Commit 3362f487a9167b077a9d19103f6c3a190089a5e2
Merge branch 'dev-fix-ww' into 'main_dev'
fix(动态表单): 日期区间无法清除时间 See merge request yunteng/thingskit-view!59
Showing
3 changed files
with
8 additions
and
8 deletions
.husky/commit-msg
100644 → 100755
| @@ -312,14 +312,14 @@ export const useDynamicPublicForm = (paramsItemList: Ref<ParamsItemType[]>) => { | @@ -312,14 +312,14 @@ export const useDynamicPublicForm = (paramsItemList: Ref<ParamsItemType[]>) => { | ||
| 312 | return [{ | 312 | return [{ |
| 313 | trigger: ['blur', 'change'], | 313 | trigger: ['blur', 'change'], |
| 314 | validator() { | 314 | validator() { |
| 315 | - /** | ||
| 316 | - * ft 修改在公共接口下拉框里加上接口类型 | ||
| 317 | - * 修改后的代码在注释之间,并标注好源代码和修改后代码,方便回溯 | ||
| 318 | - * 源代码 record[SelectTimeAggregationFieldEnum.INTERVAL] | ||
| 319 | - * 修改后代码在//ft之间 record[SelectTimeAggregationFieldEnum.AGG]!=='NONE'?record[SelectTimeAggregationFieldEnum.INTERVAL]:[] | ||
| 320 | - */ | 315 | + /** |
| 316 | + * ft 修改在公共接口下拉框里加上接口类型 | ||
| 317 | + * 修改后的代码在注释之间,并标注好源代码和修改后代码,方便回溯 | ||
| 318 | + * 源代码 record[SelectTimeAggregationFieldEnum.INTERVAL] | ||
| 319 | + * 修改后代码在//ft之间 record[SelectTimeAggregationFieldEnum.AGG]!=='NONE'?record[SelectTimeAggregationFieldEnum.INTERVAL]:[] | ||
| 320 | + */ | ||
| 321 | const record = params[BuiltInVariable.SELECT_TIME_AGGREGATION] | 321 | const record = params[BuiltInVariable.SELECT_TIME_AGGREGATION] |
| 322 | - if (required && ![record[SelectTimeAggregationFieldEnum.AGG],record[SelectTimeAggregationFieldEnum.AGG]!=='NONE'?record[SelectTimeAggregationFieldEnum.INTERVAL]:[], record[SelectTimeAggregationFieldEnum.END_TS], record[SelectTimeAggregationFieldEnum.START_TS]].every(Boolean)) { | 322 | + if (required && ![record[SelectTimeAggregationFieldEnum.AGG], record[SelectTimeAggregationFieldEnum.AGG] !== 'NONE' ? record[SelectTimeAggregationFieldEnum.INTERVAL] : [], record[SelectTimeAggregationFieldEnum.END_TS], record[SelectTimeAggregationFieldEnum.START_TS]].every(Boolean)) { |
| 323 | validFlag.value = false | 323 | validFlag.value = false |
| 324 | return new Error(`${message}需要填写完整`) | 324 | return new Error(`${message}需要填写完整`) |
| 325 | } | 325 | } |
| @@ -54,7 +54,7 @@ const getIntervalTimeOptions = computed(() => { | @@ -54,7 +54,7 @@ const getIntervalTimeOptions = computed(() => { | ||
| 54 | }) | 54 | }) |
| 55 | 55 | ||
| 56 | const handleTimePerionChange = (value: number[]) => { | 56 | const handleTimePerionChange = (value: number[]) => { |
| 57 | - const [startTs, endTs] = value | 57 | + const [startTs, endTs] = value || [] |
| 58 | emit('update:value', { ...props.value, startTs, endTs, interval: null }) | 58 | emit('update:value', { ...props.value, startTs, endTs, interval: null }) |
| 59 | emit('change', { ...props.value || {}, startTs, endTs, interval: null }) | 59 | emit('change', { ...props.value || {}, startTs, endTs, interval: null }) |
| 60 | } | 60 | } |