diff --git a/const.js b/const.js index a2989698..494bc3a5 100644 --- a/const.js +++ b/const.js @@ -423,7 +423,9 @@ var icon = { path: "bi bi-folder2", file: "bi bi-file-earmark-text", line: "bi bi-sort-numeric-down", key: "bi bi-hash", hash: "bi bi-hash", zone: "bi bi-diagram-3", id: "bi bi-sort-numeric-down", - branch: "bi bi-diagram-3", commit: "bi bi-hash", message: "bi bi-info-square", + branch: "bi bi-diagram-3", commit: "bi bi-hash", + // message: "bi bi-info-square", + message: "bi bi-wechat", domain: "bi bi-globe", "client.name": "bi bi-globe", machine: "bi bi-pc-display", port: "bi bi-hash", arch: "bi bi-cpu", os: "bi bi-ubuntu", diff --git a/frame.js b/frame.js index 51254421..ab07b9ad 100644 --- a/frame.js +++ b/frame.js @@ -699,10 +699,12 @@ Volcanos(chat.ONAPPEND, {_init: function(can, meta, list, cb, target, field) { value.meta && value.meta._init && value.meta._init(sub, meta), _cb(sub, meta, skip) }, target, field); return true } } if (_plugin(meta)) { return res } - can.runAction(can.request({}, {_method: http.GET, pod: meta.space, _failure: function() { + can.runAction(can.request({}, meta._commands, {_method: http.GET, pod: meta.space, _failure: function() { return can.misc.isDebug(can) && can.misc.Warn("not found", meta.index), _plugin({type: meta.type, index: "can._notfound", args: [meta.index, meta.space]}) }})._caller(), ctx.COMMAND, [meta.index], function(msg) { if (msg.Length() == 0) { return msg._failure() } - msg.Table(function(value) { can.onappend._plugin(can, value, meta, _cb, target, field) }) + msg.Table(function(value) { + value._prefix = msg["_prefix"] + can.onappend._plugin(can, value, meta, _cb, target, field) }) }); return res }, _plugin: function(can, value, meta, cb, target, field) { can.base.Copy(meta, value, true) @@ -715,7 +717,11 @@ Volcanos(chat.ONAPPEND, {_init: function(can, meta, list, cb, target, field) { if (can.base.isFunc(value)) { can.onengine._plugin(event, can._root, can.request(event), value.can, [meta.index].concat(cmds), cb) } else { - can.runActionCommand(sub.request(event, {pod: meta.space}), sub._index, cmds, cb) + if (value._prefix) { + can.run(sub.request(event, {pod: meta.space}), value._prefix.concat(cmds), cb) + } else { + can.runActionCommand(sub.request(event, {pod: meta.space}), sub._index, cmds, cb) + } } }, sub._index = value.index||meta.index, can.base.isFunc(cb) && cb(sub, meta, skip) if (meta.style == html.FLOAT || value.style == html.FLOAT) { can.onmotion.float(sub) } diff --git a/index.css b/index.css index d861cf5d..a97cb99a 100644 --- a/index.css +++ b/index.css @@ -458,7 +458,7 @@ div.profile:not(.toggle) { border-left:var(--box-border); } div.display:not(.toggle) { border-top:var(--box-border); } fieldset>div.status { border-top:var(--status-border); } /* border-radius */ -legend { border-top-left-radius:var(--button-radius); } +legend { border-top-left-radius:var(--plugin-radius); } select { border-radius:var(--button-radius); } input[type=button] { border-radius:var(--button-radius); } fieldset>form.option>div.item.select { border-radius:var(--button-radius); } @@ -539,9 +539,9 @@ fieldset>legend>i { margin-right:var(--input-margin); } form.option>div.item.icon { position:relative; height:var(--action-height); overflow:hidden; user-select:none; } form.option>div.item.icon { font-size:var(--icon-font-size); padding:0 var(--input-padding); } form.option>div.item.icon.menu { font-size:28px; line-height:24px; display:flex; align-items:flex-start; display:none; } -form.option>div.item.icon.refresh { font-size:28px; line-height:24px; display:flex; align-items:flex-start; } -form.option>div.item.icon.goback { font-size:28px; line-height:24px; display:flex; align-items:flex-start; } -form.option>div.icon.delete { font-size:20px; line-height:32px; display:flex; align-items:flex-start; } +form.option>div.item.icon.refresh { font-size:28px; line-height:26px; display:flex; align-items:flex-start; } +form.option>div.item.icon.goback { font-size:28px; line-height:26px; display:flex; align-items:flex-start; } +form.option>div.icon.delete { font-size:20px; line-height:30px; display:flex; align-items:flex-start; } form.option>div.item.icon.play { font-size:16px; } body.windows form.option>div.item.icon.delete { line-height:31px; display:flex; align-items:flex-start; } body.windows form.option>div.item.icon.menu { font-size:22px; line-height:32px; }