make table model types more clear

cg33 · cg33 · commit 6a0a96eac9c3 · 2019-10-05T09:17:17.000+08:00
diff --git a/examples/beego/main.go b/examples/beego/main.go
@@ -7,7 +7,6 @@ import (
 	"github.com/chenhg5/go-admin/engine"
 	"github.com/chenhg5/go-admin/examples/datamodel"
 	"github.com/chenhg5/go-admin/modules/config"
-	"github.com/chenhg5/go-admin/modules/db"
 	"github.com/chenhg5/go-admin/modules/language"
 	"github.com/chenhg5/go-admin/plugins/admin"
 	"github.com/chenhg5/go-admin/plugins/example"
@@ -29,7 +28,7 @@ func main() {
 				Name:       "godmin",
 				MaxIdleCon: 50,
 				MaxOpenCon: 150,
-				Driver:     db.DriverMysql,
+				Driver:     config.DriverMysql,
 			},
 		},
 		UrlPrefix: "admin",
diff --git a/examples/buffalo/main.go b/examples/buffalo/main.go
@@ -5,7 +5,6 @@ import (
 	"github.com/chenhg5/go-admin/engine"
 	"github.com/chenhg5/go-admin/examples/datamodel"
 	"github.com/chenhg5/go-admin/modules/config"
-	"github.com/chenhg5/go-admin/modules/db"
 	"github.com/chenhg5/go-admin/modules/language"
 	"github.com/chenhg5/go-admin/plugins/admin"
 	"github.com/chenhg5/go-admin/plugins/example"
@@ -33,7 +32,7 @@ func main() {
 				Name:       "godmin",
 				MaxIdleCon: 50,
 				MaxOpenCon: 150,
-				Driver:     db.DriverMysql,
+				Driver:     config.DriverMysql,
 			},
 		},
 		UrlPrefix: "admin",
diff --git a/examples/chi/main.go b/examples/chi/main.go
@@ -5,7 +5,6 @@ import (
 	"github.com/chenhg5/go-admin/engine"
 	"github.com/chenhg5/go-admin/examples/datamodel"
 	"github.com/chenhg5/go-admin/modules/config"
-	"github.com/chenhg5/go-admin/modules/db"
 	"github.com/chenhg5/go-admin/modules/language"
 	"github.com/chenhg5/go-admin/plugins/admin"
 	"github.com/chenhg5/go-admin/plugins/example"
@@ -29,7 +28,7 @@ func main() {
 				Name:       "godmin",
 				MaxIdleCon: 50,
 				MaxOpenCon: 150,
-				Driver:     db.DriverMysql,
+				Driver:     config.DriverMysql,
 			},
 		},
 		UrlPrefix: "admin",
diff --git a/examples/echo/main.go b/examples/echo/main.go
@@ -5,7 +5,6 @@ import (
 	"github.com/chenhg5/go-admin/engine"
 	"github.com/chenhg5/go-admin/examples/datamodel"
 	"github.com/chenhg5/go-admin/modules/config"
-	"github.com/chenhg5/go-admin/modules/db"
 	"github.com/chenhg5/go-admin/modules/language"
 	"github.com/chenhg5/go-admin/plugins/admin"
 	"github.com/chenhg5/go-admin/plugins/example"
@@ -27,7 +26,7 @@ func main() {
 				Name:       "godmin",
 				MaxIdleCon: 50,
 				MaxOpenCon: 150,
-				Driver:     db.DriverMysql,
+				Driver:     config.DriverMysql,
 			},
 		},
 		UrlPrefix: "admin",
diff --git a/examples/fasthttp/main.go b/examples/fasthttp/main.go
@@ -6,7 +6,6 @@ import (
 	"github.com/chenhg5/go-admin/engine"
 	"github.com/chenhg5/go-admin/examples/datamodel"
 	"github.com/chenhg5/go-admin/modules/config"
-	"github.com/chenhg5/go-admin/modules/db"
 	"github.com/chenhg5/go-admin/modules/language"
 	"github.com/chenhg5/go-admin/plugins/admin"
 	"github.com/chenhg5/go-admin/plugins/example"
@@ -29,7 +28,7 @@ func main() {
 				Name:       "godmin",
 				MaxIdleCon: 50,
 				MaxOpenCon: 150,
-				Driver:     db.DriverMysql,
+				Driver:     config.DriverMysql,
 			},
 		},
 		UrlPrefix: "admin",
