diff --git a/frame.js b/frame.js index 8fcb7fa4..20f001aa 100644 --- a/frame.js +++ b/frame.js @@ -199,7 +199,7 @@ Volcanos("onappend", { _init: function(can, meta, list, cb, target, field) { _follow: can._follow+"."+meta.name+"."+display, Option: sub.Option, Action: sub.Action, Status: sub.Status, }, Volcanos.meta.libs.concat(["/frame.js", display]), function(table) { table.Conf(sub.Conf()) - table.onimport._init(table, msg, msg.result||[], function() {}, output) + table.onimport && table.onimport._init && table.onimport._init(table, msg, msg.result||[], function() {}, output) table.run = function(event, cmds, cb, silent) { cmds = cmds || [] run(event, cmds, cb, silent) @@ -309,7 +309,8 @@ Volcanos("onappend", { _init: function(can, meta, list, cb, target, field) { var table = can.page.AppendTable(can, target, msg, msg.append, function(event, value, key, index, tr, td) { can.page.Select(can, can._option, "input.args", function(input) { if (input.name == key) { var data = input.dataset || {} input.value = value; typeof cb == "function" && cb(event, value); if (data.action == "auto") { - var sub = can.request(event, can.Option()) + var sub = can.request(event) + can.core.Item(can.Option(), sub.Option) sub.Option("_action", msg.Option("_action")) can.run(event, can.page.Select(can, can._option, "input.args", function(item) { return item.name && item.value || "" @@ -448,10 +449,7 @@ Volcanos("onappend", { _init: function(can, meta, list, cb, target, field) { if (action.upload.files.length == 0) {return action.upload.focus()} if (value == "关闭") {can._upload.stick = false; return can.page.Remove(can, can._upload.output.parentNode)} - var msg = can.request(event); - can.page.Select(can, can._option, "input", function(item) { - item.name && item.value && msg.Option(item.name, item.value) - }) + var msg = can.request(event, can.Option()); // 上传文件 begin = new Date(); diff --git a/plugin/inner.css b/plugin/inner.css index 9c57a72b..f7bfe4e1 100644 --- a/plugin/inner.css +++ b/plugin/inner.css @@ -14,6 +14,11 @@ fieldset.editor>div.action>div.file.select { fieldset.editor>div.output { min-height:300px; } +fieldset.editor>div.output>table { + max-height:100px; + overflow:auto; + display:block; +} fieldset.editor>div.output>div.project { width:80px; overflow:auto; position:fixed; diff --git a/plugin/inner.js b/plugin/inner.js index 61bc7910..ba114800 100644 --- a/plugin/inner.js +++ b/plugin/inner.js @@ -1,7 +1,4 @@ Volcanos("onimport", {help: "导入数据", _init: function(can, msg, list, cb, target) { target.innerHTML = "" - if (msg.append&&msg.append["file"]) { - return - } if (can.user.Search(can, "share") && can.user.Search(can, "river") && can.user.Search(can, "storm")) { can.onaction.list = ["项目", "运行"] can.page.Modify(can, can._action, {style: {clear: "none"}}) @@ -13,7 +10,10 @@ Volcanos("onimport", {help: "导入数据", _init: function(can, msg, list, cb, var width = can.Conf("width"), height = can.Conf("height") can.page.Modify(can, target, {style: {"max-height": height-160+"px"}}) - // msg.key && (msg.key = msg.key.slice(2)) + + if (msg.key && msg.key.length != msg.time.length) { + msg.key && (msg.key = msg.key.slice(2)) + } msg.Option("_action") != "查看" && msg.Option("_action") != "打开" && can.onappend.table(can, target, "table", msg) can.ui = can.page.Append(can, target, [ @@ -389,7 +389,9 @@ Volcanos("onkeymap", {help: "键盘交互", list: ["command", "normal", "insert" can.display = p && p.profile && can.ui.profile || can.ui.display var msg = can.request(event); msg.Option("content", can.onexport.content(can)) can.run(event, arg||["action", key, can.Option("path"), can.Option("name")], function(msg) { - // msg.key && (msg.key = msg.key.slice(2)) + if (msg.key && msg.key.length != msg.time.length) { + msg.key && (msg.key = msg.key.slice(2)) + } can.page.Modify(can, can.display, {innerHTML: "", style: {display: "block"}}) can.onappend.table(can, can.display, "table", msg) can.onappend.board(can, can.display, "board", msg) @@ -603,7 +605,10 @@ Volcanos("onaction", {help: "控件交互", list: ["项目", "上传", "保存", "提交": function(event, can, msg) { can.onkeymap._remote(event, can, "提交") }, "历史": function(event, can, msg) { can.onkeymap._remote(event, can, "历史") }, "运行": function(event, can, msg) { can.onkeymap._remote(event, can, "运行") }, - "记录": function(event, can, msg) { var sub = can.request(event, can.Option()); sub.Option("display", can.display.innerText) + "记录": function(event, can, msg) { + var sub = can.request(event) + can.core.Item(can.Option(), sub.Option) + sub.Option("display", can.display.innerText) can.onkeymap._remote(event, can, "记录", ["action", "记录"]) }, "复盘": function(event, can, msg) { can.onkeymap._remote(event, can, "复盘") }, diff --git a/plugin/local/wiki/word.js b/plugin/local/wiki/word.js index ee0c8148..c3b9beeb 100644 --- a/plugin/local/wiki/word.js +++ b/plugin/local/wiki/word.js @@ -20,7 +20,7 @@ Volcanos("onimport", {help: "导入数据", list: [], var meta = JSON.parse(data.meta||"{}") can.onappend._init(can, meta, Volcanos.meta.libs.concat(["plugin/state.js"]), function(sub) { sub.run = function(event, cmds, cb, silent) { - can.run(event, ["field", "action", "story", data.type, data.name, data.text].concat(cmds), cb, silent) + // can.run(event, ["field", "action", "story", data.type, data.name, data.text].concat(cmds), cb, silent) } }, can._output, item) })