golang/hotime
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 85 Wiki Activity

增加普通时间类型，以及增加富文本类型

Browse Source
This commit is contained in:
hoteas
2022-04-25 19:58:49 +08:00
parent 10b73bef8f
commit f1244091fc
4 changed files with 38 additions and 7275 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/makecode.go
+35 -14
View File
@@ -236,7 +236,6 @@ 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"))) {
@@ -266,7 +265,11 @@ func (that *MakeCode) Db2JSON(db *db.HoTimeDB, config Map) {
}
if ColumnName.GetString("type") != "" {
coloum["type"] = ColumnName.GetString("type")
if ColumnName.GetString("type") == "time" && coloum["type"] == "number" {
coloum["type"] = "unixTime"
} else {
coloum["type"] = ColumnName.GetString("type")
}
}
if ColumnName.GetBool("strict") && coloum.GetString("name") == ColumnName.GetString("name") {
break
@@ -509,8 +512,17 @@ func (that *MakeCode) Db2JSON(db *db.HoTimeDB, config Map) {
v["value"] = "label"
continue
}
tempC := that.TableConfig.GetMap(tableName).GetSlice("columns")
isGet := true
for k2, _ := range tempC {
if strings.Contains(tempC.GetMap(k2).GetString("name"), "name") {
v["value"] = tempC.GetMap(k2).GetString("name")
isGet = false
break
}
}
if len(that.TableConfig.GetMap(tableName).GetSlice("columns")) > 2 {
if isGet && len(that.TableConfig.GetMap(tableName).GetSlice("columns")) > 2 {
v["value"] = that.TableConfig.GetMap(tableName).GetSlice("columns").GetMap(1).GetString("name")
continue
}
@@ -620,7 +632,7 @@ func (that *MakeCode) Info(table string, userData Map, db *db.HoTimeDB) (string,
}
return reStr, data
}
func (that *MakeCode) Add(table string,user Map, req *http.Request) Map {
func (that *MakeCode) Add(table string, user Map, req *http.Request) Map {
data := Map{}
for _, v := range that.TableColumns[table] {
//不可使用，未在前端展示，但在内存中保持有
@@ -635,12 +647,12 @@ func (that *MakeCode) Add(table string,user Map, req *http.Request) Map {
if len(req.Form[v.GetString("name")]) == 0 {
if user[v.GetString("name")]!=nil{
if user[v.GetString("name")] != nil {
data[v.GetString("name")] = user[v.GetString("name")]
continue
}
if that.FileConfig.GetString("table")+"_id"==v.GetString("name"){
if that.FileConfig.GetString("table")+"_id" == v.GetString("name") {
data[v.GetString("name")] = user["id"]
continue
}
@@ -666,12 +678,22 @@ func (that *MakeCode) Add(table string,user Map, req *http.Request) Map {
}
if v.GetString("name") == "create_time" {
data[v.GetString("name")] = time.Now().Unix()
if v.GetString("type") == "unixTime" {
data[v.GetString("name")] = time.Now().Unix()
}
if v.GetString("type") == "time" {
data[v.GetString("name")] = time.Now().Format("2006-01-02 15-04-05")
}
continue
}
if v.GetString("name") == "modify_time" {
data[v.GetString("name")] = time.Now().Unix()
if v.GetString("type") == "unixTime" {
data[v.GetString("name")] = time.Now().Unix()
}
if v.GetString("type") == "time" {
data[v.GetString("name")] = time.Now().Format("2006-01-02 15-04-05")
}
}
}
if len(data) == 0 {
@@ -764,8 +786,7 @@ 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{
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,"
@@ -866,9 +887,9 @@ func (that *MakeCode) Search(table string, userData Map, req *http.Request, db *
//日期类型
if searchItemName == "daterange" && v.GetString("type") == "time" {
//fmt.Println(req.Form["daterange"])
if len(req.Form["daterange"])==1{
daterange[table+"."+v.GetString("name")+"[<]"]=req.FormValue("daterange")
}else{
if len(req.Form["daterange"]) == 1 {
daterange[table+"."+v.GetString("name")+"[<]"] = req.FormValue("daterange")
} else {
daterange[table+"."+v.GetString("name")+"[<>]"] = ObjToSlice(req.Form["daterange"])
}
@@ -924,7 +945,7 @@ func (that *MakeCode) Search(table string, userData Map, req *http.Request, db *
if len(daterange) > 1 {
//if data["AND"] == nil {
data = Map{"AND": Map{"AND": data, "OR": daterange}}
data = Map{"AND": Map{"AND": data, "OR": daterange}}
//}else{
// data = Map{"AND": Map{"AND": data, "OR": daterange}}
//}