From dc91674736868237af6b8c24bb13e2fc7e490676 Mon Sep 17 00:00:00 2001
From: liwenxuan <1298531568@qq.com>
Date: Tue, 13 Aug 2024 11:40:33 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=85=B3=E8=81=94=E8=A1=A8=E5=8D=95=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E6=95=B0=E6=8D=AE=E8=8C=83=E5=9B=B4=E6=9D=A1=E4=BB=B6?=
 =?UTF-8?q?=E8=A7=A3=E6=9E=90=E6=95=88=E6=9E=9C=E5=AE=9E=E7=8E=B0=202.?=
 =?UTF-8?q?=E5=85=B3=E8=81=94=E8=A1=A8=E5=8D=95=E8=BE=93=E5=85=A5=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6=E6=A0=A1=E9=AA=8C=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../associatedforms/associatedForms.vue       |  2 +-
 .../associatedFormsTinyaceRange.vue           | 26 +++++++++++++++++++
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/src/widget/associatedforms/associatedForms.vue b/src/widget/associatedforms/associatedForms.vue
index 3062a00..d148690 100644
--- a/src/widget/associatedforms/associatedForms.vue
+++ b/src/widget/associatedforms/associatedForms.vue
@@ -74,7 +74,7 @@ function getAsfDataTitles() {
         rangeString:props.data.control.dataRangeGongShi.mathsString,
         hideFormula:props.data.control.hideGongShi.mathsFormula,
         hideString:props.data.control.hideGongShi.mathsString,
-        
+        masterOnField:props.data.name,
       },
   });
 }
diff --git a/src/widget/associatedforms/associatedFormsTinyaceRange.vue b/src/widget/associatedforms/associatedFormsTinyaceRange.vue
index 00708fb..205ece4 100644
--- a/src/widget/associatedforms/associatedFormsTinyaceRange.vue
+++ b/src/widget/associatedforms/associatedFormsTinyaceRange.vue
@@ -90,6 +90,8 @@ watch(()=>tinymceHtml.value, (val:any) => {
         
       }else if(checkEnding(gongShi.mathsFormula)){
         errorCondition("不能以符号或关键字为结尾")
+      }else if(checkRoleStartAndOrgEnd(gongShi.mathsFormula)||checkFormFieldStartAndOrgEnd(gongShi.mathsFormula)||checkFormFieldStartAndOrgEnd2(gongShi.mathsFormula)){
+        errorCondition("此条件无无实际意义")
       }else{
         succCondition()
       }
@@ -98,6 +100,30 @@ watch(()=>tinymceHtml.value, (val:any) => {
 },
     { deep: true }
 )
+
+function checkRoleStartAndOrgEnd(str: string) {
+  if (str.startsWith('roleid:') && str.endsWith('数据所属部门')) {
+    return true;
+  } else {
+    return false;
+  }
+}
+function checkFormFieldStartAndOrgEnd(str: string) {
+  if (str.startsWith('formField:') && str.endsWith('数据所属部门')) {
+    return true;
+  } else {
+    return false;
+  }
+}
+
+function checkFormFieldStartAndOrgEnd2(str: string) {
+  if (str.startsWith('formField:') && str.endsWith('数据拥有者')) {
+    return true;
+  } else {
+    return false;
+  }
+}
+
 function containsSingleComparator(str: string) {  
   // 定义需要检查的运算符  
   const comparators = ['==', '>=', '>', '<=', '<', '!='];