From 63a8cd6eede38da59ecaa9975aa0dba0e2c44ae2 Mon Sep 17 00:00:00 2001 From: shaoying Date: Thu, 8 Oct 2020 07:58:21 +0800 Subject: [PATCH] opt some --- frame.js | 12 ++++-------- index.css | 3 +++ intshell | 1 - lib/base.js | 5 +++++ lib/page.js | 2 ++ pane/Header.js | 4 ++++ plugin/input.js | 2 +- plugin/state.js | 2 +- plugin/table.js | 41 +++++++++++++++++++++++++++++------------ 9 files changed, 49 insertions(+), 23 deletions(-) delete mode 120000 intshell diff --git a/frame.js b/frame.js index 5891eaed..eb4ddaab 100644 --- a/frame.js +++ b/frame.js @@ -10,7 +10,6 @@ Volcanos("onengine", {help: "解析引擎", list: [], _init: function(can, meta, }, function() { can.onlayout._init(can, meta, list, function() {}, target) can.onengine._daemon(can, can.user.title()) - can.onengine._topic(can) can.onkeypop._init(can) can.require(Volcanos.meta.webpack? []: meta.main.list, function(can) { @@ -25,10 +24,6 @@ Volcanos("onengine", {help: "解析引擎", list: [], _init: function(can, meta, }) return true }, - _topic: function(can) { - can.user.title(can.user.Search(can, "title")) - can.page.Modify(can, can._target, {className: can.user.Search(can, "topic")||(can.user.Search(can, "pod")? "black": "white")}) - }, _daemon: function(can, name) { return can.misc.WSS(can, "", {name: name, type: "chrome"}, function(event, msg) { @@ -457,9 +452,12 @@ Volcanos("onappend", {help: "渲染引擎", list: [], _init: function(can, meta, item.cb = item.cb || item.value || "" var input = {type: "input", name: item.name, data: item, dataset: {}} + item.value == "auto" && (item.value = "", item.action = "auto") + item.action == "auto" && (input.dataset.action = "auto") + switch (item.type = item.type || item._type || item._input || "text") { case "upfile": item.type = "file"; break - case "button": item.value = item.name || item.value || "查看"; break + case "button": item.value = item.value || can.Conf("feature.trans."+item.name) || item.name || "查看"; break case "select": item.values = typeof item.values == "string"? item.values.split(" "): item.values if (!item.values && item.value) { @@ -489,8 +487,6 @@ Volcanos("onappend", {help: "渲染引擎", list: [], _init: function(can, meta, break } - item.value == "auto" && (item.value = "") - item.action == "auto" && (input.dataset.action = "auto") var target = can.page.Append(can, option, [{view: ["item "+item.type], list: [item.position && {text: item.name+": "}, input]}])[item.name] var pval = "" diff --git a/index.css b/index.css index b34c935a..1c966524 100644 --- a/index.css +++ b/index.css @@ -276,6 +276,9 @@ body.white input[type=button] { body.white table input[type=button][value=结束] { background:red; } +body.white table input[type=button][value=停止] { + background:red; +} body.white table input[type=button][value=启动] { background:#52ce78; } diff --git a/intshell b/intshell deleted file mode 120000 index 855021aa..00000000 --- a/intshell +++ /dev/null @@ -1 +0,0 @@ -../intshell \ No newline at end of file diff --git a/lib/base.js b/lib/base.js index 418ee0db..5bb65daa 100644 --- a/lib/base.js +++ b/lib/base.js @@ -80,5 +80,10 @@ var base = Volcanos("base", {help: "基础模块", return result.join(""); }), Format: shy("数据格式化", function(obj) {return JSON.stringify(obj)}), + + isNight: function() { + var now = new Date() + return now.getHours() < 7 || now.getHours() > 17 + }, }) diff --git a/lib/page.js b/lib/page.js index 915692b2..d07017bf 100644 --- a/lib/page.js +++ b/lib/page.js @@ -282,6 +282,8 @@ var page = Volcanos("page", {help: "网页模块", text = text.replace(/\033\[33m/g, "") text = text.replace(/\033\[34m/g, "") text = text.replace(/\033\[36m/g, "") + text = text.replace(/\033\[34;1m/g, "") + text = text.replace(/\033\[37;1m/g, "") text = text.replace(/\033\[1m/g, "") text = text.replace(/\033\[0m/g, "") text = text.replace(/\033\[m/g, "") diff --git a/pane/Header.js b/pane/Header.js index 7fa5f90b..4ee16cce 100644 --- a/pane/Header.js +++ b/pane/Header.js @@ -9,6 +9,10 @@ Volcanos("onaction", {help: "交互数据", list: [], _init: function(can, msg, }, target) }) } + can.user.title(can.user.Search(can, "title")) + can.page.Modify(can, document.body, {className: + can.user.Search(can, "topic") || (can.user.Search(can, "pod") || can.base.isNight() ? "black": "white")}) + location.protocol == "file:"? init(): can.run({}, ["check"], function(msg) { msg.Result()? init(): can.user.login(can, init) }) diff --git a/plugin/input.js b/plugin/input.js index a673810b..26e4565c 100644 --- a/plugin/input.js +++ b/plugin/input.js @@ -9,7 +9,7 @@ Volcanos("onaction", {help: "控件交互", list: [], "查看": function(event, can) { can.run(event) }, "返回": function(event, can) { can.sup._history.pop(); var his = can.sup._history.pop(); if (his) { - can.page.Select(can, can._option, "input.args", function(item, index) { + can.page.Select(can, can._option, "input.args,select.args", function(item, index) { item.value = his[index] || "" }) } diff --git a/plugin/state.js b/plugin/state.js index af4702d1..3a751256 100644 --- a/plugin/state.js +++ b/plugin/state.js @@ -10,7 +10,7 @@ Volcanos("onaction", {help: "交互操作", list: [], _init: function(can, msg, key && value && args.push(key, value) }) - var sub = can._outputs && can._outputs[can._outputs.length-1] + var sub = can._outputs && can._outputs[can._outputs.length-1] || can sub.run(event, args, function(msg) { typeof cb == "function" && cb(msg) diff --git a/plugin/table.js b/plugin/table.js index 33903efc..61f3de43 100644 --- a/plugin/table.js +++ b/plugin/table.js @@ -2,11 +2,11 @@ Volcanos("onimport", {help: "导入数据", list: [], _init: function(can, msg, if (can.onimport._process(can, msg)) { return typeof cb == "function" && cb(msg) } - can.ui = can.page.Appends(can, target, [can.onimport._control(can, msg)].concat([ {view: ["content", "div"]}, {view: ["display", "pre"]}, ])) + can.onappend.table(can, can.ui.content, "table", msg, function(value, key, index, line, array) { return can.onimport._table(can, value, key, index, line, array) }) @@ -15,21 +15,17 @@ Volcanos("onimport", {help: "导入数据", list: [], _init: function(can, msg, can.onimport._board(can, msg) return typeof cb == "function" && cb(msg) }, - _control: function(can, msg) { - return msg.Option("_control") == "page" && {view: ["control", "div"], list: [ + _page: function(can, msg) { + return {view: ["control", "div"], list: [ {button: ["上一页", function(event) { - if (can.ui["cache.begin"].value == "") { - can.ui["cache.begin"].value = msg.Option("cache.count") - can.ui["cache.limit"].value - } - can.ui["cache.begin"].value = can.ui["cache.begin"].value - can.ui["cache.limit"].value - if (can.ui["cache.begin"].value < 0) { can.ui["cache.begin"].value = 0} + can.ui["cache.offend"].value = parseInt(can.ui["cache.offend"].value||0) + parseInt(can.ui["cache.limit"].value) can.run(event) }]}, - {input: ["cache.begin", function(event) { + {input: ["cache.offend", function(event) { event.key == "Enter" && can.run(event) }], style: {width: 50}, _init: function(item) { - item.value = msg.Option("cache.begin") + item.value = msg.Option("cache.offend") }, data: {"className": "args"}}, {select: [["cache.limit", 10, 30, 100, 1000], function(event) { @@ -39,8 +35,10 @@ Volcanos("onimport", {help: "导入数据", list: [], _init: function(can, msg, }, data: {"className": "args"}}, {button: ["下一页", function(event) { - can.ui["cache.begin"].value = parseInt(can.ui["cache.begin"].value||parseInt(m.Option("cache.count"))-parseInt(can.ui["cache.limit"].value)) + parseInt(can.ui["cache.limit"].value) - if (can.ui["cache.begin"].value != "" && parseInt(can.ui["cache.begin"].value) < parseInt(msg.Option("cache.count"))) { can.ui["cache.begin"].value = msg.Option("cache.count") } + can.ui["cache.offend"].value = parseInt(can.ui["cache.offend"].value||0) - parseInt(can.ui["cache.limit"].value) + if (can.ui["cache.offend"].value < 0) { + can.ui["cache.offend"].value = 0 + } can.run(event) }]}, @@ -58,6 +56,10 @@ Volcanos("onimport", {help: "导入数据", list: [], _init: function(can, msg, }, data: {"className": "args"}}, ]} }, + _control: function(can, msg) { + var cb = can.onimport[msg.Option("_control")] + return typeof cb == "function" && cb(can, msg) + }, _table: function(can, value, key, index, line, array) { return {type: "td", inner: value, click: function(event) { var target = event.target if (target.tagName == "INPUT" && target.type == "button") { var msg = can.sup.request(event) @@ -102,6 +104,21 @@ Volcanos("onimport", {help: "导入数据", list: [], _init: function(can, msg, var process = msg.Option("_process") || can.Conf("feature")["_process"] var cb = can.onimport[process]; return typeof cb == "function" && cb(can, msg) }, + _follow: function(can, msg) { + if (msg.Result() == "stop") { return } + can.onappend.board(can, can._target, "board", msg) + + can.Timer(100, function() { + var sub = can.request({}) + sub.Option("cache.limit", msg.Option("cache.limit")) + sub.Option("cache.begin", msg.Option("cache.begin")) + sub.Option("cache.hash", msg.Option("cache.hash")) + can.run(sub._event, [msg.Option("cache.button")], function(msg) { + can.onimport._follow(can, msg) + }, true) + }) + return true + }, _inner: function(can, msg) { can.onappend.board(can, can.ui.display, "board", msg) can.onimport._board(can, msg)