From 9e256717c24e0d23549f31132469b51c3e6d5abb Mon Sep 17 00:00:00 2001 From: shy Date: Sun, 26 May 2024 08:07:19 +0800 Subject: [PATCH] add some --- index.css | 15 +++++++++------ lib/page.js | 2 +- plugin/local/team/plan.css | 2 +- plugin/state.js | 1 + plugin/table.js | 5 +++-- 5 files changed, 15 insertions(+), 10 deletions(-) diff --git a/index.css b/index.css index d714e910..ee1c7925 100644 --- a/index.css +++ b/index.css @@ -329,12 +329,12 @@ div.toast.float>div.title { color:var(--notice-bg-color); font-style:italic; whi div.toast.float>div.close { color:var(--notice-bg-color); float:right; cursor:pointer; margin-top:-3px; } div.toast.float>div.close:hover { background-color:var(--hover-bg-color); color:var(--hover-fg-color); } div.toast.float div.duration { color:var(--disable-fg-color); float:right; } -div.toast.float div.content { color:var(--notice-bg-color); white-space:pre-line; text-align:center; padding:var(--input-padding); margin-bottom:var(--input-margin); min-height:28px; } div.toast.float div.duration { font-size:var(--status-font-size); } div.toast.float div.title { font-size:var(--status-font-size); } +div.toast.float div.content { color:var(--notice-bg-color); white-space:pre-line; text-align:center; padding:var(--input-padding); margin-bottom:var(--input-margin); min-height:28px; } div.toast.float.warn div.content { white-space:pre-wrap; text-align:left; display:block; overflow:auto; } div.toast.float div.progress { margin-left:0px; height:5px; } -div.toast.float div.progress div.current { background-color:var(--notice-bg-color); height:3px; } +div.toast.float div.progress div.current { background-color:var(--notice-bg-color); height:3px; transition:all 0.5s; } div.toast.float div.action:not(.hide) { display:flex; flex-direction:row-reverse; gap:var(--button-margin); } div.toast.float div.action>div.item i { display:none; } div.toast.float div.action>div.item span { display:none; } @@ -413,6 +413,7 @@ body>div.upload div.status div.cost { float:left; } body>div.upload div.status div.show { float:right; } body>div.upload div.status div.size { text-align:center; } /* display */ +fieldset:not(.Action) { position:relative; } fieldset>form.option:not(.hide), fieldset>div.action:not(.hide):not(.flex) { display:contents; } .hide, .hidden { display:none; } body:not(.mobile) fieldset:not(.Action):not(.output):not(.cmd)>div.action:not(.hide):not(.flex) { display:flex; overflow:hidden; } fieldset.panel>legend, fieldset.panel>div.status { display:none; } @@ -423,7 +424,8 @@ fieldset.story, fieldset>div.output, fieldset>div.status, div.output>div.project fieldset.story { position:sticky; left:0; } fieldset.auto, fieldset.full, fieldset.float { position:fixed; } fieldset.full { position:fixed; left:0; top:0; } -fieldset.plug { position:sticky; bottom:0; right:0; float:right; } +/* fieldset.plug { position:sticky; bottom:0; right:0; float:right; } */ +fieldset.plug { position:absolute; bottom:calc(var(--action-height) + var(--plugin-padding)); right:var(--plugin-padding); } fieldset.cmd>div.output>fieldset.plug { position:fixed; bottom:var(--action-height); right:0; } fieldset.story>div.output>fieldset.plug { position:absolute; bottom:0; right:0; float:right; } fieldset.plug:not(.select) { display:none; } @@ -644,7 +646,8 @@ fieldset>div.action>div.tabs img { margin-right:var(--input-margin); height:24px fieldset>div.action>div.cmds { font-style:italic; padding:var(--input-padding) var(--button-padding); height:var(--action-height); min-width:60px; text-align:center; justify-content:center; align-items:center; } fieldset>div.output>div.code { font-size:var(--code-font-size); } fieldset>div.output { width:100%; } fieldset>div.status { width:100%; } -fieldset>div.status { font-family:var(--status-font-family); font-style:italic; font-size:var(--status-font-size); line-height:20px; max-height:var(--action-height); } +fieldset>div.status { line-height:20px; max-height:var(--action-height); } +fieldset>div.status>div.item { font-family:var(--status-font-family); font-style:italic; font-size:var(--status-font-size); } fieldset>div.status>div.item { padding:var(--input-padding); height:30px; } fieldset>div.status>div.item>label { font-size:var(--status-font-size); } fieldset>div.status>div.item>span { margin-left:var(--input-padding); } @@ -685,8 +688,8 @@ fieldset.plugin>form.option>div.item.text.path>input { width:var(--project-width div.item.text.limit>input { width:var(--button-width); } div.item.text.offend>input { width:var(--button-width); } body:not(.width2):not(.mobile) fieldset.plugin>form.option>div.item.text.path>input { width:var(--project-width); } -body:not(.width2) fieldset.plugin>div.action>div.item.text.filter>input { width:var(--input-width); transition:all 1.2s; } -body:not(.width2) fieldset.plugin>div.action>div.item.text.filter>input:focus { width:var(--project-width); transition:all 0.5s; } +body:not(.width2) fieldset>div.action>div.item.text.filter>input { width:var(--input-width); transition:all 1.2s; } +body:not(.width2) fieldset>div.action>div.item.text.filter>input:focus { width:var(--project-width); transition:all 0.5s; } div.item.text.will>input { border:var(--box-notice); } div.item.text>i:first-child { color:var(--disable-fg-color); position:absolute; left:0; padding:var(--input-padding); } div.item.text:hover>i:first-child { color:unset; } diff --git a/lib/page.js b/lib/page.js index b0115471..2fef3277 100644 --- a/lib/page.js +++ b/lib/page.js @@ -389,7 +389,7 @@ Volcanos("page", { // if (can.page.unicode[name]) { return {text: [can.page.unicode[name], "", "icon"]} } if (name == mdb.DELETE) { return {icon: "bi bi-trash"} } if (can.base.beginWith(name, "bi ")) { return {icon: name} } - var _icon = can.Conf("_icons."+name)||can.Conf("_trans.icons."+name)||can.core.Value(can.onaction, ["_trans.icons."+name])||icon[name]; + var _icon = can.base.getValid(can.Conf("_icons."+name), can.Conf("_trans.icons."+name), can.core.Value(can.onaction, ["_trans.icons."+name]), icon[name]) if (_icon) { return {icon: _icon} } }, requireChina: function(can, title, list, name, path) { diff --git a/plugin/local/team/plan.css b/plugin/local/team/plan.css index 6a827e4b..64fb1f03 100644 --- a/plugin/local/team/plan.css +++ b/plugin/local/team/plan.css @@ -15,7 +15,7 @@ fieldset.plan>div.output>div.layout>div.layout>div.content>table.content td div. fieldset.plan>div.output>div.layout>div.layout>div.content>table.content td div.finish { background-color:#8080809c; } fieldset.plan>div.output>div.layout>div.layout>div.content>table.content tr:first-child { height:30px; position:sticky; top:2px; z-index:1; } fieldset.plan>div.output>div.layout>div.layout>div.content>table.content thead tr:first-child { z-index:2; } -fieldset.plan>div.output>div.layout>div.layout>div.content>table.content th:first-child { width:40px; position:sticky; left:2px; } +fieldset.plan>div.output>div.layout>div.layout>div.content>table.content th:first-child { width:40px; position:sticky; left:2px; z-index:1; } fieldset.plan>div.output>div.layout>div.layout>div.profile>table.content tr:first-child { height:30px; position:sticky; top:2px; } fieldset.plan>div.output>fieldset.plug { position:absolute; } fieldset.plan.story>form.option>div.item.scale { display:none; } diff --git a/plugin/state.js b/plugin/state.js index 6268cb0f..ba11ace0 100644 --- a/plugin/state.js +++ b/plugin/state.js @@ -346,6 +346,7 @@ Volcanos(chat.ONEXPORT, { var args = can.Option(); args.pod = can.ConfSpace()||can.misc.Search(can, ice.POD), args.cmd = can.ConfIndex() can.core.Item(args, function(key, value) { key != ice.POD && !value && delete(args[key]) }) var hash = can.misc.localStorage(can, [args.pod, args.cmd, "hash"])||"" + can.base.isArray(hash) && (hash = hash.join(":")) hash && (hash = "#"+hash) return can.misc.MergePodCmd(can, args, true)+hash }, diff --git a/plugin/table.js b/plugin/table.js index 4c610c56..2354209e 100644 --- a/plugin/table.js +++ b/plugin/table.js @@ -231,7 +231,7 @@ Volcanos(chat.ONIMPORT, {_init: function(can, msg, target, cb) { }) } else { can.onappend.table(can, msg), can.onappend.board(can, msg) } }, function() { delete(value._tabs), can.onmotion.cacheClear(can, value._hash, can.ui.content, can.ui.profile, can.ui.display) }) }, - tool: function(can, list, cb, target, status) { target = target||can._output, status = status||can._status + tool: function(can, list, cb, target, status) { target = target||can._status, status = status||can._status var height = can.base.Max(html.PLUG_HEIGHT, can.ConfHeight()-3*html.ACTION_HEIGHT, 240), width = can.base.Max(html.PLUG_WIDTH, can.ConfWidth()-(can.user.isMobile? 0: html.PROJECT_WIDTH)) can.core.Next(list.reverse(), function(meta, next) { can.base.isString(meta) && (meta = {index: meta}), meta.mode = html.FLOAT can.onimport.plug(can, meta, function(sub) { @@ -243,7 +243,8 @@ Volcanos(chat.ONIMPORT, {_init: function(can, msg, target, cb) { can.page.Remove(can, sub._target), can.page.Remove(can, sub._legend), can.onexport.tool(can), can.onkeymap.prevent(event) }}]), sub._legend._target = sub._target, sub._legend._meta = {index: meta.index} status.appendChild(sub._legend), sub._legend.oncontextmenu = sub._legend.onclick, sub._legend.onclick = function(event) { can.misc.Event(event, can, function(msg) { - if (can.page.SelectOne(can, status, nfs.PT+html.SELECT, function(target) { can.onmotion.hidden(can, target._target), can.page.ClassList.del(can, target, html.SELECT); return target }) == sub._legend) { return } + if (can.page.SelectOne(can, status, "legend.select", function(target) { + can.onmotion.hidden(can, target._target), can.page.ClassList.del(can, target, html.SELECT); return target }) == sub._legend) { return } can.onmotion.select(can, status, html.LEGEND, sub._legend), can.onmotion.toggle(can, sub._target, true) can.onmotion.select(can, target, html.FIELDSET_PLUG, sub._target) sub.onimport.size(sub, sub.ConfHeight(), sub.ConfWidth(), false)