diff --git a/base/ctx/command.go b/base/ctx/command.go index b8213eaf..cc2791a5 100644 --- a/base/ctx/command.go +++ b/base/ctx/command.go @@ -18,6 +18,11 @@ func _command_list(m *ice.Message, name string) *ice.Message { return m.Push(mdb.INDEX, name).Push(mdb.NAME, name).Push(mdb.HELP, "").Push(mdb.META, "").Push(mdb.LIST, "") } m.Spawn(m.Source()).Search(name, func(p *ice.Context, s *ice.Context, key string, cmd *ice.Command) { + // if _p, ok := ice.Info.Index[key].(*ice.Context); ok && _p.Prefix() == s.Prefix() { + // m.Push(mdb.INDEX, key) + // } else { + // m.Push(mdb.INDEX, kit.Keys(s.Prefix(), key)) + // } m.Push(mdb.INDEX, kit.Keys(s.Prefix(), key)) m.Push(mdb.NAME, kit.Format(cmd.Name)) m.Push(mdb.HELP, kit.Format(cmd.Help)) diff --git a/base/web/dream.go b/base/web/dream.go index 72cda7f6..86feb115 100644 --- a/base/web/dream.go +++ b/base/web/dream.go @@ -319,8 +319,9 @@ func init() { } }}, }, StatsAction(), DreamAction(), mdb.ImportantHashAction( - html.BUTTON, "web.wiki.portal web.admin web.chat.macos.desktop web.code.git.status web.code.vimer web.code.xterm web.code.compile", - ctx.TOOLS, "web.code.git.search,route", mdb.SHORT, mdb.NAME, mdb.FIELD, "time,name,icon,repos,binary,template,restart")), Hand: func(m *ice.Message, arg ...string) { + mdb.SHORT, mdb.NAME, mdb.FIELD, "time,name,icon,repos,binary,template,restart", ctx.TOOLS, kit.Simple(CODE_GIT_SEARCH, ROUTE), + html.BUTTON, kit.JoinWord(PORTAL, ADMIN, DESKTOP, WIKI_WORD, CODE_GIT_STATUS, CODE_VIMER, CODE_XTERM, CODE_COMPILE), + )), Hand: func(m *ice.Message, arg ...string) { if len(arg) == 0 { _dream_list(m).RewriteAppend(func(value, key string, index int) string { if key == mdb.ICON { diff --git a/base/web/render.go b/base/web/render.go index eea0d3db..2ffc2579 100644 --- a/base/web/render.go +++ b/base/web/render.go @@ -157,7 +157,8 @@ func RenderVersion(m *ice.Message) string { } const ( - CHAT = "chat" + CHAT = "chat" + DESKTOP = "desktop" CODE_GIT_SERVICE = "web.code.git.service" CODE_GIT_SEARCH = "web.code.git.search" diff --git a/base/web/web.go b/base/web/web.go index 784826fd..928a0c4b 100644 --- a/base/web/web.go +++ b/base/web/web.go @@ -81,7 +81,7 @@ func init() { ice.Index.Register(Index, &Frame{}, BROAD, SERVE, DREAM, ROUTE, SPACE, TOKEN, SHARE, CACHE, SPIDE, COUNT, - ADMIN, + ADMIN, STATS, ) } diff --git a/core/wiki/word.go b/core/wiki/word.go index 2421c7d3..caf6911e 100644 --- a/core/wiki/word.go +++ b/core/wiki/word.go @@ -73,6 +73,8 @@ func init() { m.Cmd(web.CHAT_FAVOR, mdb.CREATE, mdb.TYPE, nfs.SHY, mdb.NAME, path.Base(arg[0]), mdb.TEXT, arg[0]) m.ProcessHold("favor success") }}, + web.DREAM_TABLES: {Hand: func(m *ice.Message, arg ...string) { m.PushButton(kit.Dict(m.CommandKey(), "文档")) }}, + web.DREAM_ACTION: {Hand: func(m *ice.Message, arg ...string) { web.DreamProcess(m, nil, arg...) }}, }, WikiAction("", nfs.SHY), mdb.HashAction(mdb.SHORT, nfs.PATH, mdb.FIELD, "time,path")), Hand: func(m *ice.Message, arg ...string) { if len(arg) > 0 { mdb.HashCreate(m.Spawn(), nfs.PATH, arg[0]) diff --git a/misc/git/git.go b/misc/git/git.go index 161e524e..a361f476 100644 --- a/misc/git/git.go +++ b/misc/git/git.go @@ -15,6 +15,6 @@ const GIT = "git" var Index = &ice.Context{Name: GIT, Help: "代码库"} -func init() { code.Index.Register(Index, &web.Frame{}) } +func init() { code.Index.Register(Index, &web.Frame{}, STATUS, REPOS) } func Prefix(arg ...string) string { return code.Prefix(GIT, kit.Keys(arg)) }