From fde6e9168b5070f79a6a718cec2169c694539b40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BB=95=E5=B5=A9?= <17854119262@163.com> Date: Thu, 10 Apr 2025 11:34:02 +0800 Subject: [PATCH] =?UTF-8?q?=E6=99=BA=E6=84=9F-=E7=BB=84=E4=BB=B6=E5=BA=95?= =?UTF-8?q?=E9=83=A8=E8=A3=85=E9=A5=B0=E6=A0=8F=EF=BC=88=E5=B7=A6=E5=8F=B3?= =?UTF-8?q?=EF=BC=89=E6=9C=89=E6=97=B6=E4=B8=8D=E6=98=BE=E7=A4=BA=E7=9A=84?= =?UTF-8?q?bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../images/chart/zhigan/component/LowerLeft.png | Bin 0 -> 1884 bytes .../images/chart/zhigan/component/LowerRight.png | Bin 0 -> 1777 bytes .../Zhichu/Zhichu/ZhiChu_ModalTable/index.vue | 6 +++++- .../Zhigan/Zhigan/ZhiGan_LowerLeft/config.vue | 4 ++-- .../Zhigan/Zhigan/ZhiGan_LowerLeft/index.vue | 9 +++++++-- .../Zhigan/Zhigan/ZhiGan_LowerRight/config.vue | 4 ++-- .../Zhigan/Zhigan/ZhiGan_LowerRight/index.vue | 9 +++++++-- .../Zhigan/Zhigan/ZhiGan_ModalCarousel/index.vue | 5 +++++ .../Zhigan/Zhigan/ZhiGan_ModalVideo/index.vue | 8 ++++++-- .../Zhigan/ZhiGan_SheXiangTouModal/index.vue | 1 - .../Zhigan/ZhiGan_WuRenJiShiShiHuaMian/index.vue | 2 -- 11 files changed, 34 insertions(+), 14 deletions(-) create mode 100644 src/assets/images/chart/zhigan/component/LowerLeft.png create mode 100644 src/assets/images/chart/zhigan/component/LowerRight.png diff --git a/src/assets/images/chart/zhigan/component/LowerLeft.png b/src/assets/images/chart/zhigan/component/LowerLeft.png new file mode 100644 index 0000000000000000000000000000000000000000..803744fa39714bc570af922a87b27a26f9937c55 GIT binary patch literal 1884 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 To%s>Q00000NkvXXu0mjfqTE$r literal 0 HcmV?d00001 diff --git a/src/packages/components/Zhichu/Zhichu/ZhiChu_ModalTable/index.vue b/src/packages/components/Zhichu/Zhichu/ZhiChu_ModalTable/index.vue index a2d5f03..8e2f82d 100644 --- a/src/packages/components/Zhichu/Zhichu/ZhiChu_ModalTable/index.vue +++ b/src/packages/components/Zhichu/Zhichu/ZhiChu_ModalTable/index.vue @@ -277,7 +277,7 @@ } }, { - immediate: true, + immediate: false, deep: true, }, ); @@ -309,6 +309,10 @@ } } }, + { + immediate: false, + deep: true, + }, ); // 水源 diff --git a/src/packages/components/Zhigan/Zhigan/ZhiGan_LowerLeft/config.vue b/src/packages/components/Zhigan/Zhigan/ZhiGan_LowerLeft/config.vue index fe08a59..9855217 100644 --- a/src/packages/components/Zhigan/Zhigan/ZhiGan_LowerLeft/config.vue +++ b/src/packages/components/Zhigan/Zhigan/ZhiGan_LowerLeft/config.vue @@ -32,7 +32,7 @@ placeholder="宽度" /> - + diff --git a/src/packages/components/Zhigan/Zhigan/ZhiGan_LowerLeft/index.vue b/src/packages/components/Zhigan/Zhigan/ZhiGan_LowerLeft/index.vue index d26e1c9..45d5634 100644 --- a/src/packages/components/Zhigan/Zhigan/ZhiGan_LowerLeft/index.vue +++ b/src/packages/components/Zhigan/Zhigan/ZhiGan_LowerLeft/index.vue @@ -1,7 +1,12 @@ @@ -41,6 +46,7 @@ diff --git a/src/packages/components/Zhigan/Zhigan/ZhiGan_LowerRight/config.vue b/src/packages/components/Zhigan/Zhigan/ZhiGan_LowerRight/config.vue index 496fa0e..d2dfc7a 100644 --- a/src/packages/components/Zhigan/Zhigan/ZhiGan_LowerRight/config.vue +++ b/src/packages/components/Zhigan/Zhigan/ZhiGan_LowerRight/config.vue @@ -40,7 +40,7 @@ placeholder="宽度" /> - + diff --git a/src/packages/components/Zhigan/Zhigan/ZhiGan_LowerRight/index.vue b/src/packages/components/Zhigan/Zhigan/ZhiGan_LowerRight/index.vue index 62bc83c..beb5762 100644 --- a/src/packages/components/Zhigan/Zhigan/ZhiGan_LowerRight/index.vue +++ b/src/packages/components/Zhigan/Zhigan/ZhiGan_LowerRight/index.vue @@ -1,7 +1,12 @@ @@ -41,6 +46,7 @@ diff --git a/src/packages/components/Zhigan/Zhigan/ZhiGan_ModalCarousel/index.vue b/src/packages/components/Zhigan/Zhigan/ZhiGan_ModalCarousel/index.vue index 0907761..6653917 100644 --- a/src/packages/components/Zhigan/Zhigan/ZhiGan_ModalCarousel/index.vue +++ b/src/packages/components/Zhigan/Zhigan/ZhiGan_ModalCarousel/index.vue @@ -104,6 +104,11 @@ dataset: props.chartConfig.option.dataset, dataStyle: props.chartConfig.option.dataStyle, }); + + // 数据callback处理（预览时触发） + useChartDataFetch(props.chartConfig, useChartEditStore, (resData: any[]) => { + option.dataset = resData; + });