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/3] =?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 @@
         </el-radio>
       </el-radio-group>
     </el-form-item>
-    <el-form-item v-if="condition.conditionType === ConditionType.RULE && condition.conditionGroups" label="条件规则">
+    <el-form-item
+      v-if="condition.conditionType === ConditionType.RULE && condition.conditionGroups"
+      label="条件规则"
+    >
       <div class="condition-group-tool">
         <div class="flex items-center">
           <div class="mr-4">条件组关系</div>
@@ -74,7 +77,16 @@
                     :label="field.title"
                     :value="field.field"
                     :disabled="!field.required"
-                  />
+                  >
+                    <el-tooltip
+                      content="表单字段非必填时不能作为流程分支条件"
+                      effect="dark"
+                      placement="right-start"
+                      v-if="!field.required"
+                    >
+                      <span>{{ field.title }}</span>
+                    </el-tooltip>
+                  </el-option>
                 </el-select>
               </el-form-item>
             </div>
-- 
Gitee


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/3] =?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'
                 }"
               >
-                <el-select style="width: 160px" v-model="rule.leftSide">
+                <el-select style="width: 160px" v-model="rule.leftSide" clearable>
                   <el-option
                     v-for="(field, fIdx) in fieldOptions"
                     :key="fIdx"
-- 
Gitee


From 95452312c542a432fd00d8cc2a43957fab985311 Mon Sep 17 00:00:00 2001
From: lizhixian <18210040298@163.com>
Date: Thu, 13 Mar 2025 17:41:08 +0800
Subject: [PATCH 3/3] =?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
 }
 
 /** 处理审批通过和不通过的操作 */
-- 
Gitee