Merge branch 'fix/DEFECT-1754' into 'main_dev'

fix: 修复TCP网关子产品新增后,选择了默认脚本,然后编辑时,提示请选择对应脚本

See merge request yunteng/thingskit-front!1011

@@ -113,7 +113,6 @@
     setModalProps({ confirmLoading: false });
     setModalProps({ confirmLoading: false });
     current.value = 0;
     current.value = 0;
     isUpdate.value = data.isUpdate;
     isUpdate.value = data.isUpdate;
-    console.log(isUpdate.value, 'isUpdate');
     isViewDetail.value = data.isView;
     isViewDetail.value = data.isView;
     const res =
     const res =
       data.record !== undefined
       data.record !== undefined
@@ -127,6 +126,8 @@
     const title = unref(isUpdate) ? '编辑产品' : '新增产品';
     const title = unref(isUpdate) ? '编辑产品' : '新增产品';
     setModalProps({ title, showOkBtn: true, showCancelBtn: true });
     setModalProps({ title, showOkBtn: true, showCancelBtn: true });
     if (unref(isUpdate)) {
     if (unref(isUpdate)) {
+      const { deviceType } = res || {};
+      deviceTypeStr.value = deviceType;
       await setDeviceConfEditFormData(res);
       await setDeviceConfEditFormData(res);
       await setTransConfEditFormData(res);
       await setTransConfEditFormData(res);
       handleStepNext(false, res);
       handleStepNext(false, res);

@@ -4,7 +4,6 @@
   import { BasicDrawer, useDrawerInner } from '/@/components/Drawer';
   import { BasicDrawer, useDrawerInner } from '/@/components/Drawer';
   import { BasicTable } from '/@/components/Table';
   import { BasicTable } from '/@/components/Table';
   import { useTable } from '/@/components/Table';
   import { useTable } from '/@/components/Table';
-  import { Button } from 'ant-design-vue';
   import { ExclamationCircleOutlined } from '@ant-design/icons-vue';
   import { ExclamationCircleOutlined } from '@ant-design/icons-vue';
   import { getModelList } from '/@/api/device/modelOfMatter';
   import { getModelList } from '/@/api/device/modelOfMatter';
 
 
@@ -58,7 +57,6 @@
       transition: 'none',
       transition: 'none',
     }"
     }"
     v-bind="$attrs"
     v-bind="$attrs"
-    :showFooter="true"
     destroyOnClose
     destroyOnClose
     @close="handleClose"
     @close="handleClose"
     title="物模型"
     title="物模型"
@@ -70,8 +68,5 @@
         <ExclamationCircleOutlined class="ml-1" />
         <ExclamationCircleOutlined class="ml-1" />
       </template>
       </template>
     </BasicTable>
     </BasicTable>
-    <template #footer>
-      <Button @click="handleClose">取消</Button>
-    </template>
   </BasicDrawer>
   </BasicDrawer>
 </template>
 </template>