Skip to content

operation_translate 在数据库生成的时候可以获取到comment的数据 #670

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

operation_translate 在数据库生成的时候可以获取到comment的数据 #670

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions plugins/admin/modules/table/generators.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ func NewSystemTable(conn db.Connection, c *config.Config) *SystemTable {
return &SystemTable{conn: conn, c: c}
}


var filterType = types.FilterType{NoIcon: true, HeadWidth: 4, InputWidth: 8}

func (s *SystemTable) GetManagerTable(ctx *context.Context) (managerTable Table) {
Expand Down Expand Up @@ -1415,7 +1414,7 @@ func (s *SystemTable) GetGenerateForm(ctx *context.Context) (generateTool Table)
connName = ctx.FormValue("conn")
driver = s.c.Databases[connName].Driver
conn = db.GetConnectionFromService(services.Get(driver))
columnsModel, _ = db.WithDriverAndConnection(connName, conn).Table(tableName).ShowColumns()
columnsModel, _ = db.WithDriverAndConnection(connName, conn).Table(tableName).ShowColumnsWithComment(conn.GetConfig(connName).Name)

fieldField = "Field"
typeField = "Type"
Expand All @@ -1442,7 +1441,12 @@ func (s *SystemTable) GetGenerateForm(ctx *context.Context) (generateTool Table)
for i, model := range columnsModel {
typeName := getType(model[typeField].(string))

headName[i] = cases.Title(textLang.Und).String(model[fieldField].(string))
comment, _ := model["Comment"].(string)
if comment != "" {
headName[i] = comment
} else {
headName[i] = cases.Title(textLang.Und).String(model[fieldField].(string))
}
fieldName[i] = model[fieldField].(string)
dbTypeList[i] = typeName
formTypeList[i] = form.GetFormTypeFromFieldType(db.DT(strings.ToUpper(typeName)),
Expand Down