From f59c918c04c82f8edcfa362c67c08ae4c8559a22 Mon Sep 17 00:00:00 2001
From: liwenxuan <1298531568@qq.com>
Date: Tue, 30 Jul 2024 14:08:58 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=B3=E8=81=94=E8=A1=A8=E4=BD=86=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6=E8=AE=BE=E7=BD=AE=E5=B8=AE=E5=8A=A9=E6=8F=8F=E8=BF=B0?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/DesignForm/formControlAttr.vue | 20 +++++++++----------
 .../DesignForm/formControlPropertiNew.vue     | 13 ++++++------
 .../associatedFormsTinyace.vue                |  4 ++--
 .../associatedFormsTinyaceRange.vue           |  4 ++--
 4 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/src/components/DesignForm/formControlAttr.vue b/src/components/DesignForm/formControlAttr.vue
index 1e629eb..07c8737 100644
--- a/src/components/DesignForm/formControlAttr.vue
+++ b/src/components/DesignForm/formControlAttr.vue
@@ -3868,11 +3868,11 @@ const disabledIstrue = (val:string) => {
 					<div style="border: 1px solid gainsboro; height: 50%; padding-top: 20px;">
                         <ul>
                             <li>请从左侧面板<span style="color: red">右击</span>选择字段或选项</li>
-                            <li>支持<span style="color: red">英文</span>模式下运算符<!-- （+、-、*、/、>、<、==、） --></li>
-                            <li>支持<span style="color: red">"包含"</span>关键字,用于组织机构条件</li>
-                            <li>支持<span style="color: red">"当前用户"</span>关键字,用于角色条件</li>
-                            <li>参考场景：</li>
-                            <span style="margin-left: 14px;">年龄控件输入的值大于10时，需要隐藏当前控件，则可将隐藏条件设置为：年龄>10</span>
+                            <li>支持的符号：<span style="color: red">'==', '>=', '>', '<=', '<', '!='</span></li>
+                            <li>支持<span style="color: red">"包含,不包含,当前用户"</span>关键字,用于组织机构条件和角色条件</li>
+                            <li>参考举例：</li>
+                            <span style="margin-left: 14px;">年龄>10</span><br>
+                            <span style="margin-left: 14px;">企管部包含当前用户</span>
                         </ul>
                     </div>
 				</el-main>
@@ -3980,11 +3980,11 @@ const disabledIstrue = (val:string) => {
 					<div style="border: 1px solid gainsboro; height: 50%; padding-top: 20px;">
                         <ul>
                             <li>请从左侧面板<span style="color: red">右击</span>选择字段或选项</li>
-                            <li>支持<span style="color: red">英文</span>模式下运算符<!-- （+、-、*、/、>、<、==、） --></li>
-                            <li>支持<span style="color: red">"包含"</span>关键字,用于组织机构条件</li>
-                            <li>支持<span style="color: red">"当前用户"</span>关键字,用于角色条件</li>
-                            <li>参考场景：</li>
-                            <span style="margin-left: 14px;">仅可选择关联表单中年龄大于10的数据，则可将数据范围设置为：年龄>10</span>
+                            <li>支持的符号：<span style="color: red">'==', '>=', '>', '<=', '<', '!='</span></li>
+                            <li>支持<span style="color: red">"包含,不包含,当前用户"</span>关键字,用于组织机构条件和角色条件</li>
+                            <li>参考举例：</li>
+                            <span style="margin-left: 14px;">年龄>10</span><br>
+                            <span style="margin-left: 14px;">企管部包含当前用户</span>
                         </ul>
                     </div>
 				</el-main>
diff --git a/src/components/DesignForm/formControlPropertiNew.vue b/src/components/DesignForm/formControlPropertiNew.vue
index e6c2155..8930b93 100644
--- a/src/components/DesignForm/formControlPropertiNew.vue
+++ b/src/components/DesignForm/formControlPropertiNew.vue
@@ -3923,11 +3923,11 @@ const disabledIstrue = (val:string) => {
 					<div style="border: 1px solid gainsboro; height: 50%; padding-top: 20px;">
                         <ul>
                             <li>请从左侧面板<span style="color: red">右击</span>选择字段或选项</li>
-                            <li>支持<span style="color: red">英文</span>模式下运算符<!-- （+、-、*、/、>、<、==、） --></li>
-                            <li>支持<span style="color: red">"包含"</span>关键字,用于组织机构条件</li>
-                            <li>支持<span style="color: red">"当前用户"</span>关键字,用于角色条件</li>
-                            <li>参考场景：</li>
-                            <span style="margin-left: 14px;">年龄控件输入的值大于10时，需要隐藏当前控件，则可将隐藏条件设置为：年龄>10</span>
+                            <li>支持的符号：<span style="color: red">'==', '>=', '>', '<=', '<', '!='</span></li>
+                            <li>支持<span style="color: red">"包含,不包含,当前用户"</span>关键字,用于组织机构条件和角色条件</li>
+                            <li>参考举例：</li>
+                            <span style="margin-left: 14px;">年龄>10</span><br>
+                            <span style="margin-left: 14px;">企管部包含当前用户</span>
                         </ul>
                     </div>
 				</el-main>
@@ -4036,7 +4036,8 @@ const disabledIstrue = (val:string) => {
                         <ul>
                             <li>请从左侧面板<span style="color: red">右击</span>选择字段或选项</li>
                             <li>支持<span style="color: red">英文</span>模式下运算符<!-- （+、-、*、/、>、<、==、） --></li>
-                            <li>支持<span style="color: red">"包含"</span>关键字,用于组织机构条件</li>
+                            
+                            <li>支持<span style="color: red">"包含,不包含"</span>关键字,用于组织机构条件和角色条件</li>
                             <li>支持<span style="color: red">"当前用户"</span>关键字,用于角色条件</li>
                             <li>参考场景：</li>
                             <span style="margin-left: 14px;">仅可选择关联表单中年龄大于10的数据，则可将数据范围设置为：年龄>10</span>
diff --git a/src/widget/associatedforms/associatedFormsTinyace.vue b/src/widget/associatedforms/associatedFormsTinyace.vue
index 4606fea..471642e 100644
--- a/src/widget/associatedforms/associatedFormsTinyace.vue
+++ b/src/widget/associatedforms/associatedFormsTinyace.vue
@@ -85,7 +85,7 @@ watch(()=>tinymceHtml.value, (val:any) => {
         errorCondition("条件不能以蓝色块结尾")
       }else if(countSpanTags(gongShi.formulaHtml)>1){
         errorCondition("不允许出现多个蓝色块")
-      }else if(!containsSingleComparator(gongShi.mathsFormula)&&!gongShi.mathsFormula.includes("包含")){
+      }else if(!containsSingleComparator(gongShi.mathsFormula)&&!gongShi.mathsFormula.includes("包含")&&!gongShi.mathsFormula.includes("不包含")){
       
       errorCondition("不存在有效符号")
       
@@ -100,7 +100,7 @@ watch(()=>tinymceHtml.value, (val:any) => {
     { deep: true }
 )
 function checkEnding(str: string) {
-  const symbols = ['==', '>=', '>', '<=', '<', '!=', '='];
+  const symbols = ['==', '>=', '>', '<=', '<', '!=', '=','包含','不包含'];
   const trimmedStr = str.trim();
   for (let symbol of symbols) {
     if (trimmedStr.endsWith(symbol)) {
diff --git a/src/widget/associatedforms/associatedFormsTinyaceRange.vue b/src/widget/associatedforms/associatedFormsTinyaceRange.vue
index 4ce83e9..e73b9c5 100644
--- a/src/widget/associatedforms/associatedFormsTinyaceRange.vue
+++ b/src/widget/associatedforms/associatedFormsTinyaceRange.vue
@@ -84,7 +84,7 @@ watch(()=>tinymceHtml.value, (val:any) => {
         errorCondition("条件不能以蓝色块结尾")
       }else if(countSpanTags(gongShi.formulaHtml)>1){
         errorCondition("不允许出现多个蓝色块")
-      }else if(!containsSingleComparator(gongShi.mathsFormula)&&!gongShi.mathsFormula.includes("包含")){
+      }else if(!containsSingleComparator(gongShi.mathsFormula)&&!gongShi.mathsFormula.includes("包含")&&!gongShi.mathsFormula.includes("不包含")){
       
         errorCondition("不存在有效符号")
         
@@ -126,7 +126,7 @@ function containsSingleComparator(str: string) {
   return found;  
 } 
 function checkEnding(str: string) {
-  const symbols = ['==', '>=', '>', '<=', '<', '!=', '='];
+  const symbols = ['==', '>=', '>', '<=', '<', '!=', '=','包含','不包含'];
   const trimmedStr = str.trim();
   for (let symbol of symbols) {
     if (trimmedStr.endsWith(symbol)) {