Merge branch 'ft' into 'main_dev'

fix(src/packages): 图表地图 点击切换 标点还存在

See merge request yunteng/thingskit-view!120

@@ -64,6 +64,17 @@ const onHandleSelectCity = async (value: number) => {
 const onHandleSubmit = () => {
 const onHandleSubmit = () => {
   emits('submit', selectValues)
   emits('submit', selectValues)
 }
 }
+const resetValue = () => {
+  selectValues.provinceValue = 'china'
+  selectValues.cityValue = null
+  selectValues.countyValue = null
+  selectValues.levelStr = areaEnum.COUNTRY
+  selectOptions.cityOptions = []
+  selectOptions.countryOptions = []
+}
+defineExpose({
+  resetValue
+})
 </script>
 </script>
 
 
 <template>
 <template>

@@ -4,7 +4,7 @@
   <CollapseItem name="地图" :expanded="true">
   <CollapseItem name="地图" :expanded="true">
     <SettingItemBox name="开启下钻">
     <SettingItemBox name="开启下钻">
       <SettingItem name="">
       <SettingItem name="">
-        <n-switch v-model:value="optionData.drillingIn" size="small"></n-switch>
+        <n-switch @change="handleChangeDrillingIn" v-model:value="optionData.drillingIn" size="small"></n-switch>
       </SettingItem>
       </SettingItem>
     </SettingItemBox>
     </SettingItemBox>
     <SettingItemBox name="返回图标">
     <SettingItemBox name="返回图标">
@@ -35,7 +35,12 @@
         ></n-input-number>
         ></n-input-number>
       </SettingItem>
       </SettingItem>
     </SettingItemBox>
     </SettingItemBox>
-    <SelectCity :optionData="optionData" :drillingIn="optionData.drillingIn" @submit="onHandleSelectValues" />
+    <SelectCity
+      ref="SelectCityRef"
+      :optionData="optionData"
+      :drillingIn="optionData.drillingIn"
+      @submit="onHandleSelectValues"
+    />
     <SettingItemBox name="颜色">
     <SettingItemBox name="颜色">
       <SettingItem name="区域颜色">
       <SettingItem name="区域颜色">
         <n-color-picker size="small" :modes="['hex']" v-model:value="seriesList[0].itemStyle.color"></n-color-picker>
         <n-color-picker size="small" :modes="['hex']" v-model:value="seriesList[0].itemStyle.color"></n-color-picker>
@@ -181,6 +186,8 @@ const symbolOption = ref([
   }
   }
 ])
 ])
 
 
