Merge branch 'qin_v5'

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"

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;

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">

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"

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