Merge remote-tracking branch 'origin/qin_25'

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/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;
   }