This is an automated email from the ASF dual-hosted git repository. wenjun pushed a commit to branch revert-15912-f-parallelism in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git
commit 92f93524b63d525d0713d1c79ad84fd80ee05255 Author: Wenjun Ruan <[email protected]> AuthorDate: Sun Apr 28 19:57:24 2024 +0800 Revert "[Improvement-15910][UI] Supposed to provide a default value for the c…" This reverts commit 5a6c6c37f006291bc774ec44fe6d3d6793721195. --- dolphinscheduler-ui/src/locales/en_US/project.ts | 3 +-- dolphinscheduler-ui/src/locales/zh_CN/project.ts | 3 +-- .../workflow/definition/components/start-modal.tsx | 20 +++++++++----------- .../workflow/definition/components/use-form.ts | 2 +- 4 files changed, 12 insertions(+), 16 deletions(-) diff --git a/dolphinscheduler-ui/src/locales/en_US/project.ts b/dolphinscheduler-ui/src/locales/en_US/project.ts index 5e5ee4b2a9..7a39752526 100644 --- a/dolphinscheduler-ui/src/locales/en_US/project.ts +++ b/dolphinscheduler-ui/src/locales/en_US/project.ts @@ -249,8 +249,7 @@ export default { delete_task_validate_dependent_tasks_desc: 'The downstream dependent tasks exists. You can not delete the task.', warning_delete_scheduler_dependent_tasks_desc: - 'The downstream dependent tasks exists. Are you sure to delete the scheduler?', - warning_too_large_parallelism_number: 'The parallelism number is too large. It is better not to be over 10.' + 'The downstream dependent tasks exists. Are you sure to delete the scheduler?' }, task: { on_line: 'Online', diff --git a/dolphinscheduler-ui/src/locales/zh_CN/project.ts b/dolphinscheduler-ui/src/locales/zh_CN/project.ts index 85de0122fb..50e0a821ef 100644 --- a/dolphinscheduler-ui/src/locales/zh_CN/project.ts +++ b/dolphinscheduler-ui/src/locales/zh_CN/project.ts @@ -246,8 +246,7 @@ export default { delete_task_validate_dependent_tasks_desc: '下游存在依赖，你不能删除该任务.', warning_delete_scheduler_dependent_tasks_desc: - '下游存在依赖, 删除定时可能会对下游任务产生影响. 你确定要删除该定时嘛?', - warning_too_large_parallelism_number: '并行度设置太大了, 最好不要超过10.', + '下游存在依赖, 删除定时可能会对下游任务产生影响. 你确定要删除该定时嘛?' }, task: { on_line: '线上', diff --git a/dolphinscheduler-ui/src/views/projects/workflow/definition/components/start-modal.tsx b/dolphinscheduler-ui/src/views/projects/workflow/definition/components/start-modal.tsx index 8a4b07b4bc..872b515844 100644 --- a/dolphinscheduler-ui/src/views/projects/workflow/definition/components/start-modal.tsx +++ b/dolphinscheduler-ui/src/views/projects/workflow/definition/components/start-modal.tsx @@ -44,8 +44,7 @@ import { NSwitch, NCheckbox, NDatePicker, - NRadioButton, - NInputNumber + NRadioButton } from 'naive-ui' import { ArrowDownOutlined, @@ -76,6 +75,7 @@ export default defineComponent({ props, emits: ['update:show', 'update:row', 'updateList'], setup(props, ctx) { + const parallelismRef = ref(false) const { t } = useI18n() const route = useRoute() const { startState } = useForm() @@ -296,6 +296,7 @@ export default defineComponent({ return { t, showTaskDependType, + parallelismRef, hideModal, handleStart, generalWarningTypeListOptions, @@ -503,20 +504,17 @@ export default defineComponent({ <NFormItem label={t('project.workflow.parallelism')} path='expectedParallelismNumber' - feedback={t( - 'project.workflow.warning_too_large_parallelism_number' - )} - validationStatus={'warning'} - showFeedback={ - parseInt(this.startForm.expectedParallelismNumber) > 10 - } > - <NInputNumber + <NCheckbox v-model:checked={this.parallelismRef}> + {t('project.workflow.custom_parallelism')} + </NCheckbox> + <NInput + allowInput={this.trim} + disabled={!this.parallelismRef} placeholder={t( 'project.workflow.please_enter_parallelism' )} v-model:value={this.startForm.expectedParallelismNumber} - min='1' /> </NFormItem> )} diff --git a/dolphinscheduler-ui/src/views/projects/workflow/definition/components/use-form.ts b/dolphinscheduler-ui/src/views/projects/workflow/definition/components/use-form.ts index 33dd7ba241..32b02a7880 100644 --- a/dolphinscheduler-ui/src/views/projects/workflow/definition/components/use-form.ts +++ b/dolphinscheduler-ui/src/views/projects/workflow/definition/components/use-form.ts @@ -66,7 +66,7 @@ export const useForm = () => { tenantCode: 'default', environmentCode: null, startParams: null, - expectedParallelismNumber: '2', + expectedParallelismNumber: '', dryRun: 0, testFlag: 0, version: null,
