diff --git a/frame.js b/frame.js index 9e5e6a06..bc6c5c4c 100644 --- a/frame.js +++ b/frame.js @@ -160,8 +160,8 @@ Volcanos("onengine", {help: "解析引擎", list: [], _init: function(can, meta, "web.wiki.feel", "web.wiki.draw.draw", "web.team.plan", - "web.wiki.word", "web.wiki.data", + "web.wiki.word", ]}, "english": {name: "english", action: [ {name: "english", help: "英汉", index: "web.wiki.alpha.find", args: ["hi"]}, diff --git a/plugin/input.js b/plugin/input.js index 9f4ea560..871fbb50 100644 --- a/plugin/input.js +++ b/plugin/input.js @@ -8,6 +8,12 @@ Volcanos("onaction", {help: "控件交互", list: [], } }, onclick: function(event, can) { + // 前端回调 + var sub = can.sup && can.sup._outputs && can.sup._outputs[can.sup._outputs.length-1] + var cb = sub && sub.onaction && sub.onaction[can.Conf("name")] + if (typeof cb == "function") { return cb(event, sub, can.Conf("name")) } + + // 后端回调 var feature = can.sup.Conf("feature") var input = feature && feature[can.Conf("name")]; if (input) { return can.user.input(event, can, input,function(event, button, data, list) { @@ -23,10 +29,7 @@ Volcanos("onaction", {help: "控件交互", list: [], }) } - var sub = can.sup && can.sup._outputs && can.sup._outputs[can.sup._outputs.length-1] - var cb = sub && sub.onaction && sub.onaction[can.Conf("name")] - if (typeof cb == "function") { return cb(event, sub, can.Conf("name")) } - + // 后端回调 if (can.Conf("name") == "粘贴") { navigator.clipboard.readText().then(function(text) { can.user.toast(can, "复制成功", "paste") @@ -35,11 +38,10 @@ Volcanos("onaction", {help: "控件交互", list: [], return } - switch (can.Conf("type")) { - case "button": - var toast = can.user.toast(can, "执行中...", can.sup._help, 100000) - can.run(event, [], function(msg) { toast.Close() }) - break + // 通用回调 + if (can.Conf("type") == "button") { + var toast = can.user.toast(can, "执行中...", can.sup._help, 100000) + can.run(event, [], function(msg) { toast.Close() }) } }, onkeydown: function(event, can) { diff --git a/plugin/local/code/vimer.js b/plugin/local/code/vimer.js index b7b8f55f..6592b9d0 100644 --- a/plugin/local/code/vimer.js +++ b/plugin/local/code/vimer.js @@ -2,7 +2,7 @@ Volcanos("onimport", {help: "导入数据", list: [], _init: function(can, msg, can.require(["/plugin/local/code/inner.js"], function(can) { can.onimport._init(can, msg, list, function() { // can.page.Modify(can, can._option, {style: {display: "none"}}) - var ui = can.page.Append(can, can._target, [ + var ui = can.page.Append(can, can.ui.profile, [ {view: ["editor", "input"], "rows": "1", onkeydown: function(event) { can.onkeymap.parse(event, can, "insert"), can.Timer(10, function() { can.onaction.modifyLine(can, can.current, can.editor.value) diff --git a/plugin/local/wiki/feel.js b/plugin/local/wiki/feel.js index 8c11ee98..0e541077 100644 --- a/plugin/local/wiki/feel.js +++ b/plugin/local/wiki/feel.js @@ -48,7 +48,7 @@ Volcanos("onfigure", {help: "组件菜单", list: [], } }, video: function(can, path) { var auto = true, loop = true, total = 0 - function cb(event) { console.log(event) } + function cb(event) { } return {className: "preview", type: "video", style: {height: can.height}, data: {src: path, controls: "controls", autoplay: auto, loop: loop, playbackRate: can.rate}, oncontextmenu: cb, onplay: cb, onpause: cb, onended: cb,