Merge branch 'fix/rule-chain-export' into 'main_dev'

fix: 修复规则链导出问题和分页问题

See merge request yunteng/thingskit-front!906

-<template>
-  <div>属性</div>
-</template>
-
-<script setup lang="ts"></script>
-
-<style lang="less" scoped></style>

-<template>
-  <div>警告</div>
-</template>
-
-<script setup lang="ts"></script>
-
-<style lang="less" scoped></style>

-import ChainDetailDrawer from './index.vue';
-export { ChainDetailDrawer };

-<template>
-  <BasicDrawer
-    v-bind="$attrs"
-    isDetail
-    @register="register"
-    destroyOnClose
-    @close="closeDrawer"
-    :title="deviceDetail.alias || deviceDetail.name"
-    width="80%"
-  >
-    <Tabs v-model:activeKey="activeKey" :size="size">
-      <TabPane key="1" tab="详情">
-        <div>详情</div>
-      </TabPane>
-      <TabPane key="2" tab="属性">
-        <Attribute />
-      </TabPane>
-      <TabPane key="3" tab="最新遥测数据"><div>最新遥测数据</div></TabPane>
-      <TabPane key="4" tab="警告">
-        <div>警告</div>
-      </TabPane>
-      <TabPane key="5" tab="事件">
-        <div>事件</div>
-      </TabPane>
-      <!-- 网关设备并且场家是TBox -->
-      <TabPane key="6" tab="关联">
-        <div>关联</div>
-      </TabPane>
-      <!-- 网关设备并且是TBox -->
-
-      <TabPane key="7" tab="审计日志">
-        <div>审计日志</div>
-      </TabPane>
-    </Tabs>
-  </BasicDrawer>
-</template>
-<script lang="ts" setup>
-  import { ref } from 'vue';
-  import { BasicDrawer, useDrawerInner } from '/@/components/Drawer';
-
-  import { Tabs, TabPane } from 'ant-design-vue';
-  import { DeviceRecord } from '/@/api/device/model/deviceModel';
-
-  import Attribute from './component/Attribute.vue';
-
-  // defineProps({});
-
-  // defineEmits([]);
-
-  const activeKey = ref('1');
-  const size = ref('small');
-  const deviceDetail = ref<DeviceRecord>({} as unknown as DeviceRecord);
-  // 详情回显
-  const [register] = useDrawerInner(async (data) => {
-    console.log(data, 'data');
-  });
-  const closeDrawer = () => {
-    activeKey.value = '1';
-  };
-</script>

@@ -5,7 +5,7 @@
         <Authority>
         <Authority>
           <a-button type="primary" @click="handleAdd"> 新增规则链 </a-button>
           <a-button type="primary" @click="handleAdd"> 新增规则链 </a-button>
         </Authority>
         </Authority>
-        <Upload :show-upload-list="false" :customRequest="handleImport">
+        <Upload :show-upload-list="false" accept=".json," :customRequest="handleImport">
           <Button type="primary" :loading="importLoading"> 导入规则链 </Button>
           <Button type="primary" :loading="importLoading"> 导入规则链 </Button>
         </Upload>
         </Upload>
         <Authority>
         <Authority>
@@ -64,7 +64,7 @@
               ifShow: !record.root,
               ifShow: !record.root,
               popConfirm: {
               popConfirm: {
                 title: '是否确认删除',
                 title: '是否确认删除',
-                confirm: handleDeleteOrBatchDelete.bind(null, record),
+                confirm: handleDeleteOrBatchDelete.bind(null, record.id.id),
               },
               },
             },
             },
           ]"
           ]"
@@ -113,7 +113,7 @@
 
 
   const isEmptyObject = (value: any) => isObject(value) && !Object.keys(value).length;
   const isEmptyObject = (value: any) => isObject(value) && !Object.keys(value).length;
   const importLoading = ref<boolean>(false);
   const importLoading = ref<boolean>(false);
