diff --git a/lib/misc.js b/lib/misc.js index 56311213..1335b8c9 100644 --- a/lib/misc.js +++ b/lib/misc.js @@ -208,6 +208,7 @@ Volcanos("misc", {help: "通信协议", Message: function(event, can) { var msg var path = location.pathname; objs._path && (path = objs._path), delete(objs._path) objs.pod && (path = "/chat/pod/"+objs.pod), delete(objs.pod) objs.cmd && (path = (path.indexOf("/chat/pod/") == 0? path: "/chat")+"/cmd/"+objs.cmd), delete(objs.cmd) + objs.website && (path = (path.indexOf("/chat/pod/") == 0? path: "/chat")+"/website/"+objs.website), delete(objs.website) return can.base.MergeURL(location.origin+path+(clear?"":location.search), objs) }), diff --git a/page/index.css b/page/index.css index c6f400b0..e33e9307 100644 --- a/page/index.css +++ b/page/index.css @@ -57,7 +57,7 @@ fieldset.full { background-color:#073947f2; padding:0; margin:0; left:0; top:0; fieldset.story>legend { margin:10px 0; } fieldset.plug>legend { float:left; margin-right:5px; } fieldset.float>legend { float:left; margin-right:5px; } -fieldset.full>legend { float:left; margin-right:5px; } +fieldset.full>legend { float:left; margin:0; margin-right:5px; } fieldset.float input[type=button][name=close]{ display:block; } fieldset.plug>form.option input[type=button][name=close]{ display:block; } fieldset.full input[type=button][name=close]{ display:block; } diff --git a/page/index.js b/page/index.js index 4b251f17..15d2a009 100644 --- a/page/index.js +++ b/page/index.js @@ -1,10 +1,4 @@ -Volcanos({name: "chat", panels: [ - {name: "Header", help: "标题栏", pos: html.HEAD, state: ["time", "usernick", "avatar"]}, - {name: "River", help: "群聊组", pos: html.LEFT, action: ["create", "refresh"]}, - {name: "Action", help: "工作台", pos: html.MAIN}, - {name: "Footer", help: "状态条", pos: html.FOOT, state: ["ncmd"]}, - {name: "Search", help: "搜索框", pos: html.AUTO}, - ], main: {name: "Header"}, river: { +Volcanos({name: "chat", river: { product: {name: "产品群", storm: { office: {name: "办公 office", list: [ {name: "feel", help: "影音媒体", index: "web.wiki.feel"}, @@ -48,10 +42,10 @@ Volcanos({name: "chat", panels: [ "share", "spide", "cache", "story", ]}, cli: {name: "系统 cli", index: [ - "qrcode", "daemon", "system", "runtime", + "qrcode", "daemon", "system", "runtime", "mirrors", "forever", ]}, nfs: {name: "文件 nfs", index: [ - "cat", "dir", "tail", "trash", + "cat", "dir", "port", "tail", "trash", ]}, }}, }}) diff --git a/panel/action.css b/panel/action.css index ec1788f1..a2e7bb92 100644 --- a/panel/action.css +++ b/panel/action.css @@ -1,5 +1,8 @@ fieldset.Action { background-color:rgba(114, 153, 162, 0.54); min-width:160px; } -fieldset.Action>div.action { background-color:#159cc7b0; width:inherit; display:none; } +fieldset.Action>div.action { background-color:#4682b46b; width:inherit; display:none; } +fieldset.Action>div.action div.tabs { font-size:1.1rem; padding:5px; height:21px; } +fieldset.Action>div.action div.tabs.select { background:#6495ed63; } +fieldset.Action>div.action div.tabs:hover { background:#6495ed63; } fieldset.Action.tabs>div.action { display:block; } fieldset.Action.tabs>div.output>fieldset>legend { display:none; } fieldset.Action.tabs>div.output fieldset.plugin { display:none; } diff --git a/panel/action.js b/panel/action.js index 7d1dd4a9..14a07bc6 100644 --- a/panel/action.js +++ b/panel/action.js @@ -57,7 +57,7 @@ Volcanos(chat.ONENGINE, {help: "解析引擎", _engine: function(event, page, ms if (!storm || cmds.length != 2) { return false } if (storm.index) { // 命令索引 - can.runAction(event, ctx.COMMAND, [storm.index], cb) + can.runAction(event, ctx.COMMAND, [].concat(storm.index), cb) } else { // 命令列表 can.core.List(storm.list, function(value) { msg.Push(mdb.NAME, value.name||"") diff --git a/plugin/local/chat/div.js b/plugin/local/chat/div.js index 090a025e..b9bf044b 100644 --- a/plugin/local/chat/div.js +++ b/plugin/local/chat/div.js @@ -22,8 +22,7 @@ Volcanos(chat.ONIMPORT, {help: "导入数据", _init: function(can, msg, cb, tar can.sup._keys == keys && ui.item.click() }, _list: function(can, keys, item, target, width, height) { - if (item.meta.style == html.SPAN) { width = width / item.list.length } - if (item.meta.style == html.DIV) { height = height / item.list.length } + if (item.meta.style == html.SPAN) { width = width / item.list.length } else { height = height / item.list.length } can.onmotion.clear(can, target), can.onmotion.clear(can, target._target) can.core.List(item.list, function(item) { can.onimport._item(can, can.core.Keys(keys, item.meta.name), item, target, width, height) }) }, diff --git a/plugin/local/wiki/word.css b/plugin/local/wiki/word.css index b2dd2f49..46fc59f8 100644 --- a/plugin/local/wiki/word.css +++ b/plugin/local/wiki/word.css @@ -16,6 +16,7 @@ fieldset.word ul.story[data-type=endmenu] { clear:both; } fieldset.word p.story[data-name=inner] { background-color:#4b6c8a7a; padding:4px 10px; border-left:solid 4px blue; margin:10px 0px; } fieldset.word p.story[data-name=inner]:hover { background-color:#c10c8a; cursor:copy; } fieldset.word fieldset.story { margin:10px; } +fieldset.word fieldset.story.full { margin:0px; } fieldset.word.float { padding:0; margin:0; width:-webkit-fill-available; position:fixed; left:0; top:0; z-index:10; } fieldset.word.float>div.action { display:contents; }