This is an automated email from the ASF dual-hosted git repository.
wenhemin pushed a commit to branch json_split
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git
The following commit(s) were added to refs/heads/json_split by this push:
new 4e97a0c fix: When process definition state is release, process
version to set enable (#5216)
4e97a0c is described below
commit 4e97a0c4fdff5234a1c066c5f967fb3fd4a725d2
Author: wen-hemin <[email protected]>
AuthorDate: Tue Apr 6 16:46:58 2021 +0800
fix: When process definition state is release, process version to set
enable (#5216)
Co-authored-by: wen-hemin <[email protected]>
---
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue | 4 ++--
.../pages/projects/pages/definition/pages/list/_source/list.vue | 2 +-
.../pages/projects/pages/definition/pages/list/_source/versions.vue | 6 +++---
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue
b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue
index bd0cfa6..860de1c 100755
--- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue
@@ -231,7 +231,7 @@
processDefinition: {
id: null,
version: '',
- state: ''
+ releaseState: ''
},
processDefinitionVersions: [],
total: null,
@@ -806,7 +806,7 @@
let pageNo = res.data.currentPage
this.versionData.processDefinition.id = this.urlParam.id
this.versionData.processDefinition.version =
this.$store.state.dag.version
- this.versionData.processDefinition.state = this.releaseState
+ this.versionData.processDefinition.releaseState = this.releaseState
this.versionData.processDefinitionVersions =
processDefinitionVersions
this.versionData.total = total
this.versionData.pageNo = pageNo
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 882bd67..9a19a8c 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
@@ -102,7 +102,7 @@
<span><el-button type="primary" size="mini"
icon="el-icon-s-unfold" @click="_export(scope.row)" circle></el-button></span>
</el-tooltip>
<el-tooltip :content="$t('Version Info')" placement="top"
:enterable="false">
- <span><el-button type="primary" size="mini" icon="el-icon-info"
:disabled="scope.row.releaseState === 'ONLINE'" @click="_version(scope.row)"
circle></el-button></span>
+ <span><el-button type="primary" size="mini" icon="el-icon-info"
@click="_version(scope.row)" circle></el-button></span>
</el-tooltip>
</template>
</el-table-column>
diff --git
a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/versions.vue
b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/versions.vue
index 9677a1c..f1e10b3 100644
---
a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/versions.vue
+++
b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/versions.vue
@@ -27,8 +27,8 @@
<el-table-column prop="userName" :label="$t('Version')">
<template slot-scope="scope">
<span v-if="scope.row.version">
- <span v-if="scope.row.version ===
versionData.processDefinition.version" style="color:
green"><strong>{{scope.row.version}} {{$t('Current Version')}}</strong></span>
- <span v-else>{{scope.row.version}}</span>
+ <span v-if="scope.row.version ===
versionData.processDefinition.version" style="color:
green"><strong>V{{scope.row.version}} {{$t('Current Version')}}</strong></span>
+ <span v-else>V{{scope.row.version}}</span>
</span>
<span v-else>-</span>
</template>
@@ -50,7 +50,7 @@
:title="$t('Confirm Switch To This Version?')"
@onConfirm="_mVersionSwitchProcessDefinitionVersion(scope.row)"
>
- <el-button :disabled="scope.row.version ===
versionData.processDefinition.version" type="primary" size="mini"
icon="el-icon-warning" circle slot="reference"></el-button>
+ <el-button
:disabled="versionData.processDefinition.releaseState === 'ONLINE' ||
scope.row.version === versionData.processDefinition.version" type="primary"
size="mini" icon="el-icon-warning" circle slot="reference"></el-button>
</el-popconfirm>
</el-tooltip>
<el-tooltip :content="$t('Delete')" placement="top">
