Commit 3555a1d4 authored by pobu168's avatar pobu168
Browse files

fix bug

parent 98b1723f
master 2233_workflow_context_parameters_refactor 2289_workflow_interf_enhance 2313_add_timestamp_to_node_log 2317_fix_bug_of_faulted_proc_inst 2321_fix_itsm_reported_defects 2321_fix_itsm_reported_issues 2335_fix_itsm_upgrades circleci-project-setup dependabot/maven/platform-auth-client/com.fasterxml.jackson.core-jackson-databind-2.12.6.1 dependabot/maven/platform-auth-client/com.fasterxml.jackson.core-jackson-databind-2.13.4.1 dependabot/maven/platform-auth-client/org.bouncycastle-bcprov-ext-jdk15on-1.67 dependabot/maven/platform-auth-client/org.bouncycastle-bcprov-jdk15on-1.67 dependabot/maven/platform-auth-server/com.fasterxml.jackson.core-jackson-databind-2.12.6.1 dependabot/maven/platform-auth-server/com.fasterxml.jackson.core-jackson-databind-2.13.4.1 dependabot/maven/platform-auth-server/org.bouncycastle-bcprov-jdk15on-1.67 dependabot/maven/platform-core/com.amazonaws-aws-java-sdk-s3-1.12.261 dependabot/maven/platform-core/com.fasterxml.jackson.core-jackson-databind-2.12.6.1 dependabot/maven/platform-core/com.fasterxml.jackson.core-jackson-databind-2.13.4.1 dependabot/maven/platform-gateway/com.fasterxml.jackson.core-jackson-databind-2.12.6.1 dependabot/maven/platform-gateway/com.fasterxml.jackson.core-jackson-databind-2.13.4.1 dependabot/maven/platform-gateway/org.yaml-snakeyaml-1.32 dependabot/maven/platform-workflow/com.fasterxml.jackson.core-jackson-databind-2.12.6.1 dependabot/maven/platform-workflow/com.fasterxml.jackson.core-jackson-databind-2.13.4.1 dependabot/maven/platform-workflow/org.yaml-snakeyaml-1.32 dev dev_fix dev_test flow_exec_bug master_UBA remove_node_sass timed_execution web_monitor_demo workflow_report v3.2.2 v3.2.1 v3.2.0 v3.1.0
No related merge requests found
Showing with 40 additions and 26 deletions
+40 -26
......@@ -703,11 +703,14 @@ export default {
let tem = []
this.retryTartetModels.forEach(d => {
const f = this.retryCatchNodeTableList.find(c => c.id === d.id)
if (f) {
tem.push({ ...d, bound: 'Y', confirmToken: f.confirmToken })
} else {
tem.push({ ...d, bound: 'N', confirmToken: f.confirmToken })
}
tem.push({ ...d, bound: f.bound, confirmToken: f.confirmToken })
// if (typeof (f) !== 'undefined') {
// console.log(1)
// tem.push({ ...d, bound: 'Y', confirmToken: f.confirmToken })
// } else {
// console.log(2)
// tem.push({ ...d, bound: 'N', confirmToken: '' })
// }
})
const payload = {
nodeInstId: found.id,
......@@ -782,37 +785,48 @@ export default {
}
},
retrySingleSelect (selection, row) {
this.retryCatchNodeTableList = this.retryCatchNodeTableList.concat(row)
let find = this.retryCatchNodeTableList.find(item => item.id === row.id)
find.bound = 'Y'
// console.log(selection, row, this.retryCatchNodeTableList)
// this.retryCatchNodeTableList = this.retryCatchNodeTableList.concat(row)
},
retrySingleCancel (selection, row) {
const index = this.retryCatchNodeTableList.findIndex(cn => {
let find = this.retryCatchNodeTableList.find(cn => {
return cn.id === row.id
})
this.retryCatchNodeTableList.splice(index, 1)
// const find = this.retryCatchNodeTableList.find(item => item.id === row.id)
find.bound = 'N'
// this.retryCatchNodeTableList.splice(index, 1)
},
retrySelectAll (selection) {
let temp = []
this.retryCatchNodeTableList.forEach(cntl => {
temp.push(cntl.id)
})
selection.forEach(se => {
if (!temp.includes(se.id)) {
this.retryCatchNodeTableList.push(se)
}
this.retryCatchNodeTableList.forEach(item => {
item.bound = 'Y'
})
// let temp = []
// this.retryCatchNodeTableList.forEach(cntl => {
// temp.push(cntl.id)
// })
// selection.forEach(se => {
// if (!temp.includes(se.id)) {
// this.retryCatchNodeTableList.push(se)
// }
// })
},
retrySelectAllCancel () {
let temp = []
this.retryTartetModels.forEach(tm => {
temp.push(tm.id)
this.retryCatchNodeTableList.forEach(item => {
item.bound = 'N'
})
if (this.retryTableFilterParam) {
this.retryCatchNodeTableList = this.retryCatchNodeTableList.filter(item => {
return !temp.includes(item.id)
})
} else {
this.retryCatchNodeTableList = []
}
// let temp = []
// this.retryTartetModels.forEach(tm => {
// temp.push(tm.id)
// })
// if (this.retryTableFilterParam) {
// this.retryCatchNodeTableList = this.retryCatchNodeTableList.filter(item => {
// return !temp.includes(item.id)
// })
// } else {
// this.retryCatchNodeTableList = []
// }
},
allFlowNodesSingleSelect (selection, row) {
this.selectedFlowNodesModelData = this.selectedFlowNodesModelData.concat(row)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment