关联表单v0.5

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>

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>')
 }