update

coscms · May 26, 2021 · c0163bc · c0163bc
1 parent 5ea7a0e
commit c0163bc
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/fields/number.go b/fields/number.go
@@ -52,6 +52,9 @@ func NumberFieldFromInstance(val reflect.Value, t reflect.Type, fieldNo int, nam
 	if v := common.TagVal(t, fieldNo, "form_max"); v != "" {
 		ret.SetParam("max", v)
 	}
+	if v := common.TagVal(t, fieldNo, "form_step"); v != "" {
+		ret.SetParam("step", v)
+	}
 	ret.SetValue(defaultValue(val, t, fieldNo, useFieldValue))
 	return ret
 }

diff --git a/forms.go b/forms.go
@@ -482,8 +482,11 @@ func (form *Form) unWindStructure(m interface{}, baseName string) ([]interface{}
 			label := common.TagVal(t, i, "form_label")
 			if len(label) == 0 {
 				label = strings.Title(t.Field(i).Name)
+			} else if label != `-` {
+				label = form.labelFn(label)
+			} else {
+				label = ``
 			}
-			label = form.labelFn(label)
 			f.SetLabel(label)
 
 			params := common.TagVal(t, i, "form_params")
@@ -503,8 +506,8 @@ func (form *Form) unWindStructure(m interface{}, baseName string) ([]interface{}
 			if len(valid) > 0 {
 				form.validTagFn(valid, f)
 			}
-			fieldsetLabel := common.TagVal(t, i, "form_fieldset")
-			fieldsort := common.TagVal(t, i, "form_sort")
+			fieldsetLabel := common.TagVal(t, i, "form_fieldset") // label;name or name
+			fieldsort := common.TagVal(t, i, "form_sort")         // 1 ( or other number ) or "last"
 			if len(fieldsetLabel) > 0 {
 				fieldsets := strings.SplitN(fieldsetLabel, ";", 2)
 				var fieldsetName string