From 6fa53f36b53cf28cc6be7fd95596f3109cf33c4a Mon Sep 17 00:00:00 2001 From: shy Date: Thu, 25 Jan 2024 15:02:59 +0800 Subject: [PATCH] add some --- frame.js | 7 +++++++ index.css | 6 +++++- panel/header.css | 2 +- plugin/local/code/inner.css | 2 +- plugin/table.js | 9 ++++++--- 5 files changed, 20 insertions(+), 6 deletions(-) diff --git a/frame.js b/frame.js index 2eecad35..fdd7145f 100644 --- a/frame.js +++ b/frame.js @@ -407,6 +407,13 @@ Volcanos(chat.ONAPPEND, {_init: function(can, meta, list, cb, target, field) { }) }, _init: function(target) { can.page.style(can, target, html.WIDTH, (select.offsetWidth||80)+30), can.onappend.style(can, html.HIDE, select) }}, {icon: mdb.SELECT}]) }, + label: function(can, value, icons) { + return {view: html.STATUS, list: can.core.Item(icons||{version: "bi bi-tags", time: "bi bi-clock-history"}, function(name, icon) { var text = value[name] + if (name == nfs.VERSION) { text = value.version.split("-").slice(0, 2).join("-") } + if (name == mdb.TIME) { text = can.base.TimeTrim(value[name]) } + return value[name] && {view: [[html.ITEM]], list: [{icon: icon}, {text: text}]} + })} + }, checkbox: function(can, table, msg) { can.page.Select(can, table, "tr>th:first-child,tr>td:first-child", function(target) { can.page.insertBefore(can, [{type: target.tagName, list: [{type: html.INPUT, data: {type: html.CHECKBOX}, onchange: function(event) { diff --git a/index.css b/index.css index 8f3622d3..fbcaef9d 100644 --- a/index.css +++ b/index.css @@ -146,6 +146,9 @@ fieldset>div.action div.item.select:not(.cmds) { border-radius:var(--button-radi fieldset>div.action div.item.select.cmds { border-bottom:var(--notice-bg-color) solid 2px; height:var(--action-height); } fieldset>div.output { width:100%; } fieldset>div.status { width:100%; } +div.title>div.status { margin-top:var(--input-margin); } +div.title>div.status>div.item { color:var(--disable-fg-color); font-size:var(--status-font-size); font-weight:normal; float:left; margin-right:var(--button-margin); } +div.title>div.status>div.item>i { margin-right:var(--input-margin); } fieldset.rich>div.output>table.content { font-family:var(--code-font-family); } fieldset.input>legend { display:none; } fieldset.input.key>div.output>div.item:not(.hide) { display:flex; align-items:center; } @@ -291,7 +294,8 @@ div.item.text.line>input { width:var(--button-width) !important; } div.item.text.limit>input { width:var(--button-width); } div.item.text.offend>input { width:var(--button-width); } div.item.text.will>input { border:var(--box-notice); } -div.item.text>i:first-child { position:absolute; left:var(--input-padding); padding:var(--input-padding); } +/* div.item.text>i:first-child { position:absolute; left:var(--input-padding); padding:var(--input-padding); } */ +div.item.text>i:first-child { position:absolute; left:0; padding:var(--input-padding); } div.item.text>span.icon { font-size:var(--icon-font-size); padding:var(--input-padding); position:absolute; right:0; visibility:hidden; } div.item.text:hover>span.icon { visibility:visible; } div.item.button { position:relative; height:var(--action-height); } diff --git a/panel/header.css b/panel/header.css index 5cea2eb1..497a14f0 100644 --- a/panel/header.css +++ b/panel/header.css @@ -18,7 +18,7 @@ fieldset.Header>div.output div.item.avatar { padding:0; } fieldset.Header>div.output div.item.avatar>img { height:var(--header-height); clip-path:circle(40%); } fieldset.Header>div.output div.state { float:right; } fieldset.Header>div.output div.search.title { padding:7px 5px; margin-left:15px; } -fieldset.Header>div.output div.search>i { padding:7px; } +fieldset.Header>div.output div.search>i { padding:7px; left:3px; } fieldset.Header>div.output div.search>input { padding-left:25px; } fieldset.Header>div.output div.search>span.icon { padding:var(--input-padding) var(--button-padding); } fieldset.Header>div.output div.Action>div.tabs { padding-left:40px; height:100%; overflow:auto; } diff --git a/plugin/local/code/inner.css b/plugin/local/code/inner.css index 3ac27140..80b0e1a1 100644 --- a/plugin/local/code/inner.css +++ b/plugin/local/code/inner.css @@ -41,7 +41,7 @@ fieldset.inner.cmd>div.output>div.layout>div.tabs>div.icon>div.icon { font-size: fieldset.inner.cmd>div.output>div.layout>div.tabs>div.tabs { justify-content:flex-start; flex-grow:1; flex-wrap:wrap; overflow:auto; } fieldset.inner.cmd>div.output>div.layout>div.tabs>div.tabs:hover { background-color:unset; } fieldset.inner.cmd>div.output>div.layout>div.tabs>div.tabs>div.tabs { padding:var(--input-padding) var(--button-padding); height:var(--code-tabs-height); display:flex; align-items:center; } -fieldset.inner.cmd>div.output>div.layout>div.tabs>div.head>div { white-space:pre; padding:10px; height:var(--code-tabs-height); } +fieldset.inner.cmd>div.output>div.layout>div.tabs>div.head>div { white-space:pre; padding:10px; } fieldset.inner.cmd>div.output>div.layout>div.tabs>div.head>div.avatar { padding:0; } fieldset.inner.cmd>div.output>div.layout>div.tabs>div.head>div.avatar>img { height:var(--code-tabs-height); clip-path:circle(40%); } fieldset.inner.cmd>div.output>div.layout>div.path:not(.hide) { display:flex; } diff --git a/plugin/table.js b/plugin/table.js index 74700889..b057e314 100644 --- a/plugin/table.js +++ b/plugin/table.js @@ -9,13 +9,16 @@ Volcanos(chat.ONIMPORT, {_init: function(can, msg, target) { } }, card: function(can, msg, target) { can.sup.onexport.outputMargin = function() { return 200 } - can.page.Appends(can, target||can._output, msg.Table(function(value) { value.icon = value.icon||value.image + can.page.Appends(can, target||can.ui.content||can._output, msg.Table(function(value) { value.icon = value.icon||value.image return {view: [[html.ITEM, value.type, value.status]], list: [ - {view: [wiki.TITLE, html.DIV], list: [value.icon && {img: can.misc.Resource(can, value.icon, value.type == web.MASTER? "": value.name)}, {text: value.name}]}, + {view: [wiki.TITLE, html.DIV], list: [ + value.icon && {img: can.misc.Resource(can, value.icon, value.type == web.MASTER? "": value.name)}, + {view: wiki.TITLE, list: [{text: value.name}, can.onappend.label(can, value)]}, + ]}, {view: [wiki.CONTENT, html.DIV, value.text]}, {view: html.ACTION, inner: value.action, _init: function(target) { can.onappend.mores(can, target, value, 5) }}, ]} - })), can.onimport.layout = function() { can.onlayout.expand(can, can._output, 320) }, can.onappend.scroll(can, can._output) + })), can.onimport.layout = can.onimport.layout||function() { can.onlayout.expand(can, can._output, 320) }, can.onappend.scroll(can, can._output) }, _vimer_zone: function(can, msg, target) { msg.Table(function(value) { var action = can.page.parseAction(can, value) can.onimport.item(can, {icon: can.misc.Resource(can, value.icon||value.avatar_url), name: can.page.Color(value[can.Conf(mdb.FIELD)||mdb.VIEW]||value[mdb.NAME]||value[mdb.TEXT]||value[mdb.TYPE]), title: value[mdb.TEXT]||value.description}, function(event) {