From 1cd3aed35b742cb9c042c03d34919923ba1dfbd0 Mon Sep 17 00:00:00 2001
From: liwenxuan <1298531568@qq.com>
Date: Thu, 21 Nov 2024 15:54:04 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=B3=E8=81=94=E8=A1=A8=E5=8D=95=E5=A4=9A?=
 =?UTF-8?q?=E5=8F=98=E9=87=8F=E6=95=B0=E6=8D=AE=E5=A1=AB=E5=85=85=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DesignForm/formControlPropertiNew.vue     |  2 +-
 .../DesignForm/public/form/form.vue           |  9 +++-
 .../associatedforms/associatedForms.vue       | 19 +++++++-
 .../associatedFormsTinyaceRange.vue           | 45 ++++++++++++++++---
 4 files changed, 67 insertions(+), 8 deletions(-)

diff --git a/src/components/DesignForm/formControlPropertiNew.vue b/src/components/DesignForm/formControlPropertiNew.vue
index addbb75..1d439ad 100644
--- a/src/components/DesignForm/formControlPropertiNew.vue
+++ b/src/components/DesignForm/formControlPropertiNew.vue
@@ -4821,7 +4821,7 @@ const radioChangeSet = (val:any) => {
 				<el-main style="border: 1px solid gainsboro; padding: 3px;" class="associatedFormsHideDialogMain">
 					<div style="border: 1px solid gainsboro; height: 7%; border-bottom: 0px; padding-top: 3px; padding-left: 5px; background-color: #E6F3FE;">仅可选择符合以下条件的数据</div>
 					<div  id="associatedFormsHideEditArea" style="border: 1px solid gainsboro; height: 38%; border-bottom: 0px;">
-                        <AssociatedFormsTinyaceRange ref="aftRange" :aft-text="controlData.control.dataRangeConditionHtml" :aft-text-copy = "controlData.control.dataRangeConditionHtmlCopy" @text-change = "aftTextChangedRange" @gongshi-change = "aftGongshiChangedRange"></AssociatedFormsTinyaceRange>
+                        <AssociatedFormsTinyaceRange ref="aftRange" :aft-text="controlData.control.dataRangeConditionHtml" :aft-text-copy = "controlData.control.dataRangeConditionHtmlCopy" :current-form = "props.customerformid" @text-change = "aftTextChangedRange" @gongshi-change = "aftGongshiChangedRange"></AssociatedFormsTinyaceRange>
                         <!-- <div style="border: 1px solid #4189EF;width:90px;height:26px;border-radius: 3px;padding:2px;text-align: center;cursor:pointer;float: right;margin-top: -32px;margin-right: 5px;z-index:99999999;position: relative;">
                             <span style="color: #4189EF;font:6px;margin-right: 5px;">fx</span>插入函数
                         </div> -->
diff --git a/src/components/DesignForm/public/form/form.vue b/src/components/DesignForm/public/form/form.vue
index a0c2cc8..f1b47a0 100644
--- a/src/components/DesignForm/public/form/form.vue
+++ b/src/components/DesignForm/public/form/form.vue
@@ -443,6 +443,8 @@ if(formProps.value.type!=5){
 
 	return hideFieldArr
 }
+let asfRangeDoubleCondiChangeObj = ref()
+provide('asfRangeDoubleCondiChangeObj',asfRangeDoubleCondiChangeObj)
 
 let oldModelStr = ""
 watch(() => model.value,(newVal) => {
@@ -472,7 +474,12 @@ watch(() => model.value,(newVal) => {
 					let field = a[a.length-1]
 					if(currentChangeKey==field){
 						let toShowDoubleCondiValVal = model.value[currentChangeKey]
-						console.log("关联表单"+asfName+"应该更新其选项,只显示doubleCondiVal为"+toShowDoubleCondiValVal+"的选项")
+						//console.log("关联表单"+asfName+"应该更新其选项,只显示doubleCondiVal为"+toShowDoubleCondiValVal+"的选项")
+						let obj = {
+							asfName:asfName,
+							toShowDoubleCondiValVal:toShowDoubleCondiValVal
+						} 
+						asfRangeDoubleCondiChangeObj.value = obj
 						//console.log(field)
 					}
 				}
diff --git a/src/widget/associatedforms/associatedForms.vue b/src/widget/associatedforms/associatedForms.vue
index d9cc65d..6f95b42 100644
--- a/src/widget/associatedforms/associatedForms.vue
+++ b/src/widget/associatedforms/associatedForms.vue
@@ -16,7 +16,7 @@
 <script lang='ts' setup>
 import request from '@/utils/request';
 import { formProps } from 'element-plus';
-
+import { inject } from 'vue'
 import { FormItem, FormList } from '@/api/DesignForm/types'
 /* const props = defineProps({
   // eslint-disable-next-line vue/require-default-prop
@@ -31,6 +31,21 @@ import { FormItem, FormList } from '@/api/DesignForm/types'
   },
 }) */
 
+const asfRangeDoubleCondiChangeObj = inject('asfRangeDoubleCondiChangeObj')
+watch(() => asfRangeDoubleCondiChangeObj,(newVal:any) => {
+  value1.value = ""
+  value2.value = ""
+  //console.log(newVal.value)
+  let newValObj = JSON.parse(JSON.stringify(newVal.value));
+  //console.log(newValObj)
+  //console.log(asfDataTitlesData)
+  let toShowDoubleCondiValValStr = newValObj.toShowDoubleCondiValVal+"";
+  //console.log(toShowDoubleCondiValValStr)
+  const filteredData = asfDataTitlesData.filter((item: any) => item.doubleCondiVal == toShowDoubleCondiValValStr);
+  //console.log(filteredData)
+  options.value  = filteredData
+  //console.log(options.value)
+},{deep: true})
 const props = withDefaults(
     defineProps<{
 		data: FormList
@@ -56,9 +71,11 @@ function hasTableProperty(obj: object): boolean {
     }
     return false;
 }
+let asfDataTitlesData: any = []
 onMounted(()=>{
     if(props.data.control.formid!=null&&props.data.control.formid!=""){
       getAsfDataTitles().then(({ data }) => {
+        asfDataTitlesData = data
         //console.log(data)
         options.value = data
 				value1.value = props.formProps.model[props.data.name]
diff --git a/src/widget/associatedforms/associatedFormsTinyaceRange.vue b/src/widget/associatedforms/associatedFormsTinyaceRange.vue
index 205ece4..eb95549 100644
--- a/src/widget/associatedforms/associatedFormsTinyaceRange.vue
+++ b/src/widget/associatedforms/associatedFormsTinyaceRange.vue
@@ -40,6 +40,12 @@ const props = defineProps({
 			return {}
 		} 
   },
+  currentForm:{ 
+    type: String, 
+    default(){
+			return {}
+		} 
+  },
 })
 
 let $emit = defineEmits(["textChange","gongshiChange"]);
@@ -74,16 +80,45 @@ watch(()=>tinymceHtml.value, (val:any) => {
         mathsString:tinymceBox.value.innerText,
         mathsFormula:suanShitwo,
       }
-      
+      /* 
+      console.log(props.currentForm)
+      console.log(countSpanTags(gongShi.formulaHtml)) */
       $emit('gongshiChange',gongShi);
       if(containsNewline(gongShi.mathsString)){
         errorCondition("条件不允许换行")
       }else if(!gongShi.formulaHtml.startsWith("<p><span")){
         errorCondition("条件需以蓝色块开头")
-      }else if(gongShi.formulaHtml.endsWith("</span></p>")){
-        errorCondition("条件不能以蓝色块结尾")
-      }else if(countSpanTags(gongShi.formulaHtml)>1){
-        errorCondition("不允许出现多个蓝色块")
+      }else if(countSpanTags(gongShi.formulaHtml)>=2){
+        if(countSpanTags(gongShi.formulaHtml)>2){
+          errorCondition("不允许超过2个蓝色块")
+        }else{
+          if(!gongShi.formulaHtml.endsWith("</span></p>")){
+            errorCondition("请检查您的条件")
+          }else{
+            /* console.log(gongShi)
+            console.log(props.currentForm) */
+            const parts = gongShi.formulaHtml.split(':');
+            if (parts.length >= 2) {
+                const result = parts[parts.length - 2];
+                //console.log(result);
+                if(result.startsWith("table")){
+                  errorCondition("第二个蓝色块不支持选择子表中的字段")
+                }else{
+                  if(props.currentForm+""==result){
+                    //console.log(result)
+                    succCondition()
+                  }else{
+                    //errorCondition("若要设置两个蓝色块,请按照: 关联的表单.字段A==当前表单.字段B的形式设置条件")
+                    errorCondition("请对调这两个蓝色块")
+                  }
+                }
+            } else {
+                console.log("输入的字符串不符合预期格式");
+            }
+          }
+          
+        }
+        
       }else if(!containsSingleComparator(gongShi.mathsFormula)&&!gongShi.mathsFormula.includes("包含")&&!gongShi.mathsFormula.includes("不包含")){
       
         errorCondition("不存在有效符号或关键字")