diff --git a/lib/misc.js b/lib/misc.js index 42bd11fd..13584b06 100644 --- a/lib/misc.js +++ b/lib/misc.js @@ -192,7 +192,8 @@ Volcanos("misc", {help: "通信协议", Message: function(event, can) { var msg args[key] = value, args[key] == "" && delete(args[key]) } - return location.search = can.core.Item(args, function(key, value) { return key+"="+encodeURIComponent(value) }).join("&") + var search = can.core.Item(args, function(key, value) { return key+"="+encodeURIComponent(value) }).join("&") + return search? location.search = search: location.href = location.pathname }), MergeURL: shy("地址链接", function(can, objs, clear) { var path = location.pathname; objs._path && (path = objs._path, delete(objs._path)) diff --git a/page/index.js b/page/index.js index d798862b..a672fc14 100644 --- a/page/index.js +++ b/page/index.js @@ -94,7 +94,7 @@ Volcanos({name: "chat", panels: [ ]}, release: {name: "发布 release", index: [ "web.code.install", "web.code.upgrade", "web.code.publish", "web.code.compile", "web.code.autogen", "web.code.binpack", "web.code.webpack", - "web.code.git.server", + "web.code.git.status", "web.code.git.server", ]}, research: {name: "测试 research", index: [ "web.code.favor", "web.code.bench", "web.code.pprof", diff --git a/panel/action.js b/panel/action.js index 4fb1878f..10b0a514 100644 --- a/panel/action.js +++ b/panel/action.js @@ -155,7 +155,10 @@ Volcanos("onaction", {help: "交互操作", list: [], _init: function(can, cb, t can.page.ClassList.del(can, can._target, can.Conf(chat.LAYOUT)) can.page.ClassList.add(can, can._target, can.Conf(chat.LAYOUT, button)) - if (button == "tabs") { + if (button == "auto") { + can.Conf(chat.LAYOUT, "") + + } else if (button == "tabs") { can.onmotion.select(can, can._output, html.FIELDSET_PLUGIN, 0) can.onmotion.select(can, can._action, html.DIV_TABS, 0) } else if (button == "free") { diff --git a/plugin/local/code/inner.js b/plugin/local/code/inner.js index 2ee092b9..64f1e979 100644 --- a/plugin/local/code/inner.js +++ b/plugin/local/code/inner.js @@ -15,7 +15,7 @@ Volcanos("onimport", {help: "导入数据", _init: function(can, msg, cb, target can.onimport._display(can, can.ui.display) can.base.isFunc(cb) && cb(msg) - if (can.page.ClassList.has(can, can._fields, chat.FLOAT)) { + if (can.page.ClassList.has(can, can._fields, chat.FLOAT) || can.page.ClassList.has(can, can._fields, chat.PLUGIN)) { can.page.style(can, can.ui.project, html.MIN_HEIGHT, can.ConfHeight()) can.page.style(can, can.ui.content, html.MIN_HEIGHT, can.ConfHeight()) }