From 56b96bfe44f14c4c5e5f7bc29d9f289d2e2fdbaf 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: Thu, 8 Sep 2022 16:31:26 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=E6=BC=8F=E6=96=97?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/Charts/Mores/Funnel/config.ts         |  2 +-
 .../components/Charts/Mores/Funnel/config.vue        |  6 ++++--
 .../components/Charts/Mores/Funnel/data.json         | 12 ++++++------
 src/packages/components/Charts/Mores/Radar/index.vue |  3 ++-
 src/settings/chartThemes/global.theme.json           |  3 +--
 5 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/packages/components/Charts/Mores/Funnel/config.ts b/src/packages/components/Charts/Mores/Funnel/config.ts
index d34bce3e..40be9e29 100644
--- a/src/packages/components/Charts/Mores/Funnel/config.ts
+++ b/src/packages/components/Charts/Mores/Funnel/config.ts
@@ -19,7 +19,7 @@ export const FunnelLabelPositionEnumList = [
   { label: '内部右侧', value: 'insideRight' }
 ]
 
-const option = {
+export const option = {
   tooltip: {},
   legend: {},
   dataset: { ...dataJson },
diff --git a/src/packages/components/Charts/Mores/Funnel/config.vue b/src/packages/components/Charts/Mores/Funnel/config.vue
index 6586f9b9..0a2581a2 100644
--- a/src/packages/components/Charts/Mores/Funnel/config.vue
+++ b/src/packages/components/Charts/Mores/Funnel/config.vue
@@ -8,6 +8,7 @@
         <n-select v-model:value="item.sort" :options="FunnelOrderEnumList" size="small" />
       </setting-item>
     </setting-item-box>
+
     <setting-item-box name="区块">
       <setting-item name="边框大小">
         <n-input-number v-model:value="item.itemStyle.borderWidth" :min="0" :max="10" size="small" />
@@ -19,6 +20,7 @@
         <n-input-number v-model:value="item.gap" :min="0" :max="20" size="small" />
       </setting-item>
     </setting-item-box>
+
     <setting-item-box name="标签">
       <setting-item name="是否显示">
         <n-checkbox v-model:checked="item.label.show" size="small">标签</n-checkbox>
@@ -40,11 +42,11 @@
 import { PropType, computed } from 'vue'
 import { GlobalSetting, CollapseItem, SettingItemBox, SettingItem } from '@/components/Pages/ChartItemSetting'
 import { GlobalThemeJsonType } from '@/settings/chartThemes/index'
-import { FunnelOrderEnumList, FunnelLabelPositionEnumList } from './config'
+import { option, FunnelOrderEnumList, FunnelLabelPositionEnumList } from './config'
 
 const props = defineProps({
   optionData: {
-    type: Object as PropType<GlobalThemeJsonType>,
+    type: Object as PropType<typeof option>,
     required: true
   }
 })
diff --git a/src/packages/components/Charts/Mores/Funnel/data.json b/src/packages/components/Charts/Mores/Funnel/data.json
index 3aba79d9..ec6e1d65 100644
--- a/src/packages/components/Charts/Mores/Funnel/data.json
+++ b/src/packages/components/Charts/Mores/Funnel/data.json
@@ -1,10 +1,10 @@
 {
-  "dimensions": ["product", "2015"],
+  "dimensions": ["product", "category"],
   "source": [
-    { "product": "Matcha Latte", "2015": 20 },
-    { "product": "Milk Tea", "2015": 40 },
-    { "product": "Cheese Cocoa", "2015": 60 },
-    { "product": "Walnut Brownie", "2015": 80 },
-    { "product": "Walnut", "2015": 100 }
+    { "product": "data1", "category": 20 },
+    { "product": "data2", "category": 40 },
+    { "product": "data3", "category": 60 },
+    { "product": "data4", "category": 80 },
+    { "product": "data5", "category": 100 }
   ]
 }
diff --git a/src/packages/components/Charts/Mores/Radar/index.vue b/src/packages/components/Charts/Mores/Radar/index.vue
index d39e0fed..60ba34f9 100644
--- a/src/packages/components/Charts/Mores/Radar/index.vue
+++ b/src/packages/components/Charts/Mores/Radar/index.vue
@@ -38,7 +38,8 @@ const option = computed(() => {
 })
 
 const dataSetHandle = (dataset: any) => {
-  if (props.chartConfig.option.legend && dataset.seriesData) {
+  if (dataset.seriesData) {
+    // @ts-ignore
     props.chartConfig.option.legend.data = dataset.seriesData.map((i: { name: string }) => i.name)
   }
   if (dataset.radarIndicator) {
diff --git a/src/settings/chartThemes/global.theme.json b/src/settings/chartThemes/global.theme.json
index 44245e3e..d7b2a61f 100644
--- a/src/settings/chartThemes/global.theme.json
+++ b/src/settings/chartThemes/global.theme.json
@@ -86,7 +86,6 @@
     "top": "5%",
     "textStyle": {
       "color": "#B9B8CE"
-    },
-    "data": []
+    }
   }
 }
\ No newline at end of file