Merge branch 'master' into lwx_v27

src/components/DesignForm/assembly/pageSetup.ts

@@ -0,0 +1,106 @@
+//内容呈现页设计
+export default [
+    {
+        type: 'grid',
+        label: '格栅布局',
+		unitName: '格栅布局',
+        icon: 'grid',
+        columns: [
+            // 格栅列数据
+			{
+				attr: { span: 12 },
+				list: []
+			},
+			{
+				attr: { span: 12 },
+				list: []
+			}
+		],
+        config: {},
+        styles: {
+			divStyle: {
+			},
+			labelStyle: {
+			},
+			inputStyle: {}
+		}
+    },
+    {
+		type: 'div',
+		label: '容器',
+		unitName: '容器',
+		icon: 'div',
+		iconFont: '',
+		control: {},
+		config: {},
+		list: [],
+		styles: {
+			divStyle: {
+			},
+			labelStyle: {
+			},
+			inputStyle: {}
+		}
+	},
+	{
+		type: 'tabs',
+		label: '标签页',
+		unitName: '标签页',
+		icon: 'tabs',
+		iconFont: 'fa-folder-o',
+		columns: [
+			{
+				label: 'Tab1',
+				unitName: '',
+				list: []
+			}
+		],
+		control: {},
+		config: {},
+		styles: {
+			divStyle: {
+				marginBot: "15"
+			},
+			labelStyle: {
+				paddingLeft: "7",
+			},
+			inputStyle: {}
+		}
+	},
+	{
+		type: 'divider',
+		label: '分割线',
+		unitName: '分割线',
+		icon: 'divider',
+		iconFont: '',
+		control: {},
+		config: {},
+		styles: {
+			divStyle: {
+				marginBot: "15"
+			},
+			labelStyle: {
+				paddingLeft: "7",
+			},
+			inputStyle: {}
+		}
+	},
+	{
+		type: 'commentRemark',
+		label: '评论套件',
+		unitName: '评论套件',
+		icon: 'commentRemark',
+		iconFont: '',
+		control: {},
+		config: {},
+		styles: {
+			divStyle: {
+				marginBot: "15"
+			},
+			labelStyle: {
+				paddingLeft: "7",
+			},
+			inputStyle: {}
+		}
+	},
+]

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

@@ -0,0 +1,57 @@
+<!--
+@ 作者: 秦东
+@ 时间: 2025-09-17 14:48:36
+@ 备注: 内容呈现模板
+-->
+<script lang='ts' setup>
+
+</script>
+<template>
+    <div class="contBox">
+        <div class="contBoxLeft">
+            <div class="contBox title">
+                <el-text>布局组件</el-text>
+                <el-text>版本</el-text>
+            </div>
+
+        </div>
+        <div class="contBoxBody">2</div>
+        <div class="contBoxRight">
+            <div class="contBox title">
+                <el-text>布局样式</el-text>
+                <el-text></el-text>
+            </div>
+        </div>
+    </div>
+</template>
+<style  lang='scss' scoped>
+.contBox{                                                                
+    width: 100%;
+    display: flex;
+
+    justify-content: space-between;
+    .contBoxLeft{
+        width: 200px;
+        height: calc(100vh - 40px);
+        border-right: 1px solid #4e4e4e;
+        overflow-y: auto;
+        overflow: hidden;
+        .title{
+            padding: 5px 5px;
+        }
+    }
+    .contBoxRight{
+        width: 200px;
+        height: calc(100vh - 40px);
+        border-left: 1px solid #4e4e4e;
+        overflow-y: auto;
+        overflow: hidden;
+        .title{
+            padding: 5px 5px;
+        }
+    }
+    .contBoxBody{
+        width: calc(100vh - 400px);;
+    }
+}
+</style>

src/views/sysworkflow/lowcodepage/appPage/appPageForm/echatesUnit/right.vue

@@ -637,6 +637,9 @@ onMounted(()=>{
 .echartsRight {
   width: 100%;
   padding: 0px 10px;
+  overflow: hidden;
+  overflow-y: auto;
+  height: 100%;
   :deep .el-tabs__content{
     padding: 10px 2px 0  2px;
   }

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

@@ -877,7 +877,7 @@ const clearData = () => {
   tableAttrBut.value!.clearSelection();
   state.searchData = [];
   // state.tableData.controlBtn = []
-  // state.tableData.columns = []
+  state.tableData.columns = []
   state.tableData.operateBtn = [];
   state.tableData.config = {};
   if (formTableField.masterTable) {

src/views/sysworkflow/lowcodepage/appPage/createAppFormPage.vue

@@ -15,6 +15,7 @@ import PageList from "@/views/sysworkflow/lowcodepage/appPage/appPageForm/pageLi
 import PrintSetupPage from "@/views/sysworkflow/lowcodepage/appPage/appPageForm/printSetupPage.vue";
 import AiPage from "@/views/sysworkflow/lowcodepage/appPage/appPageForm/aiPage.vue";
 import DataBpard from "@/views/sysworkflow/lowcodepage/appPage/appPageForm/dataBoard.vue";
+import ContentPresentation from "@/views/sysworkflow/lowcodepage/appPage/appPageForm/contentPresentation.vue";
 
 const props = defineProps({
   appCont: {
@@ -226,6 +227,7 @@ onBeforeMount(() => {
               <el-tab-pane label="③ 列表设计" :name="3"> </el-tab-pane>
               <el-tab-pane label="④ 数据看板" :name="4"> </el-tab-pane>
               <el-tab-pane label="⑤ 打印设计" :name="5"> </el-tab-pane>
+              <el-tab-pane label="⑥ 内容呈现设计" :name="6"> </el-tab-pane>
             </el-tabs>
           </div>
           <div class="headRight">
@@ -287,6 +289,9 @@ onBeforeMount(() => {
             v-model:app-page-key="appPageKey"
             v-model:form-version="formVersion"
           />
+          <ContentPresentation 
+            v-if="tabsActive == 6"
+          />
         </el-container>
       </el-container>
     </div>
@@ -318,7 +323,9 @@ onBeforeMount(() => {
     ::v-deep .el-tabs__nav-scroll {
       margin: 0 auto !important;
     }
-
+    :deep .el-tabs__item{
+      padding: 0 5px;
+    }
     ::v-deep .el-drawer__body {
       padding: 0;
     }