From 42bdc1bd165002854c83035cf5ad3c290a4531eb Mon Sep 17 00:00:00 2001 From: dengbf Date: Wed, 22 Nov 2023 17:32:32 +0800 Subject: [PATCH 1/2] =?UTF-8?q?[=E4=BF=AE=E5=A4=8D]=20=E5=B7=A5=E5=8D=95?= =?UTF-8?q?=E6=B5=81=E8=BD=AC=EF=BC=8C=E9=BB=98=E8=AE=A4=E7=9A=84=E8=A1=A8?= =?UTF-8?q?=E5=8D=95=E5=9C=BA=E6=99=AF=E4=B8=8D=E7=9B=B8=E7=AC=A6=20=20-?= =?UTF-8?q?=20[=E5=85=B3=E8=81=94]=20#[1030435218358272]=E5=B7=A5=E5=8D=95?= =?UTF-8?q?=E6=B5=81=E8=BD=AC=EF=BC=8C=E6=98=BE=E7=A4=BA=E4=B8=8E=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E5=9C=BA=E6=99=AF=E4=B8=8D=E4=B8=80=E6=A0=B7=20http:/?= =?UTF-8?q?/192.168.0.96:8090/demo/rdm.html#/bug-detail/939050947543040/93?= =?UTF-8?q?9050947543057/1030435218358272?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/pages/process/flow/flow-edit.vue | 6 ++---- .../pages/process/flow/flowedit/components/nodemixin.js | 1 - src/views/pages/process/task/processdetail/detailmixin.js | 3 ++- src/views/pages/process/task/taskcommon/dealNewFormData.js | 5 +++-- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/views/pages/process/flow/flow-edit.vue b/src/views/pages/process/flow/flow-edit.vue index 51ade4dd..ed2bf9e9 100644 --- a/src/views/pages/process/flow/flow-edit.vue +++ b/src/views/pages/process/flow/flow-edit.vue @@ -772,7 +772,6 @@ export default { saveData.config && saveData.config.process && saveData.config.process.stepList.length > 0 && saveData.config.process.stepList.forEach((item) => { if (item && item.stepConfig && item.stepConfig.hasOwnProperty('formSceneUuid') && item.stepConfig.formSceneUuid) { // 如果某些步骤节点，找不到匹配的场景名称时，回填失败，表单场景下拉框处为空 - item.stepConfig['formSceneName'] = !this.formSceneUuidList.includes(item.stepConfig.formSceneUuid) ? '' : item.stepConfig.formSceneName; item.stepConfig['formSceneUuid'] = !this.formSceneUuidList.includes(item.stepConfig.formSceneUuid) ? '' : item.stepConfig.formSceneUuid; } }); @@ -1127,6 +1126,7 @@ export default { if (res.Status == 'OK') { try { let formConfig = res.Return.formConfig || {}; + let defaultSceneUuid = formConfig.defaultSceneUuid || formConfig.uuid; formConfig.sceneList && formConfig.sceneList.forEach((item) => { if (item.uuid) { this.formSceneUuidList.push(item.uuid); @@ -1137,8 +1137,7 @@ export default { } this.stepList && !this.$utils.isEmpty(this.stepList) && this.stepList.forEach((item) => { if (item && item.handler && !noFormSceneNodeList.includes(item.handler) && item.stepConfig) { - this.$set(item.stepConfig, 'formSceneUuid', (formConfig && formConfig.uuid) ? formConfig.uuid : ''); - this.$set(item.stepConfig, 'formSceneName', (formConfig && formConfig.name) ? formConfig.name : ''); + this.$set(item.stepConfig, 'formSceneUuid', (formConfig && formConfig.uuid) ? defaultSceneUuid : ''); } }); } catch (error) { @@ -1150,7 +1149,6 @@ export default { this.stepList && !this.$utils.isEmpty(this.stepList) && this.stepList.forEach((item) => { if (item && item.handler && !noFormSceneNodeList.includes(item.handler) && item.stepConfig) { this.$set(item.stepConfig, 'formSceneUuid', ''); - this.$set(item.stepConfig, 'formSceneName', ''); } }); } diff --git a/src/views/pages/process/flow/flowedit/components/nodemixin.js b/src/views/pages/process/flow/flowedit/components/nodemixin.js index f5d9ade5..5eb2e502 100644 --- a/src/views/pages/process/flow/flowedit/components/nodemixin.js +++ b/src/views/pages/process/flow/flowedit/components/nodemixin.js @@ -140,7 +140,6 @@ export default { }, updateScene(sceneConfig) { // 更新表单场景值 - this.$set(this.configData.stepConfig, 'formSceneName', sceneConfig.text); this.$set(this.configData.stepConfig, 'formSceneUuid', sceneConfig.value); }, clearNodeData(stepConfig) { diff --git a/src/views/pages/process/task/processdetail/detailmixin.js b/src/views/pages/process/task/processdetail/detailmixin.js index ff6944dd..8a8dd619 100644 --- a/src/views/pages/process/task/processdetail/detailmixin.js +++ b/src/views/pages/process/task/processdetail/detailmixin.js @@ -286,7 +286,8 @@ export default { let formSceneUuid = this.processTaskConfig.currentProcessTaskStep ? this.processTaskConfig.currentProcessTaskStep.formSceneUuid : null; let formConfig = this.processTaskConfig.formConfig; this.formConfig = formConfig; - if (this.formConfig._type == 'new') { + if (this.formConfig._type == 'new' && !this.$utils.isEmpty(this.processTask.currentProcessTaskStep)) { + //步骤进行中展示设置的节点场景或者默认场景 this.formConfig = this.initNewFormConfig(formSceneUuid, this.formConfig); } } diff --git a/src/views/pages/process/task/taskcommon/dealNewFormData.js b/src/views/pages/process/task/taskcommon/dealNewFormData.js index d7ad2fe8..00a15627 100644 --- a/src/views/pages/process/task/taskcommon/dealNewFormData.js +++ b/src/views/pages/process/task/taskcommon/dealNewFormData.js @@ -3,8 +3,9 @@ export default { initNewFormConfig(formSceneUuid, formConfig) { let data = this.$utils.deepClone(formConfig); let formItemList = []; - if (formSceneUuid && formSceneUuid != this.formConfig.uuid) { - let sceneConfig = this.formConfig.sceneList.find(item => item.uuid === formSceneUuid); + let currentCceneUuid = formSceneUuid || formConfig.defaultSceneUuid || this.formConfig.uuid; + if (currentCceneUuid && currentCceneUuid != this.formConfig.uuid) { + let sceneConfig = this.formConfig.sceneList.find(item => item.uuid === currentCceneUuid); if (sceneConfig) { if (formConfig.tableList) { formConfig.tableList.forEach(item => { -- Gitee From d9a0e6c0238503852e26aa8f804c60a8b0103e35 Mon Sep 17 00:00:00 2001 From: dengbf Date: Wed, 22 Nov 2023 17:35:31 +0800 Subject: [PATCH 2/2] commit --- src/views/pages/process/task/taskcommon/dealNewFormData.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/pages/process/task/taskcommon/dealNewFormData.js b/src/views/pages/process/task/taskcommon/dealNewFormData.js index 00a15627..c6be17c1 100644 --- a/src/views/pages/process/task/taskcommon/dealNewFormData.js +++ b/src/views/pages/process/task/taskcommon/dealNewFormData.js @@ -3,9 +3,9 @@ export default { initNewFormConfig(formSceneUuid, formConfig) { let data = this.$utils.deepClone(formConfig); let formItemList = []; - let currentCceneUuid = formSceneUuid || formConfig.defaultSceneUuid || this.formConfig.uuid; - if (currentCceneUuid && currentCceneUuid != this.formConfig.uuid) { - let sceneConfig = this.formConfig.sceneList.find(item => item.uuid === currentCceneUuid); + let currentSceneUuid = formSceneUuid || formConfig.defaultSceneUuid || this.formConfig.uuid; + if (currentSceneUuid && currentSceneUuid != this.formConfig.uuid) { + let sceneConfig = this.formConfig.sceneList.find(item => item.uuid === currentSceneUuid); if (sceneConfig) { if (formConfig.tableList) { formConfig.tableList.forEach(item => { -- Gitee