Merge branch 'ww' into 'main'

fix: RangePicker format is not correct

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

@@ -145,6 +145,7 @@
       startTs: Date.now() - 1 * 24 * 60 * 60 * 1000,
       startTs: Date.now() - 1 * 24 * 60 * 60 * 1000,
       endTs: Date.now(),
       endTs: Date.now(),
       agg: AggregateDataEnum.NONE,
       agg: AggregateDataEnum.NONE,
+      limit: 7,
     });
     });
 
 
     // 判断对象是否为空
     // 判断对象是否为空

@@ -10,7 +10,9 @@
     baseColProps: {
     baseColProps: {
       span: 5,
       span: 5,
     },
     },
-    fieldMapToTime: [[SchemaFiled.DATE_RANGE, [SchemaFiled.START_TS, SchemaFiled.END_TS]]],
+    fieldMapToTime: [
+      [SchemaFiled.DATE_RANGE, [SchemaFiled.START_TS, SchemaFiled.END_TS], 'YYYY-MM-DD HH:mm:ss'],
+    ],
   });
   });
   onMounted(() => {
   onMounted(() => {
     emit('register', method);
     emit('register', method);

-import { Moment } from 'moment';
+import moment, { Moment } from 'moment';
 import { getPacketIntervalByRange, getPacketIntervalByValue, intervalOption } from './helper';
 import { getPacketIntervalByRange, getPacketIntervalByValue, intervalOption } from './helper';
 import { FormSchema } from '/@/components/Form';
 import { FormSchema } from '/@/components/Form';
 import { ColEx } from '/@/components/Form/src/types';
 import { ColEx } from '/@/components/Form/src/types';
@@ -86,7 +86,9 @@ export const defaultSchemas: FormSchema[] = [
       const { setFieldsValue } = formActionType;
       const { setFieldsValue } = formActionType;
       let dates: Moment[] = [];
       let dates: Moment[] = [];
       return {
       return {
-        showTime: true,
+        showTime: {
+          defaultValue: [moment('00:00:00', 'HH:mm:ss'), moment('23:59:59', 'HH:mm:ss')],
+        },
         onCalendarChange(value: Moment[]) {
         onCalendarChange(value: Moment[]) {
           dates = value;
           dates = value;
         },
         },