diff --git a/frame.js b/frame.js index 2c902f70..cf5dfaeb 100644 --- a/frame.js +++ b/frame.js @@ -275,10 +275,11 @@ Volcanos(chat.ONAPPEND, {_init: function(can, meta, list, cb, target, field) { if (sub.onimport && can.base.isArray(sub.onimport.list) && sub.onimport.list.length > 0) { can.onmotion.clear(can, can._option), can.onappend._option(can, {inputs: can.page.inputs(can, sub.onimport.list, html.TEXT) }) } - can.page.ClassList.del(can, sub._fields, "form") sub.db.hash = can.isCmdMode()? can.misc.SearchHash(can): [] - sub._output.className = html.OUTPUT, can.onappend.style(can, sub._args.style, can._output) + can.page.ClassList.del(can, sub._fields, html.FORM) + delete(can._status._cache), delete(can._status._cache_key) can.page.style(can, can._output, html.HEIGHT, can._output.offsetHeight) + sub._output.className = html.OUTPUT, can.onappend.style(can, sub._args.style, can._output) can.onexport._output(sub, msg), sub.Mode() != ice.MSG_RESULT && can.onmotion.clear(can, output) can.core.CallFunc([sub, chat.ONIMPORT, chat._INIT], {can: sub, msg: msg, cb: function(msg) { if (action !== false) { can.onkeymap._build(sub) diff --git a/index.css b/index.css index eea2afb3..92625d68 100644 --- a/index.css +++ b/index.css @@ -420,7 +420,7 @@ div.output.card>div.item { div.output.card>div.item.stop { color:var(--disable-fg-color); } div.output.card>div.item>div.title { font-size:var(--legend-font-size); font-weight:bold; padding-bottom:var(--input-padding); border-bottom:var(--box-border); display:flex; align-items:center; overflow:hidden; } div.output.card>div.item>div.title>img { margin-right:var(--button-margin); margin-left:0; height:var(--header-height); width:var(--header-height); float:left; } -div.output.card>div.item>div.content { font-size:var(--status-font-size); padding:var(--input-padding); height:var(--header-height); } +div.output.card>div.item>div.content { white-space:pre; font-size:var(--status-font-size); padding:var(--input-padding); height:var(--header-height); } div.output.card>div.item>div.action { text-align:right; width:100%; display:flex; position:absolute; bottom:var(--plugin-padding); } div.output.card>div.item>div.action>input { padding:0 var(--button-padding); margin-right:var(--input-margin); box-shadow:var(--box-shadow); } div.output.stats { flex-wrap:wrap; } diff --git a/lib/user.js b/lib/user.js index 958e79ab..6fd32d06 100644 --- a/lib/user.js +++ b/lib/user.js @@ -278,8 +278,8 @@ Volcanos("user", { can.page.Append(can, ui.display, [{text: ["或第三方授权: ", html.LABEL]}, {view: [["sso", html.FLEX]], list: _msg.Table(function(value) { return value.type == "oauth" && {view: [[html.ITEM, html.FLEX]], title: "点击跳转,授权登录", list: [{img: can.misc.Resource(can, value.icons)}, {text: value.name}], onclick: function() { can.user.jumps(value.link) }} }) }]) - can.page.style(can, ui._target, {left: (can.page.width()-ui._target.offsetWidth)/2, top: can.page.height() < 640? (can.page.height()-ui._target.offsetHeight)/2: - (can.page.height()-ui._target.offsetHeight-html.HEADER_HEIGHT-html.ACTION_HEIGHT)/4+html.HEADER_HEIGHT}) + can.page.style(can, ui._target, {left: (can.page.width()-ui._target.offsetWidth)/2, + top: can.page.height() < 640? (can.page.height()-ui._target.offsetHeight)/2: (can.page.height()-ui._target.offsetHeight-html.HEADER_HEIGHT-html.ACTION_HEIGHT)/4+html.HEADER_HEIGHT}) cb && cb(); return true } else if (cmd == ice.MSG_SESSID) { if (!can.misc.CookieSessid(can, arg[0])) { can.user.info.sessid = arg[0] } check(), cb && cb(); return true } }) @@ -295,10 +295,7 @@ Volcanos("user", { }}, avatar: {view: [[html.ITEM, "state", aaa.AVATAR]], list: [{img: can.user.info.avatar}], onclick: function(event) { header && header.onaction.avatar(event, header) }}, usernick: {view: [[html.ITEM, "state", aaa.USERNICK, html.FLEX], "", can.user.info.usernick], onclick: function(event) { header && header.onaction.usernick(event, header) }}, - qrcode: {view: [[html.ITEM, "state", cli.QRCODE]], list: [{icon: icon.qrcode}], onclick: function(event) { - var _can = can._fields? can.sup: can; _can.onaction["生成链接"](event, _can) - // can._root.Header.onaction.qrcode(event, can._root.Header) - }}, + qrcode: {view: [[html.ITEM, "state", cli.QRCODE]], list: [{icon: icon.qrcode}], onclick: function(event) { var _can = can._fields? can.sup: can; _can.onaction["生成链接"](event, _can) }}, }; return can.core.List(can.base.getValid(can.core.List(arguments).slice(1), [html.SPACE, mdb.TIME, aaa.AVATAR, aaa.USERNICK, cli.QRCODE]), function(item) { return meta[item] }) }, email: function(can) {