From 184e5d49fb13e89ab902d26a6a3e519614fc9f41 Mon Sep 17 00:00:00 2001 From: shaoying Date: Sun, 28 Jun 2020 21:10:11 +0800 Subject: [PATCH] opt order --- frame.js | 48 +++++++++++++++++++++----------------- plugin/input.js | 3 +++ plugin/local/code/inner.js | 7 +++++- plugin/local/wiki/data.js | 4 ++++ plugin/local/wiki/draw.js | 4 ++-- plugin/local/wiki/feel.css | 3 +++ 6 files changed, 45 insertions(+), 24 deletions(-) diff --git a/frame.js b/frame.js index 464029d1..15d5f9f5 100644 --- a/frame.js +++ b/frame.js @@ -44,38 +44,43 @@ Volcanos("onengine", { _init: function(can, meta, list, cb, target) { }); return true }, river: { "main": {name: "main", storm: { - "dream": {name: "dream", index: [ - "web.space", - "web.dream", - "web.code.docker.container", - "web.code.tmux.session", - ]}, - "main": {name: "main", index: [ + "inner": {name: "inner", index: [ "web.code.inner", "web.code.git.status", "web.code.git.total", ]}, - "task": {name: "task", index: [ - "web.team.plan", - "web.wiki.draw.draw", - "web.wiki.word", - ]}, - "relay": {name: "relay", index: [ - "aaa.totp.get", - "web.route", - ]}, - "性能": {name: "性能", index: [ + "pprof": {name: "pprof", index: [ "web.code.pprof", "web.code.bench", "web.favor", "web.cache", "web.share", ]}, + "relay": {name: "relay", index: [ + "aaa.totp.get", + "web.route", + "web.space", + "web.dream", + "web.code.docker.container", + "web.code.tmux.session", + ]}, + "office": {name: "office", index: [ + "web.team.plan", + "web.wiki.feel", + "web.wiki.data", + "web.wiki.word", + "web.wiki.draw.draw", + ]}, "docker": {name: "docker", index: [ "web.code.docker.image", "web.code.docker.container", "web.code.docker.command", ]}, + "tmux": {name: "tmux", index: [ + "web.code.tmux.text", + "web.code.tmux.buffer", + "web.code.tmux.session", + ]}, }}, }, @@ -565,15 +570,16 @@ Volcanos("onappend", { _init: function(can, meta, list, cb, target, field) { met 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.Option()); + var msg = can.request(event) + can.core.Item(can.Option(), msg.Option) // 上传文件 - begin = new Date(); + begin = new Date() msg._progress = show - msg.upload = action.upload.files[0]; + msg.upload = action.upload.files[0] can.run(event, ["action", "upload"], function(msg) { can.onappend.toast(can, "上传成功") - }, true); + }, true) }) action.upload.click() }, diff --git a/plugin/input.js b/plugin/input.js index c41ec7be..3ede764b 100644 --- a/plugin/input.js +++ b/plugin/input.js @@ -4,6 +4,9 @@ Volcanos("onimport", {help: "导入数据", list: [], }) Volcanos("onaction", {help: "控件交互", list: [], onchange: function(event, can) { + if (event.target.tagName == "SELECT") { + can.run(event) + } }, onclick: function(event, can) { switch (can.Conf("type")) { diff --git a/plugin/local/code/inner.js b/plugin/local/code/inner.js index 7f26de2c..8cd52bc0 100644 --- a/plugin/local/code/inner.js +++ b/plugin/local/code/inner.js @@ -317,7 +317,11 @@ Volcanos("onsyntax", {help: "语法高亮", list: ["keyword", "prefix", "line"], line: function(can, line) { return can.page.Format("img", "/share/local/"+line) } }, jpg: { - line: function(can, line) { return can.page.Format("img", "/share/local/"+line) } + show: function(can, line) { + can.page.Append(can, can.ui.display, can.core.List(can._msg.result, function(line) { + return {img: "/share/local/"+line} + })) + } }, m4v: { line: function(can, line) { var auto = true, loop = true, total = 0 @@ -376,6 +380,7 @@ Volcanos("onkeymap", {help: "键盘交互", list: ["command", "normal", "insert" _remote: function(event, can, key, arg, cb) { can.ui.display.innerHTML = "", can.ui.profile.innerHTML = "" var p = can.onsyntax[can.parse]; can.display = p && p.profile && can.ui.profile || can.ui.display + if (p && p.show) { p.show(can); return } can.page.Modify(can, can.display, {innerHTML: "", style: {display: "none"}}) var msg = can.request(event); msg.Option("content", can.onexport.content(can)) diff --git a/plugin/local/wiki/data.js b/plugin/local/wiki/data.js index 07958d04..d236658c 100644 --- a/plugin/local/wiki/data.js +++ b/plugin/local/wiki/data.js @@ -9,6 +9,10 @@ Volcanos("onimport", {help: "导入数据", list: [], _init: function(can, msg, }) }, ondblclick: function(event) { can.page.Modify(can, event.target, {contenteditable: true}) + }, onclick: function(event) { + if (key == "path") { + can.run(event, [can.Option("path", value)]) + } }} }) }, diff --git a/plugin/local/wiki/draw.js b/plugin/local/wiki/draw.js index 0b00ed8f..01f722ab 100644 --- a/plugin/local/wiki/draw.js +++ b/plugin/local/wiki/draw.js @@ -18,7 +18,7 @@ Volcanos("onimport", {help: "导入数据", list: [], _init: function(can, msg, can.last = null // 加载绘图 - var code = can.page.AppendBoard(can, can.ui.content, msg.Result()||can.onexport.file(event, can)) + var code = can.page.AppendBoard(can, can.ui.content, msg.Result()||can.onexport.file(can)) can.page.Select(can, can.ui.content, "svg", function(svg) { can.svg = can.group = svg can.onimport.block(can, svg), can.onimport.group(can, svg).click() can.page.Select(can, svg, "*", function(item, index) { @@ -858,7 +858,7 @@ Volcanos("onexport", {help: "导出数据", list: ["group", "target", "zone", "t return ['', svg? svg.innerHTML: "", ""]).join("") + }): [" width=600 height=200 "]).concat(['>', svg? svg.innerHTML: "", ""]).join("") }, }) diff --git a/plugin/local/wiki/feel.css b/plugin/local/wiki/feel.css index 972ef339..0c485f40 100644 --- a/plugin/local/wiki/feel.css +++ b/plugin/local/wiki/feel.css @@ -2,6 +2,9 @@ fieldset.feel div.action { clear:none; } +fieldset.feel div.output { + min-height:200px; +} fieldset.feel div.output div.content { max-height:200px; overflow:auto;