diff --git a/code.go b/code.go index f34fae1..d631b8e 100644 --- a/code.go +++ b/code.go @@ -218,6 +218,9 @@ var TptProject = Proj{ } inData["parent_ids"] = parent_ids + ObjToStr(re) + "," that.Db.Update(tableName, Map{"parent_ids": inData["parent_ids"]}, Map{"id": re}) + } else { + inData["parent_ids"] = "," + ObjToStr(re) + "," + that.Db.Update(tableName, Map{"parent_ids": inData["parent_ids"]}, Map{"id": re}) } that.Log["table_id"] = re @@ -365,22 +368,28 @@ var TptProject = Proj{ } - if inData.Get("parent_id") != nil { + if _, ok := inData["parent_id"]; ok { //1 //12 62 //123 623 - Index := that.Db.Get(tableName, "parent_id,`parent_ids`", Map{"id": that.RouterString[2]}) - if inData.GetCeilInt64("parent_id") != Index.GetCeilInt64("parent_id") { - parentIndex := that.Db.Get(tableName, "`parent_ids`", Map{"id": inData.Get("parent_id")}) - if strings.Contains(parentIndex.GetString("parent_ids"), ","+that.RouterString[2]+",") { - that.Display(4, "不能将子级设置为父级") - return - } - parent_ids := parentIndex.GetString("parent_ids") + that.RouterString[2] + "," - childNodes := that.Db.Select(tableName, "id,`parent_ids`", Map{"parent_ids[~]": "," + that.RouterString[2] + ","}) - for _, v := range childNodes { - v["parent_ids"] = strings.Replace(v.GetString("parent_ids"), Index.GetString("parent_ids"), parent_ids, -1) - that.Db.Update(tableName, Map{"parent_ids": v["parent_ids"]}, Map{"id": v.GetCeilInt("id")}) + + if inData.GetCeilInt64("parent_id") == 0 { + that.Db.Update(tableName, Map{"parent_ids": "," + that.RouterString[2] + ","}, Map{"id": that.RouterString[2]}) + } else { + + Index := that.Db.Get(tableName, "parent_id,`parent_ids`", Map{"id": that.RouterString[2]}) + if inData.GetCeilInt64("parent_id") != Index.GetCeilInt64("parent_id") { + parentIndex := that.Db.Get(tableName, "`parent_ids`", Map{"id": inData.Get("parent_id")}) + if strings.Contains(parentIndex.GetString("parent_ids"), ","+that.RouterString[2]+",") { + that.Display(4, "不能将子级设置为父级") + return + } + parent_ids := parentIndex.GetString("parent_ids") + that.RouterString[2] + "," + childNodes := that.Db.Select(tableName, "id,`parent_ids`", Map{"parent_ids[~]": "," + that.RouterString[2] + ","}) + for _, v := range childNodes { + v["parent_ids"] = strings.Replace(v.GetString("parent_ids"), Index.GetString("parent_ids"), parent_ids, -1) + that.Db.Update(tableName, Map{"parent_ids": v["parent_ids"]}, Map{"id": v.GetCeilInt("id")}) + } } } diff --git a/code/makecode.go b/code/makecode.go index 5f3f10e..c5c2130 100644 --- a/code/makecode.go +++ b/code/makecode.go @@ -743,17 +743,23 @@ func (that *MakeCode) Add(table string, user Map, req *http.Request) Map { } - reqValue := req.FormValue(v.GetString("name")) - if (reqValue == "" || reqValue == "null") && strings.Contains(v.GetString("name"), "id") { - data[v.GetString("name")] = nil - } else { - if v.GetString("type") == "password" { - data[v.GetString("name")] = Md5(reqValue) - } else { - data[v.GetString("name")] = reqValue - } - + if req.Form[v.GetString("name")] == nil { + continue } + + reqValue := req.FormValue(v.GetString("name")) + if reqValue == "null" { + data[v.GetString("name")] = nil + continue + } + + if v.GetString("type") == "password" { + data[v.GetString("name")] = Md5(reqValue) + continue + } + + data[v.GetString("name")] = reqValue + } //sn则自动生成 if v.GetString("name") == "sn" { @@ -802,13 +808,21 @@ func (that *MakeCode) Edit(table string, req *http.Request) Map { } if v.Get("edit") == nil || v.GetBool("edit") { + if len(req.Form[v.GetString("name")]) == 0 { continue } + reqValue := req.FormValue(v.GetString("name")) if reqValue == "null" { + data[v.GetString("name")] = nil continue } + if v.GetString("type") == "number" && reqValue == "" { + data[v.GetString("name")] = nil + continue + } + if v.GetString("type") == "password" { data[v.GetString("name")] = Md5(reqValue) } else { @@ -909,12 +923,12 @@ func (that *MakeCode) Search(table string, userData Map, data Map, req *http.Req // reqValue := req.FormValue(v.GetString("name")) if v.GetString("name") != "parent_id" && reqValue != "" { - data[table+"."+v.GetString("name")] = reqValue + data[v.GetString("name")] = reqValue } // //} else { - reStr += table + "." + v.GetString("name") + "," + reStr += v.GetString("name") + "," //} //if v["name"] == "parent_id" && v.GetString("link") != "" { @@ -972,7 +986,7 @@ func (that *MakeCode) Search(table string, userData Map, data Map, req *http.Req if strings.Contains(v.GetString("type"), "text") { reqValue := req.FormValue(v.GetString("name")) if reqValue != "" { - data[table+"."+v.GetString("name")+"[~]"] = reqValue + data[v.GetString("name")+"[~]"] = reqValue } } @@ -980,9 +994,9 @@ func (that *MakeCode) Search(table string, userData Map, data Map, req *http.Req if v.GetString("type") == "unixtime" { if len(req.Form[v.GetString("name")]) == 1 { - daterange[table+"."+v.GetString("name")+"[>]"] = req.FormValue("daterange") + daterange[v.GetString("name")+"[>]"] = req.FormValue("daterange") } else if len(req.Form[v.GetString("name")]) == 2 { - daterange[table+"."+v.GetString("name")+"[<>]"] = ObjToSlice(req.Form["daterange"]) + daterange[v.GetString("name")+"[<>]"] = ObjToSlice(req.Form["daterange"]) } //fmt.Println(req.Form["daterange"]) @@ -995,12 +1009,12 @@ func (that *MakeCode) Search(table string, userData Map, data Map, req *http.Req if len(req.Form[v.GetString("name")]) == 1 { t := time.Unix(ObjToCeilInt64(req.FormValue(v.GetString("name"))), 0).Format("2006-01-02 15:04:05") - daterange[table+"."+v.GetString("name")+"[>]"] = t + daterange[v.GetString("name")+"[>]"] = t } else if len(req.Form[v.GetString("name")]) == 2 { t1 := time.Unix(ObjToCeilInt64(req.Form[v.GetString("name")][0]), 0).Format("2006-01-02 15:04:05") t2 := time.Unix(ObjToCeilInt64(req.Form[v.GetString("name")][1]), 0).Format("2006-01-02 15:04:05") - daterange[table+"."+v.GetString("name")+"[<>]"] = Slice{t1, t2} + daterange[v.GetString("name")+"[<>]"] = Slice{t1, t2} } } @@ -1040,8 +1054,8 @@ func (that *MakeCode) Search(table string, userData Map, data Map, req *http.Req for _, v := range r { reqValue = append(reqValue, v.GetString("id")) } - if data[table+"."+searchItemName] != nil { - data[table+"."+searchItemName] = reqValue + if data[searchItemName] != nil { + data[searchItemName] = reqValue } } @@ -1065,10 +1079,10 @@ func (that *MakeCode) Search(table string, userData Map, data Map, req *http.Req if v.GetString("type") == "unixtime" { //fmt.Println(req.Form["daterange"]) if len(req.Form["daterange"]) == 1 && req.Form["daterange"][0] != "" { - daterange[table+"."+v.GetString("name")+"[>]"] = req.FormValue("daterange") + daterange[v.GetString("name")+"[>]"] = req.FormValue("daterange") } else if len(req.Form["daterange"]) == 2 { - daterange[table+"."+v.GetString("name")+"[<>]"] = ObjToSlice(req.Form["daterange"]) + daterange[v.GetString("name")+"[<>]"] = ObjToSlice(req.Form["daterange"]) } } if v.GetString("type") == "time" { @@ -1077,12 +1091,12 @@ func (that *MakeCode) Search(table string, userData Map, data Map, req *http.Req if len(req.Form["daterange"]) == 1 && req.Form["daterange"][0] != "" { t := time.Unix(ObjToCeilInt64(req.FormValue("daterange")), 0).Format("2006-01-02 15:04:05") - daterange[table+"."+v.GetString("name")+"[>]"] = t + daterange[v.GetString("name")+"[>]"] = t } else if len(req.Form["daterange"]) == 2 { t1 := time.Unix(ObjToCeilInt64(req.Form["daterange"][0]), 0).Format("2006-01-02 15:04:05") t2 := time.Unix(ObjToCeilInt64(req.Form["daterange"][1]), 0).Format("2006-01-02 15:04:05") - daterange[table+"."+v.GetString("name")+"[<>]"] = Slice{t1, t2} + daterange[v.GetString("name")+"[<>]"] = Slice{t1, t2} } } @@ -1092,7 +1106,7 @@ func (that *MakeCode) Search(table string, userData Map, data Map, req *http.Req if keywordTableStr != "" { if keywordTableStr == v.GetString("name") { - data[table+"."+keywordTableStr+"[~]"] = keywordStr + data[keywordTableStr+"[~]"] = keywordStr } if keywordTableStr == v.GetString("value") { @@ -1109,11 +1123,11 @@ func (that *MakeCode) Search(table string, userData Map, data Map, req *http.Req } if strings.Contains(v.GetString("type"), "text") { - keyword[table+"."+v.GetString("name")+"[~]"] = keywordStr + keyword[v.GetString("name")+"[~]"] = keywordStr } if v.GetString("name") == "id" { - keyword[table+"."+v.GetString("name")] = keywordStr + keyword[v.GetString("name")] = keywordStr } if v.GetString("link") != "" && v.GetString("name") != "parent_id" { @@ -1132,7 +1146,7 @@ func (that *MakeCode) Search(table string, userData Map, data Map, req *http.Req } if len(reqValue) != 0 && searchItem.GetString("name") == "sort" && reqValue[0] != "" { - sortMap["ORDER"] = table + "." + reqValue[0] + sortMap["ORDER"] = reqValue[0] } continue @@ -1143,7 +1157,7 @@ func (that *MakeCode) Search(table string, userData Map, data Map, req *http.Req parentID := ObjToInt(req.FormValue("parent_id")) if parentID == 0 { parentID = userData.GetCeilInt(table + "_id") - data["OR"] = Map{table + ".id": parentID, table + ".parent_id": nil} + data["OR"] = Map{"id": parentID, "parent_id": nil} } else { //是否展示全部子级 where := Map{} @@ -1151,21 +1165,21 @@ func (that *MakeCode) Search(table string, userData Map, data Map, req *http.Req for _, v := range reqValue { if len(where) == 0 { - where[table+"."+parent_idsStr] = "," + v + "," + where[parent_idsStr] = "," + v + "," continue } - where = Map{"OR": where, table + "." + parent_idsStr: "," + v + ","} + where = Map{"OR": where, parent_idsStr: "," + v + ","} } } else { - where[table+".parent_id"] = reqValue + where["parent_id"] = reqValue } //是否展示自己 if req.FormValue("showself") == "1" { if len(where) == 0 { - data["OR"] = Map{table + ".id": reqValue} + data["OR"] = Map{"id": reqValue} } else { - data["OR"] = Map{"OR": where, table + ".id": reqValue} + data["OR"] = Map{"OR": where, "id": reqValue} } } else { if len(where) != 0 { @@ -1181,26 +1195,37 @@ func (that *MakeCode) Search(table string, userData Map, data Map, req *http.Req if parent_idsStr != "" { - where := Map{} + //where := Map{} //是否全部展示 if req.FormValue("showall") != "1" { - where[table+"."+searchItem.GetString("name")] = reqValue + if len(reqValue) != 0 { + data[searchItem.GetString("name")] = reqValue + } + } else { + + ls := []int64{} for _, v := range reqValue { - if len(where) == 0 { - where[searchItem.GetString("link")+"."+parent_idsStr] = "," + v + "," - continue + + ls1 := db.Select(searchItem.GetString("link"), "id", Map{"OR": Map{parent_idsStr: "," + v + ",", "id": v}}) + for _, vls1 := range ls1 { + ls = append(ls, vls1.GetCeilInt64("id")) } - where = Map{"OR": where, searchItem.GetString("link") + "." + parent_idsStr: "," + v + ","} + } + + if len(ls) != 0 { + data[searchItem.GetString("name")] = ls } } //用户 - if userData[searchItem.GetString("name")] != nil { - - where = Map{"AND": Map{searchItem.GetString("link") + "." + parent_idsStr: "," + ObjToStr(userData.GetCeilInt64(searchItem.GetString("name"))) + ",", "OR": where}} - } - data["OR"] = where + //if userData[searchItem.GetString("name")] != nil { + // + // where = Map{"AND": Map{searchItem.GetString("link") + "." + parent_idsStr: "," + ObjToStr(userData.GetCeilInt64(searchItem.GetString("name"))) + ",", "OR": where}} + //} + //if len(where)!=0{ + // data["OR"] = where + //} continue //r := db.Select(searchItem.GetString("link"), "id", where) @@ -1212,13 +1237,13 @@ func (that *MakeCode) Search(table string, userData Map, data Map, req *http.Req } if len(reqValue) != 0 && reqValue[0] != "" { - data[table+"."+searchItemName] = reqValue + data[searchItemName] = reqValue } } if sortMap["ORDER"] == nil { - sortMap["ORDER"] = table + ".id DESC" + sortMap["ORDER"] = "id DESC" } where := Map{} diff --git a/example/config/adminDB.json b/example/config/adminDB.json index 0f89ba6..6cb1727 100644 --- a/example/config/adminDB.json +++ b/example/config/adminDB.json @@ -74,20 +74,8 @@ "show" ], "icon": "Setting", - "label": "栏目管理", + "label": "关联栏目", "menus": [ - { - "auth": [ - "show", - "add", - "delete", - "edit", - "info", - "download" - ], - "label": "栏目管理", - "table": "ctg_copy" - }, { "auth": [ "show", @@ -111,6 +99,18 @@ ], "label": "栏目管理", "table": "ctg" + }, + { + "auth": [ + "show", + "add", + "delete", + "edit", + "info", + "download" + ], + "label": "栏目管理", + "table": "ctg_copy" } ], "name": "sys:ctg" @@ -120,7 +120,7 @@ "show" ], "icon": "Setting", - "label": "ebw_jobs", + "label": "ebw_customer", "menus": [ { "auth": [ @@ -131,32 +131,8 @@ "info", "download" ], - "label": "ebw_jobs", - "table": "ebw_jobs" - }, - { - "auth": [ - "show", - "add", - "delete", - "edit", - "info", - "download" - ], - "label": "ebw_news", - "table": "ebw_news" - }, - { - "auth": [ - "show", - "add", - "delete", - "edit", - "info", - "download" - ], - "label": "ebw_vote_user", - "table": "ebw_vote_user" + "label": "ebw_customer", + "table": "ebw_customer" }, { "auth": [ @@ -179,8 +155,20 @@ "info", "download" ], - "label": "ebw_res", - "table": "ebw_res" + "label": "ebw_annex", + "table": "ebw_annex" + }, + { + "auth": [ + "show", + "add", + "delete", + "edit", + "info", + "download" + ], + "label": "ebw_news", + "table": "ebw_news" }, { "auth": [ @@ -203,8 +191,8 @@ "info", "download" ], - "label": "ebw_news_addition_res", - "table": "ebw_news_addition_res" + "label": "ebw_res", + "table": "ebw_res" }, { "auth": [ @@ -227,20 +215,8 @@ "info", "download" ], - "label": "ebw_annex", - "table": "ebw_annex" - }, - { - "auth": [ - "show", - "add", - "delete", - "edit", - "info", - "download" - ], - "label": "ebw_customer", - "table": "ebw_customer" + "label": "ebw_jobs", + "table": "ebw_jobs" }, { "auth": [ @@ -254,6 +230,18 @@ "label": "ebw_vote", "table": "ebw_vote" }, + { + "auth": [ + "show", + "add", + "delete", + "edit", + "info", + "download" + ], + "label": "ebw_vote_user", + "table": "ebw_vote_user" + }, { "auth": [ "show", @@ -265,6 +253,18 @@ ], "label": "ebw_attachment", "table": "ebw_attachment" + }, + { + "auth": [ + "show", + "add", + "delete", + "edit", + "info", + "download" + ], + "label": "ebw_news_addition_res", + "table": "ebw_news_addition_res" } ], "name": "sys:ebw" @@ -274,7 +274,7 @@ "show" ], "icon": "Setting", - "label": "底部", + "label": "纪委信箱", "menus": [ { "auth": [ @@ -285,8 +285,8 @@ "info", "download" ], - "label": "底部", - "table": "swiper_bottom" + "label": "纪委信箱", + "table": "mail_discipline" }, { "auth": [ @@ -297,9 +297,31 @@ "info", "download" ], - "label": "顶部", - "table": "swiper_top" + "label": "党委书记信箱", + "table": "mail_part" }, + { + "auth": [ + "show", + "add", + "delete", + "edit", + "info", + "download" + ], + "label": "总经理信箱", + "table": "mail" + } + ], + "name": "sys:mail" + }, + { + "auth": [ + "show" + ], + "icon": "Setting", + "label": "关联专题", + "menus": [ { "auth": [ "show", @@ -324,6 +346,30 @@ "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_bottom" + }, { "auth": [ "show", @@ -345,58 +391,12 @@ "info", "download" ], - "label": "飘窗", - "table": "swiper_fly" + "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_discipline" - }, - { - "auth": [ - "show", - "add", - "delete", - "edit", - "info", - "download" - ], - "label": "党委书记信箱", - "table": "mail_part" - } - ], - "name": "sys:mail" - }, { "auth": [ "show" @@ -404,6 +404,14 @@ "icon": "Setting", "label": "系统管理", "menus": [ + { + "auth": [ + "show", + "download" + ], + "label": "日志管理", + "table": "logs" + }, { "auth": [ "show", @@ -416,26 +424,6 @@ "label": "人员管理", "table": "admin" }, - { - "auth": [ - "show", - "add", - "delete", - "edit", - "info", - "download" - ], - "label": "文章管理", - "table": "article" - }, - { - "auth": [ - "show", - "download" - ], - "label": "日志管理", - "table": "logs" - }, { "auth": [ "show", @@ -459,6 +447,18 @@ ], "label": "角色管理", "table": "role" + }, + { + "auth": [ + "show", + "add", + "delete", + "edit", + "info", + "download" + ], + "label": "文章管理", + "table": "article" } ], "name": "sys" @@ -577,13 +577,13 @@ "name": "名称", "value": "name" }, - { - "name": "职位", - "value": "title" - }, { "name": "手机号", "value": "phone" + }, + { + "name": "职位", + "value": "title" } ], "type": "search", @@ -788,14 +788,14 @@ "name": "无", "value": null }, - { - "name": "id", - "value": "id" - }, { "name": "描述", "value": "description" }, + { + "name": "编号", + "value": "sn" + }, { "name": "标题", "value": "title" @@ -809,8 +809,8 @@ "value": "content" }, { - "name": "编号", - "value": "sn" + "name": "id", + "value": "id" } ], "type": "search", @@ -1016,24 +1016,24 @@ "value": null }, { - "name": "板块名称", - "value": "name" + "name": "源链接", + "value": "url" + }, + { + "name": "文章", + "value": "article_id" }, { "name": "编码", "value": "sn" }, { - "name": "源链接", - "value": "url" + "name": "板块名称", + "value": "name" }, { "name": "ID", "value": "id" - }, - { - "name": "文章", - "value": "article_id" } ], "type": "search", @@ -1047,13 +1047,13 @@ "name": "无", "value": null }, - { - "name": "变更时间", - "value": "modify_time" - }, { "name": "创建时间", "value": "create_time" + }, + { + "name": "变更时间", + "value": "modify_time" } ], "type": "search", @@ -1412,6 +1412,10 @@ "name": "无", "value": null }, + { + "name": "ID", + "value": "id" + }, { "name": "文章", "value": "article_id" @@ -1420,17 +1424,13 @@ "name": "板块名称", "value": "name" }, - { - "name": "源链接", - "value": "url" - }, - { - "name": "ID", - "value": "id" - }, { "name": "编码", "value": "sn" + }, + { + "name": "源链接", + "value": "url" } ], "type": "search", @@ -2456,38 +2456,6 @@ "name": "无", "value": null }, - { - "name": "mail", - "value": "mail" - }, - { - "name": "type", - "value": "type" - }, - { - "name": "id", - "value": "id" - }, - { - "name": "no", - "value": "no" - }, - { - "name": "account", - "value": "account" - }, - { - "name": "name", - "value": "name" - }, - { - "name": "depNo", - "value": "depNo" - }, - { - "name": "depName", - "value": "depName" - }, { "name": "pass", "value": "pass" @@ -2503,6 +2471,38 @@ { "name": "tel", "value": "tel" + }, + { + "name": "type", + "value": "type" + }, + { + "name": "name", + "value": "name" + }, + { + "name": "no", + "value": "no" + }, + { + "name": "account", + "value": "account" + }, + { + "name": "mail", + "value": "mail" + }, + { + "name": "depNo", + "value": "depNo" + }, + { + "name": "depName", + "value": "depName" + }, + { + "name": "id", + "value": "id" } ], "type": "search", @@ -2944,16 +2944,16 @@ "value": null }, { - "name": "其他内容", - "value": "name" + "name": "IP地址", + "value": "ip" }, { "name": "ID", "value": "id" }, { - "name": "IP地址", - "value": "ip" + "name": "其他内容", + "value": "name" } ], "type": "search", @@ -2993,30 +2993,6 @@ "type": "search", "value": null }, - { - "label": "状态", - "name": "state", - "options": [ - { - "name": "已启用", - "value": "0" - }, - { - "name": "未启用", - "value": "1" - }, - { - "name": "异常", - "value": "2" - }, - { - "name": "全部", - "value": null - } - ], - "type": "select", - "value": null - }, { "label": "操作类型", "name": "type", @@ -3045,6 +3021,30 @@ "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" @@ -3176,14 +3176,6 @@ "name": "无", "value": null }, - { - "name": "手机号", - "value": "phone" - }, - { - "name": "IP", - "value": "not_show_ip" - }, { "name": "编号", "value": "sn" @@ -3193,8 +3185,12 @@ "value": "title" }, { - "name": "姓名", - "value": "name" + "name": "手机号", + "value": "phone" + }, + { + "name": "IP", + "value": "not_show_ip" }, { "name": "id", @@ -3203,6 +3199,10 @@ { "name": "内容", "value": "content" + }, + { + "name": "姓名", + "value": "name" } ], "type": "search", @@ -3216,13 +3216,13 @@ "name": "无", "value": null }, - { - "name": "变更时间", - "value": "modify_time" - }, { "name": "创建时间", "value": "create_time" + }, + { + "name": "变更时间", + "value": "modify_time" } ], "type": "search", @@ -3441,18 +3441,6 @@ "name": "无", "value": null }, - { - "name": "id", - "value": "id" - }, - { - "name": "标题", - "value": "title" - }, - { - "name": "内容", - "value": "content" - }, { "name": "姓名", "value": "name" @@ -3461,10 +3449,22 @@ "name": "IP", "value": "not_show_ip" }, + { + "name": "id", + "value": "id" + }, { "name": "编号", "value": "sn" }, + { + "name": "标题", + "value": "title" + }, + { + "name": "内容", + "value": "content" + }, { "name": "手机号", "value": "phone" @@ -3481,13 +3481,13 @@ "name": "无", "value": null }, - { - "name": "创建时间", - "value": "create_time" - }, { "name": "变更时间", "value": "modify_time" + }, + { + "name": "创建时间", + "value": "create_time" } ], "type": "search", @@ -3531,27 +3531,6 @@ "type": "select", "value": null }, - { - "label": "是否展示", - "name": "show", - "options": [ - { - "name": "否", - "value": "0" - }, - { - "name": "是", - "value": "1" - }, - { - "name": "全部", - "value": null - } - ], - "sortable": true, - "type": "select", - "value": null - }, { "label": "进展", "name": "status", @@ -3575,6 +3554,27 @@ ], "type": "select", "value": null + }, + { + "label": "是否展示", + "name": "show", + "options": [ + { + "name": "否", + "value": "0" + }, + { + "name": "是", + "value": "1" + }, + { + "name": "全部", + "value": null + } + ], + "sortable": true, + "type": "select", + "value": null } ], "table": "mail_discipline" @@ -3706,18 +3706,6 @@ "name": "无", "value": null }, - { - "name": "标题", - "value": "title" - }, - { - "name": "内容", - "value": "content" - }, - { - "name": "id", - "value": "id" - }, { "name": "编号", "value": "sn" @@ -3726,6 +3714,18 @@ "name": "姓名", "value": "name" }, + { + "name": "id", + "value": "id" + }, + { + "name": "标题", + "value": "title" + }, + { + "name": "内容", + "value": "content" + }, { "name": "手机号", "value": "phone" @@ -3952,14 +3952,14 @@ "name": "无", "value": null }, - { - "name": "板块名称", - "value": "name" - }, { "name": "ID", "value": "id" }, + { + "name": "板块名称", + "value": "name" + }, { "name": "编码", "value": "sn" @@ -4592,10 +4592,6 @@ "name": "无", "value": null }, - { - "name": "名称", - "value": "name" - }, { "name": "ID", "value": "id" @@ -4603,6 +4599,10 @@ { "name": "链接", "value": "url" + }, + { + "name": "名称", + "value": "name" } ], "type": "search", @@ -4646,26 +4646,6 @@ "type": "search", "value": null }, - { - "label": "状态", - "name": "state", - "options": [ - { - "name": "正常", - "value": "0" - }, - { - "name": "异常", - "value": "1" - }, - { - "name": "全部", - "value": null - } - ], - "type": "select", - "value": null - }, { "label": "位置", "name": "pos", @@ -4694,6 +4674,26 @@ "sortable": true, "type": "select", "value": null + }, + { + "label": "状态", + "name": "state", + "options": [ + { + "name": "正常", + "value": "0" + }, + { + "name": "异常", + "value": "1" + }, + { + "name": "全部", + "value": null + } + ], + "type": "select", + "value": null } ], "table": "swiper_fly" @@ -4780,10 +4780,6 @@ "name": "无", "value": null }, - { - "name": "链接", - "value": "url" - }, { "name": "ID", "value": "id" @@ -4791,6 +4787,10 @@ { "name": "名称", "value": "name" + }, + { + "name": "链接", + "value": "url" } ], "type": "search", @@ -4939,6 +4939,10 @@ "name": "无", "value": null }, + { + "name": "链接", + "value": "url" + }, { "name": "ID", "value": "id" @@ -4946,10 +4950,6 @@ { "name": "名称", "value": "name" - }, - { - "name": "链接", - "value": "url" } ], "type": "search",