diff --git a/Makefile b/Makefile index 71decd15f..3227b64cd 100644 --- a/Makefile +++ b/Makefile @@ -1,8 +1,8 @@ GOCMD = go GOBUILD = $(GOCMD) build BINARY_NAME = adm -LAST_VERSION = v1.2.22 -VERSION = v1.2.23 +LAST_VERSION = v1.2.23 +VERSION = v1.2.24 CLI = adm TEST_CONFIG_PATH=./../../common/config.json diff --git a/modules/file/file.go b/modules/file/file.go index ea223ce72..b95813810 100644 --- a/modules/file/file.go +++ b/modules/file/file.go @@ -5,6 +5,7 @@ package file import ( + "fmt" "io" "mime/multipart" "os" @@ -73,6 +74,7 @@ func Upload(c UploadFun, form *multipart.Form) error { } form.Value[k] = append(form.Value[k], pathStr) + form.Value[k+"_size"] = append(form.Value[k+"_size"], fmt.Sprintf("%d", fileObj.Size)) } } diff --git a/modules/system/version.go b/modules/system/version.go index d861508fa..305f379c0 100644 --- a/modules/system/version.go +++ b/modules/system/version.go @@ -1,6 +1,6 @@ package system -const version = "v1.2.23" +const version = "v1.2.24" var requireThemeVersion = map[string][]string{ "adminlte": {">=v0.0.41"}, diff --git a/template/components/box.go b/template/components/box.go index 00a6f7eb3..e055aff8e 100644 --- a/template/components/box.go +++ b/template/components/box.go @@ -106,7 +106,7 @@ func (compo *BoxAttribute) WithSecondHeadBorder() types.BoxAttribute { func (compo *BoxAttribute) GetContent() template.HTML { if compo.Style == "" { - compo.Style = template.HTMLAttr(fmt.Sprintf(`style="overflow-x: scroll;overflow-y: hidden;%s"`, compo.Padding)) + compo.Style = template.HTMLAttr(fmt.Sprintf(`style="%s"`, compo.Padding)) } else { compo.Style = template.HTMLAttr(fmt.Sprintf(`style="%s"`, string(compo.Style)+compo.Padding)) }