Skip to content

Commit ca6b95f

Browse files
author
cg33
committed
Merge branch 'master' of github.com:GoAdminGroup/go-admin
2 parents f435911 + 0de64c6 commit ca6b95f

File tree

1 file changed

+18
-7
lines changed

1 file changed

+18
-7
lines changed

plugins/admin/modules/table/table.go

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -745,17 +745,28 @@ func (tb DefaultTable) GetDataFromDatabaseWithId(id string) ([]types.FormField,
745745
for i := 0; i < len(tb.form.FieldList); i++ {
746746
if checkInTable(columns, formList[i].Field) {
747747
if formList[i].FormType.IsSelect() {
748-
valueArr := formList[i].ToDisplay(types.FieldModel{
748+
valueRet := formList[i].ToDisplay(types.FieldModel{
749749
ID: id,
750750
Value: db.GetValueFromDatabaseType(formList[i].TypeName, res[formList[i].Field]).String(),
751751
Row: res,
752-
}).([]string)
752+
})
753753

754-
for _, v := range formList[i].Options {
755-
if modules.InArray(valueArr, v["value"]) {
756-
v["selected"] = "selected"
757-
} else {
758-
v["selected"] = ""
754+
if _, ok := valueRet.(string); ok {
755+
for _, v := range formList[i].Options {
756+
if v["value"] == valueRet {
757+
v["selected"] = "selected"
758+
} else {
759+
v["selected"] = ""
760+
}
761+
}
762+
} else {
763+
valueArr := valueRet.([]string)
764+
for _, v := range formList[i].Options {
765+
if modules.InArray(valueArr, v["value"]) {
766+
v["selected"] = "selected"
767+
} else {
768+
v["selected"] = ""
769+
}
759770
}
760771
}
761772
} else if formList[i].FormType.IsRadio() {

0 commit comments

Comments
 (0)