diff --git a/src/components/common/log-drawer.vue b/src/components/common/log-drawer.vue index 4a0652a..f61b735 100644 --- a/src/components/common/log-drawer.vue +++ b/src/components/common/log-drawer.vue @@ -282,14 +282,32 @@ const SnailLogComponent = defineComponent({ return <>; } const restOfText = throwable.replace(/^.+(\n|$)/m, ''); - return {`${restOfText}`}; + return {`${restOfText}`}; + }; + + const messageComponent = (message: Api.JobLog.JobMessage) => { + const msg = message.message; + if (!msg) { + return <>; + } + const firstLine = msg.match(/^.+/m); + if (!firstLine) { + return <>; + } + const restOfText = msg.replace(/^.+(\n|$)/m, '').replaceAll('\n', '\n - '); + if (restOfText) { + return ( + {` - ${restOfText}`} + ); + } + return
- {`${msg}`}
; }; const handleUpdateExpanded = (val: string[]) => { expandedNames.value = val; }; - const handleResize = () => { + const handleResize = (_: ResizeObserverEntry) => { expandedNames.value = []; }; @@ -305,6 +323,7 @@ const SnailLogComponent = defineComponent({ class="virtual-list" itemSize={85} item-resizable + ignore-item-resize padding-bottom={16} items={logList.value} scrollbar-props={{ xScrollable: true }} @@ -322,7 +341,7 @@ const SnailLogComponent = defineComponent({ {`[${message.thread}]`}
{`${message.location}: `}
-
- {`${message.message}`}
+
{messageComponent(message)}
{throwableComponent(message)}
@@ -479,6 +498,14 @@ const SnailLogComponent = defineComponent({ max-height: calc(100vh - 101px); } + .v-vl { + min-height: calc(100vh - 101px); + } + + .v-vl-items { + min-height: calc(100vh - 101px - 16px) !important; + } + .n-divider:not(.n-divider--vertical) { margin-top: 6px; margin-bottom: 6px;