diff --git a/page/index.css b/page/index.css index 1bed1bdb..49cdca58 100644 --- a/page/index.css +++ b/page/index.css @@ -131,7 +131,7 @@ body.white fieldset.Action fieldset.story.Full { background-color:#cce0f4eb; col body.white fieldset.Action fieldset.plugin.Full table.content { color:white; } body.white fieldset.Action fieldset.story.Full table.content { color:white; } body.white fieldset.Search table { color:white; } -body.white fieldset.word.float { background-color:aliceblue; color:black; } +body.white fieldset.word.float { background-color:#3d5569; color:black; } body.white legend { border-radius:10px 10px 10px 10px; } body.white select { background-color:#99CC66; color:white; border:2px solid #99CC66; border-radius:10px 10px 10px 10px; } @@ -249,9 +249,9 @@ body.white fieldset.float table { color:white; } body.mobile div.output div.code { font-size:12px; } body.mobile div.output.card div.item { height:160px; float:none; } body.mobile.landscape div.output.card div.item { width:auto; float:left; } -div.output.card div.item { padding:10px; border:solid 1px #e7e7e7; margin:10px; height:120px; float:left; position:relative; } +div.output.card div.item { padding:10px; border:solid 1px #e7e7e7; margin:10px; height:120px; width:240px; float:left; position:relative; } div.output.card div.item>div.title { font-size:1.2rem; font-weight:bold; padding:10px; border-bottom: solid 1px #e7e7e7; } -div.output.card div.item>div.content { padding:10px; } +div.output.card div.item>div.content { padding:10px; height:24px; } body.simple { background-color:white; } body.simple fieldset.Header { border-bottom:solid 1px #e7e7e7; height:60px; display:block; } diff --git a/panel/header.js b/panel/header.js index f4a15c39..e3437662 100644 --- a/panel/header.js +++ b/panel/header.js @@ -87,7 +87,7 @@ Volcanos("onimport", {help: "导入数据", list: [], _init: function(can, msg, msg.Option(aaa.AVATAR) && can.page.Modify(can, "div.state.avatar>img", {src: "/share/local/avatar"}) }, _menus: function(can, msg, target) { - can.setHeaderMenu(can.user.mod.isPod||can.user.isExtension||can.user.isMobile? [ctx.CONFIG]: + can.setHeaderMenu(can.user.mod.isPod||can.user.isExtension||can.user.isMobile? [ctx.CONFIG, code.PUBLISH]: can.base.Obj(msg.Option(chat.MENUS)||can.Conf(chat.MENUS), can.onaction._menus), function(event, button) { can.core.CallFunc(can.onaction[button]||function(event, can) { can.run(event, [button], function(msg) { can.user.toast(can, "执行成功", can.user.trans(can, button)) }) @@ -137,7 +137,7 @@ Volcanos("onimport", {help: "导入数据", list: [], _init: function(can, msg, Volcanos("onaction", {help: "交互数据", list: [], _init: function(can, cb, target) { can.base.isFunc(cb) && cb() }, - _menus: [["setting", chat.BLACK, chat.WHITE, chat.PRINT, "webpack", "toimage"]], + _menus: [["setting", chat.BLACK, chat.WHITE, chat.PRINT, "webpack", "toimage", ctx.CONFIG]], _trans: { "search": "搜索", "create": "创建", @@ -148,6 +148,7 @@ Volcanos("onaction", {help: "交互数据", list: [], _init: function(can, cb, t "white": "白色主题", "print": "打印主题", "toimage": "生成图片", + "config": "拉取配置", "shareuser": "共享用户", "setnick": "设置昵称", @@ -189,7 +190,15 @@ Volcanos("onaction", {help: "交互数据", list: [], _init: function(can, cb, t }, config: function(event, can) { can.user.input(event, can, [{name: "scope", value: "etc/local.shy"}], function(ev, button, meta, list, args) { - can.run(event, [ctx.CONFIG].concat(args), function(msg) { can.user.jumps(msg.Result()) }) + can.run(event, [ctx.ACTION, ctx.CONFIG].concat(args), function(msg) { can.user.jumps(msg.Result()) }) + }) + }, + publish: function(event, can) { + can.run(event, [ctx.ACTION, code.PUBLISH], function(msg) { + can.user.toast(can, { + title: "发布应用", duration: -1, width: -300, + content: msg.Result(), action: [cli.CLOSE], + }) }) }, webpack: function(event, can) { diff --git a/plugin/state.js b/plugin/state.js index 046dd47a..13db5d30 100644 --- a/plugin/state.js +++ b/plugin/state.js @@ -62,7 +62,10 @@ Volcanos("onimport", {help: "导入数据", list: [], _init: function(can, conf, return true }, - _open: function(can, msg) { can.user.open(msg.Option("_arg")); return true }, + _open: function(can, msg) { + can.user.open(msg.Option("_arg")), can.Update() + return true + }, _hold: function(can, msg) { return true }, _back: function(can) { can._history.pop(); for (var his = can._history.pop(); his; his = can._history.pop()) { if (his[0] == ctx.ACTION) { continue } diff --git a/proto.js b/proto.js index bf1b9239..0501dd07 100644 --- a/proto.js +++ b/proto.js @@ -115,7 +115,7 @@ var tcp = { var code = { VIMER: "vimer", INNER: "inner", FAVOR: "favor", - AUTOGEN: "autogen", COMPILE: "compile", BINPACK: "binpack", WEBPACK: "webpack", + AUTOGEN: "autogen", COMPILE: "compile", BINPACK: "binpack", WEBPACK: "webpack", PUBLISH: "publish", } var wiki = { TITLE: "title", BRIEF: "brief", REFER: "refer", SPARK: "spark",