From 5fa31aa97e8e41dc32a63ca7066633cd0f5c9765 Mon Sep 17 00:00:00 2001 From: dap <15891557205@163.com> Date: Sat, 16 Nov 2024 09:30:29 +0800 Subject: [PATCH] fix: some error in range picker --- apps/web-antd/src/utils/file/download.ts | 10 ++++++++++ .../ui-kit/form-ui/src/components/form-actions.vue | 6 +++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/apps/web-antd/src/utils/file/download.ts b/apps/web-antd/src/utils/file/download.ts index 9bcdcc3c..1d7b4285 100644 --- a/apps/web-antd/src/utils/file/download.ts +++ b/apps/web-antd/src/utils/file/download.ts @@ -54,6 +54,16 @@ function handleRangeTimeValue( fieldMappingTime.forEach( ([field, [startTimeKey, endTimeKey], format = 'YYYY-MM-DD']) => { + if ( + values[field] === null && + values[startTimeKey] && + values[endTimeKey] + ) { + Reflect.deleteProperty(values, startTimeKey); + Reflect.deleteProperty(values, endTimeKey); + return; + } + if (!values[field]) { Reflect.deleteProperty(values, field); return; diff --git a/packages/@core/ui-kit/form-ui/src/components/form-actions.vue b/packages/@core/ui-kit/form-ui/src/components/form-actions.vue index e1768521..40596609 100644 --- a/packages/@core/ui-kit/form-ui/src/components/form-actions.vue +++ b/packages/@core/ui-kit/form-ui/src/components/form-actions.vue @@ -95,7 +95,11 @@ function handleRangeTimeValue(values: Record) { * 时间字段为空 但是映射的start/end不为空 说明已经清理了组件的时间(组件右边的x) * 需要删除对应的start/end字段 否则会被保留 */ - if (!values[field] && values[startTimeKey] && values[endTimeKey]) { + if ( + values[field] === null && + values[startTimeKey] && + values[endTimeKey] + ) { delete values[startTimeKey]; delete values[endTimeKey]; return;