update

Author: admpub

config/element.go

@@ -21,6 +21,10 @@ type Element struct {
 	Data       map[string]interface{} `json:"data,omitempty"`
 }
 
+func (e *Element) Cols() int {
+	return GetCols(e.LabelCols, e.FieldCols)
+}
+
 func (e *Element) Clone() *Element {
 	elements := make([]*Element, len(e.Elements))
 	languages := make([]*Language, len(e.Languages))

config/element_interface.go

@@ -6,6 +6,7 @@ import "html/template"
 type FormElement interface {
 	Render() template.HTML
 	Name() string
+	Cols() int
 	OriginalName() string
 	SetName(string)
 	String() string

config/element_list_group.go

@@ -0,0 +1,32 @@
+package config
+
+type Grouped struct {
+	Elements []FormElement
+}
+
+type Groups []Grouped
+
+func SplitGroup(elements []FormElement) Groups {
+	result := Groups{}
+	t := 0
+	g := Grouped{}
+	for idx, ele := range elements {
+		if idx == 0 {
+			g.Elements = append(g.Elements, ele)
+			t += ele.Cols()
+		} else {
+			cols := ele.Cols()
+			if cols == 0 || t+cols > 12 {
+				result = append(result, g)
+				g = Grouped{}
+				t = 0
+			}
+			g.Elements = append(g.Elements, ele)
+			t += ele.Cols()
+		}
+	}
+	if len(g.Elements) > 0 {
+		result = append(result, g)
+	}
+	return result
+}

config/element_list_group_test.go

@@ -0,0 +1,42 @@
+package config_test
+
+import (
+	"testing"
+
+	"github.com/coscms/forms/config"
+	"github.com/coscms/forms/fields"
+	"github.com/stretchr/testify/assert"
+	"github.com/webx-top/com"
+)
+
+func TestSplitGroup(t *testing.T) {
+	r := config.SplitGroup([]config.FormElement{
+		&fields.Field{
+			OrigName:  `1`,
+			LabelCols: 0,
+			FieldCols: 4,
+		},
+		&fields.Field{
+			OrigName:  `2`,
+			LabelCols: 0,
+			FieldCols: 4,
+		},
+		&fields.Field{
+			OrigName:  `3`,
+			LabelCols: 0,
+			FieldCols: 8,
+		},
+		&fields.Field{
+			OrigName:  `4`,
+			LabelCols: 0,
+			FieldCols: 4,
+		},
+		&fields.Field{
+			OrigName:  `5`,
+			LabelCols: 0,
+			FieldCols: 4,
+		},
+	})
+	assert.Equal(t, 3, len(r))
+	com.Dump(r)
+}

config/utils.go

@@ -103,3 +103,21 @@ func getValue(elements []*Element, languages []*Language, fieldValue func(string
 	}
 	return
 }
+
+func GetCols(labelCols int, fieldCols int) int {
+	return GetLabelCols(labelCols) + GetFieldCols(fieldCols)
+}
+
+func GetLabelCols(labelCols int) int {
+	if labelCols == 0 {
+		labelCols = 2
+	}
+	return labelCols
+}
+
+func GetFieldCols(fieldCols int) int {
+	if fieldCols == 0 {
+		fieldCols = 8
+	}
+	return fieldCols
+}

fields/field.go

@@ -85,6 +85,10 @@ func FieldWithType(name, t string) *Field {
 	}
 }
 
+func (f *Field) Cols() int {
+	return config.GetCols(f.LabelCols, f.FieldCols)
+}
+
 func (f *Field) SetTemplate(tmpl string, theme ...string) FieldInterface {
 	f.Template = tmpl
 	if len(f.Template) > 0 && f.widget != nil && f.Template != tmpl {

fields/field_interface.go

@@ -11,6 +11,7 @@ import (
 type FieldInterface interface {
 	Name() string
 	OriginalName() string
+	Cols() int
 	SetName(string)
 	SetLabelCols(cols int)
 	SetFieldCols(cols int)

fieldset.go

@@ -48,6 +48,10 @@ type FieldSetType struct {
 	data         map[string]interface{}
 }
 
+func (f *FieldSetType) Cols() int {
+	return config.GetCols(f.LabelCols, f.FieldCols)
+}
+
 func (f *FieldSetType) SetData(key string, value interface{}) {
 	f.AppendData[key] = value
 }
@@ -79,6 +83,7 @@ func (f *FieldSetType) Data() map[string]interface{} {
 		"labelCols": f.LabelCols,
 		"fieldCols": f.FieldCols,
 		"fields":    f.FieldList,
+		"groups":    config.SplitGroup(f.FieldList),
 		"classes":   f.Classes,
 		"tags":      f.Tags,
 	}

forms.go

@@ -610,6 +610,7 @@ func (f *Form) Data() map[string]interface{} {
 	f.data = map[string]interface{}{
 		"container": "",
 		"fields":    f.FieldList,
+		"groups":    config.SplitGroup(f.FieldList),
 		"classes":   f.Class,
 		"id":        f.ID,
 		"params":    safeParams,

langset.go

@@ -45,6 +45,10 @@ type LangSetType struct {
 	data         map[string]interface{}
 }
 
+func (f *LangSetType) Cols() int {
+	return 0
+}
+
 func (f *LangSetType) SetName(name string) {
 	f.CurrName = name
 }