From 9efd9f6215d14969bd45ebb71438e07d1847c74f Mon Sep 17 00:00:00 2001 From: harveyshao Date: Sun, 23 Jan 2022 16:53:03 +0800 Subject: [PATCH] opt website --- plugin/local/code/inner.js | 13 ++++++++++--- plugin/local/code/vimer.js | 12 ++++++------ 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/plugin/local/code/inner.js b/plugin/local/code/inner.js index 43f63c3e..082fe931 100644 --- a/plugin/local/code/inner.js +++ b/plugin/local/code/inner.js @@ -19,8 +19,6 @@ Volcanos("onimport", {help: "导入数据", _init: function(can, msg, cb, target can.onimport.project(can, paths, function() { can.onimport._toolkit(can, can.ui.toolkit), can.onimport._session(can, msg), can.onimport._keydown(can) can.onmotion.delay(can, function() { - can.onmotion.toggle(can, can.ui.project), can.onimport.layout(can) - can.onmotion.toggle(can, can.ui.project), can.onimport.layout(can) can.core.Next(files.slice(1), function(file, next) { can.onimport.tabview(can, can.Option(nfs.PATH), file, can.Option(nfs.LINE), next) }, function() { can.onimport.tabview(can, paths[0], files[0]) }) @@ -162,7 +160,7 @@ Volcanos("onimport", {help: "导入数据", _init: function(can, msg, cb, target plugin: function(can, meta, target, cb) { can.onappend.plugin(can, meta, function(sub) { sub.run = function(event, cmds, cb) { - can.run(event, [ctx.ACTION, ice.RUN, meta.index].concat(cmds), cb, true) + can.run(event, can.misc.concat(can, [ctx.ACTION, ice.RUN, meta.index], cmds), cb, true) }, can.base.isFunc(cb) && cb(sub) }, target) }, @@ -181,6 +179,15 @@ Volcanos("onimport", {help: "导入数据", _init: function(can, msg, cb, target } else { can.page.styleHeight(can, can.ui.profile_output, can.ui.content.offsetHeight-html.ACTION_HEIGHT) } + can.page.Select(can, can.ui.profile_output, html.IFRAME, function(item) { + can.page.style(can, item, html.HEIGHT, can.ui.profile_output.offsetHeight-5, + + "position", "absolute", + html.WIDTH, can.ui.profile_output.offsetWidth-5, + "margin-top", "-12px", + "margin-left", "-12px", + ) + }) }, exts: function(can, url, cb) { can.require([url], function() {}, function(can, name, sub) { sub._init(can, can.base.ParseURL(sub._path), function(sub) { diff --git a/plugin/local/code/vimer.js b/plugin/local/code/vimer.js index 4eba3b55..70bc9e7e 100644 --- a/plugin/local/code/vimer.js +++ b/plugin/local/code/vimer.js @@ -124,7 +124,7 @@ Volcanos("onkeymap", {help: "键盘交互", list: [], }, }, _engine: {}, }) -Volcanos("onaction", {help: "控件交互", list: [nfs.SAVE, "autogen", "compile", "binpack", "加载"], +Volcanos("onaction", {help: "控件交互", list: ["加载", nfs.SAVE, "autogen", "compile", "binpack"], "加载": function(event, can) { var file = "/share/local/"+can.Option(nfs.PATH)+can.Option(nfs.FILE) delete(Volcanos.meta.cache[file]) @@ -133,6 +133,11 @@ Volcanos("onaction", {help: "控件交互", list: [nfs.SAVE, "autogen", "compile `\n_can_name = ""\nconsole.log("once")` eval(script) }, + save: function(event, can) { var msg = can.request(event, {content: can.onexport.content(can)}) + can.run(event, [ctx.ACTION, nfs.SAVE, can.parse, can.Option(nfs.FILE), can.Option(nfs.PATH)], function(msg) { + can.user.toastSuccess(can) + }, true) + }, autogen: function(event, can, button) { var meta = can.Conf(), msg = can.request(event, {_handle: ice.TRUE}) can.user.input(event, can, meta.feature[button], function(ev, btn, data, list, args) { can.run(event, [ctx.ACTION, button].concat(args), function(msg) { @@ -150,11 +155,6 @@ Volcanos("onaction", {help: "控件交互", list: [nfs.SAVE, "autogen", "compile } }, true) }, - save: function(event, can) { var msg = can.request(event, {content: can.onexport.content(can)}) - can.run(event, [ctx.ACTION, nfs.SAVE, can.parse, can.Option(nfs.FILE), can.Option(nfs.PATH)], function(msg) { - can.user.toastSuccess(can) - }, true) - }, _selectLine: function(event, can) { can.page.Select(can, can.current.line, "td.text", function(td) { can.current.line.appendChild(can.ui.current)