Merge branch 'local_fix_report_config_by_ft' into 'main_dev'

fix: 修复报表导出，报表查看，日期取值问题

See merge request yunteng/thingskit-front!1000

@@ -471,7 +471,6 @@ export const formSchema: BFormSchema[] = [
     dynamicRules: () => {
     dynamicRules: () => {
       return [
       return [
         {
         {
-          // required: model[SchemaFiled.AGG] !== AggregateDataEnum.NONE,
           required: true,
           required: true,
           message: '间隔时间为必填项',
           message: '间隔时间为必填项',
           type: 'number',
           type: 'number',
@@ -479,8 +478,11 @@ export const formSchema: BFormSchema[] = [
       ];
       ];
     },
     },
     ifShow({ values }) {
     ifShow({ values }) {
-      return values[SchemaFiled.DATA_TYPE] !== DataTypeEnum.ORIGINAL;
-      // return values[SchemaFiled.WAY] === QueryWay.TIME_PERIOD && exectueIsImmed(values.executeWay);
+      return (
+        values[SchemaFiled.WAY] === QueryWay.TIME_PERIOD &&
+        exectueIsImmed(values.executeWay) &&
+        values[SchemaFiled.DATA_TYPE] !== DataTypeEnum.ORIGINAL
+      );
     },
     },
     componentProps({ formModel, formActionType }) {
     componentProps({ formModel, formActionType }) {
       const options =
       const options =

@@ -209,15 +209,40 @@
 
 
           const keys = attributes.length ? (attributes as any[]).at(0)?.value : '';
           const keys = attributes.length ? (attributes as any[]).at(0)?.value : '';
 
 
+          // fix修改执行条件里的日期
+          const tsObj: Recordable = {};
+
+          const { executeCondition } = data.record?.executeCondition as Recordable;
+
+          if (!executeCondition) return;
+
+          if (
+            Reflect.has(executeCondition, 'prevStartTs') &&
+            Reflect.has(executeCondition, 'prevEndTs')
+          ) {
+            // 有则取对应值
+            tsObj.startTs = executeCondition?.prevStartTs;
+            tsObj.endTs = executeCondition?.prevEndTs;
+          } else {
+            // 使用之前的日期
+            tsObj.startTs = executeCondition?.startTs;
+            tsObj.endTs = executeCondition?.endTs;
+          }
+          Reflect.deleteProperty(executeCondition, 'prevStartTs');
+          Reflect.deleteProperty(executeCondition, 'prevEndTs');
+
           const sendParams = {
           const sendParams = {
-            ...data.record.executeCondition.executeCondition,
+            ...executeCondition,
             ...{
             ...{
               keys,
               keys,
             },
             },
+            ...tsObj,
           };
           };
 
 
           const result = await exportViewChartApi(device, sendParams);
           const result = await exportViewChartApi(device, sendParams);
+
           item.notFoundData = validateHasData(result);
           item.notFoundData = validateHasData(result);
+
           const { xAxisData, series } = getChartsOption(result as unknown as ResponsData);
           const { xAxisData, series } = getChartsOption(result as unknown as ResponsData);
 
 
           await nextTick();
           await nextTick();