diff --git a/frame.js b/frame.js index cd165c5f..a8423c0c 100644 --- a/frame.js +++ b/frame.js @@ -235,7 +235,7 @@ Volcanos("onappend", { _init: function(can, meta, list, cb, target, field) { met for (var k in sub._inputs) { sub._inputs[k]._target.focus(); break } }) }, target) }, - }, Volcanos.meta.libs.concat([item.display||"/plugin/input.js"]), function(input) { + }, Volcanos.meta.libs.concat([item.display||"/plugin/input.js"]), function(input) { input.sup = sub input.onimport._init(input, input.Conf(item), item.list||[], function() {}, input._target) if (location.protocol == "chrome-extension:") { @@ -264,7 +264,7 @@ Volcanos("onappend", { _init: function(can, meta, list, cb, target, field) { met } break default: - msg.Option("_action", item.name) + cmds && cmds[0] == "action" || msg.Option("_action", item.name||item.value) } // 解析参数 @@ -310,6 +310,7 @@ Volcanos("onappend", { _init: function(can, meta, list, cb, target, field) { met if (!cmds[i]) { cmds.pop() } else { break } } + var last = sub._history[sub._history.length-1]; !can.core.Eq(last, cmds) && cmds[0] != "action" && sub._history.push(cmds) return run(event, cmds, cb, silent) } diff --git a/plugin/input.js b/plugin/input.js index 1d81ca4a..f978ea08 100644 --- a/plugin/input.js +++ b/plugin/input.js @@ -10,6 +10,17 @@ Volcanos("onaction", {help: "控件交互", list: [], }, onclick: function(event, can) { if (can.Conf("name") == "添加") { + can.user.input(event, can, can.sup.Conf("feature").insert,function(event, button, data, list) { + var args = ["action", "insert"]; can.core.Item(data, function(key, value) { + key && value && args.push(key, value) + }) + can.run(event, args, function(msg) { + can.user.toast(can, "添加成功") + }) + return true + }) + return + navigator.clipboard.readText().then(function(text) { console.log(text) can.run(event, ["action", "insert", "paste", "", text], function() {})