From e56c93ffbca0b245aa5c5c0ab146ff203572b34f Mon Sep 17 00:00:00 2001 From: shylinux Date: Sat, 3 Jun 2023 17:07:21 +0800 Subject: [PATCH] add some --- frame.js | 7 ++++--- plugin/input.js | 3 --- plugin/local/wiki/word.css | 5 ++++- plugin/local/wiki/word.js | 10 ++++++---- 4 files changed, 14 insertions(+), 11 deletions(-) diff --git a/frame.js b/frame.js index 6f122228..94255491 100644 --- a/frame.js +++ b/frame.js @@ -193,10 +193,11 @@ Volcanos(chat.ONAPPEND, {_init: function(can, meta, list, cb, target, field) { }, can._inputs = can._inputs||{}, can._inputs[item.name] = sub, sub.sup = can can.core.ItemCB(sub.onaction, function(key, cb) { sub._target[key] = function(event) { can.misc.Event(event, can, function(msg) { cb(event, sub, sub._target) })} }) can.core.ItemCB(item, function(key, cb) { sub._target[key] = function(event) { can.misc.Event(event, can, function(msg) { cb(event, sub, sub._target) })} }) - item.action && can.onappend.figure(sub, item, sub._target, function(_sub, value) { can.Update() }) - if (skip) { return } item.type == html.BUTTON && item.action == ice.AUTO && can.base.isUndefined(can._delay_init) && (auto = sub._target), next() + item.action && can.onappend.figure(sub, item, sub._target, function(_sub, value) { can.Update() }); if (skip) { return } + item.type == html.BUTTON && item.action == ice.AUTO && can.base.isUndefined(can._delay_init) && (auto = sub._target), next() + can.Conf(ice.AUTO) == item.name && (auto = sub._target) }) - }; var auto; can.core.Next(can.core.Value(can, [chat.ONIMPORT, mdb.LIST])||meta.inputs, add, function() { auto && auto.click() }) + }; var auto; can.core.Next(can.core.Value(can, [chat.ONIMPORT, mdb.LIST])||meta.inputs, add, function() { can.Conf(ice.AUTO) == "delay" || auto && auto.click() }) }, _action: function(can, list, action, meta) { meta = meta||can.onaction||{}, action = action||can._action, can.onmotion.clear(can, action) function run(event, button) { can.misc.Event(event, can, function(msg) { var _can = can._fields? can.sup: can diff --git a/plugin/input.js b/plugin/input.js index 1a8b83d3..595770f8 100644 --- a/plugin/input.js +++ b/plugin/input.js @@ -1,7 +1,4 @@ Volcanos(chat.ONACTION, { - _init: function(can, meta, target) { - meta.type == html.BUTTON && meta.action == ice.AUTO && can.base.isUndefined(can.sup._delay_init) && target.click() - }, run: function(event, can) { can.run(event) }, refresh: function(event, can) { can.run(event) }, list: function(event, can) { can.sup.isSimpleMode() || can.run(event) }, back: function(event, can) { can.sup.onimport._back(can.sup) }, onclick: function(event, can) { can.Conf(mdb.TYPE) == html.BUTTON && can.run(event, [ctx.ACTION, can.Conf(mdb.NAME)].concat(can.sup.Input())), can.onkeymap.prevent(event) }, diff --git a/plugin/local/wiki/word.css b/plugin/local/wiki/word.css index 346739d4..e0871366 100644 --- a/plugin/local/wiki/word.css +++ b/plugin/local/wiki/word.css @@ -18,11 +18,14 @@ fieldset.word.play.float>div.status { clear:none; } fieldset.word.play.float>div.output>div.project { background-color:#4682b46b; padding:10px; position:fixed; right:0; top:32px; z-index:10; } fieldset.word.play.float div.content div.page { text-align:center; display:none; } fieldset.word.play.float div.content div.page.show { display:block; } -fieldset.word.play.float div.content.grid div.page { background-color:#a4cbecb5; margin:10px; height:200px; width:30%; overflow:auto; display:block; float:left; } +fieldset.word.play.float div.content div.page ul { text-align:left; } +fieldset.word.play.float div.content div.page fieldset { text-align:center; } +fieldset.word.play.float div.content.grid div.page { background-color:#a4cbecb5; margin:10px; height:320px; width:30%; overflow:auto; display:block; float:left; } fieldset.word.play.float h1 { text-align:center; } fieldset.word.play.float h2 { text-align:center; } fieldset.word.play.float h3 { text-align:center; } div.story[data-type=spark] label { user-select:none; } +div.story[data-type=spark_tabs] { margin-top:20px; } div.story[data-type=spark_tabs]>div.tabs>div.item { font-style:italic; padding:5px 20px; height:32px; float:left; } div.story[data-type=spark_tabs]>div.tabs>div.item.select { border-bottom:blue solid 2px; } div.story[data-type=spark_tabs]>div.story:not(.select) { display:none; } diff --git a/plugin/local/wiki/word.js b/plugin/local/wiki/word.js index 6e7f6f5b..8b3c60df 100644 --- a/plugin/local/wiki/word.js +++ b/plugin/local/wiki/word.js @@ -44,8 +44,7 @@ Volcanos(chat.ONIMPORT, {_init: function(can, msg, target) { can.onmotion.clear( if (msg.Option(nfs.PATH) == can.Option(nfs.PATH)) { msg.Option(nfs.PATH, "") } can.runAction(event, chat.STORY, [meta.type, meta.name, meta.text].concat(cmds), cb, true) }, can._plugins = (can._plugins||[]).concat([sub]) - - sub.ConfHeight(can.base.Min(300, can.ConfHeight()-300)), sub.ConfWidth(item.width = (width||can.ConfWidth())-(can.user.isWindows? 42: 22)) + sub.ConfHeight(sub.Conf("_height", parseInt(item.height))||can.base.Min(300, can.ConfHeight()-300)), sub.ConfWidth(item.width = (width||can.ConfWidth())-(can.user.isWindows? 42: 22)) can.page.style(can, sub._output, html.MAX_WIDTH, sub.ConfWidth()) can.core.Value(item, "auto.cmd") && can.onmotion.delay(function() { @@ -85,7 +84,7 @@ Volcanos(chat.ONIMPORT, {_init: function(can, msg, target) { can.onmotion.clear( can.isCmdMode() && can.ConfHeight(can.page.height()) && can.page.styleHeight(can, can._output, "") } can.core.List(can._plugins, function(sub) { - sub.ConfHeight(can.base.Min(300, height-300)), sub.ConfWidth(width-(can.user.isWindows? 40: 20)) + sub.ConfHeight(sub.Conf("_height")||can.base.Min(300, height-300)), sub.ConfWidth(width-(can.user.isWindows? 40: 20)) sub.onimport.size(sub, can.base.Min(300, height-300), width-(can.user.isWindows? 40: 20), true) }) can.page.Select(can, can._output, can.page.Keys(html.IMG, html.VIDEO), function(target) { can.page.style(can, target, html.MAX_HEIGHT, height-20, html.MAX_WIDTH, width-20) }) @@ -152,7 +151,10 @@ Volcanos(chat.ONDETAIL, {list: ["删除"], can.sup.ondetail.show(can, 0) }, "网格": function(event, can) { - can.onlayout.expand(can, can.ui.content, 320) + var count = can.page.Select(can, can.ui.content, html.DIV_PAGE).length + var n = (can.sup.ConfHeight()-20)/340 + for (var i = 1; i < 5; i++) { if (i*n > count) { break } } + can.onlayout.expand(can, can.ui.content, parseInt((can.sup.ConfWidth()-20)/i)-20) can.sup.ondetail.grid(can) }, "快闪": function(event, can) {