From c12d47c82dfda228319fb8838a1ea17637d3711f Mon Sep 17 00:00:00 2001 From: shylinux Date: Sat, 22 Apr 2023 21:23:59 +0800 Subject: [PATCH] add some --- frame.js | 8 +++---- panel/action.js | 2 +- plugin/local/code/inner.css | 8 +++++-- plugin/local/code/inner.js | 45 +++++++++++++++++++------------------ plugin/local/code/vimer.css | 4 ++-- plugin/local/code/vimer.js | 16 ++++++++----- plugin/local/wiki/word.css | 2 +- plugin/table.js | 3 ++- 8 files changed, 50 insertions(+), 38 deletions(-) diff --git a/frame.js b/frame.js index 360f9376..a4f274cd 100644 --- a/frame.js +++ b/frame.js @@ -121,7 +121,7 @@ Volcanos(chat.ONAPPEND, {_init: function(can, meta, list, cb, target, field) { Status: function(key, value) { if (can.base.isObject(key)) { return can.core.Item(key, sub.Status), key } can.page.Select(can, status, [[[html.SPAN, key]]], function(target) { if (can.base.beginWith(value, ice.PS, ice.HTTP)) { value = can.page.Format(html.A, value) } - return can.base.isUndefined(value)? (value = target.innerHTML): (target.innerHTML = value||"") + return can.base.isUndefined(value)? (value = target.innerHTML): (target.innerHTML = value.trim? value.trim(): value||"") }); return value }, Action: function(key, value) { return can.page.SelectArgs(can, action, key, value)[0] }, @@ -225,6 +225,7 @@ Volcanos(chat.ONAPPEND, {_init: function(can, meta, list, cb, target, field) { }) }, _output: function(can, msg, display, output, action, cb) { display = display||chat.PLUGIN_TABLE_JS, output = output||can._output + can.misc.Search(can, log.DEBUG) == ice.TRUE && can.base.beginWith(display, "/require/src/") && delete(Volcanos.meta.cache[display]) Volcanos(display, {_root: can._root, _follow: can.core.Keys(can._follow, display), _fields: can._target, _target: output, _legend: can._legend, _option: can._option, _action: can._action, _output: output, _status: can._status, Update: can.Update, Option: can.Option, Action: can.Action, Status: can.Status, @@ -254,7 +255,7 @@ Volcanos(chat.ONAPPEND, {_init: function(can, meta, list, cb, target, field) { can.core.List(can.base.Obj(list, can.core.Value(can, [chat.ONEXPORT, mdb.LIST])), function(item) { item = can.base.isString(item)? {name: item}: item if (can.base.beginWith(item.value, ice.PS, ice.HTTP)) { item.value = can.page.Format(html.A, item.value, item.value.split("?")[0]) } can.page.Append(can, status, [{view: html.ITEM, list: [ - {text: [item.name, html.LABEL]}, {text: [": ", html.LABEL]}, {text: [(item.value == undefined? "": item.value)+"", html.SPAN, item.name]}, + {text: [item.name, html.LABEL]}, {text: [": ", html.LABEL]}, {text: [(item.value == undefined? "": item.value.trim())+"", html.SPAN, item.name]}, ], onclick: function(event) { can.user.copy(event, can, item.value) }}]) }) }, @@ -414,8 +415,7 @@ Volcanos(chat.ONAPPEND, {_init: function(can, meta, list, cb, target, field) { }); return list } ui.list = append(target, type, list||[html.PROJECT, [[html.CONTENT, html.PROFILE], html.DISPLAY]]) function calc(item, size, total) { return !ui.size[item]? can.base.isString(size)? parseInt(can.base.trimSuffix(size, "px")): size: ui.size[item] < 1? total*ui.size[item]: ui.size[item] } var defer = [], content_height, content_width; function layout(type, list, height, width) { var _width = width, _height = height; can.core.List(list, function(item) { - if (can.base.isArray(item)) { return } - if (can.base.isObject(item)) { var meta = item; item = item._index } + if (can.base.isArray(item)) { return } if (can.base.isObject(item)) { var meta = item; item = item._index } var target = ui[item]; if (!can.page.isDisplay(target)) { return } if (item == html.CONTENT) { return defer.push(function() { can.page.style(can, target, html.HEIGHT, content_height = height, html.WIDTH, content_width = width) }) } if (type == FLOW) { var h = calc(item, target.offsetHeight, height) diff --git a/panel/action.js b/panel/action.js index 5018ad28..2b3142d8 100644 --- a/panel/action.js +++ b/panel/action.js @@ -75,7 +75,7 @@ Volcanos(chat.ONACTION, {_init: function(can, target) { layout: function(can, button, skip) { can.page.ClassList.del(can, can._target, can._layout||can.onlayout._storage(can)), can._header_tabs && can.onmotion.hidden(can, can._header_tabs) button = (can.onlayout._storage(can, can._layout = button == ice.AUTO? "": button))||can.misc.SearchOrConf(can, html.LAYOUT), can.page.ClassList.add(can, can._target, button) can.onengine.signal(can, chat.ONLAYOUT, can.request({}, {layout: button})), can._root.River && can._river_show === false && can.onmotion.hidden(can, can._root.River._target), skip || can.onlayout._init(can) - can.core.List(can._plugins, function(sub) { sub._delay_refresh = false, can.page.ClassList.set(can, sub._target, html.OUTPUT, [TABVIEW, HORIZON, VERTICAL].indexOf(button) > -1) }) + can.isCmdMode() || can.core.List(can._plugins, function(sub) { sub._delay_refresh = false, can.page.ClassList.set(can, sub._target, html.OUTPUT, [TABVIEW, HORIZON, VERTICAL].indexOf(button) > -1) }) var cb = can.onlayout[button]; can.base.isFunc(cb) && cb(can) || can.onlayout._plugin(can, button) }, _menus: [[html.LAYOUT, ice.AUTO, TABS, TABVIEW, HORIZON, VERTICAL, GRID, FREE, FLOW, PAGE]], diff --git a/plugin/local/code/inner.css b/plugin/local/code/inner.css index 8eed21df..2f2bc106 100644 --- a/plugin/local/code/inner.css +++ b/plugin/local/code/inner.css @@ -27,8 +27,8 @@ fieldset.inner>div.output>div.layout>div.layout div.content * { font-family:mono fieldset.inner>div.output>div.layout>div.layout>div.profile { max-width:unset; } fieldset.inner>div.output>div.layout>div.layout>div.profile div.status>div { padding:5px; float:left; } fieldset.inner>div.output>div.layout>div.display div.status>div { padding:5px; float:left; } -fieldset.inner.cmd>div.output>div.project>div.zone>div.item { font-style:italic; font-weight:bold; line-height:32px; } -fieldset.inner.cmd>div.output>div.project>div.zone>div.item>span.icon { font-style:normal; font-weight:normal; } +fieldset.inner>div.output>div.project>div.zone>div.item { font-style:italic; font-weight:bold; line-height:32px; } +fieldset.inner>div.output>div.project>div.zone>div.item>span.icon { font-style:normal; font-weight:normal; } fieldset.inner.cmd>div.output>div.layout>div.tabs { height:38px; display:block; overflow:hidden; } fieldset.inner.cmd>div.output>div.layout>div.tabs.hide { display:none; } fieldset.inner.cmd>div.output>div.layout>div.tabs>div { padding:10px; height:38px; float:left; } @@ -47,6 +47,10 @@ fieldset.inner.cmd>div.output>div.layout>div.path span.view { font-size:22px; li fieldset.inner.cmd>div.output>div.layout>div.plug { height:32px; clear:both; position:fixed; bottom:0; right:0; } fieldset.inner.cmd>div.output>div.layout>div.plug>legend { font-size:1rem; padding:0 10px; float:right; } fieldset.inner.cmd>div.output>div.layout>div.display>div.status { position:sticky; bottom:0; } +fieldset.inner.cmd>legend { display:none; } +fieldset.inner.cmd>form.option { display:none; } +fieldset.inner.cmd>div.action { display:none; } +fieldset.inner.cmd>div.status { display:none; } body.dark fieldset.inner>div.output div.content td.text span.comment { color:green; } body.dark fieldset.inner>div.output div.content td.text span.keyword { color:royalblue; } body.dark fieldset.inner>div.output div.content td.text span.datatype { color:lavender; } diff --git a/plugin/local/code/inner.js b/plugin/local/code/inner.js index 3c095542..dc69eebf 100644 --- a/plugin/local/code/inner.js +++ b/plugin/local/code/inner.js @@ -148,29 +148,27 @@ Volcanos(chat.ONIMPORT, {_init: function(can, msg, cb) { var paths = can.core.Sp project: function(can, path) { can.onmotion.clear(can, can.ui.project), can.onimport.zone(can, can.core.Item(can.onfigure, function(name, cb) { if (can.base.isFunc(cb)) { return {name: name, _trans: can.onfigure._trans? can.onfigure._trans[name]||"": "", _init: function(target, zone) { return cb(can, target, zone, path) }} } }), can.ui.project) }, - profile: function(can, msg) { var _msg = can.db.tabview[can.onexport.keys(can)]; _msg.Option(html.WIDTH, msg.Option(html.WIDTH)||0.5) + profile: function(can, msg) { var _msg = can.db.tabview[can.onexport.keys(can)]; _msg.Option(html.WIDTH, msg.Option(html.WIDTH)), border = 1 if (msg.Result().indexOf("