Merge branch 'dev-fix-ww' into 'main_dev'

fix(动态请求/公共接口): DEFECT-1269修复动态请求切换公共接口为清空表单

See merge request yunteng/thingskit-view!54

@@ -4,7 +4,7 @@ import { FormItemInst, NDatePicker, NForm, NFormItem, NInput, NSelect, NTreeSele
 import { computed, nextTick, ref, unref, watch } from 'vue';
 import { computed, nextTick, ref, unref, watch } from 'vue';
 import { ComponentType, useDynamicPublicForm } from './useDynamicPublicForm';
 import { ComponentType, useDynamicPublicForm } from './useDynamicPublicForm';
 import { Help } from '@vicons/ionicons5'
 import { Help } from '@vicons/ionicons5'
-import { SelectTimeAggregation } from '../SelectTImeAggregation'; 
+import { SelectTimeAggregation } from '../SelectTImeAggregation';
 
 
 const props = defineProps<{
 const props = defineProps<{
   paramsItemList: ParamsItemType[]
   paramsItemList: ParamsItemType[]
@@ -41,12 +41,16 @@ const setConfigurationData = async (params: Recordable) => {
   setDynamicFormValue(params)
   setDynamicFormValue(params)
 }
 }
 
 
+const recreate = ref(false)
+
 watch(
 watch(
   () => props.paramsItemList,
   () => props.paramsItemList,
   (newValue) => {
   (newValue) => {
     if (newValue) {
     if (newValue) {
+      recreate.value = true
       clearParams()
       clearParams()
       createForm()
       createForm()
+      recreate.value = false
     }
     }
   }
   }
 )
 )
@@ -61,8 +65,8 @@ defineExpose({
 
 
 <template>
 <template>
   <NForm>
   <NForm>
-    <template v-for="item in getDynamicFormSchemas" :key="item.key">
-      <NFormItem ref="dynamicFormItemEl" :required="item.required" :rule="item.rules">
+    <template v-for="item in getDynamicFormSchemas" :key="item.uuid">
+      <NFormItem v-if="!recreate" ref="dynamicFormItemEl" :required="item.required" :rule="item.rules">
         <template #label>
         <template #label>
           <div class="label-container">
           <div class="label-container">
             <span>{{ item.name }}</span>
             <span>{{ item.name }}</span>

@@ -31,6 +31,7 @@ export enum ComponentType {
 
 
 
 
 export interface DynamicFormSchema {
 export interface DynamicFormSchema {
+  uuid?: string
   key: string
   key: string
   name?: string
   name?: string
   component: ComponentType,
   component: ComponentType,
@@ -336,6 +337,7 @@ export const useDynamicPublicForm = (paramsItemList: Ref<ParamsItemType[]>) => {
     }] as FormItemRule
     }] as FormItemRule
   }
   }
 
 
+  const uuid = () => Number(Math.random().toString().substring(2)).toString(32)
   const toFormSchemas = (builtInVariableKey: string, required: boolean, value: any, mores: boolean) => {
   const toFormSchemas = (builtInVariableKey: string, required: boolean, value: any, mores: boolean) => {
     const groupList = (builtInVariableKey || '').split(GROUP_SEPARATOR)
     const groupList = (builtInVariableKey || '').split(GROUP_SEPARATOR)
     return groupList.reduce((prev, next) => {
     return groupList.reduce((prev, next) => {
@@ -351,6 +353,7 @@ export const useDynamicPublicForm = (paramsItemList: Ref<ParamsItemType[]>) => {
 
 
         schema = {
         schema = {
           ...result,
           ...result,
+          // uuid: uuid(),
           props,
           props,
           name,
           name,
           required,
           required,
@@ -358,6 +361,7 @@ export const useDynamicPublicForm = (paramsItemList: Ref<ParamsItemType[]>) => {
         } as DynamicFormSchema
         } as DynamicFormSchema
       } else {
       } else {
         schema = {
         schema = {
+          // uuid: uuid(),
           key: value,
           key: value,
           name: value,
           name: value,
           component: ComponentType.INPUT,
           component: ComponentType.INPUT,
@@ -377,22 +381,19 @@ export const useDynamicPublicForm = (paramsItemList: Ref<ParamsItemType[]>) => {
       const schemas = toFormSchemas(key, required, value, mores)
       const schemas = toFormSchemas(key, required, value, mores)
       return [...prev, ...schemas]
       return [...prev, ...schemas]
     }, [] as DynamicFormSchema[])
     }, [] as DynamicFormSchema[])
-    console.log(result)
     return result
     return result
   })
   })
 
 
   const createForm = async () => {
   const createForm = async () => {
-    console.log('enter')
     await getBuiltInVariable()
     await getBuiltInVariable()
     await getOrgOption()
     await getOrgOption()
     getDeviceProfileOption()
     getDeviceProfileOption()
     getDeviceOption()
     getDeviceOption()
-    clearParams()
   }
   }
 
 
   const setParams = (Params: Recordable = {}) => {
   const setParams = (Params: Recordable = {}) => {
     for (const { key, value, mores } of unref(getParams)) {
     for (const { key, value, mores } of unref(getParams)) {
-      const splitKeys = value ? value.split(GROUP_SEPARATOR) : key.split(GROUP_SEPARATOR)
+      const splitKeys = value ? value.split(GROUP_SEPARATOR) : (key || '').split(GROUP_SEPARATOR)
       if (isDateComponent(key as BuiltInVariable)) {
       if (isDateComponent(key as BuiltInVariable)) {
         if (key as BuiltInVariable === BuiltInVariable.DATE_FIXED) {
         if (key as BuiltInVariable === BuiltInVariable.DATE_FIXED) {
           params[key] = Params[splitKeys[0]] || null
           params[key] = Params[splitKeys[0]] || null
@@ -417,9 +418,10 @@ export const useDynamicPublicForm = (paramsItemList: Ref<ParamsItemType[]>) => {
 
 
   const clearParams = () => {
   const clearParams = () => {
     Object.keys(params).forEach(key => {
     Object.keys(params).forEach(key => {
-      // Reflect.deleteProperty(params, key)
-      params[key] = null
+      Reflect.deleteProperty(params, key)
+      // params[key] = null
     })
     })
+    // params[BuiltInVariable.SELECT_TIME_AGGREGATION] = { startTs: null, endTs: null, limit: null, interval: null }
     params[BuiltInVariable.SELECT_TIME_AGGREGATION] = {}
     params[BuiltInVariable.SELECT_TIME_AGGREGATION] = {}
   }
   }