From cb491c1c94caeb0e60cfbbdab32ce1443e729d1c Mon Sep 17 00:00:00 2001 From: shaoying Date: Thu, 28 Jan 2021 02:58:52 +0800 Subject: [PATCH] opt vimer.js --- frame.js | 3 +- page/index.css | 21 ++-- plugin/local/code/inner.css | 90 ++++---------- plugin/local/code/inner.js | 228 ++++++++++++++++-------------------- plugin/local/code/vimer.css | 35 +++--- plugin/local/code/vimer.js | 173 ++++++++++++++------------- 6 files changed, 237 insertions(+), 313 deletions(-) diff --git a/frame.js b/frame.js index 43a8b61c..452a7a30 100644 --- a/frame.js +++ b/frame.js @@ -88,8 +88,7 @@ Volcanos("onengine", {help: "解析引擎", list: [], _init: function(can, meta, }}, "project": {name: "研发群", storm: { "studio": {name: "研发 studio", action: [ - // {name: "vimer", help: "编辑器", index: "web.code.vimer", args: ["src/", "main.go"]}, - {name: "inner", help: "编辑器", index: "web.code.inner", args: ["src/", "main.go"]}, + {name: "vimer", help: "编辑器", index: "web.code.vimer", args: ["src/", "main.go"]}, {name: "repos", help: "代码库", index: "web.code.git.status"}, {name: "plan", help: "任务表", index: "web.team.plan"}, {name: "contexts", help: "上下文", index: "web.wiki.word", args: ["src/main.shy"]}, diff --git a/page/index.css b/page/index.css index 7922550a..d7c21fcc 100644 --- a/page/index.css +++ b/page/index.css @@ -91,6 +91,7 @@ option { } table.content { + width:-webkit-fill-available; border:0; white-space:pre; font-size:14px; font-family:monospace; cursor:pointer; overflow: auto; @@ -216,16 +217,18 @@ fieldset>div.status>div.item>label { font-size:10px; color:gray; } -table.layout>td { +table.layout { + margin:0; border:0; padding:0; + border-spacing:0; +} +table.layout tr { + margin:0;border:0;padding:0; +} +table.layout td { + margin:0; border:0; padding:0; vertical-align:top; } -table.layout>tr { - margin:0;border:0;padding:0; -} -table.layout>tr>th { - margin:0;border:0;padding:0; -} -table.layout>tr>td { +table.layout th { margin:0;border:0;padding:0; } @@ -236,7 +239,7 @@ fieldset>div.output td.profile { background-color:#71909c91; } fieldset>div.output tr.display { - background-color:#71909c91; + /* background-color:#71909c91; */ } fieldset>div.output { diff --git a/plugin/local/code/inner.css b/plugin/local/code/inner.css index 8da49a97..4fed26ba 100644 --- a/plugin/local/code/inner.css +++ b/plugin/local/code/inner.css @@ -1,82 +1,48 @@ fieldset.editor>form.option div.item input.args[name=line] { width:40px; } -fieldset.editor>div.action>div.file { +fieldset.editor>div.action div.file { border:solid 2px red; padding:2px; - float:left; margin:2px 0; - cursor:pointer; + float:left; cursor:pointer; } -fieldset.editor>div.action>div.file.over { +fieldset.editor>div.action div.file.over { background-color:blue; } -fieldset.editor>div.action>div.file.select { - background-color:green; color:white; +fieldset.editor>div.action div.file.select { + background-color:green; } -fieldset.editor { - background:#0b2c54ab; -} fieldset.editor>div.output { - background-color:#173d4047; + color:white; } -fieldset.editor>div.output>table>tr { - background-color:#99CCFF00; -} -fieldset.editor>div.output>table>tr:hover { - background-color:#99CCFF00; -} -fieldset.editor>div.output>table>tr>td { - padding:0; overflow:auto; - vertical-align:top; - background-color:#99CCFF00; -} -fieldset.editor>div.output>table>tr>td:hover { - background-color:#99CCFF00; -} - fieldset.editor>div.output div.project { max-width:180px; overflow:auto; font-size:14px; font-family:monospace; - color:white; } -fieldset.editor>div.output div.content { - overflow:auto; - padding:0; margin:0; -} -fieldset.editor>div.output div.display { - display:none; -} - fieldset.editor>div.output div.content { font-size:16px; font-family:monospace; -} -fieldset.editor>div.output div.content tr { - background-color:#99CCFF00; -} -fieldset.editor>div.output div.content tr.select td.line { - background-color:red; - border:solid 1px yellow; -} -fieldset.editor>div.output div.content td.line { - text-align:right; margin:0; - border-right:solid 2px red; - padding:0 6px; + position:relative; + overflow:auto; color:white; } + +fieldset.editor>div.output div.content tr.select td.line { + border:solid 1px yellow; + background-color:red; +} fieldset.editor>div.output div.content td.line:hover { background-color:green; } +fieldset.editor>div.output div.content td.line { + text-align:right; padding:0 6px; + border-right:solid 2px red; +} fieldset.editor>div.output div.content td.text { text-align:left; height:20px; - border:solid 1px #173d4000; - padding:0; margin:0; padding-left:10px; - color:white; white-space:pre; } -fieldset.editor>div.output div.content td.text:hover { - background-color:#06062700; -} + fieldset.editor>div.output div.content td.text span.comment { color:cyan; background-color:blue; } @@ -92,29 +58,25 @@ fieldset.editor>div.output div.content td.text span.datatype { fieldset.editor>div.output div.content td.text span.string { color:magenta; } -body.white fieldset.editor>div.output div.content td.text span.string { - color:#a703a7; -} fieldset.editor>div.output div.search { - background-color:#060627ab; color:white; padding:6px; border:solid 1px red; - color:white; } fieldset.editor>div.output div.search div.tags { text-align:left; overflow:auto; } +fieldset.editor>div.output div.search div.tags table { + width:-webkit-fill-available; +} fieldset.editor>div.output div.search td>div { max-height:100px; overflow:hidden; } -body.white fieldset.editor div.output table { - background:#0b2c5400; color:white; +body.white fieldset.editor>div.output div.content { + background-color:#013b675c; } -body.white fieldset.editor div.output table tr { - background:#0b2c5400; -} -body.white fieldset.editor div.output div.search table { - background:#0b2c5400; color:white; +body.white fieldset.editor>div.output div.content td.text span.string { + color:#a703a7; } + diff --git a/plugin/local/code/inner.js b/plugin/local/code/inner.js index 1ec71c6c..6b717163 100644 --- a/plugin/local/code/inner.js +++ b/plugin/local/code/inner.js @@ -1,42 +1,9 @@ Volcanos("onimport", {help: "导入数据", _init: function(can, msg, list, cb, target) { - - /* - var width = can.Conf("width"), height = can.Conf("height") - can.ui = can.page.Appends(can, target, [ - {view: ["void", "table"], list: [{type: "tr", list: [ - {type: "td", list: [{view: "project", style: {"max-height": height-240, display: "none"}} ]}, - {type: "td", list: [{view: "profile", style: {"max-height": height-240}, list: [ - {view: ["content", "table"]}, - ]}], style: {"min-width": width-80}}, - ]}, ]}, - {view: "search", style: {display: "none"}, list: [{view: "action", list: [ - {input: ["word", function(event) { - if (event.key == "Enter") { - can.onaction.searchLine(event, can, can.ui.word.value) - } - }], value: "main", onfocus: function(event) { - event.target.setSelectionRange(0, -1) - }}, - {button: ["搜索", function(event) { - can.onaction.searchLine(event, can, can.ui.word.value) - }]}, - {button: ["返回", function(event) { - var last = can.history.pop(); last = can.history.pop() - last && can.onimport.tabview(can, last.path, last.file, last.line) - }]}, - {button: ["关闭", function(event) { - can.page.Modify(can, can.ui.search, {style: {display: "none"}}) - }]}, - ]}, - {view: "tags", style: {"max-height": 160}}, - ]}, - ]) - */ - can.history = can.history || [] can.onmotion.clear(can), can.ui = can.onlayout.profile(can) - can.page.Modify(can, can.ui.content, {style: {"max-height": can.Conf("height")-480}}) - can.page.Modify(can, can.ui.project, {style: {"max-height": can.Conf("height")-480}}) + can.page.Modify(can, can.ui.content, {style: {"max-height": can.Conf("height")-320}}) + can.page.Modify(can, can.ui.project, {style: {"max-height": can.Conf("height")-320}}) + can.page.Modify(can, can.ui.display, {style: {display: "none"}}) msg.Option({path: can.Option("path"), file: can.Option("file"), line: can.Option("line")||1}) can.tabview = can.tabview || {}, can.tabview[can.Option("path")+can.Option("file")] = msg @@ -44,6 +11,21 @@ Volcanos("onimport", {help: "导入数据", _init: function(can, msg, list, cb, can.onimport.tabview(can, msg.Option("path"), msg.Option("file"), msg.Option("line")||1) can.onimport.project(can, msg.Option("path")) typeof cb == "function" && cb(msg) + + can.onaction.project({}, can) + var ui = can.page.Append(can, target, [ + {view: "search", style: {display: "none"}, list: [ + {view: "action", list: [ + {input: ["word", function(event) { + event.key == "Enter" && can.onaction.searchLine(event, can, ui.word.value) + }], value: "main", onfocus: function(event) { event.target.setSelectionRange(0, -1) }}, + {button: ["搜索", function(event) { can.onaction.searchLine(event, can, ui.word.value) }]}, + {button: ["返回", function(event) { can.onaction["返回"](event, can) }]}, + {button: ["关闭", function(event) { can.onaction.searchShow(event, can) }]}, + ]}, + {view: "tags", style: {"max-height": 160}}, + ]}, + ]); can.ui.search = ui.search, can.ui.word = ui.word, can.ui.tags = ui.tags }, project: function(can, path) { can.Option({path: path}) var msg = can.request({}, {dir_root: path, dir_deep: true}) @@ -61,7 +43,6 @@ Volcanos("onimport", {help: "导入数据", _init: function(can, msg, list, cb, can._msg = can.tabview[path+file] can.Option({path: path, file: file, line: line||parseInt(can._msg.Option("line"))||1}) - can.onmotion.select(can, can._action, "div.file", can._msg._tab) can.onsyntax._init(can, can._msg) typeof cb == "function" && cb() return @@ -85,27 +66,25 @@ Volcanos("onimport", {help: "导入数据", _init: function(can, msg, list, cb, Volcanos("onsyntax", {help: "语法高亮", list: ["keyword", "prefix", "line"], _init: function(can, msg) { // caches save can.file && can.core.List(["content", "profile", "display"], function(item) { can.page.Cache(can.file, can.ui[item], { - scrollTop: can.ui.profile.parentNode.scrollTop, - current: can.current, max: can.max, + scrollTop: can.ui.content.scrollTop, current: can.current, max: can.max, }) }) can.file = can.base.Path(msg.Option("path"), msg.Option("file")) can.parse = can.base.Ext(can.file) - can.Status("解析器", can.parse) - can.Status("文件名", can.file) can.Status("模式", "normal") // caches load + can.onmotion.select(can, can._action, "div.file", msg._tab) var cache = false; can.core.List(["content", "profile", "display"], function(item) { var p = can.page.Cache(can.file, can.ui[item]); if (p != undefined && !cache) { cache = true - can.ui.profile.parentNode.scrollTo(0, p.scrollTop) + can.ui.content.scrollTo(0, p.scrollTop) can.onaction.selectLine(can, p.current.line) can.max = p.max } }); if (cache) { return } - function init(p) { - can.max = 0, can.core.List(can.ls = msg.Result().split("\n"), function(item) { + function init(p) { can.max = 0 + can.core.List(can.ls = msg.Result().split("\n"), function(item) { can.onaction.appendLine(can, item) }), can.onaction.selectLine(can, msg.Option("line")||1) } @@ -141,6 +120,18 @@ Volcanos("onsyntax", {help: "语法高亮", list: ["keyword", "prefix", "line"], }, }) Volcanos("onaction", {help: "控件交互", list: [], + "返回": function(event, can) { + var last = can.history.pop(); last = can.history.pop() + last && can.onimport.tabview(can, last.path, last.file, last.line) + can.Status("跳转数", can.history.length) + }, + project: function(event, can) { + can.onmotion.toggle(can, can.ui.project) + }, + searchShow: function(event, can) { + can.onmotion.toggle(can, can.ui.search) + }, + appendLine: function(can, value) { var ui = can.page.Append(can, can.ui.content, [{type: "tr", list: [ {view: ["line", "td", ++can.max], onclick: function(event) { @@ -150,13 +141,29 @@ Volcanos("onaction", {help: "控件交互", list: [], can.onaction.favorLine(can) }}, {view: ["text", "td"], list: [can.onsyntax._parse(can, value)], onclick: function(event) { - can.onaction._selectLine(can, ui, value) + can.onaction._selectLine(can, ui) }, ondblclick: function(event) { - can.onaction._searchLine(can, ui, value) + can.onaction._searchLine(can, ui) }} ]}]); return ui.tr }, + modifyLine: function(can, line, value) { + can.page.Select(can, can.ui.content, "tr", function(item, index) { + if (item != line && index+1 != line) { return } + + can.page.Select(can, item, "td.text", function(item) { + can.page.Appends(can, item, [can.onsyntax._parse(can, value)]) + }) + }) + }, + rerankLine: function(can, value) { can.max = 0 + can.page.Select(can, can.ui.content, "tr", function(item, index) { + can.max++, can.page.Select(can, item, "td.line", function(item) { + item.innerText = index+1 + }) + }) + }, selectLine: function(can, line) { if (!line) { return } can.page.Select(can, can.ui.content, "tr", function(item, index) { can.page.ClassList.del(can, item, "select") @@ -165,21 +172,22 @@ Volcanos("onaction", {help: "控件交互", list: [], line = item can.Option("line", index+1) + can.Status("文件名", can.file) + can.Status("解析器", can.parse) can.Status("当前行", can.onexport.position(can, index+1)) }) typeof line == "object" && can.page.Select(can, line, "td.text", function(item) { can.current = { - scroll: function(x, y) { return can.ui.profile.parentNode.scrollBy(x, y) }, - offset: function() { return can.ui.profile.parentNode.scrollTop }, - window: function() { return can.ui.profile.parentNode.offsetHeight }, + scroll: function(x, y) { return can.ui.content.scrollBy(x, y) }, + offset: function() { return can.ui.content.scrollTop }, + window: function() { return can.ui.content.offsetHeight }, height: function() { return line.offsetHeight }, prev: function() { return line.previousSibling }, next: function() { return line.nextSibling }, line: line, text: function(text) { - text != undefined && can.onaction.modifyLine(can, line, text) - return item.innerText + return text != undefined && can.onaction.modifyLine(can, line, text), item.innerText }, } @@ -197,23 +205,50 @@ Volcanos("onaction", {help: "控件交互", list: [], } } }, + searchLine: function(event, can, value) { value = value.trim() + can.page.Modify(can, can.ui.search, {style: {display: ""}}) + value = can.ui.word.value = value || can.ui.word.value || "main" + var toast = can.user.toast(can, "搜索中...", value, 1000000) + can.run(event, ["action", "search", can.parse, value, can.Option("path")], function(msg) { toast.Close() - "返回": function(event, can) { - var last = can.history.pop(); last = can.history.pop() - last && can.onimport.tabview(can, last.path, last.file, last.line) - can.Status("跳转数", can.history.length) + can.onmotion.clear(can, can.ui.tags) + can.onappend.table(can, msg, function(value, key, index, line) { + value = value.replace("<", "<").replace(">", ">"), value = value.replace("./", "") + + return {text: ["", "td"], list: [{text: [value, "div"]}], onclick: function(event) { + line.line && can.onimport.tabview(can, can.Option("path"), line.file.replace("./", ""), parseInt(line.line), function() { + can.onaction.selectLine(can, line.line) + }) + }} + }, can.ui.tags), can.Status("标签数", msg.Length()) + }, true) }, - project: function(event, can) { - can.page.Toggle(can, can.ui.project, function() { - // can.onimport.project(can, can.Option("path")) - }) + _searchLine: function(can, ui) { + var s = document.getSelection().toString() + var str = ui.text.innerText + var begin = str.indexOf(s) + var end = begin+s.length + + for (var i = begin; i >= 0; i--) { + if (str[i].match(/[a-zA-Z0-9_.]/)) { + s = str.slice(i, end) + } else { + break + } + } + + if (s.indexOf("kit.") == 0) { s = s.replace("kit.", "toolkits.") } + if (s.indexOf(".") == 0) { s = s.slice(1) } + can.onaction.searchLine(event, can, s) }, - searchShow: function(event, can) { - can.page.Toggle(can, can.ui.search, function() { - // can.onaction.searchLine(event, can, "") - }) + _selectLine: function(can, ui) { + can.onkeymap && can.onkeymap._mode(can, "insert") + can.onaction.selectLine(can, ui.tr) + can.onkeymap && can.ui.current.focus() + can.ui.current.setSelectionRange(event.offsetX/13, event.offsetX/13) }, + favorLine: function(can, value) { can.user.input(event, can, [ {_input: "text", name: "topic", value: "@key"}, @@ -230,78 +265,13 @@ Volcanos("onaction", {help: "控件交互", list: [], }) }, - rerankLine: function(can, value) { can.max = 0 - can.page.Select(can, can.ui.content, "tr", function(item, index) { - can.max++, can.page.Select(can, item, "td.line", function(item) { - item.innerText = index+1 - }) - }) - }, - modifyLine: function(can, line, value) { - can.page.Select(can, can.ui.content, "tr", function(item, index) { - if (item != line && index+1 != line) { return } - - can.page.Select(can, item, "td.text", function(item) { - var p = can.onsyntax._parse(can, value) - typeof p == "object"? can.page.Appends(can, item, [p]): item.innerHTML = p - }) - }) - }, - _selectLine: function(can, ui) { - can.onkeymap && can.onkeymap._mode(can, "insert") - can.onaction.selectLine(can, ui.tr) - can.onkeymap && can.ui.editor.focus() - // can.ui.editor.setSelectionRange(0, 0) - // can.ui.editor.setSelectionRange(event.offsetX/10, event.offsetX/10) - }, - _searchLine: function(can, ui, value) { - var str = ui.text.innerText - var s = document.getSelection().toString() - var begin = str.indexOf(s) - var end = begin+s.length - - for (var i = begin; i >= 0; i--) { - if (str[i].match(/[a-zA-Z0-9_.]/)) { - s = str.slice(i, end) - } else { - break - } - } - if (s.indexOf(".") == 0) { - s = s.slice(1) - } - if (s.indexOf("kit.") == 0) { - s = s.replace("kit.", "toolkits.") - } - - can.onaction.searchLine(event, can, s) - }, - searchLine: function(event, can, value) { value = value.trim() - can.page.Modify(can, can.ui.search, {style: {display: ""}}) - value = can.ui.word.value = value || can.ui.word.value || "main" - - var toast = can.user.toast(can, "搜索中...", value, 1000000) - can.run(event, ["action", "search", can.parse, value, can.Option("path")], function(msg) { - toast.Close() - - can.ui.tags.innerHTML = "" - can.onappend.table(can, msg, function(value, key, index, line) { can.Status("标签数", index+1) - value = value.replace("<", "<").replace(">", ">"), value = value.replace("./", "") - return {text: ["", "td"], list: [{text: [value, "div"]}], onclick: function(event) { - line.line && can.onimport.tabview(can, can.Option("path"), line.file.replace("./", ""), parseInt(line.line), function() { - can.onaction.selectLine(can, parseInt(line.line)) - }) - }} - }, can.ui.tags) - }, true) - }, }) Volcanos("onexport", {help: "导出数据", list: ["文件数", "解析器", "文件名", "当前行", "跳转数", "标签数"], position: function(can, index, total) { total = total || can.max return (parseInt(index))+"/"+parseInt(total)+" = "+parseInt((index)*100/total)+"%" }, content: function(can) { - return can.page.Select(can, can._output, "table.content td.text", function(item) { + return can.page.Select(can, can.ui.content, "td.text", function(item) { return item.innerText }).join("\n")+"\n" }, diff --git a/plugin/local/code/vimer.css b/plugin/local/code/vimer.css index aea3c6cb..7de5c776 100644 --- a/plugin/local/code/vimer.css +++ b/plugin/local/code/vimer.css @@ -1,24 +1,18 @@ - -fieldset.editor>div.output input.editor { +fieldset.editor>div.output input.current { position:absolute; padding:0; margin:0; font-size:16px; font-family:monospace; padding-left:9px; background-color:#00000000; color:#00000000; - caret-color:yellow; - min-width:480px; - display:none; width:-webkit-fill-available; } -fieldset.editor>div.output input.editor.insert { +fieldset.editor>div.output input.current.insert { caret-color:yellow; - display:block; } -fieldset.editor>div.output input.editor.normal { +fieldset.editor>div.output input.current.normal { caret-color:blue; - display:block; } -fieldset.editor>div.output input.editor.command { +fieldset.editor>div.output input.current.command { display:none; } @@ -28,9 +22,9 @@ fieldset.editor>div.output input.command { background-color:black; color:white; caret-color:red; - min-width:480px; border:solid 1px red; border-left:solid 3px green; + width:-webkit-fill-available; } fieldset.editor>div.output input.command.normal { display:none; @@ -41,19 +35,18 @@ fieldset.editor>div.output input.command.insert { fieldset.editor>div.output div.display { border:solid 2px greenyellow; - padding:6px; -} -fieldset.editor>div.output div.display div.action { - padding-left:6px; -} -fieldset.editor>div.output div.display div.output { - padding:0; border:0; overflow:auto; - color:white; + padding:10px; } fieldset.editor>div.output div.display input.cmd { font-size:16px; font-family:monospace; background-color:black; color:white; - min-width:480px; + min-width:480px; padding-left:5px; + margin-left:2px; +} +fieldset.editor>div.output div.display div.output { + overflow:auto; +} +fieldset.editor>div.output div.display div.output { + max-height:160px; } - diff --git a/plugin/local/code/vimer.js b/plugin/local/code/vimer.js index 5a2ed62e..cccb3742 100644 --- a/plugin/local/code/vimer.js +++ b/plugin/local/code/vimer.js @@ -3,65 +3,49 @@ Volcanos("onimport", {help: "导入数据", list: [], _merge: function(can, sub) }, _init: function(can, msg, list, cb, target) { can.require(["/plugin/local/code/inner.js"], function(can) { can.onimport.inner_init(can, msg, list, function() { - var ui = can.page.Append(can, can.ui.profile, [ - {view: ["editor", "input"], onkeydown: function(event) { + can.keylist = [], can.onkeymap._init(can, "insert") + typeof cb == "function" && cb(msg) + + var ui = can.page.Append(can, can.ui.content, [ + {view: ["current", "input"], onkeydown: function(event) { can.onkeymap.parse(event, can, "insert") - can.core.Timer(1, function() { - can.current.text(can.ui.editor.value) + can.core.Timer(10, function() { + can.current.text(can.ui.current.value) }) + }, onblur: function(event) { + can.current.text(can.ui.current.value) }, onfocus: function(event) { can.current.scroll(-1000, 0) - }, onblur: function(event) { - can.current.text(can.ui.editor.value) }, onclick: function(event) { can.onkeymap._insert(can) }}, {view: ["command", "input"], onkeydown: function(event) { can.onkeymap.parse(event, can, "command") + }, onfocus: function(event) { + can.current.scroll(-1000, 0) }}, - ]); can.core.Copy(can.ui, ui, "editor", "command") + ]); can.core.Copy(can.ui, ui, "current", "command") - var ui = can.page.Append(can, target, [ - {view: "display", style: {display: "none"}, list: [ - {view: "action", list: [ - {input: ["cmd", function(event) { - can.onkeymap.parse(event, can, "command") - }], value: "", onfocus: function(event) { - event.target.setSelectionRange(0, -1) - }}, - {button: ["执行", function(event) { - can.onkeymap.command.Enter(event, can, can.ui.cmd.value) - }]}, - {button: ["关闭", function(event) { - can.page.Modify(can, can.ui.display, {style: {display: "none"}}) - } ]}, - ]}, - {view: "output", style: {"max-height": 160}}, + var ui = can.page.Append(can, can.ui.display, [ + {view: "action", list: [ + {input: ["cmd", function(event) { + can.onkeymap.parse(event, can, "command") + }], value: "", onfocus: function(event) { + event.target.setSelectionRange(0, -1) + }}, + {button: ["执行", function(event) { + can.onkeymap.command.Enter(event, can, can.ui.cmd.value) + }]}, + {button: ["关闭", function(event) { + can.page.Modify(can, can.ui.display, {style: {display: "none"}}) + } ]}, ]}, - ]); can.core.Copy(can.ui, ui, "display", "output", "cmd") - - typeof cb == "function" && cb(msg) - can.keylist = [], can.onkeymap._init(can, "insert") + {view: "output"}, + ]); can.core.Copy(can.ui, ui, "output", "cmd") }, target) }) }, }, ["/plugin/local/code/vimer.css"]) -Volcanos("onaction", {help: "控件交互", list: [], - _engine: function(event, can, key, arg, cb) { - can.onkeymap._remote(event, can, key) - }, - save: function(event, can) { - var msg = can.request(event); msg.Option("content", can.onexport.content(can)) - can.run(event, ["action", "save", can.parse, can.Option("file"), can.Option("path")], function(msg) { - can.user.toast(can, "保存成功") - }, true) - }, - display: function(event, can) { - can.page.Toggle(can, can.ui.display, function() { - // can.onimport.project(can, can.Option("path")) - }) - }, -}) Volcanos("onkeymap", {help: "键盘交互", list: ["command", "normal", "insert"], _init: function(can, mode) { can.core.List(can.onkeymap.list, function(item) { var engine = {} can.core.Item(can.onkeymap[item], function(key, cb) { var map = engine @@ -69,11 +53,10 @@ Volcanos("onkeymap", {help: "键盘交互", list: ["command", "normal", "insert" map = map[key[i]] = i == 0? cb: (map[key[i]]||{}) } }), can.onkeymap[item]._engine = engine - }) - can.onkeymap._mode(can, mode||"normal") + }), can.onkeymap._mode(can, mode||"normal") }, _mode: function(can, value) { can.Status("模式", can.mode = value) - can.page.Modify(can, can.ui.editor, {className: "editor "+can.mode}) + can.page.Modify(can, can.ui.current, {className: "current "+can.mode}) can.page.Modify(can, can.ui.command, {className: "command "+can.mode}) return value }, @@ -84,26 +67,21 @@ Volcanos("onkeymap", {help: "键盘交互", list: ["command", "normal", "insert" }}) can.ui.command.focus() } else { + can.page.Modify(can, can.ui.display, {style: {display: "block"}}) can.ui.cmd.focus() } }, _normal: function(can) { can.onkeymap._mode(can, "normal") - can.ui.editor.focus() + can.ui.current.focus() }, _insert: function(can) { can.onkeymap._mode(can, "insert") - can.ui.editor.focus() + can.ui.current.focus() }, _remote: function(event, can, key, arg, cb) { var toast = can.user.toast(can, "执行中...", key, 1000000) - var msg = can.request(event); msg.Option("content", can.onexport.content(can)) - can.run(event, arg||["action", key, can.parse, can.Option("file"), can.Option("path")], cb||function(msg) { - toast.Close() - - can.ui.output.innerHTML = "" - can.onappend.table(can, msg, function(value, key, index) { - return {text: [value, "td"]} - }, can.ui.output) + can.run(event, arg||["action", key, can.parse, can.Option("file"), can.Option("path")], cb||function(msg) { toast.Close() + can.onappend.table(can, msg, function(value, key, index) { return {text: [value, "td"]} }, can.ui.output) can.onappend.board(can, msg.Result(), can.ui.output) }, true) }, @@ -146,14 +124,20 @@ Volcanos("onkeymap", {help: "键盘交互", list: ["command", "normal", "insert" can.onkeymap._normal(can) }, Enter: function(event, can) { var line = can.ui.command.value || can.ui.cmd.value ; var ls = can.core.Split(line, " ", ",") - var cb = can.onkeymap._engine[ls[0]]; typeof cb == "function"? cb(event, can, line, ls): - can.onkeymap._remote(event, can, line, ["action", "command"].concat(ls)) - can.page.Modify(can, can.ui.command, {style: {display: "none"}, value: ""}) - can.page.Modify(can, can.ui.display, {style: {display: ""}}) + can.page.Modify(can, can.ui.display, {style: {display: "block"}}) can.ui.cmd.value = line, can.ui.cmd.focus() can.ui.cmd.setSelectionRange(0, -1) - can.ui.output.innerHTML = "" + + can.onmotion.clear(can, can.ui.output) + var cb = can.onkeymap._engine[ls[0]]; + if (typeof cb == "function") { + cb(event, can, line, ls) + can.page.Modify(can, can.ui.display, {style: {display: "none"}}) + can.onkeymap._normal(can) + } else { + can.onkeymap._remote(event, can, line, ["action", "command"].concat(ls)) + } }, jk: function(event, can) { can.keylist = can.keylist.slice(0, -1) can.onkeymap.command.Enter(event, can) @@ -170,54 +154,54 @@ Volcanos("onkeymap", {help: "键盘交互", list: ["command", "normal", "insert" }, H: function(event, can) { - can.ui.editor.setSelectionRange(0, 0) + can.ui.current.setSelectionRange(0, 0) }, h: function(event, can) { - can.ui.editor.setSelectionRange(can.ui.editor.selectionStart-1, can.ui.editor.selectionStart-1) + can.ui.current.setSelectionRange(can.ui.current.selectionStart-1, can.ui.current.selectionStart-1) }, l: function(event, can) { - can.ui.editor.setSelectionRange(can.ui.editor.selectionStart+1, can.ui.editor.selectionStart+1) + can.ui.current.setSelectionRange(can.ui.current.selectionStart+1, can.ui.current.selectionStart+1) }, L: function(event, can) { - can.ui.editor.setSelectionRange(-1, -1) + can.ui.current.setSelectionRange(-1, -1) }, j: function(event, can) { can.onaction.selectLine(can, can.current.next()) - var pos = can.current.offset()+can.current.window()-can.ui.editor.offsetTop; if (pos < 5*can.current.height()) { + var pos = can.current.offset()+can.current.window()-can.ui.current.offsetTop; if (pos < 5*can.current.height()) { can.current.scroll(0, can.current.height()) } }, k: function(event, can) { can.onaction.selectLine(can, can.current.prev()) - var pos = can.ui.editor.offsetTop-can.current.offset(); if (pos < can.current.height()*5) { + var pos = can.ui.current.offsetTop-can.current.offset(); if (pos < can.current.height()*5) { can.current.scroll(0, -can.current.height()) } }, gg: function(event, can, count) { count = count || 1 can.onaction.selectLine(can, count) - var pos = can.current.offset()-can.ui.editor.offsetTop + var pos = can.current.offset()-can.ui.current.offsetTop can.current.scroll(0, -(pos+can.current.height()*5)) return true }, G: function(event, can, count) { count = count > 1? count: can.max can.onaction.selectLine(can, count) - var pos = can.current.offset()-can.ui.editor.offsetTop + var pos = can.current.offset()-can.ui.current.offsetTop can.current.scroll(0, -(pos+can.current.height()*5)) return true }, zt: function(event, can, count) { count = count || 2 - var pos = can.current.offset()-can.ui.editor.offsetTop + var pos = can.current.offset()-can.ui.current.offsetTop can.current.scroll(0, -(pos+can.current.height()*count)) return true }, zz: function(event, can, count) { count = count || 5 - var pos = can.current.offset()-can.ui.editor.offsetTop + var pos = can.current.offset()-can.ui.current.offsetTop can.current.scroll(0, -(pos+can.current.height()*count)) return true }, zb: function(event, can, count) { count = count || 3 - var pos = can.current.offset()-can.ui.editor.offsetTop + var pos = can.current.offset()-can.ui.current.offsetTop can.current.scroll(0, -(pos+can.current.window()-can.current.height()*count)) return true }, @@ -225,12 +209,12 @@ Volcanos("onkeymap", {help: "键盘交互", list: ["command", "normal", "insert" i: function(event, can) { can.onkeymap._insert(can) }, I: function(event, can) { can.onkeymap._insert(can) - can.ui.editor.setSelectionRange(0, 0) + can.ui.current.setSelectionRange(0, 0) }, a: function(event, can) { can.onkeymap._insert(can) }, A: function(event, can) { can.onkeymap._insert(can) - can.ui.editor.setSelectionRange(-1, -1) + can.ui.current.setSelectionRange(-1, -1) }, o: function(event, can) { can.onkeymap._insert(can) can.onaction.selectLine(can, can.onkeymap.insertLine(can, "", can.current.next())) @@ -254,18 +238,18 @@ Volcanos("onkeymap", {help: "键盘交互", list: ["command", "normal", "insert" }, insert: { Escape: function(event, can) { can.onkeymap._normal(can) - can.onaction.modifyLine(can, can.current, can.ui.editor.value) + can.onaction.modifyLine(can, can.current, can.ui.current.value) event.stopPropagation(), event.preventDefault() }, Enter: function(event, can) { - var before = can.ui.editor.value.slice(0, event.target.selectionEnd) - var left = can.ui.editor.value.slice(event.target.selectionEnd) + var before = can.ui.current.value.slice(0, event.target.selectionEnd) + var left = can.ui.current.value.slice(event.target.selectionEnd) can.current.text(before||"") can.onaction.selectLine(can, can.onkeymap.insertLine(can, left, can.current.next())) - can.ui.editor && can.ui.editor.setSelectionRange(0, 0) + can.ui.current && can.ui.current.setSelectionRange(0, 0) }, Backspace: function(event, can) { - if (can.ui.editor.selectionStart > 0) { return } + if (can.ui.current.selectionStart > 0) { return } event.stopPropagation(), event.preventDefault() if (!can.current.prev()) { return } @@ -274,34 +258,34 @@ Volcanos("onkeymap", {help: "键盘交互", list: ["command", "normal", "insert" var pos = can.current.text().length rest = can.current.text()+rest - can.ui.editor.value = rest + can.ui.current.value = rest can.current.text(rest) - can.ui.editor.setSelectionRange(pos, pos) + can.ui.current.setSelectionRange(pos, pos) can.onkeymap.deleteLine(can, can.current.next()) }, ArrowDown: function(event, can) { can.onaction.selectLine(can, can.current.next()) - can.ui.editor.setSelectionRange(can.ui.editor.selectionStart, can.ui.editor.selectionEnd) + can.ui.current.setSelectionRange(can.ui.current.selectionStart, can.ui.current.selectionEnd) }, ArrowUp: function(event, can) { can.onaction.selectLine(can, can.current.prev()) - can.ui.editor.setSelectionRange(can.ui.editor.selectionStart, can.ui.editor.selectionEnd) + can.ui.current.setSelectionRange(can.ui.current.selectionStart, can.ui.current.selectionEnd) }, jk: function(event, can) { - can.page.DelText(can.ui.editor, can.ui.editor.selectionStart-1, 1) + can.page.DelText(can.ui.current, can.ui.current.selectionStart-1, 1) can.onkeymap.insert.Escape(event, can) }, }, selectLine: function(can, line, item) { - can.page.Modify(can, can.ui.editor, {className: "editor "+can.mode, value: item.innerText, style: { - height: item.offsetHeight, + can.page.Modify(can, can.ui.current, {className: "current "+can.mode, value: item.innerText, style: { left: item.offsetLeft, top: item.offsetTop, + height: item.offsetHeight, }}) can.page.Modify(can, can.ui.command, {className: "command "+can.mode, value: item.innerText, style: { - height: item.offsetHeight, width: can.Conf("width")-180, left: item.offsetLeft, top: item.offsetTop + can.ui.profile.offsetHeight-100, + height: item.offsetHeight, }}) }, insertLine: function(can, value, before) { @@ -315,5 +299,18 @@ Volcanos("onkeymap", {help: "键盘交互", list: ["command", "normal", "insert" can.onaction.rerankLine(can) }, }) -Volcanos("onexport", {help: "导出数据", list: ["模式", "按键", "解析器", "文件名", "当前行", "跳转数", "标签数"], +Volcanos("onaction", {help: "控件交互", list: [], + _engine: function(event, can, key) { + can.onkeymap._remote(event, can, key) + }, + save: function(event, can) { + var msg = can.request(event); msg.Option("content", can.onexport.content(can)) + can.run(event, ["action", "save", can.parse, can.Option("file"), can.Option("path")], function(msg) { + can.user.toast(can, "保存成功") + }, true) + }, + display: function(event, can) { + can.onmotion.toggle(can, can.ui.display) + }, }) +Volcanos("onexport", {help: "导出数据", list: ["文件数", "模式", "按键", "解析器", "文件名", "当前行", "跳转数", "标签数"]})