add post validator & post hook

GoAdminGroup · Oct 7, 2019 · ee4caf6 · ee4caf6
1 parent c947ae3
commit ee4caf6
Show file tree

Hide file tree

Showing 19 changed files with 109 additions and 30 deletions.
diff --git a/adapter/beego/beego.go b/adapter/beego/beego.go
@@ -13,6 +13,7 @@ import (
 	"github.com/chenhg5/go-admin/engine"
 	"github.com/chenhg5/go-admin/modules/auth"
 	"github.com/chenhg5/go-admin/modules/config"
+	"github.com/chenhg5/go-admin/modules/language"
 	"github.com/chenhg5/go-admin/modules/logger"
 	"github.com/chenhg5/go-admin/modules/menu"
 	"github.com/chenhg5/go-admin/modules/system"
@@ -106,7 +107,7 @@ func (bee *Beego) Content(contextInterface interface{}, c types.GetPanel) {
 	var panel types.Panel
 
 	if !auth.CheckPermissions(user, ctx.Request.URL.Path, ctx.Request.Method) {
-		alert := template.Get(globalConfig.Theme).Alert().SetTitle(template2.HTML(`<i class="icon fa fa-warning"></i> Error!`)).
+		alert := template.Get(globalConfig.Theme).Alert().SetTitle(template2.HTML(`<i class="icon fa fa-warning"></i> ` + language.Get("error") + `!`)).
 			SetTheme("warning").SetContent(template2.HTML("no permission")).GetContent()
 
 		panel = types.Panel{

diff --git a/adapter/buffalo/buffalo.go b/adapter/buffalo/buffalo.go
@@ -11,6 +11,7 @@ import (
 	"github.com/chenhg5/go-admin/engine"
 	"github.com/chenhg5/go-admin/modules/auth"
 	"github.com/chenhg5/go-admin/modules/config"
+	"github.com/chenhg5/go-admin/modules/language"
 	"github.com/chenhg5/go-admin/modules/logger"
 	"github.com/chenhg5/go-admin/modules/menu"
 	"github.com/chenhg5/go-admin/modules/system"
@@ -152,7 +153,7 @@ func (bu *Buffalo) Content(contextInterface interface{}, c types.GetPanel) {
 	var panel types.Panel
 
 	if !auth.CheckPermissions(user, ctx.Request().URL.Path, ctx.Request().Method) {
-		alert := template.Get(globalConfig.Theme).Alert().SetTitle(template2.HTML(`<i class="icon fa fa-warning"></i> Error!`)).
+		alert := template.Get(globalConfig.Theme).Alert().SetTitle(template2.HTML(`<i class="icon fa fa-warning"></i> ` + language.Get("error") + `!`)).
 			SetTheme("warning").SetContent(template2.HTML("no permission")).GetContent()
 
 		panel = types.Panel{

diff --git a/adapter/chi/chi.go b/adapter/chi/chi.go
@@ -11,6 +11,7 @@ import (
 	"github.com/chenhg5/go-admin/engine"
 	"github.com/chenhg5/go-admin/modules/auth"
 	cfg "github.com/chenhg5/go-admin/modules/config"
+	"github.com/chenhg5/go-admin/modules/language"
 	"github.com/chenhg5/go-admin/modules/logger"
 	"github.com/chenhg5/go-admin/modules/menu"
 	"github.com/chenhg5/go-admin/modules/system"
@@ -158,7 +159,7 @@ func (bu *Chi) Content(contextInterface interface{}, c types.GetPanel) {
 	var panel types.Panel
 
 	if !auth.CheckPermissions(user, ctx.Request.URL.Path, ctx.Request.Method) {
-		alert := template.Get(config.Theme).Alert().SetTitle(template2.HTML(`<i class="icon fa fa-warning"></i> Error!`)).
+		alert := template.Get(config.Theme).Alert().SetTitle(template2.HTML(`<i class="icon fa fa-warning"></i> ` + language.Get("error") + `!`)).
 			SetTheme("warning").SetContent(template2.HTML("no permission")).GetContent()
 
 		panel = types.Panel{

diff --git a/adapter/echo/echo.go b/adapter/echo/echo.go
@@ -11,6 +11,7 @@ import (
 	"github.com/chenhg5/go-admin/engine"
 	"github.com/chenhg5/go-admin/modules/auth"
 	"github.com/chenhg5/go-admin/modules/config"
+	"github.com/chenhg5/go-admin/modules/language"
 	"github.com/chenhg5/go-admin/modules/logger"
 	"github.com/chenhg5/go-admin/modules/menu"
 	"github.com/chenhg5/go-admin/modules/system"
@@ -107,7 +108,7 @@ func (e *Echo) Content(contextInterface interface{}, c types.GetPanel) {
 	var panel types.Panel
 
 	if !auth.CheckPermissions(user, ctx.Path(), ctx.Request().Method) {
-		alert := template.Get(globalConfig.Theme).Alert().SetTitle(template2.HTML(`<i class="icon fa fa-warning"></i> Error!`)).
+		alert := template.Get(globalConfig.Theme).Alert().SetTitle(template2.HTML(`<i class="icon fa fa-warning"></i> ` + language.Get("error") + `!`)).
 			SetTheme("warning").SetContent(template2.HTML("no permission")).GetContent()
 
 		panel = types.Panel{

diff --git a/adapter/fasthttp/fasthttp.go b/adapter/fasthttp/fasthttp.go
@@ -12,6 +12,7 @@ import (
 	"github.com/chenhg5/go-admin/engine"
 	"github.com/chenhg5/go-admin/modules/auth"
 	"github.com/chenhg5/go-admin/modules/config"
+	"github.com/chenhg5/go-admin/modules/language"
 	"github.com/chenhg5/go-admin/modules/logger"
 	"github.com/chenhg5/go-admin/modules/menu"
 	"github.com/chenhg5/go-admin/modules/system"
@@ -172,7 +173,7 @@ func (fast *Fasthttp) Content(contextInterface interface{}, c types.GetPanel) {
 	var panel types.Panel
 
 	if !auth.CheckPermissions(user, string(ctx.Path()), string(ctx.Method())) {
-		alert := template.Get(globalConfig.Theme).Alert().SetTitle(template2.HTML(`<i class="icon fa fa-warning"></i> Error!`)).
+		alert := template.Get(globalConfig.Theme).Alert().SetTitle(template2.HTML(`<i class="icon fa fa-warning"></i> ` + language.Get("error") + `!`)).
 			SetTheme("warning").SetContent(template2.HTML("no permission")).GetContent()
 
 		panel = types.Panel{

diff --git a/adapter/gin/gin.go b/adapter/gin/gin.go
@@ -11,6 +11,7 @@ import (
 	"github.com/chenhg5/go-admin/engine"
 	"github.com/chenhg5/go-admin/modules/auth"
 	"github.com/chenhg5/go-admin/modules/config"
+	"github.com/chenhg5/go-admin/modules/language"
 	"github.com/chenhg5/go-admin/modules/logger"
 	"github.com/chenhg5/go-admin/modules/menu"
 	"github.com/chenhg5/go-admin/modules/system"
@@ -111,7 +112,7 @@ func (gins *Gin) Content(contextInterface interface{}, c types.GetPanel) {
 	var panel types.Panel
 
 	if !auth.CheckPermissions(user, ctx.Request.URL.Path, ctx.Request.Method) {
-		alert := template.Get(globalConfig.Theme).Alert().SetTitle(template2.HTML(`<i class="icon fa fa-warning"></i> Error!`)).
+		alert := template.Get(globalConfig.Theme).Alert().SetTitle(template2.HTML(`<i class="icon fa fa-warning"></i> ` + language.Get("error") + `!`)).
 			SetTheme("warning").SetContent(template2.HTML("no permission")).GetContent()
 
 		panel = types.Panel{

diff --git a/adapter/gorilla/gorilla.go b/adapter/gorilla/gorilla.go
@@ -3,6 +3,7 @@ package gorilla
 import (
 	"bytes"
 	"errors"
+	"github.com/chenhg5/go-admin/modules/language"
 	"github.com/chenhg5/go-admin/modules/logger"
 	"github.com/chenhg5/go-admin/modules/system"
 	"github.com/chenhg5/go-admin/plugins/admin/modules/constant"
@@ -131,7 +132,7 @@ func (g *Gorilla) Content(contextInterface interface{}, c types.GetPanel) {
 	var panel types.Panel
 
 	if !auth.CheckPermissions(user, ctx.Request.RequestURI, ctx.Request.Method) {
-		alert := template.Get(globalConfig.Theme).Alert().SetTitle(template2.HTML(`<i class="icon fa fa-warning"></i> Error!`)).
+		alert := template.Get(globalConfig.Theme).Alert().SetTitle(template2.HTML(`<i class="icon fa fa-warning"></i> ` + language.Get("error") + `!`)).
 			SetTheme("warning").SetContent(template2.HTML("Permission Denied")).GetContent()
 
 		panel = types.Panel{

diff --git a/adapter/iris/iris.go b/adapter/iris/iris.go
@@ -11,6 +11,7 @@ import (
 	"github.com/chenhg5/go-admin/engine"
 	"github.com/chenhg5/go-admin/modules/auth"
 	"github.com/chenhg5/go-admin/modules/config"
+	"github.com/chenhg5/go-admin/modules/language"
 	"github.com/chenhg5/go-admin/modules/logger"
 	"github.com/chenhg5/go-admin/modules/menu"
 	"github.com/chenhg5/go-admin/modules/system"
@@ -112,7 +113,7 @@ func (is *Iris) Content(contextInterface interface{}, c types.GetPanel) {
 	var panel types.Panel
 
 	if !auth.CheckPermissions(user, ctx.Path(), ctx.Method()) {
-		alert := template.Get(globalConfig.Theme).Alert().SetTitle(template2.HTML(`<i class="icon fa fa-warning"></i> Error!`)).
+		alert := template.Get(globalConfig.Theme).Alert().SetTitle(template2.HTML(`<i class="icon fa fa-warning"></i> ` + language.Get("error") + `!`)).
 			SetTheme("warning").SetContent(template2.HTML("no permission")).GetContent()
 
 		panel = types.Panel{

diff --git a/admincli/Makefile b/admincli/Makefile
@@ -1,8 +1,8 @@
 GOCMD=go
 GOBUILD=$(GOCMD) build
 BINARY_NAME=admincli
-LASTVERSION=v0.4.1
-VERSION=v0.4.2
+LASTVERSION=v0.4.2
+VERSION=v0.5.0
 
 all:
 	GO111MODULE=on $(GOBUILD) -o ./build/mac/$(BINARY_NAME)

diff --git a/examples/datamodel/user.go b/examples/datamodel/user.go
@@ -3,6 +3,7 @@ package datamodel
 import (
 	"fmt"
 	"github.com/chenhg5/go-admin/modules/db"
+	form2 "github.com/chenhg5/go-admin/plugins/admin/modules/form"
 	"github.com/chenhg5/go-admin/plugins/admin/modules/table"
 	"github.com/chenhg5/go-admin/template/types"
 	"github.com/chenhg5/go-admin/template/types/form"
@@ -227,5 +228,9 @@ func GetUserTable() (userTable table.Table) {
 	userTable.GetForm().Title = "Users"
 	userTable.GetForm().Description = "Users"
 
+	userTable.GetForm().PostHook = func(values form2.Values) {
+		fmt.Println("userTable.GetForm().PostHook", values)
+	}
+
 	return
 }
diff --git a/modules/system/version.go b/modules/system/version.go
@@ -1,3 +1,3 @@
 package system
 
-const Version = "v0.4.3"
+const Version = "v0.5.0"
diff --git a/plugins/admin/controller/edit.go b/plugins/admin/controller/edit.go
@@ -3,6 +3,7 @@ package controller
 import (
 	"github.com/chenhg5/go-admin/context"
 	"github.com/chenhg5/go-admin/modules/auth"
+	"github.com/chenhg5/go-admin/modules/language"
 	"github.com/chenhg5/go-admin/modules/menu"
 	"github.com/chenhg5/go-admin/plugins/admin/modules"
 	"github.com/chenhg5/go-admin/plugins/admin/modules/constant"
@@ -66,7 +67,15 @@ func EditForm(ctx *context.Context) {
 	} else if param.IsRole() { // role edit
 		editRole(param.Value())
 	} else {
-		param.Panel.UpdateDataFromDatabase(param.Value())
+		err := param.Panel.UpdateDataFromDatabase(param.Value())
+		if err != nil {
+			alert := aAlert().SetTitle(template2.HTML(`<i class="icon fa fa-warning"></i> ` + language.Get("error") + `!`)).
+				SetTheme("warning").
+				SetContent(template2.HTML(err.Error())).
+				GetContent()
+			showForm(ctx, alert, param.Panel, param.Id, param.GetUrl(), param.GetInfoUrl())
+			return
+		}
 	}
 
 	table.RefreshTableList()

diff --git a/plugins/admin/controller/menu.go b/plugins/admin/controller/menu.go
@@ -24,7 +24,7 @@ func ShowEditMenu(ctx *context.Context) {
 
 	if ctx.Query("id") == "" {
 		getMenuInfoPanel(ctx, template.Get(config.Theme).Alert().
-			SetTitle(template2.HTML(`<i class="icon fa fa-warning"></i> Error!`)).
+			SetTitle(template2.HTML(`<i class="icon fa fa-warning"></i> `+language.Get("error")+`!`)).
 			SetTheme("warning").
 			SetContent(template2.HTML("wrong id")).
 			GetContent())

diff --git a/plugins/admin/controller/new.go b/plugins/admin/controller/new.go
@@ -3,6 +3,7 @@ package controller
 import (
 	"github.com/chenhg5/go-admin/context"
 	"github.com/chenhg5/go-admin/modules/auth"
+	"github.com/chenhg5/go-admin/modules/language"
 	"github.com/chenhg5/go-admin/modules/menu"
 	"github.com/chenhg5/go-admin/plugins/admin/modules"
 	"github.com/chenhg5/go-admin/plugins/admin/modules/constant"
@@ -71,7 +72,15 @@ func NewForm(ctx *context.Context) {
 	} else if param.IsRole() { // role edit
 		newRole(param.Value())
 	} else {
-		param.Panel.InsertDataFromDatabase(param.Value())
+		err := param.Panel.InsertDataFromDatabase(param.Value())
+		if err != nil {
+			alert := aAlert().SetTitle(template2.HTML(`<i class="icon fa fa-warning"></i> ` + language.Get("error") + `!`)).
+				SetTheme("warning").
+				SetContent(template2.HTML(err.Error())).
+				GetContent()
+			showForm(ctx, alert, param.Panel, param.Id, param.GetUrl(), param.GetInfoUrl())
+			return
+		}
 	}
 
 	editUrl := modules.AorB(param.Panel.GetEditable(), param.GetEditUrl(), "")

diff --git a/plugins/admin/modules/form/form.go b/plugins/admin/modules/form/form.go
@@ -9,6 +9,10 @@ func (f Values) Get(key string) string {
 	return ""
 }
 
+func (f Values) Add(key string, value string) {
+	f[key] = []string{value}
+}
+
 func (f Values) IsEmpty(key ...string) bool {
 	for _, k := range key {
 		if f.Get(k) == "" {

diff --git a/plugins/admin/modules/guard/edit.go b/plugins/admin/modules/guard/edit.go
@@ -4,6 +4,7 @@ import (
 	"github.com/chenhg5/go-admin/context"
 	"github.com/chenhg5/go-admin/modules/auth"
 	"github.com/chenhg5/go-admin/modules/config"
+	"github.com/chenhg5/go-admin/modules/language"
 	"github.com/chenhg5/go-admin/plugins/admin/modules/form"
 	"github.com/chenhg5/go-admin/plugins/admin/modules/parameter"
 	"github.com/chenhg5/go-admin/plugins/admin/modules/response"
@@ -175,7 +176,7 @@ func alertWithTitleAndDesc(ctx *context.Context, title, desc, msg string) {
 
 func getAlert(msg string) template2.HTML {
 	return template.Get(config.Get().Theme).Alert().
-		SetTitle(template2.HTML(`<i class="icon fa fa-warning"></i> Error!`)).
+		SetTitle(template2.HTML(`<i class="icon fa fa-warning"></i> ` + language.Get("error") + `!`)).
 		SetTheme("warning").
 		SetContent(template2.HTML(msg)).
 		GetContent()

diff --git a/plugins/admin/modules/response/response.go b/plugins/admin/modules/response/response.go
@@ -39,7 +39,7 @@ func Alert(ctx *context.Context, config config.Config, desc, title, msg string)
 	user := auth.Auth(ctx)
 
 	alert := template.Get(config.Theme).Alert().
-		SetTitle(template2.HTML(`<i class="icon fa fa-warning"></i> Error!`)).
+		SetTitle(template2.HTML(`<i class="icon fa fa-warning"></i> ` + language.Get("error") + `!`)).
 		SetTheme("warning").
 		SetContent(template2.HTML(msg)).
 		GetContent()

diff --git a/plugins/admin/modules/table/table.go b/plugins/admin/modules/table/table.go
@@ -61,8 +61,8 @@ type Table interface {
 	GetDataFromDatabase(path string, params parameter.Parameters) PanelInfo
 	GetDataFromDatabaseWithIds(path string, params parameter.Parameters, ids []string) PanelInfo
 	GetDataFromDatabaseWithId(id string) ([]types.Form, [][]types.Form, []string, string, string)
-	UpdateDataFromDatabase(dataList form.Values)
-	InsertDataFromDatabase(dataList form.Values)
+	UpdateDataFromDatabase(dataList form.Values) error
+	InsertDataFromDatabase(dataList form.Values) error
 	DeleteDataFromDatabase(id string)
 }
 
@@ -779,15 +779,51 @@ func (tb DefaultTable) GetDataFromDatabaseWithId(id string) ([]types.Form, [][]t
 }
 
 // UpdateDataFromDatabase update data.
-func (tb DefaultTable) UpdateDataFromDatabase(dataList form.Values) {
-	_, _ = tb.sql().Table(tb.form.Table).
+func (tb DefaultTable) UpdateDataFromDatabase(dataList form.Values) error {
+
+	if tb.form.PostValidator != nil {
+		if err := tb.form.PostValidator(dataList); err != nil {
+			return err
+		}
+	}
+
+	_, err := tb.sql().Table(tb.form.Table).
 		Where(tb.primaryKey.Name, "=", dataList.Get(tb.primaryKey.Name)).
 		Update(tb.getValues(dataList))
+
+	if err != nil {
+		return err
+	}
+
+	if tb.form.PostHook != nil {
+		go tb.form.PostHook(dataList)
+	}
+
+	return nil
 }
 
 // InsertDataFromDatabase insert data.
-func (tb DefaultTable) InsertDataFromDatabase(dataList form.Values) {
-	_, _ = tb.sql().Table(tb.form.Table).Insert(tb.getValues(dataList))
+func (tb DefaultTable) InsertDataFromDatabase(dataList form.Values) error {
+
+	if tb.form.PostValidator != nil {
+		if err := tb.form.PostValidator(dataList); err != nil {
+			return err
+		}
+	}
+
+	id, err := tb.sql().Table(tb.form.Table).Insert(tb.getValues(dataList))
+
+	if err != nil {
+		return err
+	}
+
+	dataList.Add(tb.GetPrimaryKey().Name, strconv.Itoa(int(id)))
+
+	if tb.form.PostHook != nil {
+		go tb.form.PostHook(dataList)
+	}
+
+	return nil
 }
 
 func (tb DefaultTable) getValues(dataList form.Values) dialect.H {

diff --git a/template/types/types.go b/template/types/types.go
@@ -9,6 +9,7 @@ import (
 	"github.com/chenhg5/go-admin/modules/menu"
 	"github.com/chenhg5/go-admin/plugins/admin/models"
 	"github.com/chenhg5/go-admin/plugins/admin/modules"
+	form2 "github.com/chenhg5/go-admin/plugins/admin/modules/form"
 	"github.com/chenhg5/go-admin/template/types/form"
 	"html/template"
 )
@@ -165,16 +166,22 @@ const (
 
 // FormPanel
 type FormPanel struct {
-	FormList     FormList
-	Group        [][]string
-	GroupHeaders []string
-	Table        string
-	Title        string
-	Description  string
-	HeaderHtml   template.HTML
-	FooterHtml   template.HTML
+	FormList      FormList
+	Group         [][]string
+	GroupHeaders  []string
+	Table         string
+	Title         string
+	Description   string
+	PostValidator PostValidator
+	PostHook      PostHookFn
+	HeaderHtml    template.HTML
+	FooterHtml    template.HTML
 }
 
+type PostValidator func(values form2.Values) error
+
+type PostHookFn func(values form2.Values)
+
 type FormList []Form
 
 func (f FormList) Copy() FormList {