From bfe33df671fe900cd701a2967d72d40260f34cbb Mon Sep 17 00:00:00 2001 From: shy Date: Thu, 15 Feb 2024 19:12:07 +0800 Subject: [PATCH] add some --- index.css | 2 +- lib/misc.js | 7 +++++-- plugin/state.js | 4 ++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/index.css b/index.css index 8f2489a9..7ea02f57 100644 --- a/index.css +++ b/index.css @@ -692,7 +692,7 @@ fieldset.web.code.git.status>div.output table.content { width:100%; } fieldset.web.wiki.word>div.output>fieldset.story:not(.full) { margin:var(--title-margin) 0; } fieldset.web.wiki.word>div.output fieldset.story:not(.float):not(.full)>form.option>div.icon.delete { display:none; } fieldset.web.chat.script>div.output>fieldset.story { margin-top:20px; } -fieldset.web.chat.script>div.output>table.content { position:sticky; top:2px; } +/* fieldset.web.chat.script>div.output>table.content { position:sticky; top:2px; } */ fieldset.web.chat.location>div.output>div.layout>div.layout { position:relative; } fieldset.web.chat.location>div.output .amap-toolbar { z-index:unset; } fieldset.web.chat.location>div.output .amap-controls { z-index:unset; } diff --git a/lib/misc.js b/lib/misc.js index 94a26c1c..d4279620 100644 --- a/lib/misc.js +++ b/lib/misc.js @@ -174,7 +174,7 @@ Volcanos("misc", { res.Option(ice.LOG_TRACEID, msg.Option(ice.LOG_TRACEID)) res.Option(ice.MSG_DEBUG, msg.Option(ice.MSG_DEBUG)) socket.send(JSON.stringify(res)) - }, msg.detail = data.detail, msg.Copy(data) + }, msg.detail = data.detail||[], msg.Copy(data) try { msg.Option(ice.LOG_DISABLE) != ice.TRUE && can.misc.Log(html.WSS, ice.MSG_DETAIL, msg.detail, msg, _msg) can.core.CallFunc(cb, {event: event, msg: msg, cmd: msg.detail[0], arg: msg.detail.slice(1), cb: function() { msg.Reply() }}) } catch (e) { can.misc.Warn(e), msg.Reply() } @@ -281,7 +281,10 @@ Volcanos("misc", { console.log.apply(console, args), this._signal(args) }, Info: function() { var args = this._args(log.INFO, arguments); console.info.apply(console, args), this._signal(args) }, - Warn: function() { var args = this._args(log.WARN, arguments); console.warn.apply(console, args), this._signal(args); debugger }, + Warn: function() { + var args = this._args(log.WARN, arguments); console.warn.apply(console, args), this._signal(args); + // debugger + }, Error: function() { var args = this._args(log.ERROR, arguments); args.push(lex.NL, this._stacks().slice(1).join(lex.NL)), console.error.apply(console, args), this._signal(args); debugger }, Debug: function() { var args = this._args(log.DEBUG, arguments); args.push(lex.NL, this._stacks().slice(1, 4).join(lex.NL)), console.debug.apply(console, args), this._signal(args) }, Trace: function() { var output = false diff --git a/plugin/state.js b/plugin/state.js index a773bf80..ed1b8d46 100644 --- a/plugin/state.js +++ b/plugin/state.js @@ -44,7 +44,7 @@ Volcanos(chat.ONIMPORT, { (sub._rich_list = sub._rich_list||[]).push(msg); if (sub._rich_list.length > 1) { return } } var height = can.onexport.outputHeight(can) - can.onappend.plugin(can, {title: can.core.Keys(can.ConfSpace(), msg.Option(ice.MSG_TITLE)||"table.js"), index: "can._filter", height: height, style: "rich"}, function(sub) { + can.onappend.plugin(can, {title: can.core.Keys(msg.Option(ice.MSG_TITLE)||"table.js"), index: "can._filter", height: height, style: "rich"}, function(sub) { sub.onexport.output = function() { can.page.style(can, sub._output, html.HEIGHT, "", html.MAX_HEIGHT, "") can.sub._rich = sub.sub, _rich(), can.onmotion.scrollIntoView(can, sub._target) @@ -71,7 +71,7 @@ Volcanos(chat.ONIMPORT, { (can.sub._grow_list = can.sub._grow_list||[]).push(msg); if (can.sub._grow_list.length > 1) { return } } var height = can.onexport.outputHeight(can) - can.onappend.plugin(can, {title: can.core.Keys(can.ConfSpace(), msg.Option(ice.MSG_TITLE)||msg.Option(ctx.DISPLAY).split(nfs.PS).pop()), index: "can._filter", display: msg.Option(ctx.DISPLAY), height: height}, function(sub) { + can.onappend.plugin(can, {title: can.core.Keys(msg.Option(ice.MSG_TITLE)||msg.Option(ctx.DISPLAY).split(nfs.PS).pop()), index: "can._filter", display: msg.Option(ctx.DISPLAY), height: height}, function(sub) { sub.onexport.output = function() { can.onmotion.scrollIntoView(can, sub._target), can.sub._grow = sub.sub, _grow() } }); return }