From 231f3c1b0d5ce64ccb04e7858784beb2da50adf2 Mon Sep 17 00:00:00 2001 From: shylinux Date: Fri, 24 Jul 2020 17:10:23 +0800 Subject: [PATCH] opt some --- pane/River.js | 12 ++++++++++-- pane/Search.js | 14 +++++++------- plugin/local/code/inner.js | 2 +- plugin/local/team/plan.css | 4 ++++ plugin/local/wiki/feel.js | 2 +- 5 files changed, 23 insertions(+), 11 deletions(-) diff --git a/pane/River.js b/pane/River.js index 75f7236c..379d8d7b 100644 --- a/pane/River.js +++ b/pane/River.js @@ -37,7 +37,11 @@ Volcanos("onaction", {help: "控件交互", list: ["创建", "刷新"], _init: f can.onexport._init(can, msg, list, cb, target) }, create: function(can) { - can.user.input(event, can, [["type", "public", "protected", "private"], "name", "text"], function(event, button, meta, list) { + can.user.input(event, can, [ + ["类型", "public", "protected", "private"], + {_input: "text", name: "名称", value: "hi"}, + {_input: "text", name: "简介", value: "hello"}, + ], function(event, button, meta, list) { can.run(event, ["action", "create"].concat(list), function(msg) { can.user.Search(can, {"river": msg.Result()}) }) @@ -65,7 +69,11 @@ Volcanos("ondetail", {help: "菜单交互", list: ["添加应用", "添加用户 }) }, "添加应用": function(event, can, river, button) { - can.user.input(event, can, [["type", "public", "protected", "private"], "name", "text"], function(event, button, meta, list) { + can.user.input(event, can, [ + ["类型", "public", "protected", "private"], + {_input: "text", name: "名称", value: "hi"}, + {_input: "text", name: "简介", value: "hello"}, + ], function(event, button, meta, list) { can.run(event, [can.Conf("river"), "storm", "action", "create"].concat(list), function(msg) { can.user.Search(can, {"river": can.Conf("river"), "storm": msg.Result()}) }) diff --git a/pane/Search.js b/pane/Search.js index eb434d96..34614431 100644 --- a/pane/Search.js +++ b/pane/Search.js @@ -55,9 +55,10 @@ Volcanos("onimport", {help: "导入数据", list: [], _init: function(can, meta, search(cmd[1]) }, select: function(can, msg, cmd, cb) { can._output.innerHTML = "" - function search(word) { cmd[1] = word + function search(word, cb) { cmd[1] = word can.run({}, cmd, function(msg) { can.ui.content.innerHTML = "" can.onappend.table(can, can.ui.content, "table", msg, function(value, key, index, line) { + can.Status("count", index+1) return {text: [value, "td"], onclick: function(event) { can.Status("index", index) can.Status("value", value) @@ -67,6 +68,7 @@ Volcanos("onimport", {help: "导入数据", list: [], _init: function(can, meta, }}]) }} }) + typeof cb == "function" && cb(msg) }) } @@ -79,13 +81,11 @@ Volcanos("onimport", {help: "导入数据", list: [], _init: function(can, meta, can.onaction.close(can) }, can.ui = can.page.Append(can, can._output, [ {input: ["word", function(event) { - if (event.key == "Enter") { search(event.target.value) - var list = can.page.Select(can, can.ui.content, "tr") - if (list.length == 2) { - list[1].firstChild.click() - event.target.setSelectionRange(0, -1) + if (event.key == "Enter") { search(event.target.value, function(msg) { + var list = can.page.Select(can, can.ui.content, "tr"); if (list.length == 2) { + list[1].firstChild.click(); event.target.setSelectionRange(0, -1) } - } + }) } }]}, {view: "content"}, {view: "display", list: [{type: "table", list: [{th: ["pod", "ctx", "cmd", "type", "name", "text"]}]}]}, ]) diff --git a/plugin/local/code/inner.js b/plugin/local/code/inner.js index 213f5bd2..630d1f79 100644 --- a/plugin/local/code/inner.js +++ b/plugin/local/code/inner.js @@ -138,7 +138,7 @@ Volcanos("onsyntax", {help: "语法高亮", list: ["keyword", "prefix", "line"], }) can.onaction.selectLine(can, can.Option("line")||1) }; var p = can.onsyntax[can.parse]; !p? can.run({}, ["action", "plugin", can.parse, can.Option("file"), can.Option("path")], function(msg) { - p = can.onsyntax[can.parse] = can.base.Obj(msg.Result()), can.onsyntax._init(can, can._msg), init(p) + p = can.onsyntax[can.parse] = can.base.Obj(msg.Result()), can.onsyntax._init(can, can._msg) }, true): init(p) }, parse: function(can, line) { var p = can.onsyntax[can.parse]; if (!p) { return } diff --git a/plugin/local/team/plan.css b/plugin/local/team/plan.css index 9483c28f..9480f330 100644 --- a/plugin/local/team/plan.css +++ b/plugin/local/team/plan.css @@ -9,15 +9,19 @@ fieldset.plan>div.output table.profile { } fieldset.plan>div.output table.content div.prepare { background-color:blue; + color:white; } fieldset.plan>div.output table.content div.process { background-color:green; + color:white; } fieldset.plan>div.output table.content div.finish { background-color:red; + color:white; } fieldset.plan>div.output table.content div.cancel { background-color:yellow; + color:white; } fieldset.plan>div.output table.content td { diff --git a/plugin/local/wiki/feel.js b/plugin/local/wiki/feel.js index cb781531..18f9be7e 100644 --- a/plugin/local/wiki/feel.js +++ b/plugin/local/wiki/feel.js @@ -13,7 +13,7 @@ Volcanos("onimport", {help: "导入数据", list: [], _init: function(can, msg, }} }) - var list = msg.Table(), begin = 0, limit = 3; function page() { + var list = msg.Table()||[], begin = 0, limit = 3; function page() { can.ctrl.offset.innerHTML = begin+"-"+(begin+limit) can.onimport.page(can, list, begin, limit) }