From 9fa440245ad1262618d52f181a550093ba32e5d6 Mon Sep 17 00:00:00 2001 From: shy Date: Thu, 23 Jan 2025 18:59:35 +0800 Subject: [PATCH] add some --- const.js | 2 +- frame.js | 7 +++---- index.css | 2 +- panel/header.js | 2 +- plugin/story/spides.js | 22 ++++++++++++++++------ 5 files changed, 22 insertions(+), 13 deletions(-) diff --git a/const.js b/const.js index d0f8e748..553f54b9 100644 --- a/const.js +++ b/const.js @@ -254,7 +254,7 @@ var code = { FAVOR: "favor", XTERM: "xterm", INNER: "inner", VIMER: "vimer", WEBPACK: "webpack", BINPACK: "binpack", AUTOGEN: "autogen", COMPILE: "compile", PUBLISH: "publish", UPGRADE: "upgrade", TEMPLATE: "template", COMPLETE: "complete", NAVIGATE: "navigate", CURRENT: "current", - PULL: "pull", PUSH: "push", + STATUS: "status", PULL: "pull", PUSH: "push", INSTALL: "install", COMMENT: "comment", KEYWORD: "keyword", DATATYPE: "datatype", PACKAGE: "package", FUNCTION: "function", CONSTANT: "constant", STRING: "string", NUMBER: "number", BOOLEAN: "boolean", diff --git a/frame.js b/frame.js index 4ffe7b7a..c31d91ef 100644 --- a/frame.js +++ b/frame.js @@ -156,7 +156,7 @@ Volcanos(chat.ONAPPEND, { var status = can.page.SelectOne(can, field, html.DIV_STATUS) can.isCmdMode() && meta.index && meta.index.indexOf("can.") != 0 && can.page.style(can, field, "visibility", "hidden") can.isCmdMode() && meta.index && meta.index.indexOf("can.") != 0 && can.page.style(can, output, "visibility", "hidden") - can.isCmdMode() && (can.base.isIn(meta.index, web.WIKI_PORTAL)) && can.onappend.style(can, html.OUTPUT, field) + can.isCmdMode() && meta.style != "float" && (can.base.isIn(meta.index, web.WIKI_PORTAL)) && can.onappend.style(can, html.OUTPUT, field) var sub = Volcanos(meta.name, {_root: can._root||can, _follow: can.core.Keys(can._follow, meta.name), _target: field, _legend: legend, _option: option, _action: action, _output: output, _status: status, _history: [], db: {hash: [""]}, ui: {}, Status: function(key, value) { if (can.base.isObject(key)) { return can.core.Item(key, sub.Status), key } try { @@ -393,12 +393,11 @@ Volcanos(chat.ONAPPEND, { }) }, _status: function(can, list, status, msg) { list && list.Option && (list = list.Option(ice.MSG_STATUS)||[]) + var keys = {}, fileline = can.Conf("_fileline")||"" status = status||can._status, can.onmotion.clear(can, status) - var keys = {} - var fileline = can.Conf("_fileline")||"" can.core.List((can.base.Obj(list, can.core.Value(can, [chat.ONEXPORT, mdb.LIST]))||[]).concat([ can.ConfSpace() && {name: web.SPACE, value: can.ConfSpace()}, - ], can.misc.Search(can, log.DEBUG) == ice.TRUE? [ + ], can.misc.Search(can, log.DEBUG) == ice.TRUE && can.ConfIndex() != code.VIMER? [ fileline && {name: nfs.SOURCE, value: can.base.trimPrefix(fileline.split("?")[0], nfs.REQUIRE, nfs.P), onclick: function(event) { can.onkeymap.prevent(event) var ls = can.misc.SplitPath(can, fileline); if (event.metaKey) { can.user.open(can.misc.MergePodCmd(can, {pod: can.ConfSpace(), cmd: web.CODE_VIMER, path: ls[0], file: ls[1]})) diff --git a/index.css b/index.css index 4b4700dc..9b2616e2 100644 --- a/index.css +++ b/index.css @@ -938,7 +938,7 @@ fieldset.iframe.float.portal { background-color:var(--notice-bg-color); color:va fieldset.iframe.float.portal>legend { background-color:var(--notice-bg-color); color:var(--notice-fg-color); margin-right:10px; } fieldset.iframe.float.portal>div.action>div.item.full { display:none; } fieldset.desktop { border:0; } -fieldset.desktop>legend { background-color:transparent; color:silver; } +fieldset.desktop>legend { background-color:transparent; color:white; } fieldset.desktop>form.option>div.item:not(.delete) { display:none; } fieldset.desktop>form.option>div.item.delete { color:silver; } fieldset.desktop>div.action>div.item.text { display:none; } diff --git a/panel/header.js b/panel/header.js index 1ad96364..997c4f5f 100644 --- a/panel/header.js +++ b/panel/header.js @@ -6,7 +6,7 @@ Volcanos(chat.ONIMPORT, { _title: function(can, msg, target) { can.core.List(can.base.getValid(can.Conf(chat.TITLE)||msg.result, [ // can.user.title()|| - decodeURIComponent(can.user.info.titles||can.misc.Search(can, ice.POD)||location.host) + decodeURIComponent((window == top? can.user.info.titles: "")||can.misc.Search(can, ice.POD)||location.host) ]), function(item) { can.page.Append(can, target, [{view: [[html.ITEM, chat.TITLE, html.FLEX]], list: [{img: can.misc.ResourceFavicon(can)}, {text: item}], title: "返回主页", onclick: function(event) { can.onaction.title(event, can) }}]) }) diff --git a/plugin/story/spides.js b/plugin/story/spides.js index c6b73a22..38379433 100644 --- a/plugin/story/spides.js +++ b/plugin/story/spides.js @@ -62,14 +62,24 @@ Volcanos(chat.ONDETAIL, { can.run(can.request(event, can.Option()), can.base.Obj(can.Conf(lex.PREFIX), []).concat(can.Conf(ctx.ACTION)||[], [tree.file||"", tree.name]), function(msg) { if (msg.Length() == 0) { return can.onappend._float(can, web.CODE_INNER, [can._msg.Option(nfs.DIR_ROOT), tree.file, tree.line]) } if (msg.Append(mdb.INDEX)) { - return msg.Table(function(value) { value.style = html.FLOAT - can.onappend.plugin(can, value, function(sub) {}) - }) + return msg.Table(function(value) { value.style = html.FLOAT, can.onappend.plugin(can, value, function(sub) {}) }) } tree.list = can.onimport._tree(can, msg.Table(), can.Conf(mdb.FIELD), can.Conf(lex.SPLIT))[can.dir_root].list - tree.hide = false - can.onimport.layout(can) + tree.hide = false, can.onimport.layout(can) }, true) }, + oncontextmenu: function(event, can, tree) { + can.user.carte(event, can, {}, [ + wiki.PORTAL, chat.DESKTOP, web.DREAM, web.STORE, web.ADMIN, + wiki.WORD, code.VIMER, code.STATUS, code.COMPILE, cli.RUNTIME, code.XTERM, + ], function(event, button) { + if (button == web.ADMIN) { + can.onappend.plugin(can, {index: web.CHAT_IFRAME, args: [ + can.misc.MergePodCmd(can, {pod: tree.file, cmd: web.ADMIN}) + ], title: tree.name+"."+web.ADMIN, style: html.FLOAT}, function(sub) {}) + } else { + can.onappend.plugin(can, {space: tree.file, index: button, style: html.FLOAT}, function(sub) {}) + } + }) + }, }) -Volcanos(chat.ONEXPORT, {list: [mdb.TIME, mdb.COUNT]})