Browse Source

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 <51205902080@stu.ecnu.edu.cn>
2.0.7-release
Yao-chen-ecnu 3 years ago committed by GitHub
parent
commit
2d02f78ba7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 14
      dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/start.vue
  2. 6
      dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/_source/list.vue
  3. 6
      dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/taskInstance/_source/list.vue
  4. 2
      dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js
  5. 2
      dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js

14
dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/start.vue

@ -183,6 +183,12 @@
</div> </div>
</div> </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"> <div class="submit">
<el-button type="text" size="small" @click="close()"> {{$t('Cancel')}} </el-button> <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> <el-button type="primary" size="small" round :loading="spinnerLoading" @click="ok()">{{spinnerLoading ? $t('Loading...') : $t('Start')}} </el-button>
@ -226,7 +232,8 @@
environmentCode: '', environmentCode: '',
// Global custom parameters // Global custom parameters
definitionGlobalParams: [], definitionGlobalParams: [],
udpList: [] udpList: [],
dryRun: 0
} }
}, },
mixins: [disabledState], mixins: [disabledState],
@ -291,7 +298,8 @@
workerGroup: this.workerGroup, workerGroup: this.workerGroup,
environmentCode: this.environmentCode, environmentCode: this.environmentCode,
startParams: !_.isEmpty(startParams) ? JSON.stringify(startParams) : '', startParams: !_.isEmpty(startParams) ? JSON.stringify(startParams) : '',
expectedParallelismNumber: this.parallismNumber expectedParallelismNumber: this.parallismNumber,
dryRun: this.dryRun
} }
// Executed from the specified node // Executed from the specified node
if (this.sourceType === 'contextmenu') { if (this.sourceType === 'contextmenu') {
@ -395,14 +403,12 @@
display: block; display: block;
} }
} }
.ans { .ans {
color: #0097e0; color: #0097e0;
font-size: 14px; font-size: 14px;
vertical-align: middle; vertical-align: middle;
cursor: pointer; cursor: pointer;
} }
.list { .list {
margin-bottom: 14px; margin-bottom: 14px;
.text { .text {

6
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>
<el-table-column prop="runTimes" :label="$t('Run Times')"></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 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="executorName" :label="$t('Executor')"></el-table-column>
<el-table-column prop="host" :label="$t('host')" min-width="210"></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"> <el-table-column :label="$t('Operation')" width="240" fixed="right">

6
dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/taskInstance/_source/list.vue

@ -59,6 +59,12 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="retryTimes" :label="$t('Retry Count')"></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"> <el-table-column :label="$t('host')" min-width="210">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{scope.row.host | filterNull}}</span> <span>{{scope.row.host | filterNull}}</span>

2
dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js

@ -187,6 +187,7 @@ export default {
'Task status statistics': 'Task Status Statistics', 'Task status statistics': 'Task Status Statistics',
Number: 'Number', Number: 'Number',
State: 'State', State: 'State',
'Dry-run flag': 'Dry-run flag',
'Process Status Statistics': 'Process Status Statistics', 'Process Status Statistics': 'Process Status Statistics',
'Process Definition Statistics': 'Process Definition Statistics', 'Process Definition Statistics': 'Process Definition Statistics',
'Project Name': 'Project Name', 'Project Name': 'Project Name',
@ -464,6 +465,7 @@ export default {
'Timeout strategy must be selected': 'Timeout strategy must be selected', 'Timeout strategy must be selected': 'Timeout strategy must be selected',
'Timeout must be a positive integer': 'Timeout must be a positive integer', 'Timeout must be a positive integer': 'Timeout must be a positive integer',
'Add dependency': 'Add dependency', 'Add dependency': 'Add dependency',
'Whether dry-run': 'Whether dry-run',
and: 'and', and: 'and',
or: 'or', or: 'or',
month: 'month', month: 'month',

2
dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js

@ -186,6 +186,7 @@ export default {
'Task status statistics': '任务状态统计', 'Task status statistics': '任务状态统计',
Number: '数量', Number: '数量',
State: '状态', State: '状态',
'Dry-run flag': '空跑标识',
'Process Status Statistics': '流程状态统计', 'Process Status Statistics': '流程状态统计',
'Process Definition Statistics': '流程定义统计', 'Process Definition Statistics': '流程定义统计',
'Project Name': '项目名称', 'Project Name': '项目名称',
@ -463,6 +464,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': '是否空跑',
and: '且', and: '且',
or: '或', or: '或',
month: '月', month: '月',

Loading…
Cancel
Save