From c4c32a240527fb0e12f83ac94d699ed2ad7a0dc0 Mon Sep 17 00:00:00 2001 From: harveyshao Date: Sat, 12 Feb 2022 15:20:26 +0800 Subject: [PATCH] add forever --- frame.js | 8 +++++--- lib/user.js | 8 ++------ panel/river.js | 6 +++--- plugin/input.js | 10 +++------- 4 files changed, 13 insertions(+), 19 deletions(-) diff --git a/frame.js b/frame.js index bb601d7a..0ac68f66 100644 --- a/frame.js +++ b/frame.js @@ -62,12 +62,14 @@ Volcanos("onengine", {help: "搜索引擎", list: [], _init: function(can, meta, return can.base.isFunc(cb) && cb(msg) } - if (msg.Option("_toast")) { var toast = can.user.toast(can, msg.Option("_toast"), "", -1) } + var toast; if (msg.Option("_toast")) { can.core.Timer(1000, function() { + toast = toast||can.user.toast(can, msg.Option("_toast"), msg._can._name, -1) + }) } var names = msg.Option("_names")||panel._names||((can.Conf("iceberg")||"/chat/")+panel._name) can.onengine.signal(can, chat.ONREMOTE, can.request({}, {_follow: panel._follow, _msg: msg, _cmds: cmds})) can.misc.Run(event, can, {names: names, daemon: can.core.Keys(can.ondaemon._list[0], msg._daemon)}, cmds, function(msg) { - Volcanos.meta.pack[key] = msg, delete(msg._handle), delete(msg._toast), can.base.isFunc(cb) && cb(msg) - toast && toast.close() + Volcanos.meta.pack[key] = msg, delete(msg._handle), can.base.isFunc(cb) && cb(msg) + toast && toast.close(), toast = true, delete(msg._toast) }) }, diff --git a/lib/user.js b/lib/user.js index 934326c9..5da247a3 100644 --- a/lib/user.js +++ b/lib/user.js @@ -103,12 +103,8 @@ Volcanos("user", {help: "用户操作", agent: { }, function() { action.close() }), _target: ui._target, ui: ui, }); can.onmotion.story.auto(can, ui._target) - can.onengine.signal(can, chat.ONTOAST, can.request({}, { - title: meta.title, content: meta.content, - time: can.base.Time(), fileline: can.misc.FileLine(2, 2), - })) - !meta.action && can.onmotion.float.add(can, chat.TOAST, action) - return action + can.onengine.signal(can, chat.ONTOAST, can.request({}, {time: can.base.Time(), title: meta.title, content: meta.content, fileline: can.misc.FileLine(2, 2)})) + return !meta.action && can.onmotion.float.add(can, chat.TOAST, action), action }, share: function(can, msg, cmd) { can.run(msg._event, cmd||[ctx.ACTION, chat.SHARE], function(msg) { diff --git a/panel/river.js b/panel/river.js index 290cdc27..55ca3930 100644 --- a/panel/river.js +++ b/panel/river.js @@ -171,7 +171,7 @@ Volcanos("ondetail", {help: "菜单交互", sublist: ["共享应用", "添加工具", "保存参数", "重命名应用", "删除应用"], _menus: [ ["create", "创建群组", "添加应用", "添加工具", "添加设备", "创建空间"], - ["share", "共享群组", "共享应用", "共享工具", "共享主机", "访问空间"], + ["share", "共享群组", "共享应用", "共享工具", "下载应用", "访问空间"], ], "river": function(event, can) { can.onmotion.toggle(can, can._target), can.onlayout._init(can) }, @@ -207,10 +207,10 @@ Volcanos("ondetail", {help: "菜单交互", }) }) }, - "共享主机": function(event, can, button, river, storm) { + "下载应用": function(event, can, button, river, storm) { can.run(event, [ctx.ACTION, aaa.INVITE], function(msg) { can.user.toast(can, { - title: "共享主机", duration: -1, width: -300, + title: "下载应用", duration: -1, width: -300, content: msg.Result(), action: [cli.CLOSE], }) }) diff --git a/plugin/input.js b/plugin/input.js index 0f983ab5..38d88cb5 100644 --- a/plugin/input.js +++ b/plugin/input.js @@ -4,19 +4,15 @@ Volcanos("onaction", {help: "控件交互", list: [], _init: function(can, meta, case html.BUTTON: meta.action == ice.AUTO && target.click(); break } }, - run: function(event, can) { - var title = can.sup._name+ice.SP+can.sup.Input([], true) - var toast = can.user.toast(can, "执行中...", title, -1) - can.run(event, [], function() { toast.close(), can.user.toastSuccess(can) }) - }, + run: function(event, can) { can.run(event) }, list: function(event, can) { can.run(event) }, back: function(event, can) { can.sup.onimport._back(can.sup) }, refresh: function(event, can) { can.run(event) }, - onclick: function(event, can) { + onclick: function(event, can) { can.sup.request(event, {_toast: "执行中..."}) can.Conf(mdb.TYPE) == html.BUTTON && can.run(event, [ctx.ACTION, can.Conf(mdb.NAME)].concat(can.sup.Input())) }, - onchange: function(event, can) { + onchange: function(event, can) { can.sup.request(event, {_toast: "执行中..."}) if (can.Conf(mdb.TYPE) == html.SELECT) { can.run(event) } }, onkeydown: function(event, can) { can.onkeymap.input(event, can, event.target)