From 12358ad8b805501134464bd319ca15b0a6b4669b Mon Sep 17 00:00:00 2001
From: herenshan112 <herenshan112@163.com>
Date: Sat, 14 Sep 2024 15:53:58 +0800
Subject: [PATCH 01/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkg/sumdb/sum.golang.org/latest               |  5 +++
 src/components/DesignForm/formControlAttr.vue |  4 +-
 .../DesignForm/formControlPropertiNew.vue     |  4 +-
 .../DesignForm/public/expand/org.vue          |  9 ++++-
 .../DesignForm/public/expand/userDialog.vue   |  4 +-
 .../DesignForm/tableListPage/index.vue        |  4 +-
 .../lowcodepage/appPage/appMenus.vue          | 40 ++++++++++++++-----
 .../appPage/appPageForm/pageList.vue          |  9 +++--
 8 files changed, 56 insertions(+), 23 deletions(-)
 create mode 100644 pkg/sumdb/sum.golang.org/latest

diff --git a/pkg/sumdb/sum.golang.org/latest b/pkg/sumdb/sum.golang.org/latest
new file mode 100644
index 0000000..31dde1f
--- /dev/null
+++ b/pkg/sumdb/sum.golang.org/latest
@@ -0,0 +1,5 @@
+go.sum database tree
+29530890
+yb6t6HZvxxy4PrtbS+3QjpejyjLeRuqQ2INBTisrK38=
+
+— sum.golang.org Az3grvtY2DM7q7cq6/vo+qjK+WpbUaK7FrxZoFBSvTJ3U6QlFARxFVdrEusYH48zS1BENhlysJZH2iz7XZmGlOf1aAU=
diff --git a/src/components/DesignForm/formControlAttr.vue b/src/components/DesignForm/formControlAttr.vue
index 0153dd5..f25b9c5 100644
--- a/src/components/DesignForm/formControlAttr.vue
+++ b/src/components/DesignForm/formControlAttr.vue
@@ -880,7 +880,7 @@
                     isNum: true
                 },
                 {
-                    label: 'type',
+                    label: '显示类型',
                     value: control.type,
                     path: 'control.type',
                     vShow: ['datePicker'],
@@ -898,7 +898,7 @@
                     }
                 },
                 {
-                    label: 'format',
+                    label: '时间类型',
                     value: control.format,
                     path: 'control.format',
                     vShow: ['datePicker', 'timePicker'],
diff --git a/src/components/DesignForm/formControlPropertiNew.vue b/src/components/DesignForm/formControlPropertiNew.vue
index 5806406..a825390 100644
--- a/src/components/DesignForm/formControlPropertiNew.vue
+++ b/src/components/DesignForm/formControlPropertiNew.vue
@@ -956,7 +956,7 @@ const attrList = computed(() => {
                     isNum: true
                 },
                 {
-                    label: 'type',
+                    label: '显示类型',
                     value: control.type,
                     path: 'control.type',
                     vShow: ['datePicker'],
@@ -974,7 +974,7 @@ const attrList = computed(() => {
                     }
                 },
                 {
-                    label: 'format',
+                    label: '时间格式',
                     value: control.format,
                     path: 'control.format',
                     vShow: ['datePicker', 'timePicker'],
diff --git a/src/components/DesignForm/public/expand/org.vue b/src/components/DesignForm/public/expand/org.vue
index fae9667..c00f204 100644
--- a/src/components/DesignForm/public/expand/org.vue
+++ b/src/components/DesignForm/public/expand/org.vue
@@ -19,7 +19,12 @@ const emits = defineEmits<{
 }>()
 const value = computed({
 	get: () => {
-		return props.modelValue*1
+		if (props.modelValue != "" && props.modelValue != undefined){
+			return props.modelValue*1
+		}else{
+			return props.modelValue
+		}
+		
 	},
 	set: (newVal: any) => {
 		emits('update:modelValue', newVal)
@@ -48,7 +53,7 @@ const orgTreeProps ={
 
 function haveOrgTreeInfo(){
 	orgTreeLoading.value = true;
-	getOrgTreeList({})
+	getOrgTreeList({"orgid": 309})
 		.then(({ data })=>{
 			orgTreeList.value = data
 		}).finally(()=>{orgTreeLoading.value = false;})
diff --git a/src/components/DesignForm/public/expand/userDialog.vue b/src/components/DesignForm/public/expand/userDialog.vue
index 5cf031c..07859f7 100644
--- a/src/components/DesignForm/public/expand/userDialog.vue
+++ b/src/components/DesignForm/public/expand/userDialog.vue
@@ -24,7 +24,7 @@ const visible = ref(false)
 // 侧栏处理
 const treeEl = ref()
 const treeData = ref<orgform[]>([])
-const department = ref()
+const department = ref(309)
 const handleNodeClick = (data: any) => {
     department.value = data.id
 	getUserList()
@@ -33,7 +33,7 @@ const getTreeData = () => {
     // getRequest('deptList', {}).then((res: any) => {
     //   treeData.value = formatResult(res.data, 'transformDataToChild')
     // })
-	getOrgFormTree()
+	getOrgFormTree({id:309})
 		.then(({ data }) => {
 			// console.log(data)
 			treeData.value = data.list
diff --git a/src/components/DesignForm/tableListPage/index.vue b/src/components/DesignForm/tableListPage/index.vue
index 280a3bf..da5c9dd 100644
--- a/src/components/DesignForm/tableListPage/index.vue
+++ b/src/components/DesignForm/tableListPage/index.vue
@@ -214,7 +214,7 @@ const setUpClick = (val:string,id:string) =>{
 					.then((data)=>{
 						// console.log('cancel!',data)
 						ElNotification({
-							title: '温馨提示！',
+							title: '提示信息！',
 							message: data.mag,
 							type: 'success',
 						})
@@ -1296,7 +1296,7 @@ const transformOption = (val: string | number, type?: string) => {
 							>
 								<el-button type="info" size="small" class="fa fa-edit"  />
 							</el-tooltip>
-							</el-button-group>
+				</el-button-group>
 			
 			
 			</el-col>
diff --git a/src/views/sysworkflow/lowcodepage/appPage/appMenus.vue b/src/views/sysworkflow/lowcodepage/appPage/appMenus.vue
index b36541c..9325ebb 100644
--- a/src/views/sysworkflow/lowcodepage/appPage/appMenus.vue
+++ b/src/views/sysworkflow/lowcodepage/appPage/appMenus.vue
@@ -235,15 +235,33 @@ const showOrHide = (val:appMenuTreeInfo,types:number) =>{
 */
 const editAppMenu = (val:appMenuTreeInfo) =>{
 	// console.log('editAppMenu:',val);
-	let sendInfo = {
-		id:val.id.toString(),
-		status:3
-	}
-	delAppMenu(sendInfo)
-		.then((data) =>{
-			// console.log('删除app自定义菜单:',data);
-			gainSunAppContent()
-		});
+	ElMessageBox.confirm(
+		"您确定要删除此项？一经删除！将不可恢复！请慎重操作",
+		"删除提示",
+		{
+			confirmButtonText: '确定',
+			cancelButtonText: '取消',
+			type: 'warning',
+		}
+	)
+	.then(() => {
+		let sendInfo = {
+			id:val.id.toString(),
+			status:3
+		}
+		delAppMenu(sendInfo)
+			.then((data) =>{
+				// console.log('删除app自定义菜单:',data);
+				gainSunAppContent()
+				ElMessage({
+					type: 'success',
+					message: data.msg,
+				})
+			});
+	})
+
+
+	
 }
 const saveAppFormIsShow = ref(false)
 /**
@@ -336,7 +354,9 @@ const openAppPage = (val:any) =>{
 					<el-dropdown-item v-if="data.type==1" @click="createNewPage(data.id)">新建页面</el-dropdown-item>
 					<el-dropdown-item @click="showOrHide(data,1)" divided><el-text v-if="data.pcIsShow==1">隐藏PC端</el-text><el-text v-else>取消-隐藏PC端</el-text></el-dropdown-item>
 					<el-dropdown-item @click="showOrHide(data,2)"><el-text v-if="data.wapIsShow==1">隐藏移动端</el-text><el-text v-else>取消-隐藏移动端</el-text></el-dropdown-item>
-					<el-dropdown-item @click="editAppMenu(data)" divided><el-text class="mx-1" type="danger">删除</el-text></el-dropdown-item>
+					<el-dropdown-item @click="editAppMenu(data)" divided>
+						<el-text class="mx-1" type="danger">删除</el-text>
+					</el-dropdown-item>
 				</template>
 			</el-dropdown>
 		</div>
diff --git a/src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageList.vue b/src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageList.vue
index 5267d75..6e616fb 100644
--- a/src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageList.vue
+++ b/src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageList.vue
@@ -271,9 +271,13 @@ const jieForm = () => {
 	if(props.appPageKey != ""){
 		gainFormTableField({id:props.appPageKey.toString()})
 			.then((data)=>{
-				// console.log('解析表单--->',data)
+				console.log('解析表单--->',data)
 				formTableField.masterTable=data.data.masterTable
 				formTableField.sunTable=data.data.sunTable
+				nextTick(()=>{
+					columnDrop()
+					getListInfo();
+				})
 			})
 	}
 }
@@ -286,8 +290,7 @@ const jieForm = () => {
 onMounted(()=>{
 	jieForm();
 	nextTick(() => {
-      	columnDrop()
-		getListInfo();
+      	
 
 
 		gainFormTableKeyWord(props.appPageKey.toString())

From e544475f7815b7ac61bbdd282ba0fe4a16d7779e Mon Sep 17 00:00:00 2001
From: herenshan112 <herenshan112@163.com>
Date: Sat, 14 Sep 2024 16:01:49 +0800
Subject: [PATCH 02/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lowcodepage/appPage/appPageForm/pageList.vue            | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageList.vue b/src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageList.vue
index 6e616fb..274b7bc 100644
--- a/src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageList.vue
+++ b/src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageList.vue
@@ -411,14 +411,14 @@ const getListInfo = () => {
 			
 
 			zhuDaunIsTrue.value = false
-			// console.log("========>",state.tableData)
+			console.log("========>",state.tableData)
 			if(state.searchData && state.searchData.length>0) {
 				if(formTableField.masterTable && formTableField.masterTable.length > 0){
 					state.searchData.forEach((itemCol:any)=>{
 						formTableField.masterTable.forEach((item:any)=>{
 							if(itemCol.id == item.id){
-								// console.log("====111====>",itemCol)
-								// console.log("====222====>",item)
+								console.log("====111====>",itemCol)
+								console.log("====222====>",item)
 								item.isSearch = true
 								tableFieldList.value!.toggleRowSelection(item, true)
 							}

From aa8095afcdd114c0b7b57e2b45e20dbf46b27ed5 Mon Sep 17 00:00:00 2001
From: herenshan112 <herenshan112@163.com>
Date: Sat, 14 Sep 2024 16:08:47 +0800
Subject: [PATCH 03/14] =?UTF-8?q?=E8=BE=93=E5=87=BA=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lowcodepage/appPage/appPageForm/pageList.vue          | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageList.vue b/src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageList.vue
index 274b7bc..32db486 100644
--- a/src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageList.vue
+++ b/src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageList.vue
@@ -359,10 +359,10 @@ const getListInfo = () => {
 	// console.log("获取列表内容1111",props.appPageKey)
 	gainFormListCont({id:props.appPageKey.toString()})
 		.then((data)=>{
-			// console.log("获取列表内容",data)
+			console.log("获取列表内容",data)
 			if(data.data.listjson != null && data.data.listjson != ""){
 				let stateData = string2json(data.data.listjson)
-				// console.log("获取列表内容---->",stateData)
+				console.log("获取列表内容---->",stateData)
 				state.tableData = stateData.tableData
 				state.searchData = stateData.searchData
 				state.loading = stateData.loading
@@ -411,7 +411,9 @@ const getListInfo = () => {
 			
 
 			zhuDaunIsTrue.value = false
-			console.log("========>",state.tableData)
+			console.log("====1====>",state.tableData)
+			console.log("====2====>",formTableField.masterTable)
+			console.log("====3====>",state.searchData)
 			if(state.searchData && state.searchData.length>0) {
 				if(formTableField.masterTable && formTableField.masterTable.length > 0){
 					state.searchData.forEach((itemCol:any)=>{

From fbdb8e310d58cb2aedddcd85fde853a6b93c11e4 Mon Sep 17 00:00:00 2001
From: herenshan112 <herenshan112@163.com>
Date: Sat, 14 Sep 2024 16:33:23 +0800
Subject: [PATCH 04/14] =?UTF-8?q?=E5=A4=84=E7=90=86=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E5=9B=9E=E6=98=BE=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../appPage/appPageForm/pageList.vue          | 33 ++++++++++++-------
 1 file changed, 21 insertions(+), 12 deletions(-)

diff --git a/src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageList.vue b/src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageList.vue
index 32db486..237e35d 100644
--- a/src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageList.vue
+++ b/src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageList.vue
@@ -359,10 +359,10 @@ const getListInfo = () => {
 	// console.log("获取列表内容1111",props.appPageKey)
 	gainFormListCont({id:props.appPageKey.toString()})
 		.then((data)=>{
-			console.log("获取列表内容",data)
+			// console.log("获取列表内容",data)
 			if(data.data.listjson != null && data.data.listjson != ""){
 				let stateData = string2json(data.data.listjson)
-				console.log("获取列表内容---->",stateData)
+				// console.log("获取列表内容---->",stateData)
 				state.tableData = stateData.tableData
 				state.searchData = stateData.searchData
 				state.loading = stateData.loading
@@ -411,25 +411,36 @@ const getListInfo = () => {
 			
 
 			zhuDaunIsTrue.value = false
-			console.log("====1====>",state.tableData)
-			console.log("====2====>",formTableField.masterTable)
-			console.log("====3====>",state.searchData)
+			// console.log("====1====>",state.tableData.columns)
+			// console.log("====2====>",formTableField.masterTable)
+			// console.log("====3====>",state.searchData)
 			if(state.searchData && state.searchData.length>0) {
 				if(formTableField.masterTable && formTableField.masterTable.length > 0){
 					state.searchData.forEach((itemCol:any)=>{
 						formTableField.masterTable.forEach((item:any)=>{
 							if(itemCol.id == item.id){
-								console.log("====111====>",itemCol)
-								console.log("====222====>",item)
+								// console.log("====111====>",itemCol)
+								// console.log("====222====>",item)
 								item.isSearch = true
+								// tableFieldList.value!.toggleRowSelection(item, true)
+							}
+						})
+					})
+				}
+			}
+			if(state.tableData.columns && state.tableData.columns.length > 0){
+				if(formTableField.masterTable && formTableField.masterTable.length > 0){
+					state.tableData.columns.forEach((itemCol:any)=>{
+						formTableField.masterTable.forEach((item:any)=>{
+							if(itemCol.id == item.id){
 								tableFieldList.value!.toggleRowSelection(item, true)
 							}
 						})
 					})
-					
 				}
-				
-				if(tableAttrLogButtonList && tableAttrLogButtonList.length > 0){
+			}
+
+			if(tableAttrLogButtonList && tableAttrLogButtonList.length > 0){
 					state.tableData.columns.forEach((itemCol:any)=>{
 						tableAttrLogButtonList.forEach((item:any)=>{
 							if(itemCol.id == item.id){
@@ -438,8 +449,6 @@ const getListInfo = () => {
 						})
 					})
 				}
-			}
-			
 			if(state.tableData && state.tableData.controlBtn && state.tableData.controlBtn.length > 0) {
 				
 				state.tableData.controlBtn.forEach((itemCol:any)=>{

From 80c61860e3b104ea4d428f1f4c293c681cce6f10 Mon Sep 17 00:00:00 2001
From: herenshan112 <herenshan112@163.com>
Date: Wed, 18 Sep 2024 08:03:03 +0800
Subject: [PATCH 05/14] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E9=87=8D=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DesignForm/public/expand/uploadPage.vue   | 174 ++++++++++++++++++
 .../public/expand/uploadPageList.vue          | 106 +++++++++++
 .../DesignForm/public/form/childTable.vue     |   5 +-
 .../DesignForm/public/form/formItem.vue       |  72 ++++----
 4 files changed, 324 insertions(+), 33 deletions(-)
 create mode 100644 src/components/DesignForm/public/expand/uploadPage.vue
 create mode 100644 src/components/DesignForm/public/expand/uploadPageList.vue

diff --git a/src/components/DesignForm/public/expand/uploadPage.vue b/src/components/DesignForm/public/expand/uploadPage.vue
new file mode 100644
index 0000000..47e585e
--- /dev/null
+++ b/src/components/DesignForm/public/expand/uploadPage.vue
@@ -0,0 +1,174 @@
+<!--
+@ 作者: 秦东
+@ 时间: 2024-09-17 10:44:30
+@ 备注: 上传组件
+-->
+<script lang='ts' setup>
+import { AnalysisCss,AnalysisInputCss } from '@/components/DesignForm/public/form/calculate/cssInfo'
+import { uploadUrl,getRequest } from '@/api/DesignForm'
+import { 
+	formatNumber, 
+	objectToArray,
+	constControlChange,
+    constSetFormOptions,
+    constFormProps,
+    constGetControlByName
+} from '@/api/DesignForm/utils'
+
+const props = withDefaults(
+    defineProps<{
+		modelValue?: string
+		disabled?: boolean
+		action?: string
+		name?: string
+		fileList?: Object
+		control?: Object
+		config?: Object
+		data?: Object
+    }>(),
+    {}
+)
+const emits = defineEmits<{
+    (e: 'update:modelValue', value: string): void
+}>()
+const value = computed({
+	get: () => {
+		console.log("图片上传处理-112->",props.modelValue)
+		// if(props.modelValue != ""){
+		// 	return props.modelValue.split(",");
+		// }else{
+		// 	return props.modelValue
+		// }
+		return props.modelValue
+	},
+	set: (newVal: any) => {
+		emits('update:modelValue', newVal)
+		return newVal
+	},
+});
+const formProps = inject(constFormProps, {}) as any
+// ------------图片上传处理-----------
+const fileList = computed<any>(() => {
+    // const imgVal = formProps.value.model[props.data.name]
+	console.log("图片上传处理-2->",value.value)
+	const imgVal = value.value
+	console.log("图片上传处理-->",imgVal)
+    if (imgVal && typeof imgVal === 'string') {
+		// console.log("图片上传处理-2->",imgVal)
+		const temp: any = []
+		imgVal.split(',').forEach((item: string) => {
+			// console.log("图片上传处理-3->",item)
+			temp.push({
+				name: item,
+				url: item
+			})
+		})
+		return temp
+    }
+    return imgVal || [] // 这样可支持默认值为array([name:'',url:''这种形式])
+})
+//解析指定样式
+const getFormItemInputStyle = (ele: any,sty:number) => {
+    if(ele?.inputStyle){
+      console.log("返回栅格宽度4",AnalysisInputCss(ele?.inputStyle,sty))
+      return AnalysisInputCss(ele?.inputStyle,sty)
+    }
+}
+//组件css部分
+const configStyle = computed(() => {
+    return props.data.styles || {}
+})
+// 从列表移除
+const uploadRemove = (uploadFile: any, uploadFiles: any) => {
+    const oldList: any = []
+    fileList.value.forEach((item: any) => {
+		if (item.url !== uploadFile.url) {
+			oldList.push(item.url)
+		}
+    })
+	value.value = oldList
+    updateModel(oldList.join(','))
+    // props.control.value.onRemove && props.control.value.onRemove(uploadFile, uploadFiles)
+    // todo 需从服务端删除已上传图片时，这里需要发删除请求接口
+}
+// 上传错误
+const uploadError = (err: any, file: any, fileList: any) => {
+    // console.log('uploadError')
+    ElMessage.error(file.name + '上传失败')
+    props.control.value.onError && props.control.value.onError(err, file, fileList)
+}
+const changeEvent = inject(constControlChange, '') as any
+const updateModel = (val: any) => {
+	console.log("图片上传处理-111->",val)
+	value.value = val
+	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 uploadSuccess = (response: any, uploadFile: any, uploadFiles: any) => {
+	// console.log("response==>",response)
+	// console.log("uploadFile==>",uploadFile)
+	// console.log("uploadFiles==>",uploadFiles)
+    const oldList = []
+    fileList.value.forEach((item: any) => {
+      	oldList.push(item.url)
+    })
+    // oldList.push(response.path)
+	oldList.push(response.data.url)
+	
+    updateModel(oldList.join(','))
+	
+    // props.control.value.onSuccess &&
+    // props.control.value.onSuccess(response, uploadFile, uploadFiles)
+	// console.log("uploadSuccess===>",control.value)
+	// console.log("uploadSuccess=fileList==>",fileList)
+}
+</script>
+<template>
+	<div>
+		<el-upload
+			v-bind="props.control"
+			:action="uploadUrl"
+			:name="props.name"
+			:class="{limit: props.control.limit <= fileList.length}"
+			:file-list="fileList as any"
+			:style="getFormItemInputStyle(configStyle,2)"
+			:on-error="uploadError"
+			:on-success="uploadSuccess"
+			:on-remove="uploadRemove"
+		>
+			<i class="icon-plus" v-if="props.control?.listType=='picture-card'"></i>
+			<el-button type="primary" plain v-else-if="props.control?.listType=='picture'">
+				<span v-if="props.config?.btnText">{{ props.config?.btnText }} </span>
+				<span class="fa fa-plus" v-else></span>
+			</el-button>
+			<template v-else>
+				<el-button type="primary" plain v-if="props.config?.btnText">
+					{{ props.config?.btnText }} 
+				</el-button>
+				<i class="icon-plus" v-else></i>
+			</template>
+			<template #tip v-if="props.config?.tip">
+				<div class="el-upload__tip">
+					{{ props.config?.tip }}
+				</div>
+			</template>
+		</el-upload>
+	</div>
+</template>
+<style  lang='scss' scoped>
+
+</style>
diff --git a/src/components/DesignForm/public/expand/uploadPageList.vue b/src/components/DesignForm/public/expand/uploadPageList.vue
new file mode 100644
index 0000000..f8cb337
--- /dev/null
+++ b/src/components/DesignForm/public/expand/uploadPageList.vue
@@ -0,0 +1,106 @@
+<!--
+@ 作者: 秦东
+@ 时间: 2024-09-17 14:57:49
+@ 备注: 解析上传文件问题
+-->
+<script lang='ts' setup>
+import { AnalysisCss,AnalysisInputCss } from '@/components/DesignForm/public/form/calculate/cssInfo'
+const props = defineProps({
+	imgList:{
+		type:String,
+		default:""
+	},
+	data:{
+		type:Object,
+		default(){
+			return {}
+		}
+	},
+	control:{
+		type:Object,
+		default(){
+			return {}
+		}
+	}
+})
+const imgStr = ref<String>(props.imgList)
+//组件css部分
+
+/**
+@ 作者: 秦东
+@ 时间: 2024-09-17 15:02:50
+@ 功能:  文件列表
+*/
+// const imgAry = () => {
+// 	console.log("文件列表====>",imgStr.value)
+// 	if(imgStr.value != ""){
+// 		// let zj = imgStr.value
+// 		// let img = zj.Split(",");
+// 		let arr = imgStr.value.match(/[^,]+/g);
+// 		console.log("文件列表",arr)
+// 		return arr
+// 	}else{
+// 		return []
+// 	}
+// }
+const imgAry =computed({
+	get: () => {
+		if(props.imgList != "" && props.imgList != null && props.imgList != undefined && props.imgList != "undefined"){
+			// let zj = props.imgList
+			// let img = zj.Split(",");
+			let arr = props.imgList.match(/[^,]+/g);
+			console.log("文件列表",arr)
+			return arr
+		}else{
+			return []
+		}
+	}
+})
+
+
+
+
+
+const listType = () => {
+	if(props.control.listType){
+		return props.control.listType
+	}else{
+		return "text"
+	}
+}
+//解析指定样式
+const getFormItemInputStyle = (ele: any,sty:number) => {
+    if(ele?.inputStyle){
+      console.log("返回栅格宽度4",AnalysisInputCss(ele?.inputStyle,sty))
+      return AnalysisInputCss(ele?.inputStyle,sty)
+    }
+}
+const configStyle = computed(() => {
+    return props.data.styles || {}
+})
+</script>
+<template>
+	<div>
+		<div v-if="props.control.listType=='picture-card'">
+			<div v-for="item in imgAry">
+				<el-image class="imgCss" :style="getFormItemInputStyle(configStyle,2)" :src="item" :fit="fit" :preview-src-list="imgAry" />
+			</div>
+		</div>
+		<div v-else-if="props.control.listType=='picture'">
+			<div v-for="item in imgAry">
+				<el-image class="imgCss" :style="getFormItemInputStyle(configStyle,2)" :src="item" :fit="fit" :preview-src-list="imgAry" />
+			</div>
+		</div>
+		<div v-else>
+			<div v-for="item in imgAry">
+				<el-link :underline="false" :href="item" target="_blank">{{ item }}</el-link><br>
+			</div>
+		</div>
+	</div>
+</template>
+<style  lang='scss' scoped>
+.imgCss{
+	width: 100px;
+	height: 100px;
+}
+</style>
diff --git a/src/components/DesignForm/public/form/childTable.vue b/src/components/DesignForm/public/form/childTable.vue
index 81ef855..44a9587 100644
--- a/src/components/DesignForm/public/form/childTable.vue
+++ b/src/components/DesignForm/public/form/childTable.vue
@@ -10,7 +10,7 @@ import Tooltips from '@/components/DesignForm/tooltip.vue'
 import {constFormProps } from '@/api/DesignForm/utils'
 import { jsonParseStringify } from '@/utils/DesignForm'
 import LowcodeImagePage from '@/components/DesignForm/public/expand/lowcodeImage.vue'
-
+import UploadPageList from '@/components/DesignForm/public/expand/uploadPageList.vue'
 
 import LokOrgCentent from '@/widget/org/cont.vue' 
 
@@ -205,6 +205,9 @@ const timeToString = (timeVal:any,types:int) => {
 							<LowcodeImagePage :data="item" 
 								v-model="scope.row[item.name]" />
 						</div>
+						<div v-else-if="item.type=='upload'" >
+							<UploadPageList   :data="item" :img-list="scope.row[item.name]" :control="item.control" />
+						</div>
 						<div v-else-if="item.type=='datePicker'" v-html="timeToString(scope.row[item.name],item.control.type)">
 						</div>
 						<div v-else>{{ getText(scope.row[item.name],scope.row,item.name) }}</div>
diff --git a/src/components/DesignForm/public/form/formItem.vue b/src/components/DesignForm/public/form/formItem.vue
index d55e14f..0f965af 100644
--- a/src/components/DesignForm/public/form/formItem.vue
+++ b/src/components/DesignForm/public/form/formItem.vue
@@ -32,6 +32,10 @@ import LokOrgCentent from '@/widget/org/cont.vue'
 
 import DigitpagePage from '@/components/DesignForm/public/expand/digitpage.vue'
 import LowcodeImagePage from '@/components/DesignForm/public/expand/lowcodeImage.vue'
+import UploadPage from '@/components/DesignForm/public/expand/uploadPage.vue'
+import UploadPageList from '@/components/DesignForm/public/expand/uploadPageList.vue'
+
+
 
 import AKSelect from './select.vue'
 import { uploadUrl,getRequest } from '@/api/DesignForm'
@@ -41,6 +45,7 @@ import { useRoute } from 'vue-router'
 
 import { json2string,objToStringify,string2json,stringToObj } from '@/utils/DesignForm/form'
 
+
 import TextImg from "@/assets/image/tinymce.png"
 
 import { AnalysisCss,AnalysisInputCss } from '@/components/DesignForm/public/form/calculate/cssInfo.ts'
@@ -182,6 +187,9 @@ const currentComponent = computed(() => {
     }
 	if (props.data.type === 'lowcodeImage') {
       	return markRaw(LowcodeImagePage)
+    }
+	if (props.data.type === 'upload') {
+      	return markRaw(UploadPage)
     }
 	if (props.data.type === 'datePicker') {
 		props.data.control.valueFormat="x"
@@ -877,8 +885,22 @@ function asfValueChanged(val:any){
 	//console.log("asfValueChanged",val)
 	emits("asfValueChanged",val)
 }
-
-
+/**
+@ 作者: 秦东
+@ 时间: 2024-09-17 14:30:37
+@ 功能: 解析下载图片
+*/
+const uploadPic = (val:any) => {
+	console.log("解析下载图片-->",val)
+	if(val != ""){
+		let urlAry = string2json(val)
+		// let urlAry =  val.toString().split(",")
+		console.log("解析下载图片-2->",urlAry)
+		return urlAry
+	}else{
+		return [];
+	}
+}
 </script>
 <template>
 	<BaiduMap v-if="judgeIsShow(data.name) &&data.type === 'baidumap' && type != 4" :data="data" />
@@ -964,9 +986,10 @@ function asfValueChanged(val:any){
 			<div class="form-value" v-else-if="data.type == 'select'" v-html="selectValue(value,data.options)">
 				
 			</div>
-			<div class="form-value" v-else-if="data.type == 'upload'" v-html="value">
+			<div class="form-value" v-else-if="data.type == 'upload'" >
+				<UploadPageList :img-list="value" :control="control" :data="data"  />
 				
-			</div>
+			</div> 
 			<div class="form-value" v-else-if="data.type == 'tinymce'"  v-html="value">
 			
 			</div>
@@ -1078,43 +1101,28 @@ function asfValueChanged(val:any){
 				:transformOption="transformOption"
 				:placeholder="data.control.placeholder?data.control.placeholder:'请选择'+getLabel(data.item)"
 			/>
-			<el-upload
-				class="upload-style"
-				v-if="data.type === 'upload'"
-				:action="uploadUrl"
+			<component
+				v-if="['upload'].includes(data.type)"
+				:is="currentComponent"
+				:data="data"
 				v-bind="control"
+				:control="control"
+				:config="config"
 				:name="control.file || 'file'"
 				:disabled="judgeIsDisabled(data.name)"
-				:file-list="fileList as any"
-				:class="{limit: control.limit <= fileList.length}"
-				:on-error="uploadError"
-				:on-success="uploadSuccess"
-				:on-remove="uploadRemove"
-			>
-				<i class="icon-plus" v-if="control?.listType=='picture-card'"></i>
-				<el-button type="primary" plain v-else-if="control?.listType=='picture'">
-						<span v-if="config?.btnText">{{ config?.btnText }} </span>
-						<span class="fa fa-plus" v-else></span>
-				</el-button>
-				<template v-else>
-					<el-button type="primary" plain v-if="config?.btnText">
-						{{ config?.btnText }} 
-					</el-button>
-					<i class="icon-plus" v-else></i>
-				</template>
-				<template #tip v-if="config?.tip">
-					<div class="el-upload__tip">
-						{{ config?.tip }}
-					</div>
-				</template>
-			</el-upload>
+				:options="options"
+				v-model="value"
+			/>
+			
 			<component
 				v-if="['cascader', 'treeSelect'].includes(data.type)"
 				:is="currentComponent"
 				v-bind="control"
+				
 				:disabled="judgeIsDisabled(data.name)"
 				:options="options"
 				v-model="value"
+				
 			/>
 			<el-time-picker v-if="data.type=='timePicker'" v-model="value" value-format="x" :placeholder="data.control.placeholder?data.control.placeholder:'请选择'+getLabel(data.item)" />
 			<component
@@ -1156,7 +1164,7 @@ function asfValueChanged(val:any){
 			/>
 				
 				
-				<!--所属部门-->
+				
 				
 				
 				

From af41eb335b78818f0bfb3091ffbb460e725dad04 Mon Sep 17 00:00:00 2001
From: herenshan112 <herenshan112@163.com>
Date: Wed, 18 Sep 2024 09:15:18 +0800
Subject: [PATCH 06/14] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E8=87=AA=E5=AE=9A?=
 =?UTF-8?q?=E4=B9=89App=E8=A1=A8=E5=8D=95=E5=BD=92=E5=B1=9E=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/DesignForm/formControlPropertiNew.vue           | 1 +
 .../sysworkflow/lowcodepage/appPage/createAppFormPage.vue      | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/components/DesignForm/formControlPropertiNew.vue b/src/components/DesignForm/formControlPropertiNew.vue
index a825390..244dbd8 100644
--- a/src/components/DesignForm/formControlPropertiNew.vue
+++ b/src/components/DesignForm/formControlPropertiNew.vue
@@ -4113,6 +4113,7 @@ const radioChangeSet = (val:any) => {
                     </el-form>
                 </el-tab-pane>
                 <el-tab-pane label="表单配置" name="second">
+				{{formConfig}}
                     <el-form size="small" class="form">
                         <el-divider content-position="left">基础配置</el-divider>
 								<el-form-item v-if="formConfig.classify != 4"  class="form_cont">
diff --git a/src/views/sysworkflow/lowcodepage/appPage/createAppFormPage.vue b/src/views/sysworkflow/lowcodepage/appPage/createAppFormPage.vue
index b8e790e..5c3ba08 100644
--- a/src/views/sysworkflow/lowcodepage/appPage/createAppFormPage.vue
+++ b/src/views/sysworkflow/lowcodepage/appPage/createAppFormPage.vue
@@ -78,7 +78,8 @@ const state = reactive<formStruct>({
 			labelPosition: "left"
 		},
 		config: {
-			groupKey:props.groupKey
+			groupKey:props.formKey,
+			classify:4
 		},
 		styles:{
 			divStyle:{},

From fc35c9a15a6294845f5a3c76d4cf580a14956f73 Mon Sep 17 00:00:00 2001
From: herenshan112 <herenshan112@163.com>
Date: Thu, 19 Sep 2024 09:11:19 +0800
Subject: [PATCH 07/14] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=A1=A8=E5=8D=95?=
 =?UTF-8?q?=E8=AE=BE=E8=AE=A1BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tableListPage/index_20240919.vue          | 1386 +++++++++++++++++
 .../appPage/appPageForm/openAppFormPage.vue   |    8 +-
 .../appPage/appPageForm/pageList.vue          |    4 +
 .../appLayoutEdit/appContainerPage.vue        |    6 +
 .../lowcodepage/pageFlow/appTableFlow.vue     |    2 +-
 .../lowcodepage/runApp/runAppForm.vue         |    7 +-
 6 files changed, 1408 insertions(+), 5 deletions(-)
 create mode 100644 src/components/DesignForm/tableListPage/index_20240919.vue

diff --git a/src/components/DesignForm/tableListPage/index_20240919.vue b/src/components/DesignForm/tableListPage/index_20240919.vue
new file mode 100644
index 0000000..da5c9dd
--- /dev/null
+++ b/src/components/DesignForm/tableListPage/index_20240919.vue
@@ -0,0 +1,1386 @@
+<!--
+@ 作者: 秦东
+@ 时间: 2024-03-29 14:21:27
+@ 备注: 自定义表单通用列表
+-->
+<script lang='ts' setup>
+import { json2string,objToStringify,string2json,stringToObj } from '@/utils/DesignForm/form'
+import { onBeforeRouteLeave, useRoute, useRouter } from 'vue-router'
+import { useDesignFormStore } from '@/store/DesignForm/designForm'
+import { attrButton,FormPageList,FormPageConfig,viewPageType } from '@/api/DesignForm/tableButton'
+import { inputUnit,timeUnit,choiceUnit,switchUnit,orgUnit,checkboxUnit } from '@/api/DesignForm/fieldUnit'
+import type { FormInstance, FormRules,ElNotification  } from 'element-plus'
+import { gainFormPageListCont } from '@/api/DesignForm/requestapi'
+import { Picture,InfoFilled,QuestionFilled } from '@element-plus/icons-vue'
+import request from '@/utils/request';
+import { softDeletion,retractRunWorkFlow } from '@/api/taskapi/management'
+
+import { 
+	formatNumber
+} from '@/api/DesignForm/utils'
+//引入组件
+import FormPageCont from '@/components/DesignForm/tableListPage/formPageCont.vue'
+import TableFlow from '@/views/sysworkflow/lowcodepage/pageFlow/tableFlow.vue'
+import TimeAxisPage from '@/components/DesignForm/app/timeAxis.vue'
+import CardPage from '@/components/DesignForm/app/cardPage.vue'
+import GanttPage from '@/components/DesignForm/app/gannttPage.vue'
+import MapPage from '@/components/DesignForm/app/mapPage.vue'
+import CalendarPage from '@/components/DesignForm/app/calendar/calendar1/calendarPage.vue'
+import SearchSelect from '@/components/DesignForm/app/calendar/selectSearch.vue'
+
+const props = withDefaults(
+    defineProps<{
+		data: FormPageList
+		searchData?: attrButton[]
+		config:FormPageConfig
+		formId?:string
+		beforeRequest?: (params: any, rout: any) => any
+		afterResponse?: (result: any) => any | string
+		beforeDelete?: (params: any, route: any) => any
+		showPage?: boolean
+		requestUrl?: string // 请求的api
+		deleteUrl?: string // 删除的api
+		dict?: { [key: string | number]: string | number }
+		fixedBottomScroll?: boolean
+		query?: { [key: string]: any } // 一些附加的请求参数
+		autoLoad?: boolean // 初始时自动请求加载数据
+		delKey?: string // 删除标识
+		lookPageIsShow?:boolean,
+		versionid?:string,
+		versiontitle?:string,
+		viewPage?:viewPageType
+    }>(),
+    {
+		showPage: true,
+		data: () => {
+			return { columns: [],controlBtn:[],operateBtn:[],config:{} }
+		},
+		searchData: () => {
+			return []
+		},
+		config:() =>{
+			return {}
+		},
+		dict: () => {
+			return {}
+		},
+		formId:() =>{
+			return ""
+		},
+		versionid:() =>{
+			return ""
+		},
+		versiontitle:() =>{
+			return ""
+		},
+		fixedBottomScroll: true,
+		autoLoad: true,
+		delKey: 'id',
+		query: () => {
+			return {}
+		},
+		lookPageIsShow:() => {
+			return false
+		},
+		viewPage: () => {
+			return []
+		}
+    }
+)
+const emits = defineEmits<{
+    (e: 'selectionChange', row: any): void
+    (e: 'btnClick', btn: any, row?: any): void // 列表上面及表格列表里添加删除按钮事件
+}>()
+const operState = ref<number>(1)	//操作状态	1：新增；2：重新发起；3：申请修改；4：提交审批;5:普通表单修改
+const idList = ref<string[]>([])
+const designStore = useDesignFormStore()
+const route = useRoute()
+const router = useRouter()
+const tableDataList = ref([]) // 表格行数据
+const currentAsfTableDataList = ref([])//当前点击的关联表单数据
+const openTaskDrawer = ref(false)	//新增数据
+
+const state = reactive({
+    loading: false,
+    currentPage: 1,
+    pageSize: props.config?.pageSize || 2,
+    total: 0,
+    selectionChecked: [],
+    dict: {}, // 接口返回的
+    searchFormDown: false,
+    treeValue: {}, // 侧栏树选中的值
+    tableScrollMargin: 0,
+    columnsCheck: designStore.getColumnsCheck(route.path),
+    currentNodeKey: ''
+})
+
+const viewType = ref(1)
+const viewLayout = ref<any>()
+/**
+@ 作者: 秦东
+@ 时间: 2024-03-28 16:03:12
+@ 功能: 判断类型
+*/
+const unitIsShow = (val:tableButton,unitName:string) => {
+	// val.pattern
+	switch (val.fieldClass) {
+		case "id":		//自定义表单保留字
+			return inputUnit.includes(unitName);
+			break;
+		case "masters_key": //自定义表单保留字
+			return inputUnit.includes(unitName);
+			break;
+		case "creater": //自定义表单保留字
+			return inputUnit.includes(unitName);
+			break;
+		case "creater_time": //自定义表单保留字
+			return timeUnit.includes(unitName);
+			break;
+		case "edit_time": //自定义表单保留字
+			return timeUnit.includes(unitName);
+			break;
+		case "flow_id": //自定义表单保留字
+			return inputUnit.includes(unitName);
+			break;
+		case "baidumap":		//自定义表单保留字
+			return inputUnit.includes(unitName);
+			break;
+		case "input":		//自定义表单保留字
+			return inputUnit.includes(unitName);
+			break;
+		case "radio":		//自定义表单保留字
+			return choiceUnit.includes(unitName);
+			break;
+		case "switch":		//自定义表单保留字
+			return switchUnit.includes(unitName);
+			break;
+		case "orgCentent":		//自定义表单保留字
+			return orgUnit.includes(unitName);
+			break;
+		case "varchar":		//自定义表单保留字
+			return inputUnit.includes(unitName);
+			break;
+		case "checkbox":
+			return checkboxUnit.includes(unitName);
+			break;
+		default:
+			if(val.fieldClass != "datePicker" && val.fieldClass != "timePicker"){
+				return inputUnit.includes(unitName);
+			}
+			break;
+	}
+}
+
+/**
+@ 作者: 秦东
+@ 时间: 2024-03-28 13:17:46
+@ 功能: 重置表单
+*/
+const ruleSearchForm = ref()
+const resetFields = (formEl: FormInstance | undefined) => {
+	
+	// formEl.resetFields()
+	// console.log("formEl",formEl,formEl.resetFields())
+    // if (!formEl) return
+  	// formEl.resetFields()
+	if(props.searchData && props.searchData.length > 0){
+		props.searchData.forEach((item:any)=>{
+			item.value="";
+		})
+	}
+}
+/**
+@ 作者: 秦东
+@ 时间: 2024-04-01 11:36:07
+@ 功能: 功能按钮动作
+*/
+const setUpClick = (val:string,id:string) =>{
+	// console.log("功能按钮动作",val,"----id----->",props.versionid,"-----formId---->",props.versiontitle)
+	if(val.key == "newAdd"){
+		drawerWith.value = container.value?.clientWidth
+		openTaskDrawer.value = true
+	}else{
+		if(idList.value.length > 0){
+			ElMessageBox.confirm("确认删除此数据项?删除后不可恢复！", "警告", {
+				confirmButtonText: "确定",
+				cancelButtonText: "取消",
+				type: "warning",
+			}).then(() => {
+				let sendData = {
+					id:idList.value,
+					isTrue:2
+				}
+				softDeletion(sendData)
+					.then((data)=>{
+						// console.log('cancel!',data)
+						ElNotification({
+							title: '提示信息！',
+							message: data.mag,
+							type: 'success',
+						})
+						getPageData()
+					})
+			});
+		}else{
+			ElMessage.error("你还未选中要删除的项目！");
+		}
+		
+	}
+	
+}
+
+/**
+@ 作者: 秦东
+@ 时间: 2024-04-01 13:30:06
+@ 功能: 表格选择操作
+*/
+const selectionChange = (row: any) => {
+    state.selectionChecked = row
+    emits('selectionChange', row)
+	// console.log('selectionChange', row)
+	idList.value.length = 0
+	// console.log('idList.value-1-->', idList.value)
+	if(row && row.length>0){
+		row.forEach((item:any) => {
+			// console.log('item', item.masters_key)
+			idList.value.push(item.masters_key.toString())
+		})
+	}
+	// console.log('idList.value--->', idList.value)
+}
+/**
+@ 作者: 秦东
+@ 时间: 2024-04-01 13:31:37
+@ 功能: 获取表格头内容
+*/
+const columnsFilter = computed(() => {
+	console.log("获取表格头内容",props.data.columns)
+    if (!state.columnsCheck?.length) {
+      	return props.data.columns
+    } else {
+		return props.data.columns.filter((item: any) => {
+			return state.columnsCheck.includes(item.prop || item.type)
+		})
+    }
+	
+})
+/**
+@ 作者: 秦东
+@ 时间: 2024-04-01 14:14:36
+@ 功能: 翻页操作
+*/
+const handleSizeChange = (page: number) => {
+	// console.log("翻页操作",page)
+    state.pageSize = page
+    getListData(1)
+}
+const handleCurrentChange = (page: number) => {
+    getListData(page)
+}
+/**
+@ 作者: 秦东
+@ 时间: 2024-04-01 14:15:16
+@ 功能: 获取数据
+*/
+// 筛选查询列表数据
+const getListData = (page?: number) => {
+	if (page) {
+      	state.currentPage = page
+    }
+	console.log("筛选查询列表数据--->",page)
+	getPageData()
+}
+watch(()=>props.lookPageIsShow,(val:boolean)=>{
+	if(val && props.formId != ""){
+		getPageData()
+		
+	}
+})
+
+const timeAxisRef = ref(null)
+const calendarPageRef = ref(null)
+const cardPageRef = ref(null)
+const searchSend = reactive({
+	formId:props.formId,
+	page:state.currentPage,
+	pagesize:state.pageSize,
+	searchData:json2string(props.searchData),
+	viewClass:{}
+})
+
+let asfDetails = []
+let asfQueryParams: any[] = []
+/**
+@ 作者: 秦东
+@ 时间: 2024-04-01 15:51:32
+@ 功能: 获取数据
+*/
+const getPageData = () => {
+	state.loading = true;
+	let sendData = {
+		formId:props.formId,
+		page:state.currentPage,
+		pagesize:state.pageSize,
+		searchData:json2string(props.searchData)
+		//searchData:"id:1"
+	}
+	// console.log("获取列表详细信息",sendData)
+
+	switch(viewType.value){
+		case 2:
+			nextTick(()=>{
+				state.loading = false
+				// console.log("获取列表详细信息-------555---------->",calendarPageRef.value)
+				calendarPageRef.value.calendarSearchData(sendData)
+			})
+			// calendarPageRef.value.calendarSearchData()
+			break;
+		case 3:
+			nextTick(()=>{
+				state.loading = false
+				// console.log("获取列表详细信息-------222---------->",timeAxisRef.value)
+				timeAxisRef.value.searchTimeList(sendData,1)
+			})
+			
+			break;
+		case 4:
+			state.loading = false
+			break;
+		case 5:
+			state.loading = false
+			break;
+		case 6:
+			nextTick(()=>{
+				state.loading = false
+				cardPageRef.value.getCardList(sendData)
+			})
+			break;
+		default:
+
+			gainFormPageListCont(sendData)
+				.then((data)=>{
+					
+					//console.log("获取列表详细信息----------------->",data)
+					//liwenxuan 关联表单数据获取 start
+					
+					let dataList = data
+					//console.log(dataList)
+					asfDetails = props.data.columns.filter((item: any) => {
+						return item.fieldClass=="associatedForms"
+					})
+					
+					
+					if(asfDetails.length>0&&data.data.list!=null){
+						//console.log(data.data.list)
+						//拼装参数,asf值对象数组
+						asfQueryParams = []
+						for(let j = 0;j< asfDetails.length;j++){
+							let asfQueryParamsItem :any = {}
+							//console.log(asfDetails[j])
+							asfQueryParamsItem.formId = asfDetails[j].control.formid
+							asfQueryParamsItem.field = asfDetails[j].field
+							
+							let asfToSelectIds = []
+							for(let i = 0;i<data.data.list.length;i++){
+								let asfMasterAndAsfId:any = {}
+								asfMasterAndAsfId.asfId = data.data.list[i][asfDetails[j].field]
+								asfMasterAndAsfId.asfMasterId = data.data.list[i].id
+								
+								asfToSelectIds.push(asfMasterAndAsfId)
+							}
+							asfQueryParamsItem.asfToSelectIds = asfToSelectIds
+							asfQueryParams.push(asfQueryParamsItem)
+						}
+						let queryCount = 0
+						for(let i = 0;i<asfQueryParams[0].asfToSelectIds.length;i++){
+							if(asfQueryParams[0].asfToSelectIds[i].asfId!=""){
+								queryCount++
+							}
+						}
+						//console.log(asfQueryParams)
+						if(queryCount>0){
+							getAsfDataTitlesByIds(asfQueryParams).then(({ data }) => {   
+								//console.log(data)
+								for(let i = 0;i<dataList.data.list.length; i++){
+									//console.log(dataList.data.list[i])
+									for(let j = 0;j<data.length;j++){
+										//console.log(data[j])
+										for(let n = 0;n<data[j].list.length;n++){
+											if(dataList.data.list[i].id==data[j].list[n].asfMasterId){
+												dataList.data.list[i][data[j].field] = data[j].list[n].label
+											}
+											//console.log(data[j].list[n])
+										}
+										
+										
+									}
+								}
+								tableDataList.value = dataList.data.list
+								
+							});
+						}else{
+							tableDataList.value = data.data.list
+						}
+						
+					}else{
+						tableDataList.value = data.data.list
+						
+					}
+					//liwenxuan 关联表单数据获取 end
+					state.total = data.data.total
+					state.loading = false;
+				})
+				.finally(()=>{
+					state.loading = false;
+				})
+
+	}
+}
+
+
+const asfGetPageData = (asfFormId: any,asfToSelectMastersKey: any) => {
+	let searchData = [{"id":"id","label":"Id","field":"id","type":"bigint(20)","attribute":"","pattern":"bigint","fieldClass":"id","activeValue":"","inactiveValue":"","config":{"optionsType":0},"control":{"optionsValue3Formid":"","optionsValue3Field":""},"options":[],"isSearch":true,"value":asfToSelectMastersKey}]
+	//state.loading = true;
+	let sendData = {
+		formId:asfFormId,
+		page:1,
+		pagesize:1,
+		searchData:json2string(searchData)
+	}
+	//console.log("asf获取列表详细信息",sendData)
+	gainFormPageListCont(sendData)
+		.then((data)=>{
+			
+			//console.log("获取列表详细信息----------------->",data)
+			//liwenxuan 关联表单数据获取 start
+			
+			let dataList = data
+			//console.log(dataList)
+			asfDetails = props.data.columns.filter((item: any) => {
+				return item.fieldClass=="associatedForms"
+			})
+			
+			
+			if(asfDetails.length>0){
+				//console.log(data.data.list)
+				//拼装参数,asf值对象数组
+				let asfAsfQueryParams = []
+				for(let j = 0;j< asfDetails.length;j++){
+					let asfQueryParamsItem :any = {}
+					//console.log(asfDetails[j])
+					asfQueryParamsItem.formId = asfDetails[j].control.formid
+					asfQueryParamsItem.field = asfDetails[j].field
+					
+					let asfToSelectIds = []
+					for(let i = 0;i<data.data.list.length;i++){
+						let asfMasterAndAsfId:any = {}
+						asfMasterAndAsfId.asfId = data.data.list[i][asfDetails[j].field]
+						asfMasterAndAsfId.asfMasterId = data.data.list[i].id
+						
+						asfToSelectIds.push(asfMasterAndAsfId)
+					}
+					asfQueryParamsItem.asfToSelectIds = asfToSelectIds
+					asfAsfQueryParams.push(asfQueryParamsItem)
+				}
+				let queryCount = 0
+				for(let i = 0;i<asfAsfQueryParams[0].asfToSelectIds.length;i++){
+					if(asfAsfQueryParams[0].asfToSelectIds[i].asfId!=undefined&&asfAsfQueryParams[0].asfToSelectIds[i].asfId!=""){
+						queryCount++
+					}
+				}
+				
+				//console.log(asfAsfQueryParams)
+				if(queryCount>0){
+					getAsfDataTitlesByIds(asfAsfQueryParams).then(({ data }) => {   
+						//console.log(data)
+						for(let i = 0;i<dataList.data.list.length; i++){
+							//console.log(dataList.data.list[i])
+							for(let j = 0;j<data.length;j++){
+								//console.log(data[j])
+								for(let n = 0;n<data[j].list.length;n++){
+									if(dataList.data.list[i].id==data[j].list[n].asfMasterId){
+										dataList.data.list[i][data[j].field] = data[j].list[n].label
+									}
+									//console.log(data[j].list[n])
+								}
+								
+								
+							}
+						}
+						currentAsfTableDataList.value = dataList.data.list
+
+					});
+				}else{
+					currentAsfTableDataList.value = data.data.list
+
+					
+				}
+				
+			}else{
+				currentAsfTableDataList.value = data.data.list
+
+				
+				
+			}
+			/* //liwenxuan 关联表单数据获取 end
+			state.total = data.data.total
+			state.loading = false; */
+		})
+		.finally(()=>{
+			/* state.loading = false; */
+
+			//显示关联表单本条详情
+			tablePageClass.value = 4;	
+			drawerWith.value = container.value?.clientWidth
+			asflookPageInfoIsShow.value = true;
+						
+
+		})
+		
+}
+
+
+
+onMounted(()=>{
+	getPageData()
+	nextTick(()=>{
+		drawerWith.value = container.value?.clientWidth
+	})
+})
+//liwenxuan 关联表单数据获取 start
+function getAsfDataTitlesByIds(asfQueryParams: any[]) {
+	return request({ 
+		url: '/javasys/lowCode/AssociatedForms/getAsfDataTitlesByIds',
+		method: 'post',
+		data: asfQueryParams,
+	});
+}
+//liwenxuan 关联表单数据获取 end
+const asfShowDetailsFlag = ref(false)
+//liwenxuan 关联表单详情弹窗 start
+function showAsfDetailDialog(item: any,scope: any,asfQueryParams: any){
+	let val = scope.row
+	//asfShowDetailsFlag.value= true
+	/* console.log("item----------------->",item)
+	console.log("scope----------------->",scope)
+	console.log("asfQueryParams----------------->",asfQueryParams)
+	console.log("val----------------->",val) */
+	let asfFormId = item.control.formid//关联表单在customer_form中的id
+	//alert("asfFormId:"+asfFormId)
+	let scopeColumnProperty = scope.column.property//exp:associatedForms1720570283525
+
+	let asfQueryParamsNAsfToSelectIdsNAsfMasterId = val.id
+	//alert(asfQueryParamsNAsfToSelectIdsNAsfMasterId)
+	let asfToSelectMastersKey = ""
+	for(let i = 0;i<asfQueryParams.length;i++){
+		if(asfQueryParams[i].field == scopeColumnProperty){
+			
+			for(let j = 0;j<asfQueryParams[i].asfToSelectIds.length;j++){
+				
+				if(asfQueryParams[i].asfToSelectIds[j].asfMasterId==asfQueryParamsNAsfToSelectIdsNAsfMasterId){
+					asfToSelectMastersKey = asfQueryParams[i].asfToSelectIds[j].asfId
+					
+				}
+			}
+		}
+	}
+	//alert("asfToSelectMastersKey:"+asfToSelectMastersKey)
+
+
+	
+	
+	asfGetPageData(asfFormId,asfToSelectMastersKey)
+	
+}
+//liwenxuan 关联表单详情弹窗 end
+
+/**
+@ 作者: 秦东
+@ 时间: 2024-04-02 13:59:21
+@ 功能: 判断单选值
+*/
+const judjeRadio = (val: any, options: any[]) => {
+	// console.log("判断单选值",val, options)
+	if(options && options.length > 0){
+		options.forEach((item)=>{
+			if(item.value == val){
+				// console.log("判断单选值",val, item.value,item.label)
+				val =  item.label
+			}
+		})
+	}
+	if(val == 0 || val == "0"){
+		val = ""
+	}
+	return val
+}
+/**
+@ 作者: 秦东
+@ 时间: 2024-04-02 14:49:40
+@ 功能: 判断开关类型
+*/
+const judjeSwitch = (val:any,yesVal:any) => {
+	if(val == yesVal) return true;
+	return false;
+}
+/**
+@ 作者: 秦东
+@ 时间: 2024-04-03 13:13:56
+@ 功能: 列表信息删除信息
+*/
+const confirmEvent = (val:any) => {
+	let sendData = {
+		id:[val.masters_key],
+		isTrue:2
+	}
+	softDeletion(sendData)
+		.then((data)=>{
+			// console.log('cancel!',data)
+			ElNotification({
+				title: '系统提示！',
+				message: data.mag?data.mag:"删除成功",
+				type: 'success',
+			})
+			getPageData()
+		})
+}
+const cancelEvent = (val:any) => {
+//   console.log('cancel!',val)
+}
+const container = ref()	//实例化内容容器
+const drawerWith = ref();	//编辑表单时抽屉宽度
+/**
+@ 作者: 秦东
+@ 时间: 2024-04-03 13:24:06
+@ 功能: 查看详细内容
+*/
+const tablePageClass = ref(1)
+const lookPageInfoIsShow = ref(false)
+const asflookPageInfoIsShow = ref(false)
+const pageInfoCont = ref<any>()
+const lookPageInfo = (val:any) => {
+	tablePageClass.value = 4;
+	pageInfoCont.value = val
+	drawerWith.value = container.value?.clientWidth
+	lookPageInfoIsShow.value = true;
+	
+}
+/**
+@ 作者: 秦东
+@ 时间: 2024-04-05 11:29:50
+@ 功能: 编辑表单内容
+*/
+
+const editInfo = (val:any) => {
+	// console.log('修改数据!',val)
+	operState.value = 5;
+	tablePageClass.value = 2;
+	pageInfoCont.value = val
+	drawerWith.value = container.value?.clientWidth
+	lookPageInfoIsShow.value = true;
+}
+/**
+@ 作者: 秦东
+@ 时间: 2024-04-10 15:32:55
+@ 功能: 提交审批
+*/
+const submitApproval = (val:any) => {
+	operState.value = 4
+	tablePageClass.value = 2;
+	pageInfoCont.value = val
+	drawerWith.value = container.value?.clientWidth
+	lookPageInfoIsShow.value = true;
+}
+/**
+@ 作者: 秦东
+@ 时间: 2024-04-11 09:36:59
+@ 功能: 撤回申请
+*/
+const withdrawApplication  = (val:any) => {
+	// console.log("撤回申请", val);
+	let sendInfo = {
+		id: val.masters_key,
+	}
+	retractRunWorkFlow(sendInfo)
+		.then((data)=>{
+			ElMessage({
+				message: '撤回成功！',
+				type: 'success'
+			})
+			getPageData()
+		})
+}
+/**
+@ 作者: 秦东
+@ 时间: 2024-04-11 11:17:42
+@ 功能: 重新提交申请
+*/
+const afreshSendFlow = (val:any) => {
+	operState.value = 2
+	tablePageClass.value = 2;
+	pageInfoCont.value = val
+	drawerWith.value = container.value?.clientWidth
+	lookPageInfoIsShow.value = true;
+}
+/**
+@ 作者: 秦东
+@ 时间: 2024-04-11 11:19:21
+@ 功能: 申请修改数据
+*/
+const editFormSendFlow = (val:any) => {
+	operState.value = 3
+	tablePageClass.value = 2;
+	pageInfoCont.value = val
+	drawerWith.value = container.value?.clientWidth
+	lookPageInfoIsShow.value = true;
+}
+
+/**
+@ 作者: 秦东
+@ 时间: 2024-07-08 09:39:52
+@ 功能: 切换视图展示方式
+*/
+const tabsView = (val:any,types:number) => {
+	viewType.value = types
+	val.isClick = true
+	viewLayout.value = val
+	// console.log("切换视图展示方式",val)
+	switch(types){
+		case 2:
+			props.viewPage.list.isClick = false
+			props.viewPage.time.isClick = false
+			props.viewPage.gantt.isClick = false
+			props.viewPage.map.isClick = false
+			props.viewPage.card.isClick = false
+			break;
+		case 3:
+			props.viewPage.list.isClick = false
+			props.viewPage.date.isClick = false
+			props.viewPage.gantt.isClick = false
+			props.viewPage.map.isClick = false
+			props.viewPage.card.isClick = false
+			getPageData()
+			break;
+		case 4:
+			props.viewPage.list.isClick = false
+			props.viewPage.date.isClick = false
+			props.viewPage.time.isClick = false
+			props.viewPage.map.isClick = false
+			props.viewPage.card.isClick = false
+			break;
+		case 5:
+			props.viewPage.list.isClick = false
+			props.viewPage.date.isClick = false
+			props.viewPage.time.isClick = false
+			props.viewPage.gantt.isClick = false
+			props.viewPage.card.isClick = false
+			break;
+		case 6:
+			props.viewPage.list.isClick = false
+			props.viewPage.date.isClick = false
+			props.viewPage.time.isClick = false
+			props.viewPage.gantt.isClick = false
+			props.viewPage.map.isClick = false
+			break;
+		default:
+			props.viewPage.date.isClick = false
+			props.viewPage.card.isClick = false
+			props.viewPage.time.isClick = false
+			props.viewPage.gantt.isClick = false
+			props.viewPage.map.isClick = false
+			break;
+	}
+}
+/**
+@ 作者: 秦东
+@ 时间: 2024-07-25 08:30:49
+@ 功能: 判断是否有标题
+*/
+const writeListTitle = (val:any,viewConfig:any) => {
+	// console.log("判断是否有标题--1-->",val)
+	// console.log("判断是否有标题--2-->",viewConfig)
+	var titleAry = [];
+	if(viewConfig.form && viewConfig.form.title){
+		if(viewConfig.form.title.length > 0){
+			viewConfig.form.title.forEach((item,index)=>{
+				// console.log("判断是否有标题--"+index+"-->",val[item])
+				if(val[item]){
+					titleAry.push(val[item])
+				}
+			})
+		}
+	}
+	if(titleAry.length > 0){
+		return titleAry.join()
+	}else{
+		let firstWord = ""
+				let powerAry = ["id","creater_time","edit_time","masters_key","states","flow_id"];
+				for (let key in val) {
+					if (val.hasOwnProperty(key)) {
+						if(!powerAry.includes(key)){
+							if(val[key] != '' && val[key] != null){
+								firstWord = val[key]
+							}
+						}
+					}
+				}
+				return firstWord
+	}
+	
+}
+
+/**
+@ 作者: 秦东
+@ 时间: 2024-07-25 10:27:21
+@ 功能: 判断是否有标题
+*/
+const judgeListTitle = (val:any,viewConfig:any) => {
+	// console.log("判断是否有标题--3-->",val)
+	// console.log("判断是否有标题--4-->",viewConfig)
+	if(val && val.fieldClass=='_lableTitle'){
+		if(viewConfig.form && viewConfig.form.title){
+			if(viewConfig.form.title.length > 0){
+				return true
+			}
+		}
+	}
+	return false
+}
+// 选择数据转换，默认尝试转数字
+const transformOption = (val: string | number, type?: string) => {
+    
+    return formatNumber(val)
+ }
+</script>
+<template>
+	<div ref="container" v-loading="state.loading" class="table-list-comm">
+	
+		<el-row class="rowBox">
+			<el-col :span="24">
+				<el-form  v-if="config.searchIsShow" ref="ruleSearchForm" class="seacherForm">
+					<template v-for="(item, index) in searchData" :key="index">
+						<div class="group group-input">
+							<el-form-item :label="item.label"  class="form_cont">
+								<el-input
+									v-model="item.value"
+									:placeholder="'请输入'+item.label"
+									clearable
+									v-if="unitIsShow(item,'input')"
+								/>
+								<el-date-picker
+									v-model="item.value"
+									type="datetime"
+									:placeholder="'请选择'+item.label"
+									:shortcuts="shortcuts"
+									v-if="unitIsShow(item,'time')"
+								/>
+								<SearchSelect
+									v-if="unitIsShow(item,'radio')"
+									:data="item"
+									:disabled="false"
+									:transform-option="transformOption"
+									v-model:model-value="item.value"
+								/>
+								<el-select
+									v-model="item.value"
+									clearable
+									:placeholder="'请选择'+item.label"
+									v-if="unitIsShow(item,'switch')"
+								>
+									<el-option
+										:key="item.activeValue"
+										label="是"
+										:value="item.activeValue"
+									/>
+									<el-option
+										:key="item.inactiveValue"
+										label="否"
+										:value="item.inactiveValue"
+									/>
+								</el-select>
+								<SearchSelect
+									v-if="unitIsShow(item,'checkbox')"
+									:data="item"
+									:disabled="false"
+									:is-checkbox="true"
+									:transform-option="transformOption"
+									v-model:model-value="item.value"
+								/>
+								<el-date-picker
+									v-if="item.fieldClass == 'datePicker'"
+									v-model="item.value"
+									:type="item.auxiliary"
+									:placeholder="'请选择'+item.label"
+									value-format="x"
+								/>
+								<el-time-picker
+									v-if="item.fieldClass == 'timePicker'"
+									v-model="item.value"
+									arrow-control
+									:placeholder="'请选择'+item.label"
+									value-format="x"
+								/>
+								<el-select
+									v-model="item.value"
+									clearable
+									:placeholder="'请选择'+item.label"
+									v-if="unitIsShow(item,'org')"
+								>
+								</el-select>
+							</el-form-item>
+						</div>
+						
+					</template>
+					<div class="group group-btn" v-if="searchData.length">
+						<el-button type="primary" @click="getPageData"><el-icon><Search /></el-icon>查询</el-button>
+						<el-button @click="resetFields(ruleSearchForm)"><el-icon><Refresh /></el-icon>重置</el-button>
+					</div>
+				</el-form>
+			</el-col>
+			<el-col :span="24">
+				<div class="operateButArea">
+					<div class="operatLeft">
+						<el-text v-if="data.controlBtn.length === 0" class="mx-1 tipBox" type="info">操作按钮区域</el-text>
+						<el-button
+							v-for="item in data.controlBtn"
+							v-bind="item"
+							:key="item.type"
+							@click="setUpClick(item)"
+						>
+							{{ item.label }}
+						</el-button>
+					</div>
+					<div>
+						<el-button-group class="ml-4">
+							<el-tooltip
+								class="box-item"
+								effect="dark"
+								content="折叠查询表单"
+								placement="bottom"
+							>
+								<el-button size="small" @click="config.searchIsShow=!config.searchIsShow" class="fa fa-search" />
+							</el-tooltip>
+							<el-tooltip
+								v-if="viewPage.list.status"
+								class="box-item"
+								effect="dark"
+								content="列表视图"
+								placement="top"
+							>
+								<el-button size="small" class="fa fa-table"  :color="viewPage.list.isClick?'#a0cfff':''" @click="tabsView(viewPage.list,1)" />
+							</el-tooltip>
+							<el-tooltip
+								v-if="props.viewPage.card&&props.viewPage.card.status"
+								class="box-item"
+								effect="dark"
+								content="卡片视图"
+								placement="top"
+							>
+								<el-button size="small" class="fa fa-id-card-o"  :color="props.viewPage.card&&props.viewPage.card.isClick?'#a0cfff':''" @click="tabsView(props.viewPage.card,6)" />
+							</el-tooltip>
+							<el-tooltip
+								v-if="viewPage.date.status"
+								class="box-item"
+								effect="dark"
+								content="日历视图"
+								placement="top"
+							>
+								<el-button size="small" class="fa fa-calendar"  :color="viewPage.date.isClick?'#a0cfff':''" @click="tabsView(viewPage.date,2)" />
+							</el-tooltip>
+							<el-tooltip
+								v-if="viewPage.time.status"
+								class="box-item"
+								effect="dark"
+								content="时间轴"
+								placement="top"
+							>
+								<el-button size="small" class="fa fa-clock-o"  :color="viewPage.time.isClick?'#a0cfff':''" @click="tabsView(viewPage.time,3)" />
+							</el-tooltip>
+							<el-tooltip
+								v-if="viewPage.gantt.status"
+								class="box-item"
+								effect="dark"
+								content="甘特图"
+								placement="top"
+							>
+								<el-button size="small" class="fa fa-bar-chart"  :color="viewPage.gantt.isClick?'#a0cfff':''" @click="tabsView(viewPage.gantt,4)" />
+							</el-tooltip>
+							<el-tooltip
+								v-if="viewPage.map.status"
+								class="box-item"
+								effect="dark"
+								content="地图视图"
+								placement="top"
+							>
+								<el-button size="small" class="fa fa-map-signs"  :color="viewPage.map.isClick?'#a0cfff':''" @click="tabsView(viewPage.map,5)" />
+							</el-tooltip>
+							
+						</el-button-group>
+					</div>
+				</div>
+			</el-col>
+			<el-col v-if="viewType==1" :span="24">
+				<el-table
+					v-bind="data.tableProps"
+					ref="table"
+					:data="tableDataList"
+					@selection-change="selectionChange"
+					table-layout="fixed"
+				>
+					<template
+						v-for="item in columnsFilter"
+						:key="item.id || item.label"
+					>
+					
+						<el-table-column v-if="['-'].includes(item.fieldClass)" :type="item.type" :prop="item.field" :label="item.label" config="" width="60" fixed>
+							<template v-if="item.help" #header="scope">
+								{{ scope.column.label }}
+								<tooltip :content="item.help" />
+							</template>
+						</el-table-column>
+						<el-table-column v-else-if="item.fieldClass=='__control'"  :prop="item.field" :label="item.label" config="" width="200"  align="center"  fixed="right" >
+							<template #default="scope">
+								<el-button-group>
+									<el-tooltip
+										v-if="scope.row.flowIsOpen==1&&scope.row.taskStatus==1"
+										class="box-item"
+										effect="dark"
+										content="提交审批"
+										placement="top-end"
+									>
+										<el-button type="success" size="small" class="fa fa-send-o"   @click="submitApproval(scope.row)" />
+									</el-tooltip>
+
+									<el-tooltip
+										v-if="scope.row.flowIsOpen==1&&scope.row.taskStatus==2"
+										class="box-item"
+										effect="dark"
+										content="重新申请"
+										placement="top-end"
+									>
+										<el-button type="warning" size="small" class="fa fa-retweet"  @click="afreshSendFlow(scope.row)" />
+									</el-tooltip>
+									<el-tooltip
+										class="box-item"
+										effect="dark"
+										content="查看详情"
+										placement="top-end"
+									>
+										<el-button @click="lookPageInfo(scope.row)" type="primary" size="small" class="fa fa-eye"  />
+									</el-tooltip>
+									<el-popconfirm
+										v-if="scope.row.flowIsOpen==1&&scope.row.isRetract"
+										confirm-button-text="确定"
+										cancel-button-text="取消"
+										:icon="QuestionFilled"
+										icon-color="#F56C6C"
+										title="您确定要撤回此次申请？一经撤回！需要此流程重新提交申请！"
+										@confirm="withdrawApplication (scope.row)"
+										@cancel="cancelEvent(scope.row)"
+									>
+										<template #reference>
+											<el-button  size="small" class="fa fa-reply-all"  />
+										</template>
+									</el-popconfirm>
+									<el-tooltip
+										v-if="scope.row.flowIsOpen==2"
+										class="box-item"
+										effect="dark"
+										content="编辑"
+										placement="top-end"
+									>
+										<el-button @click="editInfo(scope.row)" type="info" size="small" class="fa fa-edit"  />
+									</el-tooltip>
+									<el-popconfirm
+										v-if="scope.row.taskStatus==2||scope.row.taskStatus==1"
+										confirm-button-text="确定"
+										cancel-button-text="取消"
+										:icon="QuestionFilled"
+										icon-color="#F56C6C"
+										title="您确定要删除此条记录?一经删除！数据将不可恢复！"
+										@confirm="confirmEvent(scope.row)"
+										@cancel="cancelEvent(scope.row)"
+									>
+										<template #reference>
+											<el-button type="danger" size="small" class="fa fa-trash-o"  />
+										</template>
+									</el-popconfirm>
+
+									<el-tooltip
+										v-if="scope.row.flowIsOpen==1&&scope.row.taskStatus==4"
+										class="box-item"
+										effect="dark"
+										content="申请修改"
+										placement="top-end"
+									>
+										<el-button type="info" size="small" class="fa fa-edit" @click="editFormSendFlow(scope.row)" />
+									</el-tooltip>
+								</el-button-group>
+							</template>
+						</el-table-column>
+						<el-table-column v-else-if="item.fieldClass=='_lableTitle'" label="标题" config="" min-width="320">
+							<template #default="scope">
+								{{writeListTitle(scope.row,viewPage.list)}}
+							</template>
+						</el-table-column>
+						<el-table-column v-else-if="item.fieldClass==''" :prop="item.field" :label="item.label" min-width="320">
+							
+						</el-table-column>
+						<el-table-column v-else  :prop="item.field" :label="item.label" config=""  min-width="220">
+							<template v-if="item.help" #header="scope">
+								{{ scope.column.label }}
+								<tooltip :content="item.help" />
+							</template>
+							
+							<template v-if="item.fieldClass=='select'" #default="scope"> 
+								{{ scope.row[scope.column.property] }}
+							</template>
+							<template v-if="item.fieldClass==''" #default="scope">
+								<!-- {{scope.row[scope.column.property]}}{{item}} -->
+								<el-tag v-if="scope.row[scope.column.property]==1" type="success">启用</el-tag>
+								<el-tag v-if="scope.row[scope.column.property]==2" type="danger">已禁用</el-tag>
+								<el-tag v-if="scope.row[scope.column.property]==3" type="info">已删除</el-tag>
+							</template>
+							<template v-if="item.fieldClass=='deptOrg'" #default="scope">
+								<!-- {{scope.row[scope.column.property]}}{{item}} -->
+								{{ scope.row[scope.column.property] }}
+							</template>
+							<template v-if="item.fieldClass=='owner'" #default="scope"> 
+								<!-- {{scope.row[scope.column.property]}}{{item}}拥有者 -->
+								{{ scope.row[scope.column.property] }}
+							</template>
+							<template v-if="item.fieldClass=='lowcodeImage'" #default="scope"> 
+								<el-image style="width: 30px; height: 30px" :src="scope.row[scope.column.property]" :fit="fit" />
+							</template>
+							<template v-if="item.fieldClass=='expand-user'" #default="scope"> 
+								{{ scope.row[scope.column.property] }} <!--选择用户-->
+							</template>
+							<template v-if="item.fieldClass=='radio'" #default="scope">
+								<!-- {{scope.row[scope.column.property]}}{{item}} -->
+								{{ judjeRadio(scope.row[scope.column.property],item.options) }}
+							</template>
+							<template v-if="item.fieldClass=='upload'" #default="scope" >
+							<div class="demo-image__error">
+								<el-image
+									style="width: 30px; height: 30px"
+									:src="scope.row[scope.column.property]"
+								>
+									<template #error>
+										<div class="image-slot">
+											<el-icon><Picture /></el-icon>
+										</div>
+									</template>
+								</el-image>
+							</div>
+							</template>
+							<template v-if="item.fieldClass=='switch'" #default="scope">	
+								
+								<el-tag
+									v-if="judjeSwitch(scope.row[scope.column.property],item.activeValue)"
+									type="success"
+									effect="light"
+								>
+									启用
+								</el-tag>
+								<el-tag
+									v-else
+									type="danger"
+									effect="light"
+								>
+									禁用
+								</el-tag>
+							</template>
+							<template v-if="item.fieldClass=='baidumap'" #default="scope">
+								{{scope.row[scope.column.property]}}
+							</template>
+							<template v-if="item.fieldClass=='associatedForms'" #default="scope">
+								<el-link
+									key="primary"
+									type="primary"
+									@click="showAsfDetailDialog(item,scope,asfQueryParams)"
+									>
+									
+									{{scope.row[scope.column.property]}}
+								</el-link>
+							</template>
+						</el-table-column>
+					</template>
+				</el-table>
+			</el-col>
+			<el-col v-if="viewType==1&&state.total > 0" :span="24">
+				<div class="pageBox">
+					<el-pagination
+						v-model:currentPage="state.currentPage"
+						v-model:page-size="state.pageSize"
+						:page-sizes="[20, 30, 40, 50] as any"
+						:total="state.total"
+						layout="total, sizes, prev, pager, next, jumper"
+						@size-change="handleSizeChange"
+						@current-change="handleCurrentChange"
+					/>
+				</div>
+			</el-col>
+			<el-col  v-if="viewType==2" :span="24">
+				<CalendarPage  ref="calendarPageRef"  :search-send="searchSend" :body-hight="265" :drawer-with="drawerWith" :view-setup="viewPage.card"  />
+			</el-col>
+			<el-col  v-if="viewType==3" :span="24">
+				<TimeAxisPage  ref="timeAxisRef" :data="tableDataList" :view-layout="viewLayout" :columns-filter="columnsFilter" :search-send="searchSend" :drawer-with="drawerWith" :view-setup="viewPage.time" />
+			</el-col>
+			<el-col  v-if="viewType==4" :span="24">
+				<GanttPage ref="ganttPageRef" :search-send="searchSend" :drawer-with="drawerWith" :view-setup="viewPage.gantt" />
+			</el-col>
+			<el-col  v-if="viewType==5" :span="24">
+				<MapPage ref="mapPageRef" :search-send="searchSend" :drawer-with="drawerWith" :view-setup="viewPage.map" />
+			</el-col>
+			<el-col  v-if="viewType==6" :span="24">
+				<CardPage ref="cardPageRef" :search-send="searchSend" :drawer-with="drawerWith" :view-setup="viewPage.card"  :columns-filter="columnsFilter"  />
+			</el-col>
+			<el-col :span="24"  style="display:none">
+			
+				{{ tableDataList}}
+			</el-col>
+			<el-col :span="24" style="display:none">
+				<el-button-group>
+							<el-tooltip
+								
+								class="box-item"
+								effect="dark"
+								content="提交审批"
+								placement="top-end"
+							>
+								<el-button type="success" size="small" class="fa fa-send-o" />
+							</el-tooltip>
+
+							<el-tooltip
+								
+								class="box-item"
+								effect="dark"
+								content="重新申请"
+								placement="top-end"
+							>
+								<el-button type="warning" size="small" class="fa fa-retweet"   />
+							</el-tooltip>
+							<el-tooltip
+								class="box-item"
+								effect="dark"
+								content="查看详情"
+								placement="top-end"
+							>
+								<el-button type="primary" size="small" class="fa fa-eye"  />
+							</el-tooltip>
+							<el-tooltip
+								
+								class="box-item"
+								effect="dark"
+								content="撤回"
+								placement="top-end"
+							>
+								<el-button  size="small" class="fa fa-reply-all"  />
+							</el-tooltip>
+							<el-tooltip
+								
+								class="box-item"
+								effect="dark"
+								content="删除"
+								placement="top-end"
+							>
+								<el-button type="danger" size="small" class="fa fa-trash-o"  />
+							</el-tooltip>
+
+							<el-tooltip
+								
+								class="box-item"
+								effect="dark"
+								content="申请修改"
+								placement="top-end"
+							>
+								<el-button type="info" size="small" class="fa fa-edit"  />
+							</el-tooltip>
+				</el-button-group>
+			
+			
+			</el-col>
+		</el-row>
+		<FormPageCont v-model:is-show="lookPageInfoIsShow" :drawer-with="drawerWith" :page-info="pageInfoCont" :table-page-class="tablePageClass" :oper-state="operState" @getPageData="getPageData" />
+		<FormPageCont v-model:is-show="asflookPageInfoIsShow" :drawer-with="drawerWith" :page-info="currentAsfTableDataList[0]" :table-page-class="tablePageClass" :oper-state="operState" @getPageData="getPageData" />
+		<TableFlow  v-model:isopen="openTaskDrawer" :versionid="props.versionid" :versiontitle="props.versiontitle" :drawerwith="drawerWith" @searchquery="getListData" />
+
+
+		<el-dialog v-model="asfShowDetailsFlag" title="关联表单详情查看" top="20px" style="margin-top:70px,margin-left:270px">
+                
+        </el-dialog>
+	
+	</div>
+</template>
+<style  lang='scss' scoped>
+.rowBox{
+	width:100%;
+}
+.table-list-comm{
+	padding:0px 15px 15px 15px;
+}
+.seacherForm{
+	min-height: auto;
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: flex-start;
+}
+.pageBox{
+	width:100%;
+	margin-top:20px;
+	text-align: center;
+	display: flex;
+  	justify-content: center;
+}
+.operateButArea{
+		width: 100%;
+		display: flex;
+		align-items: center;
+  		justify-content: space-between;
+		margin-top:15px;
+		margin-bottom:15px;
+		.operatLeft{
+			padding-bottom: 2px;
+		}
+}
+.group{
+	width: auto;
+    margin-right: 10px;
+}
+.demo-image__error .block {
+  padding: 0px 0;
+  text-align: center;
+  border-right: solid 1px var(--el-border-color);
+  display: inline-block;
+  width: 100%;
+  box-sizing: border-box;
+  vertical-align: top;
+}
+.demo-image__error .demonstration {
+  display: block;
+  color: var(--el-text-color-secondary);
+  font-size: 14px;
+  margin-bottom: 20px;
+}
+.demo-image__error .el-image {
+  padding: 0 5px;
+  max-width: 300px;
+  max-height: 200px;
+  width: 100%;
+  height: 200px;
+}
+
+.demo-image__error .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;
+}
+.demo-image__error .image-slot .el-icon {
+  font-size: 30px;
+}
+</style>
diff --git a/src/views/sysworkflow/lowcodepage/appPage/appPageForm/openAppFormPage.vue b/src/views/sysworkflow/lowcodepage/appPage/appPageForm/openAppFormPage.vue
index eaa78b9..c765eb1 100644
--- a/src/views/sysworkflow/lowcodepage/appPage/appPageForm/openAppFormPage.vue
+++ b/src/views/sysworkflow/lowcodepage/appPage/appPageForm/openAppFormPage.vue
@@ -279,7 +279,7 @@ const gainAppFormPageInit = () =>{
 							}
 							
 
-							if(stateData.searchData.length>0){
+							if(stateData.searchData && stateData.searchData.length>0){
 								for(let j = 0;j<stateData.searchData.length;j++){
 									//console.log(stateData.searchData[j])
 									if(stateData.searchData[j].id==stateData.tableData.columns[i].id){
@@ -299,7 +299,12 @@ const gainAppFormPageInit = () =>{
 				
 
 				stateList.tableData = stateData.tableData
+				
 				stateList.searchData = stateData.searchData
+				if(stateList.searchData == null){
+					stateList.searchData = new Array()
+				}
+				// console.log("类型",stateList.searchData)
 				stateList.loading = stateData.loading
 				stateList.attrObj = stateData.attrObj
 				stateList.config = stateData.config
@@ -369,7 +374,6 @@ defineExpose({
 			<el-col  v-if="activePage!=3" :span="24" class="pageBoxInfo">
 				<el-card class="tispMsg"  shadow="always">
 					<el-scrollbar class="suojing">
-					
 						<ak-page-list
 							v-if="activePage==1"
 							:data="stateList.tableData"
diff --git a/src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageList.vue b/src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageList.vue
index 237e35d..dac3709 100644
--- a/src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageList.vue
+++ b/src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageList.vue
@@ -365,6 +365,9 @@ const getListInfo = () => {
 				// console.log("获取列表内容---->",stateData)
 				state.tableData = stateData.tableData
 				state.searchData = stateData.searchData
+				if(state.searchData == null){
+					state.searchData = new Array()
+				}
 				state.loading = stateData.loading
 				state.attrObj = stateData.attrObj
 				state.config = stateData.config
@@ -622,6 +625,7 @@ const tableListFieldClick = (val:any[]) => {
 @ 功能: 处理查询条件
 */
 const addOrDelSearchField = (val:attrButton,isTrue:boolean) => {
+	console.log("处理查询条件",state.searchData)
 	if(isTrue){
 		if(state.searchData.length>0){
 			let isWrite = true;
diff --git a/src/views/sysworkflow/lowcodepage/newLowCode/appLayoutEdit/appContainerPage.vue b/src/views/sysworkflow/lowcodepage/newLowCode/appLayoutEdit/appContainerPage.vue
index f9d0a35..3bfb826 100644
--- a/src/views/sysworkflow/lowcodepage/newLowCode/appLayoutEdit/appContainerPage.vue
+++ b/src/views/sysworkflow/lowcodepage/newLowCode/appLayoutEdit/appContainerPage.vue
@@ -105,6 +105,7 @@ const closeAppDraw = () =>{
 */
 const openAppPageForm = (val:appMenuTreeInfo) => {
 	checkedMenu.value = val
+	console.log("操作表单页面",val)
 }
 /**
 @ 作者: 秦东
@@ -147,6 +148,11 @@ const addMenu = (key?:string) => {
 	}
 	menuGroupShow.value = true;
 }
+const openAppPageInit = ref(null)
+const updataPageInit = () => {
+	
+	openAppPageInit.value.gainAppFormPageInit()
+}
 </script>
 <template>
 	<el-drawer  v-model="props.editIsOpen" :with-header="false" :close-on-click-modal="false" :close-on-press-escape="false" :destroy-on-close="true" :size="props.drawerWith">
diff --git a/src/views/sysworkflow/lowcodepage/pageFlow/appTableFlow.vue b/src/views/sysworkflow/lowcodepage/pageFlow/appTableFlow.vue
index c569de1..d36782d 100644
--- a/src/views/sysworkflow/lowcodepage/pageFlow/appTableFlow.vue
+++ b/src/views/sysworkflow/lowcodepage/pageFlow/appTableFlow.vue
@@ -507,7 +507,7 @@ function optionsValue3Get3(data: any,fieldName: string){
 }
 </script>
 <template>
-	<el-drawer  v-model="drawerOpenOrClose" v-loading="loadingData" :title="versiontitle"  :close-on-click-modal="false" :close-on-press-escape="false" :destroy-on-close="true" :size="drawbox" class="drawerClass" >{{drawbox}}
+	<el-drawer  v-model="drawerOpenOrClose" v-loading="loadingData" :title="versiontitle"  :close-on-click-modal="false" :close-on-press-escape="false" :destroy-on-close="true" :size="drawbox" class="drawerClass" >
 		<AppFormPage
 						
 			ref="formEl"
diff --git a/src/views/sysworkflow/lowcodepage/runApp/runAppForm.vue b/src/views/sysworkflow/lowcodepage/runApp/runAppForm.vue
index 12ca87d..b263bee 100644
--- a/src/views/sysworkflow/lowcodepage/runApp/runAppForm.vue
+++ b/src/views/sysworkflow/lowcodepage/runApp/runAppForm.vue
@@ -195,7 +195,7 @@ const initLoadData = () => {
 				let stateData = string2json(data.data.appForm.listjson)
 				// console.log("接邂逅的数",stateData)
 				let holeControlAndConfigStateData = string2json(data.data.appForm.mastesformjson)
-				if(stateData.tableData.columns.length>0){
+				if(stateData.tableData.columns && stateData.tableData.columns.length>0){
 					for(let i = 0;i<stateData.tableData.columns.length;i++){
 						for(let u = 0;u<holeControlAndConfigStateData.list.length;u++){
 							if(stateData.tableData.columns[i].id==holeControlAndConfigStateData.list[u].name){
@@ -226,7 +226,7 @@ const initLoadData = () => {
 									}
 								})
 							}
-							if(stateData.searchData.length>0){
+							if(stateData.searchData && stateData.searchData.length>0){
 								for(let j = 0;j<stateData.searchData.length;j++){
 									// console.log(stateData.searchData[j])
 									if(stateData.searchData[j].id==stateData.tableData.columns[i].id){
@@ -244,6 +244,9 @@ const initLoadData = () => {
 				}
 				stateList.tableData = stateData.tableData
 				stateList.searchData = stateData.searchData
+				if(stateList.searchData == null){
+					stateList.searchData = new Array()
+				}
 				stateList.loading = stateData.loading
 				stateList.attrObj = stateData.attrObj
 				stateList.config = stateData.config

From 370dc98e9bdd84d6a42d016a3ec113f2e762548e Mon Sep 17 00:00:00 2001
From: herenshan112 <herenshan112@163.com>
Date: Thu, 19 Sep 2024 15:40:47 +0800
Subject: [PATCH 08/14] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=B8=8B=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DesignForm/formControlPropertiNew.vue     |   1 -
 .../hr/archives/downpage/xingGeFengXi.vue     |  86 ++++++++
 src/views/hr/archives/index.vue               | 198 +++++++++++++++++-
 3 files changed, 279 insertions(+), 6 deletions(-)
 create mode 100644 src/views/hr/archives/downpage/xingGeFengXi.vue

diff --git a/src/components/DesignForm/formControlPropertiNew.vue b/src/components/DesignForm/formControlPropertiNew.vue
index 244dbd8..a825390 100644
--- a/src/components/DesignForm/formControlPropertiNew.vue
+++ b/src/components/DesignForm/formControlPropertiNew.vue
@@ -4113,7 +4113,6 @@ const radioChangeSet = (val:any) => {
                     </el-form>
                 </el-tab-pane>
                 <el-tab-pane label="表单配置" name="second">
-				{{formConfig}}
                     <el-form size="small" class="form">
                         <el-divider content-position="left">基础配置</el-divider>
 								<el-form-item v-if="formConfig.classify != 4"  class="form_cont">
diff --git a/src/views/hr/archives/downpage/xingGeFengXi.vue b/src/views/hr/archives/downpage/xingGeFengXi.vue
new file mode 100644
index 0000000..8d0ff47
--- /dev/null
+++ b/src/views/hr/archives/downpage/xingGeFengXi.vue
@@ -0,0 +1,86 @@
+<!--
+@ 作者: 秦东
+@ 时间: 2024-09-19 13:16:56
+@ 备注: 性格分析过度
+-->
+<script lang='ts' setup>
+const downloadUrl = import.meta.env.VITE_APP_BASE_API+"/systemapi/rongxin/downLoadNineTestPage"
+const downloadUrlStis = import.meta.env.VITE_APP_BASE_API+"/systemapi/rongxin/statisticsPersonality"
+const props = defineProps({
+	typeKey: {
+		type: String,
+		default: "10000003",
+	},
+	downClassType: {
+		type: Number,
+		default: 1,
+	},
+	orgTree: {
+		type: Object,
+		default() {
+			return {};
+		},
+	},
+});
+const dialogVisible = ref(true)
+const emits = defineEmits(["closeXigePage"]);
+const searchQuery = reactive({
+	types:1,
+	org:"",
+	keywords:"",
+	typekey:props.typeKey?props.typeKey.toString():""
+})
+const handleTypeClose = () => {
+	emits("closeXigePage")
+}
+const orgTreeProps ={
+	children: 'child',
+	label: 'name',
+	value:"id"
+}	//行政组织树对照值
+</script>
+<template>
+	<el-dialog
+		v-model="dialogVisible"
+		title="选择下载范围"
+		width="500"
+		:before-close="handleTypeClose"
+	>
+		<el-form :model="searchQuery" label-width="90px" >
+			<el-form-item v-if="props.downClassType!=1" label="统计类型" label-position="left">
+				<el-radio-group v-model="searchQuery.types">
+					<el-radio :value="1">未做</el-radio>
+					<el-radio :value="2">已做</el-radio>
+				</el-radio-group>
+			</el-form-item>
+			<el-form-item label="行政组织" label-position="left">
+				<el-tree-select
+					v-model="searchQuery.org"
+					:data="props.orgTree"
+					check-strictly
+					:render-after-expand="false"
+					:props="orgTreeProps" 
+					clearable
+				/>
+			</el-form-item>
+			<el-form-item label="工号或姓名"  label-position="left">
+				<el-input v-model="searchQuery.keywords" clearable />
+			</el-form-item>
+			<el-form-item>
+				<el-link  v-if="props.downClassType==2" type="primary"  :underline="false" :href="downloadUrlStis+'?keywords='+searchQuery.keywords+'&org='+searchQuery.org+'&typekey='+searchQuery.typekey+'&types='+searchQuery.types" target="_blank">
+					<el-button type="primary">
+						确定下载
+					</el-button>
+				</el-link>
+				<el-link v-else type="primary"  :underline="false" :href="downloadUrl+'?keywords='+searchQuery.keywords+'&adminorg='+searchQuery.org+'&typekey='+searchQuery.typekey" target="_blank">
+					<el-button type="primary">
+						确定下载
+					</el-button>
+				</el-link>
+			</el-form-item>
+		</el-form>
+	</el-dialog>
+</template>
+<style  lang='scss' scoped>
+
+</style>
diff --git a/src/views/hr/archives/index.vue b/src/views/hr/archives/index.vue
index e9af648..b47f55e 100644
--- a/src/views/hr/archives/index.vue
+++ b/src/views/hr/archives/index.vue
@@ -17,7 +17,7 @@ import { uploadUrl } from '@/api/DesignForm'
  * 引入页面
  */
 import ArchivesCont from '@/views/hr/archives/archivescont.vue'
-
+import XingGeFengXi from '@/views/hr/archives/downpage/xingGeFengXi.vue'
 
 import { ElScrollbar as ElScrollbarType } from 'element-plus';
 
@@ -41,6 +41,7 @@ const handleClick = () => {
   })
 }
 
+const direction = ref("rtl")
 // const uploadFFurl = import.meta.env.VITE_APP_BASE_API + "/hrapi/staff/uploadUserFiles"
 const uploadFFurl = import.meta.env.VITE_APP_BASE_API + "/hrapi/staff/uploadUserFilesRedis"
 
@@ -497,7 +498,74 @@ const downLoadTeamTable = () => {
 			console.log("下团队角色分析表",data)
 		})
 }
-
+const openSetup = ref(false)
+/**
+@ 作者: 秦东
+@ 时间: 2024-09-19 09:57:42
+@ 功能: 设置相关操作
+*/
+const setupClick = () => {
+	openSetup.value = true
+	temList()
+}
+/**
+@ 作者: 秦东
+@ 时间: 2024-09-19 10:12:29
+@ 功能: 关闭设置
+*/
+const closeSetup  = () => {
+	openSetup.value = false
+}
+const setupActiveName = ref("1")
+watch(() =>setupActiveName.value, (val:any) => {
+	console.log("切换选项",val)
+})
+/**
+@ 作者: 秦东
+@ 时间: 2024-09-19 13:12:29
+@ 功能: 下载性格分析表
+*/
+const openTableType = ref(false)
+const downTableType = ref("10000003")
+const downClassType = ref(1)
+const selectDownTiaojian = (val:string) => {
+	downTableType.value = val
+	openTableType.value = true
+	downClassType.value = 1
+}
+/**
+@ 作者: 秦东
+@ 时间: 2024-09-19 13:23:09
+@ 功能: 关闭下载页面
+*/
+const closeXigePage = () => {
+	openTableType.value = false
+}
+/**
+@ 作者: 秦东
+@ 时间: 2024-09-19 13:55:09
+@ 功能: 性格类型
+*/
+const characterList = reactive([
+	{
+		label:"性格色彩",
+		code:"10000001"
+	},
+	{
+		label:"DISC性格特质",
+		code:"10000002"
+	},
+	{
+		label:"九型人格特质",
+		code:"10000003"
+	}
+])
+const downStatistics = (val:any) => {
+	console.log("下载数据嗖嗖嗖--->",val)
+	downTableType.value = val
+	openTableType.value = true
+	downClassType.value = 2
+}
 </script>
 <template>
 	<div class="app-container">
@@ -586,7 +654,7 @@ const downLoadTeamTable = () => {
 							批量导入数据
 							</el-button>
 							<el-button 
-			
+								v-if="false"
 								v-hasPerm="['287868103478489088']"
 								plain
 								type="primary" 
@@ -596,7 +664,7 @@ const downLoadTeamTable = () => {
 							导入模板下载
 							</el-button>
 							
-							<el-link type="primary"  :underline="false" :href="downloadUrl+'?keywords='+searchArchiveQuery.keywords+'&adminorg='+searchArchiveQuery.adminorg+'&emptype='+json2string(searchArchiveQuery.emptype)" target="_blank"><el-button 
+							<el-link type="primary" v-if="false" :underline="false" :href="downloadUrl+'?keywords='+searchArchiveQuery.keywords+'&adminorg='+searchArchiveQuery.adminorg+'&emptype='+json2string(searchArchiveQuery.emptype)" target="_blank"><el-button 
 			
 								v-hasPerm="['287868103478489088']"
 								plain
@@ -605,7 +673,13 @@ const downLoadTeamTable = () => {
 								<el-icon><Download /></el-icon>
 								下载团队角色分析表
 							</el-button></el-link>
-							</el-space>
+
+							<el-button type="warning" @click="setupClick">
+								<el-icon><Setting /></el-icon>
+								设置
+							</el-button>
+
+						</el-space>
 					</div>
 					<el-table
 						v-loading="tableLoading"
@@ -808,11 +882,117 @@ const downLoadTeamTable = () => {
 				</el-form-item>
 			</el-form>
 		</el-dialog>
+		<!--设置-->
+		<el-drawer
+			v-model="openSetup"
+			title="各行政组织员工信息点在档案模板"
+			:direction="direction"
+			:before-close="closeSetup"
+			:size="500"
+			class="drwBody"
+		>	
+			<el-tabs  v-model="setupActiveName" type="border-card">
+				<el-tab-pane label="员工档案导入模版" name="1">
+					<template #label>
+						<el-space wrap>
+							<span class="fa fa-upload"></span>
+							<span>员工档案导入模版</span>
+						</el-space>
+					</template>
+					
+					<div  v-hasPerm="['288626950073757696']" style="flex: auto; text-align:right; margin-bottom:10px;">
+						<el-button type="primary" @click="setUpNewTemplate">上传新模版</el-button>
+					</div>
+					<el-table :data="downTemplate" border style="width: 100%">
+						<el-table-column prop="orgName" label="行政组织" width="200" />
+						<el-table-column prop="fileName" label="文件名称">
+							<template #default="scope">
+								<el-link type="success" :underline="false" :href="scope.row.fileUrl" target="_blank">{{ scope.row.fileName }}</el-link>
+							</template>
+						</el-table-column>
+						<el-table-column  v-hasPerm="['288626867236253696']" prop="address" label="操作" align="center"  width="100">
+							<template #default="scope">
+								<el-button link type="warning" size="small" @click="editUserTemp(scope.row)">编辑</el-button>
+								<el-button link type="danger" size="small" @click="delUserTemp(scope.row,3)">删除</el-button>
+							</template>
+						</el-table-column>
+					</el-table>
+					<div class="pageBox">
+						<el-pagination  layout="prev, pager, next" :total="totalVal" />
+					</div>
+
+					
+
+
+
+				</el-tab-pane>
+				<el-tab-pane label="性格分析表" name="2">
+					<template #label>
+						<el-space wrap>
+							<span class="fa fa-list"></span>
+							<span>性格分析表</span>
+						</el-space>
+					</template>
+					<div class="downLink">
+						<div>团队角色九型人格测试</div>
+						<div>
+							<el-button
+								type="danger"
+								text
+								v-hasPerm="['287868103478489088']"
+								@click="selectDownTiaojian('10000003')"
+							>
+								下载
+							</el-button>
+						</div>
+					</div>
+
+					<!-- <el-link type="primary"  :underline="false" :href="downloadUrl+'?keywords='+searchArchiveQuery.keywords+'&adminorg='+searchArchiveQuery.adminorg+'&emptype='+json2string(searchArchiveQuery.emptype)" target="_blank"><el-button 
+			
+			v-hasPerm="['287868103478489088']"
+			plain
+			type="primary" 
+		>
+			<el-icon><Download /></el-icon>
+			下载团队角色分析表
+		</el-button></el-link> -->
+
+
+				</el-tab-pane>
+				<el-tab-pane label="测试统计" name="3">
+					<template #label>
+						<el-space wrap>
+							<span class="fa fa-bar-chart"></span>
+							<span>测试统计</span>
+						</el-space>
+					</template>
+					
+					<el-table :data="characterList" border style="width: 100%">
+						<el-table-column prop="label" label="测试名称"  />
+						
+						<el-table-column label="操作" align="center"  width="80">
+							<template #default="scope">
+								<el-button link type="danger" size="small" @click="downStatistics(scope.row)">下载</el-button>
+							</template>
+						</el-table-column>
+					</el-table>
+				</el-tab-pane>
+			</el-tabs>
+
+		</el-drawer>
+
+		<XingGeFengXi v-if="openTableType" :down-class-type="downClassType" :org-tree="orgTreeList" @close-xige-page="closeXigePage" />
+
 	</el-container>
 	</div>
 	
 </template>
 <style  lang='scss' scoped>
+.app-container{
+	:deep .el-drawer__body{
+		padding: 0 10px;
+	}
+}
 
 .common-layout{
 	height: calc(100% - 60px);
@@ -841,5 +1021,13 @@ const downLoadTeamTable = () => {
 	text-align: center;
 	display:flex;
 	align-items: center;
+	width: 100%;
+	
+}
+.downLink{
+	display: flex;
+	width: 100%;
+	align-items: center;
+	justify-content: space-between;
 }
 </style>

From 8334a87f6dd1b7a3a0a4a63f5911a06e478eb042 Mon Sep 17 00:00:00 2001
From: herenshan112 <herenshan112@163.com>
Date: Thu, 19 Sep 2024 15:56:25 +0800
Subject: [PATCH 09/14] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E4=BC=A0=E5=8F=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/hr/archives/downpage/xingGeFengXi.vue | 4 ++--
 src/views/hr/archives/index.vue                 | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/hr/archives/downpage/xingGeFengXi.vue b/src/views/hr/archives/downpage/xingGeFengXi.vue
index 8d0ff47..b02adb9 100644
--- a/src/views/hr/archives/downpage/xingGeFengXi.vue
+++ b/src/views/hr/archives/downpage/xingGeFengXi.vue
@@ -7,7 +7,7 @@
 const downloadUrl = import.meta.env.VITE_APP_BASE_API+"/systemapi/rongxin/downLoadNineTestPage"
 const downloadUrlStis = import.meta.env.VITE_APP_BASE_API+"/systemapi/rongxin/statisticsPersonality"
 const props = defineProps({
-	typeKey: {
+	downTableType: {
 		type: String,
 		default: "10000003",
 	},
@@ -28,7 +28,7 @@ const searchQuery = reactive({
 	types:1,
 	org:"",
 	keywords:"",
-	typekey:props.typeKey?props.typeKey.toString():""
+	typekey:props.downTableType?props.downTableType.toString():""
 })
 const handleTypeClose = () => {
 	emits("closeXigePage")
diff --git a/src/views/hr/archives/index.vue b/src/views/hr/archives/index.vue
index b47f55e..40987d4 100644
--- a/src/views/hr/archives/index.vue
+++ b/src/views/hr/archives/index.vue
@@ -562,7 +562,7 @@ const characterList = reactive([
 ])
 const downStatistics = (val:any) => {
 	console.log("下载数据嗖嗖嗖--->",val)
-	downTableType.value = val
+	downTableType.value = val.code
 	openTableType.value = true
 	downClassType.value = 2
 }
@@ -981,7 +981,7 @@ const downStatistics = (val:any) => {
 
 		</el-drawer>
 
-		<XingGeFengXi v-if="openTableType" :down-class-type="downClassType" :org-tree="orgTreeList" @close-xige-page="closeXigePage" />
+		<XingGeFengXi v-if="openTableType" :down-table-type="downTableType" :down-class-type="downClassType" :org-tree="orgTreeList" @close-xige-page="closeXigePage" />
 
 	</el-container>
 	</div>

From 698cdd0f965be309ab248e92172623e144c15126 Mon Sep 17 00:00:00 2001
From: herenshan112 <herenshan112@163.com>
Date: Wed, 25 Sep 2024 08:12:28 +0800
Subject: [PATCH 10/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=8A=E4=BC=A0?=
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/formControlAttres.vue        |  6 +++---
 src/components/DesignForm/formControlPropertiNew.vue   |  6 +++---
 src/components/DesignForm/formControlProperties.vue    |  6 +++---
 src/components/DesignForm/public/form/formGroup.vue    |  2 +-
 src/components/DesignForm/public/form/formItem.vue     |  2 +-
 src/views/hr/archives/archivescont.vue                 |  2 +-
 .../hr/archives/basicinformation/certificates.vue      | 10 +++++-----
 src/views/hr/archives/basicinformation/jobtitle.vue    |  5 +++--
 .../hr/archives/basicinformation/personalityTest.vue   |  2 +-
 10 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/src/components/DesignForm/assembly/index.ts b/src/components/DesignForm/assembly/index.ts
index 2ca1514..3c44a7d 100644
--- a/src/components/DesignForm/assembly/index.ts
+++ b/src/components/DesignForm/assembly/index.ts
@@ -267,7 +267,7 @@ export default [
 				}
 			},
 			{
-				type: 'organization',
+				type: 'organization', 
 				label: '联系地址',
 				unitName: '联系地址',
 				icon: 'marker',
diff --git a/src/components/DesignForm/formControlAttres.vue b/src/components/DesignForm/formControlAttres.vue
index 45ef55b..7a5d714 100644
--- a/src/components/DesignForm/formControlAttres.vue
+++ b/src/components/DesignForm/formControlAttres.vue
@@ -592,7 +592,7 @@ const attrList = computed(() => {
           vShow: ['upload']
         },
         {
-          label: 'direction',
+          label: '分割线方向',
           type: 'select',
           dict: { horizontal: 'horizontal', vertical: 'vertical' },
           placeholder: '分割线方向，默认horizontal',
@@ -601,14 +601,14 @@ const attrList = computed(() => {
           vShow: ['divider']
         },
         {
-          label: 'border-style',
+          label: '分隔符样式',
           placeholder: '分隔符样式，默认solid',
           value: control.borderStyle,
           path: 'control.borderStyle',
           vShow: ['divider']
         },
         {
-          label: 'content-position',
+          label: '文字方位',
           type: 'select',
           dict: { left: 'left', right: 'right', center: 'center' },
           value: control.contentPosition,
diff --git a/src/components/DesignForm/formControlPropertiNew.vue b/src/components/DesignForm/formControlPropertiNew.vue
index a825390..7eebb6f 100644
--- a/src/components/DesignForm/formControlPropertiNew.vue
+++ b/src/components/DesignForm/formControlPropertiNew.vue
@@ -908,7 +908,7 @@ const attrList = computed(() => {
                     vShow: ['upload']
                 },
                 {
-                    label: 'direction',
+                    label: '分割线方向',
                     type: 'select',
                     dict: { horizontal: 'horizontal', vertical: 'vertical' },
                     placeholder: '分割线方向，默认horizontal',
@@ -917,14 +917,14 @@ const attrList = computed(() => {
                     vShow: ['divider']
                 },
                 {
-                    label: 'border-style',
+                    label: '分隔符样式',
                     placeholder: '分隔符样式，默认solid',
                     value: control.borderStyle,
                     path: 'control.borderStyle',
                     vShow: ['divider']
                 },
                 {
-                    label: 'content-position',
+                    label: '文字方位',
                     type: 'select',
                     dict: { left: 'left', right: 'right', center: 'center' },
                     value: control.contentPosition,
diff --git a/src/components/DesignForm/formControlProperties.vue b/src/components/DesignForm/formControlProperties.vue
index 7f50ad9..28e3e59 100644
--- a/src/components/DesignForm/formControlProperties.vue
+++ b/src/components/DesignForm/formControlProperties.vue
@@ -915,7 +915,7 @@ const attrList = computed(()=>{
                 vShow: ['upload']
             },
             {
-                label: 'direction',
+                label: '分割线方向',
                 type: 'select',
                 dict: { horizontal: 'horizontal', vertical: 'vertical' },
                 placeholder: '分割线方向，默认horizontal',
@@ -924,14 +924,14 @@ const attrList = computed(()=>{
                 vShow: ['divider']
             },
             {
-                label: 'border-style',
+                label: '分隔符样式',
                 placeholder: '分隔符样式，默认solid',
                 value: control.borderStyle,
                 path: 'control.borderStyle',
                 vShow: ['divider']
             },
             {
-                label: 'content-position',
+                label: '文字方位',
                 type: 'select',
                 dict: { left: 'left', right: 'right', center: 'center' },
                 value: control.contentPosition,
diff --git a/src/components/DesignForm/public/form/formGroup.vue b/src/components/DesignForm/public/form/formGroup.vue
index 943acd3..f7d93a3 100644
--- a/src/components/DesignForm/public/form/formGroup.vue
+++ b/src/components/DesignForm/public/form/formGroup.vue
@@ -702,7 +702,7 @@ function optionsValue3Get1(data: any,fieldName: string){
 				</template>
 				<!--格栅布局-->
 				<template v-else-if="element.type === 'grid'">
-					<el-row class="form-row" :class="[element.className]">
+					<el-row class="form-row" :style="type === 5?'padding: 0 0 20px 0;':''" :class="[element.className]">
 						<el-col
 							class="form-col"
 							:class="{
diff --git a/src/components/DesignForm/public/form/formItem.vue b/src/components/DesignForm/public/form/formItem.vue
index 0f965af..c50d50f 100644
--- a/src/components/DesignForm/public/form/formItem.vue
+++ b/src/components/DesignForm/public/form/formItem.vue
@@ -929,7 +929,7 @@ const uploadPic = (val:any) => {
 
 				
 				
-				<OrgCitys v-else-if="judgeIsShow(data.name) && data.type === 'organization' " :data="data" />
+	<OrgCitys v-else-if="judgeIsShow(data.name) && data.type === 'organization' " :data="data" />
 				<UrlLink v-else-if="judgeIsShow(data.name) && data.type === 'urllink' && type != 4" :data="data" />
 
 	
diff --git a/src/views/hr/archives/archivescont.vue b/src/views/hr/archives/archivescont.vue
index 6fb72c6..f9f1ff9 100644
--- a/src/views/hr/archives/archivescont.vue
+++ b/src/views/hr/archives/archivescont.vue
@@ -26,7 +26,7 @@ import Talentinventory from "@/views/hr/archives/basicinformation/talentinventor
 import Employmentrelations from "@/views/hr/archives/basicinformation/employmentrelations.vue";	//员工用工关系
 import Jobtitle from "@/views/hr/archives/basicinformation/jobtitle.vue";					//职称信息
 import Certificates from "@/views/hr/archives/basicinformation/certificates.vue";		//证书信息
-import PersonalityTest from "@/views/hr/archives/basicinformation/personalityTest.vue";		//证书信息
+import PersonalityTest from "@/views/hr/archives/basicinformation/personalityTest.vue";		//就行人格
 
 
 const props = defineProps({
diff --git a/src/views/hr/archives/basicinformation/certificates.vue b/src/views/hr/archives/basicinformation/certificates.vue
index 4253dd6..1a99ee8 100644
--- a/src/views/hr/archives/basicinformation/certificates.vue
+++ b/src/views/hr/archives/basicinformation/certificates.vue
@@ -145,7 +145,7 @@ const delzsxxBox = (cont: zhengshuxinxi) => {
 						<template #label>
                             <el-text><el-icon><Tickets /></el-icon> 证书名称</el-text>
                         </template>
-                        {{ item.name }}
+                        {{ item.title }}
                 </el-descriptions-item>
 				<el-descriptions-item>
 						<template #label>
@@ -157,19 +157,19 @@ const delzsxxBox = (cont: zhengshuxinxi) => {
 						<template #label>
                             <el-text><el-icon><OfficeBuilding /></el-icon> 发证单位</el-text>
                         </template>
-                        {{ item.issuingunit }}
+                        {{ item.issuingUnit }}
                 </el-descriptions-item>
 				<el-descriptions-item>
 						<template #label>
                             <el-text><svg-icon icon-class="yunxing" class="svg_box"></svg-icon> 生效时间</el-text>
                         </template>
-                        {{ item.effectivetime }}
+                        {{ item.timeDataStr }}
                 </el-descriptions-item>
 				<el-descriptions-item>
 						<template #label>
                             <el-text><svg-icon icon-class="stop" class="svg_box"></svg-icon> 截止时间</el-text>
                         </template>
-						{{ item.deadline }}
+						{{ item.endTimeStr }}
                 </el-descriptions-item>
 				<el-descriptions-item>
 					<template #label>
@@ -181,7 +181,7 @@ const delzsxxBox = (cont: zhengshuxinxi) => {
 					<template #label>
                         <el-text><el-icon><QuestionFilled /></el-icon> 是否生效</el-text>
                      </template>
-                        {{ item.iseffective }}
+                        {{ item.validPeriod }}
                 </el-descriptions-item>
 			</el-descriptions>
 		</el-col>
diff --git a/src/views/hr/archives/basicinformation/jobtitle.vue b/src/views/hr/archives/basicinformation/jobtitle.vue
index 683b5cd..b97160c 100644
--- a/src/views/hr/archives/basicinformation/jobtitle.vue
+++ b/src/views/hr/archives/basicinformation/jobtitle.vue
@@ -38,7 +38,7 @@ const getzcxxList = () => {
 	tableLoading.value = true;
 	getJobtitleCont({ id: props.usercont.keystr })
 		.then((data) => {
-			zcxxList.value = data.data.list;
+			zcxxList.value = data.data;
 			totalVal.value = data.data.total
 		})
 		.finally(() => {
@@ -108,7 +108,8 @@ const delzcxxBox = (cont: zhichengxinxi) => {
 	<el-table 
 	v-loading="tableLoading" 
 	highlight-current-row 
-	:data="zcxxList" border
+	:data="zcxxList" 
+	border
 	:header-cell-style="{ background: '#F5F7FA' }">
 		<el-table-column label="职称级别" prop="types" align="center"/>
 		<el-table-column label="职称系列" prop="series" align="center"/>
diff --git a/src/views/hr/archives/basicinformation/personalityTest.vue b/src/views/hr/archives/basicinformation/personalityTest.vue
index 571f9ce..35a27a0 100644
--- a/src/views/hr/archives/basicinformation/personalityTest.vue
+++ b/src/views/hr/archives/basicinformation/personalityTest.vue
@@ -67,7 +67,7 @@ const isTestShouw = (val:number) => {
 	<div>
 		<CharacterColor v-if="isTestShouw(1)" :usercont="props.usercont" :tabsid="props.tabsid" />
 		<DiscTest v-if="isTestShouw(2)" :usercont="props.usercont" :tabsid="props.tabsid" />
-		<NinePage :usercont="props.usercont" :tabsid="props.tabsid" />
+		<NinePage v-if="isTestShouw(1)" :usercont="props.usercont" :tabsid="props.tabsid" />
 		<div  v-if="isTestShouw(3)" v-html="props.usercont.userTypes"></div>
 	</div>
 </template>

From 2d0ff2cf8c1aee805bc6430f41387db99dac2385 Mon Sep 17 00:00:00 2001
From: herenshan112 <herenshan112@163.com>
Date: Wed, 25 Sep 2024 15:54:15 +0800
Subject: [PATCH 11/14] =?UTF-8?q?=E5=AE=8C=E6=88=90=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/image/tinymce.png                  | Bin 6264 -> 23191 bytes
 src/assets/image/tinymce1.png                 | Bin 0 -> 6264 bytes
 src/components/DesignForm/assembly/index.ts   |  86 ++---
 src/components/DesignForm/dragControlApp.vue  |   3 +-
 .../DesignForm/public/expand/datePicker.vue   |  43 +++
 .../DesignForm/public/expand/orgCitys.vue     | 320 ++++++++++++++++++
 .../DesignForm/public/form/childTable.vue     |   2 +-
 .../DesignForm/public/form/formItem.vue       |  42 ++-
 .../DesignForm/public/headToolsApp.vue        |   2 +-
 src/views/sysworkflow/codepage/page.vue       |  65 ++++
 src/widget/orgcitys/index.vue                 |   1 +
 11 files changed, 514 insertions(+), 50 deletions(-)
 create mode 100644 src/assets/image/tinymce1.png
 create mode 100644 src/components/DesignForm/public/expand/datePicker.vue
 create mode 100644 src/components/DesignForm/public/expand/orgCitys.vue

diff --git a/src/assets/image/tinymce.png b/src/assets/image/tinymce.png
index e1499fb0376e72470f8d01020d6c9fe688329daa..67d7de166d25d8c0a58521e5bb14922b36336b34 100644
GIT binary patch
literal 23191
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
b^zOB~HR*Als<zXHHOUqX+71l$|8D{S8cjOl

literal 6264
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

diff --git a/src/assets/image/tinymce1.png b/src/assets/image/tinymce1.png
new file mode 100644
index 0000000000000000000000000000000000000000..e1499fb0376e72470f8d01020d6c9fe688329daa
GIT binary patch
literal 6264
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

literal 0
HcmV?d00001

diff --git a/src/components/DesignForm/assembly/index.ts b/src/components/DesignForm/assembly/index.ts
index 3c44a7d..b0653d0 100644
--- a/src/components/DesignForm/assembly/index.ts
+++ b/src/components/DesignForm/assembly/index.ts
@@ -32,7 +32,7 @@ export default [
 				config: {},
 				styles: {
 					divStyle: {
-						marginBot: "10"
+						marginBot: "15"
 					},
 					labelStyle: {
 						paddingLeft: "7",
@@ -61,7 +61,7 @@ export default [
 				selectvalue: "default",
 				styles: {
 					divStyle: {
-						marginBot: "10"
+						marginBot: "15"
 					},
 					labelStyle: {
 						paddingLeft: "7",
@@ -82,7 +82,7 @@ export default [
 				config: {}, // 其他配置信息
 				styles: {
 					divStyle: {
-						marginBot: "10"
+						marginBot: "15"
 					},
 					labelStyle: {
 						paddingLeft: "7",
@@ -103,7 +103,7 @@ export default [
 				config: {},
 				styles: {
 					divStyle: {
-						marginBot: "10"
+						marginBot: "15"
 					},
 					labelStyle: {
 						paddingLeft: "7",
@@ -127,7 +127,7 @@ export default [
 				config: config,
 				styles: {
 					divStyle: {
-						marginBot: "10"
+						marginBot: "15"
 					},
 					labelStyle: {
 						paddingLeft: "7",
@@ -151,7 +151,7 @@ export default [
 				config: config,
 				styles: {
 					divStyle: {
-						marginBot: "10"
+						marginBot: "15"
 					},
 					labelStyle: {
 						paddingLeft: "7",
@@ -176,7 +176,7 @@ export default [
 				config: config,
 				styles: {
 					divStyle: {
-						marginBot: "10"
+						marginBot: "15"
 					},
 					labelStyle: {
 						paddingLeft: "7",
@@ -197,7 +197,7 @@ export default [
 				config: config,
 				styles: {
 					divStyle: {
-						marginBot: "10"
+						marginBot: "15"
 					},
 					labelStyle: {
 						paddingLeft: "7",
@@ -218,7 +218,7 @@ export default [
 				config: {},
 				styles: {
 					divStyle: {
-						marginBot: "10"
+						marginBot: "15"
 					},
 					labelStyle: {
 						paddingLeft: "7",
@@ -238,7 +238,7 @@ export default [
 				config: {},
 				styles: {
 					divStyle: {
-						marginBot: "10"
+						marginBot: "15"
 					},
 					labelStyle: {
 						paddingLeft: "7",
@@ -258,7 +258,7 @@ export default [
 				config: {},
 				styles: {
 					divStyle: {
-						marginBot: "10"
+						marginBot: "15"
 					},
 					labelStyle: {
 						paddingLeft: "7",
@@ -277,7 +277,7 @@ export default [
 				config: {},
 				styles: {
 					divStyle: {
-						marginBot: "10"
+						marginBot: "15"
 					},
 					labelStyle: {
 						paddingLeft: "7",
@@ -311,7 +311,7 @@ export default [
 				config: {},
 				styles: {
 					divStyle: {
-						marginBot: "10"
+						marginBot: "15"
 					},
 					labelStyle: {
 						paddingLeft: "7",
@@ -332,7 +332,7 @@ export default [
 				config: {},
 				styles: {
 					divStyle: {
-						marginBot: "10"
+						marginBot: "15"
 					},
 					labelStyle: {
 						paddingLeft: "7",
@@ -352,7 +352,7 @@ export default [
 				config: {},
 				styles: {
 					divStyle: {
-						marginBot: "10"
+						marginBot: "15"
 					},
 					labelStyle: {
 						paddingLeft: "7",
@@ -372,7 +372,7 @@ export default [
 			// 	config: {},
 			// 	styles: {
 			// 		divStyle: {
-			// 			marginBot: "10"
+			// 			marginBot: "15"
 			// 		},
 			// 		labelStyle: {
 			// 			paddingLeft: "7",
@@ -415,7 +415,7 @@ export default [
 				config: {},
 				styles: {
 					divStyle: {
-						marginBot: "10"
+						marginBot: "15"
 					},
 					labelStyle: {
 						paddingLeft: "7",
@@ -435,7 +435,7 @@ export default [
 				item: {}, // label标题相关
 				styles: {
 					divStyle: {
-						marginBot: "10"
+						marginBot: "15"
 					},
 					labelStyle: {
 						paddingLeft: "7",
@@ -457,7 +457,7 @@ export default [
 				},
 				styles: {
 					divStyle: {
-						marginBot: "10"
+						marginBot: "15"
 					},
 					labelStyle: {
 						paddingLeft: "7",
@@ -476,7 +476,7 @@ export default [
 				list: [],
 				styles: {
 					divStyle: {
-						marginBot: "10"
+						marginBot: "15"
 					},
 					labelStyle: {
 						paddingLeft: "7",
@@ -501,7 +501,7 @@ export default [
 				config: {},
 				styles: {
 					divStyle: {
-						marginBot: "10"
+						marginBot: "15"
 					},
 					labelStyle: {
 						paddingLeft: "7",
@@ -520,7 +520,7 @@ export default [
 				config: {},
 				styles: {
 					divStyle: {
-						marginBot: "10"
+						marginBot: "15"
 					},
 					labelStyle: {
 						paddingLeft: "7",
@@ -601,7 +601,7 @@ export default [
 				config: {},
 				styles: {
 					divStyle: {
-						marginBot: "10"
+						marginBot: "15"
 					},
 					labelStyle: {
 						paddingLeft: "7",
@@ -622,7 +622,7 @@ export default [
 				config: {},
 				styles: {
 					divStyle: {
-						marginBot: "10"
+						marginBot: "15"
 					},
 					labelStyle: {
 						paddingLeft: "7",
@@ -642,7 +642,7 @@ export default [
 				config: {},
 				styles: {
 					divStyle: {
-						marginBot: "10"
+						marginBot: "15"
 					},
 					labelStyle: {
 						paddingLeft: "7",
@@ -666,7 +666,7 @@ export default [
 				},
 				styles: {
 					divStyle: {
-						marginBot: "10"
+						marginBot: "15"
 					},
 					labelStyle: {
 						paddingLeft: "7",
@@ -685,7 +685,7 @@ export default [
 				config: {},
 				styles: {
 					divStyle: {
-						marginBot: "10"
+						marginBot: "15"
 					},
 					labelStyle: {
 						paddingLeft: "7",
@@ -705,7 +705,7 @@ export default [
 				config: {},
 				styles: {
 					divStyle: {
-						marginBot: "10"
+						marginBot: "15"
 					},
 					labelStyle: {
 						paddingLeft: "7",
@@ -725,7 +725,7 @@ export default [
 				config: {},
 				styles: {
 					divStyle: {
-						marginBot: "10"
+						marginBot: "15"
 					},
 					labelStyle: {
 						paddingLeft: "7",
@@ -745,7 +745,7 @@ export default [
 				config: {},
 				styles: {
 					divStyle: {
-						marginBot: "10"
+						marginBot: "15"
 					},
 					labelStyle: {
 						paddingLeft: "7",
@@ -778,7 +778,7 @@ export default [
 				config: {},
 				styles: {
 					divStyle: {
-						marginBot: "10"
+						marginBot: "15"
 					},
 					labelStyle: {
 						paddingLeft: "7",
@@ -798,7 +798,7 @@ export default [
 				config: {},
 				styles: {
 					divStyle: {
-						marginBot: "10"
+						marginBot: "15"
 					},
 					labelStyle: {
 						paddingLeft: "7",
@@ -849,7 +849,7 @@ export default [
 				config: {},
 				styles: {
 					divStyle: {
-						marginBot: "10"
+						marginBot: "15"
 					},
 					labelStyle: {
 						paddingLeft: "7",
@@ -873,7 +873,7 @@ export default [
 				},
 				styles: {
 					divStyle: {
-						marginBot: "10"
+						marginBot: "15"
 					},
 					labelStyle: {
 						paddingLeft: "7",
@@ -953,7 +953,7 @@ export default [
 				config: {},
 				styles: {
 					divStyle: {
-						marginBot: "10"
+						marginBot: "15"
 					},
 					labelStyle: {
 						paddingLeft: "7",
@@ -990,7 +990,7 @@ export default [
 				},
 				styles: {
 					divStyle: {
-						marginBot: "10"
+						marginBot: "15"
 					},
 					labelStyle: {
 						paddingLeft: "7",
@@ -1011,7 +1011,7 @@ export default [
 				config: {}, // 其他配置信息
 				styles: {
 					divStyle: {
-						marginBot: "10"
+						marginBot: "15"
 					},
 					labelStyle: {
 						paddingLeft: "7",
@@ -1030,7 +1030,7 @@ export default [
 				config: {},
 				styles: {
 					divStyle: {
-						marginBot: "10"
+						marginBot: "15"
 					},
 					labelStyle: {
 						paddingLeft: "7",
@@ -1050,7 +1050,7 @@ export default [
 				config: {},
 				styles: {
 					divStyle: {
-						marginBot: "10"
+						marginBot: "15"
 					},
 					labelStyle: {
 						paddingLeft: "7",
@@ -1070,7 +1070,7 @@ export default [
 				config: {},
 				styles: {
 					divStyle: {
-						marginBot: "10"
+						marginBot: "15"
 					},
 					labelStyle: {
 						paddingLeft: "7",
@@ -1090,7 +1090,7 @@ export default [
 				config: {},
 				styles: {
 					divStyle: {
-						marginBot: "10"
+						marginBot: "15"
 					},
 					labelStyle: {
 						paddingLeft: "7",
@@ -1110,7 +1110,7 @@ export default [
 				config: {},
 				styles: {
 					divStyle: {
-						marginBot: "10"
+						marginBot: "15"
 					},
 					labelStyle: {
 						paddingLeft: "7",
@@ -1130,7 +1130,7 @@ export default [
 				config: {},
 				styles: {
 					divStyle: {
-						marginBot: "10"
+						marginBot: "15"
 					},
 					labelStyle: {
 						paddingLeft: "7",
diff --git a/src/components/DesignForm/dragControlApp.vue b/src/components/DesignForm/dragControlApp.vue
index 2987072..7720709 100644
--- a/src/components/DesignForm/dragControlApp.vue
+++ b/src/components/DesignForm/dragControlApp.vue
@@ -157,8 +157,9 @@ const clone = (origin: any) => {
 	
 }
 .fontIcon{
+	height: 35px;
 	i{
-		padding: 4px 0px 0 0px;
+		padding: 3px 0px 0 0px;
 	}
 }
 </style>
diff --git a/src/components/DesignForm/public/expand/datePicker.vue b/src/components/DesignForm/public/expand/datePicker.vue
new file mode 100644
index 0000000..dbf3ec6
--- /dev/null
+++ b/src/components/DesignForm/public/expand/datePicker.vue
@@ -0,0 +1,43 @@
+<!--
+@ 作者: 秦东
+@ 时间: 2024-09-25 15:01:57
+@ 备注: 时间控件
+-->
+<script lang='ts' setup>
+const props = withDefaults(
+    defineProps<{
+		modelValue?: string
+		disabled?: boolean
+		data?:any
+    }>(),
+    {}
+)
+const emits = defineEmits<{
+    (e: 'update:modelValue', value: string): void
+}>()
+const value = computed({
+	get: () => {
+		return props.modelValue
+	},
+	set: (newVal: any) => {
+		emits('update:modelValue', newVal)
+	},
+});
+</script>
+<template>
+	<el-date-picker
+		align="left"
+		v-model="value"
+		:type="props.data.control.type"
+		range-separator="-"
+		start-placeholder="开始日期"
+		end-placeholder="结束日期"
+		:teleported="true"
+		:placeholder="props.data.control.placeholder"
+		:value-format="props.data.valueFormat"
+		:format="props.data.control.format"
+    />
+
+</template>
+<style  lang='scss' scoped>
+</style>
diff --git a/src/components/DesignForm/public/expand/orgCitys.vue b/src/components/DesignForm/public/expand/orgCitys.vue
new file mode 100644
index 0000000..428b0f5
--- /dev/null
+++ b/src/components/DesignForm/public/expand/orgCitys.vue
@@ -0,0 +1,320 @@
+<!--
+@ 作者: 秦东
+@ 时间: 2024-09-25 09:18:33
+@ 备注: 联系地址
+-->
+<script lang='ts' setup>
+import { AnalysisCss,AnalysisInputCss } from '@/components/DesignForm/public/form/calculate/cssInfo.ts'
+import { 
+	constControlChange,
+    constFormProps,
+} from '@/api/DesignForm/utils'
+import validate from '@/api/DesignForm/validate'
+import { FormItem, FormList } from '@/api/DesignForm/types'
+import Tooltips from '@/components/DesignForm/tooltip.vue'
+
+import areaObj from '@/widget/orgcitys/pca.json'
+
+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 control = computed(() => {
+    return props.data.control || {}
+	// return props.data
+})
+const config = computed(() => {
+    return props.data.config || {}
+})
+const changeEvent = inject(constControlChange, '') as any
+const value = computed({
+	get: () => {
+		return props.modelValue
+	},
+	set: (newVal: any) => {
+		emits('update:modelValue', newVal)
+	},
+});
+// 控制编辑模式下是否可用
+const editDisabled = computed(() => {
+    if (type.value === 3) {
+      	return true // 查看模式，为不可编辑状态
+    }
+    if (type.value === 1 && config.value.addDisabled) {
+      	return true
+    }
+    if (type.value === 2 && config.value.editDisabled) {
+      	return true // 编辑模式
+    }
+    return control.value.disabled
+})
+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
+}
+const addressBox = ref(false)
+// 省
+const provinceArr = Object.keys(areaObj)
+const province = ref(provinceArr[0])
+// 市
+const cityArr = computed(() => {
+  return Object.keys(areaObj[province.value])
+})
+const city = ref(cityArr.value[0])
+// 监听省份变化
+watch(province, (newVal) => {
+  city.value = Object.keys(areaObj[newVal])[0];
+
+  if(value.value != "" && value.value != null){
+        let ads = value.value.split(" - ")
+        if(ads.length >=2){
+            city.value = ads[1]
+        }else{
+            city.value = Object.keys(areaObj[newVal])[0];
+        }
+    }else{
+        city.value = Object.keys(areaObj[newVal])[0];
+    }
+});
+// 区
+const areaArr = computed(() => {
+  return areaObj[province.value][city.value]
+})
+const area = ref(areaArr.value[0])
+// 监听市变化
+watch(city, (newVal) => {
+    
+    if(value.value != "" && value.value != null){
+        let ads = value.value.split(" - ")
+        if(ads.length >=3){
+            area.value = ads[2]
+        }else{
+            area.value = areaObj[province.value][newVal][0]
+        }
+    }else{
+        area.value = areaObj[province.value][newVal][0]
+    }
+
+})
+const fullAddress = ref<string>("")
+//打开地址选择弹窗
+const openAddress = () =>{
+    if(value.value != "" && value.value != null){
+        let ads = value.value.split(" - ")
+        // console.log(ads)
+        if(ads.length >= 4){
+            province.value = ads[0]
+            fullAddress.value = ads[3]
+        }else if(ads.length >0){
+            province.value = ads[0]
+        }
+    }else{
+        province.value = provinceArr[0]
+        city.value = cityArr.value[0]
+        area.value = areaArr.value[0]
+        fullAddress.value = ""
+    }
+    addressBox.value=true
+}
+//关闭地址选择弹窗
+const addressBoxClose = () => {
+    addressBox.value=false
+    initAddressData()
+}
+//确定选择地址
+const submitAddress = () => {
+    // console.log(province.value,city.value,area.value,fullAddress.value)
+    if(province.value == "" || province.value == null){
+        ElMessage.error('未选择省份！')
+        return
+    }
+    if(city.value == "" || city.value == null){
+        ElMessage.error('未选择市/区！')
+        return
+    }
+    if(area.value == "" || area.value == null){
+        ElMessage.error('未选择县/市！')
+        return
+    }
+    if(fullAddress.value == "" || fullAddress.value == null){
+        ElMessage.error('未填写详细信息！')
+        return
+    }
+    value.value = province.value + " - " + city.value + " - " + area.value + " - " + fullAddress.value
+	console.log(province.value + " - " + city.value + " - " + area.value + " - " + fullAddress.value)
+	console.log(value.value)
+    addressBoxClose()
+}
+const initAddressData = () =>{
+    province.value = provinceArr[0]
+    fullAddress.value = ""
+}
+const configStyle = computed(() => {
+    return props.data.styles || {}
+})
+const getFormItemInputStyle = (ele: any,sty:number) => {
+    if(ele?.inputStyle){
+      //console.log("返回栅格宽度4",AnalysisInputCss(ele?.inputStyle,sty))
+      return AnalysisInputCss(ele?.inputStyle,sty)
+    }
+}
+</script>
+<template>
+	
+		<div  v-if="type === 4"  class="form-value" v-html="value"></div>
+		<el-input v-else  v-model="value" :disabled="editDisabled" clearable placeholder="请选择地址" style="width:100%" @click="openAddress" :style="getFormItemInputStyle(configStyle,2)" :input-style="getFormItemInputStyle(configStyle,3)" />
+
+		<el-dialog
+			v-model="addressBox"
+			title="填写地址"
+			width="600px"
+			:append-to-body="true"
+			:draggable="true"
+			:before-close="addressBoxClose"
+		>
+			<el-row>
+				<el-col :span="3">所在地区：</el-col>
+				<el-col :span="21">
+					<el-row :gutter="20">
+						<el-col :span="8">
+							<el-select v-model="province" class="m-2" placeholder="省">
+								<el-option v-for="item in provinceArr" :key="item" :label="item" :value="item" />
+							</el-select>
+						</el-col>
+						<el-col :span="8">
+							<el-select v-model="city" class="m-2" placeholder="市">
+								<el-option v-for="item in cityArr" :key="item" :label="item" :value="item" />
+							</el-select>
+						</el-col>
+						<el-col :span="8">
+							<el-select v-model="area" class="m-2" placeholder="区/县">
+								<el-option v-for="item in areaArr" :key="item" :label="item" :value="item" />
+							</el-select>
+						</el-col>
+
+					</el-row>
+				</el-col>
+			</el-row>
+			<el-row>
+				<el-col :span="3">详细地址：</el-col>
+				<el-col :span="21">
+					<el-input
+						v-model="fullAddress"
+						:autosize="{ minRows: 2, maxRows: 4 }"
+						type="textarea"
+						placeholder="请输入详细地址"
+						style="width:100%"
+					/>
+				</el-col>
+			</el-row>
+
+			<template #footer>
+				<span class="dialog-footer">
+					<el-button @click="addressBoxClose">取消</el-button>
+					<el-button type="primary" @click="submitAddress">确定</el-button>
+				</span>
+			</template>
+
+
+		</el-dialog>
+	
+</template>
+<style  lang='scss' scoped>
+
+</style>
diff --git a/src/components/DesignForm/public/form/childTable.vue b/src/components/DesignForm/public/form/childTable.vue
index 44a9587..c4b8abd 100644
--- a/src/components/DesignForm/public/form/childTable.vue
+++ b/src/components/DesignForm/public/form/childTable.vue
@@ -197,7 +197,7 @@ const timeToString = (timeVal:any,types:int) => {
 				:width="item.item.span"
 			>
 				<template #default="scope">
-				
+
 					<span v-if="item.type === 'index'">{{ scope.$index + 1 }}</span>
 					<div v-if="type === 4 || editDisabled">
 						<LokOrgCentent  v-if="item.type == 'orgCentent'" :orgid="scope.row[item.name].toString()" />
diff --git a/src/components/DesignForm/public/form/formItem.vue b/src/components/DesignForm/public/form/formItem.vue
index c50d50f..8410b08 100644
--- a/src/components/DesignForm/public/form/formItem.vue
+++ b/src/components/DesignForm/public/form/formItem.vue
@@ -34,6 +34,8 @@ import DigitpagePage from '@/components/DesignForm/public/expand/digitpage.vue'
 import LowcodeImagePage from '@/components/DesignForm/public/expand/lowcodeImage.vue'
 import UploadPage from '@/components/DesignForm/public/expand/uploadPage.vue'
 import UploadPageList from '@/components/DesignForm/public/expand/uploadPageList.vue'
+import OrgCitys from '@/components/DesignForm/public/expand/orgCitys.vue'
+import DatePickerPage from '@/components/DesignForm/public/expand/datePicker.vue'
 
 
 
@@ -190,9 +192,15 @@ const currentComponent = computed(() => {
     }
 	if (props.data.type === 'upload') {
       	return markRaw(UploadPage)
+    }
+	if (props.data.type === 'organization') {
+      	return markRaw(OrgCitys)
     }
 	if (props.data.type === 'datePicker') {
 		props.data.control.valueFormat="x"
+		// props.data.control.align="right"
+		// props.data.control.appendToBody =true
+		return markRaw(DatePickerPage)
 	}
 	if (props.data.type === 'switch') {
 		if(typeof props.data.control.activeValue === "number"){
@@ -929,14 +937,14 @@ const uploadPic = (val:any) => {
 
 				
 				
-	<OrgCitys v-else-if="judgeIsShow(data.name) && data.type === 'organization' " :data="data" />
+				
 				<UrlLink v-else-if="judgeIsShow(data.name) && data.type === 'urllink' && type != 4" :data="data" />
 
 	
 
 	<el-form-item
 		v-bind="data.item"
-		v-if="judgeIsShow(data.name) && data.type != 'owner' && data.type != 'baidumap'   && data.type != 'serialNumber' && data.type != 'founder' && data.type != 'founderTime' && data.type != 'editTime' && data.type != 'associatedForms' && data.type != 'videoUpAndPlay' && data.type != 'organization' && data.type != 'lowcodeTransfer' && data.type != 'lowcodeCarsusel' && data.type != 'signaturemap' && data.type != 'signaturemap' && data.type != 'urllink'"
+		v-if="judgeIsShow(data.name) && data.type != 'owner' && data.type != 'baidumap'   && data.type != 'serialNumber' && data.type != 'founder' && data.type != 'founderTime' && data.type != 'editTime' && data.type != 'associatedForms' && data.type != 'videoUpAndPlay'  && data.type != 'lowcodeTransfer' && data.type != 'lowcodeCarsusel' && data.type != 'signaturemap' && data.type != 'signaturemap' && data.type != 'urllink'"
 		:disabled="judgeIsDisabled(data.name)"
 		:prop="tProp || data.name"
 		:class="config.className"
@@ -1101,6 +1109,18 @@ const uploadPic = (val:any) => {
 				:transformOption="transformOption"
 				:placeholder="data.control.placeholder?data.control.placeholder:'请选择'+getLabel(data.item)"
 			/>
+			<component
+				v-if="['organization'].includes(data.type)"
+				:is="currentComponent"
+				:data="data"
+				v-bind="control"
+				:control="control"
+				:config="config"
+				:name="control.file || 'file'"
+				:disabled="judgeIsDisabled(data.name)"
+				:options="options"
+				v-model="value"
+			/>
 			<component
 				v-if="['upload'].includes(data.type)"
 				:is="currentComponent"
@@ -1125,6 +1145,22 @@ const uploadPic = (val:any) => {
 				
 			/>
 			<el-time-picker v-if="data.type=='timePicker'" v-model="value" value-format="x" :placeholder="data.control.placeholder?data.control.placeholder:'请选择'+getLabel(data.item)" />
+
+			<component
+				v-if="
+				[
+				'datePicker'
+				].includes(data.type)
+				"
+				:is="currentComponent"
+				v-bind="control"
+				:disabled="judgeIsDisabled(data.name)"
+				:data="data" 
+				:placeholder="data.control.placeholder?data.control.placeholder:'请选择'+getLabel(data.item)"
+				v-model="value"
+			/>
+
+
 			<component
 				v-if="
 				[
@@ -1133,8 +1169,6 @@ const uploadPic = (val:any) => {
 					'switch',
 					'inputNumber',
 					'colorPicker',
-					
-					'datePicker',
 					'component',
 					'expand-user',
 					'orgCentent',
diff --git a/src/components/DesignForm/public/headToolsApp.vue b/src/components/DesignForm/public/headToolsApp.vue
index b01f390..826236c 100644
--- a/src/components/DesignForm/public/headToolsApp.vue
+++ b/src/components/DesignForm/public/headToolsApp.vue
@@ -62,7 +62,7 @@ const btnClick = (type: string) => {
 					v-if="(item.icon != 'branch') || (item.icon == 'branch' && (props.customerformid !=''))"
 					@click="btnClick(item.icon)"
 					:key="item.icon"
-					:type="item.key==6?'danger':item.key==5?'success':item.key==4?'warning':'primary'"
+					:type="item.key==6?'danger':item.key==5?'success':item.key==4?'warning':''"
 				>
 					<i v-if="item.iconFont==''" :class="['icon-' + item.icon]" ></i><i v-if="item.iconFont!=''" :class="['fa ' + item.iconFont]" ></i>{{ item.label }}
 				</el-button>
diff --git a/src/views/sysworkflow/codepage/page.vue b/src/views/sysworkflow/codepage/page.vue
index b5733af..1d8fb5c 100644
--- a/src/views/sysworkflow/codepage/page.vue
+++ b/src/views/sysworkflow/codepage/page.vue
@@ -48,8 +48,73 @@ function sendMessage() {
 
 import Editor from "@/components/WangEditor/index.vue";
 const value = ref("初始内容");
+
+const tableData = [
+  {
+    date: '2016-05-03',
+    name: 'Tom',
+    address: 'No. 189, Grove St, Los Angeles',
+  },
+  {
+    date: '2016-05-02',
+    name: 'Tom',
+    address: 'No. 189, Grove St, Los Angeles',
+  },
+  {
+    date: '2016-05-04',
+    name: 'Tom',
+    address: 'No. 189, Grove St, Los Angeles',
+  },
+  {
+    date: '2016-05-01',
+    name: 'Tom',
+    address: 'No. 189, Grove St, Los Angeles',
+  },
+]
+
+const dialogVisible = ref(false)
+
+const handleClose = (done: () => void) => {
+  ElMessageBox.confirm('Are you sure to close this dialog?')
+    .then(() => {
+      done()
+    })
+    .catch(() => {
+      // catch error
+    })
+}
 </script>
 <template>
+
+<el-table :data="tableData" border style="width: 100%">
+    <el-table-column prop="date" label="Date" width="180" />
+    <el-table-column prop="name" label="Name" width="180" />
+    <el-table-column prop="address" label="Address" />
+	<el-table-column >
+		<el-button plain @click="dialogVisible = true">
+			Click to open the Dialog
+		</el-button>
+
+		<el-dialog
+			v-model="dialogVisible"
+			title="Tips"
+			width="500"
+			:before-close="handleClose"
+		>
+			<span>This is a message</span>
+			<template #footer>
+			<div class="dialog-footer">
+				<el-button @click="dialogVisible = false">Cancel</el-button>
+				<el-button type="primary" @click="dialogVisible = false">
+				Confirm
+				</el-button>
+			</div>
+			</template>
+		</el-dialog>
+
+	</el-table-column>
+  </el-table>
+
 	<div>
 		<input v-model="message" placeholder="输入消息" />
     	<button @click="sendMessage">发送</button>
diff --git a/src/widget/orgcitys/index.vue b/src/widget/orgcitys/index.vue
index 50385ba..5184f08 100644
--- a/src/widget/orgcitys/index.vue
+++ b/src/widget/orgcitys/index.vue
@@ -275,6 +275,7 @@ const initAddressData = () =>{
         v-model="addressBox"
         title="填写地址"
         width="600px"
+		:modal="false"
         :before-close="addressBoxClose"
     >
         <el-row>

From da8d9bc9b3080709334e17ea566654b2580ae660 Mon Sep 17 00:00:00 2001
From: herenshan112 <herenshan112@163.com>
Date: Sun, 29 Sep 2024 08:07:17 +0800
Subject: [PATCH 12/14] =?UTF-8?q?=E5=A4=84=E7=90=86=E7=BA=A7=E8=81=94?=
 =?UTF-8?q?=E6=8E=A7=E4=BB=B6=E6=95=B0=E6=8D=AE=E7=BB=93=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/DesignForm/type.ts                    |   8 +
 src/components/DesignForm/aceDrawer.vue       | 197 +++++++++++++-
 src/components/DesignForm/aceDrawerPage.vue   |  92 +++++++
 src/components/DesignForm/aceDrawerTree.vue   | 254 ++++++++++++++++++
 .../DesignForm/public/form/formItem.vue       |   2 +-
 .../appPage/appPageForm/pageForm.vue          |  29 +-
 6 files changed, 574 insertions(+), 8 deletions(-)
 create mode 100644 src/components/DesignForm/aceDrawerPage.vue
 create mode 100644 src/components/DesignForm/aceDrawerTree.vue

diff --git a/src/api/DesignForm/type.ts b/src/api/DesignForm/type.ts
index bdd04e8..46bc2f0 100644
--- a/src/api/DesignForm/type.ts
+++ b/src/api/DesignForm/type.ts
@@ -220,3 +220,11 @@ export interface optionsInfo {
 	label: string;
 	value: string;
 }
+
+
+//定义树形结构体
+export interface treeStruct {
+	value: string
+	label?: string
+	children?: treeStruct[]
+}
diff --git a/src/components/DesignForm/aceDrawer.vue b/src/components/DesignForm/aceDrawer.vue
index e221b85..f2db0a3 100644
--- a/src/components/DesignForm/aceDrawer.vue
+++ b/src/components/DesignForm/aceDrawer.vue
@@ -5,10 +5,12 @@
 -->
 <script lang='ts' setup>
 import { ref, nextTick, watch, onMounted, onUnmounted } from 'vue'
-import { aceEdit } from '@/api/DesignForm/utils'
+import { aceEdit } from '@/api/DesignForm/utils'  
+import { treeStruct } from '@/api/DesignForm/type' 
 
 const props = withDefaults(
     defineProps<{
+		data?:object
 		modelValue: boolean
 		// eslint-disable-next-line vue/require-default-prop
 		title?: string
@@ -17,6 +19,7 @@ const props = withDefaults(
 		id?: string
 		// eslint-disable-next-line vue/require-default-prop
 		codeType?: string
+		data?: object
     }>(),
     {
 		id: 'editJson',
@@ -24,13 +27,35 @@ const props = withDefaults(
 		direction: 'ltr'
     }
 )
- const emits = defineEmits<{
+
+
+
+const emits = defineEmits<{
     (e: 'beforeClose'): void
     (e: 'confirm', content: string): void
+	(e: 'confirmTree', content: string): void
     (e: 'update:modelValue', val: boolean): void
 }>()
 const editor = ref<any>({})
- const visible = ref(false)
+const visible = ref(false)
+
+const treeSelectAry = reactive<treeStruct[]>([])			//树形数据
+const editTitleFormRef = ref(ElForm);	//编辑表单
+let jibuqi = 0				//计步器计算最大值
+const isTopHeader = ref(false) //是否为添加顶级树脂
+const guodu =  ref<treeStruct>({})		//数据中转使用
+const addIsShow = ref(false)			//添加数据	
+const treeSelectTitle = reactive<treeStruct>({
+	value: "1",
+	label: ""
+})	//编辑表格结构及数据
+const butLoad = ref(false)			//按钮状态
+/**
+ * 表单验证规则
+ */
+const editTitleRules = reactive({
+	label: [{ required: true, message: "请输入名称", trigger: "blur" }],	
+});
 watch(
     () => props.modelValue,
     (val: boolean) => {
@@ -60,6 +85,124 @@ onUnmounted(() => {
 		editor.value.container.remove()
     }
 })
+
+/**
+@ 作者: 秦东
+@ 时间: 2024-09-27 16:03:26
+@ 功能: 打开添加弹窗
+*/
+const pickAdd = (val:treeStruct) => {
+	guodu.value = val
+	isTopHeader.value = false
+	addIsShow.value = true
+}
+/**
+@ 作者: 秦东
+@ 时间: 2024-09-27 16:06:41
+@ 功能: 关闭弹窗
+*/
+const pickAddClose = () => {
+	guodu.value  = {}
+	treeSelectTitle.label = ""
+	addIsShow.value = false
+	butLoad.value = false
+	editTitleFormRef.value.resetFields();
+}
+/**
+@ 作者: 秦东
+@ 时间: 2024-09-27 16:09:53
+@ 功能: 添加顶级分类
+*/
+const addTopClass = () => {
+	isTopHeader.value = true
+	addIsShow.value = true
+}
+/**
+@ 作者: 秦东
+@ 时间: 2024-09-27 16:10:27
+@ 功能: 确定添加分类
+*/
+const pickIsTrue = () => {
+	butLoad.value = true
+	editTitleFormRef.value.validate((isValid: boolean) => {
+		if(isValid){
+			jibuqi++
+			if(isTopHeader.value){
+				treeSelectAry.push({
+					value: jibuqi,
+					label: treeSelectTitle.label,
+					children: []
+				})
+			}else{
+				if(guodu.value.children){
+					guodu.value.children.push({
+						value: jibuqi,
+						label: treeSelectTitle.label,
+						children: []
+					})
+				}else{
+					guodu.value.children=[
+						{
+							value: jibuqi,
+							label: treeSelectTitle.label,
+							children: []
+						}
+					]
+				}
+			}
+			
+			pickAddClose()
+		}else{
+			butLoad.value = false
+		}
+	})
+}
+/**
+@ 作者: 秦东
+@ 时间: 2024-09-27 08:38:35
+@ 功能: 回填主表值
+*/
+const dialogConfirmTree = () => {
+
+	let drawer = ({
+		visible: false,
+		type: '',
+		title: '',
+		codeType: '',
+		direction: undefined, //弹出方向rtl / ltr
+		callback: ''
+	})
+
+	emits('confirmTree', treeSelectAry)
+	drawerBeforeClose()
+}
+/**
+@ 作者: 秦东
+@ 时间: 2024-09-27 13:51:31
+@ 功能: 删除指定节点数据
+*/
+const pickDel = (val:treeStruct) => {
+	console.log("要删除得节点-->",val.value)
+	delDiGui(treeSelectAry,val)
+		console.log("删除指定节点数据---结果-->",treeSelectAry)
+}
+/**
+@ 作者: 秦东
+@ 时间: 2024-09-27 14:13:23
+@ 功能: 执行递归删除
+*/
+const delDiGui = (tree: treeStruct[],val:treeStruct) => {
+	for (let i = 0; i < tree.length; i++) {
+        const node = tree[i];
+        if (node.value == val.value) {
+            tree.splice(i, 1);
+            return;
+        }
+        if (Array.isArray(node.children) && node.children.length) {
+            return delDiGui(node.children, val);
+        }
+    }
+}
 </script>
 <template>
 	<el-drawer
@@ -74,12 +217,56 @@ onUnmounted(() => {
 		<template #header>
 			<div v-html="title"></div>
 		</template>
-		<div v-if="visible" :id="id"></div>
+		<div v-if="['cascader', 'treeSelect'].includes(props.data.type)">{{props.data}}
+			<el-table
+				:data="treeSelectAry"
+				row-key="value"
+				default-expand-all
+			>
+				<el-table-column prop="label" label="名称" />
+				<el-table-column  label="操作" width="200" align="center">
+					<template #header>
+						<el-button type="success" @click="addTopClass">添加顶级分类</el-button>
+					</template>
+					<template #default="scope">
+						<el-button-group>
+							<el-button text type="success" @click="pickAdd(scope.row)">添加</el-button>
+							<el-button text type="warning" @click="pick(scope.row)">修改</el-button>
+							<el-button text type="danger" @click="pickDel(scope.row)">删除</el-button>
+						</el-button-group>
+					</template>
+				</el-table-column>
+			</el-table>
+		</div>
+		<div  v-else :id="id"></div>
 		<div class="dialog-footer">
-			<el-button type="primary" size="small" @click="dialogConfirm">
+			<el-button v-if="['cascader', 'treeSelect'].includes(props.data.type)" type="primary" size="small" @click="dialogConfirmTree">
+				确定
+			</el-button>
+			<el-button v-else  type="primary" size="small" @click="dialogConfirm">
 				确定
 			</el-button>
 		</div>
+
+		<el-dialog
+			v-model="addIsShow"
+			title="编辑"
+			width="500"
+			:before-close="pickAddClose"
+		>
+			<el-form ref="editTitleFormRef" :rules="editTitleRules" :model="treeSelectTitle" label-width="auto" style="max-width: 600px">
+				<el-form-item label="名称：" prop="label">
+					<el-input v-model="treeSelectTitle.label" />
+				</el-form-item>
+			</el-form>
+			<template #footer>
+				<div class="dialog-footer">
+					<el-button @click="pickAddClose">取消</el-button>
+					<el-button v-loading="butLoad" type="primary" @click="pickIsTrue">确定</el-button>
+				</div>
+			</template>
+		</el-dialog>
+
 	</el-drawer>
 </template>
 <style  lang='scss' scoped>
diff --git a/src/components/DesignForm/aceDrawerPage.vue b/src/components/DesignForm/aceDrawerPage.vue
new file mode 100644
index 0000000..fc9d053
--- /dev/null
+++ b/src/components/DesignForm/aceDrawerPage.vue
@@ -0,0 +1,92 @@
+<!--
+@ 作者: 秦东
+@ 时间: 2023-07-19 08:39:34
+@ 备注: 抽屉
+-->
+<script lang='ts' setup>
+import { ref, nextTick, watch, onMounted, onUnmounted } from 'vue'
+import { aceEdit } from '@/api/DesignForm/utils'
+
+const props = withDefaults(
+    defineProps<{
+		data?:object
+		modelValue: boolean
+		// eslint-disable-next-line vue/require-default-prop
+		title?: string
+		direction?: 'rtl' | 'ltr'
+		content: string
+		id?: string
+		// eslint-disable-next-line vue/require-default-prop
+		codeType?: string
+    }>(),
+    {
+		id: 'editJson',
+		content: '',
+		direction: 'ltr'
+    }
+)
+ const emits = defineEmits<{
+    (e: 'beforeClose'): void
+    (e: 'confirm', content: string): void
+    (e: 'update:modelValue', val: boolean): void
+}>()
+const editor = ref<any>({})
+ const visible = ref(false)
+watch(
+    () => props.modelValue,
+    (val: boolean) => {
+		visible.value = val
+		if (val) {
+			initEditor()
+		}
+    }
+)
+const initEditor = () => {
+    nextTick(() => {
+      	editor.value = aceEdit(props.content, props.id, props.codeType)
+    })
+}
+const dialogConfirm = () => {
+    const editVal = editor.value.getValue()
+    emits('confirm', editVal)
+}
+const drawerBeforeClose = () => {
+    emits('update:modelValue', false)
+    emits('beforeClose')
+}
+onMounted(() => {})
+onUnmounted(() => {
+    if (Object.keys(editor.value).length !== 0) {
+		editor.value.destroy()
+		editor.value.container.remove()
+    }
+})
+</script>
+<template>
+	<el-drawer
+		v-model="visible"
+		size="60%"
+		:title="title"
+		:direction="direction as any"
+		class="ace-dialog"
+		:append-to-body="true"
+		:before-close="drawerBeforeClose"
+	>
+		<template #header>
+			<div v-html="title"></div>
+		</template>
+		<div>{{props.data}}</div>
+		<div v-if="visible" :id="id"></div>
+		<div class="dialog-footer">
+			<el-button type="primary" size="small" @click="dialogConfirm">
+				确定
+			</el-button>
+		</div>
+	</el-drawer>
+</template>
+<style  lang='scss' scoped>
+#editJson, #editJsonCopy {
+    width: 100%;
+    height: calc(100vh - 90px);
+}
+</style>
diff --git a/src/components/DesignForm/aceDrawerTree.vue b/src/components/DesignForm/aceDrawerTree.vue
new file mode 100644
index 0000000..eeb1fa2
--- /dev/null
+++ b/src/components/DesignForm/aceDrawerTree.vue
@@ -0,0 +1,254 @@
+<!--
+@ 作者: 秦东
+@ 时间: 2023-07-19 08:39:34
+@ 备注: 抽屉
+-->
+<script lang='ts' setup>
+import { ref, nextTick, watch, onMounted, onUnmounted } from 'vue'
+import { aceEdit } from '@/api/DesignForm/utils'
+
+const props = withDefaults(
+    defineProps<{
+		modelValue: boolean
+		// eslint-disable-next-line vue/require-default-prop
+		title?: string
+		direction?: 'rtl' | 'ltr'
+		content: string
+		id?: string
+		// eslint-disable-next-line vue/require-default-prop
+		codeType?: string
+		data?: object
+    }>(),
+    {
+		id: 'editJson',
+		content: '',
+		direction: 'ltr'
+    }
+)
+
+interface treeStruct {
+	value: string
+	label?: string
+	children?: treeStruct[]
+}
+
+const emits = defineEmits<{
+    (e: 'beforeClose'): void
+    (e: 'confirm', content: string): void
+    (e: 'update:modelValue', val: boolean): void
+}>()
+const editor = ref<any>({})
+const visible = ref(false)
+
+const treeSelectAry = reactive<treeStruct[]>([])
+const editTitleFormRef = ref(ElForm);	//编辑表单
+watch(
+    () => props.modelValue,
+    (val: boolean) => {
+		visible.value = val
+		if (val) {
+			initEditor()
+		}
+    }
+)
+const initEditor = () => {
+    nextTick(() => {
+      	editor.value = aceEdit(props.content, props.id, props.codeType)
+    })
+}
+const dialogConfirm = () => {
+    const editVal = editor.value.getValue()
+    emits('confirm', editVal)
+}
+const drawerBeforeClose = () => {
+    emits('update:modelValue', false)
+    emits('beforeClose')
+}
+onMounted(() => {})
+onUnmounted(() => {
+    if (Object.keys(editor.value).length !== 0) {
+		editor.value.destroy()
+		editor.value.container.remove()
+    }
+})
+let jibuqi = 0
+const isTopHeader = ref(false)
+const guodu =  ref<treeStruct>({})
+const addIsShow = ref(false)
+const pickAdd = (val:treeStruct) => {
+	guodu.value = val
+	isTopHeader.value = false
+	addIsShow.value = true
+}
+const pickAddClose = () => {
+	guodu.value  = {}
+	treeSelectTitle.label = ""
+	addIsShow.value = false
+	butLoad.value = false
+	editTitleFormRef.value.resetFields();
+}
+//添加顶级分类
+const addTopClass = () => {
+	isTopHeader.value = true
+	addIsShow.value = true
+}
+//确认添加
+const treeSelectTitle = reactive<treeStruct>({
+	value: "1",
+	label: ""
+})
+const butLoad = ref(false)
+const pickIsTrue = () => {
+	butLoad.value = true
+	editTitleFormRef.value.validate((isValid: boolean) => {
+		if(isValid){
+			jibuqi++
+			if(isTopHeader.value){
+				treeSelectAry.push({
+					value: jibuqi,
+					label: treeSelectTitle.label,
+					children: []
+				})
+			}else{
+				if(guodu.value.children){
+					guodu.value.children.push({
+						value: jibuqi,
+						label: treeSelectTitle.label,
+						children: []
+					})
+				}else{
+					guodu.value.children=[
+						{
+							value: jibuqi,
+							label: treeSelectTitle.label,
+							children: []
+						}
+					]
+				}
+			}
+			
+			pickAddClose()
+		}else{
+			butLoad.value = false
+		}
+	})
+}
+/**
+@ 作者: 秦东
+@ 时间: 2024-09-27 08:38:35
+@ 功能: 设定值
+*/
+const dialogConfirmTree = () => {
+	emits('confirm', treeSelectAry)
+	drawerBeforeClose()
+}
+/**
+ * 表单验证规则
+ */
+const editTitleRules = reactive({
+	label: [{ required: true, message: "请输入名称", trigger: "blur" }],	
+});
+/**
+@ 作者: 秦东
+@ 时间: 2024-09-27 13:51:31
+@ 功能: 删除指定节点数据
+*/
+const pickDel = (val:treeStruct) => {
+	console.log("要删除得节点-->",val.value)
+	delDiGui(treeSelectAry,val)
+		console.log("删除指定节点数据---结果-->",treeSelectAry)
+}
+/**
+@ 作者: 秦东
+@ 时间: 2024-09-27 14:13:23
+@ 功能: 执行递归删除
+*/
+const delDiGui = (tree: treeStruct[],val:treeStruct) => {
+	for (let i = 0; i < tree.length; i++) {
+        const node = tree[i];
+        if (node.value == val.value) {
+            tree.splice(i, 1);
+            return;
+        }
+        if (Array.isArray(node.children) && node.children.length) {
+            return delDiGui(node.children, val);
+        }
+    }
+}
+</script>
+<template>
+	<el-drawer
+		v-model="visible"
+		size="60%"
+		:title="title"
+		:direction="direction as any"
+		class="ace-dialog"
+		:append-to-body="true"
+		:before-close="drawerBeforeClose"
+	>
+		<template #header>
+			<div v-html="title"></div>
+		</template>
+		<div v-if="['cascader', 'treeSelect'].includes(props.data.type)">{{props.data}}
+		
+			<el-table
+				:data="treeSelectAry"
+				row-key="value"
+				default-expand-all
+			>
+				<el-table-column prop="label" label="名称" />
+				<el-table-column  label="操作" width="200" align="center">
+					<template #header>
+						<el-button type="success" @click="addTopClass">添加顶级分类</el-button>
+					</template>
+					<template #default="scope">
+						<el-button-group>
+							<el-button text type="success" @click="pickAdd(scope.row)">添加</el-button>
+							<el-button text type="warning" @click="pick(scope.row)">修改</el-button>
+							<el-button text type="danger" @click="pickDel(scope.row)">删除</el-button>
+						</el-button-group>
+					</template>
+				</el-table-column>
+			</el-table>
+		
+		</div>
+		<div v-else :id="id"></div>
+		<div class="dialog-footer">
+			<el-button v-if="['cascader', 'treeSelect'].includes(props.data.type)" type="primary" size="small" @click="dialogConfirmTree">
+				确定
+			</el-button>
+			<el-button v-else type="primary" size="small" @click="dialogConfirm">
+				确定
+			</el-button>
+		</div>
+		<el-dialog
+			v-model="addIsShow"
+			title="编辑"
+			width="500"
+			:before-close="pickAddClose"
+		>
+			<el-form ref="editTitleFormRef" :rules="editTitleRules" :model="treeSelectTitle" label-width="auto" style="max-width: 600px">
+				<el-form-item label="名称：" prop="label">
+					<el-input v-model="treeSelectTitle.label" />
+				</el-form-item>
+			</el-form>
+			<template #footer>
+				<div class="dialog-footer">
+					<el-button @click="pickAddClose">取消</el-button>
+					<el-button v-loading="butLoad" type="primary" @click="pickIsTrue">确定</el-button>
+				</div>
+			</template>
+		</el-dialog>
+	</el-drawer>
+
+	
+
+
+
+</template>
+<style  lang='scss' scoped>
+#editJson, #editJsonCopy {
+    width: 100%;
+    height: calc(100vh - 90px);
+}
+</style>
diff --git a/src/components/DesignForm/public/form/formItem.vue b/src/components/DesignForm/public/form/formItem.vue
index 8410b08..fe52431 100644
--- a/src/components/DesignForm/public/form/formItem.vue
+++ b/src/components/DesignForm/public/form/formItem.vue
@@ -1133,7 +1133,7 @@ const uploadPic = (val:any) => {
 				:options="options"
 				v-model="value"
 			/>
-			
+			{{data}}
 			<component
 				v-if="['cascader', 'treeSelect'].includes(data.type)"
 				:is="currentComponent"
diff --git a/src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageForm.vue b/src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageForm.vue
index 9b82202..52bc4a3 100644
--- a/src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageForm.vue
+++ b/src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageForm.vue
@@ -10,13 +10,14 @@ import { json2string,objToStringify,string2json,stringToObj } from '@/utils/Desi
 import { customerFormVersionCont } from '@/api/DesignForm/type'
 import { FormData,formStruct,DrawerStruct, VideoMsg } from '@/api/DesignForm/types'
 import { saveProductionForm,getOneProductionForm,haveCustomerFormVersion,editCustomerFormInfo,saveAsNewVersion,enableVersion,judgeSubmitCancel,createAppForm,editAppPageInfo,saveOtherVersion,previewAppFormVersion } from '@/api/DesignForm/requestapi'
-
+import { treeStruct } from '@/api/DesignForm/type' 
 
 //引入页面
 import DragControlApp from '@/components/DesignForm/dragControlApp.vue';
 import HeadToolsApp from '@/components/DesignForm/public/headToolsApp.vue';
 import FormDesign from '@/components/DesignForm/public/form/form.vue'
 import PreviewPage from '@/views/sysworkflow/lowcodepage/appPage/appPageForm/previewPage.vue'
+import AceDrawerPage from '@/components/DesignForm/aceDrawerPage.vue'
 
 const props = defineProps({
 	appCont:{
@@ -547,12 +548,17 @@ function optionsValue3Get3(data: any,fieldName: string){
 // 弹窗确认
 const dialogConfirm = (editVal: string) => {
     // 生成脚本预览和导入json，都是将编辑器内容更新至state.formData
+	console.log("生成脚本预览和导入",editVal)
+	console.log("生成脚本预览和导入----->",drawer.type,"==========",drawer.callback,"==========",drawer)
+	console.log("生成脚本预览和导入===========>",state.value.formData)
+	
     try {
       	if (typeof drawer.callback === 'function') {
 			// callback
 			const newObj =
 			drawer.codeType === 'json'? string2json(editVal): stringToObj(editVal)
 			drawer.callback(newObj)
+			console.log("1==============>",)
       	} else {
 			switch (drawer.type) {
 				case 'css':
@@ -561,6 +567,7 @@ const dialogConfirm = (editVal: string) => {
 						state.value.formData.config = {}
 					}
 					state.value.formData.config.style = editVal
+					console.log("2==============>",)
 					break
 				case 'dict':
 					state.value.formDict = string2json(editVal)
@@ -575,17 +582,32 @@ const dialogConfirm = (editVal: string) => {
 						state.value.formData.events = {}
 					}
 					state.value.formData.events[drawer.type] = stringToObj(editVal)
+					console.log("3==============>",)
 					break
 				default:
 					state.value.formData = stringToObj(editVal)
+					console.log("4==============>",)
 			}
       	}
       	dialogCancel()
     } catch (res) {
 		// console.log(res.message)
-		//ElMessage.error(res.message)
+		ElMessage.error(res.message)
     }
 }
+/**
+@ 作者: 秦东
+@ 时间: 2024-09-27 16:53:30
+@ 功能: 级联选择与树
+*/
+const dialogConfirmTree = (val:treeStruct[]) => {
+	console.log("级联选择与树",val)
+	const newObj =
+			drawer.codeType === 'json'? string2json(val): stringToObj(val)
+			drawer.callback(newObj)
+
+	console.log("级联选择与树--->",state.value.formData)
+}
 </script>
 <template>
 	<el-aside class="asideBox leftBox">
@@ -633,14 +655,17 @@ const dialogConfirm = (editVal: string) => {
 			@form-name-change="formNameChanged"
 		/>
 	</el-aside>
+	
 	<ace-drawer
 		v-model="drawer.visible"
 		:title="drawer.title"
 		:direction="drawer.direction"
 		:content="drawer.content"
 		:code-type="drawer.codeType"
+		:data="drawer"
 		@before-close="dialogCancel"
 		@confirm="dialogConfirm"
+		@confirmTree="dialogConfirmTree"
 	/>
 	<PreviewPage v-model:state="state"   @clickClose="closePreviewPage" />
 </template>

From c9f11663f25ea3ac2e5891d7ade94dd502f21eee Mon Sep 17 00:00:00 2001
From: herenshan112 <herenshan112@163.com>
Date: Mon, 30 Sep 2024 09:34:07 +0800
Subject: [PATCH 13/14] =?UTF-8?q?=E5=AE=8C=E6=88=90=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/DesignForm/aceDrawer.vue       | 94 ++++++++++++++++---
 .../DesignForm/formControlPropertiNew.vue     |  2 +-
 .../DesignForm/public/expand/cascader.vue     | 47 ++++++++++
 .../DesignForm/public/form/formItem.vue       | 22 ++++-
 .../appPage/appPageForm/pageForm.vue          | 27 ++++--
 5 files changed, 169 insertions(+), 23 deletions(-)
 create mode 100644 src/components/DesignForm/public/expand/cascader.vue

diff --git a/src/components/DesignForm/aceDrawer.vue b/src/components/DesignForm/aceDrawer.vue
index f2db0a3..6eb6e27 100644
--- a/src/components/DesignForm/aceDrawer.vue
+++ b/src/components/DesignForm/aceDrawer.vue
@@ -41,6 +41,7 @@ const visible = ref(false)
 
 const treeSelectAry = reactive<treeStruct[]>([])			//树形数据
 const editTitleFormRef = ref(ElForm);	//编辑表单
+const editTitleInfoRef = ref(ElForm);
 let jibuqi = 0				//计步器计算最大值
 const isTopHeader = ref(false) //是否为添加顶级树脂
 const guodu =  ref<treeStruct>({})		//数据中转使用
@@ -77,6 +78,7 @@ const dialogConfirm = () => {
 const drawerBeforeClose = () => {
     emits('update:modelValue', false)
     emits('beforeClose')
+	treeSelectAry=[]
 }
 onMounted(() => {})
 onUnmounted(() => {
@@ -164,15 +166,24 @@ const pickIsTrue = () => {
 */
 const dialogConfirmTree = () => {
 
-	let drawer = ({
-		visible: false,
-		type: '',
-		title: '',
-		codeType: '',
-		direction: undefined, //弹出方向rtl / ltr
-		callback: ''
-	})
-
+	// let drawer = ({
+	// 	visible: false,
+	// 	type: '',
+	// 	title: '',
+	// 	codeType: '',
+	// 	direction: undefined, //弹出方向rtl / ltr
+	// 	callback: ''
+	// })
+	// let opt = new Array
+	// treeSelectAry.forEach((item:treeStruct) => {
+	// 	opt.push({
+	// 		value: item.value,
+	// 		label: item.label,
+	// 		children: item.children
+	// 	})
+	// })
+	
+	// emits('confirm', treeSelectAry)
 	emits('confirmTree', treeSelectAry)
 	drawerBeforeClose()
 }
@@ -203,6 +214,46 @@ const delDiGui = (tree: treeStruct[],val:treeStruct) => {
         }
     }
 }
+const edisIsShow = ref(false)
+const butLoadEdit = ref(false)
+/**
+@ 作者: 秦东
+@ 时间: 2024-09-29 13:29:17
+@ 功能: 编辑级联舒体
+*/
+const pickEdis = (val:treeStruct) => {
+	guodu.value  = val
+	treeSelectTitle.label = val.label
+	edisIsShow.value = true
+}
+/**
+@ 作者: 秦东
+@ 时间: 2024-09-29 13:33:51
+@ 功能: 关闭编辑窗体
+*/
+const pickEditClose = () => {
+	guodu.value  = {}
+	treeSelectTitle.label = ""
+	edisIsShow.value = false
+	butLoadEdit.value = false
+	editTitleInfoRef.value.resetFields();
+}
+/**
+@ 作者: 秦东
+@ 时间: 2024-09-29 13:36:30
+@ 功能: 确定修改
+*/
+const pickEditIsTrue = () => {
+	butLoadEdit.value = true
+	editTitleInfoRef.value.validate((isValid: boolean) => {
+		if(isValid){
+			guodu.value.label   = treeSelectTitle.label
+			pickEditClose()
+		}else{
+			butLoad.value = false
+		}
+	})
+}
 </script>
 <template>
 	<el-drawer
@@ -217,7 +268,7 @@ const delDiGui = (tree: treeStruct[],val:treeStruct) => {
 		<template #header>
 			<div v-html="title"></div>
 		</template>
-		<div v-if="['cascader', 'treeSelect'].includes(props.data.type)">{{props.data}}
+		<div v-if="['cascader', 'treeSelect'].includes(props.data.type)">
 			<el-table
 				:data="treeSelectAry"
 				row-key="value"
@@ -231,7 +282,7 @@ const delDiGui = (tree: treeStruct[],val:treeStruct) => {
 					<template #default="scope">
 						<el-button-group>
 							<el-button text type="success" @click="pickAdd(scope.row)">添加</el-button>
-							<el-button text type="warning" @click="pick(scope.row)">修改</el-button>
+							<el-button text type="warning" @click="pickEdis(scope.row)">修改</el-button>
 							<el-button text type="danger" @click="pickDel(scope.row)">删除</el-button>
 						</el-button-group>
 					</template>
@@ -267,6 +318,27 @@ const delDiGui = (tree: treeStruct[],val:treeStruct) => {
 			</template>
 		</el-dialog>
 
+
+
+		<el-dialog
+			v-model="edisIsShow"
+			title="编辑"
+			width="500"
+			:before-close="pickEditClose"
+		>
+			<el-form ref="editTitleInfoRef" :rules="editTitleRules" :model="treeSelectTitle" label-width="auto" style="max-width: 600px">
+				<el-form-item label="名称：" prop="label">
+					<el-input v-model="treeSelectTitle.label" />
+				</el-form-item>
+			</el-form>
+			<template #footer>
+				<div class="dialog-footer">
+					<el-button @click="pickEditClose">取消</el-button>
+					<el-button v-loading="butLoadEdit" type="primary" @click="pickEditIsTrue">确定</el-button>
+				</div>
+			</template>
+		</el-dialog>
+
 	</el-drawer>
 </template>
 <style  lang='scss' scoped>
diff --git a/src/components/DesignForm/formControlPropertiNew.vue b/src/components/DesignForm/formControlPropertiNew.vue
index 7eebb6f..3662bd1 100644
--- a/src/components/DesignForm/formControlPropertiNew.vue
+++ b/src/components/DesignForm/formControlPropertiNew.vue
@@ -1834,7 +1834,7 @@ const showImagePreview = ref(false)
             }
         }
         // console.log(resDataForGlxxszExceptself1)
-        if(getAssociatedFormsCurrentFieldTreeData.treeAttrs!=undefined){
+        if(getAssociatedFormsCurrentFieldTreeData && getAssociatedFormsCurrentFieldTreeData.treeAttrs && getAssociatedFormsCurrentFieldTreeData.treeAttrs!=undefined){
             associatedFormsCurrentFormFieldTreeForGlxxszExceptSelf.value = [{
                 id: 'rootid_'+getAssociatedFormsCurrentFieldTreeData.label,
                 //label: '当前表单',
diff --git a/src/components/DesignForm/public/expand/cascader.vue b/src/components/DesignForm/public/expand/cascader.vue
new file mode 100644
index 0000000..e1d6b4c
--- /dev/null
+++ b/src/components/DesignForm/public/expand/cascader.vue
@@ -0,0 +1,47 @@
+<!--
+@ 作者: 秦东
+@ 时间: 2024-09-29 13:46:55
+@ 备注: 级联器
+-->
+<script lang='ts' setup>
+const props = withDefaults(
+    defineProps<{
+		modelValue?: string
+		disabled?: boolean
+		action?: string
+		name?: string
+		fileList?: Object
+		control?: Object
+		config?: Object
+		data?: Object
+		options?: Object
+    }>(),
+    {}
+)
+const emits = defineEmits<{
+    (e: 'update:modelValue', value: string): void
+}>()
+const value = computed({
+	get: () => {
+		console.log("图片上传处理-112->",props.modelValue)
+		return props.modelValue
+	},
+	set: (newVal: any) => {
+		emits('update:modelValue', newVal)
+		return newVal
+	},
+});
+const handleChange = () => {
+
+}
+</script>
+<template>
+	<el-cascader
+      v-model="value"
+      :options="props.options"
+      @change="handleChange"
+    />
+</template>
+<style  lang='scss' scoped>
+
+</style>
diff --git a/src/components/DesignForm/public/form/formItem.vue b/src/components/DesignForm/public/form/formItem.vue
index fe52431..e1a90e8 100644
--- a/src/components/DesignForm/public/form/formItem.vue
+++ b/src/components/DesignForm/public/form/formItem.vue
@@ -36,6 +36,7 @@ import UploadPage from '@/components/DesignForm/public/expand/uploadPage.vue'
 import UploadPageList from '@/components/DesignForm/public/expand/uploadPageList.vue'
 import OrgCitys from '@/components/DesignForm/public/expand/orgCitys.vue'
 import DatePickerPage from '@/components/DesignForm/public/expand/datePicker.vue'
+import CascaderPage from '@/components/DesignForm/public/expand/cascader.vue'
 
 
 
@@ -199,9 +200,12 @@ const currentComponent = computed(() => {
 	if (props.data.type === 'datePicker') {
 		props.data.control.valueFormat="x"
 		// props.data.control.align="right"
-		// props.data.control.appendToBody =true
+		// props.data.control.appendToBody =true   
 		return markRaw(DatePickerPage)
 	}
+	if(props.data.type === 'cascader'){
+		return markRaw(CascaderPage)
+	}
 	if (props.data.type === 'switch') {
 		if(typeof props.data.control.activeValue === "number"){
 			props.data.control.activeValue=props.data.control.activeValue.toString()
@@ -1133,12 +1137,24 @@ const uploadPic = (val:any) => {
 				:options="options"
 				v-model="value"
 			/>
-			{{data}}
+
 			<component
-				v-if="['cascader', 'treeSelect'].includes(data.type)"
+				v-if="['cascader'].includes(data.type)"
 				:is="currentComponent"
 				v-bind="control"
+				:data="data"
+				:control="control"
+				:config="config"
+				:disabled="judgeIsDisabled(data.name)"
+				:options="options"
+				v-model="value"
 				
+			/>
+			
+			<component
+				v-if="['treeSelect'].includes(data.type)"
+				:is="currentComponent"
+				v-bind="control"
 				:disabled="judgeIsDisabled(data.name)"
 				:options="options"
 				v-model="value"
diff --git a/src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageForm.vue b/src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageForm.vue
index 52bc4a3..e3e0881 100644
--- a/src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageForm.vue
+++ b/src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageForm.vue
@@ -105,7 +105,15 @@ const route: any = useRoute().query || {}
 const versionCont = ref<customerFormVersionCont[]>([])			//版本内容列表
 const tableKey = ref("")
 const versionId = ref<string>("")		//版本号
-const store = useDesignFormStore()
+// const store = useDesignFormStore()
+const store = useDesignFormStore() as any
+
+const controlData = computed(() => {
+        // console.log("注册自定义事件----------------->",props.formInfo)
+        // console.log("注册自定义事件--------1--------->",store.controlAttr)
+		// console.log("注册自定义事件---------3-------->",controlData.value.customRules)
+        return store.controlAttr
+})
 const drawer = reactive<DrawerStruct>({
     visible: false,
     type: '',
@@ -545,7 +553,7 @@ function optionsValue3Get3(data: any,fieldName: string){
 	}
 }
 
-// 弹窗确认
+// 弹窗确认3174.15    2924.57     3326.15   3119.33
 const dialogConfirm = (editVal: string) => {
     // 生成脚本预览和导入json，都是将编辑器内容更新至state.formData
 	console.log("生成脚本预览和导入",editVal)
@@ -554,6 +562,7 @@ const dialogConfirm = (editVal: string) => {
 	
     try {
       	if (typeof drawer.callback === 'function') {
+			console.log("1======2========>",drawer.codeType,stringToObj(editVal))
 			// callback
 			const newObj =
 			drawer.codeType === 'json'? string2json(editVal): stringToObj(editVal)
@@ -601,13 +610,15 @@ const dialogConfirm = (editVal: string) => {
 @ 功能: 级联选择与树
 */
 const dialogConfirmTree = (val:treeStruct[]) => {
-	console.log("级联选择与树",val)
-	const newObj =
-			drawer.codeType === 'json'? string2json(val): stringToObj(val)
-			drawer.callback(newObj)
-
-	console.log("级联选择与树--->",state.value.formData)
+	// console.log("级联选择与树",val)
+	// const newObj =
+	// 		drawer.codeType === 'json'? string2json(val): stringToObj(val)
+	// 		drawer.callback(newObj)
+			controlData.value.options = val
+	// console.log("级联选择与树--->",controlData)
 }
+
+
 </script>
 <template>
 	<el-aside class="asideBox leftBox">

From f246518f3f5117ac6534a152d6323aec365ee4c9 Mon Sep 17 00:00:00 2001
From: herenshan112 <herenshan112@163.com>
Date: Mon, 30 Sep 2024 14:35:33 +0800
Subject: [PATCH 14/14] =?UTF-8?q?=E6=81=A2=E5=A4=8D=E6=9D=8E=E6=96=87?=
 =?UTF-8?q?=E8=BD=A9=E5=9B=BE=E7=89=87=E6=8E=A7=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/DesignForm/public/form/formItem.vue |  6 +++++-
 src/widget/lowcodeimage/lowcodeImage.vue           | 14 +++++++-------
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/components/DesignForm/public/form/formItem.vue b/src/components/DesignForm/public/form/formItem.vue
index e1a90e8..5373310 100644
--- a/src/components/DesignForm/public/form/formItem.vue
+++ b/src/components/DesignForm/public/form/formItem.vue
@@ -31,7 +31,11 @@ import OrgCentent from '@/components/DesignForm/public/expand/org.vue'
 import LokOrgCentent from '@/widget/org/cont.vue' 
 
 import DigitpagePage from '@/components/DesignForm/public/expand/digitpage.vue'
-import LowcodeImagePage from '@/components/DesignForm/public/expand/lowcodeImage.vue'
+// import LowcodeImagePage from '@/components/DesignForm/public/expand/lowcodeImage.vue'
+
+import LowcodeImagePage from '@/widget/lowcodeimage/index.vue'
+
+
 import UploadPage from '@/components/DesignForm/public/expand/uploadPage.vue'
 import UploadPageList from '@/components/DesignForm/public/expand/uploadPageList.vue'
 import OrgCitys from '@/components/DesignForm/public/expand/orgCitys.vue'
diff --git a/src/widget/lowcodeimage/lowcodeImage.vue b/src/widget/lowcodeimage/lowcodeImage.vue
index 843f5a8..d80e37b 100644
--- a/src/widget/lowcodeimage/lowcodeImage.vue
+++ b/src/widget/lowcodeimage/lowcodeImage.vue
@@ -36,6 +36,7 @@ let styleObject = reactive({
 
 const emits = defineEmits(["update:imgUrl","updateCont"]);
 
+// const url = ref(errimg)
 const url = ref(props.data?.control.imgUrl?props.data?.control.imgUrl:props.imgUrl)
 if(props.data?.control.imgUrl===''){
   url.value = errimg
@@ -93,8 +94,6 @@ watch(()=>props.data?.control, (val) => {
 		styleObject.width = widthPercent+'%';
 		styleObject.height = heightPercent+'%';
 	}
-},{
-  deep: true,
 })
 
 
@@ -207,8 +206,9 @@ watch(() =>props.imgUrl,(val)=>{
 </script>
 <template>
 	<div>
-<!-- <img v-if="url!=errimg" referrerpolicy="no-referrer" :src="url" :style="styleObject" :fit="fit" :class="[boderAndShadowClassIsActive ? boderAndShadowClass : '', radiusClassIsActive ? radiusClass : '',mp, floatFlag ? floatStyle : '']" @click="handleLink(props.data?.control)" /> -->
-	<el-upload
+<img v-if="url!=errimg" referrerpolicy="no-referrer" :src="url" :style="styleObject" :fit="fit" :class="[boderAndShadowClassIsActive ? boderAndShadowClass : '', radiusClassIsActive ? radiusClass : '',mp, floatFlag ? floatStyle : '']" @click="handleLink(props.data?.control)" />
+<img v-else referrerpolicy="no-referrer" :src="url" :style="styleObject" :fit="fit" :class="[boderAndShadowClassIsActive ? boderAndShadowClass : '', radiusClassIsActive ? radiusClass : '',mp, floatFlag ? floatStyle : '']" @click="handleLink(props.data?.control)" />
+	<!-- <el-upload
 		v-bind="$props"
     class="upload-demo"
     :action="uploadUrl"
@@ -217,9 +217,9 @@ watch(() =>props.imgUrl,(val)=>{
     :on-success="handleAvatarSuccess"
     :before-upload="beforeAvatarUpload"
   >
-    <!-- <img referrerpolicy="no-referrer" :src="url" :style="styleObject" :fit="fit" :class="[boderAndShadowClassIsActive ? boderAndShadowClass : '', radiusClassIsActive ? radiusClass : '',mp, floatFlag ? floatStyle : '']"  /> -->
-		<img referrerpolicy="no-referrer" :src="url" :style="styleObject" :fit="fit" :class="[boderAndShadowClassIsActive ? boderAndShadowClass : '', radiusClassIsActive ? radiusClass : '',mp, floatFlag ? floatStyle : '']" />
-  </el-upload>
+    <img referrerpolicy="no-referrer" :src="url" :style="styleObject" :fit="fit" :class="[boderAndShadowClassIsActive ? boderAndShadowClass : '', radiusClassIsActive ? radiusClass : '',mp, floatFlag ? floatStyle : '']"  />
+		<img referrerpolicy="no-referrer" :src="url" :style="styleObject" :fit="fit" :class="[boderAndShadowClassIsActive ? boderAndShadowClass : '', radiusClassIsActive ? radiusClass : '',mp, floatFlag ? floatStyle : '']" /> 
+  </el-upload> -->
 </div>
 </template>