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] =?UTF-8?q?=E5=A4=84=E7=90=86=E5=88=97=E8=A1=A8=E5=9B=9E?=
 =?UTF-8?q?=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)=>{