From 286bcc55761daa7c589a4cfbabdccf9f735b9f58 Mon Sep 17 00:00:00 2001 From: Liuunicorn <8532757+Liuunicorn@user.noreply.gitee.com> Date: Thu, 19 Sep 2024 07:16:11 +0000 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=82=B9=E5=87=BB?= =?UTF-8?q?=E6=97=A0=E6=95=B0=E6=8D=AE=E6=BA=90=E7=BB=84=E4=BB=B6=E5=90=8E?= =?UTF-8?q?=EF=BC=8C=E5=86=8D=E5=88=87=E6=8D=A2=E6=88=90=E6=9C=89=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=BA=90=E7=9A=84=E7=BB=84=E4=BB=B6=E6=97=B6=EF=BC=8C?= =?UTF-8?q?=E6=97=A0=E6=B3=95=E6=93=8D=E4=BD=9C=E6=95=B0=E6=8D=AE=E5=86=85?= =?UTF-8?q?=E5=AE=B9=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Liuunicorn <8532757+Liuunicorn@user.noreply.gitee.com> --- .../ChartData/components/ChartDataMatchingAndShow/index.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/chart/ContentConfigurations/components/ChartData/components/ChartDataMatchingAndShow/index.vue b/src/views/chart/ContentConfigurations/components/ChartData/components/ChartDataMatchingAndShow/index.vue index 0774a111..6a2cdabb 100644 --- a/src/views/chart/ContentConfigurations/components/ChartData/components/ChartDataMatchingAndShow/index.vue +++ b/src/views/chart/ContentConfigurations/components/ChartData/components/ChartDataMatchingAndShow/index.vue @@ -170,6 +170,7 @@ watch( dimensions: any } | null ) => { + noData.value = false if (newData && targetData?.value?.chartConfig?.chartFrame === ChartFrameEnum.ECHARTS) { // 只有 DataSet 数据才有对应的格式 source.value = newData From 68955f8f320c952d3e3eca68ba502512da015f2f Mon Sep 17 00:00:00 2001 From: Ming <1823574190@qq.com> Date: Sat, 9 Nov 2024 01:34:01 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix=EF=BC=9Atable=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E6=97=A0=E6=B3=95=E5=8F=91=E8=B5=B7api=E8=AF=B7=E6=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/Tables/Tables/TablesBasic/index.vue | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/packages/components/Tables/Tables/TablesBasic/index.vue b/src/packages/components/Tables/Tables/TablesBasic/index.vue index f3580744..02c9523f 100644 --- a/src/packages/components/Tables/Tables/TablesBasic/index.vue +++ b/src/packages/components/Tables/Tables/TablesBasic/index.vue @@ -36,6 +36,8 @@ import { computed, PropType, toRefs, watch, reactive, ref } from 'vue' import { CreateComponentType } from '@/packages/index.d' import { icon } from '@/plugins' +import { useChartEditStore } from '@/store/modules/chartEditStore/chartEditStore' +import { useChartDataFetch } from '@/hooks' const props = defineProps({ chartConfig: { @@ -83,6 +85,13 @@ watch( deep: true } ) + +// setdata 数据监听与更改 +useChartDataFetch(props.chartConfig, useChartEditStore, (newData: any) => { + props.chartConfig.option.dataset = newData +}) + +