Merge branch 'ft' into 'main'

fix:[DEFECT-312,DEFECT-317,DEFECT-319,DEFECT-311],fix:修复设备分配删除问题，转换脚本启用删除问题，消息模板启用时删除问题，设备配置删除缓存问题

See merge request huang/yun-teng-iot-front!187

@@ -74,7 +74,7 @@ export const deviceConfigDelete = (ids: string[]) => {
   return defHttp.delete({
     url: EDeviceConfigApi.DEVICE_CONFIG_DELETE,
     data: {
-      ids: ids,
+      ids,
     },
   });
 };

@@ -7,9 +7,9 @@
         ref="organizationIdTreeRef"
       />
       <BasicTable
-        @selection-change="useSelectionChange"
         @register="registerTable"
         :searchInfo="searchInfo"
+        @selection-change="useSelectionChange"
         :rowSelection="{ type: 'checkbox' }"
         class="w-3/4 xl:w-4/5"
       >
@@ -95,7 +95,7 @@
       const searchInfo = reactive<Recordable>({});
       const { organizationIdTreeRef, resetFn } = useResetOrganizationTree(searchInfo);
       // 表格hooks
-      const [registerTable, { reload, getSelectRows }] = useTable({
+      const [registerTable, { reload, getSelectRows, getSelectRowKeys }] = useTable({
         title: '告警配置列表',
         api: queryAlarmConfig,
         columns,
@@ -140,6 +140,10 @@
         }
       };
       const useSelectionChange = () => {
+        selectArray = getSelectRowKeys();
+        if (selectArray.length > 0) {
+          hasBatchDelete.value = false;
+        }
         let getRows = getSelectRows();
         const isJudge = getRows.map((m) => m.status);
         if (isJudge.length === 0) {
@@ -152,7 +156,6 @@
         } else if (!isJudge.includes(1) && isJudge.includes(0)) {
           hasBatchDelete.value = false;
         }
-        selectArray = getRows.filter((f) => f.status !== 1).map((m) => m.id);
       };
       // 删除或批量删除
       const handleDeleteOrBatchDelete = async (record: Recordable | null) => {

@@ -6,14 +6,19 @@
         @select="handleSelect"
         ref="organizationIdTreeRef"
       />
-      <BasicTable @register="registerTable" class="w-5/6 xl:w-4/5">
+      <BasicTable
+        @selection-change="useSelectionChange"
+        :rowSelection="{ type: 'checkbox' }"
+        @register="registerTable"
+        class="w-5/6 xl:w-4/5"
+      >
         <template #toolbar>
           <a-button type="primary" @click="handleCreate" v-if="authBtn(role)"> 新增设备 </a-button>
           <a-button
             color="error"
             v-if="authBtn(role)"
             @click="handleDeleteOrBatchDelete(null)"
-            :disabled="hasBatchDelete"
+            :disabled="disabled"
           >
             批量删除
           </a-button>
@@ -121,7 +126,7 @@
   </div>
 </template>
 <script lang="ts">
-  import { defineComponent, reactive } from 'vue';
+  import { defineComponent, reactive, ref } from 'vue';
   import { DeviceState, DeviceTypeEnum } from '/@/api/device/model/deviceModel';
   import { BasicTable, useTable, TableAction, TableImg } from '/@/components/Table';
   import { columns, searchFormSchema } from './config/device.data';
@@ -137,16 +142,14 @@
   import { PageWrapper } from '/@/components/Page';
   import { useModal } from '/@/components/Modal';
   import { OrganizationIdTree, useResetOrganizationTree } from '/@/views/common/organizationIdTree';
-
   import DeviceModal from './cpns/modal/DeviceModal.vue';
   import { useDrawer } from '/@/components/Drawer';
   import DeviceDetailDrawer from './cpns/modal/DeviceDetailDrawer.vue';
   import CustomerModal from './cpns/modal/CustomerModal.vue';
-
+  import { useMessage } from '/@/hooks/web/useMessage';
   import { USER_INFO_KEY } from '/@/enums/cacheEnum';
   import { getAuthCache } from '/@/utils/auth';
   import { authBtn } from '/@/enums/roleEnum';
-  import { useBatchDelete } from '/@/hooks/web/useBatchDelete';
 
   export default defineComponent({
     name: 'DeviceManagement',
@@ -162,17 +165,16 @@
       TableImg,
     },
     setup(_) {
+      const { createMessage } = useMessage();
+      let selectedRowKeys: any = [];
+      const disabled = ref(true);
       const go = useGo();
-      const { hasBatchDelete, handleDeleteOrBatchDelete, selectionOptions } = useBatchDelete(
-        deleteDevice,
-        handleSuccess
-      );
       const searchInfo = reactive<Recordable>({});
       const { organizationIdTreeRef, resetFn } = useResetOrganizationTree(searchInfo);
       const [registerModal, { openModal }] = useModal();
       const [registerCustomerModal, { openModal: openCustomerModal }] = useModal();
       const [registerDetailDrawer, { openDrawer }] = useDrawer();
-      const [registerTable, { reload }] = useTable({
+      const [registerTable, { reload, getSelectRows, getSelectRowKeys }] = useTable({
         title: '设备列表',
         api: devicePage,
         columns,
@@ -185,6 +187,7 @@
         showTableSetting: true,
         bordered: true,
         showIndexColumn: false,
+        rowKey: 'id',
         searchInfo: searchInfo,
         actionColumn: {
           width: 300,
@@ -192,7 +195,6 @@
           slots: { customRender: 'action' },
           fixed: 'right',
         },
-        ...selectionOptions,
       });
 
       const userInfo: any = getAuthCache(USER_INFO_KEY);
@@ -241,6 +243,44 @@
       function goDeviceProfile(e) {
         go(PageEnum.DEVICE_PROFILE + '?name=' + String(e));
       }
+      const useSelectionChange = () => {
+        selectedRowKeys = getSelectRowKeys();
+        if (selectedRowKeys.length > 0) {
+          disabled.value = false;
+        }
+        const isJudge = getSelectRows().map((m) => {
+          return {
+            status: m.customerId,
+            id: m.id,
+          };
+        });
+        isJudge.some((s) => {
+          if (s.status != undefined) {
+            disabled.value = true;
+          }
+        });
+      };
+      // 删除或批量删除
+      const handleDeleteOrBatchDelete = async (record: Recordable | null) => {
+        if (record) {
+          try {
+            await deleteDevice([record.id]);
+            createMessage.success('删除成功');
+            handleSuccess();
+          } catch (e: any) {}
+        } else {
+          try {
+            await deleteDevice(selectedRowKeys);
+            createMessage.success('批量删除成功');
+            handleSuccess();
+            selectedRowKeys.length = 0;
+          } catch (e: any) {
+            selectedRowKeys.length = 0;
+          } finally {
+            selectedRowKeys.length = 0;
+          }
+        }
+      };
 
       return {
         registerTable,
@@ -262,7 +302,8 @@
         authBtn,
         role,
         handleDeleteOrBatchDelete,
-        hasBatchDelete,
+        disabled,
+        useSelectionChange,
       };
     },
   });

@@ -2,8 +2,8 @@
   <div>
     <BasicTable
       class="devide-profiles"
-      @selection-change="useSelectionChange"
       @register="registerTable"
+      @selection-change="useSelectionChange"
       :rowSelection="{ type: 'checkbox' }"
     >
       <template #toolbar>
@@ -74,7 +74,7 @@
   </div>
 </template>
 <script lang="ts">
-  import { defineComponent, ref, nextTick, onUnmounted, reactive } from 'vue';
+  import { defineComponent, ref, nextTick, onUnmounted } from 'vue';
   import { BasicTable, TableImg, useTable, TableAction, BasicColumn } from '/@/components/Table';
   import { columns, searchFormSchema } from './device.profile.data';
   import { useMessage } from '/@/hooks/web/useMessage';
@@ -92,8 +92,8 @@
     name: 'DeviceProfileManagement',
     components: { BasicTable, DeviceProfileModal, TableAction, ImpExcel, TableImg },
     setup() {
+      let selectedRowKeys: any = [];
       const deviceDetailRef = ref(null);
-      let selectedRowKeys: any = reactive([]);
       const getPathUrl = ref('');
       const getPathUrlName = ref('');
       const disabled = ref(true);
@@ -103,29 +103,30 @@
       const { createMessage } = useMessage();
       const [registerModal, { openModal }] = useModal();
       const [registerModalDetail] = useModal();
-      const [registerTable, { reload, getSelectRows, setTableData, getForm }] = useTable({
-        title: '设备配置列表',
-        clickToRowSelect: false,
-        api: deviceConfigGetQuery,
-        immediate: immediateStatus.value,
-        columns,
-        formConfig: {
-          labelWidth: 120,
-          schemas: searchFormSchema,
-        },
-        rowKey: 'id',
-        useSearchForm: true,
-        showTableSetting: true,
-        bordered: true,
-        showIndexColumn: false,
-        actionColumn: {
-          width: 240,
-          title: '操作',
-          dataIndex: 'action',
-          slots: { customRender: 'action' },
-          fixed: 'right',
-        },
-      });
+      const [registerTable, { reload, getSelectRows, setTableData, getForm, getSelectRowKeys }] =
+        useTable({
+          title: '设备配置列表',
+          clickToRowSelect: false,
+          api: deviceConfigGetQuery,
+          immediate: immediateStatus.value,
+          columns,
+          formConfig: {
+            labelWidth: 120,
+            schemas: searchFormSchema,
+          },
+          rowKey: 'id',
+          useSearchForm: true,
+          showTableSetting: true,
+          bordered: true,
+          showIndexColumn: false,
+          actionColumn: {
+            width: 240,
+            title: '操作',
+            dataIndex: 'action',
+            slots: { customRender: 'action' },
+            fixed: 'right',
+          },
+        });
 
       /**
        *@param url,name
@@ -227,8 +228,11 @@
         }, 10);
       }
       const useSelectionChange = () => {
-        let getRows = getSelectRows();
-        const isJudge = getRows.map((m) => m.default);
+        selectedRowKeys = getSelectRowKeys();
+        if (selectedRowKeys.length > 0) {
+          disabled.value = false;
+        }
+        const isJudge = getSelectRows().map((m) => m.default);
         if (isJudge.includes(true)) {
           disabled.value = true;
         } else {
@@ -237,19 +241,18 @@
         if (isJudge.length === 0) {
           disabled.value = true;
         }
-        selectedRowKeys.length = 0;
-        selectedRowKeys = getRows.filter((f) => f.default !== true).map((m) => m.id);
       };
       const handleTableDel = () => {
         deviceConfigDelete(selectedRowKeys)
-          .then((res) => {
-            createMessage.success('删除成功');
-            selectedRowKeys.length = 0;
+          .then(() => {
+            createMessage.success('删除设备配置成功');
             handleSuccess();
+            selectedRowKeys.length = 0;
           })
-          .catch((e) => {
+          .catch(() => {
             selectedRowKeys.length = 0;
           });
+        selectedRowKeys.length = 0;
       };
 
       function handleDelete(record: Recordable) {

 <template>
   <div>
-    <BasicTable @register="registerTable">
+    <BasicTable
+      @selection-change="useSelectionChange"
+      :rowSelection="{ type: 'checkbox' }"
+      @register="registerTable"
+    >
       <template #toolbar>
         <a-button type="primary" @click="handleCreate"> 新增消息配置 </a-button>
-        <a-button color="error" @click="handleDeleteOrBatchDelete(null)" :disabled="hasBatchDelete">
+        <a-button color="error" @click="handleDeleteOrBatchDelete(null)" :disabled="disabled">
           批量删除
         </a-button>
       </template>
@@ -36,8 +40,7 @@
   </div>
 </template>
 <script lang="ts">
-  import { defineComponent, h } from 'vue';
-
+  import { defineComponent, h, ref } from 'vue';
   import { BasicTable, useTable, TableAction } from '/@/components/Table';
   import { messageConfigPage, deleteMessageConfig } from '/@/api/message/config';
   import { useDrawer } from '/@/components/Drawer';
@@ -45,17 +48,18 @@
   import { columns, searchFormSchema } from './config.data';
   import { Modal } from 'ant-design-vue';
   import { JsonPreview } from '/@/components/CodeEditor';
-  import { useBatchDelete } from '/@/hooks/web/useBatchDelete';
+  import { useMessage } from '/@/hooks/web/useMessage';
+
   export default defineComponent({
     name: 'MessageConfigManagement',
     components: { BasicTable, ConfigDrawer, TableAction },
     setup() {
+      let selectedRowKeys: any = [];
+      const disabled = ref(true);
+      const { createMessage } = useMessage();
+
       const [registerDrawer, { openDrawer }] = useDrawer();
-      const { hasBatchDelete, handleDeleteOrBatchDelete, selectionOptions } = useBatchDelete(
-        deleteMessageConfig,
-        handleSuccess
-      );
-      const [registerTable, { reload }] = useTable({
+      const [registerTable, { reload, getSelectRows, getSelectRowKeys }] = useTable({
         title: '消息配置列表',
         api: messageConfigPage,
         columns,
@@ -64,6 +68,7 @@
           schemas: searchFormSchema,
         },
         useSearchForm: true,
+        rowKey: 'id',
         showTableSetting: true,
         bordered: true,
         showIndexColumn: false,
@@ -74,7 +79,6 @@
           slots: { customRender: 'action' },
           fixed: 'right',
         },
-        ...selectionOptions,
       });
 
       function handleCreate() {
@@ -100,6 +104,43 @@
           content: h(JsonPreview, { data: JSON.parse(JSON.stringify(record.config)) }),
         });
       }
+
+      const useSelectionChange = () => {
+        selectedRowKeys = getSelectRowKeys();
+        if (selectedRowKeys.length > 0) {
+          disabled.value = false;
+        }
+        const isJudge = getSelectRows().map((m) => m.status);
+        if (isJudge.includes(1)) {
+          disabled.value = true;
+        } else {
+          disabled.value = false;
+        }
+        if (isJudge.length === 0) {
+          disabled.value = true;
+        }
+      };
+      // 删除或批量删除
+      const handleDeleteOrBatchDelete = async (record: Recordable | null) => {
+        if (record) {
+          try {
+            await deleteMessageConfig([record.id]);
+            createMessage.success('删除成功');
+            handleSuccess();
+          } catch (e: any) {}
+        } else {
+          try {
+            await deleteMessageConfig(selectedRowKeys);
+            createMessage.success('批量删除成功');
+            handleSuccess();
+            selectedRowKeys.length = 0;
+          } catch (e: any) {
+            selectedRowKeys.length = 0;
+          } finally {
+            selectedRowKeys.length = 0;
+          }
+        }
+      };
       return {
         registerTable,
         registerDrawer,
@@ -107,8 +148,9 @@
         handleCreate,
         handleEdit,
         handleSuccess,
-        hasBatchDelete,
+        disabled,
         handleDeleteOrBatchDelete,
+        useSelectionChange,
       };
     },
   });

 <template>
   <div>
-    <BasicTable @register="registerTable" v-show="isStatus === 0">
+    <BasicTable
+      @selection-change="useSelectionChange"
+      :rowSelection="{ type: 'checkbox' }"
+      @register="registerTable"
+      v-show="isStatus === 0"
+    >
       <template #toolbar>
         <a-button type="primary" @click="handleCreate"> 新增转换脚本 </a-button>
-        <a-button color="error" @click="handleDeleteOrBatchDelete(null)" :disabled="hasBatchDelete">
+        <a-button color="error" @click="handleDeleteOrBatchDelete(null)" :disabled="disabled">
           批量删除
         </a-button>
       </template>
@@ -43,20 +48,20 @@
 <script lang="ts" setup>
   import { ref } from 'vue';
   import { BasicTable, useTable, TableAction } from '/@/components/Table';
-  import { columns, searchFormSchema } from './config/config.data.ts';
+  import { columns, searchFormSchema } from './config/config.data';
   import { getConvertApi, deleteTransformApi } from '/@/api/device/TransformScriptApi';
-  import { useBatchDelete } from '/@/hooks/web/useBatchDelete';
   import { useDrawer } from '/@/components/Drawer/index';
   import ScriptDrawer from './cpns/ScriptDrawer.vue';
   import TestScript from './cpns/TestScript.vue';
+  import { useMessage } from '/@/hooks/web/useMessage';
+
   const handleSuccess = () => {
     reload();
   };
-  const { hasBatchDelete, handleDeleteOrBatchDelete, selectionOptions } = useBatchDelete(
-    deleteTransformApi,
-    handleSuccess
-  );
-  const [registerTable, { reload }] = useTable({
+  const { createMessage } = useMessage();
+  let selectedRowKeys: any = [];
+  const disabled = ref(true);
+  const [registerTable, { reload, getSelectRowKeys, getSelectRows }] = useTable({
     api: getConvertApi,
     title: '转换脚本列表',
     columns,
@@ -68,6 +73,7 @@
       labelWidth: 100,
       schemas: searchFormSchema,
     },
+    rowKey: 'id',
     actionColumn: {
       width: 180,
       title: '操作',
@@ -75,9 +81,8 @@
       slots: { customRender: 'action' },
       fixed: 'right',
     },
-    ...selectionOptions,
   });
-  const [registerDrawer, { openDrawer }] = useDrawer({});
+  const [registerDrawer, { openDrawer }] = useDrawer();
 
   const isStatus = ref(0);
   const testScriptRef = ref();
@@ -102,4 +107,39 @@
   const handleEdit = (record: Recordable) => {
     openDrawer(true, { isUpdate: true, record });
   };
+  const useSelectionChange = () => {
+    selectedRowKeys = getSelectRowKeys();
+    if (selectedRowKeys.length > 0) {
+      disabled.value = false;
+    }
+    let getRows = getSelectRows();
+    const isJudge = getRows.map((m) => m.status);
+    if (isJudge.length === 0) {
+      disabled.value = true;
+    }
+    if (isJudge.includes(1)) {
+      disabled.value = true;
+    }
+  };
+  // 删除或批量删除
+  const handleDeleteOrBatchDelete = async (record: Recordable | null) => {
+    if (record) {
+      try {
+        await deleteTransformApi([record.id]);
+        createMessage.success('删除成功');
+        handleSuccess();
+      } catch (e: any) {}
+    } else {
+      try {
+        await deleteTransformApi(selectedRowKeys);
+        createMessage.success('批量删除成功');
+        handleSuccess();
+        selectedRowKeys.length = 0;
+      } catch (e: any) {
+        selectedRowKeys.length = 0;
+      } finally {
+        selectedRowKeys.length = 0;
+      }
+    }
+  };
 </script>