Merge branch 'lwx_v5'

src/components/DesignForm/formControlAttr.vue

@@ -4015,14 +4015,14 @@ const disabledIstrue = (val:string) => {
 
 
 
-    <el-dialog v-model="associatedFormsFillRolesDialogFlag" title="数据填充规则" top="150px" :close-on-click-modal="false" :show-close="false" style="margin-top:70px ;min-height: 500px" width="50%"  >
+    <el-dialog v-model="associatedFormsFillRolesDialogFlag" title="数据填充规则" top="150px" :close-on-click-modal="false" :show-close="false" style="margin-top:70px ;min-height: 800px" width="50%"  >
 		
 		<template v-if="controlData.type=='associatedForms'">
             <el-divider style="margin-top: 0px;" />
 			<div style="margin-top: -10px;"><span style="color: grey;">当选择具体数据后，将按如下规则给当前表单字段填充数据 </span></div>
             <el-button  style="font-size: large;margin-top: 3px;"   type="primary" link append-to-body="true" modal="true" @click="addFillRole">十 添加规则</el-button>
             <el-divider />
-            <div style="height:300px;border:1px solid white;overflow-y:auto">
+            <div style="height:600px;border:1px solid white;overflow-y:auto">
                 
                     <template v-for="(item, index) in controlData.control.fillRoles"  :key="controlData.control.fillRoles[index].id">
                         <AssociatedFormsFillRole v-model:left-value="controlData.control.fillRoles[index].leftValue"  v-model:right-value="controlData.control.fillRoles[index].rightValue" :left-tree-source = "asfasfFieldTree" :right-tree-source = "associatedFormsCurrentFormFieldTree"  :current-key="controlData.control.fillRoles[index].id"  @del-Role = "delRole"  ></AssociatedFormsFillRole>

src/components/DesignForm/formControlPropertiNew.vue

@@ -1765,6 +1765,16 @@ const showImagePreview = ref(false)
                 }
             });
         }else if(controlData.value.type==='associatedForms'){
+            console.log(controlData.value.control.fillRoles)
+            if(controlData.value.control.fillRoles.length==0){
+                controlData.value.control.fillRoles = [
+						{
+							leftValue: '',
+							rightValue: '',
+							id: '',
+						}
+					]
+            }
             controlData.value.control.fillRoles[0].id = uuidv4().replaceAll('-','').toString();
         }
         //实现关联表单设置可选字段中没有当前字段效果    start
@@ -4321,19 +4331,19 @@ const radioChangeSet = (val:any) => {
 
 
 
-    <el-dialog v-model="associatedFormsFillRolesDialogFlag" title="数据填充规则" top="150px" :close-on-click-modal="false" :show-close="false" style="margin-top:70px ;min-height: 500px" width="50%"  >
+    <el-dialog v-model="associatedFormsFillRolesDialogFlag" title="数据填充规则" top="150px" :close-on-click-modal="false" :show-close="false" style="margin-top:70px ;min-height: 800px" width="80%"  >
 		
 		<template v-if="controlData.type=='associatedForms'">
             <el-divider style="margin-top: 0px;" />
 			<div style="margin-top: -10px;"><span style="color: grey;">当选择具体数据后，将按如下规则给当前表单字段填充数据 </span></div>
             <el-button  style="font-size: large;margin-top: 3px;"   type="primary" link append-to-body="true" modal="true" @click="addFillRole">十 添加规则</el-button>
             <el-divider />
-            <div style="height:300px;border:1px solid white;overflow-y:auto">
+            <div style="height:600px;border:1px solid white;overflow-y:auto">
                 
                     <template v-for="(item, index) in controlData.control.fillRoles"  :key="controlData.control.fillRoles[index].id">
                         <AssociatedFormsFillRole v-model:left-value="controlData.control.fillRoles[index].leftValue"  v-model:right-value="controlData.control.fillRoles[index].rightValue" :left-tree-source = "asfasfFieldTree" :right-tree-source = "associatedFormsCurrentFormFieldTree"  :current-key="controlData.control.fillRoles[index].id"  @del-Role = "delRole"  ></AssociatedFormsFillRole>
                     </template>
-                
+                    <div style="height:2000px"></div>
                 
             </div>
 		</template>

src/widget/associatedforms/associatedForms.vue

@@ -61,8 +61,24 @@ function getAsfDataTitles() {
     for(let i = 0;i<props.tablekey.dataTitle.length;i++){
       dataTitle = dataTitle+props.tablekey.dataTitle[i]+"###"
     }
-    
   }
+  //数据填充规则条件参数处理
+
+  /*
+    fillRoles: [
+      {
+        leftValue: "formField:43:dai4biao3zuo4",
+        rightValue: "formField:44:input1721721327977",
+        id: "870df909314342cfb53c440a3d4263a4"
+      }
+    ] 
+  */
+  /* let fillFields = "";
+  for(let i= 0;i<props.data.control.fillRoles.length;i++){
+    if(props.data.control.fillRoles[i].leftValue!=""){
+      fillFields = fillFields+props.data.control.fillRoles[i].leftValue
+    }
+  } */
   
   return request({ 
       url: '/javasys/lowCode/AssociatedForms/getAsfDataTitles',
@@ -75,6 +91,7 @@ function getAsfDataTitles() {
         hideFormula:props.data.control.hideGongShi.mathsFormula,
         hideString:props.data.control.hideGongShi.mathsString,
         masterOnField:props.data.name,
+        //fillFields:fillFields,
       },
   });
 }