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

fix: 修改看板历史趋势时间排序 mqtt数据流转

See merge request yunteng/thingskit-front!864

@@ -126,7 +126,10 @@
                 password: getDataFlowParams.password ? getDataFlowParams.password : undefined,
                 password: getDataFlowParams.password ? getDataFlowParams.password : undefined,
               }
               }
             : undefined,
             : undefined,
+          appendClientIdSuffix: getDataFlowParams.appendClientIdSuffix || undefined,
+          type: undefined,
         };
         };
+
         const rest = isRabbitmq(getDataFlowMethod?.type)
         const rest = isRabbitmq(getDataFlowMethod?.type)
           ? await postAddConvertApi({ ...restData.data, ...data })
           ? await postAddConvertApi({ ...restData.data, ...data })
           : await postAddConvertApi({ ...restData.data, ...data, configuration });
           : await postAddConvertApi({ ...restData.data, ...data, configuration });

@@ -12,7 +12,7 @@
   import { useModalInner } from '/@/components/Modal';
   import { useModalInner } from '/@/components/Modal';
   import { getAllDeviceByOrg } from '/@/api/dataBoard';
   import { getAllDeviceByOrg } from '/@/api/dataBoard';
   import { useHistoryData } from '/@/views/device/list/hook/useHistoryData';
   import { useHistoryData } from '/@/views/device/list/hook/useHistoryData';
-  import { BasicTable, useTable } from '/@/components/Table';
+  import { BasicColumn, BasicTable, useTable } from '/@/components/Table';
   import { formatToDateTime } from '/@/utils/dateUtil';
   import { formatToDateTime } from '/@/utils/dateUtil';
   import {
   import {
     ModeSwitchButton,
     ModeSwitchButton,
@@ -112,18 +112,14 @@
     return mapping;
     return mapping;
   });
   });
 
 
-  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',
-        format: (value) => {
-          return unref(getIdentifierNameMapping)[value];
+        format: (text) => {
+          return unref(getIdentifierNameMapping)[text];
         },
         },
       },
       },
       {
       {
@@ -136,10 +132,47 @@
         format: (val) => {
         format: (val) => {
           return formatToDateTime(val, 'YYYY-MM-DD HH:mm:ss');
           return formatToDateTime(val, 'YYYY-MM-DD HH:mm:ss');
         },
         },
+        sorter: true,
+        sortOrder: unref(sortOrder),
+        sortDirections: ['descend', 'ascend', 'descend'],
       },
       },
-    ],
+    ];
   });
   });
 
 
+  const [registerTable, { setColumns }] = useTable({
+    showIndexColumn: false,
+    showTableSetting: false,
+    dataSource: historyData,
+    maxHeight: 300,
+    size: 'small',
+    columns: unref(columns),
+  });
+
+  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, 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.order == 'descend') {
+        getTableList('DESC');
+      } else {
+        getTableList('ASC');
+      }
+    }
+  };
+
   const getDeviceDataKey = async (record: DeviceOption) => {
   const getDeviceDataKey = async (record: DeviceOption) => {
     const { organizationId, value } = record;
     const { organizationId, value } = record;
     try {
     try {
@@ -260,7 +293,7 @@
     :show-ok-btn="false"
     :show-ok-btn="false"
     cancel-text="关闭"
     cancel-text="关闭"
     width="70%"
     width="70%"
-    title="选择时间"
+    title="历史趋势"
   >
   >
     <section
     <section
       class="flex flex-col p-4 h-full w-full min-w-7/10"
       class="flex flex-col p-4 h-full w-full min-w-7/10"
@@ -295,7 +328,11 @@
             v-show="!isNull"
             v-show="!isNull"
           />
           />
 
 
-          <BasicTable v-show="mode === EnumTableChartMode.TABLE" @register="registerTable">
+          <BasicTable
+            v-show="mode === EnumTableChartMode.TABLE"
+            @change="handleTableChange"
+            @register="registerTable"
+          >
             <template #toolbar>
             <template #toolbar>
               <div class="flex h-70px items-center justify-end p-2">
               <div class="flex h-70px items-center justify-end p-2">
                 <ModeSwitchButton
                 <ModeSwitchButton