Commit 8c3e912e1113a8555cf7510b09448c049bb761bd

Authored by ww
1 parent 0c1312d7

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

... ... @@ -144,8 +144,13 @@ export const useDynamicPublicForm = (paramsItemList: Ref<ParamsItemType[]>) => {
144 144 }
145 145
146 146 if (Reflect.has(value, BuiltInVariable.SELECT_TIME_AGGREGATION)) {
  147 + const fieldMapping = unref(getParams).find(item => item.key === BuiltInVariable.DATE_RANGE)
  148 + const [start, end] = ((fieldMapping || {}).value || '').split(GROUP_SEPARATOR)
147 149 const aggregation = Reflect.get(value, BuiltInVariable.SELECT_TIME_AGGREGATION) || {}
148   - Object.assign(value, { ...aggregation })
  150 + const result = { ...aggregation, [start]: aggregation.startTs, [end]: aggregation.endTs }
  151 + Reflect.deleteProperty(result, SelectTimeAggregationFieldEnum.START_TS)
  152 + Reflect.deleteProperty(result, SelectTimeAggregationFieldEnum.END_TS)
  153 + Object.assign(value, { ...result, [start]: aggregation.startTs, [end]: aggregation.endTs })
149 154 Reflect.deleteProperty(value, BuiltInVariable.SELECT_TIME_AGGREGATION)
150 155 }
151 156
... ... @@ -307,8 +312,7 @@ export const useDynamicPublicForm = (paramsItemList: Ref<ParamsItemType[]>) => {
307 312 trigger: ['blur', 'change'],
308 313 validator() {
309 314 const record = params[BuiltInVariable.SELECT_TIME_AGGREGATION]
310   - // const keys = [SelectTimeAggregationFieldEnum.AGG, SelectTimeAggregationFieldEnum.INTERVAL, SelectTimeAggregationFieldEnum.TIME_PERIOD]
311   - if (required && ![record[SelectTimeAggregationFieldEnum.AGG], record[SelectTimeAggregationFieldEnum.INTERVAL], record[SelectTimeAggregationFieldEnum.TIME_PERIOD]].every(Boolean)) {
  315 + if (required && ![record[SelectTimeAggregationFieldEnum.AGG], record[SelectTimeAggregationFieldEnum.INTERVAL], record[SelectTimeAggregationFieldEnum.END_TS], record[SelectTimeAggregationFieldEnum.START_TS]].every(Boolean)) {
312 316 validFlag.value = false
313 317 return new Error(`${message}需要填写完整`)
314 318 }
... ... @@ -392,7 +396,9 @@ export const useDynamicPublicForm = (paramsItemList: Ref<ParamsItemType[]>) => {
392 396 continue
393 397 }
394 398 if (mores) {
395   - const { agg, interval, startTs, endTs, limit } = Params
  399 + const { agg, interval, limit } = Params
  400 + const startTs = Params[splitKeys[0]]
  401 + const endTs = Params[splitKeys[1]]
396 402 params[BuiltInVariable.SELECT_TIME_AGGREGATION] = { agg, interval, startTs, endTs, limit }
397 403 } else {
398 404 const value = [Params[splitKeys[0]], Params[splitKeys[1]]]
... ...
... ... @@ -2,6 +2,8 @@ export { default as SelectTimeAggregation } from './index.vue'
2 2
3 3 export interface SelectTimeAggregationValueTypw {
4 4 timePeriod?: Nullable<number>
  5 + startTs?: Nullable<number>
  6 + endTs?: Nullable<number>
5 7 agg?: Nullable<string>
6 8 interval?: Nullable<number>
7 9 }
... ... @@ -9,6 +11,8 @@ export interface SelectTimeAggregationValueTypw {
9 11
10 12 export enum SelectTimeAggregationFieldEnum {
11 13 TIME_PERIOD = 'timePeriod',
  14 + START_TS = 'startTs',
  15 + END_TS = 'endTs',
12 16 AGG = 'agg',
13 17 INTERVAL = 'interval'
14 18 }
... ...