From 080a237b0d8f0adefde22c922ad2c52fa26c133e Mon Sep 17 00:00:00 2001 From: Devosend Date: Tue, 8 Mar 2022 12:25:31 +0800 Subject: [PATCH] [Fix][UI Next][V1.0.0-Alpha] Fix time alert validate of workflow (#8750) --- dolphinscheduler-ui-next/src/utils/regex.ts | 2 ++ .../projects/workflow/components/dag/dag-save-modal.tsx | 6 +++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dolphinscheduler-ui-next/src/utils/regex.ts b/dolphinscheduler-ui-next/src/utils/regex.ts index 0a0de4f069..eb0ff18338 100644 --- a/dolphinscheduler-ui-next/src/utils/regex.ts +++ b/dolphinscheduler-ui-next/src/utils/regex.ts @@ -21,4 +21,6 @@ const regex = { password: /^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{6,20}$/ } +export const positiveIntegerRegex = /^\+?[0-9]*$/ + export default regex diff --git a/dolphinscheduler-ui-next/src/views/projects/workflow/components/dag/dag-save-modal.tsx b/dolphinscheduler-ui-next/src/views/projects/workflow/components/dag/dag-save-modal.tsx index 8962fcc281..8c83650960 100644 --- a/dolphinscheduler-ui-next/src/views/projects/workflow/components/dag/dag-save-modal.tsx +++ b/dolphinscheduler-ui-next/src/views/projects/workflow/components/dag/dag-save-modal.tsx @@ -33,6 +33,7 @@ import { SaveForm, WorkflowDefinition } from './types' import { useRoute } from 'vue-router' import { verifyName } from '@/service/modules/process-definition' import './x6-style.scss' +import { positiveIntegerRegex } from '@/utils/regex' const props = { visible: { @@ -95,7 +96,10 @@ export default defineComponent({ }, timeout: { validator() { - if (formValue.value.timeoutFlag && formValue.value.timeout <= 0) { + if ( + formValue.value.timeoutFlag && + !positiveIntegerRegex.test(String(formValue.value.timeout)) + ) { return new Error(t('project.dag.positive_integer')) } }