diff --git a/const.js b/const.js index c382427e..b716e980 100644 --- a/const.js +++ b/const.js @@ -452,6 +452,7 @@ var icon = { qrcode: "bi bi-qr-code", main: "bi bi-house-door", top: "bi bi-globe", configs: "bi bi-gear", config: "bi bi-gear", conf: "bi bi-gear", logs: "bi bi-calendar4-week", tag: "bi bi-tags", + data: "bi bi-database", branch: "bi bi-diagram-3", commit: "bi bi-hash", message: "bi bi-wechat", diff --git a/frame.js b/frame.js index 06eea0d9..cef0ee52 100644 --- a/frame.js +++ b/frame.js @@ -271,7 +271,7 @@ Volcanos(chat.ONAPPEND, {_init: function(can, meta, list, cb, target, field) { }), item), "", action) }) var _can = can._fields? can.sup: can - can.base.beginWith(can.ConfIndex(), "can.", "web.chat.macos.") || + can.isCmdMode() || can.base.beginWith(can.ConfIndex(), "can.", "web.chat.macos.") || can.page.tagis(can._fields||can._target, html.FIELDSET_PANEL) || action == can._action && can.page.Append(can, action, can.core.Item(can.user.isMobile? { open: !can.isCmdMode() && "打开链接", @@ -431,9 +431,10 @@ Volcanos(chat.ONAPPEND, {_init: function(can, meta, list, cb, target, field) { }}) if (item.name == html.FILTER) { item.icon = item.icon||icon.search } item.icon = item.icon||can.Conf(["_icons", item.name])||icon[item.name] - } if (item.range) { input._init = function(target) { can.onappend.figure(can, item, target, function(sub, value, old) { target.value = value, can.core.CallFunc([can.onaction, item.name], [event, can, item.name]) }) } } + } + if (item.range) { input._init = function(target) { can.onappend.figure(can, item, target, function(sub, value, old) { target.value = value, can.core.CallFunc([can.onaction, item.name], [event, can, item.name]) }) } } var _style = can.page.buttonStyle(can, item.name) - var _input = can.page.Append(can, target, [{view: [[html.ITEM].concat(style, [item.type, item.name, item._className, html.FLEX , item.icon? "_icon": ""], _style)], list: [item.icon && {icon: item.icon}, input].concat(_icon), _init: function(target, _input) { + var _input = can.page.Append(can, target, [{view: [[html.ITEM].concat(style, [item.type, item.name, item._className, html.FLEX, item.icon? "_icon": ""], _style)], list: [item.icon && {icon: item.icon}, input].concat(_icon), _init: function(target, _input) { if (item.type == html.SELECT) { _input.select.value = value||_item.value||_item.values[0] can.onappend.select(can, _input.select, _item) diff --git a/index.css b/index.css index f6e15265..333c41d4 100644 --- a/index.css +++ b/index.css @@ -458,6 +458,7 @@ div.plug>legend.select { background-color:var(--plugin-bg-color); border-left:va div.complete>table { background-color:var(--plugin-bg-color); } fieldset>form.option>div.item.text.cmd>input { background-color:var(--code-bg-color); color:var(--code-fg-color); } fieldset>div.action div.item.cmds.select { background:var(--output-bg-color); border-top:var(--box-notice3); } +fieldset.desktop fieldset>div.action div.item.cmds.select { border-top:unset; border-bottom:var(--box-notice3); } fieldset>div.action div.item.cmds:hover { background:var(--output-bg-color); } fieldset>div.output { background-color:var(--output-bg-color); } fieldset.panel:not(.main) { background-color:var(--panel-bg-color); color:var(--panel-fg-color); } @@ -635,7 +636,7 @@ div.item.button.create>span.icon { font-size:28px; line-height:26px; height:var( div.item.button.insert>span.icon { font-size:28px; line-height:26px; height:var(--action-height); } div.item.button.refresh>span.icon { font-size:28px; line-height:26px; height:var(--action-height); } body.windows div.item.button.refresh>span.icon { font-size:22px; line-height:30px; } -div.item.button._space.icons { flex-grow:1; } +div.item.button._space.icons { flex-grow:1; min-width:var(--button-margin); } div.item.button._space.icons:hover { background-color:unset; cursor:unset; } fieldset.inner fieldset.story div.item.button._space.icons { margin-left:0; flex-grow:1; } div.tabs>span { font-style:italic; } diff --git a/plugin/input/key.js b/plugin/input/key.js index 2c048dda..b2c4c838 100644 --- a/plugin/input/key.js +++ b/plugin/input/key.js @@ -8,7 +8,7 @@ Volcanos(chat.ONFIGURE, {key: { }) }, _show: function(can, msg, cb, target, name) { - if (msg.Length() == 0 || msg.Length() == 1 && msg.Append(name) == target.value && target.value != "" || msg.Length() == 1 && msg.Append(name) == "") { return can.onmotion.hidden(can) } + if (msg.Length() == 0 || msg.Length() == 1 && msg.Append(name) == target.value && target.value != "") { return can.onmotion.hidden(can) } if (can.base.isIn(msg.append[msg.append.length-1], ctx.ACTION, "cb")) { msg.append = msg.append.slice(0, -1) } var list = {} msg.Option(ice.TABLE_CHECKBOX, "") can.onmotion.clear(can), can.onappend.table(can, msg, function(value, key, index, item) { value = item[key]