Merge branch 'feat/product-object-model' into 'main_dev'

feat: 物模型新增批量删除功能

See merge request yunteng/thingskit-front!1106

@@ -65,3 +65,19 @@ export interface ImportModelOfMatterType {
   tkDeviceProfileId?: string;
   categoryId?: string;
 }
+
+export interface ModelOfMatterItemRecordType {
+  id: string;
+  creator: string;
+  createTime: string;
+  enabled: boolean;
+  tenantId: string;
+  functionType: string;
+  functionName: string;
+  identifier: string;
+  extensionDesc: any;
+  accessMode: string;
+  functionJson: FunctionJson;
+  status: number;
+  deviceProfileId: string;
+}

@@ -2,6 +2,7 @@ import { BasicPageParams } from '../model/baseModel';
 import {
   GetModelTslParams,
   ImportModelOfMatterType,
+  ModelOfMatterItemRecordType,
   ModelOfMatterParams,
 } from './model/modelOfMatterModel';
 import { defHttp } from '/@/utils/http/axios';
@@ -36,7 +37,7 @@ export const getModelList = (
     id?: string;
   }
 ) => {
-  return defHttp.get({
+  return defHttp.get<ModelOfMatterItemRecordType[]>({
     url: `${ModelOfMatter.LIST}`,
     params,
   });

@@ -68,21 +68,18 @@
               <Button v-if="isShowBtn" class="!bg-gray-200" type="text" @click="handleReturn">
                 返回
               </Button>
-              <Authority :value="[ModelOfMatterPermission.DELETE, ModelCategoryPermission.DELETE]">
+              <Authority
+                v-if="isShowBtn"
+                :value="[ModelOfMatterPermission.DELETE, ModelCategoryPermission.DELETE]"
+              >
                 <Popconfirm
                   title="您确定要批量删除数据"
                   ok-text="确定"
                   cancel-text="取消"
-                  @confirm="handleDeleteOrBatchDelete(null)"
+                  @confirm="handleDeleteOrBatchDelete()"
+                  :disabled="getHasBatchDelete"
                 >
-                  <Button
-                    style="display: none"
-                    type="primary"
-                    color="error"
-                    :disabled="hasBatchDelete"
-                  >
-                    批量删除
-                  </Button>
+                  <Button type="primary" danger :disabled="getHasBatchDelete"> 批量删除 </Button>
                 </Popconfirm>
               </Authority>
             </div>
@@ -120,11 +117,7 @@
         />
       </template>
     </BasicTable>
-    <PhysicalModelModal
-      :record="$props.record"
-      @register="registerModal"
-      @success="handleSuccess"
-    />
+    <PhysicalModelModal :record="$props.record" @register="registerModal" @success="reload" />
     <PhysicalModelTsl :record="$props.record" @register="registerModalTsl" />
     <SelectImport
       :record="$props.record"
@@ -142,7 +135,6 @@
     ModelCategoryPermission,
     physicalColumn,
   } from '../device.profile.data';
-  import { useBatchDelete } from '/@/hooks/web/useBatchDelete';
   import { Authority } from '/@/components/Authority';
   import PhysicalModelModal from './cpns/physical/PhysicalModelModal.vue';
   import PhysicalModelTsl from './cpns/physical/PhysicalModelTsl.vue';
@@ -156,8 +148,11 @@
     releaseModel,
   } from '/@/api/device/modelOfMatter';
   import { OpenModelOfMatterModelParams, OpenModelMode } from './cpns/physical/types';
-  import { ModelOfMatterParams } from '/@/api/device/model/modelOfMatterModel';
-  import { ref, unref } from 'vue';
+  import {
+    ModelOfMatterItemRecordType,
+    ModelOfMatterParams,
+  } from '/@/api/device/model/modelOfMatterModel';
+  import { computed, ref, unref } from 'vue';
   import { isObject } from '/@/utils/is';
   import { useRole } from '/@/hooks/business/useRole';
   import { ExportModelCategory } from '/@/api/device/modelOfMatter';
@@ -177,50 +172,45 @@
   const [registerModalTsl, { openModal: openModalTsl }] = useModal();
   const [registerModalSelect, { openModal: openModalSelect }] = useModal();
 
-  const [registerTable, { reload, setProps }] = useTable({
-    api: async (params: Record<'page' | 'pageSize', number>) => {
-      return await getModelList({
-        ...params,
-        id: props.record.id,
-        selectType: props.record.ifShowClass ? 'category' : undefined,
-      });
-    },
-    columns: props.record.ifShowClass
-      ? physicalColumn.filter((item) => item.dataIndex !== 'status')
-      : physicalColumn,
-    showIndexColumn: false,
-    clickToRowSelect: false,
-    showTableSetting: true,
-    bordered: true,
-    useSearchForm: true,
-    formConfig: {
-      schemas: modelOfMatterForm,
-      labelWidth: 120,
-    },
-    actionColumn: {
-      width: 200,
-      title: '操作',
-      dataIndex: 'action',
-      slots: { customRender: 'action' },
-      fixed: 'right',
-    },
-  });
-
-  // 刷新
-  const handleSuccess = () => {
-    reload();
-  };
-  const { hasBatchDelete, handleDeleteOrBatchDelete, selectionOptions } = useBatchDelete(
-    props.record.ifShowClass && (unref(isPlatformAdmin) || unref(isSysadmin))
-      ? deleteModelCategory
-      : deleteModel,
-    handleSuccess,
-    setProps
-  );
+  const [registerTable, { reload, getSelectRowKeys, getRowSelection, clearSelectedRowKeys }] =
+    useTable({
+      api: async (params: Record<'page' | 'pageSize', number>) => {
+        return await getModelList({
+          ...params,
+          id: props.record.id,
+          selectType: props.record.ifShowClass ? 'category' : undefined,
+        });
+      },
+      columns: props.record.ifShowClass
+        ? physicalColumn.filter((item) => item.dataIndex !== 'status')
+        : physicalColumn,
+      showIndexColumn: false,
+      clickToRowSelect: false,
+      showTableSetting: true,
+      bordered: true,
+      useSearchForm: true,
+      rowKey: 'id',
+      formConfig: {
+        schemas: modelOfMatterForm,
+        labelWidth: 120,
+      },
+      actionColumn: {
+        width: 200,
+        title: '操作',
+        dataIndex: 'action',
+        slots: { customRender: 'action' },
+        fixed: 'right',
+      },
+      rowSelection: {
+        getCheckboxProps: (record: ModelOfMatterItemRecordType) => {
+          return {
+            disabled: record.status === 1,
+          };
+        },
+      },
+    });
 
-  selectionOptions.rowSelection.getCheckboxProps = (record: Recordable) => {
-    return { disabled: record.status === 1 };
-  };
+  const getHasBatchDelete = computed(() => !getRowSelection().selectedRowKeys?.length);
 
   const handleViewDetail = (record: ModelOfMatterParams) => {
     if (record) {
@@ -245,6 +235,19 @@
     }
   };
 
+  const handleDeleteOrBatchDelete = async (record?: ModelOfMatterItemRecordType) => {
+    const deleteFn =
+      props.record.ifShowClass && (unref(isPlatformAdmin) || unref(isSysadmin))
+        ? deleteModelCategory
+        : deleteModel;
+
+    const ids = record ? [record.id] : getSelectRowKeys();
+    await deleteFn(ids);
+    createMessage.success('删除成功');
+    clearSelectedRowKeys();
+    reload();
+  };
+
   const handleOpenTsl = () => {
     openModalTsl(true, {
       isUpdate: true,