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)=>{