Merge branch 'fix/line-form-setFormData' into 'main_dev'

fix: 修复折线图和柱状图属性物模型表单赋值问题

See merge request yunteng/thingskit-view!203

@@ -65,7 +65,8 @@ export const useDynamicPublicForm = (paramsItemList: Ref<ParamsItemType[]>) => {
   const builtInVariable = ref<BuiltInVariableRecord>()
   const builtInVariable = ref<BuiltInVariableRecord>()
 
 
   const params = reactive<Recordable & { [key in BuiltInVariable]?: any }>({
   const params = reactive<Recordable & { [key in BuiltInVariable]?: any }>({
-    [BuiltInVariable.SELECT_TIME_AGGREGATION]: {}
+    [BuiltInVariable.SELECT_TIME_AGGREGATION]: {},
+    [BuiltInVariable.ATTR_NAME]: []
   })
   })
 
 
   const optionsSet = reactive<Recordable>({})
   const optionsSet = reactive<Recordable>({})
@@ -112,7 +113,6 @@ export const useDynamicPublicForm = (paramsItemList: Ref<ParamsItemType[]>) => {
     if( !organizationId) return
     if( !organizationId) return
     if (!validIsExist(BuiltInVariable.ORGANIZATION_ID)) return
     if (!validIsExist(BuiltInVariable.ORGANIZATION_ID)) return
     optionsSet[BuiltInVariable.ORGANIZATION_ID] = await getOrgList({organizationId})
     optionsSet[BuiltInVariable.ORGANIZATION_ID] = await getOrgList({organizationId})
-    console.log(optionsSet[BuiltInVariable.ORGANIZATION_ID])
   }
   }
 
 
   const getDeviceProfileOption = async () => {
   const getDeviceProfileOption = async () => {
@@ -167,7 +167,6 @@ export const useDynamicPublicForm = (paramsItemList: Ref<ParamsItemType[]>) => {
       }
       }
       Reflect.deleteProperty(value, BuiltInVariable.SELECT_TIME_AGGREGATION)
       Reflect.deleteProperty(value, BuiltInVariable.SELECT_TIME_AGGREGATION)
     }
     }
-
     return value
     return value
   })
   })
 
 
@@ -235,6 +234,7 @@ export const useDynamicPublicForm = (paramsItemList: Ref<ParamsItemType[]>) => {
         const attrNameList = unref(optionsSet[BuiltInVariable.KEYS])
         const attrNameList = unref(optionsSet[BuiltInVariable.KEYS])
         
         
         params[BuiltInVariable.ATTR_NAME] = value.map((item:any) => attrNameList.find((temp:any)=>temp.identifier==item).name)
         params[BuiltInVariable.ATTR_NAME] = value.map((item:any) => attrNameList.find((temp:any)=>temp.identifier==item).name)
+
       }
       }
     }
     }
   })
   })
@@ -439,6 +439,7 @@ export const useDynamicPublicForm = (paramsItemList: Ref<ParamsItemType[]>) => {
       for (const temp of splitKeys) {
       for (const temp of splitKeys) {
         params[temp] = Params[temp]
         params[temp] = Params[temp]
       }
       }
+      params[BuiltInVariable.ATTR_NAME] = Params[BuiltInVariable.ATTR_NAME]
     }
     }
   }
   }