From 3b4003f5c86852ee1f2370dc5b5e8c80f93fa48d Mon Sep 17 00:00:00 2001
From: liwenxuan <1298531568@qq.com>
Date: Mon, 15 Apr 2024 16:55:24 +0800
Subject: [PATCH 01/17] =?UTF-8?q?=E5=85=B3=E8=81=94=E8=A1=A8=E5=8D=95v0.4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/DesignForm/formControlAttr.vue | 77 ++++++++++++++--
 .../associatedFormsTinyace.vue                | 91 +++++++++++++++++++
 2 files changed, 158 insertions(+), 10 deletions(-)
 create mode 100644 src/widget/associatedforms/associatedFormsTinyace.vue

diff --git a/src/components/DesignForm/formControlAttr.vue b/src/components/DesignForm/formControlAttr.vue
index 680c9d65a..c6cab36df 100644
--- a/src/components/DesignForm/formControlAttr.vue
+++ b/src/components/DesignForm/formControlAttr.vue
@@ -1741,10 +1741,9 @@ const transferDataSourceOptions = [
 
 
 //liwenxuan20240403 associatedForms start 
+import AssociatedFormsTinyace from '@/widget/associatedforms/associatedFormsTinyace.vue'
 
-const associatedFormsHideDialogFlag = ref(false)
-
-const defaultProps = {
+const treeDefaultProps = {
 	children: 'children',
 	label: 'label',
 }
@@ -1754,7 +1753,7 @@ function getAssociatedFormsCurrentFieldTree() {
             url: '/javasys/lowCode/AssociatedForms/getFieldTree',
             method: 'post',
 			data: {
-				cfid:'1'
+				cfid:'13'
 			},
         });
 }
@@ -1802,14 +1801,24 @@ function handleFieldTreeCollapse(){
 function handleFieldTreeNodeclick(){
 	
 }
+//拿到子组件AssociatedFormsTinyace的实例
+let aft = ref();
 function handleFieldTreeContextmenu(MouseEvent:any, object:any, Node:any, element:any){
 	//console.log(MouseEvent)
-	console.log(object)
+	
 	//console.log(Node)
 	//console.log(element)
+    
+    aft.value.addIcon(object)
+    
 
 }
+
+
+
 import { ElTree } from 'element-plus'
+
+
 const fieldTreeFilterText = ref('')
 const fieldTreeRef = ref<InstanceType<typeof ElTree>>()
 
@@ -1821,6 +1830,50 @@ const filterNode = (value: string, associatedFormsCurrentFormFieldTree: Tree) =>
 	if (!value) return true
 	return associatedFormsCurrentFormFieldTree.label.includes(value)
 }
+//关联表单隐藏条件弹窗flag
+const associatedFormsHideDialogFlag = ref(false)
+//父组件
+let associatedFormsHideDialogText = ref('雾峦青雨')
+//父组件编辑备份
+let associatedFormsHideDialogTextCopy = ref('')
+//点击开启隐藏设置
+function associatedFormsHideDialoghandle(){
+    associatedFormsHideDialogFlag.value = true
+    associatedFormsHideDialogTextCopy.value = associatedFormsHideDialogText.value
+}
+//asf隐藏条件取消编辑
+function asfhTextCancel(){
+    associatedFormsHideDialogFlag.value = false
+    associatedFormsHideDialogText.value = associatedFormsHideDialogTextCopy.value
+    //父组件取消将copy同步至子组件
+    aft.value.handelCancel(associatedFormsHideDialogTextCopy)
+}
+//自定义事件同步父子组件的text
+function aftTextChanged(str:any){
+    console.log(str)
+    associatedFormsHideDialogText.value = str.value
+}
+
+//监听associatedFormsHideDialogFlag true 重新init  tinymce
+ watch(associatedFormsHideDialogFlag, (val) => {
+	if(associatedFormsHideDialogFlag.value===true){
+        
+        setTimeout(() => {
+           
+            aft.value.tinymceReInit()
+            
+        }, 200);
+        
+    }
+})
+
+
+
+
+//liwenxuan20240403 associatedForms end 
+
+
+
 
 
 		
