fix form type add custom && add editable table field options attribute

Author: cg33

examples/datamodel/content.go

@@ -26,7 +26,7 @@ func GetContent() (types.Panel, error) {
 		SetText("CPU TRAFFIC").
 		SetColor("#3583af").
 		SetNumber("100").
-		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>`).
+		SetIcon("fa-tint").
 		GetContent()
 
 	infobox2 := infobox.New().

examples/datamodel/user.go

@@ -8,6 +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"
 )
 
 func GetUserTable() (userTable table.Table) {
@@ -44,8 +45,8 @@ func GetUserTable() (userTable table.Table) {
 			SetSrc(`//quick.go-admin.cn/demo/assets/dist/img/gopher_avatar.png`).
 			SetHeight("120").SetWidth("120").GetContent()
 	})
-	info.AddField("createdAt", "created_at", db.Timestamp)
-	info.AddField("updatedAt", "updated_at", db.Timestamp)
+	info.AddField("createdAt", "created_at", db.Timestamp).FieldEditAble(table2.Datetime)
+	info.AddField("updatedAt", "updated_at", db.Timestamp).FieldEditAble(table2.Datetime)
 
 	info.SetTable("users").SetTitle("Users").SetDescription("Users")
 

plugins/admin/modules/table/table.go

@@ -343,6 +343,7 @@ func (tb DefaultTable) GetDataFromDatabase(path string, params parameter.Paramet
 			"field":    headField,
 			"hide":     hide,
 			"editable": editable,
+			"edittype": tb.info.FieldList[i].EditType.String(),
 			"width":    strconv.Itoa(tb.info.FieldList[i].Width),
 		})
 	}
@@ -515,6 +516,7 @@ func (tb DefaultTable) GetDataFromDatabaseWithIds(path string, params parameter.
 			"field":    headField,
 			"hide":     hide,
 			"editable": editable,
+			"edittype": tb.info.FieldList[i].EditType.String(),
 			"width":    strconv.Itoa(tb.info.FieldList[i].Width),
 		})
 	}

template/types/form/form.go

@@ -25,6 +25,7 @@ const (
 	Currency
 	Number
 	TextArea
+	Custom
 )
 
 func (t Type) String() string {
@@ -65,6 +66,8 @@ func (t Type) String() string {
 		return "number"
 	case TextArea:
 		return "textarea"
+	case Custom:
+		return "custom"
 	default:
 		panic("wrong form type")
 	}

template/types/table/table.go

@@ -0,0 +1,52 @@
+package table
+
+type Type uint8
+
+const (
+	Text Type = iota
+	Textarea
+	Select
+	Date
+	Datetime
+	Dateui
+	Combodate
+	Html5types
+	Checklist
+	Wysihtml5
+	Typeahead
+	Typeaheadjs
+	Select2
+)
+
+func (t Type) String() string {
+	switch t {
+	case Text:
+		return "text"
+	case Select:
+		return "select"
+	case Textarea:
+		return "textarea"
+	case Date:
+		return "date"
+	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

@@ -13,6 +13,7 @@ import (
 	"github.com/GoAdminGroup/go-admin/plugins/admin/modules"
 	form2 "github.com/GoAdminGroup/go-admin/plugins/admin/modules/form"
 	"github.com/GoAdminGroup/go-admin/template/types/form"
+	"github.com/GoAdminGroup/go-admin/template/types/table"
 	"html"
 	"html/template"
 	"strconv"
@@ -325,6 +326,9 @@ type Field struct {
 	Filterable bool
 	Hide       bool
 
+	EditType    table.Type
+	EditOptions []map[string]string
+
 	FieldDisplay
 }
 
@@ -409,6 +413,7 @@ func (i *InfoPanel) AddField(head, field string, typeName db.DatabaseType) *Info
 		TypeName: typeName,
 		Sortable: false,
 		EditAble: false,
+		EditType: table.Text,
 		FieldDisplay: FieldDisplay{
 			Display: func(value FieldModel) interface{} {
 				return value.Value
@@ -438,8 +443,16 @@ func (i *InfoPanel) FieldSortable() *InfoPanel {
 	return i
 }
 
-func (i *InfoPanel) FieldEditAble() *InfoPanel {
+func (i *InfoPanel) FieldEditOptions(options []map[string]string) *InfoPanel {
+	i.FieldList[i.curFieldListIndex].EditOptions = options
+	return i
+}
+
+func (i *InfoPanel) FieldEditAble(editType ...table.Type) *InfoPanel {
 	i.FieldList[i.curFieldListIndex].EditAble = true
+	if len(editType) > 0 {
+		i.FieldList[i.curFieldListIndex].EditType = editType[0]
+	}
 	return i
 }
 
@@ -762,7 +775,7 @@ func (f *FormPanel) FieldSubstr(start int, end int) *FormPanel {
 	return f
 }
 
-func (f *FormPanel) FieldToTitle() *FormPanel {
+func (f *FormPanel) FieldToTitlCustomJse() *FormPanel {
 	f.FieldList[f.curFieldListIndex].DisplayProcessChains = f.FieldList[f.curFieldListIndex].AddToTitle()
 	return f
 }