fix(动态请求): 修复选择时间周期组件未映射开始时间和结束时间

@@ -144,8 +144,13 @@ export const useDynamicPublicForm = (paramsItemList: Ref<ParamsItemType[]>) => {
     }
     }
 
 
     if (Reflect.has(value, BuiltInVariable.SELECT_TIME_AGGREGATION)) {
     if (Reflect.has(value, BuiltInVariable.SELECT_TIME_AGGREGATION)) {
+      const fieldMapping = unref(getParams).find(item => item.key === BuiltInVariable.DATE_RANGE)
+      const [start, end] = ((fieldMapping || {}).value || '').split(GROUP_SEPARATOR)
       const aggregation = Reflect.get(value, BuiltInVariable.SELECT_TIME_AGGREGATION) || {}
       const aggregation = Reflect.get(value, BuiltInVariable.SELECT_TIME_AGGREGATION) || {}
-      Object.assign(value, { ...aggregation })
+      const result = { ...aggregation, [start]: aggregation.startTs, [end]: aggregation.endTs }
+      Reflect.deleteProperty(result, SelectTimeAggregationFieldEnum.START_TS)
+      Reflect.deleteProperty(result, SelectTimeAggregationFieldEnum.END_TS)
+      Object.assign(value, { ...result, [start]: aggregation.startTs, [end]: aggregation.endTs })
       Reflect.deleteProperty(value, BuiltInVariable.SELECT_TIME_AGGREGATION)
       Reflect.deleteProperty(value, BuiltInVariable.SELECT_TIME_AGGREGATION)
     }
     }
 
 
@@ -307,8 +312,7 @@ export const useDynamicPublicForm = (paramsItemList: Ref<ParamsItemType[]>) => {
       trigger: ['blur', 'change'],
       trigger: ['blur', 'change'],
       validator() {
       validator() {
         const record = params[BuiltInVariable.SELECT_TIME_AGGREGATION]
         const record = params[BuiltInVariable.SELECT_TIME_AGGREGATION]
-        // const keys = [SelectTimeAggregationFieldEnum.AGG, SelectTimeAggregationFieldEnum.INTERVAL, SelectTimeAggregationFieldEnum.TIME_PERIOD]
-        if (required && ![record[SelectTimeAggregationFieldEnum.AGG], record[SelectTimeAggregationFieldEnum.INTERVAL], record[SelectTimeAggregationFieldEnum.TIME_PERIOD]].every(Boolean)) {
+        if (required && ![record[SelectTimeAggregationFieldEnum.AGG], record[SelectTimeAggregationFieldEnum.INTERVAL], record[SelectTimeAggregationFieldEnum.END_TS], record[SelectTimeAggregationFieldEnum.START_TS]].every(Boolean)) {
           validFlag.value = false
           validFlag.value = false
           return new Error(`${message}需要填写完整`)
           return new Error(`${message}需要填写完整`)
         }
         }
@@ -392,7 +396,9 @@ export const useDynamicPublicForm = (paramsItemList: Ref<ParamsItemType[]>) => {
           continue
           continue
         }
         }
         if (mores) {
         if (mores) {
-          const { agg, interval, startTs, endTs, limit } = Params
+          const { agg, interval, limit } = Params
+          const startTs = Params[splitKeys[0]]
+          const endTs = Params[splitKeys[1]]
           params[BuiltInVariable.SELECT_TIME_AGGREGATION] = { agg, interval, startTs, endTs, limit }
           params[BuiltInVariable.SELECT_TIME_AGGREGATION] = { agg, interval, startTs, endTs, limit }
         } else {
         } else {
           const value = [Params[splitKeys[0]], Params[splitKeys[1]]]
           const value = [Params[splitKeys[0]], Params[splitKeys[1]]]

@@ -2,6 +2,8 @@ export { default as SelectTimeAggregation } from './index.vue'
 
 
 export interface SelectTimeAggregationValueTypw {
 export interface SelectTimeAggregationValueTypw {
   timePeriod?: Nullable<number>
   timePeriod?: Nullable<number>
+  startTs?: Nullable<number>
+  endTs?: Nullable<number>
   agg?: Nullable<string>
   agg?: Nullable<string>
   interval?: Nullable<number>
   interval?: Nullable<number>
 }
 }
@@ -9,6 +11,8 @@ export interface SelectTimeAggregationValueTypw {
 
 
 export enum SelectTimeAggregationFieldEnum {
 export enum SelectTimeAggregationFieldEnum {
   TIME_PERIOD = 'timePeriod',
   TIME_PERIOD = 'timePeriod',
+  START_TS = 'startTs',
+  END_TS = 'endTs',
   AGG = 'agg',
   AGG = 'agg',
   INTERVAL = 'interval'
   INTERVAL = 'interval'
 }
 }