From 2cf20e72063c4eefa78af094ef88db4ce914fddb Mon Sep 17 00:00:00 2001
From: hoteas <deng1993624>
Date: Thu, 6 Apr 2023 11:37:03 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=95=B0=E6=8D=AE=E5=BA=93mu?=
 =?UTF-8?q?st=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 code/makecode.go            |   26 +-
 example/config/adminDB.json | 1054 +++++++++++++++++++----------------
 2 files changed, 587 insertions(+), 493 deletions(-)

diff --git a/code/makecode.go b/code/makecode.go
index fd3d2af..98e8168 100644
--- a/code/makecode.go
+++ b/code/makecode.go
@@ -116,7 +116,7 @@ func (that *MakeCode) Db2JSON(db *db.HoTimeDB, config Map) {
 		nowTables = db.Select("INFORMATION_SCHEMA.TABLES", "TABLE_NAME as name,TABLE_COMMENT as label", Map{"TABLE_SCHEMA": db.DBName})
 	}
 	if db.Type == "sqlite" {
-		nowTables = db.Select("sqlite_sequence", "name")
+		nowTables = db.Select("sqlite_master", "name", Map{"type": "table"})
 	}
 	//idSlice=append(idSlice,nowTables)
 	for _, v := range nowTables {
@@ -158,7 +158,7 @@ func (that *MakeCode) Db2JSON(db *db.HoTimeDB, config Map) {
 
 		tableInfo := make([]Map, 0)
 		if db.Type == "mysql" {
-			tableInfo = db.Select("INFORMATION_SCHEMA.COLUMNS", "COLUMN_NAME AS name,COLUMN_TYPE AS type,COLUMN_COMMENT AS label", Map{"AND": Map{"TABLE_SCHEMA": db.DBName, "TABLE_NAME": v.GetString("name")}})
+			tableInfo = db.Select("INFORMATION_SCHEMA.COLUMNS", "COLUMN_NAME AS name,COLUMN_TYPE AS type,COLUMN_COMMENT AS label,IS_NULLABLE AS must,COLUMN_DEFAULT AS  dflt_value", Map{"AND": Map{"TABLE_SCHEMA": db.DBName, "TABLE_NAME": v.GetString("name")}})
 		}
 		if db.Type == "sqlite" {
 			tableInfo = db.Query("pragma table_info([" + v.GetString("name") + "]);")
@@ -189,6 +189,18 @@ func (that *MakeCode) Db2JSON(db *db.HoTimeDB, config Map) {
 					//"must": false,
 				}
 
+				if info.GetString("must") == "NO" {
+					coloum["must"] = true
+				}
+
+				if info["dflt_value"] != nil {
+					coloum["default"] = info["dflt_value"]
+				}
+
+				if info["pk"] != nil && info.GetCeilInt64("pk") == 1 {
+					coloum["must"] = true
+				}
+
 				//备注以空格隔开，空格后的是其他备注
 				indexNum := strings.Index(info.GetString("label"), " ")
 				if indexNum > -1 {
@@ -219,7 +231,15 @@ func (that *MakeCode) Db2JSON(db *db.HoTimeDB, config Map) {
 						coloum["edit"] = ColumnName.GetBool("edit")
 						coloum["add"] = ColumnName["add"]
 						coloum["list"] = ColumnName.GetBool("list")
-						coloum["must"] = ColumnName.GetBool("must")
+						//coloum["must"] = ColumnName.GetBool("must")
+
+						if coloum["must"] == nil {
+							coloum["must"] = ColumnName.GetBool("must")
+						} else {
+							if ColumnName["must"] != nil {
+								coloum["must"] = ColumnName.GetBool("must")
+							}
+						}
 
 						if ColumnName.GetBool("info") {
 							delete(coloum, "info")
diff --git a/example/config/adminDB.json b/example/config/adminDB.json
index 38a7512..3a92811 100644
--- a/example/config/adminDB.json
+++ b/example/config/adminDB.json
@@ -58,7 +58,7 @@
 			"table": "role"
 		}
 	},
-	"id": "74a8a59407fa7d6c7fcdc85742dbae57",
+	"id": "37a7189078e76283764336a7252d7412",
 	"label": "HoTime管理平台",
 	"labelConfig": {
 		"add": "添加",
@@ -69,6 +69,242 @@
 		"show": "开启"
 	},
 	"menus": [
+		{
+			"auth": [
+				"show"
+			],
+			"icon": "Setting",
+			"label": "ebw_annex",
+			"menus": [
+				{
+					"auth": [
+						"show",
+						"add",
+						"delete",
+						"edit",
+						"info",
+						"download"
+					],
+					"label": "ebw_annex",
+					"table": "ebw_annex"
+				},
+				{
+					"auth": [
+						"show",
+						"add",
+						"delete",
+						"edit",
+						"info",
+						"download"
+					],
+					"label": "ebw_customer",
+					"table": "ebw_customer"
+				},
+				{
+					"auth": [
+						"show",
+						"add",
+						"delete",
+						"edit",
+						"info",
+						"download"
+					],
+					"label": "ebw_user",
+					"table": "ebw_user"
+				},
+				{
+					"auth": [
+						"show",
+						"add",
+						"delete",
+						"edit",
+						"info",
+						"download"
+					],
+					"label": "ebw_vote_option",
+					"table": "ebw_vote_option"
+				},
+				{
+					"auth": [
+						"show",
+						"add",
+						"delete",
+						"edit",
+						"info",
+						"download"
+					],
+					"label": "ebw_news",
+					"table": "ebw_news"
+				},
+				{
+					"auth": [
+						"show",
+						"add",
+						"delete",
+						"edit",
+						"info",
+						"download"
+					],
+					"label": "ebw_news_addition_res",
+					"table": "ebw_news_addition_res"
+				},
+				{
+					"auth": [
+						"show",
+						"add",
+						"delete",
+						"edit",
+						"info",
+						"download"
+					],
+					"label": "ebw_res",
+					"table": "ebw_res"
+				},
+				{
+					"auth": [
+						"show",
+						"add",
+						"delete",
+						"edit",
+						"info",
+						"download"
+					],
+					"label": "ebw_vote",
+					"table": "ebw_vote"
+				},
+				{
+					"auth": [
+						"show",
+						"add",
+						"delete",
+						"edit",
+						"info",
+						"download"
+					],
+					"label": "ebw_attachment",
+					"table": "ebw_attachment"
+				},
+				{
+					"auth": [
+						"show",
+						"add",
+						"delete",
+						"edit",
+						"info",
+						"download"
+					],
+					"label": "ebw_vote_user",
+					"table": "ebw_vote_user"
+				},
+				{
+					"auth": [
+						"show",
+						"add",
+						"delete",
+						"edit",
+						"info",
+						"download"
+					],
+					"label": "ebw_items",
+					"table": "ebw_items"
+				},
+				{
+					"auth": [
+						"show",
+						"add",
+						"delete",
+						"edit",
+						"info",
+						"download"
+					],
+					"label": "ebw_jobs",
+					"table": "ebw_jobs"
+				}
+			],
+			"name": "sys:ebw"
+		},
+		{
+			"auth": [
+				"show"
+			],
+			"icon": "Setting",
+			"label": "关联专题",
+			"menus": [
+				{
+					"auth": [
+						"show",
+						"add",
+						"delete",
+						"edit",
+						"info",
+						"download"
+					],
+					"label": "关联专题",
+					"table": "swiper_point"
+				},
+				{
+					"auth": [
+						"show",
+						"add",
+						"delete",
+						"edit",
+						"info",
+						"download"
+					],
+					"label": "外部系统",
+					"table": "swiper_sys"
+				},
+				{
+					"auth": [
+						"show",
+						"add",
+						"delete",
+						"edit",
+						"info",
+						"download"
+					],
+					"label": "底部",
+					"table": "swiper_bottom"
+				},
+				{
+					"auth": [
+						"show",
+						"add",
+						"delete",
+						"edit",
+						"info",
+						"download"
+					],
+					"label": "飘窗",
+					"table": "swiper_fly"
+				},
+				{
+					"auth": [
+						"show",
+						"add",
+						"delete",
+						"edit",
+						"info",
+						"download"
+					],
+					"label": "顶部",
+					"table": "swiper_top"
+				},
+				{
+					"auth": [
+						"show",
+						"add",
+						"delete",
+						"edit",
+						"info",
+						"download"
+					],
+					"label": "中间",
+					"table": "swiper_center"
+				}
+			],
+			"name": "sys:swiper"
+		},
 		{
 			"auth": [
 				"show"
@@ -85,8 +321,20 @@
 						"info",
 						"download"
 					],
-					"label": "组织管理",
-					"table": "org"
+					"label": "人员管理",
+					"table": "admin"
+				},
+				{
+					"auth": [
+						"show",
+						"add",
+						"delete",
+						"edit",
+						"info",
+						"download"
+					],
+					"label": "文章管理",
+					"table": "article"
 				},
 				{
 					"auth": [
@@ -105,8 +353,8 @@
 						"info",
 						"download"
 					],
-					"label": "文章管理",
-					"table": "article"
+					"label": "组织管理",
+					"table": "org"
 				},
 				{
 					"auth": [
@@ -119,6 +367,28 @@
 					],
 					"label": "角色管理",
 					"table": "role"
+				}
+			],
+			"name": "sys"
+		},
+		{
+			"auth": [
+				"show"
+			],
+			"icon": "Setting",
+			"label": "党委书记信箱",
+			"menus": [
+				{
+					"auth": [
+						"show",
+						"add",
+						"delete",
+						"edit",
+						"info",
+						"download"
+					],
+					"label": "党委书记信箱",
+					"table": "mail_part"
 				},
 				{
 					"auth": [
@@ -129,11 +399,23 @@
 						"info",
 						"download"
 					],
-					"label": "人员管理",
-					"table": "admin"
+					"label": "纪委信箱",
+					"table": "mail_discipline"
+				},
+				{
+					"auth": [
+						"show",
+						"add",
+						"delete",
+						"edit",
+						"info",
+						"download"
+					],
+					"label": "总经理信箱",
+					"table": "mail"
 				}
 			],
-			"name": "sys"
+			"name": "sys:mail"
 		},
 		{
 			"auth": [
@@ -180,288 +462,6 @@
 				}
 			],
 			"name": "sys:ctg"
-		},
-		{
-			"auth": [
-				"show"
-			],
-			"icon": "Setting",
-			"label": "ebw_annex",
-			"menus": [
-				{
-					"auth": [
-						"show",
-						"add",
-						"delete",
-						"edit",
-						"info",
-						"download"
-					],
-					"label": "ebw_annex",
-					"table": "ebw_annex"
-				},
-				{
-					"auth": [
-						"show",
-						"add",
-						"delete",
-						"edit",
-						"info",
-						"download"
-					],
-					"label": "ebw_customer",
-					"table": "ebw_customer"
-				},
-				{
-					"auth": [
-						"show",
-						"add",
-						"delete",
-						"edit",
-						"info",
-						"download"
-					],
-					"label": "ebw_news_addition_res",
-					"table": "ebw_news_addition_res"
-				},
-				{
-					"auth": [
-						"show",
-						"add",
-						"delete",
-						"edit",
-						"info",
-						"download"
-					],
-					"label": "ebw_news",
-					"table": "ebw_news"
-				},
-				{
-					"auth": [
-						"show",
-						"add",
-						"delete",
-						"edit",
-						"info",
-						"download"
-					],
-					"label": "ebw_vote",
-					"table": "ebw_vote"
-				},
-				{
-					"auth": [
-						"show",
-						"add",
-						"delete",
-						"edit",
-						"info",
-						"download"
-					],
-					"label": "ebw_jobs",
-					"table": "ebw_jobs"
-				},
-				{
-					"auth": [
-						"show",
-						"add",
-						"delete",
-						"edit",
-						"info",
-						"download"
-					],
-					"label": "ebw_items",
-					"table": "ebw_items"
-				},
-				{
-					"auth": [
-						"show",
-						"add",
-						"delete",
-						"edit",
-						"info",
-						"download"
-					],
-					"label": "ebw_vote_option",
-					"table": "ebw_vote_option"
-				},
-				{
-					"auth": [
-						"show",
-						"add",
-						"delete",
-						"edit",
-						"info",
-						"download"
-					],
-					"label": "ebw_res",
-					"table": "ebw_res"
-				},
-				{
-					"auth": [
-						"show",
-						"add",
-						"delete",
-						"edit",
-						"info",
-						"download"
-					],
-					"label": "ebw_user",
-					"table": "ebw_user"
-				},
-				{
-					"auth": [
-						"show",
-						"add",
-						"delete",
-						"edit",
-						"info",
-						"download"
-					],
-					"label": "ebw_vote_user",
-					"table": "ebw_vote_user"
-				},
-				{
-					"auth": [
-						"show",
-						"add",
-						"delete",
-						"edit",
-						"info",
-						"download"
-					],
-					"label": "ebw_attachment",
-					"table": "ebw_attachment"
-				}
-			],
-			"name": "sys:ebw"
-		},
-		{
-			"auth": [
-				"show"
-			],
-			"icon": "Setting",
-			"label": "底部",
-			"menus": [
-				{
-					"auth": [
-						"show",
-						"add",
-						"delete",
-						"edit",
-						"info",
-						"download"
-					],
-					"label": "底部",
-					"table": "swiper_bottom"
-				},
-				{
-					"auth": [
-						"show",
-						"add",
-						"delete",
-						"edit",
-						"info",
-						"download"
-					],
-					"label": "中间",
-					"table": "swiper_center"
-				},
-				{
-					"auth": [
-						"show",
-						"add",
-						"delete",
-						"edit",
-						"info",
-						"download"
-					],
-					"label": "飘窗",
-					"table": "swiper_fly"
-				},
-				{
-					"auth": [
-						"show",
-						"add",
-						"delete",
-						"edit",
-						"info",
-						"download"
-					],
-					"label": "关联专题",
-					"table": "swiper_point"
-				},
-				{
-					"auth": [
-						"show",
-						"add",
-						"delete",
-						"edit",
-						"info",
-						"download"
-					],
-					"label": "外部系统",
-					"table": "swiper_sys"
-				},
-				{
-					"auth": [
-						"show",
-						"add",
-						"delete",
-						"edit",
-						"info",
-						"download"
-					],
-					"label": "顶部",
-					"table": "swiper_top"
-				}
-			],
-			"name": "sys:swiper"
-		},
-		{
-			"auth": [
-				"show"
-			],
-			"icon": "Setting",
-			"label": "总经理信箱",
-			"menus": [
-				{
-					"auth": [
-						"show",
-						"add",
-						"delete",
-						"edit",
-						"info",
-						"download"
-					],
-					"label": "总经理信箱",
-					"table": "mail"
-				},
-				{
-					"auth": [
-						"show",
-						"add",
-						"delete",
-						"edit",
-						"info",
-						"download"
-					],
-					"label": "党委书记信箱",
-					"table": "mail_part"
-				},
-				{
-					"auth": [
-						"show",
-						"add",
-						"delete",
-						"edit",
-						"info",
-						"download"
-					],
-					"label": "纪委信箱",
-					"table": "mail_discipline"
-				}
-			],
-			"name": "sys:mail"
 		}
 	],
 	"name": "admin",
@@ -499,6 +499,7 @@
 					"type": "text"
 				},
 				{
+					"default": "0",
 					"label": "状态",
 					"name": "state",
 					"options": [
@@ -569,21 +570,21 @@
 							"name": "无",
 							"value": null
 						},
-						{
-							"name": "手机号",
-							"value": "phone"
-						},
 						{
 							"name": "名称",
 							"value": "name"
 						},
 						{
-							"name": "职位",
-							"value": "title"
+							"name": "手机号",
+							"value": "phone"
 						},
 						{
 							"name": "ID",
 							"value": "id"
+						},
+						{
+							"name": "职位",
+							"value": "title"
 						}
 					],
 					"type": "search",
