From 19b63c3b7b2be0ff2b28356b5b4b27b7e5d528cb Mon Sep 17 00:00:00 2001 From: harveyshao Date: Wed, 22 Dec 2021 10:30:35 +0800 Subject: [PATCH] opt some --- page/index.js | 2 +- plugin/local/team/plan.js | 10 +++++----- plugin/local/wiki/word.css | 7 ++++--- plugin/local/wiki/word.js | 23 ++++++++++++----------- plugin/story/spide.js | 1 + proto.js | 2 +- 6 files changed, 24 insertions(+), 21 deletions(-) diff --git a/page/index.js b/page/index.js index 862e3830..7a0ff982 100644 --- a/page/index.js +++ b/page/index.js @@ -2,8 +2,8 @@ Volcanos({name: "chat", panels: [ {name: "Header", help: "标题栏", pos: chat.HEAD, state: ["time", "usernick", "avatar"]}, {name: "River", help: "群聊组", pos: chat.LEFT, action: ["create", "refresh"]}, {name: "Action", help: "工作台", pos: chat.MAIN}, - {name: "Search", help: "搜索框", pos: chat.AUTO}, {name: "Footer", help: "状态条", pos: chat.FOOT, state: ["ncmd"]}, + {name: "Search", help: "搜索框", pos: chat.AUTO}, ], main: {name: "Header", list: ["/publish/order.js"]}, river: { serivce: {name: "运营群", storm: { wx: {name: "公众号 wx", list: [ diff --git a/plugin/local/team/plan.js b/plugin/local/team/plan.js index 76796531..94d72d22 100644 --- a/plugin/local/team/plan.js +++ b/plugin/local/team/plan.js @@ -62,7 +62,7 @@ Volcanos("onimport", {help: "导入数据", list: [], _init: function(can, msg, _profile: function(can, task) { function keys(task, key) { return [task.pod, task.zone, task.id, key].join(".") } - if (can.sup.task) { if (can.sup.task.id == task.id) { return } + if (can.sup.task) { if (can.sup.task.pod == task.pod && can.sup.task.id == task.id) { return } can.page.Cache(keys(can.sup.task, chat.PROFILE), can.ui.profile, can.sup.task.id) can.page.Cache(keys(can.sup.task, chat.DISPLAY), can.ui.display, can.sup.task.id) } @@ -85,12 +85,12 @@ Volcanos("onimport", {help: "导入数据", list: [], _init: function(can, msg, }]) }), can.onimport._display(can, task) }, _display: function(can, task) { if (!task["extra.cmd"]) { return } - can.onappend.plugin(can, {type: "story", ctx: task["extra.ctx"], cmd: task["extra.cmd"], arg: task["extra.arg"]}, function(sub, meta) { - sub.run = function(event, cmds, cb) { var msg = can.request(event, {"task.zone": task.zone, "task.id": task.id}) - can.run(event, can.misc.concat([ctx.ACTION, ice.RUN, task["zone"], task["id"]], cmds), cb, true) + can.onappend.plugin(can, {type: chat.STORY, ctx: task["extra.ctx"], cmd: task["extra.cmd"], arg: task["extra.arg"]}, function(sub, meta) { + sub.run = function(event, cmds, cb) { var msg = can.request(event, kit.Dict("task.pod", task["pod"], "task.zone", task.zone, "task.id", task.id)) + can.run(event, can.misc.concat([ctx.ACTION, ice.RUN, task[kit.MDB_ZONE], task[kit.MDB_ID]], cmds), cb, true) } }, can.ui.display) - can.page.Modify(can, can.ui.display, {style: {display: "block"}}) + can.page.Modify(can, can.ui.display, {style: {display: html.BLOCK}}) }, day: function(can, msg) { diff --git a/plugin/local/wiki/word.css b/plugin/local/wiki/word.css index 3a4029fa..a31540da 100644 --- a/plugin/local/wiki/word.css +++ b/plugin/local/wiki/word.css @@ -120,11 +120,9 @@ fieldset.word.float { width:-webkit-fill-available; position:fixed; left:0; top:0; background-color:aliceblue; - background-color:aliceblue; color:black; } fieldset.word.float>div.output { - background-color:aliceblue; background-color:#f0f8ff80; overflow:auto; padding:20px; @@ -134,7 +132,6 @@ fieldset.word.float div.project { padding:10px; } fieldset.word.float div.content div.page { - background-color:aliceblue; background-color:#194c79d4; margin-top:30px; display:none; @@ -158,6 +155,10 @@ fieldset.word.float h2 { fieldset.word.float h3 { text-align:center; } +fieldset.word.float div.status { + color:white; + clear:none; +} fieldset.panel.cmd fieldset.word>form.option { display:none; diff --git a/plugin/local/wiki/word.js b/plugin/local/wiki/word.js index 52224008..2e0a12df 100644 --- a/plugin/local/wiki/word.js +++ b/plugin/local/wiki/word.js @@ -174,6 +174,7 @@ Volcanos("onaction", {help: "控件交互", list: [], can.keylist = can.onkeypop._parse(event, can, "normal", can.keylist) }})) + sub.onappend._status(sub, ["page", "from", "cost"]) sub.list = list sub.page.Modify(sub, sub._output, {style: {"width": window.innerWidth-40}}) sub.page.Modify(sub, sub._output, {style: {"height": window.innerHeight-93}}) @@ -201,18 +202,18 @@ Volcanos("onaction", {help: "控件交互", list: [], }, document.body) }, - "开讲": function(event, sub) { sub.sup.onaction.show(sub, 0) }, - "快闪": function(event, sub) { sub.sup.onaction.flash(sub) }, - "网格": function(event, sub) { sub.sup.onaction.grid(sub) }, + "开讲": function(event, can) { can.sup.onaction.show(can, 0) }, + "快闪": function(event, can) { can.sup.onaction.flash(can) }, + "网格": function(event, can) { can.sup.onaction.grid(can) }, - "大纲": function(event, sub) { sub.onmotion.toggle(sub, sub.ui.project) }, - "首页": function(event, sub) { sub.sup.onaction.show(sub, 0) }, - "上一页": function(event, sub) { sub.sup.onaction.prev(sub, sub.ui.content) }, - "菜单": function(event, sub) { sub.sup.onaction.show(sub, event.target.selectedIndex) }, - "下一页": function(event, sub) { sub.sup.onaction.next(sub, sub.ui.content) }, - "隐藏": function(event, sub) { sub.onmotion.toggle(sub, sub._output) }, - "结束": function(event, sub) { sub.page.Remove(sub, sub._target) - sub.onengine.signal(sub, "keymap.focus", sub.request(event, {cb: null})) + "大纲": function(event, can) { can.onmotion.toggle(can, can.ui.project) }, + "首页": function(event, can) { can.sup.onaction.show(can, 0) }, + "上一页": function(event, can) { can.sup.onaction.prev(can, can.ui.content) }, + "菜单": function(event, can) { can.sup.onaction.show(can, event.target.selectedIndex) }, + "下一页": function(event, can) { can.sup.onaction.next(can, can.ui.content) }, + "隐藏": function(event, can) { can.onmotion.toggle(can, can._output) }, + "结束": function(event, can) { can.page.Remove(can, can._target) + can.onengine.signal(can, "keymap.focus", can.request(event, {cb: null})) }, show: function(sub, which) { sub.page.Modify(sub, sub.ui.content, {className: "content"}) diff --git a/plugin/story/spide.js b/plugin/story/spide.js index a8714323..12248f92 100644 --- a/plugin/story/spide.js +++ b/plugin/story/spide.js @@ -1,5 +1,6 @@ Volcanos("onimport", {help: "导入数据", list: [], _init: function(can, msg, list, cb, target) { can.onmotion.clear(can), can.base.isFunc(cb) && cb(msg) + if (msg.Length() == 0) { return } can._args = can.base.Copy({root: "ice", field: msg.append[0], split: ice.PS}, can.base.ParseURL(can._display)) can.dir_root = msg.Option(nfs.DIR_ROOT)||can._args.root||"" diff --git a/proto.js b/proto.js index 3c5d1d9b..96beb23e 100644 --- a/proto.js +++ b/proto.js @@ -136,8 +136,8 @@ var chat = { {name: "Header", help: "标题栏", pos: "head", state: ["time", "usernick", "avatar"]}, {name: "River", help: "群聊组", pos: "left", action: ["create", "refresh"]}, {name: "Action", help: "工作台", pos: "main"}, - {name: "Search", help: "搜索框", pos: "auto"}, {name: "Footer", help: "状态条", pos: "foot", state: ["ncmd"]}, + {name: "Search", help: "搜索框", pos: "auto"}, ], plugin_list: [ "/plugin/state.js",