This is an automated email from the ASF dual-hosted git repository.
chengshiwen pushed a commit to branch json_split
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git
The following commit(s) were added to refs/heads/json_split by this push:
new 7b2f334 fix: process definition version delete bug (#5380)
7b2f334 is described below
commit 7b2f33426b3ada64d02fafc31b03f7c77d028cb1
Author: wen-hemin <[email protected]>
AuthorDate: Sun Apr 25 21:11:09 2021 +0800
fix: process definition version delete bug (#5380)
Co-authored-by: wen-hemin <[email protected]>
---
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue | 9 +++++----
.../projects/pages/definition/pages/list/_source/list.vue | 10 +++++-----
.../projects/pages/definition/pages/list/_source/versions.vue | 3 ++-
3 files changed, 12 insertions(+), 10 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 a1cef10..aa932eb 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
@@ -753,11 +753,11 @@
* @param processDefinitionId the process definition id of page version
* @param fromThis fromThis
*/
- mVersionGetProcessDefinitionVersionsPage ({ pageNo, pageSize,
processDefinitionId, fromThis }) {
+ mVersionGetProcessDefinitionVersionsPage ({ pageNo, pageSize,
processDefinitionCode, fromThis }) {
this.getProcessDefinitionVersionsPage({
pageNo: pageNo,
pageSize: pageSize,
- processDefinitionId: processDefinitionId
+ processDefinitionCode: processDefinitionCode
}).then(res => {
this.versionData.processDefinitionVersions = res.data.lists
this.versionData.total = res.data.totalCount
@@ -775,7 +775,7 @@
* @param processDefinitionId the process definition id user want to
delete
* @param fromThis fromThis
*/
- mVersionDeleteProcessDefinitionVersion ({ version, processDefinitionId,
fromThis }) {
+ mVersionDeleteProcessDefinitionVersion ({ version, processDefinitionId,
processDefinitionCode, fromThis }) {
this.deleteProcessDefinitionVersion({
version: version,
processDefinitionId: processDefinitionId
@@ -784,7 +784,7 @@
this.mVersionGetProcessDefinitionVersionsPage({
pageNo: 1,
pageSize: 10,
- processDefinitionId: processDefinitionId,
+ processDefinitionCode: processDefinitionCode,
fromThis: fromThis
})
}).catch(e => {
@@ -805,6 +805,7 @@
let pageSize = res.data.pageSize
let pageNo = res.data.currentPage
this.versionData.processDefinition.id = this.urlParam.id
+ this.versionData.processDefinition.code = this.store.state.dag.code
this.versionData.processDefinition.version =
this.$store.state.dag.version
this.versionData.processDefinition.releaseState = this.releaseState
this.versionData.processDefinitionVersions =
processDefinitionVersions
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 6b3d06e..11eab51 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
@@ -356,11 +356,11 @@
* @param processDefinitionId the process definition id of page version
* @param fromThis fromThis
*/
- mVersionGetProcessDefinitionVersionsPage ({ pageNo, pageSize,
processDefinitionId, fromThis }) {
+ mVersionGetProcessDefinitionVersionsPage ({ pageNo, pageSize,
processDefinitionCode, fromThis }) {
this.getProcessDefinitionVersionsPage({
pageNo: pageNo,
pageSize: pageSize,
- processDefinitionId: processDefinitionId
+ processDefinitionCode: processDefinitionCode
}).then(res => {
this.versionData.processDefinitionVersions = res.data.lists
this.versionData.total = res.data.totalCount
@@ -377,7 +377,7 @@
* @param processDefinitionId the process definition id user want to
delete
* @param fromThis fromThis
*/
- mVersionDeleteProcessDefinitionVersion ({ version, processDefinitionId,
fromThis }) {
+ mVersionDeleteProcessDefinitionVersion ({ version, processDefinitionId,
processDefinitionCode, fromThis }) {
this.deleteProcessDefinitionVersion({
version: version,
processDefinitionId: processDefinitionId
@@ -386,7 +386,7 @@
this.mVersionGetProcessDefinitionVersionsPage({
pageNo: 1,
pageSize: 10,
- processDefinitionId: processDefinitionId,
+ processDefinitionCode: processDefinitionCode,
fromThis: fromThis
})
}).catch(e => {
@@ -397,7 +397,7 @@
this.getProcessDefinitionVersionsPage({
pageNo: 1,
pageSize: 10,
- processDefinitionId: item.id
+ processDefinitionCode: item.code
}).then(res => {
let processDefinitionVersions = res.data.lists
let total = res.data.totalCount
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 7fa8bb3..d70f4f7 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
@@ -132,6 +132,7 @@
this.$emit('mVersionDeleteProcessDefinitionVersion', {
version: item.version,
processDefinitionId: this.versionData.processDefinition.id,
+ processDefinitionCode: this.versionData.processDefinition.code,
fromThis: this
})
},
@@ -143,7 +144,7 @@
this.$emit('mVersionGetProcessDefinitionVersionsPage', {
pageNo: val,
pageSize: this.pageSize,
- processDefinitionId: this.versionData.processDefinition.id,
+ processDefinitionCode: this.versionData.processDefinition.code,
fromThis: this
})
},
