This is an automated email from the ASF dual-hosted git repository.
songjian 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 5a6c6c37f0 [Improvement-15910][UI] Supposed to provide a default value
for the custom parallelism when using the mode of parallel execution. (#15912)
5a6c6c37f0 is described below
commit 5a6c6c37f006291bc774ec44fe6d3d6793721195
Author: calvin <[email protected]>
AuthorDate: Sun Apr 28 18:47:20 2024 +0800
[Improvement-15910][UI] Supposed to provide a default value for the custom
parallelism when using the mode of parallel execution. (#15912)
* worked out the issue
* imrpove the parallism strategy
* imrpove the parallism strategy
* merge from dev
---
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, 16 insertions(+), 12 deletions(-)
diff --git a/dolphinscheduler-ui/src/locales/en_US/project.ts
b/dolphinscheduler-ui/src/locales/en_US/project.ts
index 7a39752526..5e5ee4b2a9 100644
--- a/dolphinscheduler-ui/src/locales/en_US/project.ts
+++ b/dolphinscheduler-ui/src/locales/en_US/project.ts
@@ -249,7 +249,8 @@ 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?'
+ '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.'
},
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 50e0a821ef..85de0122fb 100644
--- a/dolphinscheduler-ui/src/locales/zh_CN/project.ts
+++ b/dolphinscheduler-ui/src/locales/zh_CN/project.ts
@@ -246,7 +246,8 @@ 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 872b515844..8a4b07b4bc 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,7 +44,8 @@ import {
NSwitch,
NCheckbox,
NDatePicker,
- NRadioButton
+ NRadioButton,
+ NInputNumber
} from 'naive-ui'
import {
ArrowDownOutlined,
@@ -75,7 +76,6 @@ 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,7 +296,6 @@ export default defineComponent({
return {
t,
showTaskDependType,
- parallelismRef,
hideModal,
handleStart,
generalWarningTypeListOptions,
@@ -504,17 +503,20 @@ 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
+ }
>
- <NCheckbox v-model:checked={this.parallelismRef}>
- {t('project.workflow.custom_parallelism')}
- </NCheckbox>
- <NInput
- allowInput={this.trim}
- disabled={!this.parallelismRef}
+ <NInputNumber
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 32b02a7880..33dd7ba241 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: '',
+ expectedParallelismNumber: '2',
dryRun: 0,
testFlag: 0,
version: null,
