diff --git a/frame.js b/frame.js index 948bb00e..48adbdf7 100644 --- a/frame.js +++ b/frame.js @@ -125,7 +125,7 @@ Volcanos("onengine", {help: "解析引擎", list: [], _init: function(can, meta, ]}, }}, "profile": {name: "测试群", storm: { - "auto": {name: "智能 auto", index: [ + "auto": {name: "功能 auto", index: [ "web.code.publish", "web.code.compile", "web.code.autogen", @@ -135,11 +135,6 @@ Volcanos("onengine", {help: "解析引擎", list: [], _init: function(can, meta, "web.code.bench", "web.code.pprof", ]}, - "pack": {name: "功能 pack", index: [ - "web.code.webpack", - "web.code.binpack", - "web.code.install", - ]}, }}, "operate": {name: "运维群", storm: { "cli": {name: "系统 cli", index: [ diff --git a/lib/user.js b/lib/user.js index 569204b1..ed4d2610 100644 --- a/lib/user.js +++ b/lib/user.js @@ -53,6 +53,7 @@ Volcanos("user", {help: "用户模块", agent: { return can._trans && can._trans[text] || can.Conf("trans."+text) || can.Conf("feature.trans."+text) || { "submit": "提交", "cancel": "取消", "begin": "启动", "end": "结束", + "close": "关闭", }[text] || text }, topic: function(can, name) { @@ -70,7 +71,7 @@ Volcanos("user", {help: "用户模块", agent: { }, list: [ {text: [meta.title||"", "div", "title"]}, typeof meta.content == "object"? meta.content: {text: [meta.content||"执行成功", "div", "content"]}, - {view: "button", list: meta.button}, + {view: "button"}, {view: "duration"}, meta.progress > 0 && {view: "progress", style: {width: width}, list: [ {view: "current", style: {width: meta.progress/100*width}}, ]}, @@ -81,6 +82,10 @@ Volcanos("user", {help: "用户模块", agent: { if (index > 20) { ui.duration.innerHTML = parseInt(index/10)+"."+(index%10)+"s..." } }, ui.Close) + can.onappend._action(can, meta.button||[], ui.button, { + close: function(event) { ui.Close() }, + }) + can.run(can.request({}, { title: meta.title, content: meta.content, time: can.base.Time(), fileline: can.base.FileLine(2, 2), diff --git a/pane/River.js b/pane/River.js index 90ec49ca..29fdd9bf 100644 --- a/pane/River.js +++ b/pane/River.js @@ -233,7 +233,7 @@ Volcanos("ondetail", {help: "菜单交互", list: ["共享群组", "添加用户 can.run(event, ["action", "invite"], function(msg) { var toast = can.user.toast(can, { title: "共享设备", content: msg.Result(), - width: -100, duration: -1, button: ["关闭"], + button: ["close"], duration: -1, width: -100, }) }) },