增加表关联新建功能,同时修复数据库bug
This commit is contained in:
+1
-1
@@ -87,6 +87,6 @@ var ColumnNameType = []ColumnShow{
|
||||
{"file", false, true, true, false, "file", false},
|
||||
{"age", false, true, true, false, "", false},
|
||||
{"email", false, true, true, false, "", false},
|
||||
{"time", true, false, false, false, "", false},
|
||||
{"time", true, false, true, false, "", false},
|
||||
{"level", false, false, true, false, "", false},
|
||||
}
|
||||
|
||||
+14
-7
@@ -203,7 +203,7 @@ func (that *MakeCode) Db2JSON(name string, path string, db db.HoTimeDB) {
|
||||
}
|
||||
|
||||
for _, v := range ColumnNameType {
|
||||
if (v.Strict && coloum.GetString("name") == v.Name) || strings.Contains(coloum.GetString("name"), v.Name) {
|
||||
if (v.Strict && coloum.GetString("name") == v.Name) || (!v.Strict && strings.Contains(coloum.GetString("name"), v.Name)) {
|
||||
//全部都不需要则不加入
|
||||
if v.Edit == false && v.List == false && v.Info == false {
|
||||
coloum["notUse"] = true
|
||||
@@ -386,11 +386,12 @@ func (that *MakeCode) Db2JSON(name string, path string, db db.HoTimeDB) {
|
||||
|
||||
//字段有动词前缀,自动进行解析
|
||||
prefixColumn := strings.Index(oldTableName, "_")
|
||||
|
||||
//sys_org_id oldTableName即为sys此处判断为org表存在
|
||||
|
||||
if prefixColumn > -1 && that.TableConfig[oldTableName[prefixColumn+1:]] != nil {
|
||||
oldTableName = oldTableName[prefixColumn+1:]
|
||||
}
|
||||
|
||||
//如果依然找不到则查询system_org是否存在
|
||||
if prefixColumn > -1 && that.TableConfig[DefaultMenuParentName+"_"+oldTableName[prefixColumn+1:]] != nil {
|
||||
oldTableName = DefaultMenuParentName + "_" + oldTableName[prefixColumn+1:]
|
||||
@@ -404,7 +405,7 @@ func (that *MakeCode) Db2JSON(name string, path string, db db.HoTimeDB) {
|
||||
if prefix > 0 {
|
||||
//表模块前缀sys_user sys即为前缀 sys_org
|
||||
tableName = fk[:prefix+1] + oldTableName
|
||||
if that.TableConfig[tableName] == nil {
|
||||
if that.TableConfig[tableName] == nil || that.TableConfig[oldTableName] != nil {
|
||||
//不存在则改为org
|
||||
tableName = oldTableName
|
||||
}
|
||||
@@ -486,7 +487,7 @@ func (that *MakeCode) Info(table string) string {
|
||||
continue
|
||||
}
|
||||
if v.Get("info") == nil || v.GetBool("info") {
|
||||
reStr += v.GetString("name") + ","
|
||||
reStr += "`" + v.GetString("name") + "`,"
|
||||
}
|
||||
}
|
||||
if len(reStr) != 0 {
|
||||
@@ -502,11 +503,17 @@ func (that *MakeCode) Add(table string, req *http.Request) Map {
|
||||
continue
|
||||
}
|
||||
if v.Get("add") == nil || v.GetBool("add") {
|
||||
reqValue := req.FormValue(v.GetString("name"))
|
||||
if reqValue == "" {
|
||||
|
||||
if len(req.Form[v.GetString("name")]) == 0 {
|
||||
return nil
|
||||
}
|
||||
data[v.GetString("name")] = reqValue
|
||||
reqValue := req.FormValue(v.GetString("name"))
|
||||
if reqValue == "" && strings.Contains(v.GetString("name"), "id") {
|
||||
data[v.GetString("name")] = nil
|
||||
} else {
|
||||
data[v.GetString("name")] = reqValue
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
if len(data) == 0 {
|
||||
|
||||
Reference in New Issue
Block a user