diff --git a/base/web/dream.go b/base/web/dream.go index 63c238ad..70a5e258 100644 --- a/base/web/dream.go +++ b/base/web/dream.go @@ -373,10 +373,10 @@ func init() { kit.If(m.Option(aaa.ACCESS) == aaa.PUBLIC, func() { m.Option(aaa.ACCESS, "") }) mdb.HashModify(m, m.OptionSimple(mdb.NAME, cli.RESTART, aaa.ACCESS)) }}, - tcp.SEND: {Name: "send space*", Hand: func(m *ice.Message, arg ...string) { - m.Cmd(SPACE, m.Option(SPACE), DREAM, mdb.CREATE, m.OptionSimple(mdb.NAME, mdb.ICONS, nfs.REPOS, nfs.BINARY)) - m.Cmd(SPACE, m.Option(SPACE), DREAM, cli.START, m.OptionSimple(mdb.NAME)) - ProcessIframe(m, "", m.MergePod(kit.Keys(m.Option(SPACE), m.Option(mdb.NAME)))) + tcp.SEND: {Name: "send to*", Hand: func(m *ice.Message, arg ...string) { + m.Cmd(SPACE, m.Option(nfs.TO), DREAM, mdb.CREATE, m.OptionSimple(mdb.NAME, mdb.ICONS, nfs.REPOS, nfs.BINARY)) + m.Cmd(SPACE, m.Option(nfs.TO), DREAM, cli.START, m.OptionSimple(mdb.NAME)) + ProcessIframe(m, "", m.MergePod(kit.Keys(m.Option(nfs.TO), m.Option(mdb.NAME)))) }}, nfs.COPY: {Name: "copy to*", Help: "复制", Hand: func(m *ice.Message, arg ...string) { m.Cmdy("", mdb.CREATE, mdb.NAME, m.Option(nfs.TO), nfs.BINARY, path.Join(ice.USR_LOCAL_WORK, m.Option(mdb.NAME), ice.BIN_ICE_BIN)) @@ -416,7 +416,7 @@ func init() { return } list := []ice.Any{} - kit.If(m.IsDebug(), func() { list = append(list, cli.RUNTIME) }) + // kit.If(m.IsDebug(), func() { list = append(list, cli.RUNTIME) }) switch m.Option(mdb.TYPE) { case WORKER: list = append(list, "settings", nfs.COPY, tcp.SEND) @@ -488,7 +488,7 @@ func init() { }}, }, StatsAction(), DreamAction(), DreamTablesAction(), mdb.ImportantHashAction( mdb.SHORT, mdb.NAME, mdb.FIELD, "time,name,icons,repos,binary,template,restart,access", - html.BUTTON, kit.JoinWord(PORTAL, DESKTOP, MESSAGE, ADMIN, WORD, STATUS, VIMER, COMPILE, XTERM, DREAM), + html.BUTTON, kit.JoinWord(PORTAL, DESKTOP, ADMIN, WORD, STATUS, VIMER, COMPILE, XTERM, DREAM), ctx.TOOLS, kit.Simple(SPIDE, ROUTE, STATUS), ONLINE, ice.TRUE, )), Hand: func(m *ice.Message, arg ...string) { if len(arg) == 0 { diff --git a/base/web/store.go b/base/web/store.go index 74d84854..214832f9 100644 --- a/base/web/store.go +++ b/base/web/store.go @@ -74,7 +74,7 @@ func init() { origin := SpideOrigin(m, arg[0]) kit.If(origin == "", func() { arg[0], origin, dream = ice.DEV, arg[0], arg[0]+dream }) if kit.IsIn(kit.ParseURL(origin).Hostname(), append(m.Cmds(tcp.HOST).Appendv(aaa.IP), tcp.LOCALHOST)...) { - // origin = m.Option(ice.MSG_USERHOST) + origin = m.Option(ice.MSG_USERHOST) } else { origin = tcp.PublishLocalhost(m, origin) } diff --git a/core/chat/flows.css b/core/chat/flows.css index 27c9f2f5..e856c0da 100644 --- a/core/chat/flows.css +++ b/core/chat/flows.css @@ -13,5 +13,9 @@ $content fieldset.can._action { position:absolute; bottom:var(--action-height); $content fieldset.can._action>legend { display:none; } $content fieldset.can._action>div.action { display:contents; } $content fieldset.can._action>div.action br { clear:both; } -$content fieldset.can._action>div.action div.state { display:none; } +$content fieldset.can._action>div.action div.item.state { display:none; } $content fieldset.can._action>div.status { display:none; } +$content fieldset.can._action:not(:hover) { background-color:transparent; } +$content fieldset.can._action:not(:hover)>form.option input { background-color:transparent; } +$content fieldset.can._action:not(:hover)>div.action input { background-color:transparent; } +$output>div.layout>div.layout:not(:hover) fieldset.can._action { visibility:hidden; } \ No newline at end of file diff --git a/core/chat/flows.js b/core/chat/flows.js index d10ed879..e273d3e7 100644 --- a/core/chat/flows.js +++ b/core/chat/flows.js @@ -101,7 +101,10 @@ Volcanos(chat.ONIMPORT, { }, layout: function(can) { can.ui.layout(can.ConfHeight(), can.ConfWidth(), 0, function(height, width) { var sub = can.db.value && can.db.value._toolkit_plugin - if (sub) { sub.onimport.size(sub, html.ACTION_HEIGHT, width/2, true), can.page.style(can, sub._target, html.LEFT, width/4) } + if (sub) { + can.page.style(can, sub._target, html.LEFT, 0), sub.onimport.size(sub, html.ACTION_HEIGHT, width, true) + can.page.style(can, sub._target, html.LEFT, (can.ui.content.offsetWidth-sub._target.offsetWidth)/2) + } }) }, }) Volcanos(chat.ONACTION, { diff --git a/core/chat/macos/desktop.css b/core/chat/macos/desktop.css index a3a84362..043331b4 100644 --- a/core/chat/macos/desktop.css +++ b/core/chat/macos/desktop.css @@ -8,8 +8,8 @@ fieldset.desktop>div.output>fieldset.macos.menu div.menu:hover { background-colo fieldset.desktop>div.output>fieldset.macos.menu div.menu.icon { font-size:24px; line-height:22px; height:var(--desktop-menu-height); } fieldset.desktop>div.output>fieldset.macos.menu div.menu img { height:var(--desktop-menu-height); margin-right:var(--input-padding); } fieldset.desktop>div.output>fieldset.macos.menu div.menu { display:flex; align-items:flex-start; } -fieldset.desktop>div.output>fieldset.macos.menu div.menu.title { font-style:italic; margin-left:10px; } -fieldset.desktop>div.output>fieldset.macos.menu div.item.time { margin-right:10px; } +fieldset.desktop>div.output>fieldset.macos.menu div.menu.title { font-style:italic; } +// fieldset.desktop>div.output>fieldset.macos.menu div.item.time { margin-right:10px; } fieldset.desktop>div.output>fieldset.macos.menu>div.output { overflow:hidden; } fieldset.desktop>div.output>fieldset.macos.dock { border:var(--plugin-border); border-radius:var(--plugin-radius); position:absolute; bottom:var(--input-margin); transition:margin-left 0.3s; z-index:10; } fieldset.desktop>div.output>fieldset.macos.searchs { position:absolute; z-index:10; } @@ -67,11 +67,13 @@ fieldset.desktop>div.output>div.desktop>fieldset.web.chat.macos.finder>div.statu fieldset.desktop>div.output>div.desktop>fieldset.web.chat.macos.finder>div.output div.item.disable { display:none; } fieldset.desktop>div.output>fieldset.web.chat.macos.dock>div.output div.item.disable { display:none; } fieldset.desktop>div.output>div.desktop>div.item.disable { display:none; } -fieldset.macos.menu>div.output>div.item { padding:0 var(--button-padding); height:var(--desktop-menu-height); float:right; } -fieldset.macos.menu>div.output>div.item.avatar { padding:0; } -fieldset.macos.menu>div.output>div.item.avatar { margin-right:10px; } +fieldset.macos.menu>div.output>div.item { padding:0 var(--input-padding); height:var(--desktop-menu-height); float:right; } +body.cmd fieldset.macos.menu>div.output>div.item { padding:0 var(--button-padding); } +// fieldset.macos.menu>div.output>div.item.avatar { padding:0; } +// fieldset.macos.menu>div.output>div.item.avatar { margin-right:10px; } fieldset.macos.menu>div.output>div.item.avatar>img { padding:0; height:var(--desktop-menu-height); } -fieldset.macos.menu>div.output>div.menu { padding:0 var(--button-padding); float:left; } +fieldset.macos.menu>div.output>div.menu { padding:0 var(--input-padding); float:left; } +body.cmd fieldset.macos.menu>div.output>div.menu { padding:0 var(--button-padding); } fieldset.macos.menu>div.output>div.tabs { font-style:italic; padding:0 var(--button-padding); float:left; } fieldset.macos.menu>div.output>div.tabs.select { background-color:var(--panel-hover-bg-color); color:var(--panel-hover-fg-color); } fieldset.macos.dock>div.output { height:var(--desktop-icon-size); display:flex; overflow:auto; } diff --git a/core/chat/macos/finder.js b/core/chat/macos/finder.js index 39fcd8aa..cf6799c2 100644 --- a/core/chat/macos/finder.js +++ b/core/chat/macos/finder.js @@ -1,5 +1,5 @@ Volcanos(chat.ONIMPORT, { - _init: function(can, msg) { can.ui = can.onappend.layout(can), msg.Table(function(value, index) { value._select == index == 0 + _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) { diff --git a/core/code/vimer.go b/core/code/vimer.go index 461ae9d6..664e12ed 100644 --- a/core/code/vimer.go +++ b/core/code/vimer.go @@ -151,6 +151,11 @@ func init() { kit.If(len(arg) == 0, func() { arg = append(arg, m.Option(nfs.PATH), m.Option(nfs.FILE), m.Option(nfs.LINE)) }) cli.OpenCmds(m, "cd "+kit.Path(""), "vim "+path.Join(arg[0], arg[1])+" +"+arg[2]).ProcessHold() }}, + web.DREAM_TABLES: {Hand: func(m *ice.Message, arg ...string) { + kit.If(m.IsDebug() && aaa.IsTechOrRoot(m), func() { + m.PushButton(kit.Dict(m.CommandKey(), "编程")) + }) + }}, }, web.DreamTablesAction("编程"), ctx.ConfAction(ctx.TOOLS, "xterm,compile,runtime", web.ONLINE, ice.TRUE)), Hand: func(m *ice.Message, arg ...string) { if m.Cmdy(INNER, arg); arg[0] == ctx.ACTION { return diff --git a/core/code/xterm.go b/core/code/xterm.go index 913f4d5a..2efcdd93 100644 --- a/core/code/xterm.go +++ b/core/code/xterm.go @@ -117,7 +117,11 @@ func init() { m.ProcessHold() }}, 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)) }) + kit.If(m.IsDebug() && aaa.IsTechOrRoot(m), func() { + // m.PushButton(cli.RUNTIME) + m.PushButton(cli.RUNTIME, kit.Dict(m.CommandKey(), m.Commands("").Help)) + }) + // kit.If(m.IsDebug(), func() { list = append(list, cli.RUNTIME) }) }}, 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) {