This is an automated email from the ASF dual-hosted git repository.
liudongkai pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git
The following commit(s) were added to refs/heads/dev by this push:
new cac3f780e5 [Fix] add resource capacity required rule (#9922)
cac3f780e5 is described below
commit cac3f780e56037f9b74ecb39d2dced0f907006aa
Author: Mr.An <[email protected]>
AuthorDate: Sat May 7 14:12:00 2022 +0800
[Fix] add resource capacity required rule (#9922)
* [Fix] add resource capacity required rule
* Update use-form.ts
---
.../views/resource/task-group/option/use-form.ts | 25 ++++++++++++++++------
1 file changed, 19 insertions(+), 6 deletions(-)
diff --git
a/dolphinscheduler-ui/src/views/resource/task-group/option/use-form.ts
b/dolphinscheduler-ui/src/views/resource/task-group/option/use-form.ts
index abef4361a9..6f6f0e69c3 100644
--- a/dolphinscheduler-ui/src/views/resource/task-group/option/use-form.ts
+++ b/dolphinscheduler-ui/src/views/resource/task-group/option/use-form.ts
@@ -28,8 +28,8 @@ export function useForm() {
formData: {
id: 0,
name: '',
- projectCode: '',
- groupSize: '0',
+ projectCode: null as string | null,
+ groupSize: '',
status: 1,
description: ''
} as TaskGroupUpdateReq,
@@ -39,17 +39,30 @@ export function useForm() {
required: true,
trigger: ['input', 'blur'],
validator() {
- if (state.formData.name === '') {
+ if (!state.formData.name) {
return new Error(t('resource.task_group_option.please_enter_name'))
}
}
},
- description: {
+ groupSize: {
required: true,
trigger: ['input', 'blur'],
validator() {
- if (state.formData.description === '') {
- return new Error(t('resource.task_group_option.please_enter_desc'))
+ if (!state.formData.groupSize) {
+ return new Error(
+ t('resource.task_group_option.please_enter_resource_pool_size')
+ )
+ }
+ }
+ },
+ projectCode: {
+ required: true,
+ trigger: ['input', 'blur'],
+ validator() {
+ if (!state.formData.projectCode) {
+ return new Error(
+ t('resource.task_group_option.please_select_project')
+ )
}
}
}