From 851846e54c4e0d5e4f5e9fcb046179849af2b3da Mon Sep 17 00:00:00 2001 From: shaoying Date: Mon, 15 Jun 2020 23:53:03 +0800 Subject: [PATCH] opt share --- frame.js | 5 +++-- pane/Action.js | 17 +++++++++-------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/frame.js b/frame.js index c34014a7..c2b15990 100644 --- a/frame.js +++ b/frame.js @@ -361,7 +361,8 @@ Volcanos("onappend", { _init: function(can, meta, list, cb, target, field) { met table: function(can, target, type, msg, cb) { var table = can.page.AppendTables(can, target, msg, msg.append, cb || function(value, key, index, line) { function run(event, item, value) { - var msg = can.request(event); msg.Option(line) + var msg = can.request(event); + msg.Option(can.Option()), msg.Option(line); var cb = can.onaction[item] || can.onaction["运行"] cb? cb(event, can, item): can.run(event, ["action", item, key, value.trim()], function(res) { can.ui.display.innerHTML = "" @@ -480,7 +481,7 @@ Volcanos("onappend", { _init: function(can, meta, list, cb, target, field) { met return ui }, share: function(can, msg, name, text) { - can.run(msg._event, ["share"], function(msg) { + can.run(msg._event, ["action", "share"], function(msg) { var src = can.user.Share(can, {_path: "/share/"+msg.Result()}, true); var ui = can.onappend.toast(can, {title: can.page.Format("a", src, msg.Result()), text: can.page.Format("img", src+"/share"), width: 300, height: 300, duration: 100000, button: [{button: ["确定", function(event) { diff --git a/pane/Action.js b/pane/Action.js index e458ce89..f2a2a90a 100644 --- a/pane/Action.js +++ b/pane/Action.js @@ -9,13 +9,14 @@ Volcanos("ondetail", {help: "交互菜单", list: ["共享", "更名", "删除"] "共享": function(event, can, value, sub) { console.log(sub.Option()) var msg = sub.request(event) - msg.Option("pod", can.user.Search(can, "pod")) - msg.Option("name", value.name) - msg.Option("node", value.pod) - msg.Option("group", value.group) - msg.Option("index", value.index) - msg.Option("args", value.args) - msg.Option("value", JSON.stringify(sub.Option())) + msg.Option("_pod", can.user.Search(can, "pod")) + msg.Option("_name", value.name) + msg.Option("_text", value.help) + msg.Option("_node", value.pod) + msg.Option("_group", value.group) + msg.Option("_index", value.index) + msg.Option("_args", value.args) + msg.Option("_value", JSON.stringify(sub.Option())) msg.Option("storm", can.Conf("storm")) msg.Option("river", can.Conf("river")) can.onappend.share(can, msg) @@ -23,7 +24,7 @@ Volcanos("ondetail", {help: "交互菜单", list: ["共享", "更名", "删除"] }) Volcanos("onexport", {help: "导出数据", list: [], _init: function(can, msg, list, cb, target) { var key = "action"; can.Cache(can.Conf("river")+"."+can.Conf("storm"), can._output, can._output.scrollTop+1); - var river = can.Conf("river", msg.Option("river")||"main"), storm = can.Conf("storm", msg.Option("storm")||"main") + var river = can.Conf("river", msg.Option("river")), storm = can.Conf("storm", msg.Option("storm")||"main") var position = can.Conf(key, msg.Option(key, can.Cache(river+"."+storm, can._output)||"")); if (position) { can._output.scrollTo(0, position-1); return }