diff --git a/examples/gin/main.go b/examples/gin/main.go
@@ -5,7 +5,6 @@ import (
 	"github.com/chenhg5/go-admin/engine"
 	"github.com/chenhg5/go-admin/examples/datamodel"
 	"github.com/chenhg5/go-admin/modules/config"
-	"github.com/chenhg5/go-admin/modules/db"
 	"github.com/chenhg5/go-admin/modules/language"
 	"github.com/chenhg5/go-admin/plugins/admin"
 	"github.com/chenhg5/go-admin/plugins/example"
@@ -33,9 +32,9 @@ func main() {
 				Name:       "godmin",
 				MaxIdleCon: 50,
 				MaxOpenCon: 150,
-				Driver:     db.DriverMysql,
+				Driver:     config.DriverMysql,
 
-				//Driver: db.DriverSqlite,
+				//Driver: config.DriverSqlite,
 				//File:   "../datamodel/admin.db",
 			},
 		},
diff --git a/examples/gorilla/main.go b/examples/gorilla/main.go
@@ -9,7 +9,6 @@ import (
 	"github.com/chenhg5/go-admin/engine"
 	"github.com/chenhg5/go-admin/examples/datamodel"
 	"github.com/chenhg5/go-admin/modules/config"
-	"github.com/chenhg5/go-admin/modules/db"
 	"github.com/chenhg5/go-admin/modules/language"
 	"github.com/chenhg5/go-admin/plugins/admin"
 	"github.com/chenhg5/go-admin/plugins/example"
@@ -30,7 +29,7 @@ func main() {
 				Name:       "godmin",
 				MaxIdleCon: 50,
 				MaxOpenCon: 150,
-				Driver:     db.DriverMysql,
+				Driver:     config.DriverMysql,
 			},
 		},
 		Store: config.Store{
diff --git a/examples/iris/main.go b/examples/iris/main.go
@@ -5,7 +5,6 @@ import (
 	"github.com/chenhg5/go-admin/engine"
 	"github.com/chenhg5/go-admin/examples/datamodel"
 	"github.com/chenhg5/go-admin/modules/config"
-	"github.com/chenhg5/go-admin/modules/db"
 	"github.com/chenhg5/go-admin/modules/language"
 	"github.com/chenhg5/go-admin/plugins/admin"
 	"github.com/chenhg5/go-admin/plugins/example"
@@ -27,7 +26,7 @@ func main() {
 				Name:       "godmin",
 				MaxIdleCon: 50,
 				MaxOpenCon: 150,
-				Driver:     db.DriverMysql,
+				Driver:     config.DriverMysql,
 			},
 		},
 		UrlPrefix: "admin",
diff --git a/modules/config/config.go b/modules/config/config.go
@@ -59,6 +59,11 @@ const (
 	EnvTest  = "test"
 	EnvLocal = "local"
 	EnvProd  = "prod"
+
+	DriverMysql      = "mysql"
+	DriverSqlite     = "sqlite"
+	DriverPostgresql = "postgresql"
+	DriverMssql      = "mssql"
 )
 
 // Store is the file store config. Path is the local store path.
diff --git a/modules/system/version.go b/modules/system/version.go
@@ -1,3 +1,3 @@
 package system
 
-const Version = "v0.2.0"
+const Version = "v0.2.1"
diff --git a/plugins/admin/controller/edit.go b/plugins/admin/controller/edit.go
@@ -10,7 +10,6 @@ import (
 	"github.com/chenhg5/go-admin/plugins/admin/modules/table"
 	"github.com/chenhg5/go-admin/template"
 	"github.com/chenhg5/go-admin/template/types"
-	"github.com/chenhg5/go-admin/template/types/form"
 	template2 "html/template"
 	"net/http"
 )
@@ -55,7 +54,7 @@ func EditForm(ctx *context.Context) {
 	}
 
 	// process uploading files, only support local storage for now.
-	if len(form.File) > 0 {
+	if len(param.MultiForm.File) > 0 {
 		_, _ = file.GetFileEngine("local").Upload(param.MultiForm)
 	}
 
diff --git a/plugins/admin/modules/table/generators.go b/plugins/admin/modules/table/generators.go
@@ -342,7 +342,7 @@ func GetPermissionTable() (PermissionTable Table) {
 			FilterFn: func(model types.RowModel) interface{} {
 				return strings.Split(model.Value, ",")
 			},
-			PostFilterFn: func(model types.PostRowModel) interface{} {
+			PostFilterFn: func(model types.PostRowModel) string {
 				return strings.Join(model.Value, ",")
 			},
 		}, {
@@ -351,7 +351,7 @@ func GetPermissionTable() (PermissionTable Table) {
 			TypeName: db.Varchar,
 			Default:  "",
 			Editable: true,
-			FormType: "textarea",
+			FormType: form.TextArea,
 			FilterFn: func(model types.RowModel) interface{} {
 				return model.Value
 			},
diff --git a/plugins/admin/modules/table/table.go b/plugins/admin/modules/table/table.go
@@ -324,18 +324,24 @@ func (tb DefaultTable) GetDataFromDatabase(path string, params parameter.Paramet
 			if tb.info.FieldList[j].Hide {
 				continue
 			}
+			var value interface{}
 			if checkInTable(columns, tb.info.FieldList[j].Field) {
-				tempModelData[tb.info.FieldList[j].Head] = template.HTML(tb.info.FieldList[j].FilterFn(types.RowModel{
+				value = tb.info.FieldList[j].FilterFn(types.RowModel{
 					ID:    primaryKeyValue.String(),
 					Value: db.GetValueFromDatabaseType(tb.info.FieldList[j].TypeName, row[tb.info.FieldList[j].Field]).String(),
 					Row:   row,
-				}).(string))
+				})
 			} else {
-				tempModelData[tb.info.FieldList[j].Head] = template.HTML(tb.info.FieldList[j].FilterFn(types.RowModel{
+				value = tb.info.FieldList[j].FilterFn(types.RowModel{
 					ID:    primaryKeyValue.String(),
 					Value: "",
 					Row:   row,
-				}).(string))
+				})
+			}
+			if valueStr, ok := value.(string); ok {
+				tempModelData[tb.info.FieldList[j].Head] = template.HTML(valueStr)
+			} else {
+				tempModelData[tb.info.FieldList[j].Head] = value.(template.HTML)
 			}
 		}
 
@@ -450,18 +456,25 @@ func (tb DefaultTable) GetDataFromDatabaseWithIds(path string, params parameter.
 			if tb.info.FieldList[j].Hide {
 				continue
 			}
+			var value interface{}
 			if checkInTable(columns, tb.info.FieldList[j].Field) {
-				tempModelData[tb.info.FieldList[j].Head] = template.HTML(tb.info.FieldList[j].FilterFn(types.RowModel{
+				value = tb.info.FieldList[j].FilterFn(types.RowModel{
 					ID:    primaryKeyValue.String(),
 					Value: db.GetValueFromDatabaseType(tb.info.FieldList[j].TypeName, row[tb.info.FieldList[j].Field]).String(),
 					Row:   row,
-				}).(string))
+				})
 			} else {
-				tempModelData[tb.info.FieldList[j].Head] = template.HTML(tb.info.FieldList[j].FilterFn(types.RowModel{
+				value = tb.info.FieldList[j].FilterFn(types.RowModel{
 					ID:    primaryKeyValue.String(),
 					Value: "",
 					Row:   row,
-				}).(string))
+				})
+			}
+
+			if valueStr, ok := value.(string); ok {
+				tempModelData[tb.info.FieldList[j].Head] = template.HTML(valueStr)
+			} else {
+				tempModelData[tb.info.FieldList[j].Head] = value.(template.HTML)
 			}
 		}
 
@@ -520,7 +533,7 @@ func (tb DefaultTable) GetDataFromDatabaseWithId(id string) ([]types.Form, strin
 
 	for i := 0; i < len(tb.form.FormList); i++ {
 		if checkInTable(columns, tb.form.FormList[i].Field) {
-			if tb.form.FormList[i].FormType == "select" || tb.form.FormList[i].FormType == "selectbox" || tb.form.FormList[i].FormType == "select_single" {
+			if tb.form.FormList[i].FormType.IsSelect() {
 				valueArr := tb.form.FormList[i].FilterFn(types.RowModel{
 					ID:    id,
 					Value: db.GetValueFromDatabaseType(tb.form.FormList[i].TypeName, res[tb.form.FormList[i].Field]).String(),
@@ -539,7 +552,7 @@ func (tb DefaultTable) GetDataFromDatabaseWithId(id string) ([]types.Form, strin
 				}).(string)
 			}
 		} else {
-			if tb.form.FormList[i].FormType == "select" || tb.form.FormList[i].FormType == "selectbox" {
+			if tb.form.FormList[i].FormType.IsSelect() {
 				valueArr := tb.form.FormList[i].FilterFn(types.RowModel{
 					ID:    id,
 					Value: db.GetValueFromDatabaseType(tb.form.FormList[i].TypeName, res[tb.form.FormList[i].Field]).String(),
diff --git a/template/adminlte/resource/pages/components/form.tmpl b/template/adminlte/resource/pages/components/form.tmpl
@@ -22,41 +22,41 @@
                 <div class="fields-group">
                     {{range $key, $data := .Content}}
                         <div class="form-group">
-                            {{if eq $data.FormType "default"}}
+                            {{if eq $data.FormType.String "default"}}
                                 {{ template "form_default" $data }}
-                            {{else if eq $data.FormType "text"}}
+                            {{else if eq $data.FormType.String "text"}}
                                 {{ template "form_text" $data }}
-                            {{else if eq $data.FormType "file"}}
+                            {{else if eq $data.FormType.String "file"}}
                                 {{ template "form_file" $data }}
-                            {{else if eq $data.FormType "password"}}
+                            {{else if eq $data.FormType.String "password"}}
                                 {{ template "form_password" $data }}
-                            {{else if eq $data.FormType "selectbox"}}
+                            {{else if eq $data.FormType.String "selectbox"}}
                                 {{ template "form_selectbox" $data }}
-                            {{else if eq $data.FormType "select"}}
+                            {{else if eq $data.FormType.String "select"}}
                                 {{ template "form_select" $data }}
-                            {{else if eq $data.FormType "select_single"}}
+                            {{else if eq $data.FormType.String "select_single"}}
                                 {{ template "form_select_single" $data }}
-                            {{else if eq $data.FormType "textarea"}}
+                            {{else if eq $data.FormType.String "textarea"}}
                                 {{ template "form_textarea" $data }}
-                            {{else if eq $data.FormType "iconpicker"}}
+                            {{else if eq $data.FormType.String "iconpicker"}}
                                 {{ template "form_iconpicker" $data }}
-                            {{else if eq $data.FormType "richtext"}}
+                            {{else if eq $data.FormType.String "richtext"}}
                                 {{ template "form_rich_text" $data }}
-                            {{else if eq $data.FormType "datetime"}}
+                            {{else if eq $data.FormType.String "datetime"}}
                                 {{ template "form_datetime" $data }}
-                            {{else if eq $data.FormType "radio"}}
+                            {{else if eq $data.FormType.String "radio"}}
                                 {{ template "form_radio" $data }}
-                            {{else if eq $data.FormType "email"}}
+                            {{else if eq $data.FormType.String "email"}}
                                 {{ template "form_email" $data }}
-                            {{else if eq $data.FormType "url"}}
+                            {{else if eq $data.FormType.String "url"}}
                                 {{ template "form_url" $data }}
-                            {{else if eq $data.FormType "ip"}}
+                            {{else if eq $data.FormType.String "ip"}}
                                 {{ template "form_ip" $data }}
-                            {{else if eq $data.FormType "color"}}
+                            {{else if eq $data.FormType.String "color"}}
                                 {{ template "form_color" $data }}
-                            {{else if eq $data.FormType "currency"}}
+                            {{else if eq $data.FormType.String "currency"}}
                                 {{ template "form_currency" $data }}
-                            {{else if eq $data.FormType "number"}}
+                            {{else if eq $data.FormType.String "number"}}
                                 {{ template "form_number" $data }}
                             {{end}}
                         </div>
diff --git a/template/adminlte/tmpl/template.go b/template/adminlte/tmpl/template.go
diff --git a/template/types/form/form.go b/template/types/form/form.go
diff --git a/template/types/types.go b/template/types/types.go

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`package system`
`2`	`2`
`3`		`-const Version = "v0.2.0"`
	`3`	`+const Version = "v0.2.1"`