From 5b37edc55851eade79144543226ade88570fdb03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A5=94=E8=B7=91=E7=9A=84=E9=9D=A2=E6=9D=A1?=
 <1262327911@qq.com>
Date: Tue, 24 Dec 2024 17:35:53 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96=E7=9B=91=E5=90=ACvCh?=
 =?UTF-8?q?arts=E9=85=8D=E7=BD=AE=E7=9A=84=E5=86=99=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/GoVChart/index.vue             | 19 ++++++++++++++++---
 .../ChartDataMatchingAndShow/index.vue        |  6 ++----
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/src/components/GoVChart/index.vue b/src/components/GoVChart/index.vue
index 3f99e3a0..07abd05b 100644
--- a/src/components/GoVChart/index.vue
+++ b/src/components/GoVChart/index.vue
@@ -8,7 +8,7 @@
 </template>
 
 <script setup lang="ts">
-import { ref, PropType, watch, onBeforeUnmount, nextTick, toRaw } from 'vue'
+import { ref, PropType, watch, onBeforeUnmount, nextTick, toRaw, toRefs } from 'vue'
 import { VChart, type IVChart, type IInitOption, type ISpec } from '@visactor/vchart'
 import { transformHandler } from './transformProps'
 import { IOption } from '@/packages/components/VChart/index.d'
@@ -156,11 +156,13 @@ const props = defineProps({
 const vChartRef = ref()
 let chart: IVChart
 
+// 解构 props.option，排除 dataset
+const { dataset, ...restOfOption } = toRefs(props.option)
+
 // 排除 data 监听
 watch(
   () => ({
-    ...props.option,
-    dataset: undefined
+    ...restOfOption
   }),
   () => {
     nextTick(() => {
@@ -172,6 +174,17 @@ watch(
     immediate: true
   }
 )
+watch(
+  () => dataset.value,
+  () => {
+    nextTick(() => {
+      createOrUpdateChart(props.option)
+    })
+  },
+  {
+    deep: false
+  }
+)
 
 // 更新
 const createOrUpdateChart = (
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 fe8a3539..59cc7750 100644
--- a/src/views/chart/ContentConfigurations/components/ChartData/components/ChartDataMatchingAndShow/index.vue
+++ b/src/views/chart/ContentConfigurations/components/ChartData/components/ChartDataMatchingAndShow/index.vue
@@ -221,13 +221,11 @@ const dimensionsAndSourceHandle = () => {
 const initFieldListHandle = () => {
   if (targetData.value?.option) {
     fieldList.value = []
-    // 所有名称，找到其中中 Field 结尾 的 key 和值，如果值不是数组结构，则先转换
+    // 所有名称，找到其中中 Field 结尾 的 key 和值
     for (const key in targetData.value.option) {
       if (key.endsWith('Field')) {
         const value = targetData.value.option[key]
-        if (!isArray(value)) {
-          targetData.value.option[key] = [value]
-        }
+        targetData.value.option[key] = value
         const item = {
           field: key,
           mapping: value,