From c129026c526e84a9bf6dd99a14b59842ccf38fac Mon Sep 17 00:00:00 2001 From: shy Date: Thu, 6 Jun 2024 00:04:07 +0800 Subject: [PATCH] opt some --- base/web/dream.go | 4 ++-- base/web/option.go | 2 +- base/web/space.go | 19 +++++++++++++++++-- base/web/store.js | 3 +-- misc/git/repos.go | 1 + misc/wx/ide.go | 3 ++- 6 files changed, 24 insertions(+), 8 deletions(-) diff --git a/base/web/dream.go b/base/web/dream.go index 75fe78e8..296d9255 100644 --- a/base/web/dream.go +++ b/base/web/dream.go @@ -450,7 +450,7 @@ func init() { m.Cmd(gdb.EVENT, gdb.LISTEN, gdb.EVENT, DREAM_ACTION, ice.CMD, cmd) aaa.White(m, kit.Keys(m.ShortKey(), ctx.ACTION, cmd)) } - mdb.HashSelects(m).Table(func(value ice.Maps) { + mdb.HashSelects(m.Spawn()).Table(func(value ice.Maps) { if value[cli.RESTART] == ALWAYS && nfs.Exists(m, path.Join(ice.USR_LOCAL_WORK+value[mdb.NAME])) { m.Cmd(DREAM, cli.START, kit.Dict(mdb.NAME, value[mdb.NAME])) } @@ -504,7 +504,7 @@ func init() { _dream_list(m, simple) _dream_list_icon(m) if m.Length() == 0 { - m.EchoInfoButton(m.Trans("please scan or create new dream", "请扫描或创建新空间"), mdb.CREATE, "scan") + m.EchoInfoButton(m.Trans("please scan or create new dream", "请扫描或创建新空间"), mdb.CREATE, nfs.SCAN) return } } diff --git a/base/web/option.go b/base/web/option.go index 01b54bb1..9d4c6a4a 100644 --- a/base/web/option.go +++ b/base/web/option.go @@ -61,7 +61,7 @@ func PushPodCmd(m *ice.Message, cmd string, arg ...string) *ice.Message { GoToastTable(msg, SPACE, func(value ice.Maps) { m.Cmd(SPACE, value[SPACE], kit.Dict(ice.MSG_USERPOD, value[SPACE]), kit.Select(m.ShortKey(), cmd), arg).Table(func(val ice.Maps, index int, head []string) { kit.If(!kit.IsIn(SPACE, head...), func() { head = append(head, SPACE) }) - val[SPACE] = kit.Keys(value[SPACE], val[SPACE]) + val[SPACE] = kit.Keys(m.Option(ice.MSG_USERPOD), value[SPACE], val[SPACE]) m.Push("", val, head) }) }) diff --git a/base/web/space.go b/base/web/space.go index eb1ab36d..8a878535 100644 --- a/base/web/space.go +++ b/base/web/space.go @@ -85,7 +85,7 @@ func _space_fork(m *ice.Message) { } } if m.Option(mdb.ICONS) != "" && !kit.HasPrefix(m.Option(mdb.ICONS), nfs.PS, HTTP) { - m.Option(mdb.ICONS, kit.MergeURL(nfs.P+m.Option(mdb.ICONS), ice.POD, name)) + // m.Option(mdb.ICONS, kit.MergeURL(nfs.P+m.Option(mdb.ICONS), ice.POD, name)) } args := kit.Simple(mdb.TYPE, m.Option(mdb.TYPE), mdb.NAME, name, mdb.TEXT, text, m.OptionSimple(mdb.ICONS, mdb.TIME, nfs.MODULE, nfs.VERSION, cli.DAEMON)) args = append(args, aaa.USERNICK, m.Option(ice.MSG_USERNICK), aaa.USERNAME, m.Option(ice.MSG_USERNAME), aaa.USERROLE, m.Option(ice.MSG_USERROLE)) @@ -194,7 +194,14 @@ func _space_exec(m *ice.Message, name string, source, target []string, c *websoc m.Optionv(ice.MSG_OPTION, []string{}) break } - m.Option(mdb.ICONS, m.Resource(m.Option(mdb.ICONS), SpideOrigin(m, name))) + icons := m.Option(mdb.ICONS) + if !strings.HasPrefix(icons, HTTP) { + if !strings.HasPrefix(icons, nfs.PS) { + icons = nfs.P + icons + } + icons = SpideOrigin(m, name) + icons + } + m.Option(mdb.ICONS, icons) args := m.OptionSimple(mdb.ICONS, mdb.TIME, nfs.MODULE, nfs.VERSION, AGENT, cli.SYSTEM) kit.If(name == ice.OPS, func() { args = append(args, m.OptionSimple(mdb.TEXT)...) }) mdb.HashModify(m, mdb.HASH, name, ParseUA(m), args) @@ -421,6 +428,14 @@ func init() { } m.PushButton(kit.Select(OPEN, LOGIN, value[mdb.TYPE] == LOGIN), mdb.REMOVE) }) + m.RewriteAppend(func(value, key string, index int) string { + if key == mdb.ICONS { + if !kit.HasPrefix(value, nfs.PS, HTTP) { + value = kit.MergeURL(nfs.P+value, ice.POD, kit.Keys(m.Option(ice.MSG_USERPOD), m.Appendv(mdb.NAME)[index])) + } + } + return value + }) m.Sort("", kit.Simple(aaa.LOGIN, WEIXIN, PORTAL, WORKER, SERVER, ORIGIN)) } else { if kit.IsIn(arg[0], "", ice.CONTEXTS) { diff --git a/base/web/store.js b/base/web/store.js index 227eb241..f74e4f6d 100644 --- a/base/web/store.js +++ b/base/web/store.js @@ -2,8 +2,7 @@ Volcanos(chat.ONIMPORT, { _init: function(can, msg, cb) { can.db.hash[0] = can.db.hash[0]||(can.user.info.nodetype == web.WORKER? ice.OPS: ice.DEV) can.ui = can.onappend.layout(can), can.onimport._project(can, msg, []) - cb && cb(msg), - can.onappend._filter(can) + cb && cb(msg), can.onappend._filter(can) }, _project: function(can, msg, dev, target) { msg.Table(function(value) { if (value.type == web.WORKER) { return } diff --git a/misc/git/repos.go b/misc/git/repos.go index 1f0d8b58..62428db5 100644 --- a/misc/git/repos.go +++ b/misc/git/repos.go @@ -569,6 +569,7 @@ func init() { }}, STATUS: {Help: "状态", Icon: "bi bi-app-indicator", Hand: func(m *ice.Message, arg ...string) { if repos := kit.Select(m.Option(REPOS), arg, 0); repos != "" { + m.Toast(kit.Format("what %v", repos)) _repos_status(m, repos, _repos_open(m, repos)) } else { last := "" diff --git a/misc/wx/ide.go b/misc/wx/ide.go index 9aa6ec65..fbbd38c5 100644 --- a/misc/wx/ide.go +++ b/misc/wx/ide.go @@ -179,7 +179,8 @@ func init() { } else if mdb.HashSelect(m, arg...); tcp.IsLocalHost(m, m.Option(ice.MSG_USERIP)) { m.PushAction(AUTO_PREVIEW, PREVIEW, PUSH, mdb.REMOVE).Action(aaa.LOGIN, code.AUTOGEN, mdb.CREATE, web.ADMIN, DOC) } else { - m.PushAction(PUSH, mdb.REMOVE).Action(mdb.CREATE, web.ADMIN, DOC) + m.PushAction(AUTO_PREVIEW, PREVIEW, PUSH, mdb.REMOVE).Action(aaa.LOGIN, code.AUTOGEN, mdb.CREATE, web.ADMIN, DOC) + // m.PushAction(PUSH, mdb.REMOVE).Action(mdb.CREATE, web.ADMIN, DOC) } if len(arg) > 0 { m.Options(m.AppendSimple(web.SPACE, ctx.INDEX, ctx.ARGS, tcp.WIFI))