Showing
1 changed file
with
6 additions
and
2 deletions
| ... | ... | @@ -136,7 +136,9 @@ export const useDynamicPublicForm = (paramsItemList: Ref<ParamsItemType[]>) => { |
| 136 | 136 | |
| 137 | 137 | if (Reflect.has(value, BuiltInVariable.DATE_RANGE)) { |
| 138 | 138 | const fieldMapping = unref(getParams).find(item => item.key === BuiltInVariable.DATE_RANGE) |
| 139 | - const [start, end] = ((fieldMapping || {}).value || '').split(GROUP_SEPARATOR) | |
| 139 | + let [start, end] = ((fieldMapping || {}).value || '').split(GROUP_SEPARATOR) | |
| 140 | + start = start ? start : SelectTimeAggregationFieldEnum.START_TS | |
| 141 | + end = end ? end : SelectTimeAggregationFieldEnum.END_TS | |
| 140 | 142 | const dateRangeValue = value[BuiltInVariable.DATE_RANGE] |
| 141 | 143 | const [startValue, endValue] = isArray(dateRangeValue) ? dateRangeValue : [null, null] |
| 142 | 144 | value[start] = startValue |
| ... | ... | @@ -404,7 +406,9 @@ export const useDynamicPublicForm = (paramsItemList: Ref<ParamsItemType[]>) => { |
| 404 | 406 | const setParams = (Params: Recordable = {}) => { |
| 405 | 407 | for (const { key, value, mores } of unref(getParams)) { |
| 406 | 408 | const splitKeys = value ? value.split(GROUP_SEPARATOR) : (key || '').split(GROUP_SEPARATOR) |
| 407 | - const [ start, end ] = splitKeys | |
| 409 | + let [start, end] = splitKeys | |
| 410 | + start = start ? start : SelectTimeAggregationFieldEnum.START_TS | |
| 411 | + end = end ? end : SelectTimeAggregationFieldEnum.END_TS | |
| 408 | 412 | if (isDateComponent(key as BuiltInVariable)) { |
| 409 | 413 | if (key as BuiltInVariable === BuiltInVariable.DATE_FIXED) { |
| 410 | 414 | params[key] = Params[start] || null | ... | ... |