update

Author: admpub

common/types.go

@@ -158,8 +158,8 @@ func TmplDir(style string) (tmplDir string) {
 	return
 }
 
-// CreateUrl creates the complete url of the desired widget template
-func CreateUrl(widget string) string {
+// LookupPath creates the complete path of the desired widget template
+func LookupPath(widget string) string {
 	if !FileSystem.IsEmpty() {
 		fp, err := FileSystem.Open(widget)
 		if err != nil {

fieldset.go

@@ -25,7 +25,7 @@ import (
 	"strings"
 
 	"github.com/coscms/forms/common"
-	conf "github.com/coscms/forms/config"
+	"github.com/coscms/forms/config"
 	"github.com/coscms/forms/fields"
 )
 
@@ -93,7 +93,7 @@ func (f *FieldSetType) render() string {
 	var err error
 	tpl, ok := common.CachedTemplate(tpf)
 	if !ok {
-		tpl, err = common.ParseFiles(common.CreateUrl(tpf))
+		tpl, err = common.ParseFiles(common.LookupPath(tpf))
 		if err != nil {
 			return err.Error()
 		}
@@ -123,7 +123,7 @@ func (f *FieldSetType) Lang() string {
 	return f.Language
 }
 
-func (f *FieldSetType) Clone() conf.FormElement {
+func (f *FieldSetType) Clone() config.FormElement {
 	fc := *f
 	return &fc
 }
@@ -175,7 +175,7 @@ func (f *FieldSetType) SortAll(sortList ...string) *FieldSetType {
 }
 
 // Elements adds the provided elements to the fieldset.
-func (f *FieldSetType) Elements(elems ...conf.FormElement) *FieldSetType {
+func (f *FieldSetType) Elements(elems ...config.FormElement) *FieldSetType {
 	for _, e := range elems {
 		switch v := e.(type) {
 		case fields.FieldInterface:

forms.go

@@ -33,7 +33,7 @@ import (
 	"strings"
 
 	"github.com/coscms/forms/common"
-	conf "github.com/coscms/forms/config"
+	"github.com/coscms/forms/config"
 	"github.com/coscms/forms/fields"
 	"github.com/webx-top/validation"
 )
@@ -44,7 +44,7 @@ const (
 	GET  = "GET"
 )
 
-func NewWithConfig(c *conf.Config, args ...interface{}) *Form {
+func NewWithConfig(c *config.Config, args ...interface{}) *Form {
 	form := New()
 	form.Init(c, args...)
 	return form
@@ -60,7 +60,7 @@ func NewWithConfigFile(m interface{}, configJSONFile string) *Form {
 
 func New() *Form {
 	return &Form{
-		FieldList:             []conf.FormElement{},
+		FieldList:             []config.FormElement{},
 		FieldMap:              make(map[string]int),
 		ContainerMap:          make(map[string]string),
 		Style:                 common.BASE,
@@ -77,7 +77,7 @@ func New() *Form {
 	}
 }
 
-func NewFromModel(m interface{}, c *conf.Config) *Form {
+func NewFromModel(m interface{}, c *config.Config) *Form {
 	form := NewWithConfig(c, m)
 	form.SetModel(m)
 	form.ParseModel(m)
@@ -90,7 +90,7 @@ type Form struct {
 	Model       interface{}
 	IngoreValid []string
 
-	FieldList             []conf.FormElement
+	FieldList             []config.FormElement
 	FieldMap              map[string]int
 	ContainerMap          map[string]string
 	Style                 string
@@ -104,7 +104,7 @@ type Form struct {
 	valid                 *validation.Validation
 	labelFn               func(string) string
 	validTagFn            func(string, fields.FieldInterface)
-	config                *conf.Config
+	config                *config.Config
 	beforeRender          []func()
 	debug                 bool
 	OmitOrMustFieldsValue map[string]bool //true:omit; false:must
@@ -192,9 +192,9 @@ func (f *Form) ValidTagFunc() func(string, fields.FieldInterface) {
 	return f.validTagFn
 }
 
-func (f *Form) Init(c *conf.Config, model ...interface{}) *Form {
+func (f *Form) Init(c *config.Config, model ...interface{}) *Form {
 	if c == nil {
-		c = &conf.Config{}
+		c = &config.Config{}
 	}
 	f.config = c
 	if len(c.Theme) == 0 {
@@ -209,7 +209,7 @@ func (f *Form) Init(c *conf.Config, model ...interface{}) *Form {
 	tmpl, ok := common.CachedTemplate(tpf)
 	if !ok {
 		var err error
-		tmpl, err = common.ParseFiles(common.CreateUrl(c.Template))
+		tmpl, err = common.ParseFiles(common.LookupPath(c.Template))
 		if err != nil {
 			log.Println(err)
 		}
@@ -304,7 +304,7 @@ func (f *Form) ParseModel(model ...interface{}) *Form {
 	}
 	flist, fsort := f.unWindStructure(m, ``)
 	for _, v := range flist {
-		f.Elements(v.(conf.FormElement))
+		f.Elements(v.(config.FormElement))
 	}
 	if len(fsort) > 0 {
 		f.Sort(fsort)
@@ -613,7 +613,7 @@ func (f *Form) String() string {
 }
 
 // Elements adds the provided elements to the form.
-func (f *Form) Elements(elems ...conf.FormElement) {
+func (f *Form) Elements(elems ...config.FormElement) {
 	for _, e := range elems {
 		switch v := e.(type) {
 		case fields.FieldInterface:
@@ -739,7 +739,7 @@ func (f *Form) Field(name string) fields.FieldInterface {
 }
 
 // Fields returns all field
-func (f *Form) Fields() []conf.FormElement {
+func (f *Form) Fields() []config.FormElement {
 	return f.FieldList
 }
 
@@ -757,7 +757,7 @@ func (f *Form) LangSet(name string) *LangSetType {
 	}
 }
 
-func (f *Form) NewLangSet(name string, langs []*conf.Language) *LangSetType {
+func (f *Form) NewLangSet(name string, langs []*config.Language) *LangSetType {
 	return LangSet(name, f.Style, langs...)
 }
 
@@ -785,7 +785,7 @@ func (f *Form) NewFieldSet(name string, label string, elems ...fields.FieldInter
 func (f *Form) SortAll(sortList ...string) *Form {
 	elem := f.FieldList
 	size := len(elem)
-	f.FieldList = make([]conf.FormElement, size)
+	f.FieldList = make([]config.FormElement, size)
 	var sortSlice []string
 	if len(sortList) == 1 {
 		sortSlice = strings.Split(sortList[0], ",")
@@ -857,8 +857,8 @@ func (f *Form) Sort2Last(fieldsName ...string) *Form {
 
 func (f *Form) sortFields(index, oldIndex, endIdx, size int) {
 
-	var newFields []conf.FormElement
-	oldFields := make([]conf.FormElement, size)
+	var newFields []config.FormElement
+	oldFields := make([]config.FormElement, size)
 	copy(oldFields, f.FieldList)
 	var min, max int
 	if index > oldIndex {

go.mod

@@ -6,7 +6,7 @@ require (
 	github.com/francoispqt/gojay v1.2.13 // indirect
 	github.com/goccy/go-json v0.5.1 // indirect
 	github.com/json-iterator/go v1.1.11 // indirect
-	github.com/stretchr/testify v1.7.0 // indirect
+	github.com/stretchr/testify v1.7.0
 	github.com/webx-top/com v0.2.0
 	github.com/webx-top/tagfast v0.0.0-20161020041435-9a2065ce3dd2
 	github.com/webx-top/validation v0.0.1

go.sum

@@ -172,6 +172,7 @@ google.golang.org/grpc v1.14.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmE
 google.golang.org/grpc v1.16.0/go.mod h1:0JHn/cJsOMiMfNA9+DeHDlAU7KAAB5GDlYFpa9MZMio=
 google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
 gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=