From 7fa4319bd1014b16b43cc761fc2522bc0eedcf77 Mon Sep 17 00:00:00 2001
From: tnt group <dodu@live.cn>
Date: Tue, 6 Sep 2022 12:49:25 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=B8=8D=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E5=8D=97=E6=B5=B7=E7=BE=A4=E5=B2=9B=E6=97=B6=E7=9A=84?=
 =?UTF-8?q?=E5=B0=8F=E6=96=B9=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/Charts/Maps/MapChina/config.ts        |  4 ++--
 .../components/Charts/Maps/MapChina/config.vue       |  2 +-
 .../components/Charts/Maps/MapChina/index.vue        | 12 ++++--------
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/src/packages/components/Charts/Maps/MapChina/config.ts b/src/packages/components/Charts/Maps/MapChina/config.ts
index 832a0b86..1d23a843 100644
--- a/src/packages/components/Charts/Maps/MapChina/config.ts
+++ b/src/packages/components/Charts/Maps/MapChina/config.ts
@@ -36,7 +36,7 @@ export const option = {
     {
       name: '地图',
       type: 'map',
-      map: 'chinaWithoutHainanIsLands',
+      map: 'china',
       zoom: 1, //缩放
       itemStyle: {
         // 背景色
@@ -50,7 +50,7 @@ export const option = {
         color: '#ffffff',
         borderColor: '#75ecaa',
         borderWidth: 1,
-        showHainanIsLands: true // 是否显示海南群岛
+        showHainanIsLands: true // 是否显示南海群岛
       },
       label: {
         show: true,
diff --git a/src/packages/components/Charts/Maps/MapChina/config.vue b/src/packages/components/Charts/Maps/MapChina/config.vue
index 010bcab0..a56dc962 100644
--- a/src/packages/components/Charts/Maps/MapChina/config.vue
+++ b/src/packages/components/Charts/Maps/MapChina/config.vue
@@ -45,7 +45,7 @@
       </SettingItemBox>
       <SettingItemBox name="其他">
         <SettingItem>
-          <n-checkbox v-model:checked="seriesList[1].itemStyle.showHainanIsLands" size="small">显示海南群岛</n-checkbox>
+          <n-checkbox v-model:checked="seriesList[1].itemStyle.showHainanIsLands" size="small">显示南海群岛</n-checkbox>
         </SettingItem>
       </SettingItemBox>
     </CollapseItem>
diff --git a/src/packages/components/Charts/Maps/MapChina/index.vue b/src/packages/components/Charts/Maps/MapChina/index.vue
index cb12cece..39fe0c59 100644
--- a/src/packages/components/Charts/Maps/MapChina/index.vue
+++ b/src/packages/components/Charts/Maps/MapChina/index.vue
@@ -45,7 +45,6 @@ use([
 ])
 
 registerMap('china', { geoJSON: mapJson as any, specialAreas: {} })
-registerMap('chinaWithoutHainanIsLands', { geoJSON: mapJsonWithoutHainanIsLands as any, specialAreas: {} })
 
 const option = reactive({
   value: mergeTheme(props.chartConfig.option, props.themeSetting, includes)
@@ -59,13 +58,10 @@ const dataSetHandle = (dataset: any) => {
   })
 }
 
-const mapTypeHandle = (config: boolean) => {
-  // props.chartConfig.option.series.forEach((item: any) => {
-  //   if (item.type === 'effectScatter' && dataset.point) item.data = dataset.point
-  //   else if (item.type === 'map' && dataset.point) item.data = dataset.map
-  //   option.value = props.chartConfig.option
-  // })
-  props.chartConfig.option.series[1].map = config ? 'china' : 'chinaWithoutHainanIsLands'
+const mapTypeHandle = (show: boolean) => {
+  show
+    ? registerMap('china', { geoJSON: mapJson as any, specialAreas: {} })
+    : registerMap('china', { geoJSON: mapJsonWithoutHainanIsLands as any, specialAreas: {} })
   option.value = props.chartConfig.option
 }