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

fix: 修改看板控制组件和teambition上DEFECT-1560

See merge request yunteng/thingskit-front!856

@@ -12,11 +12,11 @@ export const getDeviceProfile = (deviceType?: string) => {
 };
 };
 
 
 // 获取历史数据
 // 获取历史数据
-export const getDeviceHistoryInfo = (params: Recordable, orderBy) => {
+export const getDeviceHistoryInfo = (params: Recordable, orderBy?: string) => {
   return defHttp.get<HistoryData>(
   return defHttp.get<HistoryData>(
     {
     {
       url: `/plugins/telemetry/DEVICE/${params.entityId}/values/timeseries`,
       url: `/plugins/telemetry/DEVICE/${params.entityId}/values/timeseries`,
-      params: { ...params, entityId: null, orderBy },
+      params: { ...params, entityId: null, orderBy: orderBy || 'DESC' },
     },
     },
     {
     {
       joinPrefix: false,
       joinPrefix: false,

@@ -52,6 +52,7 @@ export function useBatchDelete(
       if (record) {
       if (record) {
         await deleteFn([record.id]);
         await deleteFn([record.id]);
         createMessage.success('删除成功');
         createMessage.success('删除成功');
+        selectedRowIds.value = [];
       } else {
       } else {
         await deleteFn(selectedRowIds.value);
         await deleteFn(selectedRowIds.value);
         createMessage.success('批量删除成功');
         createMessage.success('批量删除成功');

@@ -116,7 +116,7 @@
       const { organizationIdTreeRef, resetFn } = useResetOrganizationTree(searchInfo);
       const { organizationIdTreeRef, resetFn } = useResetOrganizationTree(searchInfo);
       const [registerModal, { openModal }] = useModal();
       const [registerModal, { openModal }] = useModal();
       // 表格hooks
       // 表格hooks
-      const [registerTable, { reload, setProps }] = useTable({
+      const [registerTable, { reload, setProps, clearSelectedRowKeys }] = useTable({
         title: '视频列表',
         title: '视频列表',
         api: cameraPage,
         api: cameraPage,
         columns,
         columns,
@@ -145,6 +145,7 @@
       // 刷新
       // 刷新
       const handleSuccess = () => {
       const handleSuccess = () => {
         reload();
         reload();
+        clearSelectedRowKeys();
       };
       };
       const { hasBatchDelete, handleDeleteOrBatchDelete, selectionOptions } = useBatchDelete(
       const { hasBatchDelete, handleDeleteOrBatchDelete, selectionOptions } = useBatchDelete(
         deleteCameraManage,
         deleteCameraManage,

@@ -7,7 +7,7 @@ import { JSONEditor } from '/@/components/CodeEditor';
 import { DeviceTypeEnum } from '/@/api/device/model/deviceModel';
 import { DeviceTypeEnum } from '/@/api/device/model/deviceModel';
 import { getModelServices } from '/@/api/device/modelOfMatter';
 import { getModelServices } from '/@/api/device/modelOfMatter';
 import { ModelOfMatterParams } from '/@/api/device/model/modelOfMatterModel';
 import { ModelOfMatterParams } from '/@/api/device/model/modelOfMatterModel';
-import { toRaw, unref } from 'vue';
+import { nextTick, toRaw, unref } from 'vue';
 import ObjectModelValidateForm from '/@/components/Form/src/externalCompns/components/ObjectModelValidateForm/ObjectModelValidateForm.vue';
 import ObjectModelValidateForm from '/@/components/Form/src/externalCompns/components/ObjectModelValidateForm/ObjectModelValidateForm.vue';
 import { CommandDeliveryWayEnum, ServiceCallTypeEnum } from '/@/enums/toolEnum';
 import { CommandDeliveryWayEnum, ServiceCallTypeEnum } from '/@/enums/toolEnum';
 import { TaskTypeEnum } from '/@/views/task/center/config';
 import { TaskTypeEnum } from '/@/views/task/center/config';
@@ -246,8 +246,9 @@ export const step1Schemas: FormSchema[] = [
     required: true,
     required: true,
     component: 'ApiSelect',
     component: 'ApiSelect',
     ifShow: ({ values }) => values.deviceType === 'SENSOR' && values.organizationId,
     ifShow: ({ values }) => values.deviceType === 'SENSOR' && values.organizationId,
-    componentProps: ({ formModel }) => {
+    componentProps: ({ formModel, formActionType }) => {
       const { organizationId, transportType } = formModel;
       const { organizationId, transportType } = formModel;
+      const { validateFields } = formActionType;
       if (![organizationId, transportType].every(Boolean)) return {};
       if (![organizationId, transportType].every(Boolean)) return {};
       return {
       return {
         api: async (params: Recordable) => {
         api: async (params: Recordable) => {
@@ -266,6 +267,10 @@ export const step1Schemas: FormSchema[] = [
         },
         },
         valueField: 'tbDeviceId',
         valueField: 'tbDeviceId',
         labelField: 'alias',
         labelField: 'alias',
+        onChange: async () => {
+          await nextTick();
+          validateFields(['gatewayId']);
+        },
       };
       };
     },
     },
   },
   },

@@ -11,7 +11,7 @@
   import { ColEx } from '/@/components/Form/src/types';
   import { ColEx } from '/@/components/Form/src/types';
   import { useHistoryData } from '../../hook/useHistoryData';
   import { useHistoryData } from '../../hook/useHistoryData';
   import { formatToDateTime } from '/@/utils/dateUtil';
   import { formatToDateTime } from '/@/utils/dateUtil';
-  import { useTable, BasicTable } from '/@/components/Table';
+  import { useTable, BasicTable, BasicColumn } from '/@/components/Table';
   import { DataTypeEnum } from '/@/components/Form/src/externalCompns/components/StructForm/config';
   import { DataTypeEnum } from '/@/components/Form/src/externalCompns/components/StructForm/config';
   import {
   import {
     ModeSwitchButton,
     ModeSwitchButton,
@@ -60,13 +60,9 @@
     }
     }
   }
   }
 
 
-  const [registerTable] = useTable({
-    showIndexColumn: false,
-    showTableSetting: false,
-    dataSource: historyData,
-    maxHeight: 300,
-    size: 'small',
-    columns: [
+  const sortOrder = ref<any>('descend');
+  const columns: BasicColumn[] | any = computed(() => {
+    return [
       {
       {
         title: '属性',
         title: '属性',
         dataIndex: 'name',
         dataIndex: 'name',
@@ -84,18 +80,50 @@
         format: (val) => {
         format: (val) => {
           return formatToDateTime(val, 'YYYY-MM-DD HH:mm:ss');
           return formatToDateTime(val, 'YYYY-MM-DD HH:mm:ss');
         },
         },
-        sorter: 'descend',
+        sorter: true,
+        sortOrder: unref(sortOrder),
+        sortDirections: ['descend', 'ascend', 'descend'],
       },
       },
-    ],
+    ];
+  });
+
+  const [registerTable, { setColumns }] = useTable({
+    showIndexColumn: false,
+    showTableSetting: false,
+    dataSource: historyData,
+    maxHeight: 300,
+    columns: unref(columns),
+    size: 'small',
   });
   });
 
 
-  const handleTableChange = async (pag, filters, sorter: any) => {
-    console.log(pag, filters, sorter, 'pag, filters, sorter');
+  const getTableList = async (orderBy?: string) => {
+    // 表单验证
+    await method.validate();
+    const value = method.getFieldsValue();
+    const searchParams = getSearchParams(value);
+
+    if (!hasDeviceAttr()) return;
+    // 发送请求
+    loading.value = true;
+    const res = await getDeviceHistoryInfo(
+      {
+        ...searchParams,
+        entityId: props.deviceDetail.tbDeviceId,
+      },
+      orderBy
+    );
+    historyData.value = getTableHistoryData(res);
+    loading.value = false;
+  };
+
+  const handleTableChange = async (_pag, _filters, sorter: any) => {
+    sortOrder.value = sorter.order;
+    await setColumns(unref(columns));
     if (sorter.field == 'ts') {
     if (sorter.field == 'ts') {
       if (sorter.order == 'descend') {
       if (sorter.order == 'descend') {
-        openHistoryPanel('ASC');
+        getTableList('DESC');
       } else {
       } else {
-        openHistoryPanel('DESC');
+        getTableList('ASC');
       }
       }
     }
     }
   };
   };
@@ -214,7 +242,7 @@
     setOptions(setChartOptions(res, selectedKeys));
     setOptions(setChartOptions(res, selectedKeys));
   };
   };
 
 
-  const switchMode = (flag: EnumTableChartMode) => {
+  const switchMode = async (flag: EnumTableChartMode) => {
     mode.value = flag;
     mode.value = flag;
   };
   };
 
 

@@ -79,7 +79,6 @@
         debugMode,
         debugMode,
         name,
         name,
       };
       };
-      console.log(value, 'value');
       await createRuleChine(value);
       await createRuleChine(value);
       createMessage.success('编辑成功');
       createMessage.success('编辑成功');
     }
     }

 import { BasicColumn, FormSchema } from '/@/components/Table';
 import { BasicColumn, FormSchema } from '/@/components/Table';
 import { transformTime } from '/@/hooks/web/useDateToLocaleString';
 import { transformTime } from '/@/hooks/web/useDateToLocaleString';
+import { isObject, isString } from '/@/utils/is';
 
 
 export const columns: BasicColumn[] = [
 export const columns: BasicColumn[] = [
   {
   {
@@ -55,6 +56,18 @@ export const exportJSONFile = (value: Recordable, name: string) => {
   URL.revokeObjectURL(objectURL);
   URL.revokeObjectURL(objectURL);
 };
 };
 
 
+export const paseJSON = (string: string) => {
+  let data = null;
+  let flag = false;
+  try {
+    if (!isString(string)) return { flag: false, data };
+    data = JSON.parse(string);
+    flag = true;
+    if (!isObject(data)) flag = false;
+  } catch (error) {}
+  return { flag, data };
+};
+
 export enum RuleChainPermisssion {
 export enum RuleChainPermisssion {
   DETAIL = 'rule:chain:detail',
   DETAIL = 'rule:chain:detail',
 }
 }

@@ -8,7 +8,7 @@
         <Upload :show-upload-list="false" :customRequest="handleImport">
         <Upload :show-upload-list="false" :customRequest="handleImport">
           <Button type="primary" :loading="importLoading"> 导入规则链 </Button>
           <Button type="primary" :loading="importLoading"> 导入规则链 </Button>
         </Upload>
         </Upload>
-        <!-- <Authority>
+        <Authority>
           <Popconfirm
           <Popconfirm
             title="您确定要批量删除数据"
             title="您确定要批量删除数据"
             ok-text="确定"
             ok-text="确定"
@@ -17,7 +17,7 @@
           >
           >
             <a-button color="error" :disabled="hasBatchDelete"> 批量删除 </a-button>
             <a-button color="error" :disabled="hasBatchDelete"> 批量删除 </a-button>
           </Popconfirm>
           </Popconfirm>
-        </Authority> -->
+        </Authority>
       </template>
       </template>
       <template #root="{ record }">
       <template #root="{ record }">
         <Tag :color="record.root ? 'green' : 'red'"> {{ record.root ? '是' : '否' }}</Tag>
         <Tag :color="record.root ? 'green' : 'red'"> {{ record.root ? '是' : '否' }}</Tag>
@@ -84,6 +84,7 @@
     encode,
     encode,
     exportJSONFile,
     exportJSONFile,
     searchFormSchema,
     searchFormSchema,
+    paseJSON,
   } from './config/config.data';
   } from './config/config.data';
   import {
   import {
     deleteRuleChine,
     deleteRuleChine,
@@ -95,17 +96,45 @@
   } from '/@/api/ruleengine/ruleengineApi';
   } from '/@/api/ruleengine/ruleengineApi';
   import { useModal } from '/@/components/Modal';
   import { useModal } from '/@/components/Modal';
   import { Authority } from '/@/components/Authority';
   import { Authority } from '/@/components/Authority';
-  import { Tag, Button, Upload } from 'ant-design-vue';
+  import { Tag, Button, Upload, Popconfirm } from 'ant-design-vue';
   import { RuleChainModal } from './component/index';
   import { RuleChainModal } from './component/index';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { usePermission } from '/@/hooks/web/usePermission';
   import { usePermission } from '/@/hooks/web/usePermission';
   import { useRouter } from 'vue-router';
   import { useRouter } from 'vue-router';
   import { ref } from 'vue';
   import { ref } from 'vue';
-  import { isObject, isString } from '/@/utils/is';
+  import { isObject } from '/@/utils/is';
   // import { ChainDetailDrawer } from './chainDetail/index';
   // import { ChainDetailDrawer } from './chainDetail/index';
   // import { useDrawer } from '/@/components/Drawer';
   // import { useDrawer } from '/@/components/Drawer';
 
 
-  const [registerTable, { reload, setProps }] = useTable({
+  const [registerModal, { openModal }] = useModal();
+  const { createMessage } = useMessage();
+  const { hasPermission } = usePermission();
+  const router = useRouter();
+
+  const isEmptyObject = (value: any) => isObject(value) && !Object.keys(value).length;
+  const importLoading = ref<boolean>(false);
+  const hasBatchDelete = ref<boolean>(false);
+
+  const beforeFetch = (params) => {
+    Reflect.set(params, 'page', params.page - 1);
+    Reflect.set(params, 'sortProperty', 'createdTime');
+    Reflect.set(params, 'sortOrder', 'DESC');
+    return params;
+  };
+
+  const rowSelection = () => {
+    return {
+      type: 'checkbox',
+      getCheckboxProps: (record: Recordable) => {
+        return { disabled: record.root };
+      },
+      onChange(rowKeys: string[]) {
+        hasBatchDelete.value = rowKeys.length <= 0;
+      },
+    };
+  };
+
+  const [registerTable, { reload, setProps, getSelectRowKeys, clearSelectedRowKeys }] = useTable({
     title: '规则链库',
     title: '规则链库',
     api: getRuleChinsList,
     api: getRuleChinsList,
     rowKey: (record) => record.id.id,
     rowKey: (record) => record.id.id,
@@ -123,19 +152,8 @@
       pageField: 'page',
       pageField: 'page',
       listField: 'data',
       listField: 'data',
     },
     },
-    beforeFetch(params) {
-      Reflect.set(params, 'page', params.page - 1);
-      Reflect.set(params, 'sortProperty', 'createdTime');
-      Reflect.set(params, 'sortOrder', 'DESC');
-      return params;
-    },
-    rowSelection: {
-      type: 'checkbox',
-      getCheckboxProps: (record: Recordable) => {
-        console.log(record, 'record');
-        return { disabled: record.root };
-      },
-    },
+    beforeFetch: (params) => beforeFetch(params),
+    rowSelection: rowSelection() as any,
     actionColumn: {
     actionColumn: {
       width: 220,
       width: 220,
       title: '操作',
       title: '操作',
@@ -145,10 +163,6 @@
     },
     },
   });
   });
 
 
-  const [registerModal, { openModal }] = useModal();
-
-  // const [registerDrawer, { openDrawer }] = useDrawer();
-
   const handleSuccess = () => {
   const handleSuccess = () => {
     reload();
     reload();
   };
   };
@@ -166,10 +180,6 @@
     });
     });
   };
   };
 
 
