From 32be0902ed6a849ade14eedb3d605d5c1feea454 Mon Sep 17 00:00:00 2001
From: hreenshan112 <hreenshan112@noreply.gitcode.com>
Date: Mon, 21 Oct 2024 08:52:26 +0800
Subject: [PATCH] 1

---
 src/components/DesignForm/assembly/index.ts   | 281 +++++++++---------
 .../DesignForm/formControlPropertiNew.vue     |   1 +
 2 files changed, 142 insertions(+), 140 deletions(-)

diff --git a/src/components/DesignForm/assembly/index.ts b/src/components/DesignForm/assembly/index.ts
index 9487aec..e8f14e8 100644
--- a/src/components/DesignForm/assembly/index.ts
+++ b/src/components/DesignForm/assembly/index.ts
@@ -17,6 +17,146 @@ const config: { optionsType: number } = {
 	optionsType: 0 // 0固定 1数据源 2 接口字典 3系统表单字段
 }
 export default [
+	{
+		title: '布局字段',
+		children: [
+			{
+				type: 'grid',
+				label: '格栅布局',
+				unitName: '格栅布局',
+				icon: 'grid',
+				iconFont: 'fa-th-large',
+				columns: [
+					// 格栅列数据
+					{
+						attr: { span: 12 },
+						list: []
+					},
+					{
+						attr: { span: 12 },
+						list: []
+					}
+				],
+				control: {},
+				config: {},
+				styles: {
+					divStyle: {
+						// marginBot: "15"
+					},
+					labelStyle: {
+						// paddingLeft: "7",
+					},
+					inputStyle: {}
+				}
+			},
+			{
+				type: 'card',
+				label: '卡片布局',
+				unitName: '卡片布局',
+				icon: 'card',
+				iconFont: 'fa-credit-card',
+				list: [],
+				control: {},
+				config: {},
+				item: {}, // label标题相关
+				styles: {
+					divStyle: {
+						// marginBot: "15"
+					},
+					labelStyle: {
+						// paddingLeft: "7",
+					},
+					inputStyle: {}
+				}
+			},
+			{
+				type: 'flex',
+				label: '弹性布局',
+				unitName: '弹性布局',
+				icon: 'flex',
+				iconFont: 'fa-file-text-o',
+				list: [],
+				tableData: [], // 值集合
+				control: {},
+				config: {
+					addBtnText: '添加一行'
+				},
+				styles: {
+					divStyle: {
+						// marginBot: "15"
+					},
+					labelStyle: {
+						// paddingLeft: "7",
+					},
+					inputStyle: {}
+				}
+			},
+			{
+				type: 'div',
+				label: '容器',
+				unitName: '容器',
+				icon: 'div',
+				iconFont: '',
+				control: {},
+				config: {},
+				list: [],
+				styles: {
+					divStyle: {
+						// marginBot: "15"
+					},
+					labelStyle: {
+						// paddingLeft: "7",
+					},
+					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: {}
+				}
+			},
+
+		]
+	},
 	{
 		title: '基础字段',
 		children: [
@@ -391,146 +531,7 @@ export default [
 
 		]
 	},
-	{
-		title: '布局字段',
-		children: [
-			{
-				type: 'grid',
-				label: '格栅布局',
-				unitName: '格栅布局',
-				icon: 'grid',
-				iconFont: 'fa-th-large',
-				columns: [
-					// 格栅列数据
-					{
-						attr: { span: 12 },
-						list: []
-					},
-					{
-						attr: { span: 12 },
-						list: []
-					}
-				],
-				control: {},
-				config: {},
-				styles: {
-					divStyle: {
-						marginBot: "15"
-					},
-					labelStyle: {
-						paddingLeft: "7",
-					},
-					inputStyle: {}
-				}
-			},
-			{
-				type: 'card',
-				label: '卡片布局',
-				unitName: '卡片布局',
-				icon: 'card',
-				iconFont: 'fa-credit-card',
-				list: [],
-				control: {},
-				config: {},
-				item: {}, // label标题相关
-				styles: {
-					divStyle: {
-						marginBot: "15"
-					},
-					labelStyle: {
-						paddingLeft: "7",
-					},
-					inputStyle: {}
-				}
-			},
-			{
-				type: 'flex',
-				label: '弹性布局',
-				unitName: '弹性布局',
-				icon: 'flex',
-				iconFont: 'fa-file-text-o',
-				list: [],
-				tableData: [], // 值集合
-				control: {},
-				config: {
-					addBtnText: '添加一行'
-				},
-				styles: {
-					divStyle: {
-						marginBot: "15"
-					},
-					labelStyle: {
-						paddingLeft: "7",
-					},
-					inputStyle: {}
-				}
-			},
-			{
-				type: 'div',
-				label: '容器',
-				unitName: '容器',
-				icon: 'div',
-				iconFont: '',
-				control: {},
-				config: {},
-				list: [],
-				styles: {
-					divStyle: {
-						marginBot: "15"
-					},
-					labelStyle: {
-						paddingLeft: "7",
-					},
-					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: {}
-				}
-			},
-
-		]
-	},
+	
 
 	{
 		title: '高级控件',
diff --git a/src/components/DesignForm/formControlPropertiNew.vue b/src/components/DesignForm/formControlPropertiNew.vue
index 84eabfb..75f1891 100644
--- a/src/components/DesignForm/formControlPropertiNew.vue
+++ b/src/components/DesignForm/formControlPropertiNew.vue
@@ -3096,6 +3096,7 @@ function optionsTypeChanged(){
     @ 功能: 判断是否是组件
     */
     const cssIsShouw = (val:any) => {
+		console.log("判断是否是组件",val)
         if(val.length && val.length > 0){
             return true;
         }