Merge branch 'fix/teambition-issure' into 'main_dev'

fix(src/packages/components): 修复地图未开启下钻,选择省市时,回显正常,但是刷新在选择时,回显为地区码了

See merge request yunteng/thingskit-view!241

@@ -43,13 +43,14 @@ onMounted(async () => {
     label: '中国',
     label: '中国',
     value: 'china'
     value: 'china'
   })
   })
-  onHandleSelectProvince('china')
+  onHandleSelectProvince(props.optionData?.mapRegion.saveSelect['provinceValue'])
   for (let i in selectValues) Reflect.set(selectValues, i, props.optionData?.mapRegion.saveSelect[i])
   for (let i in selectValues) Reflect.set(selectValues, i, props.optionData?.mapRegion.saveSelect[i])
 })
 })
 
 
 const onHandleSelectProvince = async (value: number | string) => {
 const onHandleSelectProvince = async (value: number | string) => {
   selectValues.cityValue = null
   selectValues.cityValue = null
   selectValues.countyValue = null
   selectValues.countyValue = null
+  selectOptions.cityOptions = []
   if (value === 'china') return (selectValues.levelStr = areaEnum.COUNTRY)
   if (value === 'china') return (selectValues.levelStr = areaEnum.COUNTRY)
   selectOptions.cityOptions = await getAreaLists(areaEnum.CITY, value)
   selectOptions.cityOptions = await getAreaLists(areaEnum.CITY, value)
   selectValues.levelStr = areaEnum.PROVINCE
   selectValues.levelStr = areaEnum.PROVINCE

@@ -55,7 +55,7 @@
 </template>
 </template>
 
 
 <script setup lang="ts">
 <script setup lang="ts">
-import { PropType, ref, onMounted } from 'vue'
+import { PropType, ref, onMounted, watch } from 'vue'
 import { AccessMode, option, sourceTypeEnum, videoListInterface, sourceTypeNameEnum, Dataset } from './config'
 import { AccessMode, option, sourceTypeEnum, videoListInterface, sourceTypeNameEnum, Dataset } from './config'
 import { CollapseItem, SettingItemBox, SettingItem } from '@/components/Pages/ChartItemSetting'
 import { CollapseItem, SettingItemBox, SettingItem } from '@/components/Pages/ChartItemSetting'
 import { NTreeSelect } from 'naive-ui'
 import { NTreeSelect } from 'naive-ui'
@@ -135,6 +135,19 @@ const handleSelect = (_: string, e: videoListInterface) => {
   }
   }
 }
 }
 
 
+watch(()=>props.optionData, (newData)=>{
+  if (newData.sourceType === sourceTypeEnum.PLATFORM) {
+    getOriginationList()
+    if (newData.organization) {
+      getVideoLists(newData.organization)
+    }
+  }
+},
+{
+  immediate: true,
+  deep: true
+})
+
 onMounted(() => {
 onMounted(() => {
   if (props.optionData.sourceType === sourceTypeEnum.PLATFORM) {
   if (props.optionData.sourceType === sourceTypeEnum.PLATFORM) {
     getOriginationList()
     getOriginationList()

@@ -11,7 +11,7 @@
       <!-- <n-input type="textarea" @input="handleTestInput($event, option)" size="small" placeholder="请输入"></n-input>
       <!-- <n-input type="textarea" @input="handleTestInput($event, option)" size="small" placeholder="请输入"></n-input>
       <n-code word-wrap :code="toString(testInputValue)" language="json"></n-code> -->
       <n-code word-wrap :code="toString(testInputValue)" language="json"></n-code> -->
       <n-divider />
       <n-divider />
-      <div v-for="(item, index) in groupList" :key="item.key + index">
+      <div v-for="(item, index) in cacheGroupList" :key="item.key + index">
         <n-space justify="space-between">
         <n-space justify="space-between">
           <n-ellipsis> 组件id </n-ellipsis>
           <n-ellipsis> 组件id </n-ellipsis>
           <n-input size="small" v-model:value="item.id" :disabled="true"></n-input>
           <n-input size="small" v-model:value="item.id" :disabled="true"></n-input>
@@ -52,12 +52,16 @@ import { SelectOption } from 'naive-ui'
 
 
 const { targetData } = useTargetData()
 const { targetData } = useTargetData()
 
 
-const { groupList, option } = toRefs(targetData.value)
+const { groupList, option } = toRefs(targetData.value as unknown as Recordable)
+
+const cacheGroupList = computed(()=>{
+  return (groupList.value as unknown as CreateComponentType[]).reverse()
+})
 
 
 const saveHistoryInputValueList = ref<saveHistoryInputValueListType>([])
 const saveHistoryInputValueList = ref<saveHistoryInputValueListType>([])
 
 
 const handleSelectDataKey = (key:string, options:SelectOption[], currentComponentId:string, groupList:CreateComponentType[]) => {
 const handleSelectDataKey = (key:string, options:SelectOption[], currentComponentId:string, groupList:CreateComponentType[]) => {
-  saveHistoryInputValueList.value.unshift({
+  saveHistoryInputValueList.value.push({
     id:currentComponentId,
     id:currentComponentId,
     inputValue:key
     inputValue:key
   })
   })
@@ -115,6 +119,10 @@ const dataCacheKeys = computed(()=>{
   return []
   return []
 })
 })
 
 
+const cacheTargetDataGroupList = computed(()=>{
+  return (targetData.value?.groupList as unknown as CreateComponentType[]).reverse()
+})
+
 watch(
 watch(
   () => targetData.value,
   () => targetData.value,
   (newValue: CreateComponentType | CreateComponentGroupType) => {
   (newValue: CreateComponentType | CreateComponentGroupType) => {
@@ -124,7 +132,7 @@ watch(
         newValue.saveHistoryInput = JSON.stringify(uniqHistoryInputValueList)
         newValue.saveHistoryInput = JSON.stringify(uniqHistoryInputValueList)
         window.localStorage.setItem('CACHE_HISTORY_INPUT_VALUE', JSON.stringify(uniqHistoryInputValueList))
         window.localStorage.setItem('CACHE_HISTORY_INPUT_VALUE', JSON.stringify(uniqHistoryInputValueList))
       }
       }
-      newValue?.groupList?.forEach((item: CreateComponentType) => {
+      cacheTargetDataGroupList.value?.forEach((item: CreateComponentType) => {
         uniqHistoryInputValueList.forEach((uniqueItem: historyInputValue) => {
         uniqHistoryInputValueList.forEach((uniqueItem: historyInputValue) => {
           if (uniqueItem.id === item.id) {
           if (uniqueItem.id === item.id) {
             // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
             // eslint-disable-next-line @typescript-eslint/no-non-null-assertion