feat(new version): ready for v1.2.6

GoAdminGroup · Mar 15, 2020 · a38d9ad · a38d9ad
1 parent 949bb35
commit a38d9ad
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 7 deletions.
diff --git a/Makefile b/Makefile
@@ -1,8 +1,8 @@
 GOCMD = go
 GOBUILD = $(GOCMD) build
 BINARY_NAME = adm
-LAST_VERSION = v1.2.4
-VERSION = v1.2.5
+LAST_VERSION = v1.2.5
+VERSION = v1.2.6
 CLI = adm
 
 TEST_CONFIG_PATH=./../../common/config.json

diff --git a/examples/gin/main.go b/examples/gin/main.go
@@ -49,9 +49,12 @@ func main() {
 			Path:   "./uploads",
 			Prefix: "uploads",
 		},
-		Language:    language.CN,
-		IndexUrl:    "/",
-		Debug:       true,
+		Language: language.CN,
+		IndexUrl: "/",
+		Debug:    true,
+		Animation: config.PageAnimation{
+			Type: "fadeInUp",
+		},
 		ColorScheme: adminlte.ColorschemeSkinBlack,
 	}
 

diff --git a/modules/system/version.go b/modules/system/version.go
@@ -1,6 +1,6 @@
 package system
 
-const version = "v1.2.5"
+const version = "v1.2.6"
 
 // Version return the version of framework.
 func Version() string {

diff --git a/plugins/admin/controller/show.go b/plugins/admin/controller/show.go
@@ -63,7 +63,7 @@ func (h *Handler) showTable(ctx *context.Context, prefix string, params paramete
 		}, h.config, menu.GetGlobalMenu(user, h.conn).SetActiveClass(h.config.URLRemovePrefix(ctx.Path())))
 	}
 
-	paramStr := params.GetRouteParamStr()
+	paramStr := params.DeleteIsAll().GetRouteParamStr()
 
 	editUrl := modules.AorEmpty(panel.GetEditable(), h.routePathWithPrefix("show_edit", prefix)+paramStr)
 	newUrl := modules.AorEmpty(panel.GetCanAdd(), h.routePathWithPrefix("show_new", prefix)+paramStr)

diff --git a/plugins/admin/modules/parameter/parameter.go b/plugins/admin/modules/parameter/parameter.go
@@ -179,6 +179,11 @@ func (param Parameters) WithIsAll(isAll bool) Parameters {
 	return param
 }
 
+func (param Parameters) DeleteIsAll() Parameters {
+	delete(param.Fields, IsAll)
+	return param
+}
+
 func (param Parameters) GetFilterFieldValueStart(field string) string {
 	return param.GetFieldValue(field + FilterRangeParamStartSuffix)
 }