From 410c25fca9ad4aaab32f095faf378051e7f8121f Mon Sep 17 00:00:00 2001 From: shy Date: Fri, 19 Jan 2024 14:11:40 +0800 Subject: [PATCH] add some --- index.css | 6 +++++- lib/page.js | 5 +++-- panel/header.js | 3 ++- panel/river.css | 2 +- plugin/local/code/vimer.js | 7 ++----- plugin/story/spides.js | 3 +-- plugin/story/trends.js | 2 +- 7 files changed, 15 insertions(+), 13 deletions(-) diff --git a/index.css b/index.css index e57da7f6..9cac2fa1 100644 --- a/index.css +++ b/index.css @@ -60,12 +60,14 @@ body.windows { --code-font-family:"Courier New"; } body.mobile { --qrcode-height:284px; --svg-font-size:13px; } body.cmd { background-color:var(--plugin-bg-color); } body.width1 { /* 320-640 手机竖屏 */ - --river-width:280px; --project-width:120px; --input-width:80px; + --river-width:280px; --project-width:120px; + --input-width:80px; --river-margin:0; --plugin-margin:0; --button-margin:5px; --footer-height:60px; --table-button:2; } body.width2 { /* 640-960 手机横屏 平板竖屏 笔记本调试 */ + --input-width:80px; --table-button:3; } body.width3 { /* 960-1280 平板横屏 */ @@ -580,6 +582,7 @@ fieldset.vimer>div.output>div.project>div.zone.space div.item.stop { color:var(- 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; } +body.width2 fieldset.xterm.story>form.option>div.item.hash input { width:var(--input-width); } fieldset.cmd>div.output>fieldset.xterm.story>form.option>div.item.hash input { width:var(--plug-width); } fieldset.cmd>div.output>fieldset.iframe.story>form.option>div.item.hash input { width:var(--plug-width); } fieldset.xterm>div.layout { clear:both; } @@ -590,6 +593,7 @@ fieldset.dream>div.output.card>div.item.login { border:var(--danger-bg-color) so fieldset.dream>div.output.card>div.item.server { border:var(--notice-bg-color) solid 3px; } fieldset.dream>div.output.card>div.item.master { border:var(--danger-bg-color) solid 3px; } fieldset.trans>form.option>div.item.text>input { width:var(--project-width); } +body.width2 fieldset.trans>form.option>div.item.text>input { width:var(--input-width); } fieldset.trans>div.output>fieldset { margin:var(--button-margin); } fieldset.config form.option input[name=key] { width:var(--project-width); } fieldset.qrcode>div.output div.code { padding:0; } diff --git a/lib/page.js b/lib/page.js index 17570140..b6272873 100644 --- a/lib/page.js +++ b/lib/page.js @@ -33,8 +33,9 @@ Volcanos("page", { can.base.isString(value)? (target.innerHTML = value): can.core.Item(value, function(key, val) { key == "className" && can.base.isArray(val) && (val = val.join(lex.SP)), !can.base.isObject(val)? (target[key] = val): can.core.Item(val, function(k, v) { if (can.base.isIn(k, "height", "width", "min-height", "max-height", "min-width", "max-width") && parseInt(v) < 0) { return target[key] && (target[key][k] = "") } - if (can.base.isIn(k, "height", "width", "min-height", "max-height", "min-width", "max-width", - "left", "top", "right", "bottom", "margin-left", "margin-top", "margin", "padding", "font-size") && v && (can.base.isNumber(v) || !can.base.endWith(v, "px"))) { v += "px" } + if (can.base.isIn(k, "height", "width", "min-height", "max-height", "min-width", "max-width", "left", "top", "right", "bottom", "margin-left", "margin-top", "margin", "padding", "font-size") && v && (can.base.isNumber(v) || !can.base.endWith(v, "px"))) { v += "px" } + // if (k == "background-color") { debugger } + // if (k == "left") { debugger } target[key] && (target[key][k] = v) }) }); return target diff --git a/panel/header.js b/panel/header.js index e6c670e9..f44a155a 100644 --- a/panel/header.js +++ b/panel/header.js @@ -22,7 +22,8 @@ Volcanos(chat.ONIMPORT, {_init: function(can, msg, target) { _theme: function(can, theme) { return can.ui.diy&&can.ui.diy[theme]||theme }, _avatar: function(can, msg) { can.user.isExtension || can.user.isLocalFile || can.page.Modify(can, "div.state.avatar>img", {src: can.onexport.avatar(can)}) }, _background: function(can, msg) { if (can.user.isExtension || can.user.isLocalFile) { return } - window.parent == window? can.onlayout.background(can, can.onexport.background(can)): can.page.style(can, document.body, html.BACKGROUND_COLOR, cli.TRANSPARENT) + can.onlayout.background(can, can.onexport.background(can)) + // window.parent == window? can.onlayout.background(can, can.onexport.background(can)): can.page.style(can, document.body, html.BACKGROUND_COLOR, cli.TRANSPARENT) }, _search: function(can, msg, target) { can._search = can.onappend.input(can, {type: html.TEXT, _className: "args trans", icon: icon.SEARCH, name: mdb.SEARCH, value: can.misc.Search(can, "_search"), onkeydown: function(event) { can.onkeymap.input(event, can) diff --git a/panel/river.css b/panel/river.css index 0be8d5af..373f0c29 100644 --- a/panel/river.css +++ b/panel/river.css @@ -15,7 +15,7 @@ fieldset.River>div.toggle.next { bottom:-50px; } fieldset.River>div.output div.item>i:first-child { margin-right:var(--button-margin); } fieldset.River.page { display:none; } fieldset.River:not(.all):not(.tabs):not(.page) { width:var(--header-height); } -fieldset.River:not(.all):not(.tabs):not(.page)>div.action { flex-direction:column; } +fieldset.River:not(.all):not(.tabs):not(.page)>div.action { flex-direction:column; overflow:hidden; } fieldset.River:not(.all):not(.tabs):not(.page)>div.action div.item { margin-right:0; } fieldset.River:not(.all):not(.tabs):not(.page)>div.action div.item.share { display:none; } fieldset.River:not(.all):not(.tabs):not(.page)>div.action div.item.refresh { display:none; } diff --git a/plugin/local/code/vimer.js b/plugin/local/code/vimer.js index 3f2f8714..34b16512 100644 --- a/plugin/local/code/vimer.js +++ b/plugin/local/code/vimer.js @@ -25,7 +25,7 @@ Volcanos(chat.ONIMPORT, {_init: function(can, msg, cb) { if (can.user.mod.isPod) }, [""]) Volcanos(chat.ONFIGURE, { source: function(can, target, zone, path) { - var args = can.base.getValid(can.misc.SearchHash(can), [can.Option(nfs.PATH), can.Option(nfs.FILE)]) + var args = (can.isCmdMode() && can.base.getValid(can.misc.SearchHash(can))) || [can.Option(nfs.PATH), can.Option(nfs.FILE)] function show(target, zone, path) { can.run(can.request({}, {_method: http.GET, dir_root: path, dir_deep: true}), [nfs.PWD], function(msg) { zone._icon(kit.Dict( web.REFRESH, function(event) { show(target, zone, path) }, @@ -43,10 +43,7 @@ Volcanos(chat.ONFIGURE, { }); cache = can.onimport.tree(can, list, nfs.PATH, nfs.PS, function(event, item) { can.onimport.tabview(can, path, item.path) }, target, cache) }, true) } if (path.length == 1) { return show(target, zone, path[0]) } can.page.Remove(can, zone._action) can.onimport.zone(can, can.core.List(path, function(path) { return kit.Dict(mdb.NAME, path, path == args[0]? chat._INIT: chat._DELAY_INIT, function(target, zone) { - show(target, zone, path), zone._toggle = function() { - can.ui.zone.source && can.ui.zone.source._layout() - zone._layout() - } + show(target, zone, path), zone._toggle = function() { can.ui.zone.source && can.ui.zone.source._layout(), zone._layout() } }) }), target) }, space: function(can, target, zone) { can.onimport._zone(can, zone, web.DREAM, function(sub, msg) { diff --git a/plugin/story/spides.js b/plugin/story/spides.js index 7ad23c5b..ee77b927 100644 --- a/plugin/story/spides.js +++ b/plugin/story/spides.js @@ -1,6 +1,6 @@ Volcanos(chat.ONIMPORT, {_init: function(can, msg, cb) { can.page.requireDraw(can, function() { msg.append && can.ConfDefault({field: msg.append[0], split: nfs.PS}) can.dir_root = can.Conf(nfs.DIR_ROOT)||msg.Option(nfs.DIR_ROOT), can._tree = can.onimport._tree(can, msg.Table(), can.Conf(mdb.FIELD), can.Conf(lex.SPLIT)) - can.onaction.list = [], can.base.isFunc(cb) && cb(msg), can.onimport.layout(can) + can.onaction.list = [], can.base.isFunc(cb) && cb(msg), can.onimport.layout(can), can.onmotion.toggle(can, can._action, true) can.onappend._status(can, msg.Option(ice.MSG_STATUS)) }) }, _tree: function(can, list, field, split) { var node = {}; can.core.List(list, function(item) { can.core.List(item[field].split(split), function(value, index, array) { @@ -17,7 +17,6 @@ Volcanos(chat.ONIMPORT, {_init: function(can, msg, cb) { can.page.requireDraw(ca } can.core.List(tree.list, function(item) { tree.width += can.onimport._width(can, item) }); return tree.width }, _color: function(can, tree) { return tree.meta.color || (tree.list == 0? cli.PURPLE: cli.YELLOW) }, layout: function(can) { - // can.page.ClassList.has(can, can._fields, html.FLOAT) || can.page.style(can, can._output, html.MAX_HEIGHT, "", "overflow", "hidden") can.ui.svg && can.ui.svg.Val(svg.FONT_SIZE, can.size = parseInt(can.Action(html.SIZE)||24)), can.margin = parseInt(can.Action(html.MARGIN)||10) can._tree && can._tree[can.dir_root] && can.core.CallFunc(can.onaction[can.Action(html.VIEW)||"横向"], [event, can, can.Action(html.VIEW)]) }, diff --git a/plugin/story/trends.js b/plugin/story/trends.js index dbb0f130..526517a7 100644 --- a/plugin/story/trends.js +++ b/plugin/story/trends.js @@ -50,7 +50,7 @@ Volcanos(chat.ONACTION, {list: [[html.VIEW, "趋势图", "柱状图", "折线图 var color = can.core.List(can.base.Obj(can.Conf(cli.COLOR), []), function(color) { return can.onimport.group(can, color, kit.Dict(svg.STROKE, color, svg.FILL, color)) }) can.onimport.transform(can, black), can.onimport.transform(can, white), can.core.List(color, function(color) { can.onimport.transform(can, color) }) var max, min; can.core.List(can.core.List(can.base.Obj(can.Conf(mdb.FIELD), can._msg.append), function(field) { - if (can.base.isIn(field, "time", "id")) { return } return field + if (can.base.isIn(field, mdb.TIME, mdb.ID)) { return } return field }), function(field, index) { max = can.db.data[0][field], min = can.db.data[0][field] for (var i = 1; i < can.db.data.length; i += 1) { var value = can.db.data[i][field]; if (value > max) { max = value } if (value < min) { min = value } } max = parseFloat(can.Conf("max")||max), min = parseFloat(can.Conf("min")||min)