Browse Source

fix: process definition version delete bug (#5380)

Co-authored-by: wen-hemin <wenhemin@apache.com>
pull/3/MERGE
wen-hemin 4 years ago committed by GitHub
parent
commit
7b2f33426b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 9
      dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue
  2. 10
      dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/list.vue
  3. 3
      dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/versions.vue

9
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 processDefinitionId the process definition id of page version
* @param fromThis fromThis * @param fromThis fromThis
*/ */
mVersionGetProcessDefinitionVersionsPage ({ pageNo, pageSize, processDefinitionId, fromThis }) { mVersionGetProcessDefinitionVersionsPage ({ pageNo, pageSize, processDefinitionCode, fromThis }) {
this.getProcessDefinitionVersionsPage({ this.getProcessDefinitionVersionsPage({
pageNo: pageNo, pageNo: pageNo,
pageSize: pageSize, pageSize: pageSize,
processDefinitionId: processDefinitionId processDefinitionCode: processDefinitionCode
}).then(res => { }).then(res => {
this.versionData.processDefinitionVersions = res.data.lists this.versionData.processDefinitionVersions = res.data.lists
this.versionData.total = res.data.totalCount this.versionData.total = res.data.totalCount
@ -775,7 +775,7 @@
* @param processDefinitionId the process definition id user want to delete * @param processDefinitionId the process definition id user want to delete
* @param fromThis fromThis * @param fromThis fromThis
*/ */
mVersionDeleteProcessDefinitionVersion ({ version, processDefinitionId, fromThis }) { mVersionDeleteProcessDefinitionVersion ({ version, processDefinitionId, processDefinitionCode, fromThis }) {
this.deleteProcessDefinitionVersion({ this.deleteProcessDefinitionVersion({
version: version, version: version,
processDefinitionId: processDefinitionId processDefinitionId: processDefinitionId
@ -784,7 +784,7 @@
this.mVersionGetProcessDefinitionVersionsPage({ this.mVersionGetProcessDefinitionVersionsPage({
pageNo: 1, pageNo: 1,
pageSize: 10, pageSize: 10,
processDefinitionId: processDefinitionId, processDefinitionCode: processDefinitionCode,
fromThis: fromThis fromThis: fromThis
}) })
}).catch(e => { }).catch(e => {
@ -805,6 +805,7 @@
let pageSize = res.data.pageSize let pageSize = res.data.pageSize
let pageNo = res.data.currentPage let pageNo = res.data.currentPage
this.versionData.processDefinition.id = this.urlParam.id 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.version = this.$store.state.dag.version
this.versionData.processDefinition.releaseState = this.releaseState this.versionData.processDefinition.releaseState = this.releaseState
this.versionData.processDefinitionVersions = processDefinitionVersions this.versionData.processDefinitionVersions = processDefinitionVersions

10
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 processDefinitionId the process definition id of page version
* @param fromThis fromThis * @param fromThis fromThis
*/ */
mVersionGetProcessDefinitionVersionsPage ({ pageNo, pageSize, processDefinitionId, fromThis }) { mVersionGetProcessDefinitionVersionsPage ({ pageNo, pageSize, processDefinitionCode, fromThis }) {
this.getProcessDefinitionVersionsPage({ this.getProcessDefinitionVersionsPage({
pageNo: pageNo, pageNo: pageNo,
pageSize: pageSize, pageSize: pageSize,
processDefinitionId: processDefinitionId processDefinitionCode: processDefinitionCode
}).then(res => { }).then(res => {
this.versionData.processDefinitionVersions = res.data.lists this.versionData.processDefinitionVersions = res.data.lists
this.versionData.total = res.data.totalCount this.versionData.total = res.data.totalCount
@ -377,7 +377,7 @@
* @param processDefinitionId the process definition id user want to delete * @param processDefinitionId the process definition id user want to delete
* @param fromThis fromThis * @param fromThis fromThis
*/ */
mVersionDeleteProcessDefinitionVersion ({ version, processDefinitionId, fromThis }) { mVersionDeleteProcessDefinitionVersion ({ version, processDefinitionId, processDefinitionCode, fromThis }) {
this.deleteProcessDefinitionVersion({ this.deleteProcessDefinitionVersion({
version: version, version: version,
processDefinitionId: processDefinitionId processDefinitionId: processDefinitionId
@ -386,7 +386,7 @@
this.mVersionGetProcessDefinitionVersionsPage({ this.mVersionGetProcessDefinitionVersionsPage({
pageNo: 1, pageNo: 1,
pageSize: 10, pageSize: 10,
processDefinitionId: processDefinitionId, processDefinitionCode: processDefinitionCode,
fromThis: fromThis fromThis: fromThis
}) })
}).catch(e => { }).catch(e => {
@ -397,7 +397,7 @@
this.getProcessDefinitionVersionsPage({ this.getProcessDefinitionVersionsPage({
pageNo: 1, pageNo: 1,
pageSize: 10, pageSize: 10,
processDefinitionId: item.id processDefinitionCode: item.code
}).then(res => { }).then(res => {
let processDefinitionVersions = res.data.lists let processDefinitionVersions = res.data.lists
let total = res.data.totalCount let total = res.data.totalCount

3
dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/versions.vue

@ -132,6 +132,7 @@
this.$emit('mVersionDeleteProcessDefinitionVersion', { this.$emit('mVersionDeleteProcessDefinitionVersion', {
version: item.version, version: item.version,
processDefinitionId: this.versionData.processDefinition.id, processDefinitionId: this.versionData.processDefinition.id,
processDefinitionCode: this.versionData.processDefinition.code,
fromThis: this fromThis: this
}) })
}, },
@ -143,7 +144,7 @@
this.$emit('mVersionGetProcessDefinitionVersionsPage', { this.$emit('mVersionGetProcessDefinitionVersionsPage', {
pageNo: val, pageNo: val,
pageSize: this.pageSize, pageSize: this.pageSize,
processDefinitionId: this.versionData.processDefinition.id, processDefinitionCode: this.versionData.processDefinition.code,
fromThis: this fromThis: this
}) })
}, },

Loading…
Cancel
Save