-  const { createMessage } = useMessage();
-  const { hasPermission } = usePermission();
-  const router = useRouter();
-
   const handleView = (record: Recordable) => {
   const handleView = (record: Recordable) => {
     const hasDetailPermission = hasPermission(RuleChainPermisssion.DETAIL);
     const hasDetailPermission = hasPermission(RuleChainPermisssion.DETAIL);
     if (hasDetailPermission) {
     if (hasDetailPermission) {
@@ -178,30 +188,6 @@
     } else createMessage.warning('没有权限');
     } else createMessage.warning('没有权限');
   };
   };
 
 
-  // const handleRowClick = (record) => {
-  //   openDrawer(true, { record });
-  //   console.log('点击行', record);
-  // };
-
-  // const handleDetail = (record) => {
-  //   console.log(record, '详情');
-  // };
-
-  const paseJSON = (string: string) => {
-    let data = null;
-    let flag = false;
-    try {
-      if (!isString(string)) return { flag: false, data };
-      data = JSON.parse(string);
-      flag = true;
-      if (!isObject(data)) flag = false;
-    } catch (error) {}
-    return { flag, data };
-  };
-
-  const isEmptyObject = (value: any) => isObject(value) && !Object.keys(value).length;
-
-  const importLoading = ref<boolean>(false);
   const handleImport = (data: { file: File }) => {
   const handleImport = (data: { file: File }) => {
     const fileReader = new FileReader();
     const fileReader = new FileReader();
 
 
@@ -275,18 +261,25 @@
     reload();
     reload();
   };
   };
 
 