@@ -2277,7 +2330,7 @@ const loadNextPage = () => {
 								</el-row>
 
 								<el-row v-else-if="item.type === 'associatedForms_hide'">
-									<el-button  type="primary" append-to-body="true" modal="true" @click="associatedFormsHideDialogFlag = true"  >设置隐藏条件</el-button>
+									<el-button  type="primary" append-to-body="true" modal="true" @click="associatedFormsHideDialoghandle"  >设置隐藏条件</el-button>
 									
 								</el-row>
 
@@ -2983,6 +3036,8 @@ const loadNextPage = () => {
 
 	<!-- 关联表单设置弹窗 liwenxuan 20240402 start -->
 
+    
+
 	<el-dialog v-model="associatedFormsHideDialogFlag" title="隐藏条件" top="150px" style="margin-top:70px ;min-height: 500px" width="50%">
 		
 		<template v-if="controlData.type=='associatedForms'">
@@ -3001,7 +3056,7 @@ const loadNextPage = () => {
 					<el-tree
 						ref="fieldTreeRef"
 						:data="associatedFormsCurrentFormFieldTree"
-						:props="defaultProps"
+						:props="treeDefaultProps"
 						:filter-node-method="filterNode"
 						style="max-width: 600px; border: 1px solid gainsboro; margin: 3px;"
 						@node-expand="handleFieldTreeExpand"
@@ -3014,13 +3069,15 @@ const loadNextPage = () => {
 					<el-tree
 						style="max-width: 600px; border: 1px solid gainsboro; margin: 3px;"
 						:data="orgAndManTree"
-						:props="defaultProps"
+						:props="treeDefaultProps"
 						
 					/>
 				</el-aside>
 				<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;"></div>
+					<div  id="associatedFormsHideEditArea" style="border: 1px solid gainsboro; height: 63%; border-bottom: 0px;">
+                        <AssociatedFormsTinyace  @textChange = "aftTextChanged" ref="aft" :aftText="associatedFormsHideDialogText" ></AssociatedFormsTinyace>
+                    </div>
 					<div style="border: 1px solid gainsboro; height: 30%;"></div>
 				</el-main>
 				</el-container>
@@ -3028,7 +3085,7 @@ const loadNextPage = () => {
 		</template>
 		<template #footer>
 		<div class="dialog-footer">
-			<!-- <el-button @click="associatedFormsHideDialogFlag = false">取消</el-button> -->
+			<el-button @click="asfhTextCancel">取消</el-button>
 			<el-button type="primary" @click="associatedFormsHideDialogFlag = false">
 			确定
 			</el-button>
diff --git a/src/widget/associatedforms/associatedFormsTinyace.vue b/src/widget/associatedforms/associatedFormsTinyace.vue
new file mode 100644
index 000000000..b99858023
--- /dev/null
+++ b/src/widget/associatedforms/associatedFormsTinyace.vue
@@ -0,0 +1,91 @@
+
+<script lang='ts' setup>
+import { ref, onMounted } from "vue";
+import tinymce from "tinymce/tinymce";
+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";
+
+let onlyNumber = uuidv4().replaceAll('-','').toString();   //获取唯一编码
+//onlyNumber = "#"+onlyNumber
+/**
+ * 初始富文本组件
+ */
+const tinymceInit = {
+  selector: "#tinymce",
+	language_url: "/tinymce/langs/zh-Hans.js", // 引入语言包（该语言包在public下，注意文件名称）
+	language: "zh-Hans", // 这里名称根据 zh-Hans.js 里面写的名称而定
+	skin_url: "/tinymce/skins/ui/oxide", // 这里引入的样式
+	height: 260, // 限制高度
+	statusbar:false,
+	toolbar:false,
+	branding: false,  //是否禁用“Powered by TinyMCE”
+	menubar: false, //顶部菜单栏显示
+	forced_root_block:'',
+	newline_behavior:"",
+	content_css: "/tinymce/skins/content/default/content.css", //以css文件方式自定义可编辑区域的css样式，css文件需自己创建并引入	
+}
+const props = defineProps({
+  aftText:{ 
+    type: String, 
+    default(){
+			return {}
+		} 
+  },
+  
+})
+
+let $emit = defineEmits(["textChange"]);
+
+const tinymceHtml = ref("")
+tinymceHtml.value = props.aftText
+
+
+
+onMounted(() => {
+    
+  	tinymce.init({}); // 初始化富文本
+    
+});
+
+
+
+const addIcon = (currentObject) =>{
+  console.log(currentObject)
+	tinymce.activeEditor?.execCommand('mceInsertContent', false, `<span style="margin:3px;background-color: #4189EF;border-radius: 5px; padding:3px" contenteditable="false" data-keyid= "${currentObject.id}" >${currentObject.label}</span>`);
+  $emit('textChange',tinymceHtml);
+}
+
+const handelCancel = (associatedFormsHideDialogTextCopy) =>{
+
+  console.log(associatedFormsHideDialogTextCopy)
+  tinymceHtml.value = associatedFormsHideDialogTextCopy
+  
+  
+}
+ const tinymceReInit = ()=>{
+  
+  //tinymce.init({}); // 初始化富文本
+  console.log(tinymce.get("tinymce"))
+  tinymce.get("tinymce").setContent('<p>213342</p>')
+}
+
+
+defineExpose({
+  tinymceHtml,
+  addIcon,
+  handelCancel,
+  tinymceReInit,
+})
+
+</script>
+<template>
+	
+	<editor id="tinymce"   v-model="tinymceHtml" :init="tinymceInit" ></editor>
+</template>
+
+<style  lang='scss' scoped>
+	
+</style>

From fd09927497d35f04bb4eae486cef4c1b7ae279c2 Mon Sep 17 00:00:00 2001
From: liwenxuan <1298531568@qq.com>
Date: Tue, 16 Apr 2024 08:28:08 +0800
Subject: [PATCH 02/17] =?UTF-8?q?=E5=85=B3=E8=81=94=E8=A1=A8=E5=8D=95v0.5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/DesignForm/formControlAttr.vue | 22 +++++++++++--------
 .../associatedFormsTinyace.vue                |  8 +++----
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/src/components/DesignForm/formControlAttr.vue b/src/components/DesignForm/formControlAttr.vue
index c6cab36df..de220d820 100644
--- a/src/components/DesignForm/formControlAttr.vue
+++ b/src/components/DesignForm/formControlAttr.vue
@@ -1833,7 +1833,7 @@ const filterNode = (value: string, associatedFormsCurrentFormFieldTree: Tree) =>
 //关联表单隐藏条件弹窗flag
 const associatedFormsHideDialogFlag = ref(false)
 //父组件
-let associatedFormsHideDialogText = ref('雾峦青雨')
+let associatedFormsHideDialogText = ref('')//雾峦青雨
 //父组件编辑备份
 let associatedFormsHideDialogTextCopy = ref('')
 //点击开启隐藏设置
@@ -1853,19 +1853,23 @@ function aftTextChanged(str:any){
     console.log(str)
     associatedFormsHideDialogText.value = str.value
 }
-
+//上次点击了确定为true
+let determine = ref(false)
 //监听associatedFormsHideDialogFlag true 重新init  tinymce
- watch(associatedFormsHideDialogFlag, (val) => {
-	if(associatedFormsHideDialogFlag.value===true){
-        
-        setTimeout(() => {
-           
+watch(associatedFormsHideDialogFlag, (val) => {
+	if(associatedFormsHideDialogFlag.value===true&&determine.value===true){
+        determine.value = false
+        //setTimeout(() => {
             aft.value.tinymceReInit()
             
-        }, 200);
+        //}, 200);
         
     }
 })
+function handleDetermine(){
+    associatedFormsHideDialogFlag.value = false
+    determine.value = true
+}
 
 
 
@@ -3086,7 +3090,7 @@ const loadNextPage = () => {
 		<template #footer>
 		<div class="dialog-footer">
 			<el-button @click="asfhTextCancel">取消</el-button>
-			<el-button type="primary" @click="associatedFormsHideDialogFlag = false">
+			<el-button type="primary" @click="handleDetermine">
 			确定
 			</el-button>
 		</div>
diff --git a/src/widget/associatedforms/associatedFormsTinyace.vue b/src/widget/associatedforms/associatedFormsTinyace.vue
index b99858023..05d7e3ca2 100644
--- a/src/widget/associatedforms/associatedFormsTinyace.vue
+++ b/src/widget/associatedforms/associatedFormsTinyace.vue
@@ -52,13 +52,13 @@ onMounted(() => {
 
 
 
-const addIcon = (currentObject) =>{
+const addIcon = (currentObject:any) =>{
   console.log(currentObject)
 	tinymce.activeEditor?.execCommand('mceInsertContent', false, `<span style="margin:3px;background-color: #4189EF;border-radius: 5px; padding:3px" contenteditable="false" data-keyid= "${currentObject.id}" >${currentObject.label}</span>`);
   $emit('textChange',tinymceHtml);
 }
 
-const handelCancel = (associatedFormsHideDialogTextCopy) =>{
+const handelCancel = (associatedFormsHideDialogTextCopy:any) =>{
 
   console.log(associatedFormsHideDialogTextCopy)
   tinymceHtml.value = associatedFormsHideDialogTextCopy
@@ -68,8 +68,8 @@ const handelCancel = (associatedFormsHideDialogTextCopy) =>{
  const tinymceReInit = ()=>{
   
   //tinymce.init({}); // 初始化富文本
-  console.log(tinymce.get("tinymce"))
-  tinymce.get("tinymce").setContent('<p>213342</p>')
+  //console.log(tinymce.get("tinymce"))
+  tinymce.get("tinymce")?.setContent('<p>213342</p>')
 }
 
 

From 6ff57a429e04c47c5e051005cfd16cb83452b15c Mon Sep 17 00:00:00 2001
From: liwenxuan <1298531568@qq.com>
Date: Tue, 16 Apr 2024 08:33:31 +0800
Subject: [PATCH 03/17] =?UTF-8?q?=E8=A7=A3=E5=86=B3chrome=E6=8E=A7?=
 =?UTF-8?q?=E5=88=B6=E5=8F=B0non-passive=20event=20listener=E8=BE=93?=
 =?UTF-8?q?=E5=87=BA=E9=80=A0=E6=88=90=E5=8D=A1=E9=A1=BF=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 node_modules/.package-lock.json | 5 +++++
 package-lock.json               | 6 ++++++
 package.json                    | 1 +
 src/main.ts                     | 2 +-
 4 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/node_modules/.package-lock.json b/node_modules/.package-lock.json
index d044462a5..a66d8d22e 100644
--- a/node_modules/.package-lock.json
+++ b/node_modules/.package-lock.json
@@ -3308,6 +3308,11 @@
       "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
       "dev": true
     },
+    "node_modules/default-passive-events": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/default-passive-events/-/default-passive-events-2.0.0.tgz",
+      "integrity": "sha512-eMtt76GpDVngZQ3ocgvRcNCklUMwID1PaNbCNxfpDXuiOXttSh0HzBbda1HU9SIUsDc02vb7g9+3I5tlqe/qMQ=="
+    },
     "node_modules/defaults": {
       "version": "1.0.4",
       "resolved": "https://registry.npmmirror.com/defaults/-/defaults-1.0.4.tgz",
diff --git a/package-lock.json b/package-lock.json
index 1d1bca102..c1910761f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -18,6 +18,7 @@
         "@wecom/jssdk": "^1.3.2",
         "axios": "^1.4.0",
         "clipboard": "^2.0.11",
+        "default-passive-events": "^2.0.0",
         "echarts": "^5.4.3",
         "element-plus": "^2.3.4",
         "font-awesome": "^4.7.0",
@@ -3705,6 +3706,11 @@
       "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
       "dev": true
     },
+    "node_modules/default-passive-events": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/default-passive-events/-/default-passive-events-2.0.0.tgz",
+      "integrity": "sha512-eMtt76GpDVngZQ3ocgvRcNCklUMwID1PaNbCNxfpDXuiOXttSh0HzBbda1HU9SIUsDc02vb7g9+3I5tlqe/qMQ=="
+    },
     "node_modules/defaults": {
       "version": "1.0.4",
       "resolved": "https://registry.npmmirror.com/defaults/-/defaults-1.0.4.tgz",
diff --git a/package.json b/package.json
index d2856036f..fdff5ea76 100644
--- a/package.json
+++ b/package.json
@@ -49,6 +49,7 @@
     "@wecom/jssdk": "^1.3.2",
     "axios": "^1.4.0",
     "clipboard": "^2.0.11",
+    "default-passive-events": "^2.0.0",
     "echarts": "^5.4.3",
     "element-plus": "^2.3.4",
     "font-awesome": "^4.7.0",
diff --git a/src/main.ts b/src/main.ts
index d78a42f2d..c67889ac2 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -6,7 +6,7 @@ import { setupDirective } from '@/directive';
 
 import ElementPlus from 'element-plus'
 import zhCn from 'element-plus/es/locale/lang/zh-cn'
-
+import 'default-passive-events'
 import '@/permission';
 
 // 本地SVG图标

From b28ea26ad4f855c623688eb148ae84694660c7ba Mon Sep 17 00:00:00 2001
From: liwenxuan <1298531568@qq.com>
Date: Tue, 16 Apr 2024 14:37:42 +0800
Subject: [PATCH 04/17] =?UTF-8?q?=E5=85=B3=E8=81=94=E8=A1=A8=E5=8D=95v0.6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 node_modules/.package-lock.json               |  5 ---
 package-lock.json                             |  6 ----
 package.json                                  |  1 -
 src/components/DesignForm/formControlAttr.vue | 35 ++++++++++++-------
 src/main.ts                                   |  2 +-
 .../associatedFormsTinyace.vue                | 34 +++++++++++++-----
 6 files changed, 48 insertions(+), 35 deletions(-)

diff --git a/node_modules/.package-lock.json b/node_modules/.package-lock.json
index a66d8d22e..d044462a5 100644
--- a/node_modules/.package-lock.json
+++ b/node_modules/.package-lock.json
@@ -3308,11 +3308,6 @@
       "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
       "dev": true
     },
-    "node_modules/default-passive-events": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/default-passive-events/-/default-passive-events-2.0.0.tgz",
-      "integrity": "sha512-eMtt76GpDVngZQ3ocgvRcNCklUMwID1PaNbCNxfpDXuiOXttSh0HzBbda1HU9SIUsDc02vb7g9+3I5tlqe/qMQ=="
-    },
     "node_modules/defaults": {
       "version": "1.0.4",
       "resolved": "https://registry.npmmirror.com/defaults/-/defaults-1.0.4.tgz",
diff --git a/package-lock.json b/package-lock.json
index c1910761f..1d1bca102 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -18,7 +18,6 @@
         "@wecom/jssdk": "^1.3.2",
         "axios": "^1.4.0",
         "clipboard": "^2.0.11",
-        "default-passive-events": "^2.0.0",
         "echarts": "^5.4.3",
         "element-plus": "^2.3.4",
         "font-awesome": "^4.7.0",
@@ -3706,11 +3705,6 @@
       "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
       "dev": true
     },
-    "node_modules/default-passive-events": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/default-passive-events/-/default-passive-events-2.0.0.tgz",
-      "integrity": "sha512-eMtt76GpDVngZQ3ocgvRcNCklUMwID1PaNbCNxfpDXuiOXttSh0HzBbda1HU9SIUsDc02vb7g9+3I5tlqe/qMQ=="
-    },
     "node_modules/defaults": {
       "version": "1.0.4",
       "resolved": "https://registry.npmmirror.com/defaults/-/defaults-1.0.4.tgz",
diff --git a/package.json b/package.json
index fdff5ea76..d2856036f 100644
--- a/package.json
+++ b/package.json
@@ -49,7 +49,6 @@
     "@wecom/jssdk": "^1.3.2",
     "axios": "^1.4.0",
     "clipboard": "^2.0.11",
-    "default-passive-events": "^2.0.0",
     "echarts": "^5.4.3",
     "element-plus": "^2.3.4",
     "font-awesome": "^4.7.0",
diff --git a/src/components/DesignForm/formControlAttr.vue b/src/components/DesignForm/formControlAttr.vue
index de220d820..d7b44a3ec 100644
--- a/src/components/DesignForm/formControlAttr.vue
+++ b/src/components/DesignForm/formControlAttr.vue
@@ -1833,7 +1833,7 @@ const filterNode = (value: string, associatedFormsCurrentFormFieldTree: Tree) =>
 //关联表单隐藏条件弹窗flag
 const associatedFormsHideDialogFlag = ref(false)
 //父组件
-let associatedFormsHideDialogText = ref('')//雾峦青雨
+let associatedFormsHideDialogText = ref('')//textarea默认值
 //父组件编辑备份
 let associatedFormsHideDialogTextCopy = ref('')
 //点击开启隐藏设置
@@ -1841,39 +1841,48 @@ function associatedFormsHideDialoghandle(){
     associatedFormsHideDialogFlag.value = true
     associatedFormsHideDialogTextCopy.value = associatedFormsHideDialogText.value
 }
+
+//自定义事件同步父子组件的text
+function aftTextChanged(str:string){
+    //str = Object.assign({},str)
+    console.log(str)
+    //setTimeout(()=>{
+        associatedFormsHideDialogText.value = str
+    //},3000)
+    
+}
 //asf隐藏条件取消编辑
 function asfhTextCancel(){
+    determine.value = false
     associatedFormsHideDialogFlag.value = false
     associatedFormsHideDialogText.value = associatedFormsHideDialogTextCopy.value
     //父组件取消将copy同步至子组件
     aft.value.handelCancel(associatedFormsHideDialogTextCopy)
 }
-//自定义事件同步父子组件的text
-function aftTextChanged(str:any){
-    console.log(str)
-    associatedFormsHideDialogText.value = str.value
-}
 //上次点击了确定为true
-let determine = ref(false)
+let determine = ref(true)
 //监听associatedFormsHideDialogFlag true 重新init  tinymce
 watch(associatedFormsHideDialogFlag, (val) => {
-	if(associatedFormsHideDialogFlag.value===true&&determine.value===true){
-        determine.value = false
-        //setTimeout(() => {
+    //alert("determine:"+determine.value)
+	if(val===true&&determine.value===false){
+        setTimeout(() => {
             aft.value.tinymceReInit()
             
-        //}, 200);
+        }, 200);
         
     }
 })
+//确定回调
 function handleDetermine(){
     associatedFormsHideDialogFlag.value = false
     determine.value = true
+    associatedFormsHideDialogTextCopy.value = associatedFormsHideDialogText.value
 }
 
 
 
 
+
 //liwenxuan20240403 associatedForms end 
 
 
@@ -3042,7 +3051,7 @@ const loadNextPage = () => {
 
     
 
-	<el-dialog v-model="associatedFormsHideDialogFlag" title="隐藏条件" top="150px" style="margin-top:70px ;min-height: 500px" width="50%">
+	<el-dialog v-model="associatedFormsHideDialogFlag" 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'">
 			<div class="common-layout">
@@ -3080,7 +3089,7 @@ const loadNextPage = () => {
 				<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  @textChange = "aftTextChanged" ref="aft" :aftText="associatedFormsHideDialogText" ></AssociatedFormsTinyace>
+                        <AssociatedFormsTinyace ref="aft" :aft-text="associatedFormsHideDialogText" :aft-text-copy = "associatedFormsHideDialogTextCopy" @text-change = "aftTextChanged"></AssociatedFormsTinyace>
                     </div>
 					<div style="border: 1px solid gainsboro; height: 30%;"></div>
 				</el-main>
diff --git a/src/main.ts b/src/main.ts
index c67889ac2..d78a42f2d 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -6,7 +6,7 @@ import { setupDirective } from '@/directive';
 
 import ElementPlus from 'element-plus'
 import zhCn from 'element-plus/es/locale/lang/zh-cn'
-import 'default-passive-events'
+
 import '@/permission';
 
 // 本地SVG图标
diff --git a/src/widget/associatedforms/associatedFormsTinyace.vue b/src/widget/associatedforms/associatedFormsTinyace.vue
index 05d7e3ca2..547c3e4f0 100644
--- a/src/widget/associatedforms/associatedFormsTinyace.vue
+++ b/src/widget/associatedforms/associatedFormsTinyace.vue
@@ -34,7 +34,12 @@ const props = defineProps({
 			return {}
 		} 
   },
-  
+  aftTextCopy:{ 
+    type: String, 
+    default(){
+			return {}
+		} 
+  },
 })
 
 let $emit = defineEmits(["textChange"]);
@@ -49,27 +54,37 @@ onMounted(() => {
   	tinymce.init({}); // 初始化富文本
     
 });
-
+watch(tinymceHtml, (val) => {
+  $emit('textChange',val);
+})
 
 
 const addIcon = (currentObject:any) =>{
-  console.log(currentObject)
+  //console.log(currentObject)
 	tinymce.activeEditor?.execCommand('mceInsertContent', false, `<span style="margin:3px;background-color: #4189EF;border-radius: 5px; padding:3px" contenteditable="false" data-keyid= "${currentObject.id}" >${currentObject.label}</span>`);
-  $emit('textChange',tinymceHtml);
+  
 }
-
+//取消
 const handelCancel = (associatedFormsHideDialogTextCopy:any) =>{
 
-  console.log(associatedFormsHideDialogTextCopy)
+  //console.log(associatedFormsHideDialogTextCopy)
   tinymceHtml.value = associatedFormsHideDialogTextCopy
   
   
 }
- const tinymceReInit = ()=>{
-  
+const tinymceReInit = ()=>{
+  //alert("tinymceReInit")
   //tinymce.init({}); // 初始化富文本
   //console.log(tinymce.get("tinymce"))
-  tinymce.get("tinymce")?.setContent('<p>213342</p>')
+  
+
+  //setTimeout(() => {
+    
+    let str:string = props.aftTextCopy
+    console.log(str)
+    //tinymce.get("tinymce")?.setContent(str)
+  //}, 60);
+
 }
 
 
@@ -84,6 +99,7 @@ defineExpose({
 <template>
 	
 	<editor id="tinymce"   v-model="tinymceHtml" :init="tinymceInit" ></editor>
+ 
 </template>
 
 <style  lang='scss' scoped>

From 9f3e21d72c53559a994c5531e8027f767f053090 Mon Sep 17 00:00:00 2001
From: liwenxuan <1298531568@qq.com>
Date: Thu, 18 Apr 2024 10:41:15 +0800
Subject: [PATCH 05/17] =?UTF-8?q?=E5=85=B3=E8=81=94=E8=A1=A8=E5=8D=95?=
 =?UTF-8?q?=E9=9A=90=E8=97=8F=E6=8E=A7=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/DesignForm/formControlAttr.vue | 156 +++++++++++++++---
 .../associatedFormsTinyace.vue                |  41 ++---
 2 files changed, 146 insertions(+), 51 deletions(-)

diff --git a/src/components/DesignForm/formControlAttr.vue b/src/components/DesignForm/formControlAttr.vue
index d7b44a3ec..b2d7ba4e6 100644
--- a/src/components/DesignForm/formControlAttr.vue
+++ b/src/components/DesignForm/formControlAttr.vue
@@ -1747,6 +1747,8 @@ const treeDefaultProps = {
 	children: 'children',
 	label: 'label',
 }
+//拿到子组件AssociatedFormsTinyace的实例
+let aft = ref();
 
 function getAssociatedFormsCurrentFieldTree() {
         return request({ 
@@ -1764,6 +1766,12 @@ function getAssociatedFormsOrgAndManTree() {
             method: 'post',
         });
 }
+function getAssociatedFormsRoleTree() {
+        return request({
+            url: '/javasys/lowCode/AssociatedForms/getRoleList',
+            method: 'post',
+        });
+}
 const associatedFormsCurrentFormFieldTree = ref<Tree[]>()
 
 getAssociatedFormsCurrentFieldTree().then(({ data }) => {   
@@ -1787,6 +1795,18 @@ const orgAndManTree = ref<Tree[]>()
         }]
 });
 
+const roleTree = ref<Tree[]>()
+	getAssociatedFormsRoleTree().then(({ data }) => {   
+        let resData = ref(data.children)
+        //console.log("roleTree=============="+resData.value);
+		roleTree.value = [{
+            id: data.id,
+        	//label: data.label,
+			label: '角色',
+            children: [...resData.value]
+        }]
+    });
+//form    field
 const fieldTreeSearchFlag = ref(false)
 
 function handleFieldTreeExpand(){
@@ -1801,17 +1821,45 @@ function handleFieldTreeCollapse(){
 function handleFieldTreeNodeclick(){
 	
 }
-//拿到子组件AssociatedFormsTinyace的实例
-let aft = ref();
+
 function handleFieldTreeContextmenu(MouseEvent:any, object:any, Node:any, element:any){
-	//console.log(MouseEvent)
-	
-	//console.log(Node)
-	//console.log(element)
-    
     aft.value.addIcon(object)
-    
+}
+//org
+const orgTreeSearchFlag = ref(false)
+
+function handleOrgTreeExpand(){
+	
+	orgTreeSearchFlag.value = true;
+}
+
+function handleOrgTreeCollapse(){
+	
+	orgTreeSearchFlag.value = false;
+}
+function handleOrgTreeNodeclick(){
+	
+}
+function handleOrgTreeContextmenu(MouseEvent:any, object:any, Node:any, element:any){
+    aft.value.addIcon_org(object)
+}
+//role
+const roleTreeSearchFlag = ref(false)
+
+function handleRoleTreeExpand(){
+	
+	roleTreeSearchFlag.value = true;
+}
 
+function handleRoleTreeCollapse(){
+	
+	roleTreeSearchFlag.value = false;
+}
+function handleRoleTreeNodeclick(){
+	
+}
+function handleRoleTreeContextmenu(MouseEvent:any, object:any, Node:any, element:any){
+    aft.value.addIcon(object)
 }
 
 
@@ -1820,11 +1868,20 @@ import { ElTree } from 'element-plus'
 
 
 const fieldTreeFilterText = ref('')
+const orgTreeFilterText = ref('')
+const roleTreeFilterText = ref('')
 const fieldTreeRef = ref<InstanceType<typeof ElTree>>()
-
+const orgTreeRef = ref<InstanceType<typeof ElTree>>()
+const roleTreeRef = ref<InstanceType<typeof ElTree>>()
 watch(fieldTreeFilterText, (val) => {
 	fieldTreeRef.value!.filter(val)
 })
+watch(orgTreeFilterText, (val) => {
+	orgTreeRef.value!.filter(val)
+})
+watch(roleTreeFilterText, (val) => {
+	roleTreeRef.value!.filter(val)
+})
 
 const filterNode = (value: string, associatedFormsCurrentFormFieldTree: Tree) => {
 	if (!value) return true
@@ -1844,12 +1901,7 @@ function associatedFormsHideDialoghandle(){
 
 //自定义事件同步父子组件的text
 function aftTextChanged(str:string){
-    //str = Object.assign({},str)
-    console.log(str)
-    //setTimeout(()=>{
-        associatedFormsHideDialogText.value = str
-    //},3000)
-    
+    associatedFormsHideDialogText.value = str
 }
 //asf隐藏条件取消编辑
 function asfhTextCancel(){
@@ -1857,19 +1909,16 @@ function asfhTextCancel(){
     associatedFormsHideDialogFlag.value = false
     associatedFormsHideDialogText.value = associatedFormsHideDialogTextCopy.value
     //父组件取消将copy同步至子组件
-    aft.value.handelCancel(associatedFormsHideDialogTextCopy)
+    aft.value.handelCancel(associatedFormsHideDialogTextCopy.value)
 }
 //上次点击了确定为true
 let determine = ref(true)
 //监听associatedFormsHideDialogFlag true 重新init  tinymce
 watch(associatedFormsHideDialogFlag, (val) => {
-    //alert("determine:"+determine.value)
 	if(val===true&&determine.value===false){
         setTimeout(() => {
             aft.value.tinymceReInit()
-            
         }, 200);
-        
     }
 })
 //确定回调
@@ -3056,15 +3105,13 @@ const loadNextPage = () => {
 		<template v-if="controlData.type=='associatedForms'">
 			<div class="common-layout">
 				<el-container>
-				<el-aside width="300px" style="height:400px;border: 1px solid gainsboro;margin-right: 5px;">
+				<el-aside width="300px" style="height:420px;border: 1px solid gainsboro;margin-right: 5px;">
 					<el-input
 						v-show="fieldTreeSearchFlag"
 						v-model="fieldTreeFilterText"
 						style="width:98%;margin: 3px;"
 						placeholder="搜索字段"
 						class="filter-tree"
-						
-						
 					/>
 					<el-tree
 						ref="fieldTreeRef"
@@ -3079,19 +3126,60 @@ const loadNextPage = () => {
 						
 						
 					/>
+                    <el-input
+						v-show="orgTreeSearchFlag"
+						v-model="orgTreeFilterText"
+						style="width:98%;margin: 3px;"
+						placeholder="搜索字段"
+						class="filter-tree"
+					/>
 					<el-tree
+                        ref="orgTreeRef"
 						style="max-width: 600px; border: 1px solid gainsboro; margin: 3px;"
 						:data="orgAndManTree"
 						:props="treeDefaultProps"
-						
+						:filter-node-method="filterNode"
+                        @node-expand="handleOrgTreeExpand"
+						@node-collapse="handleOrgTreeCollapse"
+						@node-click="handleOrgTreeNodeclick"
+						@node-contextmenu="handleOrgTreeContextmenu"
+					/>
+                    <el-input
+						v-show="roleTreeSearchFlag"
+						v-model="roleTreeFilterText"
+						style="width:98%;margin: 3px;"
+						placeholder="搜索字段"
+						class="filter-tree"
+					/>
+					<el-tree
+                        ref="roleTreeRef"
+						style="max-width: 600px; border: 1px solid gainsboro; margin: 3px;"
+						:data="roleTree"
+						:props="treeDefaultProps"
+						:filter-node-method="filterNode"
+                        @node-expand="handleRoleTreeExpand"
+						@node-collapse="handleRoleTreeCollapse"
+						@node-click="handleRoleTreeNodeclick"
+						@node-contextmenu="handleRoleTreeContextmenu"
 					/>
 				</el-aside>
 				<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="associatedFormsHideDialogText" :aft-text-copy = "associatedFormsHideDialogTextCopy" @text-change = "aftTextChanged"></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> -->
+                        
+                    </div>
+					<div style="border: 1px solid gainsboro; height: 30%; padding-top: 20px;">
+                        <ul>
+                            <li>请从左侧面板<span style="color: red">右击</span>选择字段或选项</li>
+                            <li>支持<span style="color: red">英文</span>模式下运算符<!-- （+、-、*、/、>、<、==、） --></li>
+                            <li>参考场景：</li>
+                            <span style="margin-left: 14px;">年龄控件输入的值大于10时，需要隐藏当前控件，则可将隐藏条件设置为：年龄>10</span>
+                        </ul>
                     </div>
-					<div style="border: 1px solid gainsboro; height: 30%;"></div>
 				</el-main>
 				</el-container>
 			</div>
@@ -3105,11 +3193,27 @@ const loadNextPage = () => {
 		</div>
     </template>
 	</el-dialog>
-
+    
+    
+<!-- 
+    
+-->
 	<!-- 关联表单设置弹窗 liwenxuan 20240402 end -->
     </template>
 
-<style   lang='scss' scoped>
+<style   lang='scss' scoped>   
+
+    li::before {
+        content: "";
+        display: inline-block;
+        width: 4px;
+        height: 4px;
+        border-radius: 50%;
+        background-color: gray;
+        margin-right: 5px;
+        margin-left: 5px;
+        margin-bottom: 3.5px;
+    }
 
 	.sidebar-tools .el-tabs__content{
         padding: 0;
diff --git a/src/widget/associatedforms/associatedFormsTinyace.vue b/src/widget/associatedforms/associatedFormsTinyace.vue
index 547c3e4f0..835b8024f 100644
--- a/src/widget/associatedforms/associatedFormsTinyace.vue
+++ b/src/widget/associatedforms/associatedFormsTinyace.vue
@@ -14,7 +14,7 @@ let onlyNumber = uuidv4().replaceAll('-','').toString();   //获取唯一编码
  * 初始富文本组件
  */
 const tinymceInit = {
-  selector: "#tinymce",
+  selector: "#tinymceasfhide",
 	language_url: "/tinymce/langs/zh-Hans.js", // 引入语言包（该语言包在public下，注意文件名称）
 	language: "zh-Hans", // 这里名称根据 zh-Hans.js 里面写的名称而定
 	skin_url: "/tinymce/skins/ui/oxide", // 这里引入的样式
@@ -50,56 +50,47 @@ tinymceHtml.value = props.aftText
 
 
 onMounted(() => {
-    
   	tinymce.init({}); // 初始化富文本
-    
 });
-watch(tinymceHtml, (val) => {
+watch(()=>tinymceHtml.value, (val:any) => {
   $emit('textChange',val);
-})
+},
+    { deep: true }
+)
 
 
 const addIcon = (currentObject:any) =>{
-  //console.log(currentObject)
 	tinymce.activeEditor?.execCommand('mceInsertContent', false, `<span style="margin:3px;background-color: #4189EF;border-radius: 5px; padding:3px" contenteditable="false" data-keyid= "${currentObject.id}" >${currentObject.label}</span>`);
-  
+}
+
+const addIcon_org = (currentObject:any) =>{
+  let id = "orgOrPerson:"+currentObject.id
+	tinymce.activeEditor?.execCommand('mceInsertContent', false, `<span style="margin:3px;background-color: #4189EF;border-radius: 5px; padding:3px" contenteditable="false" data-keyid= "${id}" >${currentObject.label}</span>`);
 }
 //取消
 const handelCancel = (associatedFormsHideDialogTextCopy:any) =>{
-
-  //console.log(associatedFormsHideDialogTextCopy)
   tinymceHtml.value = associatedFormsHideDialogTextCopy
-  
-  
 }
 const tinymceReInit = ()=>{
-  //alert("tinymceReInit")
-  //tinymce.init({}); // 初始化富文本
-  //console.log(tinymce.get("tinymce"))
-  
-
-  //setTimeout(() => {
-    
     let str:string = props.aftTextCopy
-    console.log(str)
-    //tinymce.get("tinymce")?.setContent(str)
-  //}, 60);
-
 }
 
 
 defineExpose({
   tinymceHtml,
   addIcon,
+  addIcon_org,
   handelCancel,
   tinymceReInit,
 })
 
 </script>
-<template>
+<template >
+	<div >
+    <editor id="tinymce"   v-model="tinymceHtml" :init="tinymceInit" ></editor>
+  </div>
 	
-	<editor id="tinymce"   v-model="tinymceHtml" :init="tinymceInit" ></editor>
- 
+
 </template>
 
 <style  lang='scss' scoped>

From e9ce3940e7bd76b9117304c5b9006ab0b16457b9 Mon Sep 17 00:00:00 2001
From: liwenxuan <1298531568@qq.com>
Date: Thu, 18 Apr 2024 16:13:33 +0800
Subject: [PATCH 06/17] =?UTF-8?q?=E9=9A=90=E8=97=8F=E5=85=B3=E8=81=94?=
 =?UTF-8?q?=E8=A1=A8=E5=8D=95=E6=8E=A7=E4=BB=B6=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/DesignForm/assembly/index.ts   |  2 ++
 src/components/DesignForm/formControlAttr.vue | 31 ++++++++++++-------
 .../associatedFormsTinyace.vue                |  5 ++-
 3 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/src/components/DesignForm/assembly/index.ts b/src/components/DesignForm/assembly/index.ts
index 588f78504..400d30c24 100644
--- a/src/components/DesignForm/assembly/index.ts
+++ b/src/components/DesignForm/assembly/index.ts
@@ -599,6 +599,8 @@ const selectOption: any = [
 			iconFont: 'fa-wpforms',
 			control: {
 				modelValue: '',
+				hideConditionHtml:'',
+				hideConditionHtmlCopy:'',
 			},
 			config: {}
 		}
diff --git a/src/components/DesignForm/formControlAttr.vue b/src/components/DesignForm/formControlAttr.vue
index b2d7ba4e6..ffec113d8 100644
--- a/src/components/DesignForm/formControlAttr.vue
+++ b/src/components/DesignForm/formControlAttr.vue
@@ -1780,7 +1780,8 @@ getAssociatedFormsCurrentFieldTree().then(({ data }) => {
 		associatedFormsCurrentFormFieldTree.value = [{
             id: 'rootid_'+data.label,
         	label: '当前表单',
-            children: [...resData.value]
+            children: [...resData.value],
+            treeAttrs: data.treeAttrs,
         }]
 });
 
@@ -1823,7 +1824,7 @@ function handleFieldTreeNodeclick(){
 }
 
 function handleFieldTreeContextmenu(MouseEvent:any, object:any, Node:any, element:any){
-    aft.value.addIcon(object)
+    aft.value.addIcon_field(object)
 }
 //org
 const orgTreeSearchFlag = ref(false)
@@ -1889,27 +1890,33 @@ const filterNode = (value: string, associatedFormsCurrentFormFieldTree: Tree) =>
 }
 //关联表单隐藏条件弹窗flag
 const associatedFormsHideDialogFlag = ref(false)
+
+
+
 //父组件
-let associatedFormsHideDialogText = ref('')//textarea默认值
+//let associatedFormsHideDialogText = ref('')//textarea默认值
 //父组件编辑备份
-let associatedFormsHideDialogTextCopy = ref('')
+//let associatedFormsHideDialogTextCopy = ref('')
+
+
+
 //点击开启隐藏设置
 function associatedFormsHideDialoghandle(){
     associatedFormsHideDialogFlag.value = true
-    associatedFormsHideDialogTextCopy.value = associatedFormsHideDialogText.value
+    controlData.value.control.hideConditionHtmlCopy = controlData.value.control.hideConditionHtml
 }
 
 //自定义事件同步父子组件的text
 function aftTextChanged(str:string){
-    associatedFormsHideDialogText.value = str
+    controlData.value.control.hideConditionHtml = str
 }
 //asf隐藏条件取消编辑
 function asfhTextCancel(){
     determine.value = false
     associatedFormsHideDialogFlag.value = false
-    associatedFormsHideDialogText.value = associatedFormsHideDialogTextCopy.value
+    controlData.value.control.hideConditionHtml = controlData.value.control.hideConditionHtmlCopy
     //父组件取消将copy同步至子组件
-    aft.value.handelCancel(associatedFormsHideDialogTextCopy.value)
+    aft.value.handelCancel(controlData.value.control.hideConditionHtmlCopy)
 }
 //上次点击了确定为true
 let determine = ref(true)
@@ -1925,7 +1932,7 @@ watch(associatedFormsHideDialogFlag, (val) => {
 function handleDetermine(){
     associatedFormsHideDialogFlag.value = false
     determine.value = true
-    associatedFormsHideDialogTextCopy.value = associatedFormsHideDialogText.value
+    controlData.value.control.hideConditionHtmlCopy = controlData.value.control.hideConditionHtml
 }
 
 
@@ -2392,8 +2399,8 @@ const loadNextPage = () => {
 								</el-row>
 
 								<el-row v-else-if="item.type === 'associatedForms_hide'">
-									<el-button  type="primary" append-to-body="true" modal="true" @click="associatedFormsHideDialoghandle"  >设置隐藏条件</el-button>
-									
+									<el-button v-if="controlData.control.hideConditionHtml===''" style="padding-top: 5px;" type="primary" link append-to-body="true" modal="true" @click="associatedFormsHideDialoghandle"  >设置隐藏条件</el-button>
+									<div   style="width:100%; cursor: pointer;"  v-html="controlData.control.hideConditionHtml" @click="associatedFormsHideDialoghandle"></div>
 								</el-row>
 
                                 <el-input
@@ -3166,7 +3173,7 @@ const loadNextPage = () => {
 				<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="associatedFormsHideDialogText" :aft-text-copy = "associatedFormsHideDialogTextCopy" @text-change = "aftTextChanged"></AssociatedFormsTinyace>
+                        <AssociatedFormsTinyace ref="aft" :aft-text="controlData.control.hideConditionHtml" :aft-text-copy = "controlData.control.hideConditionHtmlCopy" @text-change = "aftTextChanged"></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> -->
diff --git a/src/widget/associatedforms/associatedFormsTinyace.vue b/src/widget/associatedforms/associatedFormsTinyace.vue
index 835b8024f..4ec15b8f3 100644
--- a/src/widget/associatedforms/associatedFormsTinyace.vue
+++ b/src/widget/associatedforms/associatedFormsTinyace.vue
@@ -62,7 +62,9 @@ watch(()=>tinymceHtml.value, (val:any) => {
 const addIcon = (currentObject:any) =>{
 	tinymce.activeEditor?.execCommand('mceInsertContent', false, `<span style="margin:3px;background-color: #4189EF;border-radius: 5px; padding:3px" contenteditable="false" data-keyid= "${currentObject.id}" >${currentObject.label}</span>`);
 }
-
+const addIcon_field = (currentObject:any) =>{
+	tinymce.activeEditor?.execCommand('mceInsertContent', false, `<span style="margin:3px;background-color: #4189EF;border-radius: 5px; padding:3px" contenteditable="false" data-keyid= "${currentObject.id}" >${currentObject.treeAttrs.show}</span>`);
+}
 const addIcon_org = (currentObject:any) =>{
   let id = "orgOrPerson:"+currentObject.id
 	tinymce.activeEditor?.execCommand('mceInsertContent', false, `<span style="margin:3px;background-color: #4189EF;border-radius: 5px; padding:3px" contenteditable="false" data-keyid= "${id}" >${currentObject.label}</span>`);
@@ -80,6 +82,7 @@ defineExpose({
   tinymceHtml,
   addIcon,
   addIcon_org,
+  addIcon_field,
   handelCancel,
   tinymceReInit,
 })

From 273291a12c881e2b8ffc15491412ccaa3eb1dc36 Mon Sep 17 00:00:00 2001
From: liwenxuan <1298531568@qq.com>
Date: Fri, 19 Apr 2024 10:20:47 +0800
Subject: [PATCH 07/17] =?UTF-8?q?=E9=80=89=E6=8B=A9=E5=85=B3=E8=81=94?=
 =?UTF-8?q?=E8=A1=A8=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/DesignForm/assembly/index.ts   |  1 +
 src/components/DesignForm/formControlAttr.vue | 51 ++++++++++++++++++-
 2 files changed, 51 insertions(+), 1 deletion(-)

diff --git a/src/components/DesignForm/assembly/index.ts b/src/components/DesignForm/assembly/index.ts
index 400d30c24..a54c612b0 100644
--- a/src/components/DesignForm/assembly/index.ts
+++ b/src/components/DesignForm/assembly/index.ts
@@ -601,6 +601,7 @@ const selectOption: any = [
 				modelValue: '',
 				hideConditionHtml:'',
 				hideConditionHtmlCopy:'',
+				formid: '',
 			},
 			config: {}
 		}
diff --git a/src/components/DesignForm/formControlAttr.vue b/src/components/DesignForm/formControlAttr.vue
index ffec113d8..91c9a8264 100644
--- a/src/components/DesignForm/formControlAttr.vue
+++ b/src/components/DesignForm/formControlAttr.vue
@@ -626,6 +626,14 @@
 					vIf: state.isSearch,
 					vShow: ['associatedForms']
 				},
+                {
+					label: '关联表单',
+					value: config.associatedForms,
+					path: 'config.associatedForms',
+					type: 'associatedForms_form',
+					vIf: state.isSearch,
+					vShow: ['associatedForms']
+				},
                 {
                     label: '轮播图设置',
                     value: config.carousel,
@@ -1654,6 +1662,7 @@ interface Tree {
 	[key: string]: any
 }
 
+
 const addRootNode = () => {
 	let onlyNumber = uuidv4().replaceAll('-','').toString();   
 	controlData.value.control.fixedOptions.push({
@@ -1743,6 +1752,7 @@ const transferDataSourceOptions = [
 //liwenxuan20240403 associatedForms start 
 import AssociatedFormsTinyace from '@/widget/associatedforms/associatedFormsTinyace.vue'
 
+
 const treeDefaultProps = {
 	children: 'children',
 	label: 'label',
@@ -1766,6 +1776,13 @@ function getAssociatedFormsOrgAndManTree() {
             method: 'post',
         });
 }
+
+function getCustomerFormList() {
+        return request({
+            url: '/javasys/lowCode/AssociatedForms/getCustomerFormList',
+            method: 'post',
+        });
+}
 function getAssociatedFormsRoleTree() {
         return request({
             url: '/javasys/lowCode/AssociatedForms/getRoleList',
@@ -1785,6 +1802,19 @@ getAssociatedFormsCurrentFieldTree().then(({ data }) => {
         }]
 });
 
+const customerFormTree = ref<Tree[]>()
+getCustomerFormList().then(({ data }) => {   
+    let resData = ref(data.children)
+	customerFormTree.value = [{
+        id: data.id,
+        //value: data.value,
+    	//label: data.label,
+		label: '请选择表单',
+        children: [...resData.value]
+    }]
+});
+
+
 const orgAndManTree = ref<Tree[]>()
 	getAssociatedFormsOrgAndManTree().then(({ data }) => {   
         let resData = ref(data.children)
@@ -1807,7 +1837,7 @@ const roleTree = ref<Tree[]>()
             children: [...resData.value]
         }]
     });
-//form    field
+//    field
 const fieldTreeSearchFlag = ref(false)
 
 function handleFieldTreeExpand(){
@@ -1826,6 +1856,9 @@ function handleFieldTreeNodeclick(){
 function handleFieldTreeContextmenu(MouseEvent:any, object:any, Node:any, element:any){
     aft.value.addIcon_field(object)
 }
+
+
+
 //org
 const orgTreeSearchFlag = ref(false)
 
@@ -1888,6 +1921,7 @@ const filterNode = (value: string, associatedFormsCurrentFormFieldTree: Tree) =>
 	if (!value) return true
 	return associatedFormsCurrentFormFieldTree.label.includes(value)
 }
+
 //关联表单隐藏条件弹窗flag
 const associatedFormsHideDialogFlag = ref(false)
 
@@ -2403,6 +2437,20 @@ const loadNextPage = () => {
 									<div   style="width:100%; cursor: pointer;"  v-html="controlData.control.hideConditionHtml" @click="associatedFormsHideDialoghandle"></div>
 								</el-row>
 
+
+                                <el-row v-else-if="item.type === 'associatedForms_form'">
+                                    <div  style="margin-top: 25px;margin-left: -60px;">
+                                        <el-tree-select
+                                            v-model="controlData.control.formid"
+                                            style="width: 280px;"
+                                            :data="customerFormTree[0].children"
+                                            check-strictly
+                                            :render-after-expand="false"
+                                            filterable
+                                        />
+                                    </div>
+								</el-row> 
+
                                 <el-input
                                     v-else
                                     :type="item.inputStyle"
@@ -3122,6 +3170,7 @@ const loadNextPage = () => {
 					/>
 					<el-tree
 						ref="fieldTreeRef"
+                        node-key="id"
 						:data="associatedFormsCurrentFormFieldTree"
 						:props="treeDefaultProps"
 						:filter-node-method="filterNode"

From 7a3691d97fb75a928c04c5bfde473c32c4a16ba5 Mon Sep 17 00:00:00 2001
From: liwenxuan <1298531568@qq.com>
Date: Fri, 19 Apr 2024 16:23:48 +0800
Subject: [PATCH 08/17] =?UTF-8?q?=E5=85=B3=E8=81=94=E8=A1=A8=E5=8D=95?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E8=8C=83=E5=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/DesignForm/assembly/index.ts   |   2 +
 src/components/DesignForm/formControlAttr.vue | 191 ++++++++++++++++--
 .../associatedFormsTinyace.vue                |  12 +-
 3 files changed, 185 insertions(+), 20 deletions(-)

diff --git a/src/components/DesignForm/assembly/index.ts b/src/components/DesignForm/assembly/index.ts
index a54c612b0..aebeb953d 100644
--- a/src/components/DesignForm/assembly/index.ts
+++ b/src/components/DesignForm/assembly/index.ts
@@ -602,6 +602,8 @@ const selectOption: any = [
 				hideConditionHtml:'',
 				hideConditionHtmlCopy:'',
 				formid: '',
+				dataRangeConditionHtml:'',
+				dataRangeConditionHtmlCopy:'',
 			},
 			config: {}
 		}
diff --git a/src/components/DesignForm/formControlAttr.vue b/src/components/DesignForm/formControlAttr.vue
index 91c9a8264..b9c1646c1 100644
--- a/src/components/DesignForm/formControlAttr.vue
+++ b/src/components/DesignForm/formControlAttr.vue
@@ -634,6 +634,14 @@
 					vIf: state.isSearch,
 					vShow: ['associatedForms']
 				},
+                {
+					label: '数据范围',
+					value: config.associatedForms,
+					path: 'config.associatedForms',
+					type: 'associatedForms_dataRange',
+					vIf: state.isSearch,
+					vShow: ['associatedForms']
+				},
                 {
                     label: '轮播图设置',
                     value: config.carousel,
@@ -1751,7 +1759,7 @@ const transferDataSourceOptions = [
 
 //liwenxuan20240403 associatedForms start 
 import AssociatedFormsTinyace from '@/widget/associatedforms/associatedFormsTinyace.vue'
-
+import AssociatedFormsTinyaceRange from '@/widget/associatedforms/associatedFormsTinyaceRange.vue'
 
 const treeDefaultProps = {
 	children: 'children',
@@ -1759,6 +1767,7 @@ const treeDefaultProps = {
 }
 //拿到子组件AssociatedFormsTinyace的实例
 let aft = ref();
+const aftRange = ref();
 
 function getAssociatedFormsCurrentFieldTree() {
         return request({ 
@@ -1849,13 +1858,14 @@ function handleFieldTreeCollapse(){
 	
 	fieldTreeSearchFlag.value = false;
 }
-function handleFieldTreeNodeclick(){
-	
-}
+
 
 function handleFieldTreeContextmenu(MouseEvent:any, object:any, Node:any, element:any){
     aft.value.addIcon_field(object)
 }
+function handleFieldTreeContextmenuRange(MouseEvent:any, object:any, Node:any, element:any){
+    aftRange.value.addIcon_field(object)
+}
 
 
 
@@ -1871,12 +1881,13 @@ function handleOrgTreeCollapse(){
 	
 	orgTreeSearchFlag.value = false;
 }
-function handleOrgTreeNodeclick(){
-	
-}
+
 function handleOrgTreeContextmenu(MouseEvent:any, object:any, Node:any, element:any){
     aft.value.addIcon_org(object)
 }
+function handleOrgTreeContextmenuRange(MouseEvent:any, object:any, Node:any, element:any){
+    aftRange.value.addIcon_org(object)
+}
 //role
 const roleTreeSearchFlag = ref(false)
 
@@ -1889,13 +1900,13 @@ function handleRoleTreeCollapse(){
 	
 	roleTreeSearchFlag.value = false;
 }
-function handleRoleTreeNodeclick(){
-	
-}
+
 function handleRoleTreeContextmenu(MouseEvent:any, object:any, Node:any, element:any){
     aft.value.addIcon(object)
 }
-
+function handleRoleTreeContextmenuRange(MouseEvent:any, object:any, Node:any, element:any){
+    aftRange.value.addIcon(object)
+}
 
 
 import { ElTree } from 'element-plus'
@@ -1925,6 +1936,7 @@ const filterNode = (value: string, associatedFormsCurrentFormFieldTree: Tree) =>
 //关联表单隐藏条件弹窗flag
 const associatedFormsHideDialogFlag = ref(false)
 
+const associatedFormsDataRangeDialogFlag = ref(false)
 
 
 //父组件
@@ -1938,12 +1950,31 @@ const associatedFormsHideDialogFlag = ref(false)
 function associatedFormsHideDialoghandle(){
     associatedFormsHideDialogFlag.value = true
     controlData.value.control.hideConditionHtmlCopy = controlData.value.control.hideConditionHtml
+    nextTick(() => {
+        aft.value.focusEditor()
+	})
+}
+
+
+function associatedFormsDataRangeDialoghandle(){
+    associatedFormsDataRangeDialogFlag.value = true
+    controlData.value.control.dataRangeConditionHtmlCopy = controlData.value.control.dataRangeConditionHtml
+    
+    nextTick(() => {
+        aftRange.value.focusEditor()
+	})
+
+    
 }
 
 //自定义事件同步父子组件的text
 function aftTextChanged(str:string){
     controlData.value.control.hideConditionHtml = str
 }
+
+function aftTextChangedRange(str:string){
+    controlData.value.control.dataRangeConditionHtml = str
+}
 //asf隐藏条件取消编辑
 function asfhTextCancel(){
     determine.value = false
@@ -1952,8 +1983,18 @@ function asfhTextCancel(){
     //父组件取消将copy同步至子组件
     aft.value.handelCancel(controlData.value.control.hideConditionHtmlCopy)
 }
+
+function asfhTextCancelRange(){
+    determineRange.value = false
+    associatedFormsDataRangeDialogFlag.value = false
+    controlData.value.control.dataRangeConditionHtml = controlData.value.control.dataRangeConditionHtmlCopy
+    //父组件取消将copy同步至子组件
+    aftRange.value.handelCancel(controlData.value.control.dataRangeConditionHtmlCopy)
+}
+
 //上次点击了确定为true
 let determine = ref(true)
+let determineRange = ref(true)
 //监听associatedFormsHideDialogFlag true 重新init  tinymce
 watch(associatedFormsHideDialogFlag, (val) => {
 	if(val===true&&determine.value===false){
@@ -1962,12 +2003,26 @@ watch(associatedFormsHideDialogFlag, (val) => {
         }, 200);
     }
 })
+
+watch(associatedFormsDataRangeDialogFlag, (val) => {
+	if(val===true&&determineRange.value===false){
+        setTimeout(() => {
+            aftRange.value.tinymceReInit()
+        }, 200);
+    }
+})
+
 //确定回调
 function handleDetermine(){
     associatedFormsHideDialogFlag.value = false
     determine.value = true
     controlData.value.control.hideConditionHtmlCopy = controlData.value.control.hideConditionHtml
 }
+function handleDetermineRange(){
+    associatedFormsDataRangeDialogFlag.value = false
+    determineRange.value = true
+    controlData.value.control.dataRangeConditionHtmlCopy = controlData.value.control.dataRangeConditionHtml
+}
 
 
 
@@ -2451,6 +2506,11 @@ const loadNextPage = () => {
                                     </div>
 								</el-row> 
 
+                                <el-row v-else-if="item.type === 'associatedForms_dataRange'">
+									<el-button v-if="controlData.control.dataRangeConditionHtml===''" style="padding-top: 5px;" type="primary" link append-to-body="true" modal="true" @click="associatedFormsDataRangeDialoghandle"  >设置数据范围</el-button>
+									<div style="width:100%; cursor: pointer;"  v-html="controlData.control.dataRangeConditionHtml" @click="associatedFormsDataRangeDialoghandle"></div>
+								</el-row>
+
                                 <el-input
                                     v-else
                                     :type="item.inputStyle"
@@ -3177,7 +3237,7 @@ const loadNextPage = () => {
 						style="max-width: 600px; border: 1px solid gainsboro; margin: 3px;"
 						@node-expand="handleFieldTreeExpand"
 						@node-collapse="handleFieldTreeCollapse"
-						@node-click="handleFieldTreeNodeclick"
+						
 						@node-contextmenu="handleFieldTreeContextmenu"
 						
 						
@@ -3197,7 +3257,7 @@ const loadNextPage = () => {
 						:filter-node-method="filterNode"
                         @node-expand="handleOrgTreeExpand"
 						@node-collapse="handleOrgTreeCollapse"
-						@node-click="handleOrgTreeNodeclick"
+						
 						@node-contextmenu="handleOrgTreeContextmenu"
 					/>
                     <el-input
@@ -3215,7 +3275,7 @@ const loadNextPage = () => {
 						:filter-node-method="filterNode"
                         @node-expand="handleRoleTreeExpand"
 						@node-collapse="handleRoleTreeCollapse"
-						@node-click="handleRoleTreeNodeclick"
+						
 						@node-contextmenu="handleRoleTreeContextmenu"
 					/>
 				</el-aside>
@@ -3249,11 +3309,108 @@ const loadNextPage = () => {
 		</div>
     </template>
 	</el-dialog>
+
+
+<!-- 数据范围编辑弹窗 -->
+
+    <el-dialog v-model="associatedFormsDataRangeDialogFlag" 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'">
+			<div class="common-layout">
+				<el-container>
+				<el-aside width="300px" style="height:420px;border: 1px solid gainsboro;margin-right: 5px;">
+					<el-input
+						v-show="fieldTreeSearchFlag"
+						v-model="fieldTreeFilterText"
+						style="width:98%;margin: 3px;"
+						placeholder="搜索字段"
+						class="filter-tree"
+					/>
+					<el-tree
+						ref="fieldTreeRef"
+                        node-key="id"
+						:data="associatedFormsCurrentFormFieldTree"
+						:props="treeDefaultProps"
+						:filter-node-method="filterNode"
+						style="max-width: 600px; border: 1px solid gainsboro; margin: 3px;"
+						@node-expand="handleFieldTreeExpand"
+						@node-collapse="handleFieldTreeCollapse"
+						
+						@node-contextmenu="handleFieldTreeContextmenuRange"
+						
+						
+					/>
+                    <el-input
+						v-show="orgTreeSearchFlag"
+						v-model="orgTreeFilterText"
+						style="width:98%;margin: 3px;"
+						placeholder="搜索字段"
+						class="filter-tree"
+					/>
+					<el-tree
+                        ref="orgTreeRef"
+						style="max-width: 600px; border: 1px solid gainsboro; margin: 3px;"
+						:data="orgAndManTree"
+						:props="treeDefaultProps"
+						:filter-node-method="filterNode"
+                        @node-expand="handleOrgTreeExpand"
+						@node-collapse="handleOrgTreeCollapse"
+						
+						@node-contextmenu="handleOrgTreeContextmenuRange"
+					/>
+                    <el-input
+						v-show="roleTreeSearchFlag"
+						v-model="roleTreeFilterText"
+						style="width:98%;margin: 3px;"
+						placeholder="搜索字段"
+						class="filter-tree"
+					/>
+					<el-tree
+                        ref="roleTreeRef"
+						style="max-width: 600px; border: 1px solid gainsboro; margin: 3px;"
+						:data="roleTree"
+						:props="treeDefaultProps"
+						:filter-node-method="filterNode"
+                        @node-expand="handleRoleTreeExpand"
+						@node-collapse="handleRoleTreeCollapse"
+						
+						@node-contextmenu="handleRoleTreeContextmenuRange"
+					/>
+				</el-aside>
+				<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>
+                        <!-- <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> -->
+                        
+                    </div>
+					<div style="border: 1px solid gainsboro; height: 30%; padding-top: 20px;">
+                        <ul>
+                            <li>请从左侧面板<span style="color: red">右击</span>选择字段或选项</li>
+                            <li>支持<span style="color: red">英文</span>模式下运算符<!-- （+、-、*、/、>、<、==、） --></li>
+                            <li>参考场景：</li>
+                            <span style="margin-left: 14px;">仅可选择关联表单中年龄大于10的数据，则可将数据范围设置为：年龄>10</span>
+                        </ul>
+                    </div>
+				</el-main>
+				</el-container>
+			</div>
+		</template>
+		<template #footer>
+		<div class="dialog-footer">
+			<el-button @click="asfhTextCancelRange">取消</el-button>
+			<el-button type="primary" @click="handleDetermineRange">
+			确定
+			</el-button>
+		</div>
+    </template>
+	</el-dialog>
     
     
-<!-- 
-    
--->
+
+
 	<!-- 关联表单设置弹窗 liwenxuan 20240402 end -->
     </template>
 
diff --git a/src/widget/associatedforms/associatedFormsTinyace.vue b/src/widget/associatedforms/associatedFormsTinyace.vue
index 4ec15b8f3..ca8df6f12 100644
--- a/src/widget/associatedforms/associatedFormsTinyace.vue
+++ b/src/widget/associatedforms/associatedFormsTinyace.vue
@@ -9,12 +9,12 @@ import Editor from "@tinymce/tinymce-vue"; // 引入组件
 import { v4 as uuidv4 } from "uuid";
 
 let onlyNumber = uuidv4().replaceAll('-','').toString();   //获取唯一编码
-//onlyNumber = "#"+onlyNumber
+
 /**
  * 初始富文本组件
  */
 const tinymceInit = {
-  selector: "#tinymceasfhide",
+  selector: "#"+onlyNumber,
 	language_url: "/tinymce/langs/zh-Hans.js", // 引入语言包（该语言包在public下，注意文件名称）
 	language: "zh-Hans", // 这里名称根据 zh-Hans.js 里面写的名称而定
 	skin_url: "/tinymce/skins/ui/oxide", // 这里引入的样式
@@ -74,8 +74,13 @@ const handelCancel = (associatedFormsHideDialogTextCopy:any) =>{
   tinymceHtml.value = associatedFormsHideDialogTextCopy
 }
 const tinymceReInit = ()=>{
+    
+    
     let str:string = props.aftTextCopy
 }
+const focusEditor = ()=>{
+  document.getElementById(onlyNumber)?.focus()
+}
 
 
 defineExpose({
@@ -85,12 +90,13 @@ defineExpose({
   addIcon_field,
   handelCancel,
   tinymceReInit,
+  focusEditor,
 })
 
 </script>
 <template >
 	<div >
-    <editor id="tinymce"   v-model="tinymceHtml" :init="tinymceInit" ></editor>
+    <editor :id="onlyNumber"   v-model="tinymceHtml" :init="tinymceInit" ></editor>
   </div>
 	
 

From f1b398d04cd6632838d6cda80a940b5807d758fe Mon Sep 17 00:00:00 2001
From: liwenxuan <1298531568@qq.com>
Date: Sat, 20 Apr 2024 10:49:58 +0800
Subject: [PATCH 09/17] =?UTF-8?q?=E5=85=B3=E8=81=94=E8=A1=A8=E5=8D=95v0.8?=
 =?UTF-8?q?=20=2013=E6=94=B9=E4=B8=BA=E6=B4=BB=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/DesignForm/assembly/index.ts   |   1 +
 src/components/DesignForm/formControlAttr.vue | 144 +++++++++++++++---
 2 files changed, 120 insertions(+), 25 deletions(-)

diff --git a/src/components/DesignForm/assembly/index.ts b/src/components/DesignForm/assembly/index.ts
index aebeb953d..c32cd1b2f 100644
--- a/src/components/DesignForm/assembly/index.ts
+++ b/src/components/DesignForm/assembly/index.ts
@@ -604,6 +604,7 @@ const selectOption: any = [
 				formid: '',
 				dataRangeConditionHtml:'',
 				dataRangeConditionHtmlCopy:'',
+				saveFlag: false,
 			},
 			config: {}
 		}
diff --git a/src/components/DesignForm/formControlAttr.vue b/src/components/DesignForm/formControlAttr.vue
index b9c1646c1..333388a97 100644
--- a/src/components/DesignForm/formControlAttr.vue
+++ b/src/components/DesignForm/formControlAttr.vue
@@ -642,6 +642,14 @@
 					vIf: state.isSearch,
 					vShow: ['associatedForms']
 				},
+                {
+					label: '数据填充规则',
+					value: config.associatedForms,
+					path: 'config.associatedForms',
+					type: 'associatedForms_FillRoles',
+					vIf: state.isSearch,
+					vShow: ['associatedForms']
+				},
                 {
                     label: '轮播图设置',
                     value: config.carousel,
@@ -1770,13 +1778,16 @@ let aft = ref();
 const aftRange = ref();
 
 function getAssociatedFormsCurrentFieldTree() {
+
         return request({ 
             url: '/javasys/lowCode/AssociatedForms/getFieldTree',
             method: 'post',
 			data: {
-				cfid:'13'
+				//cfid:'13'
+                cfid:props.customerformid
 			},
         });
+ 
 }
 
 function getAssociatedFormsOrgAndManTree() {
@@ -1798,18 +1809,35 @@ function getAssociatedFormsRoleTree() {
             method: 'post',
         });
 }
+
 const associatedFormsCurrentFormFieldTree = ref<Tree[]>()
 
-getAssociatedFormsCurrentFieldTree().then(({ data }) => {   
-        let resData = ref(data.children)
-		//let rootid_ = data.value.label
-		associatedFormsCurrentFormFieldTree.value = [{
-            id: 'rootid_'+data.label,
-        	label: '当前表单',
-            children: [...resData.value],
-            treeAttrs: data.treeAttrs,
-        }]
-});
+    getAssociatedFormsCurrentFieldTree().then(({ data }) => {
+        
+        if(data.id==="cfid为空"){
+            //alert("cfid为空")
+        }else{
+            
+                
+                
+                let resData = ref(data.children)
+                //let rootid_ = data.value.label
+                associatedFormsCurrentFormFieldTree.value = [{
+                    id: 'rootid_'+data.label,
+                    label: '当前表单',
+                    children: [...resData.value],
+                    treeAttrs: data.treeAttrs,
+                }]
+            
+            
+        }
+
+        
+        
+        
+    });
+
+
 
 const customerFormTree = ref<Tree[]>()
 getCustomerFormList().then(({ data }) => {   
@@ -1948,21 +1976,43 @@ const associatedFormsDataRangeDialogFlag = ref(false)
 
 //点击开启隐藏设置
 function associatedFormsHideDialoghandle(){
-    associatedFormsHideDialogFlag.value = true
-    controlData.value.control.hideConditionHtmlCopy = controlData.value.control.hideConditionHtml
-    nextTick(() => {
-        aft.value.focusEditor()
-	})
+    /* 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(){
-    associatedFormsDataRangeDialogFlag.value = true
-    controlData.value.control.dataRangeConditionHtmlCopy = controlData.value.control.dataRangeConditionHtml
+    /* if(controlData.value.control.saveFlag===true){
+        
+        associatedFormsDataRangeDialogFlag.value = true
+        controlData.value.control.dataRangeConditionHtmlCopy = controlData.value.control.dataRangeConditionHtml
+        //alert("当前表单未保存过，若从左侧树中选择字段信息，请先保存当前表单")
+        nextTick(() => {
+            aftRange.value.focusEditor()
+        })
+    }else{ */
+        associatedFormsDataRangeDialogFlag.value = true
+        controlData.value.control.dataRangeConditionHtmlCopy = controlData.value.control.dataRangeConditionHtml
+        
+        nextTick(() => {
+            aftRange.value.focusEditor()
+        })
+    //}
     
-    nextTick(() => {
-        aftRange.value.focusEditor()
-	})
 
     
 }
@@ -2497,7 +2547,7 @@ const loadNextPage = () => {
                                     <div  style="margin-top: 25px;margin-left: -60px;">
                                         <el-tree-select
                                             v-model="controlData.control.formid"
-                                            style="width: 280px;"
+                                            style="width: 260px;"
                                             :data="customerFormTree[0].children"
                                             check-strictly
                                             :render-after-expand="false"
@@ -2511,6 +2561,14 @@ const loadNextPage = () => {
 									<div style="width:100%; cursor: pointer;"  v-html="controlData.control.dataRangeConditionHtml" @click="associatedFormsDataRangeDialoghandle"></div>
 								</el-row>
 
+
+                                <!-- <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-input
                                     v-else
                                     :type="item.inputStyle"
@@ -3231,6 +3289,7 @@ const loadNextPage = () => {
 					<el-tree
 						ref="fieldTreeRef"
                         node-key="id"
+                        empty-text="请先保存当前表单,若需要展示本次编辑表单添加的字段,也需先保存"
 						:data="associatedFormsCurrentFormFieldTree"
 						:props="treeDefaultProps"
 						:filter-node-method="filterNode"
@@ -3319,6 +3378,19 @@ const loadNextPage = () => {
 			<div class="common-layout">
 				<el-container>
 				<el-aside width="300px" style="height:420px;border: 1px solid gainsboro;margin-right: 5px;">
+
+
+                    <!-- <el-tree
+						ref="fieldTreeRef"
+                        node-key="id"
+						:data="asfasfFieldTree"
+						:props="treeDefaultProps"
+						:filter-node-method="filterNode"
+						style="max-width: 600px; border: 1px solid gainsboro; margin: 3px;"
+						@node-expand="handleFieldTreeExpand"
+						@node-collapse="handleFieldTreeCollapse"
+						@node-contextmenu="handleFieldTreeContextmenuRange"
+					/> -->
 					<el-input
 						v-show="fieldTreeSearchFlag"
 						v-model="fieldTreeFilterText"
@@ -3329,16 +3401,14 @@ const loadNextPage = () => {
 					<el-tree
 						ref="fieldTreeRef"
                         node-key="id"
+                        empty-text="请先保存当前表单,若需要展示本次编辑表单添加的字段,也需先保存"
 						:data="associatedFormsCurrentFormFieldTree"
 						:props="treeDefaultProps"
 						:filter-node-method="filterNode"
 						style="max-width: 600px; border: 1px solid gainsboro; margin: 3px;"
 						@node-expand="handleFieldTreeExpand"
 						@node-collapse="handleFieldTreeCollapse"
-						
 						@node-contextmenu="handleFieldTreeContextmenuRange"
-						
-						
 					/>
                     <el-input
 						v-show="orgTreeSearchFlag"
@@ -3407,6 +3477,30 @@ const loadNextPage = () => {
 		</div>
     </template>
 	</el-dialog>
+
+
+
+
+
+
+    <!-- 数据填充规则弹窗 -->
+
+
+
+    <!-- <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
+		</template>
+		<template #footer>
+		<div class="dialog-footer">
+			<el-button @click="asfhTextCancelFillRoles">取消</el-button>
+			<el-button type="primary" @click="handleDetermineFillRoles">
+			确定
+			</el-button>
+		</div>
+    </template>
+	</el-dialog> -->
     
     
 

From f93067a110250392bc5409197f5120947da0c194 Mon Sep 17 00:00:00 2001
From: liwenxuan <1298531568@qq.com>
Date: Sat, 20 Apr 2024 11:19:26 +0800
Subject: [PATCH 10/17] =?UTF-8?q?=E5=85=B3=E8=81=94=E7=9A=84=E8=A1=A8?=
 =?UTF-8?q?=E5=8D=95=E6=A0=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/DesignForm/formControlAttr.vue | 116 +++++++++++-------
 1 file changed, 71 insertions(+), 45 deletions(-)

diff --git a/src/components/DesignForm/formControlAttr.vue b/src/components/DesignForm/formControlAttr.vue
index 333388a97..68312a620 100644
--- a/src/components/DesignForm/formControlAttr.vue
+++ b/src/components/DesignForm/formControlAttr.vue
@@ -1787,7 +1787,6 @@ function getAssociatedFormsCurrentFieldTree() {
                 cfid:props.customerformid
 			},
         });
- 
 }
 
 function getAssociatedFormsOrgAndManTree() {
@@ -1810,32 +1809,36 @@ function getAssociatedFormsRoleTree() {
         });
 }
 
-const associatedFormsCurrentFormFieldTree = ref<Tree[]>()
+function getAsfasfFieldTree() {
+    return request({ 
+        url: '/javasys/lowCode/AssociatedForms/getFieldTree',
+        method: 'post',
+        data: {
+            //cfid:'13'
+            cfid:controlData.value.control.formid
+        },
+    });
+}
 
-    getAssociatedFormsCurrentFieldTree().then(({ data }) => {
-        
-        if(data.id==="cfid为空"){
-            //alert("cfid为空")
-        }else{
-            
-                
-                
-                let resData = ref(data.children)
-                //let rootid_ = data.value.label
-                associatedFormsCurrentFormFieldTree.value = [{
-                    id: 'rootid_'+data.label,
-                    label: '当前表单',
-                    children: [...resData.value],
-                    treeAttrs: data.treeAttrs,
-                }]
-            
-            
-        }
 
-        
-        
-        
-    });
+const asfasfFieldTree = ref<Tree[]>()
+
+const associatedFormsCurrentFormFieldTree = ref<Tree[]>()
+getAssociatedFormsCurrentFieldTree().then(({ data }) => {
+    
+    if(data.id==="cfid为空"){
+        //alert("cfid为空")
+    }else{
+        let resData = ref(data.children)
+        //let rootid_ = data.value.label
+        associatedFormsCurrentFormFieldTree.value = [{
+            id: 'rootid_'+data.label,
+            label: '当前表单',
+            children: [...resData.value],
+            treeAttrs: data.treeAttrs,
+        }]
+    }
+});
 
 
 
@@ -1853,27 +1856,27 @@ getCustomerFormList().then(({ data }) => {
 
 
 const orgAndManTree = ref<Tree[]>()
-	getAssociatedFormsOrgAndManTree().then(({ data }) => {   
-        let resData = ref(data.children)
-		orgAndManTree.value = [{
-            id: data.id,
-        	//label: data.label,
-			label: '组织机构',
-            children: [...resData.value]
-        }]
+getAssociatedFormsOrgAndManTree().then(({ data }) => {   
+    let resData = ref(data.children)
+	orgAndManTree.value = [{
+        id: data.id,
+    	//label: data.label,
+		label: '组织机构',
+        children: [...resData.value]
+    }]
 });
 
 const roleTree = ref<Tree[]>()
-	getAssociatedFormsRoleTree().then(({ data }) => {   
-        let resData = ref(data.children)
-        //console.log("roleTree=============="+resData.value);
-		roleTree.value = [{
-            id: data.id,
-        	//label: data.label,
-			label: '角色',
-            children: [...resData.value]
-        }]
-    });
+getAssociatedFormsRoleTree().then(({ data }) => {   
+    let resData = ref(data.children)
+    //console.log("roleTree=============="+resData.value);
+	roleTree.value = [{
+        id: data.id,
+    	//label: data.label,
+		label: '角色',
+        children: [...resData.value]
+    }]
+});
 //    field
 const fieldTreeSearchFlag = ref(false)
 
@@ -2005,6 +2008,28 @@ function associatedFormsDataRangeDialoghandle(){
             aftRange.value.focusEditor()
         })
     }else{ */
+
+        
+
+
+        getAsfasfFieldTree().then(({ data }) => {
+    
+            if(data.id==="cfid为空"){
+                //alert("cfid为空")
+            }else{
+                let resData = ref(data.children)
+                //let rootid_ = data.value.label
+                asfasfFieldTree.value = [{
+                    id: 'rootid_'+data.label,
+                    label: '关联的表单-'+data.label,
+                    children: [...resData.value],
+                    treeAttrs: data.treeAttrs,
+                }]
+            }
+        });
+
+
+
         associatedFormsDataRangeDialogFlag.value = true
         controlData.value.control.dataRangeConditionHtmlCopy = controlData.value.control.dataRangeConditionHtml
         
@@ -2554,6 +2579,7 @@ const loadNextPage = () => {
                                             filterable
                                         />
                                     </div>
+                                    <!-- <div v-html="controlData.control.formid"></div> -->
 								</el-row> 
 
                                 <el-row v-else-if="item.type === 'associatedForms_dataRange'">
@@ -3380,7 +3406,7 @@ const loadNextPage = () => {
 				<el-aside width="300px" style="height:420px;border: 1px solid gainsboro;margin-right: 5px;">
 
 
-                    <!-- <el-tree
+                    <el-tree
 						ref="fieldTreeRef"
                         node-key="id"
 						:data="asfasfFieldTree"
@@ -3390,7 +3416,7 @@ const loadNextPage = () => {
 						@node-expand="handleFieldTreeExpand"
 						@node-collapse="handleFieldTreeCollapse"
 						@node-contextmenu="handleFieldTreeContextmenuRange"
-					/> -->
+					/>
 					<el-input
 						v-show="fieldTreeSearchFlag"
 						v-model="fieldTreeFilterText"

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 11/17] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E8=8C=83=E5=9B=B4?=
 =?UTF-8?q?=E5=BC=B9=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>
     
     
 

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

---
 src/components/DesignForm/assembly/index.ts   |  6 ++
 src/components/DesignForm/formControlAttr.vue | 66 ++++++++++++++++---
 2 files changed, 62 insertions(+), 10 deletions(-)

diff --git a/src/components/DesignForm/assembly/index.ts b/src/components/DesignForm/assembly/index.ts
index c32cd1b2f..5e88e103c 100644
--- a/src/components/DesignForm/assembly/index.ts
+++ b/src/components/DesignForm/assembly/index.ts
@@ -605,6 +605,12 @@ const selectOption: any = [
 				dataRangeConditionHtml:'',
 				dataRangeConditionHtmlCopy:'',
 				saveFlag: false,
+				fillRoles: [
+					{
+						leftValue:'',
+						rightValue:'',
+					}
+				],
 			},
 			config: {}
 		}
diff --git a/src/components/DesignForm/formControlAttr.vue b/src/components/DesignForm/formControlAttr.vue
index 04380966f..e837b9a82 100644
--- a/src/components/DesignForm/formControlAttr.vue
+++ b/src/components/DesignForm/formControlAttr.vue
@@ -1768,6 +1768,7 @@ const transferDataSourceOptions = [
 //liwenxuan20240403 associatedForms start 
 import AssociatedFormsTinyace from '@/widget/associatedforms/associatedFormsTinyace.vue'
 import AssociatedFormsTinyaceRange from '@/widget/associatedforms/associatedFormsTinyaceRange.vue'
+import AssociatedFormsFillRole from '@/widget/associatedforms/associatedFormsFillRole.vue'
 
 const treeDefaultProps = {
 	children: 'children',
@@ -1823,6 +1824,29 @@ function getAsfasfFieldTree() {
 
 const asfasfFieldTree = ref<Tree[]>()
 
+function formidChanged(){
+    
+    if(controlData.value.control.formid===''){
+
+    }else{
+        getAsfasfFieldTree().then(({ data }) => {
+            
+            if(data.id==="cfid为空"){
+                //alert("cfid为空")
+            }else{
+                let resData = ref(data.children)
+                //let rootid_ = data.value.label
+                asfasfFieldTree.value = [{
+                    id: 'rootid_'+data.label,
+                    label: '关联的表单-'+data.label,
+                    children: [...resData.value],
+                    treeAttrs: data.treeAttrs,
+                }]
+            }
+        });
+    }
+}
+
 const associatedFormsCurrentFormFieldTree = ref<Tree[]>()
 getAssociatedFormsCurrentFieldTree().then(({ data }) => {
     
@@ -1985,6 +2009,7 @@ function associatedFormsHideDialoghandle(){
 }
 
 
+
 function associatedFormsDataRangeDialoghandle(){
 
         getAsfasfFieldTree().then(({ data }) => {
@@ -2073,20 +2098,35 @@ function handleDetermineRange(){
 //数据填充规则
 
 const associatedFormsFillRolesDialogFlag = ref(false)
-
+//数据填充规则设置按钮
 function associatedFormsDataFillRolesDialoghandle(){
-    associatedFormsFillRolesDialogFlag.value = true
+    if(controlData.value.control.formid===''){
+        alert("请先选择要关联的表单")
+        
+    }else{
+        associatedFormsFillRolesDialogFlag.value = true
+    }
 }
 
 function asfhTextCancelFillRoles(){
     associatedFormsFillRolesDialogFlag.value = false
 }
-
+//数据填充规则确定按钮
 function handleDetermineFillRoles(){
+    
     associatedFormsFillRolesDialogFlag.value = false
 }
 
 
+watch(()=>store.activeKey, () => {
+    if(controlData.value.type==='associatedForms'){
+        setTimeout(() => {
+            formidChanged()
+        }, 800);
+    }
+})
+
+
 //liwenxuan20240403 associatedForms end 
 
 
@@ -2177,6 +2217,9 @@ const gainFormGroupList = () =>{
 		})
 }
 onMounted(() => {
+    
+    
+    
 	gainFormGroupList()
 })
 
@@ -2548,7 +2591,7 @@ const loadNextPage = () => {
 
 								<el-row v-else-if="item.type === 'associatedForms_hide'">
 									<el-button v-if="controlData.control.hideConditionHtml===''" style="padding-top: 5px;" type="primary" link append-to-body="true" modal="true" @click="associatedFormsHideDialoghandle"  >设置隐藏条件</el-button>
-									<div   style="width:100%; cursor: pointer;"  v-html="controlData.control.hideConditionHtml" @click="associatedFormsHideDialoghandle"></div>
+									<div   style="width:100%; cursor: pointer;"  @click="associatedFormsHideDialoghandle" v-html="controlData.control.hideConditionHtml"></div>
 								</el-row>
 
 
@@ -2561,6 +2604,7 @@ const loadNextPage = () => {
                                             check-strictly
                                             :render-after-expand="false"
                                             filterable
+                                            @change="formidChanged"
                                         />
                                     </div>
                                     <!-- <div v-html="controlData.control.formid"></div> -->
@@ -2568,7 +2612,7 @@ const loadNextPage = () => {
 
                                 <el-row v-else-if="item.type === 'associatedForms_dataRange'">
 									<el-button v-if="controlData.control.dataRangeConditionHtml===''" style="padding-top: 5px;" type="primary" link append-to-body="true" modal="true" @click="associatedFormsDataRangeDialoghandle"  >设置数据范围</el-button>
-									<div style="width:100%; cursor: pointer;"  v-html="controlData.control.dataRangeConditionHtml" @click="associatedFormsDataRangeDialoghandle"></div>
+									<div style="width:100%; cursor: pointer;" @click="associatedFormsDataRangeDialoghandle"  v-html="controlData.control.dataRangeConditionHtml"></div>
 								</el-row>
 
 
@@ -3497,15 +3541,17 @@ 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'">
-            <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 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">
-                
+                <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>

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 13/17] =?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()
 }
 

From 90ea047e409c3644f8cd9b54b918c4e1c8ec3598 Mon Sep 17 00:00:00 2001
From: liwenxuan <1298531568@qq.com>
Date: Mon, 22 Apr 2024 11:51:01 +0800
Subject: [PATCH 14/17] =?UTF-8?q?=E8=A7=A3=E5=86=B3tinyMce=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E7=84=A6=E7=82=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 node_modules/.package-lock.json               | 20 +++++++++++++++++
 package-lock.json                             | 22 +++++++++++++++++++
 package.json                                  |  2 ++
 .../associatedFormsTinyace.vue                |  9 +++-----
 4 files changed, 47 insertions(+), 6 deletions(-)

diff --git a/node_modules/.package-lock.json b/node_modules/.package-lock.json
index d044462a5..a779c9a53 100644
--- a/node_modules/.package-lock.json
+++ b/node_modules/.package-lock.json
@@ -966,6 +966,15 @@
       "resolved": "https://registry.npmmirror.com/@types/event-emitter/-/event-emitter-0.3.4.tgz",
       "integrity": "sha512-q68CMfgGnlwrV6BFupIGNSitHbuFhGzA+uTBztFKAQuGCF/Xy0mi33jwEPQaHtnb89cLFlsc7AIxk/2gdtXrvw=="
     },
+    "node_modules/@types/jquery": {
+      "version": "3.5.29",
+      "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.29.tgz",
+      "integrity": "sha512-oXQQC9X9MOPRrMhPHHOsXqeQDnWeCDT3PelUIg/Oy8FAbzSZtFHRjc7IpbfFVmpLtJ+UOoywpRsuO5Jxjybyeg==",
+      "dev": true,
+      "dependencies": {
+        "@types/sizzle": "*"
+      }
+    },
     "node_modules/@types/json-schema": {
       "version": "7.0.14",
       "resolved": "https://registry.npmmirror.com/@types/json-schema/-/json-schema-7.0.14.tgz",
@@ -1027,6 +1036,12 @@
       "integrity": "sha512-MMzuxN3GdFwskAnb6fz0orFvhfqi752yjaXylr0Rp4oDg5H0Zn1IuyRhDVvYOwAXoJirx2xuS16I3WjxnAIHiQ==",
       "dev": true
     },
+    "node_modules/@types/sizzle": {
+      "version": "2.3.8",
+      "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.8.tgz",
+      "integrity": "sha512-0vWLNK2D5MT9dg0iOo8GlKguPAU02QjmZitPEsXRuJXU/OGIOt9vT9Fc26wtYuavLxtO45v9PGleoL9Z0k1LHg==",
+      "dev": true
+    },
     "node_modules/@types/spark-md5": {
       "version": "3.0.4",
       "resolved": "https://registry.npmmirror.com/@types/spark-md5/-/spark-md5-3.0.4.tgz",
@@ -5265,6 +5280,11 @@
         "jiti": "bin/jiti.js"
       }
     },
+    "node_modules/jquery": {
+      "version": "3.7.1",
+      "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.7.1.tgz",
+      "integrity": "sha512-m4avr8yL8kmFN8psrbFFFmB/If14iN5o9nw/NgnnM+kybDJpRsAynV2BsfpTYrTRysYUdADVD7CkUUizgkpLfg=="
+    },
     "node_modules/js-base64": {
       "version": "2.6.4",
       "resolved": "https://registry.npmmirror.com/js-base64/-/js-base64-2.6.4.tgz",
diff --git a/package-lock.json b/package-lock.json
index 1d1bca102..386bcb660 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -21,6 +21,7 @@
         "echarts": "^5.4.3",
         "element-plus": "^2.3.4",
         "font-awesome": "^4.7.0",
+        "jquery": "^3.7.1",
         "js-beautify": "^1.14.8",
         "js-md5": "^0.7.3",
         "mapv-three": "^1.0.18",
@@ -46,6 +47,7 @@
         "@commitlint/cli": "^17.6.3",
         "@commitlint/config-conventional": "^17.6.3",
         "@iconify-json/ep": "^1.1.10",
+        "@types/jquery": "^3.5.29",
         "@types/md5": "^2.3.2",
         "@types/nprogress": "^0.2.0",
         "@types/path-browserify": "^1.0.0",
@@ -1363,6 +1365,15 @@
       "resolved": "https://registry.npmmirror.com/@types/event-emitter/-/event-emitter-0.3.4.tgz",
       "integrity": "sha512-q68CMfgGnlwrV6BFupIGNSitHbuFhGzA+uTBztFKAQuGCF/Xy0mi33jwEPQaHtnb89cLFlsc7AIxk/2gdtXrvw=="
     },
+    "node_modules/@types/jquery": {
+      "version": "3.5.29",
+      "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.29.tgz",
+      "integrity": "sha512-oXQQC9X9MOPRrMhPHHOsXqeQDnWeCDT3PelUIg/Oy8FAbzSZtFHRjc7IpbfFVmpLtJ+UOoywpRsuO5Jxjybyeg==",
+      "dev": true,
+      "dependencies": {
+        "@types/sizzle": "*"
+      }
+    },
     "node_modules/@types/json-schema": {
       "version": "7.0.14",
       "resolved": "https://registry.npmmirror.com/@types/json-schema/-/json-schema-7.0.14.tgz",
@@ -1424,6 +1435,12 @@
       "integrity": "sha512-MMzuxN3GdFwskAnb6fz0orFvhfqi752yjaXylr0Rp4oDg5H0Zn1IuyRhDVvYOwAXoJirx2xuS16I3WjxnAIHiQ==",
       "dev": true
     },
+    "node_modules/@types/sizzle": {
+      "version": "2.3.8",
+      "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.8.tgz",
+      "integrity": "sha512-0vWLNK2D5MT9dg0iOo8GlKguPAU02QjmZitPEsXRuJXU/OGIOt9vT9Fc26wtYuavLxtO45v9PGleoL9Z0k1LHg==",
+      "dev": true
+    },
     "node_modules/@types/spark-md5": {
       "version": "3.0.4",
       "resolved": "https://registry.npmmirror.com/@types/spark-md5/-/spark-md5-3.0.4.tgz",
@@ -5675,6 +5692,11 @@
         "jiti": "bin/jiti.js"
       }
     },
+    "node_modules/jquery": {
+      "version": "3.7.1",
+      "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.7.1.tgz",
+      "integrity": "sha512-m4avr8yL8kmFN8psrbFFFmB/If14iN5o9nw/NgnnM+kybDJpRsAynV2BsfpTYrTRysYUdADVD7CkUUizgkpLfg=="
+    },
     "node_modules/js-base64": {
       "version": "2.6.4",
       "resolved": "https://registry.npmmirror.com/js-base64/-/js-base64-2.6.4.tgz",
diff --git a/package.json b/package.json
index d2856036f..d25cd9ece 100644
--- a/package.json
+++ b/package.json
@@ -52,6 +52,7 @@
     "echarts": "^5.4.3",
     "element-plus": "^2.3.4",
     "font-awesome": "^4.7.0",
+    "jquery": "^3.7.1",
     "js-beautify": "^1.14.8",
     "js-md5": "^0.7.3",
     "mapv-three": "^1.0.18",
@@ -77,6 +78,7 @@
     "@commitlint/cli": "^17.6.3",
     "@commitlint/config-conventional": "^17.6.3",
     "@iconify-json/ep": "^1.1.10",
+    "@types/jquery": "^3.5.29",
     "@types/md5": "^2.3.2",
     "@types/nprogress": "^0.2.0",
     "@types/path-browserify": "^1.0.0",
diff --git a/src/widget/associatedforms/associatedFormsTinyace.vue b/src/widget/associatedforms/associatedFormsTinyace.vue
index 2521c43a1..40764b91f 100644
--- a/src/widget/associatedforms/associatedFormsTinyace.vue
+++ b/src/widget/associatedforms/associatedFormsTinyace.vue
@@ -5,7 +5,6 @@ import tinymce from "tinymce/tinymce";
 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";
 
 let onlyNumber = uuidv4().replaceAll('-','').toString();   //获取唯一编码
@@ -26,6 +25,7 @@ const tinymceInit = {
 	forced_root_block:'',
 	newline_behavior:"",
 	content_css: "/tinymce/skins/content/default/content.css", //以css文件方式自定义可编辑区域的css样式，css文件需自己创建并引入	
+  auto_focus : true,
 }
 const props = defineProps({
   aftText:{ 
@@ -79,10 +79,7 @@ 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()
+  tinymce.EditorManager.get(onlyNumber)?.focus(true)
 }
 
 
@@ -99,7 +96,7 @@ defineExpose({
 </script>
 <template >
 	<div >
-    <editor :id="onlyNumber"   v-model="tinymceHtml" :init="tinymceInit" ></editor>
+    <editor :id="onlyNumber"   v-model="tinymceHtml" :init="tinymceInit"></editor>
   </div>
 	
 

From 114aa3c3fe75e272429f9c362089e83f7fc15723 Mon Sep 17 00:00:00 2001
From: liwenxuan <1298531568@qq.com>
Date: Mon, 22 Apr 2024 13:47:29 +0800
Subject: [PATCH 15/17] =?UTF-8?q?=E5=88=A0=E9=99=A4role0.5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/DesignForm/formControlAttr.vue | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/components/DesignForm/formControlAttr.vue b/src/components/DesignForm/formControlAttr.vue
index ab6f6b4cf..2f4d7492d 100644
--- a/src/components/DesignForm/formControlAttr.vue
+++ b/src/components/DesignForm/formControlAttr.vue
@@ -2134,6 +2134,11 @@ function addFillRole(){
     })
 }
 
+function delRole(val:number){
+    controlData.value.control.fillRoles.splice(val, 1);
+    console.log(controlData.value.control.fillRoles)
+}
+
 
 //liwenxuan20240403 associatedForms end 
 
@@ -3556,10 +3561,10 @@ 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 red;overflow-y:auto">
+            <div style="height:300px;border:1px solid white;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>
+                        <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"  :current-key="index"  @del-Role = "delRole"  ></AssociatedFormsFillRole>
                     </template>
                 
                 

From 160afee4fdfe1f6e37560a796e38c301c9b8bbf5 Mon Sep 17 00:00:00 2001
From: liwenxuan <1298531568@qq.com>
Date: Mon, 22 Apr 2024 14:27:21 +0800
Subject: [PATCH 16/17] =?UTF-8?q?=E5=88=A0=E9=99=A4role1.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/DesignForm/assembly/index.ts   |  1 +
 src/components/DesignForm/formControlAttr.vue | 23 +++++++++++++------
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/src/components/DesignForm/assembly/index.ts b/src/components/DesignForm/assembly/index.ts
index 5e88e103c..76d13c258 100644
--- a/src/components/DesignForm/assembly/index.ts
+++ b/src/components/DesignForm/assembly/index.ts
@@ -609,6 +609,7 @@ const selectOption: any = [
 					{
 						leftValue:'',
 						rightValue:'',
+						id:'',
 					}
 				],
 			},
diff --git a/src/components/DesignForm/formControlAttr.vue b/src/components/DesignForm/formControlAttr.vue
index 2f4d7492d..515cad92c 100644
--- a/src/components/DesignForm/formControlAttr.vue
+++ b/src/components/DesignForm/formControlAttr.vue
@@ -1567,6 +1567,8 @@
                     element.imgId = onlyNumber;
                 }
             });
+        }else if(controlData.value.type==='associatedForms'){
+            controlData.value.control.fillRoles[0].id = uuidv4().replaceAll('-','').toString();
         }
     })
     //轮播图图片上传成功钩子
@@ -2128,15 +2130,22 @@ watch(()=>store.activeKey, () => {
 
 
 function addFillRole(){
+    let onlyNumber = uuidv4().replaceAll('-','').toString();   //获取唯一编码
     controlData.value.control.fillRoles.push({
         leftValue:'',
 		rightValue:'',
+        id:onlyNumber,
     })
 }
 
-function delRole(val:number){
-    controlData.value.control.fillRoles.splice(val, 1);
-    console.log(controlData.value.control.fillRoles)
+function delRole(id:String){
+    const delRoleData:any = controlData.value.control.fillRoles
+        for (var i = 0; i < delRoleData.length; i++) {
+            if(delRoleData[i].id===id){
+                delRoleData.splice(i, 1);
+                i--; // 如果不减，将漏掉一个元素
+            }
+        }
 }
 
 
@@ -3554,7 +3563,7 @@ 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="40%"  >
 		
 		<template v-if="controlData.type=='associatedForms'">
             <el-divider style="margin-top: 0px;" />
@@ -3563,8 +3572,8 @@ const loadNextPage = () => {
             <el-divider />
             <div style="height:300px;border:1px solid white;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"  :current-key="index"  @del-Role = "delRole"  ></AssociatedFormsFillRole>
+                    <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[0].children" :right-tree-source = "associatedFormsCurrentFormFieldTree[0].children"  :current-key="controlData.control.fillRoles[index].id"  @del-Role = "delRole"  ></AssociatedFormsFillRole>
                     </template>
                 
                 
@@ -3572,7 +3581,7 @@ const loadNextPage = () => {
 		</template>
 		<template #footer>
 		<div class="dialog-footer">
-			<el-button @click="asfhTextCancelFillRoles">取消</el-button>
+			<!-- <el-button @click="asfhTextCancelFillRoles">取消</el-button> -->
 			<el-button type="primary" @click="handleDetermineFillRoles">
 			确定
 			</el-button>

From 43e78ae28cede5993d42509ac75e26db8815e840 Mon Sep 17 00:00:00 2001
From: liwenxuan <1298531568@qq.com>
Date: Mon, 22 Apr 2024 14:49:47 +0800
Subject: [PATCH 17/17] =?UTF-8?q?=E5=85=B3=E8=81=94=E8=A1=A8=E5=8D=95?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=BB=84=E4=BB=B6=EF=BC=8C=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../associatedFormsFillRole.vue               |  79 +++++++++++++
 .../associatedFormsTinyaceRange.vue           | 108 ++++++++++++++++++
 2 files changed, 187 insertions(+)
 create mode 100644 src/widget/associatedforms/associatedFormsFillRole.vue
 create mode 100644 src/widget/associatedforms/associatedFormsTinyaceRange.vue

diff --git a/src/widget/associatedforms/associatedFormsFillRole.vue b/src/widget/associatedforms/associatedFormsFillRole.vue
new file mode 100644
index 000000000..af5b81aa4
--- /dev/null
+++ b/src/widget/associatedforms/associatedFormsFillRole.vue
@@ -0,0 +1,79 @@
+<template>
+
+<div style="margin-bottom: 15px; height: 40px; line-height: 40px;">
+  <el-tree-select 
+    v-model="leftValue1" style="width: 290px;" :data="leftTreeSource"
+    check-strictly :render-after-expand="false" filterable  @change="leftChanged" />
+  <span style="margin-left: 8px;margin-right: 8px;">的值填充到</span>
+  <el-tree-select 
+    v-model="rightValue1" style="width: 290px;" :data="rightTreeSource"
+    check-strictly :render-after-expand="false" filterable @change="rightChanged" />
+    <Delete style="width: 22px; height: 22px; margin-right: 35px;cursor: pointer; color: #50A6FF;margin-top: 10px; display: block; float:right" @click="delRole" />
+</div>
+  
+
+
+</template>
+
+<script setup lang="ts">
+
+
+const props = defineProps({
+  leftTreeSource: {
+    type: Object,
+    default() {
+      return {}
+    }
+  },
+  rightTreeSource: {
+    type: Object,
+    default() {
+      return {}
+    }
+  },
+  leftValue: {
+    type: String,
+    default() {
+      return {}
+    }
+  },
+  rightValue: {
+    type: String,
+    default() {
+      return {}
+    }
+  },
+  currentKey: {
+    type: String,
+    default() {
+      return {}
+    }
+  },
+})
+const leftValue1 = ref()
+const rightValue1 = ref()
+
+leftValue1.value = props.leftValue
+rightValue1.value = props.rightValue
+
+
+
+let emit = defineEmits(["update:leftValue", "update:rightValue","delRole"]);
+
+function leftChanged(){
+  emit('update:leftValue',leftValue1)
+}
+function rightChanged(){
+  emit('update:rightValue',rightValue1)
+}
+
+function delRole(){
+  //alert(props.currentKey)
+  emit('delRole',props.currentKey)
+}
+
+
+
+</script>
+
+<style></style>
\ No newline at end of file
diff --git a/src/widget/associatedforms/associatedFormsTinyaceRange.vue b/src/widget/associatedforms/associatedFormsTinyaceRange.vue
new file mode 100644
index 000000000..dd4f02abe
--- /dev/null
+++ b/src/widget/associatedforms/associatedFormsTinyaceRange.vue
@@ -0,0 +1,108 @@
+
+<script lang='ts' setup>
+import { ref, onMounted } from "vue";
+import tinymce from "tinymce/tinymce";
+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";
+
+let onlyNumber = uuidv4().replaceAll('-','').toString();   //获取唯一编码
+
+/**
+ * 初始富文本组件
+ */
+const tinymceInit = {
+  selector: "#"+onlyNumber,
+	language_url: "/tinymce/langs/zh-Hans.js", // 引入语言包（该语言包在public下，注意文件名称）
+	language: "zh-Hans", // 这里名称根据 zh-Hans.js 里面写的名称而定
+	skin_url: "/tinymce/skins/ui/oxide", // 这里引入的样式
+	height: 260, // 限制高度
+	statusbar:false,
+	toolbar:false,
+	branding: false,  //是否禁用“Powered by TinyMCE”
+	menubar: false, //顶部菜单栏显示
+	forced_root_block:'',
+	newline_behavior:"",
+	content_css: "/tinymce/skins/content/default/content.css", //以css文件方式自定义可编辑区域的css样式，css文件需自己创建并引入	
+  auto_focus : true,
+}
+const props = defineProps({
+  aftText:{ 
+    type: String, 
+    default(){
+			return {}
+		} 
+  },
+  aftTextCopy:{ 
+    type: String, 
+    default(){
+			return {}
+		} 
+  },
+})
+
+let $emit = defineEmits(["textChange"]);
+
+const tinymceHtml = ref("")
+tinymceHtml.value = props.aftText
+
+
+
+onMounted(() => {
+  	tinymce.init({}); // 初始化富文本
+});
+watch(()=>tinymceHtml.value, (val:any) => {
+  $emit('textChange',val);
+},
+    { deep: true }
+)
+
+
+const addIcon = (currentObject:any) =>{
+	tinymce.activeEditor?.execCommand('mceInsertContent', false, `<span style="margin:3px;background-color: #4189EF;border-radius: 5px; padding:3px" contenteditable="false" data-keyid= "${currentObject.id}" >${currentObject.label}</span>`);
+}
+const addIcon_field = (currentObject:any) =>{
+	tinymce.activeEditor?.execCommand('mceInsertContent', false, `<span style="margin:3px;background-color: #4189EF;border-radius: 5px; padding:3px" contenteditable="false" data-keyid= "${currentObject.id}" >${currentObject.treeAttrs.show}</span>`);
+}
+const addIcon_org = (currentObject:any) =>{
+  let id = "orgOrPerson:"+currentObject.id
+	tinymce.activeEditor?.execCommand('mceInsertContent', false, `<span style="margin:3px;background-color: #4189EF;border-radius: 5px; padding:3px" contenteditable="false" data-keyid= "${id}" >${currentObject.label}</span>`);
+}
+//取消
+const handelCancel = (associatedFormsHideDialogTextCopy:any) =>{
+  tinymceHtml.value = associatedFormsHideDialogTextCopy
+}
+const tinymceReInit = ()=>{
+    
+    
+    let str:string = props.aftTextCopy
+}
+
+const focusEditor = ()=>{
+  tinymce.EditorManager.get(onlyNumber)?.focus(true)
+}
+
+
+defineExpose({
+  tinymceHtml,
+  addIcon,
+  addIcon_org,
+  addIcon_field,
+  handelCancel,
+  tinymceReInit,
+  focusEditor,
+})
+
+</script>
+<template >
+	<div >
+    <editor :id="onlyNumber"   v-model="tinymceHtml" :init="tinymceInit"></editor>
+  </div>
+	
+
+</template>
+
+<style  lang='scss' scoped>
+	
+</style>