Merge branch 'ww' into 'main'

fix: date range picker && rename max value && data board list not request on reset

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

@@ -14,9 +14,9 @@ VITE_PUBLIC_PATH = /
 # VITE_PROXY = [["/api","http://101.133.234.90:8080/api"]]
 # 线上测试环境
 # VITE_PROXY = [["/api","http://localhost:8080/api"],["/thingskit-drawio","http://localhost:3000/"]]
-# VITE_PROXY = [["/api","https://dev.thingskit.com/api"],["/thingskit-drawio","http://localhost:3000/"]]
+VITE_PROXY = [["/api","https://dev.thingskit.com/api"],["/thingskit-drawio","http://localhost:3000/"]]
 # VITE_PROXY = [["/api","http://121.37.251.8:8080/api"],["/thingskit-drawio","http://localhost:3000/"]]
-VITE_PROXY = [["/api","http://192.168.10.111:8080/api"],["/thingskit-drawio","http://192.168.10.106:8080/api"]]
+# VITE_PROXY = [["/api","http://192.168.10.111:8080/api"],["/thingskit-drawio","http://192.168.10.106:8080/api"]]
 
 # 实时数据的ws地址
 # VITE_WEB_SOCKET = ws://localhost:8080/api/ws/plugins/telemetry?token=

@@ -148,7 +148,7 @@ export const defaultSchemas: FormSchema[] = [
   },
   {
     field: SchemaFiled.LIMIT,
-    label: '最大值',
+    label: '最大条数',
     component: 'InputNumber',
     // defaultValue: 7,
     ifShow({ values }) {

@@ -91,7 +91,9 @@
       gutter: 10,
     },
     labelWidth: 120,
-    fieldMapToTime: [[SchemaFiled.DATE_RANGE, [SchemaFiled.START_TS, SchemaFiled.END_TS]]],
+    fieldMapToTime: [
+      [SchemaFiled.DATE_RANGE, [SchemaFiled.START_TS, SchemaFiled.END_TS], 'YYYY-MM-DD HH:ss'],
+    ],
     submitButtonOptions: {
       loading: loading as unknown as boolean,
     },
@@ -100,7 +102,6 @@
       await method.validate();
       const value = method.getFieldsValue();
       const searchParams = getSearchParams(value);
-
       if (!hasDeviceAttr()) return;
       // 发送请求
       loading.value = true;

+import moment from 'moment';
 import { Moment } from 'moment';
 import { getDeviceAttributes } from '/@/api/dataBoard';
 import { FormSchema } from '/@/components/Form';
@@ -107,7 +108,9 @@ export const formSchema: FormSchema[] = [
       const { setFieldsValue } = formActionType;
       let dates: Moment[] = [];
       return {
-        showTime: true,
+        showTime: {
+          defaultValue: [moment('00:00:00', 'HH:mm:ss'), moment('23:59:59', 'HH:mm:ss')],
+        },
         onCalendarChange(value: Moment[]) {
           dates = value;
         },
@@ -167,7 +170,7 @@ export const formSchema: FormSchema[] = [
   },
   {
     field: SchemaFiled.LIMIT,
-    label: '最大值',
+    label: '最大条数',
     component: 'InputNumber',
     // defaultValue: 7,
     ifShow({ values }) {

@@ -40,6 +40,12 @@
     },
     submitFunc: async () => {
       try {
+        const params = searchFormMethod.getFieldsValue();
+        await getDatasource(params);
+      } catch (error) {}
+    },
+    resetFunc: async () => {
+      try {
         await getDatasource();
       } catch (error) {}
     },
@@ -101,10 +107,9 @@
     return basicMenu;
   });
 
-  const getDatasource = async () => {
+  const getDatasource = async (params: Recordable = {}) => {
     try {
       loading.value = true;
-      const params = searchFormMethod.getFieldsValue() || {};
       const { total, items } = await getDataBoardList({
         page: unref(paginationProp).current,
         pageSize: unref(paginationProp).pageSize,