Ver código fonte

fix: 模型下编辑命令变为新增的bug

lvkun996 2 anos atrás
pai
commit
361a3ef243

+ 2 - 3
src/layout/components/search/index.vue

@@ -13,9 +13,8 @@
         </template>
       </a-input>
 
-      <div class="search-card">
-        <!-- <a-empty /> -->
-      </div>
+      <!-- <div class="search-card">
+      </div> -->
 
     </div>
 

+ 26 - 9
src/pages/Iot/model/components/modelDefine.vue

@@ -386,7 +386,6 @@ const openModalCmdp = (type: 'request' | 'response', opraState: 'add' | 'update'
 
 const okCmdParams = () => {
   validateCmdP().then(() => {
-    // cmdParamsRef.id = useId()
     console.log(cmdParamsRef)
     const key = state.cmdParamsOpraState === 'request' ? 'requestData' : 'responseData'
     console.log(state.dataCmdParams, key)
@@ -395,8 +394,6 @@ const okCmdParams = () => {
     if (index >= 0) {
       state.dataCmdParams[key].splice(index, 1, { ...cmdParamsRef })
     } else {
-      console.log({ ...cmdParamsRef, id: useId() })
-
       state.dataCmdParams[key].push({ ...cmdParamsRef, id: useId() })
     }
 
@@ -448,11 +445,19 @@ const openModel = (key: string, opraState: 'add' | 'update', record: any = {}) =
   if (key === 'attrVisible') {
     resetFields(record)
   } else {
-    console.log(record)
-
     resetFieldsCmd(record)
-    state.dataCmdParams.requestData = record.cmdParams || []
-    state.dataCmdParams.responseData = record.cmdResponses || []
+    state.dataCmdParams.requestData = record.cmdParams.map(item => {
+      return {
+        ...item,
+        id: item.id ? item.id : useId()
+      }
+    }) || []
+    state.dataCmdParams.responseData = record.cmdResponses.map(item => {
+      return {
+        ...item,
+        id: item.id ? item.id : useId()
+      }
+    }) || []
   }
 }
 
@@ -461,7 +466,14 @@ const getModelCmd = async () => {
   state.dataSourceCmd = []
   const { data, sum } = await ModelCmdController.page(state.queryParamsCmd)
   state.loadingCmd = false
-  state.dataSourceCmd = data
+  state.dataSourceCmd = data.map(item => {
+    return {
+      ...item,
+      id: item.id ? item.id : useId()
+    }
+  })
+  console.log('state.dataSourceCmd:', state.dataSourceCmd)
+
   state.queryParamsCmd.total = sum
 }
 
@@ -472,7 +484,12 @@ const getModelAttr = async () => {
   console.log(data)
 
   state.loading = false
-  state.dataSource = data
+  state.dataSource = data.map(item => {
+    return {
+      ...item,
+      id: item.attributeKey ? item.attributeKey : useId()
+    }
+  })
   state.queryParams.total = sum
 }