Feature: table inline edit suppport

Author: cg33

examples/datamodel/content.go

@@ -26,7 +26,7 @@ func GetContent() (types.Panel, error) {
 		SetText("CPU TRAFFIC").
 		SetColor("#3583af").
 		SetNumber("100").
-		SetIcon("fa-tint").
+		SetIcon(`<svg t="1568904058859" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2216" width="48" height="48"><path d="M864 64l-704 0C142.336 64 128 78.336 128 96l0 832C128 945.664 142.336 960 160 960l704 0c17.664 0 32-14.336 32-32l0-832C896 78.336 881.664 64 864 64zM832 896 192 896 192 128l640 0L832 896z" fill="#e6e6e6" p-id="2217"></path><path d="M353.92 320c17.6 0 32-14.336 32-32S371.584 256 353.92 256L353.28 256C335.616 256 321.6 270.336 321.6 288S336.256 320 353.92 320z" fill="#e6e6e6" p-id="2218"></path><path d="M353.92 512c17.6 0 32-14.336 32-32S371.584 448 353.92 448L353.28 448C335.616 448 321.6 462.336 321.6 480S336.256 512 353.92 512z" fill="#e6e6e6" p-id="2219"></path><path d="M353.92 704c17.6 0 32-14.336 32-32S371.584 640 353.92 640L353.28 640c-17.6 0-31.616 14.336-31.616 32S336.256 704 353.92 704z" fill="#e6e6e6" p-id="2220"></path><path d="M480 320l192 0C689.664 320 704 305.664 704 288S689.664 256 672 256l-192 0C462.336 256 448 270.336 448 288S462.336 320 480 320z" fill="#e6e6e6" p-id="2221"></path><path d="M480 512l192 0C689.664 512 704 497.664 704 480S689.664 448 672 448l-192 0C462.336 448 448 462.336 448 480S462.336 512 480 512z" fill="#e6e6e6" p-id="2222"></path><path d="M480 704l192 0c17.664 0 32-14.336 32-32S689.664 640 672 640l-192 0C462.336 640 448 654.336 448 672S462.336 704 480 704z" fill="#e6e6e6" p-id="2223"></path></svg>`).
 		GetContent()
 
 	infobox2 := infobox.New().

examples/datamodel/posts.go

@@ -4,6 +4,7 @@ import (
 	"github.com/GoAdminGroup/go-admin/modules/db"
 	"github.com/GoAdminGroup/go-admin/plugins/admin/modules/table"
 	"github.com/GoAdminGroup/go-admin/template/types/form"
+	editType "github.com/GoAdminGroup/go-admin/template/types/table"
 )
 
 func GetPostsTable() (postsTable table.Table) {
@@ -14,7 +15,7 @@ func GetPostsTable() (postsTable table.Table) {
 	info.AddField("ID", "id", db.Int).FieldSortable()
 	info.AddField("Title", "title", db.Varchar)
 	info.AddField("Description", "description", db.Varchar)
-	info.AddField("Content", "content", db.Varchar)
+	info.AddField("Content", "content", db.Varchar).FieldEditAble(editType.Textarea)
 	info.AddField("Date", "date", db.Varchar)
 
 	info.SetTable("posts").SetTitle("Posts").SetDescription("Posts")

examples/datamodel/user.go

@@ -8,7 +8,7 @@ import (
 	"github.com/GoAdminGroup/go-admin/template"
 	"github.com/GoAdminGroup/go-admin/template/types"
 	"github.com/GoAdminGroup/go-admin/template/types/form"
-	table2 "github.com/GoAdminGroup/go-admin/template/types/table"
+	editType "github.com/GoAdminGroup/go-admin/template/types/table"
 )
 
 func GetUserTable() (userTable table.Table) {
@@ -28,7 +28,7 @@ func GetUserTable() (userTable table.Table) {
 
 	info := userTable.GetInfo()
 	info.AddField("ID", "id", db.Int).FieldSortable()
-	info.AddField("Name", "name", db.Varchar).FieldEditAble()
+	info.AddField("Name", "name", db.Varchar).FieldEditAble(editType.Text)
 	info.AddField("Gender", "gender", db.Tinyint).FieldDisplay(func(model types.FieldModel) interface{} {
 		if model.Value == "0" {
 			return "men"
@@ -37,16 +37,19 @@ func GetUserTable() (userTable table.Table) {
 			return "women"
 		}
 		return "unknown"
+	}).FieldEditAble(editType.Select).FieldEditOptions([]map[string]string{
+		{"value": "0", "text": "men"},
+		{"value": "1", "text": "women"},
 	})
-	info.AddField("Phone", "phone", db.Varchar)
-	info.AddField("City", "city", db.Varchar)
+	info.AddField("Phone", "phone", db.Varchar).FieldEditAble()
+	info.AddField("City", "city", db.Varchar).FieldEditAble()
 	info.AddField("Avatar", "avatar", db.Varchar).FieldDisplay(func(value types.FieldModel) interface{} {
 		return template.Default().Image().
 			SetSrc(`//quick.go-admin.cn/demo/assets/dist/img/gopher_avatar.png`).
 			SetHeight("120").SetWidth("120").GetContent()
 	})
-	info.AddField("createdAt", "created_at", db.Timestamp).FieldEditAble(table2.Datetime)
-	info.AddField("updatedAt", "updated_at", db.Timestamp).FieldEditAble(table2.Datetime)
+	info.AddField("createdAt", "created_at", db.Timestamp).FieldEditAble(editType.Datetime)
+	info.AddField("updatedAt", "updated_at", db.Timestamp).FieldEditAble(editType.Datetime)
 
 	info.SetTable("users").SetTitle("Users").SetDescription("Users")
 

plugins/admin/modules/table/table.go

@@ -338,13 +338,14 @@ func (tb DefaultTable) GetDataFromDatabase(path string, params parameter.Paramet
 		editable = modules.AorB(tb.info.FieldList[i].EditAble, "true", "false")
 		hide = modules.AorB(modules.InArrayWithoutEmpty(params.Columns, headField), "0", "1")
 		thead = append(thead, map[string]string{
-			"head":     tb.info.FieldList[i].Head,
-			"sortable": sortable,
-			"field":    headField,
-			"hide":     hide,
-			"editable": editable,
-			"edittype": tb.info.FieldList[i].EditType.String(),
-			"width":    strconv.Itoa(tb.info.FieldList[i].Width),
+			"head":       tb.info.FieldList[i].Head,
+			"sortable":   sortable,
+			"field":      headField,
+			"hide":       hide,
+			"editable":   editable,
+			"edittype":   tb.info.FieldList[i].EditType.String(),
+			"editoption": tb.info.FieldList[i].GetEditOptions(),
+			"width":      strconv.Itoa(tb.info.FieldList[i].Width),
 		})
 	}
 
@@ -511,13 +512,14 @@ func (tb DefaultTable) GetDataFromDatabaseWithIds(path string, params parameter.
 		editable = modules.AorB(tb.info.FieldList[i].EditAble, "true", "false")
 		hide = modules.AorB(modules.InArrayWithoutEmpty(params.Columns, headField), "0", "1")
 		thead = append(thead, map[string]string{
-			"head":     tb.info.FieldList[i].Head,
-			"sortable": sortable,
-			"field":    headField,
-			"hide":     hide,
-			"editable": editable,
-			"edittype": tb.info.FieldList[i].EditType.String(),
-			"width":    strconv.Itoa(tb.info.FieldList[i].Width),
+			"head":       tb.info.FieldList[i].Head,
+			"sortable":   sortable,
+			"field":      headField,
+			"hide":       hide,
+			"editable":   editable,
+			"edittype":   tb.info.FieldList[i].EditType.String(),
+			"editoption": tb.info.FieldList[i].GetEditOptions(),
+			"width":      strconv.Itoa(tb.info.FieldList[i].Width),
 		})
 	}
 

template/types/table/table.go

@@ -8,14 +8,9 @@ const (
 	Select
 	Date
 	Datetime
-	Dateui
-	Combodate
-	Html5types
-	Checklist
-	Wysihtml5
-	Typeahead
-	Typeaheadjs
-	Select2
+	Year
+	Month
+	Day
 )
 
 func (t Type) String() string {
@@ -28,24 +23,14 @@ func (t Type) String() string {
 		return "textarea"
 	case Date:
 		return "date"
+	case Year:
+		return "year"
+	case Month:
+		return "month"
+	case Day:
+		return "day"
 	case Datetime:
 		return "datetime"
-	case Dateui:
-		return "dateui"
-	case Combodate:
-		return "combodate"
-	case Html5types:
-		return "html5types"
-	case Checklist:
-		return "checklist"
-	case Wysihtml5:
-		return "wysihtml5"
-	case Typeahead:
-		return "typeahead"
-	case Typeaheadjs:
-		return "typeaheadjs"
-	case Select2:
-		return "select2"
 	default:
 		panic("wrong form type")
 	}

template/types/types.go

@@ -5,6 +5,7 @@
 package types
 
 import (
+	"encoding/json"
 	"github.com/GoAdminGroup/go-admin/modules/config"
 	"github.com/GoAdminGroup/go-admin/modules/db"
 	"github.com/GoAdminGroup/go-admin/modules/menu"
@@ -332,6 +333,19 @@ type Field struct {
 	FieldDisplay
 }
 
+func (f Field) GetEditOptions() string {
+	if len(f.EditOptions) == 0 {
+		return ""
+	}
+	eo, err := json.Marshal(f.EditOptions)
+
+	if err != nil {
+		return ""
+	}
+
+	return string(eo)
+}
+
 type Join struct {
 	Table     string
 	Field     string