From 08a9ef01b22f3f45d64cda79424152dbf2d7a6f4 Mon Sep 17 00:00:00 2001
From: liwenxuan <1298531568@qq.com>
Date: Mon, 22 Apr 2024 09:56:15 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=B3=E8=81=94=E8=A1=A8=E5=8D=950.99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/DesignForm/formControlAttr.vue | 19 +++++++++++++++----
 .../associatedFormsTinyace.vue                |  3 +++
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/src/components/DesignForm/formControlAttr.vue b/src/components/DesignForm/formControlAttr.vue
index e837b9a82..ab6f6b4cf 100644
--- a/src/components/DesignForm/formControlAttr.vue
+++ b/src/components/DesignForm/formControlAttr.vue
@@ -2127,6 +2127,14 @@ watch(()=>store.activeKey, () => {
 })
 
 
+function addFillRole(){
+    controlData.value.control.fillRoles.push({
+        leftValue:'',
+		rightValue:'',
+    })
+}
+
+
 //liwenxuan20240403 associatedForms end 
 
 
@@ -3548,10 +3556,13 @@ const loadNextPage = () => {
 			<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">
-                <template v-for="(item, index) in controlData.control.fillRoles"  :key="index">
-                    <AssociatedFormsFillRole v-model:left-value="controlData.control.fillRoles[index].leftValue"  v-model:right-value="controlData.control.fillRoles[index].rightValue" :left-tree-source = "asfasfFieldTree[0].children" :right-tree-source = "associatedFormsCurrentFormFieldTree[0].children" ></AssociatedFormsFillRole>
-                </template>
+            <div style="height:300px;border:1px solid red;overflow-y:auto">
+                
+                    <template v-for="(item, index) in controlData.control.fillRoles"  :key="index">
+                        <AssociatedFormsFillRole v-model:left-value="controlData.control.fillRoles[index].leftValue"  v-model:right-value="controlData.control.fillRoles[index].rightValue" :left-tree-source = "asfasfFieldTree[0].children" :right-tree-source = "associatedFormsCurrentFormFieldTree[0].children" ></AssociatedFormsFillRole>
+                    </template>
+                
+                
             </div>
 		</template>
 		<template #footer>
diff --git a/src/widget/associatedforms/associatedFormsTinyace.vue b/src/widget/associatedforms/associatedFormsTinyace.vue
index ca8df6f12..2521c43a1 100644
--- a/src/widget/associatedforms/associatedFormsTinyace.vue
+++ b/src/widget/associatedforms/associatedFormsTinyace.vue
@@ -79,6 +79,9 @@ const tinymceReInit = ()=>{
     let str:string = props.aftTextCopy
 }
 const focusEditor = ()=>{
+  console.log("1111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111")
+  console.log("111111111111111111111111"+onlyNumber)
+  console.log(document.getElementById(onlyNumber))
   document.getElementById(onlyNumber)?.focus()
 }