You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by so...@apache.org on 2022/03/07 10:07:03 UTC

[dolphinscheduler] branch dev updated: [Feature-8497][UI Next][V1.0.0-Alpha] Support dependent task re-run automatically (#8739)

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 aa53925  [Feature-8497][UI Next][V1.0.0-Alpha] Support dependent task re-run automatically (#8739)
aa53925 is described below

commit aa5392529bb8d2ba7b4b73a9527adf713f8884c8
Author: Devosend <de...@gmail.com>
AuthorDate: Mon Mar 7 18:05:58 2022 +0800

    [Feature-8497][UI Next][V1.0.0-Alpha] Support dependent task re-run automatically (#8739)
---
 dolphinscheduler-ui-next/src/locales/modules/en_US.ts     |  4 +++-
 dolphinscheduler-ui-next/src/locales/modules/zh_CN.ts     |  4 +++-
 .../workflow/definition/components/start-modal.tsx        | 15 +++++++++++++++
 .../projects/workflow/definition/components/use-form.ts   |  1 +
 4 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/dolphinscheduler-ui-next/src/locales/modules/en_US.ts b/dolphinscheduler-ui-next/src/locales/modules/en_US.ts
index e0e68a4..4b400ab 100644
--- a/dolphinscheduler-ui-next/src/locales/modules/en_US.ts
+++ b/dolphinscheduler-ui-next/src/locales/modules/en_US.ts
@@ -503,7 +503,9 @@ const project = {
     refresh_log: 'Refresh Log',
     enter_full_screen: 'Enter full screen',
     cancel_full_screen: 'Cancel full screen',
-    task_state: 'Task status'
+    task_state: 'Task status',
+    mode_of_dependent: 'Mode of dependent',
+    open: 'Open'
   },
   task: {
     task_name: 'Task Name',
diff --git a/dolphinscheduler-ui-next/src/locales/modules/zh_CN.ts b/dolphinscheduler-ui-next/src/locales/modules/zh_CN.ts
index 08a31f9..1b8c3b5 100644
--- a/dolphinscheduler-ui-next/src/locales/modules/zh_CN.ts
+++ b/dolphinscheduler-ui-next/src/locales/modules/zh_CN.ts
@@ -500,7 +500,9 @@ const project = {
     refresh_log: '刷新日志',
     enter_full_screen: '进入全屏',
     cancel_full_screen: '取消全屏',
-    task_state: '任务状态'
+    task_state: '任务状态',
+    mode_of_dependent: '依赖模式',
+    open: '打开'
   },
   task: {
     task_name: '任务名称',
diff --git a/dolphinscheduler-ui-next/src/views/projects/workflow/definition/components/start-modal.tsx b/dolphinscheduler-ui-next/src/views/projects/workflow/definition/components/start-modal.tsx
index 766aa80..178a5db 100644
--- a/dolphinscheduler-ui-next/src/views/projects/workflow/definition/components/start-modal.tsx
+++ b/dolphinscheduler-ui-next/src/views/projects/workflow/definition/components/start-modal.tsx
@@ -292,6 +292,21 @@ export default defineComponent({
             this.startForm.execType !== 'START_PROCESS' && (
               <NSpace>
                 <NFormItem
+                  label={t('project.workflow.mode_of_dependent')}
+                  path='dependentMode'
+                >
+                  <NRadioGroup v-model:value={this.startForm.dependentMode}>
+                    <NSpace>
+                      <NRadio value={'OFF_MODE'}>
+                        {t('project.workflow.close')}
+                      </NRadio>
+                      <NRadio value={'ALL_DEPENDENT'}>
+                        {t('project.workflow.open')}
+                      </NRadio>
+                    </NSpace>
+                  </NRadioGroup>
+                </NFormItem>
+                <NFormItem
                   label={t('project.workflow.mode_of_execution')}
                   path='runMode'
                 >
diff --git a/dolphinscheduler-ui-next/src/views/projects/workflow/definition/components/use-form.ts b/dolphinscheduler-ui-next/src/views/projects/workflow/definition/components/use-form.ts
index a791492..0208ae4 100644
--- a/dolphinscheduler-ui-next/src/views/projects/workflow/definition/components/use-form.ts
+++ b/dolphinscheduler-ui-next/src/views/projects/workflow/definition/components/use-form.ts
@@ -57,6 +57,7 @@ export const useForm = () => {
       execType: 'START_PROCESS',
       startNodeList: '',
       taskDependType: 'TASK_POST',
+      dependentMode: 'OFF_MODE',
       runMode: 'RUN_MODE_SERIAL',
       processInstancePriority: 'MEDIUM',
       workerGroup: 'default',