Merge remote-tracking branch 'origin/qin_25'

src/components/DesignForm/app/cardPage.vue

@@ -88,9 +88,10 @@ const cardInfoBox = computed(() => {
 })
 const pageSize = ref(props.searchSend.pagesize)
 onMounted(()=>{
-	if(pageSize.value <= 30){
-		pageSize.value = 30
+	if(pageSize.value <= 21){
+		pageSize.value = 21
 	}
+	props.searchSend.pagesize = pageSize.value 
 	lineRanks.value = Math.round(24/props.viewSetup.form.ranks)
 	nextTick(()=>{
 		getCardList(props.searchSend)
@@ -143,9 +144,9 @@ const getCardList = (val:any) => {
 			cardDataList.value = data.list
 		})
 }
-defineExpose({
-	getCardList
-})
+// defineExpose({
+// 	getCardList
+// })
 
 /**
 @ 作者: 秦东
@@ -219,7 +220,7 @@ const cardInfo = (val:any,cla:string) => {
 			return val[props.viewSetup.form.titleWork]
 		}
 	}else if(cla=="content"){
-console.log("判断是否有标题---->",props.columnsFilter)
+// console.log("判断是否有标题---->",props.columnsFilter)
 
 		if(props.viewSetup.form.describe){
 			var titleAry = [];

src/views/sysworkflow/lowcodepage/appPage/appPageForm/openAppFormPage.vue

@@ -640,7 +640,7 @@ defineExpose({
   }
 }
 .suojing {
-  height: calc(100vh - 190px);
+  height: calc(100vh - 135px);
 }
 .demo-image__error {
   margin-top: 15px;