From 5538e6e05aa037fd9ad28daa7f40c4cdb155d6b4 Mon Sep 17 00:00:00 2001 From: lizhixian <18210040298@163.com> Date: Thu, 13 Mar 2025 16:41:49 +0800 Subject: [PATCH 1/5] =?UTF-8?q?fix=EF=BC=9A=E6=B7=BB=E5=8A=A0simple?= =?UTF-8?q?=E8=AE=BE=E8=AE=A1=E5=99=A8=EF=BC=8C=E5=88=86=E6=94=AF=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6=E4=B8=8B=E6=8B=89=E6=A1=86=E9=9D=9E=E5=BF=85=E5=A1=AB?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/nodes-config/components/Condition.vue | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/src/components/SimpleProcessDesignerV2/src/nodes-config/components/Condition.vue b/src/components/SimpleProcessDesignerV2/src/nodes-config/components/Condition.vue index d72165460..3d6ae611e 100644 --- a/src/components/SimpleProcessDesignerV2/src/nodes-config/components/Condition.vue +++ b/src/components/SimpleProcessDesignerV2/src/nodes-config/components/Condition.vue @@ -12,7 +12,10 @@ - +
条件组关系
@@ -74,7 +77,16 @@ :label="field.title" :value="field.field" :disabled="!field.required" - /> + > + + {{ field.title }} + +
From 49cca0cde026c602a4b1692876504c5bac4efcdd Mon Sep 17 00:00:00 2001 From: lizhixian <18210040298@163.com> Date: Thu, 13 Mar 2025 17:23:51 +0800 Subject: [PATCH 2/5] =?UTF-8?q?feat:=20=E5=88=86=E6=94=AF=E8=8A=82?= =?UTF-8?q?=E7=82=B9=E6=9D=A1=E4=BB=B6=E4=B8=8B=E6=8B=89=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0clearable?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/nodes-config/components/Condition.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/SimpleProcessDesignerV2/src/nodes-config/components/Condition.vue b/src/components/SimpleProcessDesignerV2/src/nodes-config/components/Condition.vue index 3d6ae611e..366908489 100644 --- a/src/components/SimpleProcessDesignerV2/src/nodes-config/components/Condition.vue +++ b/src/components/SimpleProcessDesignerV2/src/nodes-config/components/Condition.vue @@ -70,7 +70,7 @@ trigger: 'change' }" > - + Date: Thu, 13 Mar 2025 17:41:08 +0800 Subject: [PATCH 3/5] =?UTF-8?q?review=EF=BC=9A=E9=87=8D=E6=9E=84=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../detail/ProcessInstanceOperationButton.vue | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/src/views/bpm/processInstance/detail/ProcessInstanceOperationButton.vue b/src/views/bpm/processInstance/detail/ProcessInstanceOperationButton.vue index f69035f9a..529a9aaa7 100644 --- a/src/views/bpm/processInstance/detail/ProcessInstanceOperationButton.vue +++ b/src/views/bpm/processInstance/detail/ProcessInstanceOperationButton.vue @@ -749,19 +749,16 @@ const selectNextAssigneesConfirm = (id: string, userList: any[]) => { } /** 审批通过时，校验每个自选审批人的节点是否都已配置了审批人 */ const validateNextAssignees = () => { - // TODO @小北：可以考虑 Object.keys(nextAssigneesActivityNode.value).length === 0) return true；减少括号层级 + if (Object.keys(nextAssigneesActivityNode.value).length === 0) return true // 如果需要自选审批人，则校验自选审批人 - if (Object.keys(nextAssigneesActivityNode.value).length > 0) { - // 校验每个节点是否都已配置审批人 - for (const item of nextAssigneesActivityNode.value) { - if (isEmpty(approveReasonForm.nextAssignees[item.id])) { - // TODO @小北：可以打印下节点名，嘿嘿。 - message.warning('下一个节点的审批人不能为空!') - return false - } + // 校验每个节点是否都已配置审批人 + for (const item of nextAssigneesActivityNode.value) { + if (isEmpty(approveReasonForm.nextAssignees[item.id])) { + console.log('下一个节点【' + item.name + '】的审批人不能为空!') + message.warning('下一个节点的审批人不能为空!') + return false } } - return true } /** 处理审批通过和不通过的操作 */ From 5c6cd4dda05bbb9e8e724d77aaf846b81bf6029c Mon Sep 17 00:00:00 2001 From: LesanOuO <1960681385@qq.com> Date: Sat, 15 Mar 2025 10:51:43 +0800 Subject: [PATCH 4/5] =?UTF-8?q?fix:=20=E4=BB=A3=E7=A0=81=E8=AF=84=E5=AE=A1?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/bpm/model/form/ExtraSettings.vue | 36 +++++++++++----------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/src/views/bpm/model/form/ExtraSettings.vue b/src/views/bpm/model/form/ExtraSettings.vue index 1d685c75e..3c8e689b1 100644 --- a/src/views/bpm/model/form/ExtraSettings.vue +++ b/src/views/bpm/model/form/ExtraSettings.vue @@ -147,16 +147,16 @@
流程启动后通知
@@ -167,16 +167,16 @@
流程启动后通知
@@ -247,32 +247,32 @@ const numberExample = computed(() => { }) /** 是否开启流程前置通知 */ -const preProcessNotifyEnable = ref(false) +const processBeforeTriggerEnable = ref(false) const handlePreProcessNotifyEnableChange = (val: boolean | string | number) => { if (val) { - modelData.value.preProcessNotifySetting = { + modelData.value.processBeforeTriggerSetting = { url: '', header: [], body: [], response: [] } } else { - modelData.value.preProcessNotifySetting = null + modelData.value.processBeforeTriggerSetting = null } } /** 是否开启流程后置通知 */ -const postProcessNotifyEnable = ref(false) +const processAfterTriggerEnable = ref(false) const handlePostProcessNotifyEnableChange = (val: boolean | string | number) => { if (val) { - modelData.value.postProcessNotifySetting = { + modelData.value.processAfterTriggerSetting = { url: '', header: [], body: [], response: [] } } else { - modelData.value.postProcessNotifySetting = null + modelData.value.processAfterTriggerSetting = null } } @@ -335,11 +335,11 @@ const initData = () => { summary: [] } } - if (modelData.value.preProcessNotifySetting) { - preProcessNotifyEnable.value = true + if (modelData.value.processBeforeTriggerSetting) { + processBeforeTriggerEnable.value = true } - if (modelData.value.postProcessNotifySetting) { - postProcessNotifyEnable.value = true + if (modelData.value.processAfterTriggerSetting) { + processAfterTriggerEnable.value = true } } defineExpose({ initData }) From 9f96c6177d90f7f6787e13dc9c941ab18dae4fa4 Mon Sep 17 00:00:00 2001 From: YunaiV Date: Sat, 15 Mar 2025 16:51:01 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E3=80=90=E4=BB=A3=E7=A0=81=E8=AF=84?= =?UTF-8?q?=E5=AE=A1=E3=80=91BPM=EF=BC=9Afeat=EF=BC=9A=E6=B7=BB=E5=8A=A0si?= =?UTF-8?q?mple=E8=AE=BE=E8=AE=A1=E5=99=A8=EF=BC=8C=E5=88=86=E6=94=AF?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E4=B8=8B=E6=8B=89=E6=A1=86=E9=9D=9E=E5=BF=85?= =?UTF-8?q?=E5=A1=AB=E5=AD=97=E6=AE=B5=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../detail/ProcessInstanceOperationButton.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/views/bpm/processInstance/detail/ProcessInstanceOperationButton.vue b/src/views/bpm/processInstance/detail/ProcessInstanceOperationButton.vue index 529a9aaa7..ca530cb30 100644 --- a/src/views/bpm/processInstance/detail/ProcessInstanceOperationButton.vue +++ b/src/views/bpm/processInstance/detail/ProcessInstanceOperationButton.vue @@ -749,12 +749,12 @@ const selectNextAssigneesConfirm = (id: string, userList: any[]) => { } /** 审批通过时，校验每个自选审批人的节点是否都已配置了审批人 */ const validateNextAssignees = () => { - if (Object.keys(nextAssigneesActivityNode.value).length === 0) return true - // 如果需要自选审批人，则校验自选审批人 - // 校验每个节点是否都已配置审批人 + if (Object.keys(nextAssigneesActivityNode.value).length === 0) { + return true + } + // 如果需要自选审批人，则校验每个节点是否都已配置审批人 for (const item of nextAssigneesActivityNode.value) { if (isEmpty(approveReasonForm.nextAssignees[item.id])) { - console.log('下一个节点【' + item.name + '】的审批人不能为空!') message.warning('下一个节点的审批人不能为空!') return false }