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 a1cef107ee..aa932eb8e5 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 6b3d06ee38..11eab51ce0 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 7fa8bb30c1..d70f4f7d2c 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 }) },