-  const handleDeleteOrBatchDelete = async (record: Recordable) => {
+  const handleDeleteOrBatchDelete = async (record: Recordable | null) => {
     setProps({
     setProps({
       loading: true,
       loading: true,
     });
     });
     try {
     try {
+      if (!record) {
+        const ids = getSelectRowKeys();
+        await Promise.all(ids.map((item) => deleteRuleChine(item)));
+        return;
+      }
       await deleteRuleChine(record.id.id);
       await deleteRuleChine(record.id.id);
-      createMessage.success('删除成功');
     } finally {
     } finally {
       setProps({
       setProps({
         loading: false,
         loading: false,
       });
       });
+
+      createMessage.success('删除成功');
+      clearSelectedRowKeys();
+      reload();
     }
     }
-    reload();
   };
   };
 </script>
 </script>

@@ -173,10 +173,12 @@
       const { codeType, customCommand } = unref(getDesign) || {};
       const { codeType, customCommand } = unref(getDesign) || {};
       const { transportType } = customCommand || {};
       const { transportType } = customCommand || {};
       const sendValue = ref<any>(unref(sliderValue));
       const sendValue = ref<any>(unref(sliderValue));
+      const isModbusCommand = ref<boolean>(false);
       if (transportType == 'TCP' && codeType == TaskTypeEnum.MODBUS_RTU) {
       if (transportType == 'TCP' && codeType == TaskTypeEnum.MODBUS_RTU) {
         sendValue.value = await getSendValue(unref(sliderValue));
         sendValue.value = await getSendValue(unref(sliderValue));
+        isModbusCommand.value = true;
       }
       }
-      const flag = await sendCommand(props.config.option, unref(sendValue), true);
+      const flag = await sendCommand(props.config.option, unref(sendValue), unref(isModbusCommand));
       flag
       flag
         ? ((sliderValue.value = unref(sliderValue)),
         ? ((sliderValue.value = unref(sliderValue)),
           (oldSliderValue.value = sliderValue.value),
           (oldSliderValue.value = sliderValue.value),

@@ -159,7 +159,6 @@
   });
   });
 
 
   const resize = async () => {
   const resize = async () => {
-    console.log(123321);
     await nextTick();
     await nextTick();
 
 
     // 修改echarts大小
     // 修改echarts大小