diff --git a/frame.js b/frame.js index 3d8c8577..bb601d7a 100644 --- a/frame.js +++ b/frame.js @@ -164,7 +164,7 @@ Volcanos("onappend", {help: "渲染引擎", list: [], _init: function(can, meta, if (meta.msg) { var msg = sub.request(); msg.Copy(can.base.Obj(meta.msg)), sub.onappend._output(sub, msg, msg.Option(ice.MSG_DISPLAY)) } can.page.Modify(can, sub._legend, kit.Dict(can.Conf("legend_event")||"onmouseenter", function(event) { - can.user.carte(event, sub, sub.onaction, sub.onaction.list.concat([["所有 ->"].concat(can.core.Item(meta.feature._trans))], [cli.CLOSE])) + can.user.carte(event, sub, sub.onaction, sub.onaction.list.concat([["所有"].concat(can.core.Item(meta.feature._trans))], [cli.CLOSE])) })), can.base.isFunc(cb) && cb(sub) }); return sub }, diff --git a/lib/user.js b/lib/user.js index 94f943e1..934326c9 100644 --- a/lib/user.js +++ b/lib/user.js @@ -203,7 +203,7 @@ Volcanos("user", {help: "用户操作", agent: { can.base.isFunc(cb) && cb(event, item, meta, index) }, onmouseenter: function(event) { carte._float && can.page.Remove(can, carte._float._target) - } }] }: {view: html.ITEM, list: [{text: can.user.trans(can, item[0])}], onmouseenter: function(event) { + } }] }: {view: html.ITEM, list: [{text: can.user.trans(can, item[0])+" -> "}], onmouseenter: function(event) { var sub = can.user.carte(event, can, meta, item.slice(1), cb, carte) carte._float && can.page.Remove(can, carte._float._target), carte._float = sub can.onlayout.figure(event, can, sub._target, true) diff --git a/panel/river.js b/panel/river.js index 19127bac..290cdc27 100644 --- a/panel/river.js +++ b/panel/river.js @@ -20,7 +20,13 @@ Volcanos("onimport", {help: "导入数据", list: [], _init: function(can, msg, can._main_river = can.misc.Search(can, chat.RIVER)||msg.Option(ice.MSG_RIVER)||Volcanos.meta.args.river||can._main_river can._main_storm = can.misc.Search(can, chat.STORM)||msg.Option(ice.MSG_STORM)||Volcanos.meta.args.storm||can._main_storm }, - _menu: function(can, msg) { if (can.user.mod.isPod) { return } + _menu: function(can, msg) { + if (can.user.mod.isPod) { + can.setHeaderMenu(["river"], function(event, button) { + can.core.CallFunc([can.ondetail, button], [event, can, button, can.Conf(chat.RIVER), can.Conf(chat.STORM)]) + }) + return + } var list = []; if (can.user.isMobile) { list.push("river") } can.setHeaderMenu(list.concat(can.base.Obj(msg.Option(chat.MENUS), can.Conf(chat.MENUS)||can.ondetail._menus)), function(event, button) { can.core.CallFunc([can.ondetail, button], [event, can, button, can.Conf(chat.RIVER), can.Conf(chat.STORM)]) @@ -168,7 +174,7 @@ Volcanos("ondetail", {help: "菜单交互", ["share", "共享群组", "共享应用", "共享工具", "共享主机", "访问空间"], ], - "river": function(event, can) { can.onmotion.toggle(can, can._target) }, + "river": function(event, can) { can.onmotion.toggle(can, can._target), can.onlayout._init(can) }, "创建群组": function(event, can) { can.onaction.create(event, can) }, "共享群组": function(event, can, button, river) { can.onmotion.share(event, can, [{name: chat.TITLE, value: river}], [mdb.TYPE, chat.RIVER]) diff --git a/plugin/local/code/vimer.js b/plugin/local/code/vimer.js index 44434756..123a8863 100644 --- a/plugin/local/code/vimer.js +++ b/plugin/local/code/vimer.js @@ -125,19 +125,8 @@ Volcanos("onkeymap", {help: "键盘交互", list: [], }, }, _engine: {}, }) -Volcanos("onaction", {help: "控件交互", list: ["autogen", "compile", "website"], +Volcanos("onaction", {help: "控件交互", list: [nfs.SAVE, code.AUTOGEN, code.COMPILE, chat.WEBSITE], _trans: {website: "网页"}, - "刷新": function(event, can) { - can.onimport.tabview(can, "src/", "main.go", "", function() {}, true) - }, - "加载": function(event, can) { - var file = "/share/local/"+can.Option(nfs.PATH)+can.Option(nfs.FILE) - delete(Volcanos.meta.cache[file]) - // var script = `\n_can_name = "`+file+`"\n`+ - // can.onexport.content(can)+ - // `\n_can_name = ""\nconsole.log("once")` - // eval(script) - }, save: function(event, can) { var msg = can.request(event, {content: can.onexport.content(can)}) can.run(event, [ctx.ACTION, nfs.SAVE, can.parse, can.Option(nfs.FILE), can.Option(nfs.PATH)], function(msg) { can.user.toastSuccess(can) @@ -165,6 +154,14 @@ Volcanos("onaction", {help: "控件交互", list: ["autogen", "compile", "websit can.onimport.tabview(can, "src/", "website/"+list[0], "", function() {}, true) }) }, + "加载": function(event, can) { + var file = "/share/local/"+can.Option(nfs.PATH)+can.Option(nfs.FILE) + delete(Volcanos.meta.cache[file]) + // var script = `\n_can_name = "`+file+`"\n`+ + // can.onexport.content(can)+ + // `\n_can_name = ""\nconsole.log("once")` + // eval(script) + }, _selectLine: function(event, can) { can.page.Select(can, can.current.line, "td.text", function(td) { can.current.line.appendChild(can.ui.current) diff --git a/plugin/state.js b/plugin/state.js index 98164598..41c8ae74 100644 --- a/plugin/state.js +++ b/plugin/state.js @@ -73,7 +73,7 @@ Volcanos("onimport", {help: "导入数据", list: [], _init: function(can, conf, }) Volcanos("onaction", {help: "交互操作", list: [ "共享工具", "切换全屏", "打开链接", "生成链接", "生成图片", "生成脚本", "刷新数据", "刷新页面", [ - "其它 ->", "清空参数", "复制数据", "下载数据", "清空数据", "删除工具", "摄像头", + "其它", "清空参数", "复制数据", "下载数据", "清空数据", "删除工具", "摄像头", ], ], _init: function(can, msg, list, cb, target) {}, _engine: function(event, can, button) { can.Update(event, [ctx.ACTION, button].concat(can.Input([], true))) }, diff --git a/proto.js b/proto.js index 63d449f2..9f0bdde4 100644 --- a/proto.js +++ b/proto.js @@ -112,7 +112,7 @@ var tcp = { var code = { VIMER: "vimer", INNER: "inner", FAVOR: "favor", - WEBPACK: "webpack", + AUTOGEN: "autogen", COMPILE: "compile", BINPACK: "binpack", WEBPACK: "webpack", } var wiki = { TITLE: "title", BRIEF: "brief", REFER: "refer", SPARK: "spark", @@ -146,6 +146,7 @@ var chat = { ONSIZE: "onsize", ONTOAST: "ontoast", ONREMOTE: "onremote", ONKEYDOWN: "onkeydown", + WEBSITE: "website", HEAD: "head", LEFT: "left", MAIN: "main", AUTO: "auto", HIDE: "hide", FOOT: "foot", HEADER: "header", FOOTER: "footer", ACTION_LAYOUT_FMT: `