From 4f24141689739daddd2dd07d4a3395e218e66dad Mon Sep 17 00:00:00 2001
From: jason <2667446@qq.com>
Date: Mon, 13 May 2024 20:54:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=BF=E9=92=89=E9=92=89=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E8=AE=BE=E8=AE=A1=E5=99=A8-=20=E6=9D=A1=E4=BB=B6=E8=A7=84?=
 =?UTF-8?q?=E5=88=99=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SimpleProcessDesignerV2/src/consts.ts     | 33 +++++++++----------
 .../src/nodes-config/ConditionNodeConfig.vue  | 27 ++++++++-------
 2 files changed, 32 insertions(+), 28 deletions(-)

diff --git a/src/components/SimpleProcessDesignerV2/src/consts.ts b/src/components/SimpleProcessDesignerV2/src/consts.ts
index e257f726..db8cca28 100644
--- a/src/components/SimpleProcessDesignerV2/src/consts.ts
+++ b/src/components/SimpleProcessDesignerV2/src/consts.ts
@@ -167,22 +167,21 @@ export const COMPARISON_OPERATORS : DictDataVO = [
   {
     value: '!=',
     label: '不等于',
+  },
+  {
+    value: '>',
+    label: '大于',
+  },
+  {
+    value: '>=',
+    label: '大于等于',
+  },
+  {
+    value: '<',
+    label: '小于',
+  },
+  {
+    value: '<=',
+    label: '小于等于',
   }
-  // 待完善
-  // {
-  //   value: '>',
-  //   label: '大于',
-  // },
-  // {
-  //   value: '>=',
-  //   label: '大于等于',
-  // },
-  // {
-  //   value: '<',
-  //   label: '小于',
-  // },
-  // {
-  //   value: '<=',
-  //   label: '小于等于',
-  // }
 ]
diff --git a/src/components/SimpleProcessDesignerV2/src/nodes-config/ConditionNodeConfig.vue b/src/components/SimpleProcessDesignerV2/src/nodes-config/ConditionNodeConfig.vue
index 6cc5482e..679fdbfe 100644
--- a/src/components/SimpleProcessDesignerV2/src/nodes-config/ConditionNodeConfig.vue
+++ b/src/components/SimpleProcessDesignerV2/src/nodes-config/ConditionNodeConfig.vue
@@ -4,7 +4,7 @@
     v-model="settingVisible"
     :show-close="false"
     :size="588"
-    :before-close="handleClose"
+    :before-close=" handleClose"
    >
    <template #header>
       <div class="config-header">
@@ -216,12 +216,13 @@ const closeDrawer = () => {
   settingVisible.value = false
 }
 
-const handleClose = async (done: (cancel?: boolean) => void) => {
-  if( await saveConfig()){
-    done(false); // 传入 false 阻止关闭  
-  }else {
-    done();
-  }
+const handleClose = async  (done: (cancel?: boolean) => void) => {
+  const isSuccess = await saveConfig();
+  if ( !isSuccess) {
+      done(true); // 传入 true 阻止关闭  
+    } else {
+      done();
+    }
 }
 // 表单校验规则
 const formRules = reactive({
@@ -231,13 +232,12 @@ const formRules = reactive({
 const formRef = ref() // 表单 Ref
 
 // 保存配置
-const saveConfig = async () => {
+const saveConfig =  async () => {
   if (!currentNode.value.attributes.defaultFlow) {
-      // 校验表单
+    // 校验表单
     if (!formRef) return false
     const valid = await formRef.value.validate()
     if (!valid) return false
-    
     const showText = getShowText();
     if(!showText){
       return false;
@@ -269,7 +269,7 @@ const getShowText = () : string => {
     const conditionGroup = conditionGroups.value.conditions.map( item => {
       return  '(' + item.rules.map( rule => {
           if ( rule.leftSide  && rule.rightSide) {
-            return getFieldTitle(rule.leftSide) + " " + rule.opName + " " + rule.rightSide 
+            return getFieldTitle(rule.leftSide) + " " + getOpName(rule.opCode) + " " + rule.rightSide 
           }else {
             // 又一条规则不完善。提示错误
             warningMesg = '请完善条件规则'
@@ -370,6 +370,11 @@ const getFieldTitle = (field:string) : string => {
   return item?.title;
 }
 
+const getOpName = (opCode: string) : string => {
+  const opName = COMPARISON_OPERATORS.find( item => item.value === opCode)
+  return opName?.label
+}
+
 </script>
 
 <style lang="scss" scoped>