Merge branch 'lwx_13'

# Conflicts:
#	src/types/components.d.ts

src/api/DesignForm/types.ts

@@ -103,7 +103,8 @@ export interface formData{
     form: {
         size: any;
 		name:any,
-		formName:any
+		formName:any,
+		dataTitle:any
     };
     config: any;
 	events?:any;

src/components/DesignForm/assembly/index.ts

@@ -753,9 +753,19 @@ export default [
 					modelValue: '',
 					hideConditionHtml: '',
 					hideConditionHtmlCopy: '',
+					hideGongShi:{
+						formulaHtml:'',
+						mathsFormula:'',
+						mathsString:'',
+					},
 					formid: '',
 					dataRangeConditionHtml: '',
 					dataRangeConditionHtmlCopy: '',
+					dataRangeGongShi:{
+						formulaHtml:'',
+						mathsFormula:'',
+						mathsString:'',
+					},
 					saveFlag: false,
 					asfasfLabel:'',
 					fillRoles: [

src/components/DesignForm/formControlAttr.vue

@@ -2263,9 +2263,20 @@ function aftTextChanged(str:string){
     controlData.value.control.hideConditionHtml = str
 }
 
+function aftGongshiChanged(gongshi:any){
+    controlData.value.control.hideGongShi.formulaHtml = gongshi.formulaHtml
+    controlData.value.control.hideGongShi.mathsFormula = gongshi.mathsFormula
+    controlData.value.control.hideGongShi.mathsString = gongshi.mathsString
+}
+
 function aftTextChangedRange(str:string){
     controlData.value.control.dataRangeConditionHtml = str
 }
+function aftGongshiChangedRange(gongshi:any){
+    controlData.value.control.dataRangeGongShi.formulaHtml = gongshi.formulaHtml
+    controlData.value.control.dataRangeGongShi.mathsFormula = gongshi.mathsFormula
+    controlData.value.control.dataRangeGongShi.mathsString = gongshi.mathsString
+}
 //asf隐藏条件取消编辑
 function asfhTextCancel(){
     determine.value = false
@@ -3458,6 +3469,21 @@ const disabledIstrue = (val:string) => {
 									</el-upload>
 								</el-form-item>
 
+                                <el-form-item class="form_cont">
+                                    
+                                    数据标题
+                                    <el-tree-select
+                                        v-model="formData.dataTitle"
+                                        multiple
+                                        clearable
+                                        collapse-tags
+                                        :data="associatedFormsCurrentFormFieldTree"
+                                        :render-after-expand="false"
+                                        style="width: 240px"
+                                    />
+                                    
+                                </el-form-item>
+                        
                         <template v-if="!state.isSearch">
                             <el-divider content-position="left">接口数据事件</el-divider>
     
@@ -3822,7 +3848,7 @@ const disabledIstrue = (val:string) => {
 				<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: 63%; border-bottom: 0px;">
-                        <AssociatedFormsTinyace ref="aft" :aft-text="controlData.control.hideConditionHtml" :aft-text-copy = "controlData.control.hideConditionHtmlCopy" @text-change = "aftTextChanged"></AssociatedFormsTinyace>
+                        <AssociatedFormsTinyace ref="aft" :aft-text="controlData.control.hideConditionHtml" :aft-text-copy = "controlData.control.hideConditionHtmlCopy" @text-change = "aftTextChanged" @gongshi-change = "aftGongshiChanged"></AssociatedFormsTinyace>
                         <!-- <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> -->
@@ -3932,7 +3958,7 @@ const disabledIstrue = (val:string) => {
 				<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: 63%; border-bottom: 0px;">
-                        <AssociatedFormsTinyaceRange ref="aftRange" :aft-text="controlData.control.dataRangeConditionHtml" :aft-text-copy = "controlData.control.dataRangeConditionHtmlCopy" @text-change = "aftTextChangedRange"></AssociatedFormsTinyaceRange>
+                        <AssociatedFormsTinyaceRange ref="aftRange" :aft-text="controlData.control.dataRangeConditionHtml" :aft-text-copy = "controlData.control.dataRangeConditionHtmlCopy" @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> -->

src/components/DesignForm/formControlPropertiNew.vue

@@ -2305,9 +2305,20 @@ function aftTextChanged(str:string){
     controlData.value.control.hideConditionHtml = str
 }
 
+function aftGongshiChanged(gongshi:any){
+    controlData.value.control.hideGongShi.formulaHtml = gongshi.formulaHtml
+    controlData.value.control.hideGongShi.mathsFormula = gongshi.mathsFormula
+    controlData.value.control.hideGongShi.mathsString = gongshi.mathsString
+}
+
 function aftTextChangedRange(str:string){
     controlData.value.control.dataRangeConditionHtml = str
 }
+function aftGongshiChangedRange(gongshi:any){
+    controlData.value.control.dataRangeGongShi.formulaHtml = gongshi.formulaHtml
+    controlData.value.control.dataRangeGongShi.mathsFormula = gongshi.mathsFormula
+    controlData.value.control.dataRangeGongShi.mathsString = gongshi.mathsString
+}
 //asf隐藏条件取消编辑
 function asfhTextCancel(){
     determine.value = false
@@ -3507,6 +3518,20 @@ const disabledIstrue = (val:string) => {
 										<el-icon v-else class="avatar-uploader-icon"><Plus /></el-icon>
 									</el-upload>
 								</el-form-item>
+                                <el-form-item class="form_cont">
+                                    
+                                    数据标题
+                                    <el-tree-select
+                                        v-model="formData.dataTitle"
+                                        multiple
+                                        clearable
+                                        collapse-tags
+                                        :data="associatedFormsCurrentFormFieldTree"
+                                        :render-after-expand="false"
+                                        style="width: 240px"
+                                    />
+                                    
+                                </el-form-item>
                         
                         <template v-if="!state.isSearch">
                             <el-divider content-position="left">接口数据事件</el-divider>
@@ -3872,7 +3897,7 @@ const disabledIstrue = (val:string) => {
 				<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: 63%; border-bottom: 0px;">
-                        <AssociatedFormsTinyace ref="aft" :aft-text="controlData.control.hideConditionHtml" :aft-text-copy = "controlData.control.hideConditionHtmlCopy" @text-change = "aftTextChanged"></AssociatedFormsTinyace>
+                        <AssociatedFormsTinyace ref="aft" :aft-text="controlData.control.hideConditionHtml" :aft-text-copy = "controlData.control.hideConditionHtmlCopy" @text-change = "aftTextChanged" @gongshi-change = "aftGongshiChanged"></AssociatedFormsTinyace>
                         <!-- <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> -->
@@ -3982,7 +4007,7 @@ const disabledIstrue = (val:string) => {
 				<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: 63%; border-bottom: 0px;">
-                        <AssociatedFormsTinyaceRange ref="aftRange" :aft-text="controlData.control.dataRangeConditionHtml" :aft-text-copy = "controlData.control.dataRangeConditionHtmlCopy" @text-change = "aftTextChangedRange"></AssociatedFormsTinyaceRange>
+                        <AssociatedFormsTinyaceRange ref="aftRange" :aft-text="controlData.control.dataRangeConditionHtml" :aft-text-copy = "controlData.control.dataRangeConditionHtmlCopy" @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> -->

src/views/sysworkflow/lowcodepage/appPage/appPageForm/openAppFormPage.vue

@@ -170,7 +170,7 @@ const gainAppFormPageInit = () =>{
 				if(stateData.tableData.columns.length>0){
 					for(let i = 0;i<stateData.tableData.columns.length;i++){
 						if(stateData.tableData.columns[i].config!=undefined && stateData.tableData.columns[i].control!=undefined){
-							console.log(stateData.tableData.columns[i])
+							//console.log(stateData.tableData.columns[i])
 							let paramx:string = ""+stateData.tableData.columns[i].control.optionsValue3Field
 							/*
 								在这里请求后台获取字段
@@ -179,7 +179,7 @@ const gainAppFormPageInit = () =>{
 								stateData.tableData.columns[i].options = data
 								if(stateData.searchData.length>0){
 									for(let j = 0;j<stateData.searchData.length;j++){
-										console.log(stateData.searchData[j])
+										//console.log(stateData.searchData[j])
 										if(stateData.searchData[j].id==stateData.tableData.columns[i].id){
 											stateData.searchData[j].options = data
 										}

src/views/sysworkflow/lowcodepage/appPage/createAppFormPage.vue

@@ -73,7 +73,8 @@ const state = reactive<formStruct>({
 		form: {
 			size: 'default',
 			name:'',
-			formName: formConfigCont.formName
+			formName: formConfigCont.formName,
+			dataTitle: []
 		},
 		config: {
 			groupKey:props.groupKey

src/widget/associatedforms/associatedForms.vue

@@ -1,15 +1,52 @@
 <template>
 
 
-  <el-input v-model="input" style="width: 240px" placeholder="" />
+  <!-- <el-input v-model="input" style="width: 240px" placeholder="" /> -->
-
+  <el-select v-model="value1"  placeholder="请选择" style="width: 240px">
+    <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value" />
+  </el-select>
 
 </template>
 
 <script setup>
 
-</script>
 
-<style>
+const props = defineProps({
+  // eslint-disable-next-line vue/require-default-prop
+  data: {
+    type: Object,
+  }
+})
+
+const value1 = ref('')
+
+const options = [
+  {
+    value: 'Option1',
+    label: 'Option1',
+  },
+  {
+    value: 'Option2',
+    label: 'Option2',
+  },
+  {
+    value: 'Option3',
+    label: 'Option3',
+  },
+  {
+    value: 'Option4',
+    label: 'Option4',
+  },
+  {
+    value: 'Option5',
+    label: 'Option5',
+  },
+]
+onMounted(()=>{
+	 console.log(props.data.control.hideConditionHtml)
+   console.log(props.data.control.dataRangeConditionHtml)
+})
+
+</script>
 
-</style>
+<style></style>

src/widget/associatedforms/associatedFormsTinyace.vue

@@ -6,6 +6,7 @@ import "tinymce/models/dom"; // 特别注意 tinymce 6.0.0 版本之后必须引
 import "tinymce/themes/silver/theme";
 import Editor from "@tinymce/tinymce-vue"; // 引入组件
 import { v4 as uuidv4 } from "uuid";
+import { ElMessage } from 'element-plus'
 
 let onlyNumber = uuidv4().replaceAll('-','').toString();   //获取唯一编码
 
@@ -42,11 +43,11 @@ const props = defineProps({
   },
 })
 
-let $emit = defineEmits(["textChange"]);
+let $emit = defineEmits(["textChange","gongshiChange"]);
 
 const tinymceHtml = ref("")
 tinymceHtml.value = props.aftText
-
+const tinymceBox = ref(null)
 
 
 onMounted(() => {
@@ -54,9 +55,123 @@ onMounted(() => {
 });
 watch(()=>tinymceHtml.value, (val:any) => {
     $emit('textChange',val);
+    nextTick(()=>{
+      let formulaOne = [];
+      let formulaTwo = [];
+      tinymceBox.value.childNodes.forEach(element => {
+        
+        element.childNodes.forEach(child => {
+          formulaOne.push(child.innerText?child.innerText:child.data)
+          if(child.dataset&&child.dataset.keyid){
+            formulaTwo.push(child.dataset.keyid)
+          }else{
+            formulaTwo.push(child.innerText?child.innerText:child.data)
+          }
+        })
+      });
+      let suanShitwo = formulaTwo.join('').replace(/\s+/g, "");
+      let gongShi ={
+        formulaHtml:tinymceBox.value.innerHTML,
+        mathsString:tinymceBox.value.innerText,
+        mathsFormula:suanShitwo,
+      }
+      $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(!containsSingleComparator(gongShi.mathsFormula)){
+        errorCondition("不存在有效符号")
+      }else if(checkEnding(gongShi.mathsFormula)){
+        errorCondition("不能以符号为结尾")
+      }else{
+        succCondition()
+      }
+    })
+    
   },
     { deep: true }
 )
+function checkEnding(str: string) {
+  const symbols = ['==', '>=', '>', '<=', '<', '!=', '='];
+  const trimmedStr = str.trim();
+  for (let symbol of symbols) {
+    if (trimmedStr.endsWith(symbol)) {
+      return true;
+    }
+  }
+  return false;
+}
+function containsSingleComparator(str: string) {  
+  // 定义需要检查的运算符  
+  const comparators = ['==', '>=', '>', '<=', '<', '!='];  
+  let found = false; // 用于标记是否找到运算符  
+  let i = 0; // 字符串索引  
+  
+  while (i < str.length - 1) { // 至少需要两个字符来形成运算符  
+    // 遍历每个可能的运算符  
+    for (const comparator of comparators) {  
+      if (str.substr(i, comparator.length) === comparator) {  
+        // 如果找到了一个运算符  
+        if (found) {  
+          // 如果已经找到了一个运算符，则返回false  
+          return false;  
+        }  
+        found = true; // 标记为已找到  
+        // 跳过当前找到的运算符的剩余部分，避免重复检查  
+        i += comparator.length - 1;  
+        break; // 跳出内层循环  
+      }  
+    }  
+    i++; // 继续检查下一个字符  
+  }  
+  
+  // 检查是否只找到了一个运算符  
+  return found;  
+} 
+
+function containsComparator(str: string) {  
+  if(str.includes("==")||str.includes("!=")||str.includes(">")||str.includes(">=")||str.includes("<")||str.includes("<=")){
+    return true
+  }else{
+    return false
+  }
+}
+const containsNewline = (str: string) => {  
+    //console.log("Testing string:", str); // 查看传递给函数的实际字符串  
+    return /\n/.test(str);  
+}; 
+const countSpanTags = (str: string) => {  
+  // 使用正则表达式匹配所有出现的<span>（不考虑闭合标签或属性）  
+  const matches = str.match(/<span\b[^>]*>/gi);  
+  // 如果matches是null，表示没有找到匹配项，返回0  
+  // 否则，返回匹配项数组的长度  
+  return matches ? matches.length : 0;  
+}; 
+function succCondition(){
+  ElMessage.closeAll()
+  ElMessage({
+    showClose: true,
+    message: '条件格式校验通过',
+    type: 'success',
+    duration:3500,
+  })
+}
+
+function errorCondition(str:string){
+  ElMessage.closeAll()
+  ElMessage({
+    showClose: true,
+    message: '条件格式错误 : '+str+' , 正确条件格式如 :    年龄==10',
+    type: 'error',
+    duration:3500,
+  })
+}
 
 
 const addIcon = (currentObject:any) =>{
@@ -83,6 +198,7 @@ const focusEditor = ()=>{
 }
 
 
+
 defineExpose({
   tinymceHtml,
   addIcon,
@@ -98,10 +214,18 @@ defineExpose({
 	<div >
     <editor :id="onlyNumber"   v-model="tinymceHtml" :init="tinymceInit" ></editor>
   </div>
+  <div class="isHidde">
+			<div ref="tinymceBox"  v-html="tinymceHtml"> </div>
+	</div>
 	
 
 </template>
 
 <style  lang='scss' scoped>
-	
+	.isHidde{
+    display:none;
+    position: fixed;
+      z-index: 1;
+    margin-top: -10px
+  }
 </style>

src/widget/associatedforms/associatedFormsTinyaceRange.vue

@@ -42,11 +42,11 @@ const props = defineProps({
   },
 })
 
-let $emit = defineEmits(["textChange"]);
+let $emit = defineEmits(["textChange","gongshiChange"]);
 
 const tinymceHtml = ref("")
 tinymceHtml.value = props.aftText
-
+const tinymceBox = ref(null)
 
 
 onMounted(() => {
@@ -54,9 +54,122 @@ onMounted(() => {
 });
 watch(()=>tinymceHtml.value, (val:any) => {
   $emit('textChange',val);
+  nextTick(()=>{
+      let formulaOne = [];
+      let formulaTwo = [];
+      tinymceBox.value.childNodes.forEach(element => {
+      
+        element.childNodes.forEach(child => {
+          formulaOne.push(child.innerText?child.innerText:child.data)
+          if(child.dataset&&child.dataset.keyid){
+            formulaTwo.push(child.dataset.keyid)
+          }else{
+            formulaTwo.push(child.innerText?child.innerText:child.data)
+          }
+        })
+      });
+      let suanShitwo = formulaTwo.join('').replace(/\s+/g, "");
+      let gongShi ={
+        formulaHtml:tinymceBox.value.innerHTML,
+        mathsString:tinymceBox.value.innerText,
+        mathsFormula:suanShitwo,
+      }
+      
+      $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(!containsSingleComparator(gongShi.mathsFormula)){
+        errorCondition("不存在有效符号")
+      }else if(checkEnding(gongShi.mathsFormula)){
+        errorCondition("不能以符号为结尾")
+      }else{
+        succCondition()
+      }
+    })
+    
 },
     { deep: true }
 )
+function containsSingleComparator(str: string) {  
+  // 定义需要检查的运算符  
+  const comparators = ['==', '>=', '>', '<=', '<', '!='];  
+  let found = false; // 用于标记是否找到运算符  
+  let i = 0; // 字符串索引  
+  
+  while (i < str.length - 1) { // 至少需要两个字符来形成运算符  
+    // 遍历每个可能的运算符  
+    for (const comparator of comparators) {  
+      if (str.substr(i, comparator.length) === comparator) {  
+        // 如果找到了一个运算符  
+        if (found) {  
+          // 如果已经找到了一个运算符，则返回false  
+          return false;  
+        }  
+        found = true; // 标记为已找到  
+        // 跳过当前找到的运算符的剩余部分，避免重复检查  
+        i += comparator.length - 1;  
+        break; // 跳出内层循环  
+      }  
+    }  
+    i++; // 继续检查下一个字符  
+  }  
+  
+  // 检查是否只找到了一个运算符  
+  return found;  
+} 
+function checkEnding(str: string) {
+  const symbols = ['==', '>=', '>', '<=', '<', '!=', '='];
+  const trimmedStr = str.trim();
+  for (let symbol of symbols) {
+    if (trimmedStr.endsWith(symbol)) {
+      return true;
+    }
+  }
+  return false;
+}
+function containsComparator(str: string) {  
+  if(str.includes("==")||str.includes("!=")||str.includes(">")||str.includes(">=")||str.includes("<")||str.includes("<=")){
+    return true
+  }else{
+    return false
+  }
+}
+const containsNewline = (str: string) => {  
+    //console.log("Testing string:", str); // 查看传递给函数的实际字符串  
+    return /\n/.test(str);  
+}; 
+const countSpanTags = (str: string) => {
+  // 使用正则表达式匹配所有出现的<span>（不考虑闭合标签或属性）  
+  const matches = str.match(/<span\b[^>]*>/gi);  
+  // 如果matches是null，表示没有找到匹配项，返回0  
+  // 否则，返回匹配项数组的长度  
+  return matches ? matches.length : 0;  
+}; 
+function errorCondition(str:string){
+  ElMessage.closeAll()
+  ElMessage({
+    showClose: true,
+    //message: '条件格式错误 : '+str+' , 正确条件格式如 :    年龄==10',
+    message: str,
+    type: 'error',
+    duration:3500,
+  })
+}
+function succCondition(){
+  ElMessage.closeAll()
+  ElMessage({
+    showClose: true,
+    message: '条件格式校验通过',
+    type: 'success',
+    duration:3500,
+  })
+}
 
 
 const addIcon = (currentObject:any) =>{
@@ -99,10 +212,18 @@ defineExpose({
 	<div >
     <editor :id="onlyNumber"   v-model="tinymceHtml" :init="tinymceInit"></editor>
   </div>
+  <div class="isHidde">
+			<div ref="tinymceBox"  v-html="tinymceHtml"> </div>
+	</div>
 	
 
 </template>
 
 <style  lang='scss' scoped>
-	
+	.isHidde{
+    display:none;
+    position: fixed;
+      z-index: 1;
+    margin-top: -10px
+  }
 </style>