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

fix(dynamic request): 修复socket无法连接

See merge request yunteng/thingskit-view!53

@@ -33,7 +33,7 @@ export const useSocketStore = defineStore({
         const { keys } = Params
         const { keys } = Params
         return {
         return {
           componentId: id,
           componentId: id,
-          keys: keys.split(KEYS_SEPARATOR)
+          keys: keys as unknown as string[]
         }
         }
       })
       })
     },
     },
@@ -149,8 +149,8 @@ export const useSocketStore = defineStore({
       const { requestContentType, requestParams } = request
       const { requestContentType, requestParams } = request
       if ((requestContentType as RequestContentTypeEnum) === RequestContentTypeEnum.WEB_SOCKET) {
       if ((requestContentType as RequestContentTypeEnum) === RequestContentTypeEnum.WEB_SOCKET) {
         const { Params } = requestParams
         const { Params } = requestParams
-        const { entityId = '', keys = '' } = Params
-        return this.updateConnectionPool(entityId, keys.split(KEYS_SEPARATOR), componentId)
+        const { entityId = '', keys = [] } = Params
+        return this.updateConnectionPool(entityId, keys as string[], componentId)
       }
       }
     },
     },
 
 
@@ -197,8 +197,8 @@ export const useSocketStore = defineStore({
     getComponentValueByKeys(targetComponent: CreateComponentType, value: SocketReceiveMessageType) {
     getComponentValueByKeys(targetComponent: CreateComponentType, value: SocketReceiveMessageType) {
       const { request: { requestParams } } = targetComponent
       const { request: { requestParams } } = targetComponent
       const { Params } = requestParams
       const { Params } = requestParams
-      const { keys = '' } = Params
-      const targetComponentBindKeys = keys.split(KEYS_SEPARATOR)
+      const { keys = [] } = Params
+      const targetComponentBindKeys = keys as unknown as string[]
 
 
       const _value = cloneDeep(value) || { data: {}, latestValues: {} }
       const _value = cloneDeep(value) || { data: {}, latestValues: {} }
       _value.data = targetComponentBindKeys.reduce((prev, next) => {
       _value.data = targetComponentBindKeys.reduce((prev, next) => {
@@ -238,7 +238,6 @@ export const useSocketStore = defineStore({
       const { subscriptionId, data } = value
       const { subscriptionId, data } = value
       const keys = Object.keys(data)
       const keys = Object.keys(data)
       const componentIds = this.getNeedUpdateComponentsIdBySubscribeId(subscriptionId, keys)
       const componentIds = this.getNeedUpdateComponentsIdBySubscribeId(subscriptionId, keys)
-      console.log(componentIds)
       componentIds?.forEach((targetComponentId) => {
       componentIds?.forEach((targetComponentId) => {
         this.updateComponentById(targetComponentId as string, value)
         this.updateComponentById(targetComponentId as string, value)
       })
       })

@@ -377,14 +377,17 @@ 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 = {}) => {
@@ -414,7 +417,8 @@ export const useDynamicPublicForm = (paramsItemList: Ref<ParamsItemType[]>) => {
 
 
   const clearParams = () => {
   const clearParams = () => {
     Object.keys(params).forEach(key => {
     Object.keys(params).forEach(key => {
-      Reflect.deleteProperty(params, key)
+      // Reflect.deleteProperty(params, key)
+      params[key] = null
     })
     })
     params[BuiltInVariable.SELECT_TIME_AGGREGATION] = {}
     params[BuiltInVariable.SELECT_TIME_AGGREGATION] = {}
   }
   }