From 2c6b9babff7d5a9fceb1e2b2230314db0c5f5ee7 Mon Sep 17 00:00:00 2001 From: Junyi Date: Thu, 24 Nov 2022 08:06:48 -0800 Subject: [PATCH] fix(plugin-workflow): fix endsOn field (#1144) --- .../plugins/workflow/src/client/locale/zh-CN.ts | 1 + .../src/client/triggers/schedule/EndsByField.tsx | 15 ++++++++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/packages/plugins/workflow/src/client/locale/zh-CN.ts b/packages/plugins/workflow/src/client/locale/zh-CN.ts index 91cbd5591..d9a47e00a 100644 --- a/packages/plugins/workflow/src/client/locale/zh-CN.ts +++ b/packages/plugins/workflow/src/client/locale/zh-CN.ts @@ -32,6 +32,7 @@ export default { 'Based on date field of collection': '根据数据表时间字段', 'Starts on': '开始于', 'Ends on': '结束于', + 'No end': '不结束', 'Exactly at': '当时', 'Repeat mode': '重复模式', 'Repeat limit': '重复次数', diff --git a/packages/plugins/workflow/src/client/triggers/schedule/EndsByField.tsx b/packages/plugins/workflow/src/client/triggers/schedule/EndsByField.tsx index f0e60ca6b..9b41bf2a1 100644 --- a/packages/plugins/workflow/src/client/triggers/schedule/EndsByField.tsx +++ b/packages/plugins/workflow/src/client/triggers/schedule/EndsByField.tsx @@ -10,23 +10,28 @@ import { OnField } from "./OnField"; export function EndsByField({ value, onChange }) { const { t } = useWorkflowTranslation(); - const [type, setType] = useState(typeof value === 'object' && !(value instanceof Date) ? 'field' : 'date'); - + const type = value != null ? typeof value === 'object' && !(value instanceof Date) ? 'field' : 'date' : null; return (
{type === 'field' ? - : + : null + } + {type === 'date' + ? { + onChange(v ? v.toDate() : null); + }} /> + : null }
);