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

fix: 修复编辑产品品类成功后，没有提示框和产品品类删除报错

See merge request yunteng/thingskit-front!1010

@@ -6,11 +6,13 @@
   import { useForm, BasicForm } from '/@/components/Form';
   import { useForm, BasicForm } from '/@/components/Form';
 
 
   import { deviceProfileCategory } from '/@/api/device/classModal';
   import { deviceProfileCategory } from '/@/api/device/classModal';
+  import { useMessage } from '/@/hooks/web/useMessage';
 
 
   const emit = defineEmits(['handleReload', 'register']);
   const emit = defineEmits(['handleReload', 'register']);
 
 
   const isUpdate = ref<Boolean>(false);
   const isUpdate = ref<Boolean>(false);
   const getTitle = computed(() => (!unref(isUpdate) ? '新增分类' : '编辑分类'));
   const getTitle = computed(() => (!unref(isUpdate) ? '新增分类' : '编辑分类'));
+  const { createMessage } = useMessage();
 
 
   const [registerForm, { getFieldsValue, setFieldsValue, validate }] = useForm({
   const [registerForm, { getFieldsValue, setFieldsValue, validate }] = useForm({
     labelWidth: 140,
     labelWidth: 140,
@@ -43,8 +45,8 @@
     if (unref(isUpdate)) {
     if (unref(isUpdate)) {
       values = { ...values, id: unref(recordInfo).id };
       values = { ...values, id: unref(recordInfo).id };
     }
     }
-    console.log(unref(isUpdate), values, 'values');
     await deviceProfileCategory(values);
     await deviceProfileCategory(values);
+    createMessage.success('操作成功');
     emit('handleReload');
     emit('handleReload');
     handleCancel();
     handleCancel();
   };
   };

 import classModal from './classModal.vue';
 import classModal from './classModal.vue';
-import physicalModel from './physicalModel.vue';
 
 
-export { classModal, physicalModel };
+export { classModal };

-<script setup lang="ts">
-  import { ref } from 'vue';
-  import { BasicDrawer, useDrawerInner } from '/@/components/Drawer';
-  import PhysicalModelManagementStep from '/@/views/device/profiles/step/PhysicalModelManagementStep.vue';
-
-  defineEmits(['register']);
-  const record = ref<any>({});
-  const [register, {}] = useDrawerInner(async (data: { record: any }) => {
-    record.value = { ...data.record, ifShowClass: true };
-  });
-</script>
-<template>
-  <BasicDrawer v-bind="$attrs" title="物模型" @register="register" width="60%" destroy-on-close>
-    <PhysicalModelManagementStep :record="record" />
-  </BasicDrawer>
-</template>

@@ -7,7 +7,7 @@
   import { useMessage } from '/@/hooks/web/useMessage';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { Authority } from '/@/components/Authority';
   import { Authority } from '/@/components/Authority';
   import { useModal } from '/@/components/Modal';
   import { useModal } from '/@/components/Modal';
-  import { classModal, physicalModel } from './components/index';
+  import { classModal } from './components/index';
   import { useDrawer } from '/@/components/Drawer';
   import { useDrawer } from '/@/components/Drawer';
   import { USER_INFO_KEY } from '/@/enums/cacheEnum';
   import { USER_INFO_KEY } from '/@/enums/cacheEnum';
   import { getAuthCache } from '/@/utils/auth';
   import { getAuthCache } from '/@/utils/auth';
@@ -17,6 +17,9 @@
     deleteDeviceClass,
     deleteDeviceClass,
     deviceProfileCategory,
     deviceProfileCategory,
   } from '/@/api/device/classModal';
   } from '/@/api/device/classModal';
+
+  import { BasicDrawer } from '/@/components/Drawer';
+  import PhysicalModelManagementStep from '/@/views/device/profiles/step/PhysicalModelManagementStep.vue';
   const [
   const [
     registerTable,
     registerTable,
     { reload, setLoading, getSelectRowKeys, setSelectedRowKeys, getRowSelection },
     { reload, setLoading, getSelectRowKeys, setSelectedRowKeys, getRowSelection },
@@ -82,8 +85,13 @@
   };
   };
 
 
   // 详情
   // 详情
