Skip to content

Commit c0163bc

Browse files
committed
update
1 parent 5ea7a0e commit c0163bc

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

fields/number.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,9 @@ func NumberFieldFromInstance(val reflect.Value, t reflect.Type, fieldNo int, nam
5252
if v := common.TagVal(t, fieldNo, "form_max"); v != "" {
5353
ret.SetParam("max", v)
5454
}
55+
if v := common.TagVal(t, fieldNo, "form_step"); v != "" {
56+
ret.SetParam("step", v)
57+
}
5558
ret.SetValue(defaultValue(val, t, fieldNo, useFieldValue))
5659
return ret
5760
}

forms.go

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -482,8 +482,11 @@ func (form *Form) unWindStructure(m interface{}, baseName string) ([]interface{}
482482
label := common.TagVal(t, i, "form_label")
483483
if len(label) == 0 {
484484
label = strings.Title(t.Field(i).Name)
485+
} else if label != `-` {
486+
label = form.labelFn(label)
487+
} else {
488+
label = ``
485489
}
486-
label = form.labelFn(label)
487490
f.SetLabel(label)
488491

489492
params := common.TagVal(t, i, "form_params")
@@ -503,8 +506,8 @@ func (form *Form) unWindStructure(m interface{}, baseName string) ([]interface{}
503506
if len(valid) > 0 {
504507
form.validTagFn(valid, f)
505508
}
506-
fieldsetLabel := common.TagVal(t, i, "form_fieldset")
507-
fieldsort := common.TagVal(t, i, "form_sort")
509+
fieldsetLabel := common.TagVal(t, i, "form_fieldset") // label;name or name
510+
fieldsort := common.TagVal(t, i, "form_sort") // 1 ( or other number ) or "last"
508511
if len(fieldsetLabel) > 0 {
509512
fieldsets := strings.SplitN(fieldsetLabel, ";", 2)
510513
var fieldsetName string

0 commit comments

Comments
 (0)