update

Author: admpub

common/tplfunc.go

@@ -16,13 +16,14 @@
 
 */
 
-//Package common This package provides basic constants used by forms packages.
+// Package common This package provides basic constants used by forms packages.
 package common
 
 import (
 	"html/template"
+	"io"
 	"io/fs"
-	"io/ioutil"
+	"os"
 	"path/filepath"
 )
 
@@ -35,7 +36,7 @@ func ParseFiles(files ...string) (*template.Template, error) {
 		return ParseFS(FileSystem, files...)
 	}
 	name := filepath.Base(files[0])
-	b, err := ioutil.ReadFile(files[0])
+	b, err := os.ReadFile(files[0])
 	if err != nil {
 		return nil, err
 	}
@@ -56,7 +57,7 @@ func ParseFS(fs fs.FS, files ...string) (*template.Template, error) {
 	if err != nil {
 		return tmpl, err
 	}
-	b, err := ioutil.ReadAll(fp)
+	b, err := io.ReadAll(fp)
 	fp.Close()
 	if err != nil {
 		return tmpl, err

forms.go

@@ -343,23 +343,29 @@ func (f *Form) GenChoicesForField(name string, lenType interface{}, fnType inter
 }
 
 // GenChoices generate choices
-// type Data struct{
-// 	ID string
-// 	Name string
-// }
-// data:=[]*Data{
-// 	&Data{ID:"a",Name:"One"},
-// 	&Data{ID:"b",Name:"Two"},
-// }
-// GenChoices(len(data), func(index int) (string, string, bool){
-// 	return data[index].ID,data[index].Name,false
-// })
+//
+//	type Data struct{
+//		ID string
+//		Name string
+//	}
+//
+//	data:=[]*Data{
+//		&Data{ID:"a",Name:"One"},
+//		&Data{ID:"b",Name:"Two"},
+//	}
+//
+//	GenChoices(len(data), func(index int) (string, string, bool){
+//		return data[index].ID,data[index].Name,false
+//	})
+//
 // or
-// GenChoices(map[string]int{
-// 	"":len(data),
-// }, func(group string,index int) (string, string, bool){
-// 	return data[index].ID,data[index].Name,false
-// })
+//
+//	GenChoices(map[string]int{
+//		"":len(data),
+//	}, func(group string,index int) (string, string, bool){
+//
+//		return data[index].ID,data[index].Name,false
+//	})
 func (f *Form) GenChoices(lenType interface{}, fnType interface{}) interface{} {
 	return GenChoices(lenType, fnType)
 }
@@ -396,9 +402,9 @@ func (form *Form) unWindStructure(m interface{}, baseName string) ([]interface{}
 					options[opt] = struct{}{}
 				}
 			}
-		}
-		if _, ok := options["-"]; ok {
-			continue
+			if _, ok := options["-"]; ok {
+				continue
+			}
 		}
 		widget := common.TagVal(t, i, "form_widget")
 		var f fields.FieldInterface

json.go

@@ -18,8 +18,8 @@ package forms
 import (
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
 	"net/url"
+	"os"
 	"path/filepath"
 	"reflect"
 	"strconv"
@@ -41,7 +41,7 @@ func UnmarshalFile(filename string) (r *config.Config, err error) {
 		return
 	}
 	return common.GetOrSetCachedConfig(filename, func() (*config.Config, error) {
-		b, err := ioutil.ReadFile(filename)
+		b, err := os.ReadFile(filename)
 		if err != nil {
 			return nil, err
 		}