diff --git a/base/web/space.go b/base/web/space.go index 9e4114dd..3dff482a 100644 --- a/base/web/space.go +++ b/base/web/space.go @@ -266,7 +266,7 @@ func init() { nfs.PS: {Hand: func(m *ice.Message, arg ...string) { _space_fork(m) }}, }, mdb.HashAction(mdb.LIMIT, 1000, mdb.LEAST, 500, mdb.SHORT, mdb.NAME, mdb.FIELD, "time,type,name,text,module,version", ctx.ACTION, OPEN, REDIAL, kit.Dict("a", 3000, "b", 1000, "c", 1000)), mdb.ClearOnExitHashAction()), Hand: func(m *ice.Message, arg ...string) { if len(arg) < 2 { - defer m.StatusTimeCount(ice.MAIN, mdb.Config(m, ice.MAIN)) + defer m.StatusTimeCount(kit.Dict(ice.MAIN, mdb.Config(m, ice.MAIN))) m.Option(ice.MSG_USERWEB, tcp.PublishLocalhost(m, m.Option(ice.MSG_USERWEB))) mdb.HashSelect(m.Spawn(), arg...).Sort("").Table(func(index int, value ice.Maps, field []string) { if m.Push("", value, kit.Split(mdb.Config(m, mdb.FIELD))); len(arg) > 0 && arg[0] != "" { diff --git a/go.mod b/go.mod index b09ca696..baf59f03 100644 --- a/go.mod +++ b/go.mod @@ -5,6 +5,6 @@ go 1.13 require ( shylinux.com/x/go-git/v5 v5.6.7 shylinux.com/x/go-qrcode v0.0.3 - shylinux.com/x/toolkits v0.7.13 + shylinux.com/x/toolkits v0.7.14 shylinux.com/x/websocket v0.0.3 ) diff --git a/go.sum b/go.sum index 21cdbe28..c3cbfdd0 100644 --- a/go.sum +++ b/go.sum @@ -4,7 +4,7 @@ shylinux.com/x/go-qrcode v0.0.3 h1:RMo+Vidbgq3HatLBj7DDXcTbTLFUwzis5K7TqBkD38U= shylinux.com/x/go-qrcode v0.0.3/go.mod h1:KAbtU+KwiiABMZ/CJ0zh9PI2AX82Uf9rRYcQ4ODm4po= shylinux.com/x/toolkits v0.7.10 h1:65d5rkQXQ71MD8FzYnZ9DFxb1XcOYSYfmRc4j8qQsUw= shylinux.com/x/toolkits v0.7.10/go.mod h1:CHDJarGlDkg60kVsvMLYL/a5hAnRLEOShiEsMOuEp0Q= -shylinux.com/x/toolkits v0.7.13 h1:UZvPHH/CS4PzdmpQN6kfOL1RDantPhHoAcU547H+ck4= -shylinux.com/x/toolkits v0.7.13/go.mod h1:CHDJarGlDkg60kVsvMLYL/a5hAnRLEOShiEsMOuEp0Q= +shylinux.com/x/toolkits v0.7.14 h1:ggpup1PzodrAIoIaJ+KPZbvl0JMfO2jHNsty5t31ILM= +shylinux.com/x/toolkits v0.7.14/go.mod h1:CHDJarGlDkg60kVsvMLYL/a5hAnRLEOShiEsMOuEp0Q= shylinux.com/x/websocket v0.0.3 h1:edhLwCp0Mv1ITXqIwbVWdXdX2+vui/jRnS25K89k68I= shylinux.com/x/websocket v0.0.3/go.mod h1:3UGWkjTu3ie5NAZen7J+uLPBrO7DFeKloj6Jxo13Oiw= diff --git a/misc/git/status.go b/misc/git/status.go index 14435ef5..3191cd32 100644 --- a/misc/git/status.go +++ b/misc/git/status.go @@ -77,8 +77,8 @@ func init() { text = append(text, list[0]+" ---") } } - m.PushButton(kit.Dict(m.CommandKey(), "源码")) m.Push(mdb.TEXT, strings.Join(text, ", ")) + m.PushButton(kit.Dict(m.CommandKey(), "源码")) }}, }, aaa.RoleAction(), web.DreamAction(), Prefix(REPOS)), Hand: func(m *ice.Message, arg ...string) { if len(arg) > 0 && arg[0] == ctx.ACTION { diff --git a/misc/git/trend.go b/misc/git/trend.go index 67ab4f82..26ba5dd0 100644 --- a/misc/git/trend.go +++ b/misc/git/trend.go @@ -14,7 +14,17 @@ const TREND = "trend" func init() { Index.MergeCommands(ice.Commands{ - TREND: {Name: "trend repos begin_time@date auto", Help: "趋势图", Actions: ice.Actions{ + TREND: {Name: "trend repos begin_time@date auto", Help: "趋势图", Meta: kit.Dict( + ice.CTX_TRANS, kit.Dict( + html.INPUT, kit.Dict( + "from", "起始", + "date", "日期", + "max", "最多", + "add", "添加", + "del", "删除", + ), + ), + ), Actions: ice.Actions{ mdb.DETAIL: {Hand: func(m *ice.Message, arg ...string) { m.Cmdy("", code.INNER, m.Option(REPOS), MASTER, m.Option(mdb.HASH), m.Cmdv(REPOS, m.Option(REPOS), MASTER, m.Option(mdb.HASH), nfs.FILE)) }},