diff --git a/frame.js b/frame.js index 7812ffd6..c4b8f028 100644 --- a/frame.js +++ b/frame.js @@ -98,7 +98,7 @@ Volcanos("ondaemon", {help: "推荐引擎", list: [], _init: function(can, name) msg.Push(item, kit.Dict( ice.CTX, "onengine", ice.CMD, "command", mdb.TYPE, "can", mdb.NAME, name, mdb.TEXT, command.help, - ctx.CONTEXT, "can", ctx.COMMAND, name, + ctx.CONTEXT, "can", ctx.COMMAND, name )[item]||"") }) }) @@ -256,7 +256,7 @@ Volcanos("onappend", {help: "渲染引擎", list: [], _init: function(can, meta, _item == item || close(_item) }) }, - "close all", function(event) { can.page.Select(can, action, html.DIV_TABS, close) }, + "close all", function(event) { can.page.Select(can, action, html.DIV_TABS, close) } ), ["close tab", "close other", "close all"]) }, ondragstart: function(event) { var target = event.target; target.click() @@ -357,7 +357,7 @@ Volcanos("onappend", {help: "渲染引擎", list: [], _init: function(can, meta, return can.run(event, [ctx.ACTION, target.name], function(msg) { can.run() }, true) } }) - return code.scrollBy(0, 10000), code + return (code.scrollBy && code.scrollBy(0, 10000)), code }, _plugin: function(can, value, meta, cb, target) { @@ -398,7 +398,7 @@ Volcanos("onappend", {help: "渲染引擎", list: [], _init: function(can, meta, sub.onappend._action(sub, [cli.CLOSE, cli.CLEAR, cli.REFRESH], sub._action, kit.Dict( cli.CLOSE, function(event) { sub.close() }, cli.CLEAR, function(event) { target.value = "" }, - cli.REFRESH, function(event) { can.base.isFunc(cb) && cb(sub) }, + cli.REFRESH, function(event) { can.base.isFunc(cb) && cb(sub) } )), sub.onappend._status(sub, [mdb.TOTAL, mdb.INDEX]) meta.style && sub.page.Modify(sub, sub._target, {style: meta.style}) @@ -638,7 +638,7 @@ Volcanos("onmotion", {help: "动态特效", list: [], _init: function(can, targe can.core.List(list, function(item) { can.page.Cache(item._cache_key, item, item.scrollTop+1) }) var key = next(can._cache_data = can._cache_data||{}) return can.core.List(list, function(item) { var pos = can.page.Cache(item._cache_key = key, item) - if (pos) { item.scrollTo(0, pos-1); return item } + if (pos) { item.scrollTo && item.scrollTo(0, pos-1); return item } }).length > 0 }, delay: function(can, cb) { diff --git a/lib/base.js b/lib/base.js index eda6a504..736eeca8 100644 --- a/lib/base.js +++ b/lib/base.js @@ -222,8 +222,9 @@ Volcanos("base", {help: "数据类型", isUndefined: function(val) { return val == undefined }, isNull: function(val) { return val == null }, replaceAll: function(str) { - for (var i = 1; i < arguments.length; i += 2) { - str = str.replaceAll(arguments[i], arguments[i+1]) + for (var i = 1; i < arguments.length; i += 2) { if (!arguments[i]) { continue } + if (str.replaceAll) { str = str.replaceAll(arguments[i], arguments[i+1]); continue } + if (str.replace) { str = str.replace(arguments[i], arguments[i+1]); continue } } return str }, diff --git a/panel/action.css b/panel/action.css index 4f0894cb..2a208ae5 100644 --- a/panel/action.css +++ b/panel/action.css @@ -1,5 +1,5 @@ fieldset.Action { - background-color:#7299a28c; + background-color:rgba(114, 153, 162, 0.54); min-width:160px; } fieldset.Action>div.action { diff --git a/plugin/local/code/inner.css b/plugin/local/code/inner.css index 5114daa2..d936598b 100644 --- a/plugin/local/code/inner.css +++ b/plugin/local/code/inner.css @@ -1,6 +1,6 @@ fieldset.inner>div.action { float:none; display:block; - overflow:auto; + height:1.65em; overflow:auto; } fieldset.inner>div.action div.tabs { border:solid 2px red; padding:2px; @@ -188,3 +188,4 @@ body.white fieldset.inner>div.output div.content td.text span.string { -o-user-select:none; user-select:none; } + diff --git a/plugin/local/code/inner.js b/plugin/local/code/inner.js index 9dd2ef32..5f1720a4 100644 --- a/plugin/local/code/inner.js +++ b/plugin/local/code/inner.js @@ -44,7 +44,7 @@ Volcanos("onimport", {help: "导入数据", _init: function(can, msg, cb, target can.user.input(event, can, [ctx.INDEX], function(event, button, data) { can.onimport.plugin(can, data, ui.output) }) - }, + } )) target._toggle = function(event, show) { action[show? cli.SHOW: cli.CLOSE](event) } }, @@ -58,7 +58,7 @@ Volcanos("onimport", {help: "导入数据", _init: function(can, msg, cb, target can.user.input(event, can, [ctx.INDEX], function(event, button, data) { can.onimport.plugin(can, data, ui.output) }) - }, + } )) target._toggle = function(event, show) { action[show? cli.EXEC: cli.CLOSE](event) } }, @@ -187,7 +187,7 @@ Volcanos("onimport", {help: "导入数据", _init: function(can, msg, cb, target html.WIDTH, can.ui.profile_output.offsetWidth-5, "margin-left", "-10px", "margin-top", "-10px", "position", "absolute", - "border", "0", + "border", "0" ) }) }, diff --git a/plugin/local/code/vimer.js b/plugin/local/code/vimer.js index b1c79152..2a533c2a 100644 --- a/plugin/local/code/vimer.js +++ b/plugin/local/code/vimer.js @@ -131,10 +131,10 @@ Volcanos("onaction", {help: "控件交互", list: ["加载", nfs.SAVE, "autogen" "加载": function(event, can) { var file = "/share/local/"+can.Option(nfs.PATH)+can.Option(nfs.FILE) delete(Volcanos.meta.cache[file]) - var script = `\n_can_name = "`+file+`"\n`+ - can.onexport.content(can)+ - `\n_can_name = ""\nconsole.log("once")` - eval(script) + // var script = `\n_can_name = "`+file+`"\n`+ + // can.onexport.content(can)+ + // `\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) { diff --git a/proto.js b/proto.js index f495a1fa..ade35447 100644 --- a/proto.js +++ b/proto.js @@ -176,14 +176,6 @@ var chat = { "/plugin/local/team/plan.js", "/plugin/input/province.js", ], - ACTION_LAYOUT_FMT: ` -fieldset.Action.grid>div.output fieldset.plugin { - width:_width; height:_height; -} -fieldset.Action.grid>div.output fieldset.plugin>div.output { - width:_width; height:_height; -} -`, } var team = { TASK: "task", PLAN: "plan", @@ -390,3 +382,4 @@ function can(tool) { {name: "Search", help: "搜索框", pos: chat.AUTO}, ]}) } +