diff --git a/frame.js b/frame.js index 41236e5a..ae98539d 100644 --- a/frame.js +++ b/frame.js @@ -204,24 +204,7 @@ Volcanos(chat.ONAPPEND, {help: "渲染引擎", _init: function(can, meta, list, }; can.core.Next(can.base.getValid(can.core.Value(can, [chat.ONIMPORT, mdb.LIST]), can.base.Obj(meta.inputs)).concat([{type: html.BUTTON, name: cli.CLOSE}]), add) }, _action: function(can, list, action, meta) { list = can.base.Obj(can.base.getValid(list, can.core.Item(meta)), can.core.Value(can, [chat.ONACTION, mdb.LIST])); if (!list) { return } - var _list = []; for (var i = 0; i < list.length; i++) { - switch (list[i]) { case "": _list.push(""); break - case mdb.PAGE: - _list.push({type: html.TEXT, name: mdb.LIMIT, value: can._msg.Option(mdb.LIMIT)}) - _list.push({type: html.TEXT, name: mdb.OFFEND, value: can._msg.Option(mdb.OFFEND)}) - _list.push(mdb.PREV, mdb.NEXT) - break - default: - (function() { var item = can.core.SplitInput(list[i], html.BUTTON); - if (item.type == html.SELECT) { - item._init = function(target) { target.value = item.value||item.values[0], target.onchange = function(event) { can.run(event) } } - } - item.action && (function() { item._init = function(target) { can.onappend.figure(can, item, target) } })() - item.type == html.BUTTON? _list.push(list[i]): _list.push(item) - }) () - } - } - meta = meta||can.onaction||{}, action = action||can._action, can.onmotion.clear(can, action) + var _list = can.page.inputs(can, list); action = action||can._action, can.onmotion.clear(can, action), meta = meta||can.onaction||{} return can.core.List(_list, function(item) { if (item == undefined) { return } can.onappend.input(can, item == ""? /*空白*/ {type: html.SPACE}: can.base.isString(item)? /*按键*/ {type: html.BUTTON, value: can.user.trans(can, item), onclick: function(event) { var cb = meta[item]||meta[chat._ENGINE]; cb? can.core.CallFunc(cb, {event: event, can: can, button: item}): can.run(event, [ctx.ACTION, item].concat(can.sup.Input())) @@ -290,7 +273,7 @@ Volcanos(chat.ONAPPEND, {help: "渲染引擎", _init: function(can, meta, list, table.Mode(can.Mode()), table.Conf(table._args = can.base.ParseURL(table._display)) table._trans = can.base.Copy(table._trans||{}, can.core.Value(table, "onaction._trans")) if (table.onimport && can.base.isArray(table.onimport.list) && table.onimport.list.length > 0) { - can.onmotion.clear(can, can._option), can.onappend._option(can, {inputs: table.onimport.list}) + can.onmotion.clear(can, can._option), can.onappend._option(can, {inputs: can.page.inputs(can, table.onimport.list) }) } can.core.CallFunc([table, chat.ONIMPORT, chat._INIT], {can: table, msg: msg, cb: function(msg) { @@ -592,7 +575,7 @@ Volcanos(chat.ONMOTION, {help: "动态特效", _init: function(can, target) { clear: function(can, target) { return can.page.Modify(can, target||can._output, ""), true }, cache: function(can, next) { var list = can.base.Obj(can.core.List(arguments).slice(2), [can._output]) - can.core.List(list, function(item) { can.page.Cache(item._cache_key, item, item.scrollTop+1) }) + can.core.List(list, function(item) { item._cache_key && 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 && item.scrollTo(0, pos-1); return item } @@ -786,9 +769,9 @@ Volcanos(chat.ONKEYMAP, {help: "键盘交互", _focus: [], _init: function(can, if (window.webview) { if (event.target.tagName == "A") { can.user.open(event.target.href) } } - if (can.page.tagis(["input", "select", "textarea"], event.target)) { return } + if (can.page.tagis([html.SELECT, html.INPUT, html.TEXTAREA], event.target)) { return } can.page.Select(can, document.body, can.page.Keys("fieldset.input.key.float"), function(item) { - // can.page.Remove(can, item) + can.page.Remove(can, item) }) } can.onkeymap._build(can), document.body.onkeydown = function(event) { diff --git a/lib/base.js b/lib/base.js index 34f24093..e7499c74 100644 --- a/lib/base.js +++ b/lib/base.js @@ -1,5 +1,6 @@ Volcanos("base", {help: "数据类型", Int: function(val, def) { return parseInt(val)||def||0 }, Min: function(val, min) { return val > min? val: min }, + Max: function(val, max) { return val < max? val: max }, Obj: function(val, def) { try { if (typeof val == lang.STRING) { if (val == "") { return def } val = JSON.parse(val) } diff --git a/lib/page.js b/lib/page.js index d18b4355..094682db 100644 --- a/lib/page.js +++ b/lib/page.js @@ -366,6 +366,30 @@ Volcanos("page", {help: "用户界面", ClassList: { } return input }, + inputs: function(can, list) { + var _list = []; for (var i = 0; i < list.length; i++) { + switch (list[i]) { case "": _list.push(""); break + case ice.AUTO: + _list.push({type: html.BUTTON, name: "list"}) + _list.push({type: html.BUTTON, name: "back"}) + break + case mdb.PAGE: + _list.push({type: html.TEXT, name: mdb.LIMIT, value: can._msg.Option(mdb.LIMIT)}) + _list.push({type: html.TEXT, name: mdb.OFFEND, value: can._msg.Option(mdb.OFFEND)}) + _list.push(mdb.PREV, mdb.NEXT) + break + default: + (function() { var item = can.core.SplitInput(list[i], html.BUTTON); + if (item.type == html.SELECT) { + item._init = function(target) { target.value = item.value||item.values[0], target.onchange = function(event) { can.run(event) } } + } + item.action && (function() { item._init = function(target) { can.onappend.figure(can, item, target) } })() + item.type == html.BUTTON? _list.push(list[i]): _list.push(item) + }) () + } + } + return _list + }, styleDisplay: function(can, target, value) { return can.page.style(can, target, html.DISPLAY, value), target.style.display @@ -437,7 +461,6 @@ Volcanos("page", {help: "用户界面", ClassList: { }) }, - insertBefore: function(can, list, before) { var item = can.page.Append(can, before.parentNode, list).first before.parentNode.insertBefore(item, before) diff --git a/lib/user.js b/lib/user.js index 320843ba..c0e56781 100644 --- a/lib/user.js +++ b/lib/user.js @@ -222,7 +222,7 @@ Volcanos("user", {help: "用户操作", info: {}, agent: { }, carte: function(event, can, meta, list, cb, parent) { // event item meta meta = meta||can.ondetail||can.onaction||{}, list = list&&list.length > 0? list: meta.list||[]; if (list.length == 0) { return } - cb = cb||function(event, item, meta) { var cb = meta[item]||meta["_engine"]; can.base.isFunc(cb) && cb(event, can, item) } + cb = cb||function(event, button, meta) { var cb = meta[button]||meta["_engine"]; can.base.isFunc(cb) && cb(event, can, button) } var ui = can.page.Append(can, document.body, [{view: chat.CARTE, style: {left: 0, top: 0}, onmouseleave: function(event) { // can.page.Remove(can, ui._target) diff --git a/plugin/input/key.js b/plugin/input/key.js index c4023d46..afb3ef09 100644 --- a/plugin/input/key.js +++ b/plugin/input/key.js @@ -14,7 +14,7 @@ Volcanos(chat.ONFIGURE, {help: "控件详情", key: { }} }), can.onappend._status(can, [mdb.TOTAL, mdb.INDEX]), can.Status(mdb.TOTAL, msg.Length()) can.getActionSize(function(left, top, width, height) { - can.page.style(can, can._target, html.MAX_HEIGHT, top+height-can._target.offsetTop) + can.page.style(can, can._target, html.MAX_HEIGHT, can.base.Max(top+height-can._target.offsetTop, 400)) }) }, _make: function(event, can, meta, cb, target, last) { @@ -45,13 +45,10 @@ Volcanos(chat.ONFIGURE, {help: "控件详情", key: { } can.onfigure.key._make(event, can, meta, cb, target) }, - onkeyup: function(event, can, meta, cb, target, last) { - var sub = target._can; if (!sub) { return } + onkeyup: function(event, can, meta, cb, target, last) { var sub = target._can; if (!sub) { return } switch (event.key) { - case "/": can.onfigure.key._init(event, sub, meta.msg, sub._cbs, target, meta.name) + case ice.PS: can.onfigure.key._init(event, sub, sub._cbs, target, meta.name, event.target.value); break } - can.onmotion.selectInputTable(event, sub, function() { - can.onfigure.key._init(event, sub, sub._cbs, target, meta.name) - }, target) + can.onmotion.selectInputTable(event, sub, function() { can.onfigure.key._init(event, sub, sub._cbs, target, meta.name) }, target) }, }}) diff --git a/plugin/local/code/inner.css b/plugin/local/code/inner.css index 6c5ab751..c30fd9ef 100644 --- a/plugin/local/code/inner.css +++ b/plugin/local/code/inner.css @@ -32,8 +32,8 @@ body.white fieldset.inner>div.output div.project { color:#a2dad2; } body.white fieldset.inner>div.output div.content { background-color:#013b675c; } body.white fieldset.inner>div.output div.content td.text span.string { color:#a703a7; } -body.simple fieldset.inner>div.output td.content>div.tabs { background-color:#546E7A; padding:0px; height:38px; overflow:auto; display:block; } -body.simple fieldset.inner>div.output td.content>div.tabs div.tabs { background-color:#69818d; font-family:monospace; padding:10px; height:18px; float:left; } +body.simple fieldset.inner>div.output td.content>div.tabs { background-color:#546E7A; padding:0px; height:31px; overflow:auto; display:block; } +body.simple fieldset.inner>div.output td.content>div.tabs div.tabs { background-color:#69818d; font-family:monospace; padding:7px; height:18px; float:left; } body.simple fieldset.inner>div.output td.content>div.tabs div.tabs.select { background-color:#455A64; box-shadow:0px 0px 5px 1px grey; } body.simple fieldset.inner>div.output td.content>div.path { background-color:#455A64; color:white; padding:4px 10px; margin-bottom:4px; box-shadow:0px 0px 5px 1px #90A4AE; display:block; clear:both; } body.simple fieldset.inner>div.output div.content td.line { padding-top:4px; border-right:none; } diff --git a/plugin/local/code/inner.js b/plugin/local/code/inner.js index 18e50909..99e81f86 100644 --- a/plugin/local/code/inner.js +++ b/plugin/local/code/inner.js @@ -3,6 +3,7 @@ Volcanos(chat.ONIMPORT, {help: "导入数据", _init: function(can, msg, cb, tar var files = can.core.Split(can.Option(nfs.FILE), ice.FS); can.Option(nfs.FILE, files[0]) can.tabview = can.tabview||{}, can.history = can.history||[], can.toolkit = {}, can.extentions = {} can.profile_size = {}, can.display_size = {} + can.onengine.plugin(can, can.onplugin) can.onmotion.clear(can), can.onlayout.profile(can) can.page.styleWidth(can, can.ui.project, 240) @@ -30,7 +31,6 @@ Volcanos(chat.ONIMPORT, {help: "导入数据", _init: function(can, msg, cb, tar } else { can.isCmdMode() || (can.tabview[can.onexport.keys(can)] = msg) can.onimport.tabview(can, can.Option(nfs.PATH), can.Option(nfs.FILE), can.Option(nfs.LINE)) } - can.onengine.plugin(can, can.onplugin) can.base.isFunc(cb) && cb(msg) }, _project: function(can, target) { @@ -44,7 +44,7 @@ Volcanos(chat.ONIMPORT, {help: "导入数据", _init: function(can, msg, cb, tar cli.SHOW, function(event) { can.onaction[cli.SHOW](event, can) }, nfs.LOAD, function(event) { can.onaction[nfs.LOAD](event, can) }, mdb.LINK, function(event) { can.user.open(can.misc.MergeURL(can, {pod: can.misc.Search(can, ice.POD), cmd: can.base.Path(can.Option(nfs.PATH), can.Option(nfs.FILE))})) }, - mdb.PLUGIN, function(event) { can.user.input(event, can, [ctx.INDEX, ctx.ARGS], function(data) { can.onimport.plugin(can, data, ui.output) }) }, + mdb.PLUGIN, function(event) { can.user.input(event, can, [ctx.INDEX, ctx.ARGS], function(data) { can.onimport.plug(can, data, ui.output) }) }, html.WIDTH, function(event) { can.user.input(event, can, [{name: html.WIDTH, value: can.profile_size[can.onexport.keys(can)]*100/can.ConfWidth()||50}], function(list) { can.profile_size[can.onexport.keys(can)] = can.ConfWidth()*parseInt(list[0])/100 @@ -59,7 +59,7 @@ Volcanos(chat.ONIMPORT, {help: "导入数据", _init: function(can, msg, cb, tar cli.CLOSE, function(event) { can.onmotion.hidden(can, target), can.onimport.layout(can) }, cli.CLEAR, function(event) { can.onmotion.clear(can, ui.output) }, cli.EXEC, function(event) { can.onaction[cli.EXEC](event, can) }, - mdb.PLUGIN, function(event) { can.user.input(event, can, [ctx.INDEX, ctx.ARGS], function(data) { can.onimport.plugin(can, data, ui.output) }) }, + mdb.PLUGIN, function(event) { can.user.input(event, can, [ctx.INDEX, ctx.ARGS], function(data) { can.onimport.plug(can, data, ui.output) }) }, html.HEIGHT, function(event) { can.user.input(event, can, [{name: html.HEIGHT, value: can.display_size[can.onexport.keys(can)]*100/can.ConfHeight()||50}], function(list) { can.display_size[can.onexport.keys(can)] = can.ConfHeight()*parseInt(list[0])/100 @@ -163,8 +163,15 @@ Volcanos(chat.ONIMPORT, {help: "导入数据", _init: function(can, msg, cb, tar function show(msg) { var skip2 = skip; can.tabview[key] = msg can.onimport.tabs(can, [{name: file.split(line == ctx.INDEX? ice.PT: ice.PS).pop(), text: file}], function(event, meta) { - msg._tab = event.target, can.onimport.tabview(can, path, file, msg.Option(nfs.LINE), cb, false, skip2), cb = null, skip2 = false - }, function(item) { delete(can.tabview[key]) }, can.ui._tabs, function(item) {}) + can._tab = msg._tab = event.target, can.onimport.tabview(can, path, file, msg.Option(nfs.LINE), cb, false, skip2), cb = null, skip2 = false + }, function(item) { + delete(can.tabview[key]) + delete(can._cache_data[can.base.Path(path, file)]) + delete(can.ui._content._cache[can.base.Path(path, file)]) + delete(can.ui.profile_output._cache[can.base.Path(path, file)]) + delete(can.ui.display_output._cache[can.base.Path(path, file)]) + msg._content != can.ui._content && can.page.Remove(can, msg._content) + }, can.ui._tabs, function(item) {}) } can.Option(can.onimport.history(can, {path: path, file: file, line: line})) @@ -190,7 +197,7 @@ Volcanos(chat.ONIMPORT, {help: "导入数据", _init: function(can, msg, cb, tar process: function(can, msg, target, width, height) { can.onmotion.clear(can, target), can.user.toastSuccess(can) if (msg.Option(ice.MSG_PROCESS) == "_field") { msg.Table(function(meta) { meta.display = msg.Option(ice.MSG_DISPLAY) - can.onimport.plugin(can, meta, target, function(sub) { width && sub.ConfWidth(width), height && sub.ConfHeight(height), sub.Focus() }) + can.onimport.plug(can, meta, target, function(sub) { width && sub.ConfWidth(width), height && sub.ConfHeight(height), sub.Focus() }) }) } else if (msg.Option(ice.MSG_DISPLAY) != "") { can.onappend._output(can, msg, msg.Option(ice.MSG_DISPLAY), target, false, function(msg) { can.onimport.layout(can) }) @@ -199,8 +206,7 @@ Volcanos(chat.ONIMPORT, {help: "导入数据", _init: function(can, msg, cb, tar } }, toolkit: function(can, meta, cb) { meta.msg = true - meta.opts = meta.opts||{repos: can.base.trimSuffix(can.base.trimPrefix(can.Option(nfs.PATH), "usr/"), ice.PS) } - can.onimport.plugin(can, meta, can.ui.toolkit.output, function(sub) { + can.onimport.plug(can, meta, can.ui.toolkit.output, function(sub) { sub.ConfHeight(can.ConfHeight()-4*html.ACTION_HEIGHT), sub.ConfWidth(can.ConfWidth()) sub.page.style(sub, sub._output, html.MAX_HEIGHT, sub.ConfHeight()) sub.page.style(sub, sub._output, html.MAX_WIDTH, sub.ConfWidth()) @@ -216,7 +222,7 @@ Volcanos(chat.ONIMPORT, {help: "导入数据", _init: function(can, msg, cb, tar if (meta.msg == true) { meta.msg = false, sub.Update() } }, sub.select = function() { return sub._legend.click(), sub } sub.onaction.close = function() { sub.select() } - // sub._legend.onmouseenter = null + sub._legend.onmouseenter = null can.base.isFunc(cb) && cb(sub) }) }, @@ -256,7 +262,12 @@ Volcanos(chat.ONPLUGIN, {help: "注册插件", }), }) Volcanos(chat.ONSYNTAX, {help: "语法高亮", list: ["keyword", "prefix", "line"], _init: function(can, msg, cb, skip) { - if (can.ui._path) { can.ui._path.innerText = msg.Option(ctx.INDEX)? msg.Option(nfs.FILE): can.base.Path(msg.Option(nfs.PATH), msg.Option(nfs.FILE)) } + if (can.ui._path) { + can.ui._path.innerHTML = msg.Option(ctx.INDEX)? msg.Option(nfs.LINE) == web.DREAM? + /* dream */ can.page.Format(html.A, can.misc.MergeURL(can, {pod: msg.Option(nfs.FILE), topic: can.misc.Search(can, "topic")}, true)): + /* index */ msg.Option(nfs.FILE): /* file */ can.base.Path(msg.Option(nfs.PATH), msg.Option(nfs.FILE)) + } + can.ui.current && can.onmotion.toggle(can, can.ui.current, !msg.Option(ctx.INDEX)) if (can.onmotion.cache(can, function(cache_data) { can.file && (cache_data[can.file] = {current: can.current, max: can.max, @@ -275,7 +286,7 @@ Volcanos(chat.ONSYNTAX, {help: "语法高亮", list: ["keyword", "prefix", "line }) can.page.Select(can, can._output, can.page.Keys("div.content", html.IFRAME), function(item) { - if (can.onmotion.toggle(can, item, item == msg._ui)) { can.ui.content = msg._ui } + if (can.onmotion.toggle(can, item, item == msg._content)) { can.ui.content = msg._content } }) return can.file }, can.ui._content, can.ui.profile_output, can.ui.display_output) && !skip) { @@ -285,18 +296,18 @@ Volcanos(chat.ONSYNTAX, {help: "语法高亮", list: ["keyword", "prefix", "line can.onmotion.clear(can, can.ui.content), can.onimport.layout(can) if (msg.Option(ctx.INDEX)) { if (msg.Option(nfs.LINE) == web.DREAM) { - if (msg._ui) { + if (msg._content) { can.page.Select(can, can._output, can.page.Keys("div.content", html.IFRAME), function(item) { - if (can.onmotion.toggle(can, item, item == msg._ui)) { can.ui.content = msg._ui } + if (can.onmotion.toggle(can, item, item == msg._content)) { can.ui.content = msg._content } }) return } - can.ui.content = msg._ui = can.page.insertBefore(can, [{type: html.IFRAME, src: can.misc.MergeURL(can, {pod: msg.Option(nfs.FILE)}, true), width: can.ui.content.offsetWidth, height: can.ui.content.offsetHeight}], can.ui.content) + can.ui.content = msg._content = can.page.insertBefore(can, [{type: html.IFRAME, src: can.misc.MergeURL(can, {pod: msg.Option(nfs.FILE), topic: can.misc.Search(can, "topic")}, true), width: can.ui.content.offsetWidth, height: can.ui.content.offsetHeight}], can.ui.content) return can.onimport.layout(can) } - can.onmotion.toggle(can, can.ui.content = msg._ui = can.ui._content, true) - return can.onimport.plugin(can, {index: msg.Option(ctx.INDEX)}, can.ui.content, function(sub) { + can.onmotion.toggle(can, can.ui.content = msg._content = can.ui._content, true) + return can.onimport.plug(can, {index: msg.Option(ctx.INDEX)}, can.ui.content, function(sub) { can.page.style(can, sub._output, html.MAX_HEIGHT, sub.ConfHeight(can.ui.content.offsetHeight-2*html.ACTION_HEIGHT)) can.page.style(can, sub._output, html.MAX_WIDTH, sub.ConfWidth(can.ui.content.offsetWidth)) can.onmotion.delay(can, function() { sub.Focus() }), can.base.isFunc(cb) && cb() @@ -310,7 +321,7 @@ Volcanos(chat.ONSYNTAX, {help: "语法高亮", list: ["keyword", "prefix", "line } }) } - can.onmotion.toggle(can, can.ui.content = msg._ui = can.ui._content, true) + can.onmotion.toggle(can, can.ui.content = msg._content = can.ui._content, true) function init(p) { can.max = 0, can.core.List(can.ls = msg.Result().split(ice.NL), function(item) { can.onaction.appendLine(can, item) }) @@ -354,9 +365,24 @@ Volcanos(chat.ONKEYMAP, {help: "导入数据", f: shy("打开文件", function(event, can) { can.onaction["打开"](event, can) }), r: shy("执行命令", function(event, can) { can.onaction[cli.EXEC](event, can) }), v: shy("渲染界面", function(event, can) { can.onaction[cli.SHOW](event, can) }), + x: shy("关闭标签", function(event, can) { can._tab._close() }), - j: shy("向下滚动", function(event, can) { can.current.scroll(1) }), - k: shy("向上滚动", function(event, can) { can.current.scroll(-1) }), + h: shy("打开左边标签", function(event, can) { var next = can._tab.previousSibling; next && next.click() }), + l: shy("打开右边标签", function(event, can) { var next = can._tab.nextSibling; next && next.click() }), + j: shy("向下滚动", function(event, can) { + if (can.ui.content != can.ui._content) { + can.ui.content.contentWindow.document.body.scrollTop += 16 + } else { + can.current.scroll(1) + } + }), + k: shy("向上滚动", function(event, can) { + if (can.ui.content != can.ui._content) { + can.ui.content.contentWindow.document.body.scrollTop -= 16 + } else { + can.current.scroll(-1) + } + }), J: shy("向下滚屏", function(event, can) { can.current.scroll(can.current.window()-3) }), K: shy("向上滚屏", function(event, can) { can.current.scroll(-can.current.window()+3) }), }, @@ -369,7 +395,9 @@ Volcanos(chat.ONACTION, {help: "控件交互", list: ["搜索", "打开"], can.ui.search.Update({}, [ctx.ACTION, data.action, data.name]) }) }, - "打开": function(event, can) { can.user.input(event, can, [nfs.FILE], function(list) { can.onimport.tabview(can, can.Option(nfs.PATH), list[0]) }) }, + "打开": function(event, can) { + can.user.input(event, can, [nfs.FILE], function(list) { can.onimport.tabview(can, can.Option(nfs.PATH), list[0]) }) + }, sess: function(event, can) { can.onexport.sess(can), can.user.toastSuccess(can) }, load: function(event, can) { var file = can.base.Path("/require/", can.Option(nfs.PATH), can.Option(nfs.FILE)) @@ -379,6 +407,10 @@ Volcanos(chat.ONACTION, {help: "控件交互", list: ["搜索", "打开"], }) }, show: function(event, can) { can.request(event, {_toast: "渲染中..."}) + if (can.base.endWith(can.Option(nfs.FILE), ".js")) { + var file = can.base.Path("/require/", can.Option(nfs.PATH), can.Option(nfs.FILE)) + delete(Volcanos.meta.cache[file]), eval("\n_can_name = \""+file+"\"\n"+can.onexport.content(can)+"\n_can_name = \"\"\nconsole.log(\"once\")") + } can.runAction(event, mdb.RENDER, [can.parse, can.Option(nfs.FILE), can.Option(nfs.PATH)], function(msg) { can.onimport.profile(can, msg) }) diff --git a/plugin/local/code/vimer.css b/plugin/local/code/vimer.css index 71967e48..8be5c317 100644 --- a/plugin/local/code/vimer.css +++ b/plugin/local/code/vimer.css @@ -1,6 +1,6 @@ fieldset.vimer>div.output input.current { background-color:#00000000; color:#00000000; font-size:1em; font-family:monospace; - padding:0; padding-left:11px; border:none; outline:none; margin:0; margin-top:-1px; + padding:0; padding-left:12px; border:none; outline:none; margin:0; margin-top:3px; height:22px; position:absolute; } fieldset.vimer>div.output input.current.normal { caret-color:gray; } @@ -35,3 +35,6 @@ body.simple fieldset.vimer>div.output div.complete table.content td { body.white fieldset.vimer>div.output input.current.insert { caret-color:black; } body.white fieldset.vimer>div.output input.current.normal { caret-color:lightgray; } + +div.project div.zone.create>div.list div.item { padding:5px; float:left; clear:none; } +div.project div.zone.create>div.action { display:none; } diff --git a/plugin/local/code/vimer.js b/plugin/local/code/vimer.js index bd9a84f0..a01e0386 100644 --- a/plugin/local/code/vimer.js +++ b/plugin/local/code/vimer.js @@ -1,11 +1,13 @@ Volcanos(chat.ONIMPORT, {help: "导入数据", _init: function(can, msg, cb, target) { can.require(["inner.js"], function(can) { can.onimport.inner_init(can, msg, function() { can.undo = [], can.redo = [] can.onimport._input(can), can.onkeymap._build(can), can.onkeymap._plugin({}, can) - can.onengine.plugin(can, can.onplugin) can.base.isFunc(cb) && cb(msg) - - }, target) }, function(can, name, sub) { name == chat.ONIMPORT && (can.onimport.inner_init = sub._init) + }, target) } , function(can, name, sub) { name == chat.ONIMPORT && (can.onimport.inner_init = sub._init) if (name == chat.ONACTION) { can._trans = can.base.Copy(can._trans||{}, sub._trans) } + if (name == chat.ONKEYMAP) { can.core.Item(sub._mode, function(mode, value) { + var list = can.onkeymap._mode[mode] = can.onkeymap._mode[mode]||{} + can.core.Item(value, function(key, cb) { list[key] = list[key]||cb }) + }) } }) }, _input: function(can) { @@ -25,19 +27,14 @@ Volcanos(chat.ONIMPORT, {help: "导入数据", _init: function(can, msg, cb, tar }, project: function(can, path) { can.onimport.zone(can, [ + can.isCmdMode() && {name: "create", _init: function(target) { can.onappend._action(can, can.onaction.list, target) }}, {name: "source", _init: function(target) { var total = 0 function show(path, target) { can.run(can.request({}, {dir_root: path, dir_deep: true}), [ice.PWD], function(msg) { var list = msg.Table() - can.core.List(list, function(item) { - item._init = function(target) { - target.onmouseenter = function(event) { - can.user.carteRight(event, can, {"删除": function() { - can.runAction(event, nfs.TRASH, [can.base.Path(path, item.path)], function() { - can.ui.source.refresh() - }) - }}, ["删除"]) - } - } - if (can.Option(nfs.FILE).indexOf(item.path) == 0) { item.expand = true } + can.core.List(list, function(item) { if (can.Option(nfs.FILE).indexOf(item.path) == 0) { item.expand = true } + item._init = function(target) { target.onmouseenter = function(event) { can.user.carteRight(event, can, { + "trash": function() { can.onaction._run(event, can, nfs.TRASH, [can.base.Path(path, item.path)]) }, + _engine: function(event, can, button) { can.onaction[button](event, can, button) }, + }, ["trash"]) } } }) can.onimport.tree(can, list, nfs.PATH, ice.PS, function(event, item) { can.onimport.tabview(can, path, item.path) // 显示文件 @@ -81,20 +78,9 @@ Volcanos(chat.ONIMPORT, {help: "导入数据", _init: function(can, msg, cb, tar }) }) }, _menu: shy("", { - "create": function(event, zone) { - can.user.input(event, can, [mdb.NAME], function(list) { - can.runAction({}, ice.RUN, [web.DREAM, cli.START, list[0]], function(msg) { - can.onmotion.clear(can, zone._target), zone._init(zone._target), can.user.toastSuccess(can) - can.onimport.tabview(can, can.Option(nfs.PATH), msg.Option(mdb.NAME), web.DREAM) // 显示空间 - }) - }) - }, - "refresh": function(event, zone) { - can.onmotion.clear(can, zone._target), zone._init(zone._target) - }, - "publish": function(event, zone) { button = "publish" - can.runAction(event, button, [], function(msg) { can.user.toastConfirm(can, msg.Result(), button) }) - }, + "create": function(event, can, button) { can.onaction.dream(event, can, "dream") }, + "refresh": function(event, can, button) { can.ui.dreams.refresh() }, + "publish": function(event, can, button) { can.runAction(event, button, [], function(msg) { can.user.toastConfirm(can, msg.Result(), button) }) }, }, ["create", "refresh", "publish"], function() {})}, ], can.ui.project) }, @@ -118,23 +104,18 @@ Volcanos(chat.ONKEYMAP, {help: "键盘交互", _mode: { plugin: { - Escape: shy("切换模式", function(event, can) { can.onaction.clear(event, can) }), - g: shy("搜索", function(event, can) { can.onaction["搜索"](event, can) }), - f: shy("打开文件", function(event, can) { can.onaction["打开"](event, can) }), t: shy("添加命令", function(event, can) { can.onaction["添加"](event, can) }), p: shy("添加插件", function(event, can) { can.onaction["插件"](event, can) }), e: shy("添加扩展", function(event, can) { can.onaction["扩展"](event, can) }), - r: shy("执行命令", function(event, can) { can.onaction[cli.EXEC](event, can) }), - v: shy("渲染界面", function(event, can) { can.onaction[cli.SHOW](event, can) }), - - j: shy("向下滚动", function(event, can) { can.current.scroll(1) }), - k: shy("向上滚动", function(event, can) { can.current.scroll(-1) }), - J: shy("向下滚屏", function(event, can) { can.current.scroll(can.current.window()-3) }), - K: shy("向上滚屏", function(event, can) { can.current.scroll(-can.current.window()+3) }), i: shy("插入模式", function(event, can) { can.onkeymap._insert(event, can) }), n: shy("命令模式", function(event, can) { can.onkeymap._normal(event, can) }), ":": shy("底行模式", function(event, can) { can.onimport.toolkit(can, {index: "cli.system"}, function(sub) { can.toolkit["cli.system"] = sub.select() }) }), + + s: shy("保存文件", function(event, can) { can.onaction.save(event, can, "save") }), + d: shy("创建空间", function(event, can) { can.onaction.dream(event, can, "dream") }), + m: shy("添加模块", function(event, can) { can.onaction.autogen(event, can, "autogen") }), + c: shy("编译项目", function(event, can) { can.onaction.compile(event, can, "compile") }), }, normal_ctrl: { f: shy("向下翻页", function(event, can, target, count) { @@ -207,7 +188,7 @@ Volcanos(chat.ONKEYMAP, {help: "键盘交互", can.undo.push(function() { can.onaction.deleteLine(can, line), can.onaction.selectLine(event, can, line+1) }) }), - s: shy("保存文件", function(event, can) { can.onaction.save(event, can) }), + s: shy("保存文件", function(event, can) { can.onaction.save(event, can, "save") }), m: shy("添加模块", function(event, can) { can.onaction.autogen(event, can, "autogen") }), c: shy("编译项目", function(event, can) { can.onaction.compile(event, can, "compile") }), }, @@ -252,7 +233,7 @@ Volcanos(chat.ONKEYMAP, {help: "键盘交互", }, }, _engine: {}, }) -Volcanos(chat.ONACTION, {help: "控件交互", list: [nfs.SAVE, code.COMPILE, code.AUTOGEN, nfs.SCRIPT, chat.WEBSITE], +Volcanos(chat.ONACTION, {help: "控件交互", list: [nfs.SAVE, code.COMPILE, code.AUTOGEN, nfs.SCRIPT, chat.WEBSITE, web.DREAM], _run: function(event, can, button, args, cb) { can.runAction(event, button, args, cb||function(msg) { can.onimport.tabview(can, can.Option(nfs.PATH), msg.Option(nfs.FILE)), can.ui.source.refresh() @@ -267,13 +248,6 @@ Volcanos(chat.ONACTION, {help: "控件交互", list: [nfs.SAVE, code.COMPILE, co save: function(event, can, button) { can.request(event, {file: can.Option(nfs.FILE), content: can.onexport.content(can)}) can.onaction._run(event, can, button, [can.parse, can.Option(nfs.FILE), can.Option(nfs.PATH)]) }, - autogen: function(event, can, button) { can.onaction._runs(event, can, button, function(msg) { - can.onimport.tabview(can, can.Option(nfs.PATH), msg.Option(cli.MAIN), "", function() { - can.onimport.tabview(can, can.Option(nfs.PATH), msg.Option(nfs.FILE), "", function() { - can.ui.source.refresh() - }) - }, true) - }) }, compile: function(event, can, button) { var toast = can.user.toastProcess(can, "编译中...") can.runAction(can.request(event), button, [], function(msg) { toast.close() if (msg.Length() == 0) { var toast1 = can.user.toastProcess(can, "重启中...") @@ -282,12 +256,25 @@ Volcanos(chat.ONACTION, {help: "控件交互", list: [nfs.SAVE, code.COMPILE, co }) }, + autogen: function(event, can, button) { can.onaction._runs(event, can, button, function(msg) { + can.onimport.tabview(can, can.Option(nfs.PATH), msg.Option(cli.MAIN), "", function() { + can.onimport.tabview(can, can.Option(nfs.PATH), msg.Option(nfs.FILE), "", function() { + can.ui.source.refresh() + }) + }, true) + }) }, script: function(event, can, button) { can.onaction._runs(can.request(event, {file: can.base.trimSuffix(can.Option(nfs.FILE), can.base.Ext(can.Option(nfs.FILE)))+nfs.JS}), can, button) }, website: function(event, can, button) { can.onaction._runs(can.request(event, {file: "hi.zml"}), can, button) }, + dream: function(event, can, button) { + can.onaction._runs(can.request(event), can, button, function(msg) { can.ui.dreams.refresh() + can.onimport.tabview(can, can.Option(nfs.PATH), msg.Option(mdb.NAME), web.DREAM) // 显示空间 + can.user.toastSuccess(can) + }) + }, "添加": function(event, can) { can.user.input(event, can, [ctx.INDEX], function(list) { can.onimport.tabview(can, can.Option(nfs.PATH), list[0], ctx.INDEX) }) }, "插件": function(event, can) { can.user.input(event, can, [ctx.INDEX], function(list) { diff --git a/plugin/local/wiki/word.js b/plugin/local/wiki/word.js index a7524b6f..1b35a181 100644 --- a/plugin/local/wiki/word.js +++ b/plugin/local/wiki/word.js @@ -2,6 +2,7 @@ Volcanos(chat.ONIMPORT, {help: "导入数据", _init: function(can, msg, cb, tar can.onmotion.clear(can), can.base.isFunc(cb) && cb(msg) if (msg.Length() > 0) { return can.onappend.table(can, msg) } + can.page.style(can, can._output, html.MAX_WIDTH, can.ConfWidth()) can.page.Modify(can, target, msg.Result()) can.page.Select(can, target, wiki.ITEM, function(item) { var data = item.dataset||{} can.page.style(can, item, can.base.Obj(data.style)) diff --git a/plugin/story/trend.js b/plugin/story/trend.js index 01c288e4..bb4d04d5 100644 --- a/plugin/story/trend.js +++ b/plugin/story/trend.js @@ -115,7 +115,7 @@ Volcanos(chat.ONDETAIL, {help: "用户交互", }) Volcanos(chat.ONEXPORT, {help: "导出数据", list: ["from", "commit", "total", "max", "date", "text", "add", "del"], height: function(can) { var height = can.Action(html.HEIGHT) - if (height == ice.AUTO) { height = can.ConfHeight() } + if (height == ice.AUTO) { height = can.base.Max(can.ConfHeight(), 600) } if (height < 200) { height = 200 } return parseInt(height||can._root._height/2) }, diff --git a/plugin/table.js b/plugin/table.js index 4e684182..4978787c 100644 --- a/plugin/table.js +++ b/plugin/table.js @@ -15,47 +15,17 @@ Volcanos(chat.ONIMPORT, {help: "导入数据", _init: function(can, msg, cb, tar can.onmotion.story.auto(can, target) can.base.isFunc(cb) && cb(msg) }, - card: function(can, msg, target) { - can.page.Appends(can, target, msg.Table(function(value) { - return {view: html.ITEM+" "+(value.status||""), list: [ - {view: [wiki.TITLE, html.DIV, value.name]}, - {view: [wiki.CONTENT, html.DIV, value.text]}, - {view: html.ACTION, inner: value.action, onclick: function(event) { - can.runAction(can.request(event, value), event.target.name, []) - }}, - ]} - })) - }, - list: function(can, root, cb, target) { target = target||can._output - can.core.List(root.list, function(item) { - var ui = can.page.Append(can, target, [{view: [html.ITEM, html.DIV, item.meta.name], onclick: function(event) { - can.base.isFunc(cb) && cb(event, item) || can.onmotion.toggle(can, ui.list) - can.onmotion.select(can, target, html.DIV_ITEM, event.target) - }}, {view: html.LIST}]); can.onimport.list(can, item, cb, ui.list) - }) - }, - item: function(can, type, item, cb, cbs, target) { target = target||can._output - var ui = can.page.Append(can, target, [{view: [type, html.DIV, item.nick||item.name], - onclick: function(event) { cb(event, ui.first) - can.onmotion.select(can, target, can.core.Keys(html.DIV, type), ui.first) - }, onmouseenter: function(event) { cbs(event, ui.first) }, - }]); return ui.first - }, zone: function(can, list, target) { var color = ["blue", "red", "green"] - return can.page.Append(can, target, can.core.List(list, function(zone, index) { return {view: html.ZONE, list: [ + return can.page.Append(can, target, can.core.List(list, function(zone, index) { return zone && {view: html.ZONE+" "+zone.name, list: [ {view: html.NAME, inner: zone.name, style: {background: color[index%color.length]}, onclick: function() { can.onmotion.toggle(can, zone._action), can.onmotion.toggle(can, zone._target) }, onmouseenter: function(event) { zone._menu? can.user.carteRight(event, can, zone._menu.meta, zone._menu.list, function(event, button, meta) { - meta[button](event, zone) + (meta[button]||can.onaction[button])(event, can, button) }): can.user.carteRight(event, can, { - "折叠": function() { - can.page.Select(can, zone._target, html.DIV_LIST, function(item) { can.onmotion.toggle(can, item, false) }) - }, - "展开": function() { - can.page.Select(can, zone._target, html.DIV_LIST, function(item) { can.onmotion.toggle(can, item, true) }) - }, + "折叠": function() { can.page.Select(can, zone._target, html.DIV_LIST, function(item) { can.onmotion.toggle(can, item, false) }) }, + "展开": function() { can.page.Select(can, zone._target, html.DIV_LIST, function(item) { can.onmotion.toggle(can, item, true) }) }, "刷新": function() { can.onmotion.clear(can, zone._target), zone._init(zone._target) }, }, ["折叠", "展开", "刷新"]) }}, @@ -63,22 +33,16 @@ Volcanos(chat.ONIMPORT, {help: "导入数据", _init: function(can, msg, cb, tar can.onappend._action(can, [{input: html.TEXT, onkeyup: function(event) { can.page.Select(can, zone._target, html.DIV_LIST, function(item) { can.onmotion.toggle(can, item, true) }) can.page.Select(can, zone._target, html.DIV_ITEM, function(item) { - can.page.Select(can, item, "div.name", function(name) { - can.onmotion.toggle(can, item, name.innerText.indexOf(event.target.value) > -1) - }) + can.page.Select(can, item, "div.name", function(name) { can.onmotion.toggle(can, item, name.innerText.indexOf(event.target.value) > -1) }) }) }, onclick: function(event) { can.onmotion.focus(can, event.target) }, _init: function(target) { - can.onmotion.delay(can, function() { - can.page.styleWidth(can, target, target.parentNode.parentNode.parentNode.offsetWidth-32) - }) + can.onmotion.delay(can, function() { can.page.styleWidth(can, target, target.parentNode.parentNode.parentNode.offsetWidth-32) }) }}], target, {}) }}, - {view: html.ZONE, _init: function(target) { can.ui[zone.name] = zone - zone._target = target, zone.refresh = function() { - can.onmotion.clear(can, target), zone._init(target) - } + {view: html.LIST, _init: function(target) { can.ui[zone.name] = zone + zone._target = target, zone.refresh = function() { can.onmotion.clear(can, target), zone._init(target) } can.base.isFunc(zone._init) && zone._init(target) }} ]} })) @@ -100,36 +64,57 @@ Volcanos(chat.ONIMPORT, {help: "导入数据", _init: function(can, msg, cb, tar }) }); return node }, + list: function(can, root, cb, target) { target = target||can._output + can.core.List(root.list, function(item) { + var ui = can.page.Append(can, target, [{view: [html.ITEM, html.DIV, item.meta.name], onclick: function(event) { + can.base.isFunc(cb) && cb(event, item) || can.onmotion.toggle(can, ui.list) + can.onmotion.select(can, target, html.DIV_ITEM, event.target) + }}, {view: html.LIST}]); can.onimport.list(can, item, cb, ui.list) + }) + }, + item: function(can, type, item, cb, cbs, target) { target = target||can._output + var ui = can.page.Append(can, target, [{view: [type, html.DIV, item.nick||item.name], + onclick: function(event) { cb(event, ui.first) + can.onmotion.select(can, target, can.core.Keys(html.DIV, type), ui.first) + }, onmouseenter: function(event) { cbs(event, ui.first) }, + }]); return ui.first + }, tabs: function(can, list, cb, cbs, action, each) { action = action||can._action - return can.page.Append(can, action, can.core.List(list, function(meta) { - return {text: [meta.name, html.DIV, html.TABS], title: meta.text, onclick: function(event) { - can.onmotion.select(can, action, html.DIV_TABS, event.target) - can.base.isFunc(cb) && cb(event, meta) - }, _init: function(item) { const OVER = "over" - function close(item) { var next = item.nextSibling||item.previousSibling - can.base.isFunc(cbs) && cbs(item._meta) || can.page.Remove(can, item), next && next.click() + return can.page.Append(can, action, can.core.List(list, function(tabs) { + return {text: [tabs.name, html.DIV, html.TABS], title: tabs.text, onclick: function(event) { + can.onmotion.select(can, action, html.DIV_TABS, event.target), can.base.isFunc(cb) && cb(event, tabs) + }, _init: function(item) { + function close(item) { var next = item.nextSibling||item.previousSibling; next && next.click() + if (next) { can.base.isFunc(cbs) && cbs(item._meta), can.page.Remove(can, item) } } - can.page.Modify(can, item, {draggable: true, _close: function() { close(item) }, _meta: meta, - onmouseenter: function(event) { - can.user.carte(event, can, kit.Dict( - "close tab", function(event) { close(item) }, - "close other", function(event) { - can.page.Select(can, action, html.DIV_TABS, function(_item) { _item == item || close(_item) }) - }, - "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() - action._drop = function(event, before) { action.insertBefore(target, before) } - }, - ondragover: function(event) { event.preventDefault(), action._drop(event, event.target) }, - ondrop: function(event) { event.preventDefault(), action._drop(event, event.target) }, - }), can.core.Timer(10, function() { item.click() }) - can.base.isFunc(each) && each(item) + can.page.Modify(can, item, {draggable: true, _close: function() { close(item) }, _meta: tabs, + onmouseenter: function(event) { can.user.carte(event, can, kit.Dict( + "close tab", function(event) { close(item) }, + "close other", function(event) { can.page.Select(can, action, html.DIV_TABS, function(_item) { _item == item || close(_item) }) }, + "close all", function(event) { can.page.Select(can, action, html.DIV_TABS, close) } + ), ["close tab", "close other", "close all"].concat(tabs._menu||[]), function(event, button, meta) { + (meta[button]||can.onaction[button])(event, can, button) + }) }, + ondragstart: function(event) { action._drop = function(before) { action.insertBefore(event.target, before) } }, + ondragover: function(event) { event.preventDefault(), action._drop(event.target) }, + ondrop: function(event) { event.preventDefault(), action._drop(event.target) }, + }) + can.base.isFunc(each) && each(item), can.onmotion.delay(can, function() { item.click() }) }} })).first }, - plugin: function(can, meta, target, cb) { meta.type = "plug" + card: function(can, msg, target) { + can.page.Appends(can, target, msg.Table(function(value) { + return {view: html.ITEM+" "+(value.status||""), list: [ + {view: [wiki.TITLE, html.DIV, value.name]}, + {view: [wiki.CONTENT, html.DIV, value.text]}, + {view: html.ACTION, inner: value.action, onclick: function(event) { + can.runAction(can.request(event, value), event.target.name, []) + }}, + ]} + })) + }, + plug: function(can, meta, target, cb) { meta.type = "plug" can.onappend.plugin(can, meta, function(sub) { sub.run = function(event, cmds, cb) { can.runActionCommand(can.request(event, can.Option()), meta.index, cmds, cb) } can.base.isFunc(cb) && cb(sub)