From c1b9b8633039ccaf87bc691b54f2c26355a220af Mon Sep 17 00:00:00 2001 From: shy Date: Sat, 27 Jan 2024 22:38:10 +0800 Subject: [PATCH] add some --- base/web/dream.go | 3 +++ base/web/store.go | 20 ++++++++++++++------ 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/base/web/dream.go b/base/web/dream.go index 651abd3e..f0096364 100644 --- a/base/web/dream.go +++ b/base/web/dream.go @@ -405,6 +405,9 @@ func init() { mdb.SHORT, mdb.NAME, mdb.FIELD, "time,name,icon,repos,binary,template,restart", ctx.TOOLS, kit.Simple(STORE, SPIDE, ROUTE), html.BUTTON, kit.JoinWord(PORTAL, ADMIN, DESKTOP, WIKI_WORD, STATUS, VIMER, XTERM, COMPILE), )), Hand: func(m *ice.Message, arg ...string) { + if ice.Info.NodeType == WORKER { + return + } if len(arg) == 0 { _dream_list(m).RewriteAppend(func(value, key string, index int) string { if key == mdb.ICON { diff --git a/base/web/store.go b/base/web/store.go index c770f77a..ffd248e4 100644 --- a/base/web/store.go +++ b/base/web/store.go @@ -37,22 +37,31 @@ func init() { ctx.ProcessField(m, CHAT_IFRAME, S(m.Option(mdb.NAME)), arg...) }}, OPEN: {Hand: func(m *ice.Message, arg ...string) { + if !kit.HasPrefixList(arg, ctx.RUN) { + defer m.Push(TITLE, m.Option(mdb.NAME)) + } ctx.ProcessField(m, CHAT_IFRAME, S(m.Option(mdb.NAME)), arg...) - kit.If(!kit.HasPrefixList(arg, ctx.RUN), func() { m.Push(TITLE, m.Option(mdb.NAME)) }) }}, PORTAL: {Hand: func(m *ice.Message, arg ...string) { + if !kit.HasPrefixList(arg, ctx.RUN) { + defer m.Push(TITLE, m.Option(mdb.NAME)) + } ctx.ProcessField(m, CHAT_IFRAME, m.Option(ORIGIN)+S(m.Option(mdb.NAME))+C(PORTAL), arg...) - kit.If(!kit.HasPrefixList(arg, ctx.RUN), func() { m.Push(TITLE, m.Option(mdb.NAME)) }) }}, }, ctx.ConfAction(ctx.TOOLS, DREAM)), Hand: func(m *ice.Message, arg ...string) { + if ice.Info.NodeType == WORKER { + return + } if len(arg) == 0 { m.Cmd(SPIDE, arg, kit.Dict(ice.MSG_FIELDS, "time,client.type,client.name,client.origin")).Table(func(value ice.Maps) { if value[CLIENT_TYPE] == nfs.REPOS && value[CLIENT_NAME] != ice.OPS { m.Push(mdb.NAME, value[CLIENT_NAME]) } }) - m.Action(html.FILTER, mdb.CREATE).Display("") - ctx.Toolkit(m) + if ctx.Toolkit(m.Display("")); ice.Info.NodeType == WORKER { + return + } + m.Action(html.FILTER, mdb.CREATE) } else { origin := SpideOrigin(m, arg[0]) list := m.Spawn(ice.Maps{ice.MSG_FIELDS: ""}).CmdMap(DREAM, mdb.NAME) @@ -61,8 +70,7 @@ func init() { return } m.Push("", value, kit.Split("time,name,icon,repos,binary,module,version")) - m.Push(mdb.TEXT, value[nfs.REPOS]) - m.Push(ORIGIN, origin) + m.Push(mdb.TEXT, value[nfs.REPOS]).Push(ORIGIN, origin) if _, ok := list[value[mdb.NAME]]; ok { m.PushButton(OPEN, PORTAL) } else {