+  const registerDetailRecord = ref<any>({});
   const handleDetail = (record?: any) => {
   const handleDetail = (record?: any) => {
-    openDrawer(true, { record });
+    openDrawer(true);
+    registerDetailRecord.value = {
+      ...record,
+      ifShowClass: true,
+    };
   };
   };
 
 
   // 状态->编辑
   // 状态->编辑
@@ -93,7 +101,7 @@
     await deviceProfileCategory({ ...record, status: e });
     await deviceProfileCategory({ ...record, status: e });
     switchLoading.value = false;
     switchLoading.value = false;
     createMessage.success('操作成功');
     createMessage.success('操作成功');
-    reload();
+    handleReload();
   };
   };
 
 
   // 删除
   // 删除
@@ -177,6 +185,9 @@
       </template>
       </template>
     </BasicTable>
     </BasicTable>
     <classModal @register="registerModal" @handleReload="handleReload" />
     <classModal @register="registerModal" @handleReload="handleReload" />
-    <physicalModel @register="registerDetailDrawer" />
+    <!-- <physicalModel @register="registerDetailDrawer" :record /> -->
+    <BasicDrawer title="物模型" @register="registerDetailDrawer" width="60%" destroy-on-close>
+      <PhysicalModelManagementStep :record="registerDetailRecord" />
+    </BasicDrawer>
   </div>
   </div>
 </template>
 </template>

@@ -4,6 +4,7 @@
       :maskClosable="false"
       :maskClosable="false"
       v-bind="$attrs"
       v-bind="$attrs"
       :width="dynamicWidth"
       :width="dynamicWidth"
+      :destroy-on-close="true"
       @register="register"
       @register="register"
       @ok="handleSubmit"
       @ok="handleSubmit"
       @cancel="handleCancel"
       @cancel="handleCancel"
@@ -112,6 +113,7 @@
     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

@@ -25,6 +25,9 @@
     formConfig: {
     formConfig: {
       schemas: searchFormSchema,
       schemas: searchFormSchema,
     },
     },
+    searchInfo: {
+      status: 1,
+    },
     useSearchForm: true,
     useSearchForm: true,
     showTableSetting: false,
     showTableSetting: false,
     bordered: true,
     bordered: true,

@@ -129,7 +129,7 @@ export const searchFormSchema: FormSchema[] = [
     field: 'name',
     field: 'name',
     label: '',
     label: '',
     component: 'Input',
     component: 'Input',
-    colProps: { span: 10 },
+    colProps: { span: 9 },
     componentProps: {
     componentProps: {
       placeholder: '请输入品类名称',
       placeholder: '请输入品类名称',
     },
     },

@@ -87,25 +87,8 @@
       });
       });
     }
     }
     const { image, ...params } = v;
     const { image, ...params } = v;
-    console.log(image);
+    console.log(image, props.isUpdate);
     setFieldsValue({ ...params, category: params?.categoryId ? 1 : 2 });
     setFieldsValue({ ...params, category: params?.categoryId ? 1 : 2 });
-    updateSchema({
-      field: 'category',
-      componentProps({ formModel }) {
-        return {
-          options: [
-            { label: '自定义品类', value: 2 },
-            { label: '标准品类', value: 1 },
-          ],
-          onChange() {
-            formModel.categoryId = null;
-            formModel.categoryName = undefined;
-          },
-          disabled: true,
-        };
-      },
-    });
-    cateGoryDisabled.value = true;
   };
   };
   //获取数据
   //获取数据
   async function getFormData() {
   async function getFormData() {
@@ -124,12 +107,32 @@
   };
   };
 
 
   const editOrAddDeviceTypeStatus = (status: boolean) => {
   const editOrAddDeviceTypeStatus = (status: boolean) => {
-    updateSchema({
-      field: 'deviceType',
-      componentProps: {
-        disabled: status,
+    updateSchema([
+      {
+        field: 'deviceType',
+        componentProps: {
+          disabled: status,
+        },
       },
       },
-    });
+      {
+        field: 'category',
+        componentProps({ formModel }) {
+          return {
+            options: [
+              { label: '自定义品类', value: 2 },
+              { label: '标准品类', value: 1 },
+            ],
+            onChange() {
+              formModel.categoryId = null;
+              formModel.categoryName = undefined;
+            },
+            disabled: status,
+          };
+        },
+      },
+    ]);
+
+    cateGoryDisabled.value = status;
   };
   };
 
 
   // 查看功能
   // 查看功能