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] =?UTF-8?q?=E9=80=89=E6=8B=A9=E5=85=B3=E8=81=94=E8=A1=A8?=
 =?UTF-8?q?=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"