update

Author: admpub

config/field_interface.go

@@ -0,0 +1,52 @@
+package config
+
+import (
+	"html/template"
+)
+
+// FieldInterface defines the interface an object must implement to be used in a form. Every method returns a FieldInterface object
+// to allow methods chaining.
+type FieldInterface interface {
+	Name() string
+	OriginalName() string
+	Cols() int
+	SetName(string)
+	SetLabelCols(cols int)
+	SetFieldCols(cols int)
+	Render() template.HTML
+	AddClass(class string) FieldInterface
+	RemoveClass(class string) FieldInterface
+	AddTag(class string) FieldInterface
+	RemoveTag(class string) FieldInterface
+	SetID(id string) FieldInterface
+	SetParam(key string, value interface{}) FieldInterface
+	DeleteParam(key string) FieldInterface
+	AddCSS(key, value string) FieldInterface
+	RemoveCSS(key string) FieldInterface
+	SetTheme(theme string) FieldInterface
+	SetLabel(label string) FieldInterface
+	AddLabelClass(class string) FieldInterface
+	RemoveLabelClass(class string) FieldInterface
+	SetValue(value string) FieldInterface
+	Disabled() FieldInterface
+	Enabled() FieldInterface
+	SetTemplate(tmpl string, theme ...string) FieldInterface
+	SetHelptext(text string) FieldInterface
+	AddError(err string) FieldInterface
+	MultipleChoice() FieldInterface
+	SingleChoice() FieldInterface
+	AddSelected(opt ...string) FieldInterface
+	SetSelected(opt ...string) FieldInterface
+	RemoveSelected(opt string) FieldInterface
+	AddChoice(key, value interface{}, checked ...bool) FieldInterface
+	SetChoices(choices interface{}, saveIndex ...bool) FieldInterface
+	SetText(text string) FieldInterface
+	SetData(key string, value interface{})
+	Data() map[string]interface{}
+	String() string
+	SetLang(lang string)
+	Lang() string
+	Clone() FormElement
+
+	Element() *Element
+}

config/utils.go

@@ -1,7 +1,5 @@
 package config
 
-import "github.com/coscms/forms/fields"
-
 const (
 	STATIC   = "static"
 	Disabled = "disabled"
@@ -52,7 +50,7 @@ func setDefaultValue(elements []*Element, languages []*Language, fieldDefaultVal
 			}
 			for _, lang := range languages {
 				elem.Value = fieldDefaultValue(lang.Name(elem.Name))
-				if field, ok := lang.Field(elem.Name).(fields.FieldInterface); ok {
+				if field, ok := lang.Field(elem.Name).(FieldInterface); ok {
 					field.SetValue(elem.Value)
 				}
 			}

fields/field_interface.go

@@ -1,54 +1,9 @@
 package fields
 
 import (
-	"html/template"
-
 	"github.com/coscms/forms/config"
 )
 
 // FieldInterface defines the interface an object must implement to be used in a form. Every method returns a FieldInterface object
 // to allow methods chaining.
-type FieldInterface interface {
-	Name() string
-	OriginalName() string
-	Cols() int
-	SetName(string)
-	SetLabelCols(cols int)
-	SetFieldCols(cols int)
-	Render() template.HTML
-	AddClass(class string) FieldInterface
-	RemoveClass(class string) FieldInterface
-	AddTag(class string) FieldInterface
-	RemoveTag(class string) FieldInterface
-	SetID(id string) FieldInterface
-	SetParam(key string, value interface{}) FieldInterface
-	DeleteParam(key string) FieldInterface
-	AddCSS(key, value string) FieldInterface
-	RemoveCSS(key string) FieldInterface
-	SetTheme(theme string) FieldInterface
-	SetLabel(label string) FieldInterface
-	AddLabelClass(class string) FieldInterface
-	RemoveLabelClass(class string) FieldInterface
-	SetValue(value string) FieldInterface
-	Disabled() FieldInterface
-	Enabled() FieldInterface
-	SetTemplate(tmpl string, theme ...string) FieldInterface
-	SetHelptext(text string) FieldInterface
-	AddError(err string) FieldInterface
-	MultipleChoice() FieldInterface
-	SingleChoice() FieldInterface
-	AddSelected(opt ...string) FieldInterface
-	SetSelected(opt ...string) FieldInterface
-	RemoveSelected(opt string) FieldInterface
-	AddChoice(key, value interface{}, checked ...bool) FieldInterface
-	SetChoices(choices interface{}, saveIndex ...bool) FieldInterface
-	SetText(text string) FieldInterface
-	SetData(key string, value interface{})
-	Data() map[string]interface{}
-	String() string
-	SetLang(lang string)
-	Lang() string
-	Clone() config.FormElement
-
-	Element() *config.Element
-}
+type FieldInterface = config.FieldInterface

forms_test.go

@@ -1,11 +1,13 @@
-package forms
+package forms_test
 
 import (
 	"fmt"
 	"testing"
 
+	"github.com/coscms/forms"
 	"github.com/coscms/forms/common"
 	"github.com/coscms/forms/config"
+	_ "github.com/coscms/forms/defaults"
 	"github.com/webx-top/com"
 )
 
@@ -33,7 +35,7 @@ func TestForms(t *testing.T) {
 			},
 		},
 	}
-	cfg := NewConfig()
+	cfg := forms.NewConfig()
 	cfg.AddElement(&config.Element{
 		ID:    `input-name`,
 		Type:  `text`,
@@ -65,7 +67,7 @@ func TestForms(t *testing.T) {
 		Name:  `listData.0.test`,
 		Label: `ListData 0`,
 	})
-	form := NewWithModelConfig(mp, cfg)
+	form := forms.NewWithModelConfig(mp, cfg)
 	com.Dump(form.Data())
 	result := form.String()
 	fmt.Println(result)
@@ -81,7 +83,7 @@ func TestParseConfig(t *testing.T) {
 			},
 		},
 	}
-	f := NewForms(New())
+	f := forms.NewForms(forms.New())
 	f.Theme = common.BOOTSTRAP
 	f.Init(&cfg)
 	f.ParseFromConfig(true)