-  const hasBatchDelete = ref<boolean>(false);
+  const hasBatchDelete = ref<boolean>(true);
 
 
   const beforeFetch = (params) => {
   const beforeFetch = (params) => {
     Reflect.set(params, 'page', params.page - 1);
     Reflect.set(params, 'page', params.page - 1);
@@ -148,8 +148,11 @@
       labelWidth: 120,
       labelWidth: 120,
       schemas: searchFormSchema,
       schemas: searchFormSchema,
     },
     },
+    resizeHeightOffset: 40,
+    canResize: true,
     fetchSetting: {
     fetchSetting: {
       pageField: 'page',
       pageField: 'page',
+      totalField: 'totalElements',
       listField: 'data',
       listField: 'data',
     },
     },
     beforeFetch: (params) => beforeFetch(params),
     beforeFetch: (params) => beforeFetch(params),
@@ -208,6 +211,7 @@
         });
         });
         const { ruleChain, metadata } = data as any;
         const { ruleChain, metadata } = data as any;
 
 
+        // 创建规则链
         const value = await createRuleChine(ruleChain);
         const value = await createRuleChine(ruleChain);
         const { id } = value;
         const { id } = value;
 
 
@@ -215,6 +219,7 @@
           ruleChainId: id,
           ruleChainId: id,
           ...metadata,
           ...metadata,
         };
         };
+        // 导入规则链详情nodes的东西
         const rules = await importRuleChine(values);
         const rules = await importRuleChine(values);
 
 
         rules
         rules
@@ -239,9 +244,17 @@
     const { firstNodeIndex, nodes, connections, ruleChainConnections } = await exportRuleChine(
     const { firstNodeIndex, nodes, connections, ruleChainConnections } = await exportRuleChine(
       record.id.id
       record.id.id
     );
     );
+
+    const node = nodes.map((item) => {
+      return {
+        ...item,
+        id: undefined,
+        ruleChainId: undefined,
+      };
+    });
     const value = {
     const value = {
       ruleChain: { additionalInfo, name, type, firstRuleNodeId, root, debugMode, configuration },
       ruleChain: { additionalInfo, name, type, firstRuleNodeId, root, debugMode, configuration },
-      metadata: { firstNodeIndex, nodes, connections, ruleChainConnections },
+      metadata: { firstNodeIndex, nodes: node, connections, ruleChainConnections },
     };
     };
     exportJSONFile(value, name);
     exportJSONFile(value, name);
   };
   };
@@ -257,26 +270,25 @@
       setProps({
       setProps({
         loading: false,
         loading: false,
       });
       });
+      reload();
     }
     }
-    reload();
   };
   };
 
 
-  const handleDeleteOrBatchDelete = async (record: Recordable | null) => {
+  const handleDeleteOrBatchDelete = async (id: string | null) => {
     setProps({
     setProps({
       loading: true,
       loading: true,
     });
     });
     try {
     try {
-      if (!record) {
+      if (!id) {
         const ids = getSelectRowKeys();
         const ids = getSelectRowKeys();
         await Promise.all(ids.map((item) => deleteRuleChine(item)));
         await Promise.all(ids.map((item) => deleteRuleChine(item)));
         return;
         return;
       }
       }
-      await deleteRuleChine(record.id.id);
+      await deleteRuleChine(id);
     } finally {
     } finally {
       setProps({
       setProps({
         loading: false,
         loading: false,
       });
       });
-
       createMessage.success('删除成功');
       createMessage.success('删除成功');
       clearSelectedRowKeys();
       clearSelectedRowKeys();
       reload();
       reload();

@@ -143,7 +143,7 @@
     }
     }
     if (predicateIsRequired) return createMessage.error('请填写条件筛选');
     if (predicateIsRequired) return createMessage.error('请填写条件筛选');
     //TODO-fengtao-设备、属性、条件筛选验证
     //TODO-fengtao-设备、属性、条件筛选验证
-    return { ...getFieldsValue(), predicate, schedule: alarmScheduleRef.value.scheduleData };
+    return { ...getFieldsValue(), predicate, schedule: alarmScheduleRef.value?.scheduleData };
   };
   };
 
 
   //TODO-fengtao
   //TODO-fengtao