From c879020d3ac3c1d7118ba583ea9391f63671fdca Mon Sep 17 00:00:00 2001 From: shy Date: Fri, 19 Jan 2024 09:28:37 +0800 Subject: [PATCH] add some --- index.css | 1 + lib/misc.js | 3 ++- panel/action.js | 1 + plugin/local/code/inner.css | 2 +- plugin/local/code/inner/search.js | 2 +- plugin/table.js | 2 +- 6 files changed, 7 insertions(+), 4 deletions(-) diff --git a/index.css b/index.css index 9d633429..e57da7f6 100644 --- a/index.css +++ b/index.css @@ -577,6 +577,7 @@ fieldset.inner.float>div.status { display:none; } fieldset.inner>div.output>div.project div.item.modify { background-color:#00800036; } fieldset.vimer>div.output>div.project div.item.modify { background-color:#00800036; } fieldset.vimer>div.output>div.project>div.zone.space div.item.stop { color:var(--disable-fg-color); } +fieldset.vimer>div.output>div.project>div.zone.space fieldset>div.output>div.item { height:42px; } fieldset.xterm>div.action>div.tabs:only-child { display:none; } fieldset.xterm.story>form.option>div.item.hash input { width:320px; } fieldset.cmd>div.output>fieldset.xterm.story>form.option>div.item.hash input { width:var(--plug-width); } diff --git a/lib/misc.js b/lib/misc.js index 34924a8c..444f2d1f 100644 --- a/lib/misc.js +++ b/lib/misc.js @@ -184,7 +184,8 @@ Volcanos("misc", { return socket }, ResourceFavicon(can) { return can.misc.Resource(can, nfs.SRC_MAIN_ICO) }, - Resource(can, path, space) { if (can.base.beginWith(path, web.HTTP, nfs.PS)) { return path } + Resource(can, path, space) { + if (can.base.beginWith(path, web.HTTP, nfs.PS)) { return path } return can.base.MergeURL(nfs.REQUIRE+path+_version, ice.POD, space||can.ConfSpace()||can.misc.Search(can, ice.POD)) }, ShareLocal(can, path, space) { if (can.base.beginWith(path, web.HTTP, nfs.PS)) { return path } diff --git a/panel/action.js b/panel/action.js index 94e92164..747fb6fc 100644 --- a/panel/action.js +++ b/panel/action.js @@ -78,6 +78,7 @@ Volcanos(chat.ONACTION, {_init: function(can, target) { can.db.list = can.misc.S onsearch: function(can, msg, arg) { var fields = msg.Option(ice.MSG_FIELDS).split(mdb.FS); if (arg[0] == mdb.PLUGIN) { can.onexport.plugin(can, msg, arg, fields) } if (arg[0] == ctx.COMMAND) { can.onexport.command(can, msg, arg, fields) } }, onkeydown: function(can, msg, model) { if (can.isCmdMode() && !msg._event.metaKey) { var sub = can._plugins[0].sub; sub && can.core.CallFunc([sub, "onaction.onkeydown"], {event: msg._event, can: sub}); return } + if (can._current && !msg._event.metaKey) { var sub = can._current.sub; sub && can.core.CallFunc([sub, "onaction.onkeydown"], {event: msg._event, can: sub}); return } if (can.onkeymap.selectCtrlN(msg._event, can, can._action, html.DIV_ITEM)) { return } can._keylist = can.onkeymap._parse(msg._event, can, model, can._keylist||[], can._output) }, diff --git a/plugin/local/code/inner.css b/plugin/local/code/inner.css index cda1a602..1f6035d8 100644 --- a/plugin/local/code/inner.css +++ b/plugin/local/code/inner.css @@ -11,7 +11,7 @@ fieldset.inner>div.output div.content td.text span.package { color:var(--code-pa fieldset.inner>div.output>div.project div.zone div.action:not(.hide) { width:100%; } fieldset.inner>div.output>div.project div.zone div.action>div.item { padding-right:0; width:100%; overflow:hidden; } fieldset.inner>div.output>div.project div.zone div.action>div.item>input { padding-left:25px; width:100%; } -fieldset.inner>div.output>div.project div.zone.space>div.list div.output>div.item { margin:var(--input-margin) 0; width:calc(100% - 5px); } +/* fieldset.inner>div.output>div.project div.zone.space>div.list div.output>div.item { margin:var(--input-margin) 0; width:calc(100% - 5px); } */ fieldset.inner>div.output>div.project div.zone.space>div.list div.output>div.item:hover { background-color:var(--hover-bg-color); } fieldset.inner>div.output>div.project div.zone.repos>div.list div.output>div.item { margin:0; width:100% !important; } fieldset.inner>div.output>div.project div.zone.repos>div.list div.output>div.item:hover { background-color:var(--hover-bg-color); } diff --git a/plugin/local/code/inner/search.js b/plugin/local/code/inner/search.js index 1500db06..63bf748e 100644 --- a/plugin/local/code/inner/search.js +++ b/plugin/local/code/inner/search.js @@ -1,4 +1,4 @@ -Volcanos(chat.ONIMPORT, {list: ["value", "filter", "run:button"], _init: function(can, msg) { +Volcanos(chat.ONIMPORT, {list: ["value", "filter", "run:button", "close"], _init: function(can, msg) { can.onmotion.clear(can), can.onappend.table(can, msg), can.onappend.board(can, msg), can.onmotion.highlight(can, can.Option(mdb.VALUE, msg.Option(mdb.VALUE))) can.page.Select(can, can._option, "input[name=filter]", function(target) { target.onkeyup = function(event) { can.onmotion.highlight(can, target.value) } }) }}) diff --git a/plugin/table.js b/plugin/table.js index c8fef32b..aff32355 100644 --- a/plugin/table.js +++ b/plugin/table.js @@ -18,7 +18,7 @@ Volcanos(chat.ONIMPORT, {_init: function(can, msg, target) { })), can.onimport.layout = function() { can.onlayout.expand(can, can._output, 320) }, can.onappend.scroll(can, can._output) }, _vimer_zone: function(can, msg, target) { msg.Table(function(value) { var action = can.page.parseAction(can, value) - can.onimport.item(can, {icon: value.icon||value.avatar_url, name: can.page.Color(value[can.Conf(mdb.FIELD)||mdb.VIEW]||value[mdb.NAME]||value[mdb.TEXT]||value[mdb.TYPE]), title: value[mdb.TEXT]||value.description}, function(event) { + can.onimport.item(can, {icon: can.misc.Resource(can, value.icon||value.avatar_url), name: can.page.Color(value[can.Conf(mdb.FIELD)||mdb.VIEW]||value[mdb.NAME]||value[mdb.TEXT]||value[mdb.TYPE]), title: value[mdb.TEXT]||value.description}, function(event) { can.sup.onexport.record(can, value.name, mdb.NAME, value, event) }, function() { return shy(action, function(event, button, meta, carte) { can.misc.Event(event, can, function(msg) { carte.close() can.sup.onexport.action(can, button, value) || can.run(event, [ctx.ACTION, button], function(msg) { can.sup.onimport._process(can.sup, msg) || can.Update() })