Browse Source

[Fix][UI Next][V1.0.0-Alpha] Fix time alert validate of workflow (#8750)

3.0.0/version-upgrade
Devosend 3 years ago committed by GitHub
parent
commit
080a237b0d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      dolphinscheduler-ui-next/src/utils/regex.ts
  2. 6
      dolphinscheduler-ui-next/src/views/projects/workflow/components/dag/dag-save-modal.tsx

2
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

6
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'))
}
}

Loading…
Cancel
Save