Pre Merge pull request !133 from wallellen/master-fetch-dev

This commit is contained in:
wallellen 2023-03-04 06:56:47 +00:00 committed by Gitee
commit 6376f4a0f6
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F

View File

@ -59,13 +59,14 @@ const getGeojson = (regionId: string) => {
}
//
registerMap(props.chartConfig.option.mapRegion.adcode, { geoJSON: {} as any, specialAreas: {} })
registerMap(`${props.chartConfig.option.mapRegion.adcode}`, { geoJSON: {} as any, specialAreas: {} })
// china
const registerMapInitAsync = async () => {
await nextTick()
if (props.chartConfig.option.mapRegion.adcode != 'china') {
await getGeojson(props.chartConfig.option.mapRegion.adcode)
const adCode = `${props.chartConfig.option.mapRegion.adcode}`;
if (adCode !== 'china') {
await getGeojson(adCode)
} else {
await hainanLandsHandle(props.chartConfig.option.mapRegion.showHainanIsLands)
}
@ -127,7 +128,7 @@ watch(
//
watch(
() => props.chartConfig.option.mapRegion.adcode,
() => `${props.chartConfig.option.mapRegion.adcode}`,
async newData => {
try {
await getGeojson(newData)