This is an automated email from the ASF dual-hosted git repository.
chenxingchun pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git
The following commit(s) were added to refs/heads/dev by this push:
new 0e668d1 fix ui process-instance delete funcation disabled condition.
new 8587230 Merge pull request #4545 from
zhuangchong/dev-fix-ui-instance-delete-disabled
0e668d1 is described below
commit 0e668d1a61b3929023343020c363486e74acc131
Author: zhuangchong <[email protected]>
AuthorDate: Wed Jan 20 17:04:09 2021 +0800
fix ui process-instance delete funcation disabled condition.
---
.../home/pages/projects/pages/definition/pages/list/_source/list.vue | 1 -
.../home/pages/projects/pages/instance/pages/list/_source/list.vue | 3 +--
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git
a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/list.vue
b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/list.vue
index c3b7799..0955195 100644
---
a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/list.vue
+++
b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/list.vue
@@ -84,7 +84,6 @@
<el-button type="primary" size="mini" icon="el-icon-date"
:disabled="scope.row.releaseState !== 'ONLINE'"
@click="_timingManage(scope.row)" circle></el-button>
</el-tooltip>
<el-tooltip :content="$t('delete')" placement="top"
:enterable="false">
- <el-button type="danger" size="mini" icon="el-icon-delete"
circle></el-button>
<el-popconfirm
:confirmButtonText="$t('Confirm')"
:cancelButtonText="$t('Cancel')"
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 980a755..21b8948 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
@@ -84,7 +84,6 @@
<span><el-button type="error" size="mini"
:icon="scope.row.state === 'PAUSE' ? 'el-icon-video-play' :
'el-icon-video-pause'" :disabled="scope.row.state !== 'RUNNING_EXECUTION' &&
scope.row.state !== 'PAUSE'" @click="_suspend(scope.row,scope.$index)"
circle></el-button></span>
</el-tooltip>
<el-tooltip :content="$t('delete')" placement="top"
:enterable="false">
- <el-button type="danger" size="mini" icon="el-icon-delete"
circle></el-button>
<el-popconfirm
:confirmButtonText="$t('Confirm')"
:cancelButtonText="$t('Cancel')"
@@ -92,7 +91,7 @@
iconColor="red"
:title="$t('Delete?')"
@onConfirm="_delete(scope.row,scope.row.id)">
- <el-button type="danger" size="mini" icon="el-icon-delete"
:disabled="scope.row.releaseState === 'ONLINE'" circle
slot="reference"></el-button>
+ <el-button type="danger" size="mini" icon="el-icon-delete"
:disabled="scope.row.state !== 'SUCCESS' && scope.row.state !== 'FAILURE' &&
scope.row.state !== 'STOP' && scope.row.state !== 'PAUSE'" circle
slot="reference"></el-button>
</el-popconfirm>
</el-tooltip>
<el-tooltip :content="$t('Gantt')" placement="top"
:enterable="false">
