update

coscms · May 24, 2021 · db71c9d · db71c9d
1 parent 72009da
commit db71c9d
Show file tree

Hide file tree

Showing 43 changed files with 32 additions and 7 deletions.
diff --git a/common/tplfunc.go b/common/tplfunc.go
@@ -33,7 +33,7 @@ func TplFuncs() template.FuncMap {
 }
 
 func ParseFiles(files ...string) (*template.Template, error) {
-	if FileSystem != nil {
+	if !FileSystem.IsEmpty() {
 		return ParseFS(FileSystem, files...)
 	}
 	name := filepath.Base(files[0])

diff --git a/common/types.go b/common/types.go
@@ -46,14 +46,38 @@ var (
 	LabelFn = func(s string) string {
 		return s
 	}
-	FileSystem fs.FS
+	FileSystem FileSystems
 
 	//private
 	cachedTemplate = make(map[string]*template.Template)
 	cachedConfig   = make(map[string]*config.Config)
 	lock           = new(sync.RWMutex)
 )
 
+type FileSystems []fs.FS
+
+func (f FileSystems) Open(name string) (file fs.File, err error) {
+	for _, i := range f {
+		file, err = i.Open(name)
+		if err == nil {
+			return
+		}
+	}
+	return
+}
+
+func (f FileSystems) Size() int {
+	return len(f)
+}
+
+func (f FileSystems) IsEmpty() bool {
+	return f.Size() == 0
+}
+
+func (f *FileSystems) Register(fileSystem fs.FS) {
+	*f = append(*f, fileSystem)
+}
+
 const (
 	PACKAGE_NAME = "github.com/coscms/forms"
 )
@@ -101,7 +125,7 @@ func TmplDir(style string) (tmplDir string) {
 
 // CreateUrl creates the complete url of the desired widget template
 func CreateUrl(widget string) string {
-	if FileSystem != nil {
+	if !FileSystem.IsEmpty() {
 		fp, err := FileSystem.Open(widget)
 		if err == nil {
 			defer fp.Close()
@@ -112,7 +136,7 @@ func CreateUrl(widget string) string {
 		}
 	}
 	if !TmplExists(widget) {
-		return filepath.Join(os.Getenv("GOPATH"), "src", PACKAGE_NAME, widget)
+		return filepath.Join(os.Getenv("GOPATH"), "src", PACKAGE_NAME, `defaults`, widget)
 	}
 	return widget
 }
@@ -201,7 +225,7 @@ func ParseTmpl(data interface{},
 				return err.Error()
 			}
 		}
-		if FileSystem != nil {
+		if !FileSystem.IsEmpty() {
 			tpl, err = c.ParseFS(FileSystem, tpls...)
 		} else {
 			tpl, err = c.ParseFiles(tpls...)

diff --git a/templates.go → defaults/templates.go b/templates.go → defaults/templates.go
@@ -1,4 +1,4 @@
-package forms
+package defaults
 
 import (
 	"embed"
@@ -10,5 +10,5 @@ import (
 var templateFS embed.FS
 
 func init() {
-	common.FileSystem = templateFS
+	common.FileSystem.Register(templateFS)
 }
diff --git a/templates/allfields.html → defaults/templates/allfields.html b/templates/allfields.html → defaults/templates/allfields.html
diff --git a/templates/base/button.html → defaults/templates/base/button.html b/templates/base/button.html → defaults/templates/base/button.html
diff --git a/templates/base/datetime/date.html → defaults/templates/base/datetime/date.html b/templates/base/datetime/date.html → defaults/templates/base/datetime/date.html
diff --git a/templates/base/datetime/datetime.html → ...lts/templates/base/datetime/datetime.html b/templates/base/datetime/datetime.html → ...lts/templates/base/datetime/datetime.html
diff --git a/templates/base/datetime/time.html → defaults/templates/base/datetime/time.html b/templates/base/datetime/time.html → defaults/templates/base/datetime/time.html
diff --git a/templates/base/fieldset.html → defaults/templates/base/fieldset.html b/templates/base/fieldset.html → defaults/templates/base/fieldset.html
diff --git a/templates/base/fieldset_buttons.html → ...ults/templates/base/fieldset_buttons.html b/templates/base/fieldset_buttons.html → ...ults/templates/base/fieldset_buttons.html
diff --git a/templates/base/generic.tmpl → defaults/templates/base/generic.tmpl b/templates/base/generic.tmpl → defaults/templates/base/generic.tmpl
diff --git a/templates/base/input.html → defaults/templates/base/input.html b/templates/base/input.html → defaults/templates/base/input.html
diff --git a/templates/base/langset.html → defaults/templates/base/langset.html b/templates/base/langset.html → defaults/templates/base/langset.html
diff --git a/templates/base/number/number.html → defaults/templates/base/number/number.html b/templates/base/number/number.html → defaults/templates/base/number/number.html
diff --git a/templates/base/number/range.html → defaults/templates/base/number/range.html b/templates/base/number/range.html → defaults/templates/base/number/range.html
diff --git a/templates/base/options/checkbox.html → ...ults/templates/base/options/checkbox.html b/templates/base/options/checkbox.html → ...ults/templates/base/options/checkbox.html
diff --git a/templates/base/options/radiobutton.html → ...s/templates/base/options/radiobutton.html b/templates/base/options/radiobutton.html → ...s/templates/base/options/radiobutton.html
diff --git a/templates/base/options/select.html → defaults/templates/base/options/select.html b/templates/base/options/select.html → defaults/templates/base/options/select.html
diff --git a/templates/base/static.html → defaults/templates/base/static.html b/templates/base/static.html → defaults/templates/base/static.html
diff --git a/templates/base/text/passwordinput.html → ...ts/templates/base/text/passwordinput.html b/templates/base/text/passwordinput.html → ...ts/templates/base/text/passwordinput.html
diff --git a/templates/base/text/textareainput.html → ...ts/templates/base/text/textareainput.html b/templates/base/text/textareainput.html → ...ts/templates/base/text/textareainput.html
diff --git a/templates/base/text/textinput.html → defaults/templates/base/text/textinput.html b/templates/base/text/textinput.html → defaults/templates/base/text/textinput.html
diff --git a/templates/baseform.html → defaults/templates/baseform.html b/templates/baseform.html → defaults/templates/baseform.html
diff --git a/templates/bootstrap3/button.html → defaults/templates/bootstrap3/button.html b/templates/bootstrap3/button.html → defaults/templates/bootstrap3/button.html
diff --git a/templates/bootstrap3/datetime/date.html → ...s/templates/bootstrap3/datetime/date.html b/templates/bootstrap3/datetime/date.html → ...s/templates/bootstrap3/datetime/date.html
diff --git a/templates/bootstrap3/datetime/datetime.html → ...mplates/bootstrap3/datetime/datetime.html b/templates/bootstrap3/datetime/datetime.html → ...mplates/bootstrap3/datetime/datetime.html
diff --git a/templates/bootstrap3/datetime/time.html → ...s/templates/bootstrap3/datetime/time.html b/templates/bootstrap3/datetime/time.html → ...s/templates/bootstrap3/datetime/time.html
diff --git a/templates/bootstrap3/fieldset.html → defaults/templates/bootstrap3/fieldset.html b/templates/bootstrap3/fieldset.html → defaults/templates/bootstrap3/fieldset.html
diff --git a/templates/bootstrap3/fieldset_buttons.html → ...emplates/bootstrap3/fieldset_buttons.html b/templates/bootstrap3/fieldset_buttons.html → ...emplates/bootstrap3/fieldset_buttons.html
diff --git a/templates/bootstrap3/generic.tmpl → defaults/templates/bootstrap3/generic.tmpl b/templates/bootstrap3/generic.tmpl → defaults/templates/bootstrap3/generic.tmpl
diff --git a/templates/bootstrap3/input.html → defaults/templates/bootstrap3/input.html b/templates/bootstrap3/input.html → defaults/templates/bootstrap3/input.html
diff --git a/templates/bootstrap3/langset.html → defaults/templates/bootstrap3/langset.html b/templates/bootstrap3/langset.html → defaults/templates/bootstrap3/langset.html
diff --git a/templates/bootstrap3/number/number.html → ...s/templates/bootstrap3/number/number.html b/templates/bootstrap3/number/number.html → ...s/templates/bootstrap3/number/number.html
diff --git a/templates/bootstrap3/number/range.html → ...ts/templates/bootstrap3/number/range.html b/templates/bootstrap3/number/range.html → ...ts/templates/bootstrap3/number/range.html
diff --git a/templates/bootstrap3/options/checkbox.html → ...emplates/bootstrap3/options/checkbox.html b/templates/bootstrap3/options/checkbox.html → ...emplates/bootstrap3/options/checkbox.html
diff --git a/...lates/bootstrap3/options/radiobutton.html → ...lates/bootstrap3/options/radiobutton.html b/...lates/bootstrap3/options/radiobutton.html → ...lates/bootstrap3/options/radiobutton.html
diff --git a/templates/bootstrap3/options/select.html → .../templates/bootstrap3/options/select.html b/templates/bootstrap3/options/select.html → .../templates/bootstrap3/options/select.html
diff --git a/templates/bootstrap3/static.html → defaults/templates/bootstrap3/static.html b/templates/bootstrap3/static.html → defaults/templates/bootstrap3/static.html
diff --git a/templates/bootstrap3/text/passwordinput.html → ...plates/bootstrap3/text/passwordinput.html b/templates/bootstrap3/text/passwordinput.html → ...plates/bootstrap3/text/passwordinput.html
diff --git a/templates/bootstrap3/text/textareainput.html → ...plates/bootstrap3/text/textareainput.html b/templates/bootstrap3/text/textareainput.html → ...plates/bootstrap3/text/textareainput.html
diff --git a/templates/bootstrap3/text/textinput.html → .../templates/bootstrap3/text/textinput.html b/templates/bootstrap3/text/textinput.html → .../templates/bootstrap3/text/textinput.html
diff --git a/templates/bootstrapform.html → defaults/templates/bootstrapform.html b/templates/bootstrapform.html → defaults/templates/bootstrapform.html
diff --git a/example/main.go b/example/main.go
@@ -6,6 +6,7 @@ import (
 	"time"
 
 	. "github.com/coscms/forms"
+	_ "github.com/coscms/forms/defaults"
 )
 
 type Test struct {
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,6 +6,7 @@ import ( @@
     	"time"
     	. "github.com/coscms/forms"
+    	_ "github.com/coscms/forms/defaults"
     )
     type Test struct {
@@ Expand Down @@