Merge branch 'ft_local_dev' into 'main'

feat：报表配置新增周期字段 回显

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

@@ -222,6 +222,9 @@
         way: editResData.data?.way,
         way: editResData.data?.way,
         queryMode: editResData.data.queryCondition?.queryMode === 0 ? 'latest' : 'timePeriod',
         queryMode: editResData.data.queryCondition?.queryMode === 0 ? 'latest' : 'timePeriod',
         cronTime: editResData.data?.executeContent,
         cronTime: editResData.data?.executeContent,
+        currentCycle: editResData.data?.cycle?.currentCycle,
+        cycleTime: editResData.data?.cycle?.cycleTime,
+        cycleType: editResData.data?.cycle?.cycleType,
       });
       });
       const endTsTime = editResData.data.queryCondition?.endTs;
       const endTsTime = editResData.data.queryCondition?.endTs;
       const startTsTime = editResData.data.queryCondition?.startTs;
       const startTsTime = editResData.data.queryCondition?.startTs;
@@ -409,17 +412,22 @@
         },
         },
         queryMode: values?.queryMode === 'latest' ? 0 : 1,
         queryMode: values?.queryMode === 'latest' ? 0 : 1,
       };
       };
+      const cycle = {
+        currentCycle: values.currentCycle,
+        cycleTime: values.cycleTime,
+        cycleType: values.cycleType,
+      };
       delete values.devices;
       delete values.devices;
       delete values.agg;
       delete values.agg;
       delete values.interval;
       delete values.interval;
       delete values.timeZone;
       delete values.timeZone;
-      delete values.timeWeek;
       delete values.cronTime;
       delete values.cronTime;
-      delete values.cronWeek;
-      delete values.cronYear;
+      delete values.currentCycle;
+      delete values.cycleTime;
       delete values.limit1;
       delete values.limit1;
       delete values.startTs;
       delete values.startTs;
       delete values.queryMode;
       delete values.queryMode;
+      delete values.cycleType;
       postObj = {
       postObj = {
         ...values,
         ...values,
         ...{
         ...{
@@ -427,7 +435,7 @@
             getAttrDevice.value.length == 0 ? editDeviceList.value : getAttrDevice.value,
             getAttrDevice.value.length == 0 ? editDeviceList.value : getAttrDevice.value,
         },
         },
         ...{ queryCondition },
         ...{ queryCondition },
-
+        ...{ cycle },
         ...{ executeContent },
         ...{ executeContent },
         ...{ id: editId.value !== '' ? editId.value : '' },
         ...{ id: editId.value !== '' ? editId.value : '' },
       };
       };

@@ -240,24 +240,24 @@ export const formSchema: QFormSchema[] = [
     },
     },
   },
   },
   {
   {
-    field: 'timeWeek',
+    field: 'cycleType',
     component: 'Select',
     component: 'Select',
     label: '周期',
     label: '周期',
     required: true,
     required: true,
     colProps: { span: 24 },
     colProps: { span: 24 },
-    defaultValue: 'day',
+    defaultValue:0,
     componentProps: {
     componentProps: {
       placeholder: '请选择周期',
       placeholder: '请选择周期',
       options: [
       options: [
-        { label: '每日', value: 'day' },
-        { label: '每周', value: 'week' },
-        { label: '每月', value: 'month' },
+        { label: '每日', value: 0 },
+        { label: '每周', value: 1 },
+        { label: '每月', value: 2 },
       ],
       ],
     },
     },
     ifShow: ({ values }) => isTiming(values.executeWay),
     ifShow: ({ values }) => isTiming(values.executeWay),
   },
   },
   {
   {
-    field: 'cronWeek',
+    field: 'currentCycle',
     component: 'ApiSelect',
     component: 'ApiSelect',
     label: '每周',
     label: '每周',
     required: true,
     required: true,
@@ -272,10 +272,10 @@ export const formSchema: QFormSchema[] = [
       labelField: 'itemText',
       labelField: 'itemText',
       valueField: 'itemValue',
       valueField: 'itemValue',
     },
     },
-    ifShow: ({ values }) => isWeek(values.timeWeek),
+    ifShow: ({ values }) => isWeek(values.cycleType),
   },
   },
   {
   {
-    field: 'cronYear',
+    field: 'cycleTime',
     component: 'ApiSelect',
     component: 'ApiSelect',
     label: '每月',
     label: '每月',
     required: true,
     required: true,
@@ -290,7 +290,7 @@ export const formSchema: QFormSchema[] = [
       labelField: 'itemText',
       labelField: 'itemText',
       valueField: 'itemValue',
       valueField: 'itemValue',
     },
     },
-    ifShow: ({ values }) => isMonth(values.timeWeek),
+    ifShow: ({ values }) => isMonth(values.cycleType),
   },
   },
   {
   {
     field: 'cronTime',
     field: 'cronTime',

@@ -76,8 +76,8 @@ export const optionsConfig: IOptionConfig[] = [
 
 
 export enum TypeEnum {
 export enum TypeEnum {
   IS_TIMING = 1,
   IS_TIMING = 1,
-  IS_WEEK = 'week',
-  IS_MONTH = 'month',
+  IS_WEEK = 1,
+  IS_MONTH = 2,
   IS_EMPTY = 'NONE',
   IS_EMPTY = 'NONE',
   IS_DEFAULT_WEEK = 'defaultIsWeek',
   IS_DEFAULT_WEEK = 'defaultIsWeek',
   IS_FIXED_WEEK = '2',
   IS_FIXED_WEEK = '2',