框架优化

code/makecode.go

@@ -236,6 +236,7 @@ func (that *MakeCode) Db2JSON(db *db.HoTimeDB, config Map) {
 					coloum["label"] = coloum.GetString("label")[:indexNum]
 				}
 
+
 				for _, ColumnName := range that.RuleConfig {
 					if (ColumnName.GetBool("strict") && coloum.GetString("name") == ColumnName.GetString("name")) ||
 						(!ColumnName.GetBool("strict") && strings.Contains(coloum.GetString("name"), ColumnName.GetString("name"))) {
@@ -260,7 +261,7 @@ func (that *MakeCode) Db2JSON(db *db.HoTimeDB, config Map) {
 						if ColumnName.GetBool("list") {
 							delete(coloum, "list")
 						}
-						if ColumnName.GetBool("must") {
+						if !ColumnName.GetBool("must") {
 							delete(coloum, "must")
 						}
 
@@ -298,10 +299,10 @@ func (that *MakeCode) Db2JSON(db *db.HoTimeDB, config Map) {
 				}
 
 				if coloum.GetString("type") == "select" {
-					coloum["must"] = true
+					//coloum["must"] = true
 					coloum["options"] = options
 				} else if len(options) > 0 {
-					coloum["must"] = true
+					//coloum["must"] = true
 					coloum["options"] = options
 					coloum["type"] = "select"
 
@@ -619,7 +620,7 @@ func (that *MakeCode) Info(table string, userData Map, db *db.HoTimeDB) (string,
 	}
 	return reStr, data
 }
-func (that *MakeCode) Add(table string, req *http.Request) Map {
+func (that *MakeCode) Add(table string,user Map, req *http.Request) Map {
 	data := Map{}
 	for _, v := range that.TableColumns[table] {
 		//不可使用，未在前端展示，但在内存中保持有
@@ -633,6 +634,17 @@ func (that *MakeCode) Add(table string, req *http.Request) Map {
 		if v.Get("add") == nil || v.GetBool("add") {
 
 			if len(req.Form[v.GetString("name")]) == 0 {
+
+				if user[v.GetString("name")]!=nil{
+					data[v.GetString("name")] = user[v.GetString("name")]
+					continue
+				}
+
+				if that.FileConfig.GetString("table")+"_id"==v.GetString("name"){
+					data[v.GetString("name")] = user["id"]
+					continue
+				}
+
 				if v.GetBool("must") {
 					return nil
 				} else {
@@ -752,6 +764,12 @@ func (that *MakeCode) Search(table string, userData Map, req *http.Request, db *
 					v.GetString("link") + "." + v.GetString("value") + " AS " +
 					v.GetString("link") + "_" + v.GetString("name") + "_" + v.GetString("value") + ","
 
+
+				if that.TableColumns[v.GetString("link")]["phone"]!=nil{
+					reStr += table + "." + v.GetString("name") + "," +
+						v.GetString("link") + ".phone AS " +
+						v.GetString("link") + "_" + v.GetString("name") + "_phone,"
+				}
 				leftJoin["[>]"+v.GetString("link")] =
 					table + "." + v.GetString("name") + "=" +
 						v.GetString("link") + ".id"
@@ -848,7 +866,12 @@ func (that *MakeCode) Search(table string, userData Map, req *http.Request, db *
 				//日期类型
 				if searchItemName == "daterange" && v.GetString("type") == "time" {
 					//fmt.Println(req.Form["daterange"])
-					daterange[table+"."+v.GetString("name")+"[<>]"] = ObjToSlice(req.Form["daterange"])
+					if len(req.Form["daterange"])==1{
+						daterange[table+"."+v.GetString("name")+"[<]"]=req.FormValue("daterange")
+					}else{
+
+						daterange[table+"."+v.GetString("name")+"[<>]"] = ObjToSlice(req.Form["daterange"])
+					}
 				}
 			}
 
@@ -900,9 +923,11 @@ func (that *MakeCode) Search(table string, userData Map, req *http.Request, db *
 	}
 
 	if len(daterange) > 1 {
-		if data["AND"] != nil {
+		//if data["AND"] == nil {
 			data = Map{"AND": Map{"AND": data, "OR": daterange}}
-		}
+		//}else{
+		//	data = Map{"AND": Map{"AND": data, "OR": daterange}}
+		//}
 	}
 
 	if len(data) > 1 {