From 1310234803d522defd874fc0eb5df808cacaca4d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=98=89=E5=A8=81?= <daidaibg@163.com>
Date: Tue, 3 Jan 2023 16:59:04 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E8=83=B6=E5=9B=8A?=
 =?UTF-8?q?=E6=9F=B1=E5=9B=BEmock=E6=95=B0=E6=8D=AE=EF=BC=8C=E8=A7=A3?=
 =?UTF-8?q?=E5=86=B3=E8=83=B6=E5=9B=8A=E4=B8=BB=E5=9B=BElabe=E4=B8=8D?=
 =?UTF-8?q?=E5=8F=98=E5=8C=96bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/mock/test.mock.ts                            |  8 ++------
 .../components/Charts/Bars/CapsuleChart/index.vue    | 12 ++++--------
 2 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/src/api/mock/test.mock.ts b/src/api/mock/test.mock.ts
index a58cac53..f84b8cc3 100644
--- a/src/api/mock/test.mock.ts
+++ b/src/api/mock/test.mock.ts
@@ -26,12 +26,8 @@ export default {
     msg: '请求成功',
     data: {
       dimensions: ['name', 'value'],
-      source: [
-        { name: '厦门', 'value|0-40': 20 },
-        { name: '南阳', 'value|20-60': 40 },
-        { name: '北京', 'value|40-80': 60 },
-        { name: '上海', 'value|60-100': 80 },
-        { name: '新疆', value: 100 }
+      "source|2-5": [
+        { 'name|+1': ["厦门","福州","北京","上海","新疆","郑州","湖南","内蒙古"], 'value|0-40': 20 },
       ]
     }
   },
diff --git a/src/packages/components/Charts/Bars/CapsuleChart/index.vue b/src/packages/components/Charts/Bars/CapsuleChart/index.vue
index 135ef1d0..804ae0dc 100644
--- a/src/packages/components/Charts/Bars/CapsuleChart/index.vue
+++ b/src/packages/components/Charts/Bars/CapsuleChart/index.vue
@@ -112,16 +112,12 @@ watch(
 )
 
 const calcData = (data: any, type?: string) => {
-  mergeConfig(props.chartConfig.option)
+  let cloneConfig = cloneDeep(props.chartConfig.option || {})
+  state.mergedConfig = cloneConfig
   if (type == 'preview') {
-    calcCapsuleLengthAndLabelData(data)
-  } else {
-    calcCapsuleLengthAndLabelData(state.mergedConfig.dataset)
+    cloneConfig.dataset = data
   }
-}
-
-const mergeConfig = (data: any) => {
-  state.mergedConfig = cloneDeep(data || {})
+  calcCapsuleLengthAndLabelData(state.mergedConfig.dataset)
 }
 
 // 数据解析