From fc8f534f48ddc96da82f69684f585a7d23d1fc44 Mon Sep 17 00:00:00 2001
From: liwenxuan <1298531568@qq.com>
Date: Sat, 20 Apr 2024 11:51:20 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E8=8C=83=E5=9B=B4=E5=BC=B9?=
 =?UTF-8?q?=E7=AA=970.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/DesignForm/formControlAttr.vue | 58 ++++++++-----------
 1 file changed, 24 insertions(+), 34 deletions(-)

diff --git a/src/components/DesignForm/formControlAttr.vue b/src/components/DesignForm/formControlAttr.vue
index 68312a620..04380966f 100644
--- a/src/components/DesignForm/formControlAttr.vue
+++ b/src/components/DesignForm/formControlAttr.vue
@@ -1970,47 +1970,22 @@ const associatedFormsHideDialogFlag = ref(false)
 const associatedFormsDataRangeDialogFlag = ref(false)
 
 
-//父组件
-//let associatedFormsHideDialogText = ref('')//textarea默认值
-//父组件编辑备份
-//let associatedFormsHideDialogTextCopy = ref('')
 
 
 
 //点击开启隐藏设置
 function associatedFormsHideDialoghandle(){
-    /* if(controlData.value.control.saveFlag===true){
-        
-        associatedFormsHideDialogFlag.value = true
-        controlData.value.control.hideConditionHtmlCopy = controlData.value.control.hideConditionHtml
-        //alert("当前表单未保存过，若从左侧树中选择字段信息，请先保存当前表单")
-        nextTick(() => {
-            aft.value.focusEditor()
-        })
-    }else{ */
+
         associatedFormsHideDialogFlag.value = true
         controlData.value.control.hideConditionHtmlCopy = controlData.value.control.hideConditionHtml
         nextTick(() => {
             aft.value.focusEditor()
         })
-    //}
     
 }
 
 
 function associatedFormsDataRangeDialoghandle(){
-    /* if(controlData.value.control.saveFlag===true){
-        
-        associatedFormsDataRangeDialogFlag.value = true
-        controlData.value.control.dataRangeConditionHtmlCopy = controlData.value.control.dataRangeConditionHtml
-        //alert("当前表单未保存过，若从左侧树中选择字段信息，请先保存当前表单")
-        nextTick(() => {
-            aftRange.value.focusEditor()
-        })
-    }else{ */
-
-        
-
 
         getAsfasfFieldTree().then(({ data }) => {
     
@@ -2036,10 +2011,7 @@ function associatedFormsDataRangeDialoghandle(){
         nextTick(() => {
             aftRange.value.focusEditor()
         })
-    //}
-    
 
-    
 }
 
 //自定义事件同步父子组件的text
@@ -2098,9 +2070,21 @@ function handleDetermineRange(){
     determineRange.value = true
     controlData.value.control.dataRangeConditionHtmlCopy = controlData.value.control.dataRangeConditionHtml
 }
+//数据填充规则
+
+const associatedFormsFillRolesDialogFlag = ref(false)
 
+function associatedFormsDataFillRolesDialoghandle(){
+    associatedFormsFillRolesDialogFlag.value = true
+}
 
+function asfhTextCancelFillRoles(){
+    associatedFormsFillRolesDialogFlag.value = false
+}
 
+function handleDetermineFillRoles(){
+    associatedFormsFillRolesDialogFlag.value = false
+}
 
 
 //liwenxuan20240403 associatedForms end 
@@ -2588,10 +2572,10 @@ const loadNextPage = () => {
 								</el-row>
 
 
-                                <!-- <el-row v-else-if="item.type === 'associatedForms_FillRoles'">
+                                <el-row v-else-if="item.type === 'associatedForms_FillRoles'">
 									<el-button  style="padding-top: 5px;" type="primary" link append-to-body="true" modal="true" @click="associatedFormsDataFillRolesDialoghandle"  >设置数据填充规则</el-button>
 								
-								</el-row> -->
+								</el-row>
 
 
 
@@ -3513,10 +3497,16 @@ const loadNextPage = () => {
 
 
 
-    <!-- <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: 500px" width="50%"  >
 		
 		<template v-if="controlData.type=='associatedForms'">
-			fdsaafsdfsda
+            <el-divider />
+			<div><span style="color: grey;">当选择具体数据后，将按如下规则给当前表单字段填充数据 </span></div>
+            <el-button type="primary" link append-to-body="true" modal="true" @click="addFillRole" style="font-size: large;margin-top: 3px;"  >十 添加规则</el-button>
+            <el-divider />
+            <div style="height:300px;border:1px solid white">
+                
+            </div>
 		</template>
 		<template #footer>
 		<div class="dialog-footer">
@@ -3526,7 +3516,7 @@ const loadNextPage = () => {
 			</el-button>
 		</div>
     </template>
-	</el-dialog> -->
+	</el-dialog>