This is an automated email from the ASF dual-hosted git repository.
wenhemin 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 2d02f78 workflow level task dry run UI (#6173)
2d02f78 is described below
commit 2d02f78ba7fbe0cf0e83db2b841eae42b8a8f855
Author: Yao-chen-ecnu <[email protected]>
AuthorDate: Sun Sep 26 11:56:10 2021 +0800
workflow level task dry run UI (#6173)
* workflow level task dry run UI
* Update start.vue
* Update start.vue
* Create start.vue
* Update start.vue
* Update list.vue
* Update en_US.js
* Update zh_CN.js
* Update start.vue
* Update en_US.js
* Update zh_CN.js
* Update start.vue
* Update list.vue
* Update list.vue
Co-authored-by: yao-chen-ecnu <[email protected]>
---
.../projects/pages/definition/pages/list/_source/start.vue | 14 ++++++++++----
.../projects/pages/instance/pages/list/_source/list.vue | 6 ++++++
.../pages/projects/pages/taskInstance/_source/list.vue | 6 ++++++
dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js | 2 ++
dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js | 2 ++
5 files changed, 26 insertions(+), 4 deletions(-)
diff --git
a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/start.vue
b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/start.vue
index b42473b..740bbcd 100644
---
a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/start.vue
+++
b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/start.vue
@@ -183,6 +183,12 @@
</div>
</div>
</div>
+ <div class="clearfix list">
+ <span class="text">{{$t('Whether dry-run')}}</span>
+ <span class="cont" style="padding-top: 5px;">
+ <el-switch v-model="dryRun" size="small" active-value="1"
inactive-value="0"></el-switch>
+ </span>
+ </div>
<div class="submit">
<el-button type="text" size="small" @click="close()"> {{$t('Cancel')}}
</el-button>
<el-button type="primary" size="small" round :loading="spinnerLoading"
@click="ok()">{{spinnerLoading ? $t('Loading...') : $t('Start')}} </el-button>
@@ -226,7 +232,8 @@
environmentCode: '',
// Global custom parameters
definitionGlobalParams: [],
- udpList: []
+ udpList: [],
+ dryRun: 0
}
},
mixins: [disabledState],
@@ -291,7 +298,8 @@
workerGroup: this.workerGroup,
environmentCode: this.environmentCode,
startParams: !_.isEmpty(startParams) ? JSON.stringify(startParams) :
'',
- expectedParallelismNumber: this.parallismNumber
+ expectedParallelismNumber: this.parallismNumber,
+ dryRun: this.dryRun
}
// Executed from the specified node
if (this.sourceType === 'contextmenu') {
@@ -395,14 +403,12 @@
display: block;
}
}
-
.ans {
color: #0097e0;
font-size: 14px;
vertical-align: middle;
cursor: pointer;
}
-
.list {
margin-bottom: 14px;
.text {
diff --git
a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/_source/list.vue
b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/_source/list.vue
index 327f399..1112e91 100644
---
a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/_source/list.vue
+++
b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/_source/list.vue
@@ -63,6 +63,12 @@
</el-table-column>
<el-table-column prop="runTimes" :label="$t('Run
Times')"></el-table-column>
<el-table-column prop="recovery" :label="$t('fault-tolerant
sign')"></el-table-column>
+ <el-table-column :label="$t('Dry-run flag')" width="100">
+ <template slot-scope="scope">
+ <span v-if="scope.row.dryRun == 1">YES</span>
+ <span v-else>NO</span>
+ </template>
+ </el-table-column>
<el-table-column prop="executorName"
:label="$t('Executor')"></el-table-column>
<el-table-column prop="host" :label="$t('host')"
min-width="210"></el-table-column>
<el-table-column :label="$t('Operation')" width="240" fixed="right">
diff --git
a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/taskInstance/_source/list.vue
b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/taskInstance/_source/list.vue
index 2cbb963..f5c28b1 100644
---
a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/taskInstance/_source/list.vue
+++
b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/taskInstance/_source/list.vue
@@ -59,6 +59,12 @@
</template>
</el-table-column>
<el-table-column prop="retryTimes" :label="$t('Retry
Count')"></el-table-column>
+ <el-table-column :label="$t('Dry-run flag')" width="100">
+ <template slot-scope="scope">
+ <span v-if="scope.row.dryRun == 1">YES</span>
+ <span v-else>NO</span>
+ </template>
+ </el-table-column>
<el-table-column :label="$t('host')" min-width="210">
<template slot-scope="scope">
<span>{{scope.row.host | filterNull}}</span>
diff --git a/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js
b/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js
index f450ced..ac2dd88 100755
--- a/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js
+++ b/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js
@@ -187,6 +187,7 @@ export default {
'Task status statistics': 'Task Status Statistics',
Number: 'Number',
State: 'State',
+ 'Dry-run flag': 'Dry-run flag',
'Process Status Statistics': 'Process Status Statistics',
'Process Definition Statistics': 'Process Definition Statistics',
'Project Name': 'Project Name',
@@ -464,6 +465,7 @@ export default {
'Timeout strategy must be selected': 'Timeout strategy must be selected',
'Timeout must be a positive integer': 'Timeout must be a positive integer',
'Add dependency': 'Add dependency',
+ 'Whether dry-run': 'Whether dry-run',
and: 'and',
or: 'or',
month: 'month',
diff --git a/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js
b/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js
index 104fd7c..e3b5542 100644
--- a/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js
+++ b/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js
@@ -186,6 +186,7 @@ export default {
'Task status statistics': '任务状态统计',
Number: '数量',
State: '状态',
+ 'Dry-run flag': '空跑标识',
'Process Status Statistics': '流程状态统计',
'Process Definition Statistics': '流程定义统计',
'Project Name': '项目名称',
@@ -463,6 +464,7 @@ export default {
'Timeout strategy must be selected': '超时策略必须选一个',
'Timeout must be a positive integer': '超时时长必须为正整数',
'Add dependency': '添加依赖',
+ 'Whether dry-run': '是否空跑',
and: '且',
or: '或',
month: '月',
