From ae4ae074d88071b3fc6240f9f95db5c6b5a32d90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=98=89=E5=A8=81?= Date: Thu, 22 Sep 2022 17:16:54 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E5=8F=AF=E9=80=89?= =?UTF-8?q?=E7=9C=81=E4=BB=BD=E5=9C=B0=E5=9B=BE=EF=BC=88=E5=BC=82=E6=AD=A5?= =?UTF-8?q?=E4=BC=9A=E6=9C=89=E9=97=AE=E9=A2=98=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/packages/components/Charts/Maps/MapBase/config.ts | 1 + src/packages/components/Charts/Maps/MapBase/index.vue | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/packages/components/Charts/Maps/MapBase/config.ts b/src/packages/components/Charts/Maps/MapBase/config.ts index 79c08b89..f08713bc 100644 --- a/src/packages/components/Charts/Maps/MapBase/config.ts +++ b/src/packages/components/Charts/Maps/MapBase/config.ts @@ -10,6 +10,7 @@ export const option = { dataset: dataJson, mapRegion: { adcode: 'china', + adcodeFlag: true, }, tooltip: { show: true, diff --git a/src/packages/components/Charts/Maps/MapBase/index.vue b/src/packages/components/Charts/Maps/MapBase/index.vue index d4b69051..2a01aeab 100644 --- a/src/packages/components/Charts/Maps/MapBase/index.vue +++ b/src/packages/components/Charts/Maps/MapBase/index.vue @@ -76,7 +76,6 @@ const option = reactive({ const getGeojson = (regionId: string) => { return new Promise((resolve, reject) => { import(`./mapGeojson/${regionId}.json`).then(data => { - console.log({data}); registerMap(regionId, { geoJSON: data.default as any, specialAreas: {} }) resolve(true) }) @@ -87,6 +86,9 @@ registerMap(props.chartConfig.option.mapRegion.adcode, { geoJSON: {} as any, spe //保证初始化不报错 const registerMapModulesAsync= async ()=>{ await getGeojson(props.chartConfig.option.mapRegion.adcode) + //触发option 变动 + props.chartConfig.option.mapRegion.adcodeFlag=!props.chartConfig.option.mapRegion.adcodeFlag + updateOptions() } registerMapModulesAsync() @@ -113,9 +115,11 @@ const mapTypeHandle = async (show: boolean) => { if (show) { await getGeojson("china") // registerMap('china', { geoJSON: mapJsonModules["china"] as any, specialAreas: {} }) + props.chartConfig.option.mapRegion.adcodeFlag=!props.chartConfig.option.mapRegion.adcodeFlag } else { registerMap('china', { geoJSON: mapJsonWithoutHainanIsLands as any, specialAreas: {} }) } + updateOptions() } //层级发生变化