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

---
 src/components/DesignForm/assembly/index.ts   |  11 ++
 .../DesignForm/public/form/formGroup.vue      |   1 +
 .../associatedforms/associatedForms.vue       |  15 ++
 src/widget/associatedforms/index.vue          | 181 ++++++++++++++++++
 src/widget/index.ts                           |   2 +
 5 files changed, 210 insertions(+)
 create mode 100644 src/widget/associatedforms/associatedForms.vue
 create mode 100644 src/widget/associatedforms/index.vue

diff --git a/src/components/DesignForm/assembly/index.ts b/src/components/DesignForm/assembly/index.ts
index 890fb7f22..6d7b9e1f5 100644
--- a/src/components/DesignForm/assembly/index.ts
+++ b/src/components/DesignForm/assembly/index.ts
@@ -419,6 +419,17 @@ const selectOption: any = [
 			},
 			config: {}
 		},
+		{
+			type: 'associatedForms',
+			label: '关联表单',
+			icon: '',
+			iconFont: 'fa-wpforms',
+			control: {
+				modelValue: '',
+			},
+			config: {}
+		}
+		
 	]
 	},
 	{
diff --git a/src/components/DesignForm/public/form/formGroup.vue b/src/components/DesignForm/public/form/formGroup.vue
index 58cf2b01c..504b71966 100644
--- a/src/components/DesignForm/public/form/formGroup.vue
+++ b/src/components/DesignForm/public/form/formGroup.vue
@@ -426,6 +426,7 @@ onMounted(()=>{
 					</div>
 					
 				</template>
+				<AssociatedForms  v-else-if="element.type === 'associatedForms'" :data="element" />
 				<LowcodeImage  v-else-if="element.type === 'lowcodeImage'" :data="element" />
 				<LowcodeTransfer  v-else-if="element.type === 'lowcodeTransfer'" :data="element" />
 				<VideoUpAndPlay  v-else-if="element.type === 'videoUpAndPlay'" :data="element" />
diff --git a/src/widget/associatedforms/associatedForms.vue b/src/widget/associatedforms/associatedForms.vue
new file mode 100644
index 000000000..3ba08b5ac
--- /dev/null
+++ b/src/widget/associatedforms/associatedForms.vue
@@ -0,0 +1,15 @@
+<template>
+
+
+  fdssdafsdaf
+
+
+</template>
+
+<script setup >
+
+</script>
+
+<style>
+
+</style>
\ No newline at end of file
diff --git a/src/widget/associatedforms/index.vue b/src/widget/associatedforms/index.vue
new file mode 100644
index 000000000..162b8041a
--- /dev/null
+++ b/src/widget/associatedforms/index.vue
@@ -0,0 +1,181 @@
+<!--
+@ 作者: 李文轩
+@ 时间: 2024-03-14 13:49:57
+@ 备注: 
+-->
+<template>
+    <el-form-item 
+        v-bind="data.item"
+		:prop="tProp || data.name"
+		:class="config.className"
+		:rules="itemRules as any"
+		:label="getLabel(data.item as FormItem)"
+    >
+        <input  v-model="value" type="hidden" >
+    </el-form-item>
+
+    <AssociatedForms :data="props.data"></AssociatedForms>
+</template>
+<script lang='ts' setup>
+import AssociatedForms   from './associatedForms.vue';
+import { 
+	constControlChange,
+    constFormProps,
+} from '@/api/DesignForm/utils'
+import validate from '@/api/DesignForm/validate'
+import { FormItem, FormList } from '@/api/DesignForm/types'
+const props = withDefaults(
+    defineProps<{
+		data: FormList
+		tablekey: any
+		numrun?: number
+		modelValue?: any // 子表和弹性布局时时有传
+		tProp?: string // 子表时的form-item的prop值，用于子表校验用
+    }>(),
+    {}
+)
+const emits = defineEmits<{
+    (e: 'update:modelValue', numVal: any): void
+}>()
+
+const formProps = inject(constFormProps, {}) as any
+const type = computed(() => {
+    return formProps.value.type
+})
+const config = computed(() => {
+    return props.data.config || {}
+})
+
+const changeEvent = inject(constControlChange, '') as any
+
+const value = computed({
+    get() {
+		if (props.tProp) {
+			// 表格和弹性布局
+			return props.modelValue
+		} else {
+			return formProps.value.model[props.data.name]
+		}
+    },
+    set(newVal: any) {
+		if (props.tProp) {
+			emits('update:modelValue', newVal)
+		}
+		updateModel(newVal)
+    }
+})
+const updateModel = (val: any) => {
+	let controlAttribute = ""
+	if(props.data.control){
+		if(props.data.control.type){
+			controlAttribute = props.data.control.type
+		}
+	}
+    changeEvent &&
+    changeEvent({
+        key: props.data.name,
+        value: val,
+        data: props.data,
+        tProp: props.tProp,
+		type: props.data.type,
+		attribute: controlAttribute
+    })
+}
+
+
+
+const getLabel = (ele: FormItem) => {
+    const showColon = formProps.value.showColon ? '：' : ''
+    if (ele) {
+    	return ele.showLabel ? '' : ele.label + showColon
+    } else {
+      	return ''
+    }
+}
+
+// 返回当前item项的校验规则
+const itemRules = computed(() => {
+    let temp
+    const itemR: any = props.data.item?.rules || []
+    const customR = formatCustomRules()
+    // 如果三个都没有设置，则返回undefined
+    if (itemR?.length || customR?.length) {
+      	temp = [...customR, ...itemR]
+    }
+    return temp
+})
+// 处理自定义校验规则，将customRules转换后追加到rules里
+const formatCustomRules = () => {
+    const rulesReg: any = {}
+    validate &&
+    validate.forEach(item => {
+        rulesReg[item.type] = item.regExp
+    })
+
+    // 获取校验方法 父级使用provide方法注入
+    const temp: any = []
+    props.data.customRules?.forEach((item: any) => {
+		if (!item.message && item.type !== 'methods') {
+			return // 方法时允许提示信息为空
+		}
+		let obj = {}
+		if (item.type === 'required') {
+			obj = { required: true }
+		} else if (item.type === 'rules') {
+			// 自定义表达式
+			obj = { pattern: item.rules }
+		} else if (item.type === 'methods') {
+			// 方法时
+			const methods: any = item.methods
+			if (methods) {
+			obj = { validator: inject(methods, {}) }
+			}
+		} else if (item.type) {
+			obj = { pattern: rulesReg[item.type as string] }
+		}
+		// 这里判断下防某些条件下重复push的可能或存重复校验类型
+		let message: any = { message: item.message }
+		if (!item.message) {
+			// 当使用validator校验时，如果存在message字段则不能使用 callback(new Error('x'));的提示
+			message = {}
+		}
+		temp.push(
+			Object.assign(
+				{
+					trigger: item.trigger || 'blur'
+				},
+				obj,
+				message
+			)
+		)
+    })
+    return temp
+}
+
+
+
+
+
+
+
+
+</script>
+<style  lang='scss' scoped>
+.imgbox{
+    padding: 0 5px;
+    max-width: 300px;
+    max-height: 200px;
+    width: 100%;
+    height: 200px;
+    .image-slot {
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        width: 100%;
+        height: 100%;
+        background: var(--el-fill-color-light);
+        color: var(--el-text-color-secondary);
+        font-size: 30px;
+    }
+}
+</style>
\ No newline at end of file
diff --git a/src/widget/index.ts b/src/widget/index.ts
index fadb83609..f3ac33870 100644
--- a/src/widget/index.ts
+++ b/src/widget/index.ts
@@ -11,6 +11,7 @@ import videoUpAndPlay from './videoupload/index.vue'
 import lowcodeCarsusel from './carousel/index.vue'
 import lowcodeTransfer from './lowcodetransfer/index.vue'
 import lowcodeImage from './lowcodeimage/index.vue'
+import associatedForms from './associatedforms/index.vue'
 
 export default (app: any)	=> {
 	app.component('SerialNumber', serialNumber)
@@ -23,4 +24,5 @@ export default (app: any)	=> {
 	app.component('LowcodeCarsusel',lowcodeCarsusel)
 	app.component('LowcodeTransfer',lowcodeTransfer)
 	app.component('LowcodeImage',lowcodeImage)
+	app.component('AssociatedForms',associatedForms)
 }

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

---
 src/components/DesignForm/formControlAttr.vue | 165 +++++++++++++++---
 .../associatedforms/associatedForms.vue       |   2 +-
 2 files changed, 146 insertions(+), 21 deletions(-)

diff --git a/src/components/DesignForm/formControlAttr.vue b/src/components/DesignForm/formControlAttr.vue
index 01ffb6852..22644f561 100644
--- a/src/components/DesignForm/formControlAttr.vue
+++ b/src/components/DesignForm/formControlAttr.vue
@@ -15,7 +15,9 @@ import { PublicAtrr } from '@/api/DesignForm/types'
 import { chineseToPinyin } from '@/api/DesignForm/requestapi'
 
 import { uploadUrl } from '@/api/DesignForm'
-import { UploadFilled } from '@element-plus/icons-vue'
+
+import request from '@/utils/request';
+
 import { UploadFile, UploadFiles } from 'element-plus/es/components/upload/src/upload';
 
 import type Node from 'element-plus/es/components/tree/src/model/node'
@@ -592,6 +594,14 @@ const attrList = computed(() => {
 				path: 'config.componentName',
 				vShow: ['component']
 			},
+			{
+				label: '隐藏条件',
+				value: config.associatedForms,
+				path: 'config.associatedForms',
+				type: 'associatedForms_hide',
+				vIf: state.isSearch,
+				vShow: ['associatedForms']
+			},
 			{
 				label: '上传图片',
 				value: config.lowcodeImage,
@@ -1539,10 +1549,12 @@ const floatSelectOptions = [
 
 const dataSource = ref<Tree[]>([]) 
 interface Tree {
-	id: string
+	id?: string
 	label: string
-	disabled: boolean
+	disabled?: boolean
 	children?: Tree[]
+	parentId?: string
+	[key: string]: any
 }
 
 const addRootNode = () => {
@@ -1636,6 +1648,76 @@ const transferDataSourceOptions = [
 
 //liwenxuan20240313 lowcodeImage end
 
+
+//liwenxuan20240403 associatedForms start 
+
+const associatedFormsHideDialogFlag = ref(false)
+
+const defaultProps = {
+	children: 'children',
+	label: 'label',
+}
+
+function getAssociatedFormsCurrentFieldTree() {
+        return request({
+            url: '/javasys/lowCode/AssociatedForms/getCustomerFormList',
+            method: 'post',
+        });
+}
+
+function getAssociatedFormsOrgAndManTree() {
+        return request({
+            url: '/javasys/lowCode/transfer/getOrgAndManTree',
+            method: 'post',
+        });
+}
+const associatedFormsCurrentFormFieldTree = ref<Tree[]>()
+
+getAssociatedFormsCurrentFieldTree().then(({ data }) => {   
+        let resData = ref(data.children)
+		associatedFormsCurrentFormFieldTree.value = [{
+            id: 'rootid',
+        	label: '当前表单',
+            children: [...resData.value]
+        }]
+});
+
+const orgAndManTree = ref<Tree[]>()
+	getAssociatedFormsOrgAndManTree().then(({ data }) => {   
+        let resData = ref(data.children)
+		orgAndManTree.value = [{
+            id: data.id,
+        	//label: data.label,
+			label: '组织机构',
+            children: [...resData.value]
+        }]
+});
+
+const fieldTreeSearchFlag = ref(false)
+
+function handleFieldTreeExpand(){
+	
+	fieldTreeSearchFlag.value = true;
+}
+
+function handleFieldTreeCollapse(){
+	
+	fieldTreeSearchFlag.value = false;
+}
+import { ElTree } from 'element-plus'
+const fieldTreeFilterText = ref('')
+const fieldTreeRef = ref<InstanceType<typeof ElTree>>()
+
+watch(fieldTreeFilterText, (val) => {
+	fieldTreeRef.value!.filter(val)
+})
+
+const filterNode = (value: string, data: Tree) => {
+	if (!value) return true
+	return associatedFormsCurrentFormFieldTree.value?.label.includes(value)
+}
+//liwenxuan20240403 associatedForms end
+
 </script>
 <template>
 	<div  class="sidebar-tools">
@@ -1928,6 +2010,10 @@ const transferDataSourceOptions = [
 								
 							</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-row>
 							
 
 							<el-input
@@ -2486,7 +2572,7 @@ const transferDataSourceOptions = [
 	<!-- 轮播图设置弹窗 liwenxuan 20240122 end -->
 		
 	<!-- 穿梭框设置弹窗 liwenxuan 20240217 start -->
-	<el-dialog v-model="transferDialogTableVisible" title="创建穿梭框选项树" top="150px" style="margin-top:70px" width="50%">
+	<el-dialog v-model="transferDialogTableVisible" title="创建穿梭框选项树" top="150px" style="margin-top:70px;" width="50%" >
 		<div v-if="controlData.type=='lowcodeTransfer'">
 			<el-button type="success" plain style="margin-top: -35px;" @click="addRootNode()">新增根节点</el-button>
 			
@@ -2520,31 +2606,70 @@ const transferDataSourceOptions = [
 	<!-- 穿梭框设置弹窗 liwenxuan 20240217 end -->
 
 
-	<!-- <el-dialog v-model="dialogFormVisible_tree_edit" title="Shipping address" width="500">
+	<!-- 关联表单设置弹窗 liwenxuan 20240402 start -->
+
+	<el-dialog v-model="associatedFormsHideDialogFlag" title="隐藏条件" top="150px" style="margin-top:70px ;min-height: 500px" width="50%">
 		
-				<el-input v-model="nodeLabel" autocomplete="off" />
-			
-		<template #footer>
-			<div class="dialog-footer">
-				<el-button @click="dialogFormVisible = false">Cancel</el-button>
-				<el-button type="primary" @click="dialogFormVisible = false">
-				Confirm
-				</el-button>
+		<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-input
+						v-model="fieldTreeFilterText"
+						v-show="fieldTreeSearchFlag"
+						style="width:98%;margin: 3px;"
+						placeholder="搜索字段"
+						class="filter-tree"
+						default-expand-all
+						:filter-node-method="filterNode"
+					/>
+					<el-tree
+						ref="fieldTreeRef"
+						style="max-width: 600px; border: 1px solid gainsboro; margin: 3px;"
+						:data="associatedFormsCurrentFormFieldTree"
+						:props="defaultProps"
+						@node-expand="handleFieldTreeExpand"
+						@node-collapse="handleFieldTreeCollapse"
+					/>
+					<el-tree
+						style="max-width: 600px; border: 1px solid gainsboro; margin: 3px;"
+						:data="orgAndManTree"
+						:props="defaultProps"
+						
+					/>
+				</el-aside>
+				<el-main style="border: 1px solid gainsboro;">
+					Main
+				</el-main>
+				</el-container>
 			</div>
 		</template>
-	</el-dialog> -->
+		<template #footer>
+		<div class="dialog-footer">
+			<el-button @click="associatedFormsHideDialogFlag = false">取消</el-button>
+			<el-button type="primary" @click="associatedFormsHideDialogFlag = false">
+			确定
+			</el-button>
+		</div>
+    </template>
+	</el-dialog>
+
+	<!-- 关联表单设置弹窗 liwenxuan 20240402 end -->
+
+
+	
 </template>
 <style  lang='scss' scoped>
 
 
 //!!!!!!!!!!!!!!!!!穿梭框编辑树样式start
 .custom-tree-node {
-  flex: 1;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  font-size: 14px;
-  padding-right: 8px;
+	flex: 1;
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	font-size: 14px;
+	padding-right: 8px;
 }
 .custom-tree-node:hover{
 	background-color:antiquewhite;
diff --git a/src/widget/associatedforms/associatedForms.vue b/src/widget/associatedforms/associatedForms.vue
index 3ba08b5ac..11638e47d 100644
--- a/src/widget/associatedforms/associatedForms.vue
+++ b/src/widget/associatedforms/associatedForms.vue
@@ -1,7 +1,7 @@
 <template>
 
 
-  fdssdafsdaf
+  <el-input v-model="input" style="width: 240px" placeholder="" />
 
 
 </template>

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

---
 src/components/DesignForm/formControlAttr.vue | 55 +++++++++++++++----
 1 file changed, 43 insertions(+), 12 deletions(-)

diff --git a/src/components/DesignForm/formControlAttr.vue b/src/components/DesignForm/formControlAttr.vue
index 22644f561..ca6324437 100644
--- a/src/components/DesignForm/formControlAttr.vue
+++ b/src/components/DesignForm/formControlAttr.vue
@@ -1659,9 +1659,12 @@ const defaultProps = {
 }
 
 function getAssociatedFormsCurrentFieldTree() {
-        return request({
-            url: '/javasys/lowCode/AssociatedForms/getCustomerFormList',
+        return request({ 
+            url: '/javasys/lowCode/AssociatedForms/getFieldTree',
             method: 'post',
+			data: {
+				cfid:'13'
+			},
         });
 }
 
@@ -1675,8 +1678,9 @@ const associatedFormsCurrentFormFieldTree = ref<Tree[]>()
 
 getAssociatedFormsCurrentFieldTree().then(({ data }) => {   
         let resData = ref(data.children)
+		//let rootid_ = data.value.label
 		associatedFormsCurrentFormFieldTree.value = [{
-            id: 'rootid',
+            id: 'rootid_'+data.label,
         	label: '当前表单',
             children: [...resData.value]
         }]
@@ -1704,6 +1708,16 @@ function handleFieldTreeCollapse(){
 	
 	fieldTreeSearchFlag.value = false;
 }
+function handleFieldTreeNodeclick(){
+	
+}
+function handleFieldTreeContextmenu(MouseEvent:any, object:any, Node:any, element:any){
+	//console.log(MouseEvent)
+	console.log(object)
+	//console.log(Node)
+	//console.log(element)
+
+}
 import { ElTree } from 'element-plus'
 const fieldTreeFilterText = ref('')
 const fieldTreeRef = ref<InstanceType<typeof ElTree>>()
@@ -1712,10 +1726,11 @@ watch(fieldTreeFilterText, (val) => {
 	fieldTreeRef.value!.filter(val)
 })
 
-const filterNode = (value: string, data: Tree) => {
+const filterNode = (value: string, associatedFormsCurrentFormFieldTree: Tree) => {
 	if (!value) return true
-	return associatedFormsCurrentFormFieldTree.value?.label.includes(value)
+	return associatedFormsCurrentFormFieldTree.label.includes(value)
 }
+
 //liwenxuan20240403 associatedForms end
 
 </script>
@@ -2615,21 +2630,26 @@ const filterNode = (value: string, data: Tree) => {
 				<el-container>
 				<el-aside width="300px" style="height:400px;border: 1px solid gainsboro;margin-right: 5px;">
 					<el-input
-						v-model="fieldTreeFilterText"
 						v-show="fieldTreeSearchFlag"
+						v-model="fieldTreeFilterText"
 						style="width:98%;margin: 3px;"
 						placeholder="搜索字段"
 						class="filter-tree"
-						default-expand-all
-						:filter-node-method="filterNode"
+						
+						
 					/>
 					<el-tree
 						ref="fieldTreeRef"
-						style="max-width: 600px; border: 1px solid gainsboro; margin: 3px;"
 						:data="associatedFormsCurrentFormFieldTree"
 						:props="defaultProps"
+						:filter-node-method="filterNode"
+						style="max-width: 600px; border: 1px solid gainsboro; margin: 3px;"
 						@node-expand="handleFieldTreeExpand"
 						@node-collapse="handleFieldTreeCollapse"
+						@node-click="handleFieldTreeNodeclick"
+						@node-contextmenu="handleFieldTreeContextmenu"
+						
+						
 					/>
 					<el-tree
 						style="max-width: 600px; border: 1px solid gainsboro; margin: 3px;"
@@ -2638,15 +2658,17 @@ const filterNode = (value: string, data: Tree) => {
 						
 					/>
 				</el-aside>
-				<el-main style="border: 1px solid gainsboro;">
-					Main
+				<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 style="border: 1px solid gainsboro; height: 30%;"></div>
 				</el-main>
 				</el-container>
 			</div>
 		</template>
 		<template #footer>
 		<div class="dialog-footer">
-			<el-button @click="associatedFormsHideDialogFlag = false">取消</el-button>
+			<!-- <el-button @click="associatedFormsHideDialogFlag = false">取消</el-button> -->
 			<el-button type="primary" @click="associatedFormsHideDialogFlag = false">
 			确定
 			</el-button>
@@ -2676,4 +2698,13 @@ const filterNode = (value: string, data: Tree) => {
 }
 //!!!!!!!!!!!!!!!!!穿梭框编辑树样式end
 
+
+.associatedFormsHideDialogMain7{
+	display: flex;
+	
+	
+}
+.el-main{
+	--el-main-padding: 5px
+}
 </style>