@@ -597,13 +598,13 @@
 							"name": "无",
 							"value": null
 						},
-						{
-							"name": "创建时间",
-							"value": "create_time"
-						},
 						{
 							"name": "变更时间",
 							"value": "modify_time"
+						},
+						{
+							"name": "创建时间",
+							"value": "create_time"
 						}
 					],
 					"type": "search",
@@ -628,6 +629,7 @@
 					"value": null
 				},
 				{
+					"default": "0",
 					"label": "状态",
 					"name": "state",
 					"options": [
@@ -678,6 +680,7 @@
 					"type": "text"
 				},
 				{
+					"default": "0",
 					"label": "优先级",
 					"list": false,
 					"name": "sort",
@@ -722,6 +725,7 @@
 					"type": "time"
 				},
 				{
+					"default": "0",
 					"label": "点击量",
 					"name": "click_num",
 					"sortable": true,
@@ -762,6 +766,7 @@
 					"type": "time"
 				},
 				{
+					"default": "0",
 					"label": "状态",
 					"name": "state",
 					"options": [
@@ -788,8 +793,8 @@
 							"value": null
 						},
 						{
-							"name": "正文",
-							"value": "content"
+							"name": "作者",
+							"value": "author"
 						},
 						{
 							"name": "来源",
@@ -799,6 +804,14 @@
 							"name": "描述",
 							"value": "description"
 						},
+						{
+							"name": "正文",
+							"value": "content"
+						},
+						{
+							"name": "编号",
+							"value": "sn"
+						},
 						{
 							"name": "id",
 							"value": "id"
@@ -806,14 +819,6 @@
 						{
 							"name": "标题",
 							"value": "title"
-						},
-						{
-							"name": "作者",
-							"value": "author"
-						},
-						{
-							"name": "编号",
-							"value": "sn"
 						}
 					],
 					"type": "search",
@@ -827,14 +832,14 @@
 							"name": "无",
 							"value": null
 						},
-						{
-							"name": "推送时间",
-							"value": "push_time"
-						},
 						{
 							"name": "变更时间",
 							"value": "modify_time"
 						},
+						{
+							"name": "推送时间",
+							"value": "push_time"
+						},
 						{
 							"name": "创建时间",
 							"value": "create_time"
@@ -862,6 +867,7 @@
 					"value": null
 				},
 				{
+					"default": "0",
 					"label": "状态",
 					"name": "state",
 					"options": [
@@ -922,6 +928,7 @@
 					"type": "text"
 				},
 				{
+					"default": "0",
 					"label": "优先级",
 					"list": false,
 					"name": "sort",
@@ -948,6 +955,7 @@
 					"value": "name"
 				},
 				{
+					"default": "0",
 					"label": "状态",
 					"name": "state",
 					"options": [
@@ -991,6 +999,7 @@
 				},
 				{
 					"add": false,
+					"default": ",",
 					"edit": false,
 					"info": false,
 					"label": "索引",
@@ -1026,10 +1035,6 @@
 							"name": "文章",
 							"value": "article_id"
 						},
-						{
-							"name": "源链接",
-							"value": "url"
-						},
 						{
 							"name": "ID",
 							"value": "id"
@@ -1037,6 +1042,10 @@
 						{
 							"name": "板块名称",
 							"value": "name"
+						},
+						{
+							"name": "源链接",
+							"value": "url"
 						}
 					],
 					"type": "search",
@@ -1081,6 +1090,7 @@
 					"value": null
 				},
 				{
+					"default": "0",
 					"label": "状态",
 					"name": "state",
 					"options": [
@@ -1171,6 +1181,7 @@
 					"type": "time"
 				},
 				{
+					"default": "0",
 					"label": "状态",
 					"name": "state",
 					"options": [
@@ -1259,6 +1270,7 @@
 					"value": null
 				},
 				{
+					"default": "0",
 					"label": "状态",
 					"name": "state",
 					"options": [
@@ -1319,6 +1331,7 @@
 					"type": "text"
 				},
 				{
+					"default": "0",
 					"label": "优先级",
 					"list": false,
 					"name": "sort",
@@ -1345,6 +1358,7 @@
 					"value": "name"
 				},
 				{
+					"default": "0",
 					"label": "状态",
 					"name": "state",
 					"options": [
@@ -1388,6 +1402,7 @@
 				},
 				{
 					"add": false,
+					"default": ",",
 					"edit": false,
 					"info": false,
 					"label": "索引",
@@ -1415,14 +1430,18 @@
 							"name": "无",
 							"value": null
 						},
-						{
-							"name": "编码",
-							"value": "sn"
-						},
 						{
 							"name": "ID",
 							"value": "id"
 						},
+						{
+							"name": "板块名称",
+							"value": "name"
+						},
+						{
+							"name": "编码",
+							"value": "sn"
+						},
 						{
 							"name": "源链接",
 							"value": "url"
@@ -1430,10 +1449,6 @@
 						{
 							"name": "文章",
 							"value": "article_id"
-						},
-						{
-							"name": "板块名称",
-							"value": "name"
 						}
 					],
 					"type": "search",
@@ -1447,13 +1462,13 @@
 							"name": "无",
 							"value": null
 						},
-						{
-							"name": "变更时间",
-							"value": "modify_time"
-						},
 						{
 							"name": "创建时间",
 							"value": "create_time"
+						},
+						{
+							"name": "变更时间",
+							"value": "modify_time"
 						}
 					],
 					"type": "search",
@@ -1478,6 +1493,7 @@
 					"value": null
 				},
 				{
+					"default": "0",
 					"label": "状态",
 					"name": "state",
 					"options": [
@@ -1588,6 +1604,7 @@
 					"type": "text"
 				},
 				{
+					"default": "",
 					"label": "path",
 					"name": "path",
 					"type": "text"
@@ -1660,11 +1677,13 @@
 				},
 				{
 					"label": "path",
+					"must": true,
 					"name": "path",
 					"type": "text"
 				},
 				{
 					"label": "fk_news",
+					"must": true,
 					"name": "fk_news",
 					"type": "text"
 				},
@@ -2068,11 +2087,13 @@
 					"type": "text"
 				},
 				{
+					"default": "#000000",
 					"label": "titlecolor",
 					"name": "titlecolor",
 					"type": "text"
 				},
 				{
+					"default": "0",
 					"label": "zhiding",
 					"name": "zhiding",
 					"type": "text"
@@ -2088,6 +2109,7 @@
 					"type": "text"
 				},
 				{
+					"default": "0",
 					"label": "readtime",
 					"name": "readtime",
 					"type": "time"
@@ -2157,11 +2179,13 @@
 			"columns": [
 				{
 					"label": "fk_newsid",
+					"must": true,
 					"name": "fk_newsid",
 					"type": "text"
 				},
 				{
 					"label": "fk_res",
+					"must": true,
 					"name": "fk_res",
 					"type": "text"
 				}
@@ -2225,6 +2249,7 @@
 			"columns": [
 				{
 					"add": false,
+					"default": "",
 					"edit": false,
 					"label": "id",
 					"name": "id",
@@ -2316,6 +2341,7 @@
 					"type": "text"
 				},
 				{
+					"default": "n",
 					"label": "是否锁定",
 					"name": "locking",
 					"type": "text"
@@ -2457,14 +2483,34 @@
 							"name": "无",
 							"value": null
 						},
+						{
+							"name": "pass",
+							"value": "pass"
+						},
 						{
 							"name": "mpass",
 							"value": "mpass"
 						},
+						{
+							"name": "id",
+							"value": "id"
+						},
+						{
+							"name": "name",
+							"value": "name"
+						},
 						{
 							"name": "adrress",
 							"value": "adrress"
 						},
+						{
+							"name": "tel",
+							"value": "tel"
+						},
+						{
+							"name": "mail",
+							"value": "mail"
+						},
 						{
 							"name": "type",
 							"value": "type"
@@ -2477,33 +2523,13 @@
 							"name": "no",
 							"value": "no"
 						},
-						{
-							"name": "name",
-							"value": "name"
-						},
-						{
-							"name": "pass",
-							"value": "pass"
-						},
-						{
-							"name": "depName",
-							"value": "depName"
-						},
-						{
-							"name": "id",
-							"value": "id"
-						},
 						{
 							"name": "account",
 							"value": "account"
 						},
 						{
-							"name": "tel",
-							"value": "tel"
-						},
-						{
-							"name": "mail",
-							"value": "mail"
+							"name": "depName",
+							"value": "depName"
 						}
 					],
 					"type": "search",
@@ -2694,6 +2720,7 @@
 					"type": "textArea"
 				},
 				{
+					"default": "0",
 					"label": "获得票数",
 					"name": "sum",
 					"sortable": true,
@@ -2853,6 +2880,7 @@
 					"type": "number"
 				},
 				{
+					"default": "0",
 					"label": "操作类型",
 					"name": "type",
 					"options": [
@@ -2995,6 +3023,31 @@
 					"value": null
 				},
 				{
+					"label": "状态",
+					"name": "state",
+					"options": [
+						{
+							"name": "已启用",
+							"value": "0"
+						},
+						{
+							"name": "未启用",
+							"value": "1"
+						},
+						{
+							"name": "异常",
+							"value": "2"
+						},
+						{
+							"name": "全部",
+							"value": null
+						}
+					],
+					"type": "select",
+					"value": null
+				},
+				{
+					"default": "0",
 					"label": "操作类型",
 					"name": "type",
 					"options": [
@@ -3022,30 +3075,6 @@
 					"sortable": true,
 					"type": "select",
 					"value": null
-				},
-				{
-					"label": "状态",
-					"name": "state",
-					"options": [
-						{
-							"name": "已启用",
-							"value": "0"
-						},
-						{
-							"name": "未启用",
-							"value": "1"
-						},
-						{
-							"name": "异常",
-							"value": "2"
-						},
-						{
-							"name": "全部",
-							"value": null
-						}
-					],
-					"type": "select",
-					"value": null
 				}
 			],
 			"table": "logs"
@@ -3097,6 +3126,7 @@
 					"type": "text"
 				},
 				{
+					"default": "0",
 					"label": "状态",
 					"name": "state",
 					"options": [
@@ -3112,6 +3142,7 @@
 					"type": "select"
 				},
 				{
+					"default": "0",
 					"label": "进展",
 					"name": "status",
 					"options": [
@@ -3146,6 +3177,7 @@
 					"type": "time"
 				},
 				{
+					"default": "0",
 					"label": "是否展示",
 					"name": "show",
 					"options": [
@@ -3177,33 +3209,33 @@
 							"name": "无",
 							"value": null
 						},
+						{
+							"name": "标题",
+							"value": "title"
+						},
+						{
+							"name": "手机号",
+							"value": "phone"
+						},
 						{
 							"name": "id",
 							"value": "id"
 						},
-						{
-							"name": "内容",
-							"value": "content"
-						},
-						{
-							"name": "IP",
-							"value": "not_show_ip"
-						},
 						{
 							"name": "编号",
 							"value": "sn"
 						},
 						{
-							"name": "标题",
-							"value": "title"
+							"name": "IP",
+							"value": "not_show_ip"
+						},
+						{
+							"name": "内容",
+							"value": "content"
 						},
 						{
 							"name": "姓名",
 							"value": "name"
-						},
-						{
-							"name": "手机号",
-							"value": "phone"
 						}
 					],
 					"type": "search",
@@ -3248,27 +3280,7 @@
 					"value": null
 				},
 				{
-					"label": "是否展示",
-					"name": "show",
-					"options": [
-						{
-							"name": "否",
-							"value": "0"
-						},
-						{
-							"name": "是",
-							"value": "1"
-						},
-						{
-							"name": "全部",
-							"value": null
-						}
-					],
-					"sortable": true,
-					"type": "select",
-					"value": null
-				},
-				{
+					"default": "0",
 					"label": "状态",
 					"name": "state",
 					"options": [
@@ -3289,6 +3301,7 @@
 					"value": null
 				},
 				{
+					"default": "0",
 					"label": "进展",
 					"name": "status",
 					"options": [
@@ -3311,6 +3324,28 @@
 					],
 					"type": "select",
 					"value": null
+				},
+				{
+					"default": "0",
+					"label": "是否展示",
+					"name": "show",
+					"options": [
+						{
+							"name": "否",
+							"value": "0"
+						},
+						{
+							"name": "是",
+							"value": "1"
+						},
+						{
+							"name": "全部",
+							"value": null
+						}
+					],
+					"sortable": true,
+					"type": "select",
+					"value": null
 				}
 			],
 			"table": "mail"
@@ -3362,6 +3397,7 @@
 					"type": "text"
 				},
 				{
+					"default": "0",
 					"label": "状态",
 					"name": "state",
 					"options": [
@@ -3377,6 +3413,7 @@
 					"type": "select"
 				},
 				{
+					"default": "0",
 					"label": "进展",
 					"name": "status",
 					"options": [
@@ -3411,6 +3448,7 @@
 					"type": "time"
 				},
 				{
+					"default": "0",
 					"label": "是否展示",
 					"name": "show",
 					"options": [
@@ -3443,21 +3481,13 @@
 							"value": null
 						},
 						{
-							"name": "内容",
-							"value": "content"
-						},
-						{
-							"name": "姓名",
-							"value": "name"
+							"name": "id",
+							"value": "id"
 						},
 						{
 							"name": "手机号",
 							"value": "phone"
 						},
-						{
-							"name": "IP",
-							"value": "not_show_ip"
-						},
 						{
 							"name": "编号",
 							"value": "sn"
@@ -3467,8 +3497,16 @@
 							"value": "title"
 						},
 						{
-							"name": "id",
-							"value": "id"
+							"name": "内容",
+							"value": "content"
+						},
+						{
+							"name": "姓名",
+							"value": "name"
+						},
+						{
+							"name": "IP",
+							"value": "not_show_ip"
 						}
 					],
 					"type": "search",
@@ -3513,26 +3551,7 @@
 					"value": null
 				},
 				{
-					"label": "状态",
-					"name": "state",
-					"options": [
-						{
-							"name": "已启用",
-							"value": "0"
-						},
-						{
-							"name": "未启用",
-							"value": "1"
-						},
-						{
-							"name": "全部",
-							"value": null
-						}
-					],
-					"type": "select",
-					"value": null
-				},
-				{
+					"default": "0",
 					"label": "进展",
 					"name": "status",
 					"options": [
@@ -3557,6 +3576,28 @@
 					"value": null
 				},
 				{
+					"default": "0",
+					"label": "状态",
+					"name": "state",
+					"options": [
+						{
+							"name": "已启用",
+							"value": "0"
+						},
+						{
+							"name": "未启用",
+							"value": "1"
+						},
+						{
+							"name": "全部",
+							"value": null
+						}
+					],
+					"type": "select",
+					"value": null
+				},
+				{
+					"default": "0",
 					"label": "是否展示",
 					"name": "show",
 					"options": [
@@ -3627,6 +3668,7 @@
 					"type": "text"
 				},
 				{
+					"default": "0",
 					"label": "状态",
 					"name": "state",
 					"options": [
@@ -3642,6 +3684,7 @@
 					"type": "select"
 				},
 				{
+					"default": "0",
 					"label": "进展",
 					"name": "status",
 					"options": [
@@ -3676,6 +3719,7 @@
 					"type": "time"
 				},
 				{
+					"default": "0",
 					"label": "是否展示",
 					"name": "show",
 					"options": [
@@ -3707,6 +3751,14 @@
 							"name": "无",
 							"value": null
 						},
+						{
+							"name": "id",
+							"value": "id"
+						},
+						{
+							"name": "标题",
+							"value": "title"
+						},
 						{
 							"name": "内容",
 							"value": "content"
@@ -3715,14 +3767,6 @@
 							"name": "姓名",
 							"value": "name"
 						},
-						{
-							"name": "编号",
-							"value": "sn"
-						},
-						{
-							"name": "标题",
-							"value": "title"
-						},
 						{
 							"name": "手机号",
 							"value": "phone"
@@ -3732,8 +3776,8 @@
 							"value": "not_show_ip"
 						},
 						{
-							"name": "id",
-							"value": "id"
+							"name": "编号",
+							"value": "sn"
 						}
 					],
 					"type": "search",
@@ -3778,15 +3822,16 @@
 					"value": null
 				},
 				{
-					"label": "状态",
-					"name": "state",
+					"default": "0",
+					"label": "是否展示",
+					"name": "show",
 					"options": [
 						{
-							"name": "已启用",
+							"name": "否",
 							"value": "0"
 						},
 						{
-							"name": "未启用",
+							"name": "是",
 							"value": "1"
 						},
 						{
@@ -3794,10 +3839,12 @@
 							"value": null
 						}
 					],
+					"sortable": true,
 					"type": "select",
 					"value": null
 				},
 				{
+					"default": "0",
 					"label": "进展",
 					"name": "status",
 					"options": [
@@ -3822,15 +3869,16 @@
 					"value": null
 				},
 				{
-					"label": "是否展示",
-					"name": "show",
+					"default": "0",
+					"label": "状态",
+					"name": "state",
 					"options": [
 						{
-							"name": "否",
+							"name": "已启用",
 							"value": "0"
 						},
 						{
-							"name": "是",
+							"name": "未启用",
 							"value": "1"
 						},
 						{
@@ -3838,7 +3886,6 @@
 							"value": null
 						}
 					],
-					"sortable": true,
 					"type": "select",
 					"value": null
 				}
@@ -3876,6 +3923,7 @@
 					"type": "text"
 				},
 				{
+					"default": "0",
 					"label": "优先级",
 					"list": false,
 					"name": "sort",
@@ -3891,6 +3939,7 @@
 					"value": "name"
 				},
 				{
+					"default": "0",
 					"label": "状态",
 					"name": "state",
 					"options": [
@@ -3934,6 +3983,7 @@
 				},
 				{
 					"add": false,
+					"default": ",",
 					"edit": false,
 					"info": false,
 					"label": "索引",
@@ -3953,10 +4003,6 @@
 							"name": "无",
 							"value": null
 						},
-						{
-							"name": "ID",
-							"value": "id"
-						},
 						{
 							"name": "编码",
 							"value": "sn"
@@ -3964,6 +4010,10 @@
 						{
 							"name": "板块名称",
 							"value": "name"
+						},
+						{
+							"name": "ID",
+							"value": "id"
 						}
 					],
 					"type": "search",
@@ -3977,13 +4027,13 @@
 							"name": "无",
 							"value": null
 						},
-						{
-							"name": "创建时间",
-							"value": "create_time"
-						},
 						{
 							"name": "变更时间",
 							"value": "modify_time"
+						},
+						{
+							"name": "创建时间",
+							"value": "create_time"
 						}
 					],
 					"type": "search",
@@ -4008,6 +4058,7 @@
 					"value": null
 				},
 				{
+					"default": "0",
 					"label": "状态",
 					"name": "state",
 					"options": [
@@ -4080,6 +4131,7 @@
 					"type": "time"
 				},
 				{
+					"default": "0",
 					"label": "状态",
 					"name": "state",
 					"options": [
@@ -4123,13 +4175,13 @@
 							"name": "无",
 							"value": null
 						},
-						{
-							"name": "名称",
-							"value": "name"
-						},
 						{
 							"name": "ID",
 							"value": "id"
+						},
+						{
+							"name": "名称",
+							"value": "name"
 						}
 					],
 					"type": "search",
@@ -4174,6 +4226,7 @@
 					"value": null
 				},
 				{
+					"default": "0",
 					"label": "状态",
 					"name": "state",
 					"options": [
@@ -4219,6 +4272,7 @@
 					"type": "number"
 				},
 				{
+					"default": "0",
 					"label": "排序",
 					"list": false,
 					"name": "sort",
@@ -4247,6 +4301,7 @@
 					"type": "time"
 				},
 				{
+					"default": "0",
 					"label": "状态",
 					"name": "state",
 					"options": [
@@ -4319,6 +4374,7 @@
 					"value": null
 				},
 				{
+					"default": "0",
 					"label": "状态",
 					"name": "state",
 					"options": [
@@ -4366,6 +4422,7 @@
 					"type": "image"
 				},
 				{
+					"default": "0",
 					"label": "排序",
 					"list": false,
 					"name": "sort",
@@ -4388,6 +4445,7 @@
 					"type": "time"
 				},
 				{
+					"default": "0",
 					"label": "状态",
 					"name": "state",
 					"options": [
@@ -4460,6 +4518,7 @@
 					"value": null
 				},
 				{
+					"default": "0",
 					"label": "状态",
 					"name": "state",
 					"options": [
@@ -4506,6 +4565,7 @@
 					"type": "text"
 				},
 				{
+					"default": "0",
 					"label": "位置",
 					"name": "pos",
 					"options": [
@@ -4530,12 +4590,14 @@
 					"type": "select"
 				},
 				{
+					"default": "200",
 					"label": "宽度(px)",
 					"name": "width",
 					"sortable": true,
 					"type": "number"
 				},
 				{
+					"default": "200",
 					"label": "高度(px)",
 					"name": "height",
 					"sortable": true,
@@ -4568,6 +4630,7 @@
 					"type": "time"
 				},
 				{
+					"default": "0",
 					"label": "状态",
 					"name": "state",
 					"options": [
@@ -4593,10 +4656,6 @@
 							"name": "无",
 							"value": null
 						},
-						{
-							"name": "链接",
-							"value": "url"
-						},
 						{
 							"name": "ID",
 							"value": "id"
@@ -4604,6 +4663,10 @@
 						{
 							"name": "名称",
 							"value": "name"
+						},
+						{
+							"name": "链接",
+							"value": "url"
 						}
 					],
 					"type": "search",
@@ -4648,6 +4711,7 @@
 					"value": null
 				},
 				{
+					"default": "0",
 					"label": "状态",
 					"name": "state",
 					"options": [
@@ -4668,6 +4732,7 @@
 					"value": null
 				},
 				{
+					"default": "0",
 					"label": "位置",
 					"name": "pos",
 					"options": [
@@ -4749,6 +4814,7 @@
 					"type": "time"
 				},
 				{
+					"default": "0",
 					"label": "状态",
 					"name": "state",
 					"options": [
@@ -4764,6 +4830,7 @@
 					"type": "select"
 				},
 				{
+					"default": "0",
 					"label": "排序",
 					"list": false,
 					"name": "sort",
@@ -4805,13 +4872,13 @@
 							"name": "无",
 							"value": null
 						},
-						{
-							"name": "变更时间",
-							"value": "modify_time"
-						},
 						{
 							"name": "创建时间",
 							"value": "create_time"
+						},
+						{
+							"name": "变更时间",
+							"value": "modify_time"
 						}
 					],
 					"type": "search",
@@ -4836,6 +4903,7 @@
 					"value": null
 				},
 				{
+					"default": "0",
 					"label": "状态",
 					"name": "state",
 					"options": [
@@ -4908,6 +4976,7 @@
 					"type": "time"
 				},
 				{
+					"default": "0",
 					"label": "状态",
 					"name": "state",
 					"options": [
@@ -4923,6 +4992,7 @@
 					"type": "select"
 				},
 				{
+					"default": "0",
 					"label": "排序",
 					"list": false,
 					"name": "sort",
@@ -4940,10 +5010,6 @@
 							"name": "无",
 							"value": null
 						},
-						{
-							"name": "ID",
-							"value": "id"
-						},
 						{
 							"name": "名称",
 							"value": "name"
@@ -4951,6 +5017,10 @@
 						{
 							"name": "链接",
 							"value": "url"
+						},
+						{
+							"name": "ID",
+							"value": "id"
 						}
 					],
 					"type": "search",
@@ -4995,6 +5065,7 @@
 					"value": null
 				},
 				{
+					"default": "0",
 					"label": "状态",
 					"name": "state",
 					"options": [
@@ -5057,6 +5128,7 @@
 					"type": "time"
 				},
 				{
+					"default": "0",
 					"label": "状态",
 					"name": "state",
 					"options": [
@@ -5072,6 +5144,7 @@
 					"type": "select"
 				},
 				{
+					"default": "0",
 					"label": "排序",
 					"list": false,
 					"name": "sort",
@@ -5105,13 +5178,13 @@
 							"name": "无",
 							"value": null
 						},
-						{
-							"name": "变更时间",
-							"value": "modify_time"
-						},
 						{
 							"name": "创建时间",
 							"value": "create_time"
+						},
+						{
+							"name": "变更时间",
+							"value": "modify_time"
 						}
 					],
 					"type": "search",
@@ -5136,6 +5209,7 @@
 					"value": null
 				},
 				{
+					"default": "0",
 					"label": "状态",
 					"name": "state",
 					"options": [