From f64b1419305eb58e059b1dae0a1f4a5aadfe86fe Mon Sep 17 00:00:00 2001 From: shy Date: Sun, 19 May 2024 17:02:57 +0800 Subject: [PATCH] add some --- base/web/store.js | 10 +++--- core/chat/flows.js | 8 ++--- core/chat/macos/finder.js | 6 ++-- core/code/xterm.go | 68 ++++----------------------------------- 4 files changed, 18 insertions(+), 74 deletions(-) diff --git a/base/web/store.js b/base/web/store.js index 3588d0e2..b59c37ba 100644 --- a/base/web/store.js +++ b/base/web/store.js @@ -1,11 +1,11 @@ Volcanos(chat.ONIMPORT, { _init: function(can, msg) { can.ui = can.onappend.layout(can), can.onimport._project(can, msg) }, _project: function(can, msg) { var select, current = can.sup.db._zone||can.db.hash[0]||(can.user.info.nodetype == web.WORKER? ice.OPS: ice.DEV) - msg.Table(function(value) { - var _target = can.onimport.item(can, value, function(event, value) { - can.onimport.dream(event, can, value, _target) - }, null, can.ui.project); select = (value.name == current? _target: select)||_target - }), select && select.click(), can.onmotion.orderShow(can, can.ui.project) + msg.Table(function(value) { value._select = value.name == current + can.onimport.item(can, value, function(event, item, target) { + can.onimport.dream(event, can, item, target) + }) + }) can.onappend.style(can, "output card", can.ui.content), can.onmotion.delay(can, function() { can.onimport.layout(can) }) can.onmotion.delay(can, function() { can.onappend._filter(can) }) }, diff --git a/core/chat/flows.js b/core/chat/flows.js index e86d2027..4e8455aa 100644 --- a/core/chat/flows.js +++ b/core/chat/flows.js @@ -4,8 +4,8 @@ Volcanos(chat.ONIMPORT, { can.core.Item(can.Action(), function(key) { can.onaction[key] = can.onaction[key]||can.onaction.refresh, can.Action(key, can.misc.localStorage(can, ACTION_STORE+key)) }) if (can.Option(mdb.ZONE)) { can.onmotion.hidden(can, can.ui.project), can.onimport._content(can, msg, can.Option(mdb.ZONE)) } else { can.onimport._project(can, msg) } }, - _project: function(can, msg) { var target; msg.Table(function(value) { - var item = can.onimport.item(can, value, function(event) { can.Option(mdb.ZONE, value.zone) + _project: function(can, msg) { msg.Table(function(value) { value._select = value.zone == can.Option(mdb.ZONE) + can.onimport.item(can, value, function(event, item) { can.Option(mdb.ZONE, value.zone) if (can.onmotion.cache(can, function(save, load) { save({db: can.db, toggle: can.ui.toggle, _display_class: can.ui.display.className, _profile_class: can.ui.profile.className}) return load(value.zone, function(bak) { can.db = bak.db, can.ui.toggle = bak.toggle @@ -14,8 +14,8 @@ Volcanos(chat.ONIMPORT, { }) }, can.ui.content, can.ui.display, can._status)) { return can.page.isDisplay(can.ui.profile) && can.onimport._profile(can, can.db.current), can.onimport.layout(can) } can.run(event, [value.zone], function(msg) { can.onimport._content(can, msg, can.Option(mdb.ZONE)) }) - }, null, can.ui.project); target = value.zone == can.Option(mdb.ZONE)? item: target||item - }), target && target.click() }, + }) + }) }, _content: function(can, msg, zone) { if (msg.Length() == 0) { return can.Update(can.request({target: can._legend}, {title: mdb.INSERT, zone: zone}), [ctx.ACTION, mdb.INSERT]) } can.db.list = {}; msg.Table(function(value) { can.db.list[value.hash] = value }) var root; can.core.Item(can.db.list, function(key, item) { if (!item.prev && !item.from) { return root = item } diff --git a/core/chat/macos/finder.js b/core/chat/macos/finder.js index fd7c9542..39fcd8aa 100644 --- a/core/chat/macos/finder.js +++ b/core/chat/macos/finder.js @@ -1,6 +1,6 @@ Volcanos(chat.ONIMPORT, { - _init: function(can, msg) { can.ui = can.onappend.layout(can), msg.Table(function(value, index) { - var item = can.onimport.item(can, value, function(event) { if (can.onmotion.cache(can, function() { return value.name }, can.ui.content)) { return } + _init: function(can, msg) { can.ui = can.onappend.layout(can), msg.Table(function(value, index) { value._select == index == 0 + can.onimport.item(can, value, function(event, item) { if (can.onmotion.cache(can, function() { return value.name }, can.ui.content)) { return } can.runActionCommand(event, value.index, [], function(msg) { switch (value.name) { case ".": @@ -8,7 +8,7 @@ Volcanos(chat.ONIMPORT, { default: can.onappend.table(can, msg, null, can.ui.content) } can.onimport.layout(can) }) - }); index == 0 && item.click() + }) }), can.onmotion.hidden(can, can.ui.project) }, icons: function(can, msg, target) { can.onimport.icon(can, msg = msg||can._msg, target, function(target, item) { can.page.Modify(can, target, { onclick: function(event) { can.sup.onexport.record(can.sup, item.name, mdb.NAME, item) }, diff --git a/core/code/xterm.go b/core/code/xterm.go index 9550b98e..913f4d5a 100644 --- a/core/code/xterm.go +++ b/core/code/xterm.go @@ -13,10 +13,8 @@ import ( "shylinux.com/x/icebergs/base/lex" "shylinux.com/x/icebergs/base/mdb" "shylinux.com/x/icebergs/base/nfs" - "shylinux.com/x/icebergs/base/ssh" "shylinux.com/x/icebergs/base/web" "shylinux.com/x/icebergs/base/web/html" - "shylinux.com/x/icebergs/core/chat" "shylinux.com/x/icebergs/misc/xterm" kit "shylinux.com/x/toolkits" ) @@ -69,14 +67,9 @@ const ( const XTERM = "xterm" func init() { - shell := kit.Env("SHELL", "/bin/sh") Index.MergeCommands(ice.Commands{ - XTERM: {Name: "xterm hash auto", Help: "终端", Icon: "Terminal.png", Actions: ice.MergeActions(ice.Actions{ + XTERM: {Name: "xterm refresh", Help: "终端", Icon: "Terminal.png", Actions: ice.MergeActions(ice.Actions{ ice.CTX_INIT: {Hand: func(m *ice.Message, arg ...string) { - kit.If(m.Cmd("").Length() == 0, func() { - m.Cmd("", mdb.CREATE, mdb.TYPE, shell) - m.Cmd("", mdb.CREATE, mdb.TYPE, "/bin/ish") - }) kit.For([]string{ "xterm/lib/xterm.js", "xterm/css/xterm.css", @@ -87,13 +80,6 @@ func init() { m.Cmd(BINPACK, mdb.INSERT, nfs.USR_MODULES+p) }) }}, - mdb.SEARCH: {Hand: func(m *ice.Message, arg ...string) { - if mdb.IsSearchPreview(m, arg) || kit.HasPrefixList(arg, SHELL) { - kit.For([]string{shell, "/bin/ish"}, func(p string) { - m.PushSearch(mdb.TYPE, SHELL, mdb.NAME, path.Base(p), mdb.TEXT, p) - }) - } - }}, mdb.INPUTS: {Hand: func(m *ice.Message, arg ...string) { switch mdb.HashInputs(m, arg); arg[0] { case mdb.HASH: @@ -109,15 +95,6 @@ func init() { m.Cmdy(nfs.DIR, ice.USR_LOCAL_WORK, nfs.PATH) m.Cmdy(nfs.DIR, ice.USR_LOCAL_REPOS, nfs.PATH) m.Cmdy(nfs.DIR, ice.USR_LOCAL_DAEMON, nfs.PATH) - case nfs.FILE: - push := func(arg ...string) { m.Push(nfs.FILE, strings.Join(arg, nfs.DF)) } - m.Cmd("", func(value ice.Maps) { - kit.If(value[mdb.TYPE] == html.LAYOUT, func() { push(html.LAYOUT, value[mdb.HASH], value[mdb.NAME]) }) - }) - m.Cmd("", mdb.INPUTS, mdb.TYPE, func(value ice.Maps) { push(ssh.SHELL, value[mdb.TYPE]) }) - m.Cmd(nfs.CAT, kit.HomePath(".bash_history"), func(text string) { push(text) }) - m.Cmd(nfs.CAT, kit.HomePath(".zsh_history"), func(text string) { push(text) }) - m.Cmd(ctx.COMMAND, mdb.SEARCH, ctx.COMMAND, "", "", ice.OptionFields(ctx.INDEX), func(value ice.Maps) { push(ctx.INDEX, value[ctx.INDEX]) }) } }}, mdb.CREATE: {Hand: func(m *ice.Message, arg ...string) { @@ -131,13 +108,6 @@ func init() { _xterm_get(m, "").Write(b) } }}, - html.OUTPUT: {Help: "全屏", Hand: func(m *ice.Message, arg ...string) { - m.ProcessOpen(m.MergePodCmd("", "", mdb.HASH, kit.Select(m.Option(mdb.HASH), arg, 0), ctx.STYLE, html.OUTPUT)) - }}, - INSTALL: {Help: "安装", Hand: func(m *ice.Message, arg ...string) { - _xterm_get(m, kit.Select("", arg, 0)).Write([]byte(m.Cmdx(PUBLISH, ice.CONTEXTS, ice.APP, kit.Dict("format", "raw")) + ice.NL)) - m.ProcessHold() - }}, ice.APP: {Help: "本机", Icon: "bi bi-terminal", Hand: func(m *ice.Message, arg ...string) { if h := kit.Select(m.Option(mdb.HASH), arg, 0); h == "" { cli.OpenCmds(m, "cd "+kit.Path("")) @@ -146,39 +116,13 @@ func init() { } m.ProcessHold() }}, - chat.FAVOR_INPUTS: {Hand: func(m *ice.Message, arg ...string) { - switch arg[0] { - case mdb.TYPE: - m.Push(arg[0], SHELL) - case mdb.TEXT: - if m.Option(mdb.TYPE) == SHELL { - m.Cmd(mdb.SEARCH, mdb.FOREACH, "", "", func(value ice.Maps) { - kit.If(value[mdb.TYPE] == ssh.SHELL, func() { m.Push(arg[0], value[mdb.TEXT]) }) - }) - } - } - }}, - chat.FAVOR_TABLES: {Hand: func(m *ice.Message, arg ...string) { - kit.If(m.Option(mdb.TYPE) == SHELL, func() { m.PushButton(kit.Dict(m.CommandKey(), "终端")) }) - }}, - chat.FAVOR_ACTION: {Hand: func(m *ice.Message, arg ...string) { - kit.If(m.Option(mdb.TYPE) == SHELL, func() { - ctx.ProcessField(m, m.ShortKey(), m.Cmdx("", mdb.CREATE, mdb.TYPE, m.Option(mdb.TEXT), mdb.NAME, m.Option(mdb.NAME), mdb.TEXT, "")) - }) - }}, web.DREAM_TABLES: {Hand: func(m *ice.Message, arg ...string) { kit.If(m.IsDebug() && aaa.IsTechOrRoot(m), func() { m.PushButton(kit.Dict(m.CommandKey(), m.Commands("").Help)) }) }}, - web.DREAM_ACTION: {Hand: func(m *ice.Message, arg ...string) { - web.DreamProcess(m, "", cli.SH, arg...) - }}, - }, web.DreamTablesAction(), chat.FavorAction(), mdb.HashAction(mdb.FIELD, "time,hash,type,name,text,path")), Hand: func(m *ice.Message, arg ...string) { + web.DREAM_ACTION: {Hand: func(m *ice.Message, arg ...string) { web.DreamProcess(m, "", cli.SH, arg...) }}, + }, web.DreamTablesAction(), mdb.HashAction(mdb.FIELD, "time,hash,type,name,text,path")), Hand: func(m *ice.Message, arg ...string) { if mdb.HashSelect(m, arg...); len(arg) == 0 { - if web.IsLocalHost(m) { - m.Action(mdb.CREATE, mdb.PRUNES, ice.APP) - } else { - m.Action(mdb.CREATE, mdb.PRUNES) - } + m.Action(mdb.CREATE) } else { kit.If(m.Length() == 0, func() { kit.If(arg[0] == cli.SH, func() { @@ -192,9 +136,9 @@ func init() { mdb.HashSelect(m, arg[0]) }) m.Push(mdb.HASH, arg[0]) - kit.If(m.IsLocalhost(), func() { m.Action(ice.APP) }) - ctx.DisplayLocal(m, "") + kit.If(m.IsLocalhost() && m.Append(mdb.TYPE) != "ish", func() { m.Action(ice.APP) }) } + ctx.DisplayLocal(m, "") }}, }) }