+const SelectCityRef = ref<typeof SelectCity>()
+
 const onHandleSelectValues = (values: any) => {
 const onHandleSelectValues = (values: any) => {
   const { cityValue, countyValue, provinceValue } = values
   const { cityValue, countyValue, provinceValue } = values
   props.optionData.mapRegion.saveSelect = values
   props.optionData.mapRegion.saveSelect = values
@@ -192,4 +199,8 @@ const onHandleSelectValues = (values: any) => {
     ? 'china'
     ? 'china'
     : provinceValue
     : provinceValue
 }
 }
+
+const handleChangeDrillingIn = () => {
+  SelectCityRef.value?.resetValue()
+}
 </script>
 </script>

@@ -64,6 +64,18 @@ const onHandleSelectCity = async (value: number) => {
 const onHandleSubmit = () => {
 const onHandleSubmit = () => {
   emits('submit', selectValues)
   emits('submit', selectValues)
 }
 }
+
+const resetValue = () => {
+  selectValues.provinceValue = 'china'
+  selectValues.cityValue = null
+  selectValues.countyValue = null
+  selectValues.levelStr = areaEnum.COUNTRY
+  selectOptions.cityOptions = []
+  selectOptions.countryOptions = []
+}
+defineExpose({
+  resetValue
+})
 </script>
 </script>
 
 
 <template>
 <template>

@@ -3,7 +3,7 @@ import { OverrideMapBaseConfig } from './index'
 import { chartInitConfig } from '@/settings/designSetting'
 import { chartInitConfig } from '@/settings/designSetting'
 import { CreateComponentType } from '@/packages/index.d'
 import { CreateComponentType } from '@/packages/index.d'
 import cloneDeep from 'lodash/cloneDeep'
 import cloneDeep from 'lodash/cloneDeep'
-import dataJson from './data.json'
+// import dataJson from './data.json'
 
 
 //省市区枚举
 //省市区枚举
 export const enum areaEnum {
 export const enum areaEnum {
@@ -21,7 +21,7 @@ export const option = {
   iconDistanceRight: 20,
   iconDistanceRight: 20,
   iconDistanceTop: 20,
   iconDistanceTop: 20,
   drillingIn: false,
   drillingIn: false,
-  dataset: dataJson,
+  // dataset: dataJson,
   mapRegion: {
   mapRegion: {
     adcode: 'china',
     adcode: 'china',
     showHainanIsLands: true,
     showHainanIsLands: true,

@@ -4,7 +4,7 @@
   <CollapseItem name="地图" :expanded="true">
   <CollapseItem name="地图" :expanded="true">
     <SettingItemBox name="开启下钻">
     <SettingItemBox name="开启下钻">
       <SettingItem name="">
       <SettingItem name="">
-        <n-switch v-model:value="optionData.drillingIn" size="small"></n-switch>
+        <n-switch @change="handleChangeDrillingIn" v-model:value="optionData.drillingIn" size="small"></n-switch>
       </SettingItem>
       </SettingItem>
     </SettingItemBox>
     </SettingItemBox>
     <SettingItemBox name="返回图标">
     <SettingItemBox name="返回图标">
@@ -14,11 +14,7 @@
     </SettingItemBox>
     </SettingItemBox>
     <SettingItemBox name="图标颜色">
     <SettingItemBox name="图标颜色">
       <SettingItem name="">
       <SettingItem name="">
-        <n-color-picker
-          size="small"
-          :modes="['hex']"
-          v-model:value="optionData.iconColor"
-        ></n-color-picker>
+        <n-color-picker size="small" :modes="['hex']" v-model:value="optionData.iconColor"></n-color-picker>
       </SettingItem>
       </SettingItem>
     </SettingItemBox>
     </SettingItemBox>
     <SettingItemBox name="图标距离">
     <SettingItemBox name="图标距离">
@@ -39,7 +35,12 @@
         ></n-input-number>
         ></n-input-number>
       </SettingItem>
       </SettingItem>
     </SettingItemBox>
     </SettingItemBox>
-    <SelectCity :optionData="optionData" :drillingIn="optionData.drillingIn" @submit="onHandleSelectValues" />
+    <SelectCity
+      ref="SelectCityRef"
+      :optionData="optionData"
+      :drillingIn="optionData.drillingIn"
+      @submit="onHandleSelectValues"
+    />
     <SettingItemBox name="区域颜色">
     <SettingItemBox name="区域颜色">
       <SettingItem name="0%处颜色">
       <SettingItem name="0%处颜色">
         <n-color-picker
         <n-color-picker
@@ -281,6 +282,8 @@ const props = defineProps({
   }
   }
 })
 })
 
 
+const SelectCityRef = ref<typeof SelectCity>()
+
 const initMapRegionOptions = () => {
 const initMapRegionOptions = () => {
   mapChinaJson.features.forEach((element: any) => {
   mapChinaJson.features.forEach((element: any) => {
     if (element.properties.name) {
     if (element.properties.name) {
@@ -309,4 +312,8 @@ const onHandleSelectValues = (values: any) => {
     ? 'china'
     ? 'china'
     : provinceValue
     : provinceValue
 }
 }
+
+const handleChangeDrillingIn = () => {
+  SelectCityRef.value?.resetValue()
+}
 </script>
 </script>

@@ -7,6 +7,7 @@
     :option="option.value"
     :option="option.value"
     :manual-update="isPreview()"
     :manual-update="isPreview()"
     :loading="loading"
     :loading="loading"
+    :loadingOptions="{ maskColor: '#18181C', text: '加载中', textColor: 'white' }"
     autoresize
     autoresize
   >
   >
   </v-chart>
   </v-chart>
@@ -142,6 +143,7 @@ const getGeojson = async (regionId: any) => {
     )
     )
     const { geoJson, name, code, level } = data
     const { geoJson, name, code, level } = data
     const geoJsonFile = JSON.parse(geoJson)
     const geoJsonFile = JSON.parse(geoJson)
+    if (!geoJsonFile) return
     saveGeojson.value = geoJsonFile
     saveGeojson.value = geoJsonFile
     registerMap(level === areaEnum.COUNTRY ? name : code, { geoJSON: geoJsonFile as any, specialAreas: {} })
     registerMap(level === areaEnum.COUNTRY ? name : code, { geoJSON: geoJsonFile as any, specialAreas: {} })
     loading.value = false
     loading.value = false
@@ -199,16 +201,16 @@ const hainanLandsHandle = async (newData: boolean) => {
 }
 }
 
 
 //监听 dataset 数据发生变化
 //监听 dataset 数据发生变化
-watch(
-  () => props.chartConfig.option.dataset,
-  newData => {
-    dataSetHandle(newData)
-  },
-  {
-    immediate: true,
-    deep: false
-  }
-)
+// watch(
+//   () => props.chartConfig.option.dataset,
+//   newData => {
+//     dataSetHandle(newData)
+//   },
+//   {
+//     immediate: true,
+//     deep: false
+//   }
+// )
 
 
 //监听是否显示南海群岛
 //监听是否显示南海群岛
 watch(
 watch(

@@ -7,28 +7,46 @@
   <collapse-item name="时间配置" :expanded="true">
   <collapse-item name="时间配置" :expanded="true">
     <setting-item-box name="快捷选择">
     <setting-item-box name="快捷选择">
       <setting-item name="日期">
       <setting-item name="日期">
-        <n-select clearable @change="shortCutSelect" v-model:value="optionData.shortcut" size="small" :options="intervalOption" />
+        <n-select
+          clearable
+          @change="shortCutSelect"
+          v-model:value="optionData.shortcut"
+          size="small"
+          :options="intervalOption"
+        />
       </setting-item>
       </setting-item>
     </setting-item-box>
     </setting-item-box>
     <setting-item-box name="基础">
     <setting-item-box name="基础">
       <setting-item name="类型">
       <setting-item name="类型">
-        <n-select v-model:value="optionData.componentInteractEventKey" size="small" :options="datePickerTypeOptions"
-                  @update:value="datePickerTypeUpdate"/>
+        <n-select
+          v-model:value="optionData.componentInteractEventKey"
+          size="small"
+          :options="datePickerTypeOptions"
+          @update:value="datePickerTypeUpdate"
+        />
       </setting-item>
       </setting-item>
     </setting-item-box>
     </setting-item-box>
     <setting-item-box name="默认值">
     <setting-item-box name="默认值">
       <setting-item name="类型">
       <setting-item name="类型">
-        <n-select v-model:value="optionData.defaultType" size="small" :options="defaultTypeOptions"
-                  @update:value="defaultTypeUpdate" />
+        <n-select
+          v-model:value="optionData.defaultType"
+          size="small"
+          :options="defaultTypeOptions"
+          @update:value="defaultTypeUpdate"
+        />
       </setting-item>
       </setting-item>
-
     </setting-item-box>
     </setting-item-box>
     <setting-item-box v-if="optionData.defaultType === DefaultTypeEnum.STATIC" :alone="true">
     <setting-item-box v-if="optionData.defaultType === DefaultTypeEnum.STATIC" :alone="true">
       <setting-item name="静态默认值">
       <setting-item name="静态默认值">
-        <n-date-picker size="small" clearable v-model:value="optionData.dataset" :type="optionData.componentInteractEventKey" />
+        <n-date-picker
+          size="small"
+          clearable
+          v-model:value="optionData.dataset"
+          :type="optionData.componentInteractEventKey"
+        />
       </setting-item>
       </setting-item>
     </setting-item-box>
     </setting-item-box>
-    <setting-item-box v-if="optionData.defaultType === DefaultTypeEnum.DYNAMIC" >
+    <setting-item-box v-if="optionData.defaultType === DefaultTypeEnum.DYNAMIC">
       <template #name>
       <template #name>
         <n-text></n-text>
         <n-text></n-text>
         <n-tooltip trigger="hover">
         <n-tooltip trigger="hover">
@@ -43,7 +61,7 @@
       <setting-item :name="differValueName">
       <setting-item :name="differValueName">
         <n-input-number v-model:value="optionData.differValue[0]" class="input-num-width" size="small">
         <n-input-number v-model:value="optionData.differValue[0]" class="input-num-width" size="small">
           <template #suffix>
           <template #suffix>
-            {{DifferUnitObject[optionData.differUnit[0]]}}
+            {{ DifferUnitObject[optionData.differUnit[0]] }}
           </template>
           </template>
         </n-input-number>
         </n-input-number>
       </setting-item>
       </setting-item>
@@ -53,7 +71,7 @@
       <setting-item v-if="isRange" name="结束值动态偏移量">
       <setting-item v-if="isRange" name="结束值动态偏移量">
         <n-input-number v-model:value="optionData.differValue[1]" class="input-num-width" size="small">
         <n-input-number v-model:value="optionData.differValue[1]" class="input-num-width" size="small">
           <template #suffix>
           <template #suffix>
-            {{DifferUnitObject[optionData.differUnit[1]]}}
+            {{ DifferUnitObject[optionData.differUnit[1]] }}
           </template>
           </template>
         </n-input-number>
         </n-input-number>
       </setting-item>
       </setting-item>
@@ -61,18 +79,17 @@
         <n-select v-model:value="optionData.differUnit[1]" size="small" :options="differUnitOptions" />
         <n-select v-model:value="optionData.differUnit[1]" size="small" :options="differUnitOptions" />
       </setting-item>
       </setting-item>
     </setting-item-box>
     </setting-item-box>
-
   </collapse-item>
   </collapse-item>
 </template>
 </template>
 
 
 <script lang="ts" setup>
 <script lang="ts" setup>
-import { PropType,computed } from 'vue'
+import { PropType, computed, ref } from 'vue'
 import { icon } from '@/plugins'
 import { icon } from '@/plugins'
 import { CollapseItem, SettingItemBox, SettingItem } from '@/components/Pages/ChartItemSetting'
 import { CollapseItem, SettingItemBox, SettingItem } from '@/components/Pages/ChartItemSetting'
 import { option } from './config'
 import { option } from './config'
 import { intervalOption } from './shortcutTime'
 import { intervalOption } from './shortcutTime'
 import { ComponentInteractEventEnum, DefaultTypeEnum, DifferUnitEnum, DifferUnitObject } from './interact'
 import { ComponentInteractEventEnum, DefaultTypeEnum, DifferUnitEnum, DifferUnitObject } from './interact'
-import dayjs from "dayjs";
+import dayjs from 'dayjs'
 
 
 const { HelpOutlineIcon } = icon.ionicons5
 const { HelpOutlineIcon } = icon.ionicons5
 
 
@@ -152,7 +169,6 @@ const defaultTypeOptions = [
   }
   }
 ]
 ]
 
 
-
 const differUnitOptions = [
 const differUnitOptions = [
   // ManipulateType
   // ManipulateType
   {
   {
@@ -193,7 +209,6 @@ const differUnitOptions = [
   }
   }
 ]
 ]
 
 
-
 const isRange = computed(() => {
 const isRange = computed(() => {
   return props.optionData.componentInteractEventKey.endsWith('range')
   return props.optionData.componentInteractEventKey.endsWith('range')
 })
 })
@@ -206,8 +221,13 @@ const differUnitName = computed(() => {
   return isRange.value ? '开始值偏移单位' : '偏移单位'
   return isRange.value ? '开始值偏移单位' : '偏移单位'
 })
 })
 
 
+const startTs = ref(0)
+const endTs = ref(0)
+
 const datePickerTypeUpdate = () => {
 const datePickerTypeUpdate = () => {
-  props.optionData.dataset = isRange.value ? [dayjs().valueOf(), dayjs().valueOf()] : [dayjs().valueOf()]
+  props.optionData.dataset = isRange.value
+    ? [startTs.value ? startTs.value : dayjs().valueOf(), endTs.value ? endTs.value : dayjs().valueOf()]
+    : [dayjs().valueOf()]
 }
 }
 
 
 const defaultTypeUpdate = (v: string) => {
 const defaultTypeUpdate = (v: string) => {
@@ -220,9 +240,9 @@ const defaultTypeUpdate = (v: string) => {
 }
 }
 
 
 const shortCutSelect = (value: number) => {
 const shortCutSelect = (value: number) => {
-  const startTs = Date.now() - value
-  const endTs = Date.now()
-  props.optionData.dataset = [startTs, endTs] as any
+  startTs.value = Date.now() - value
+  endTs.value = Date.now()
+  props.optionData.dataset = [startTs.value, endTs.value] as any
 }
 }
 // shortCutSelect(24*60*60*1000)//默认近1天
 // shortCutSelect(24*60*60*1000)//默认近1天
 </script>
 </script>