Merge branch 'perf/history-data-query-form' into 'main_dev'

perf: 调整历史数据表单顺序调整

See merge request yunteng/thingskit-front!984

@@ -99,7 +99,7 @@
     size: 'small',
     size: 'small',
   });
   });
 
 
-  const getTableList = async (orderBy?: string) => {
+  const getTableList = async (orderBy?: OrderByEnum) => {
     // 表单验证
     // 表单验证
     await method.validate();
     await method.validate();
     const value = method.getFieldsValue();
     const value = method.getFieldsValue();
@@ -124,9 +124,9 @@
     await setColumns(unref(columns));
     await setColumns(unref(columns));
     if (sorter.field == 'ts') {
     if (sorter.field == 'ts') {
       if (sorter.order == 'descend') {
       if (sorter.order == 'descend') {
-        getTableList('DESC');
+        getTableList(OrderByEnum.DESC);
       } else {
       } else {
-        getTableList('ASC');
+        getTableList(OrderByEnum.ASC);
       }
       }
     }
     }
   };
   };

@@ -5,6 +5,7 @@ import { copyTransFun } from '/@/utils/fnUtils';
 import { getDeviceDataKeys } from '/@/api/alarm/position';
 import { getDeviceDataKeys } from '/@/api/alarm/position';
 import { deviceProfile } from '/@/api/device/deviceManager';
 import { deviceProfile } from '/@/api/device/deviceManager';
 import { EChartsOption } from 'echarts';
 import { EChartsOption } from 'echarts';
+import { OrderByEnum, OrderByNameEnum, SchemaFiled } from './cpns/TimePeriodForm/config';
 
 
 export enum AggregateDataEnum {
 export enum AggregateDataEnum {
   MIN = 'MIN',
   MIN = 'MIN',
@@ -487,6 +488,18 @@ export const selectDeviceAttrSchema: FormSchema[] = [
       getPopupContainer: () => document.body,
       getPopupContainer: () => document.body,
     },
     },
   },
   },
+  {
+    field: SchemaFiled.ORDER_BY,
+    label: '数据排序',
+    component: 'Select',
+    defaultValue: OrderByEnum.ASC,
+    componentProps: {
+      options: Object.values(OrderByEnum).map((value) => ({
+        value,
+        label: OrderByNameEnum[value],
+      })),
+    },
+  },
 ];
 ];
 
 
 export const eChartOptions = (series: EChartsOption['series'], keys: string[]): EChartsOption => {
 export const eChartOptions = (series: EChartsOption['series'], keys: string[]): EChartsOption => {

@@ -41,18 +41,6 @@ export enum AggregateDataEnum {
 }
 }
 export const defaultSchemas: FormSchema[] = [
 export const defaultSchemas: FormSchema[] = [
   {
   {
-    field: SchemaFiled.ORDER_BY,
-    label: '数据排序',
-    component: 'Select',
-    defaultValue: OrderByEnum.ASC,
-    componentProps: {
-      options: Object.values(OrderByEnum).map((value) => ({
-        value,
-        label: OrderByNameEnum[value],
-      })),
-    },
-  },
-  {
     field: SchemaFiled.WAY,
     field: SchemaFiled.WAY,
     label: '查询方式',
     label: '查询方式',
     component: 'RadioGroup',
     component: 'RadioGroup',

@@ -39,18 +39,6 @@ export enum AggregateDataEnum {
 export const formSchema = (): FormSchema[] => {
 export const formSchema = (): FormSchema[] => {
   return [
   return [
     {
     {
-      field: SchemaFiled.ORDER_BY,
-      label: '数据排序',
-      component: 'Select',
-      defaultValue: OrderByEnum.ASC,
-      componentProps: {
-        options: Object.values(OrderByEnum).map((value) => ({
-          value,
-          label: OrderByNameEnum[value],
-        })),
-      },
-    },
-    {
       field: SchemaFiled.DEVICE_ID,
       field: SchemaFiled.DEVICE_ID,
       label: '设备名称',
       label: '设备名称',
       component: 'Select',
       component: 'Select',
@@ -213,6 +201,18 @@ export const formSchema = (): FormSchema[] => {
         getPopupContainer: () => document.body,
         getPopupContainer: () => document.body,
       },
       },
     },
     },
+    {
+      field: SchemaFiled.ORDER_BY,
+      label: '数据排序',
+      component: 'Select',
+      defaultValue: OrderByEnum.ASC,
+      componentProps: {
+        options: Object.values(OrderByEnum).map((value) => ({
+          value,
+          label: OrderByNameEnum[value],
+        })),
+      },
+    },
   ];
   ];
 };
 };