feat(sj_1.2.0-beta1): 日志组件新增换行内容折叠
This commit is contained in:
parent
27fb8434ca
commit
916020e1e9
@ -282,14 +282,32 @@ const SnailLogComponent = defineComponent({
|
|||||||
return <></>;
|
return <></>;
|
||||||
}
|
}
|
||||||
const restOfText = throwable.replace(/^.+(\n|$)/m, '');
|
const restOfText = throwable.replace(/^.+(\n|$)/m, '');
|
||||||
return <NCollapseItem title={firstLine[0]} name={message.index}>{`${restOfText}`}</NCollapseItem>;
|
return <NCollapseItem title={firstLine[0]} name={`throwable-${message.index}`}>{`${restOfText}`}</NCollapseItem>;
|
||||||
|
};
|
||||||
|
|
||||||
|
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 (
|
||||||
|
<NCollapseItem title={firstLine[0]} name={`message-${message.index}`}>{` - ${restOfText}`}</NCollapseItem>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
return <div class="pl-6px">- {`${msg}`}</div>;
|
||||||
};
|
};
|
||||||
|
|
||||||
const handleUpdateExpanded = (val: string[]) => {
|
const handleUpdateExpanded = (val: string[]) => {
|
||||||
expandedNames.value = val;
|
expandedNames.value = val;
|
||||||
};
|
};
|
||||||
|
|
||||||
const handleResize = () => {
|
const handleResize = (_: ResizeObserverEntry) => {
|
||||||
expandedNames.value = [];
|
expandedNames.value = [];
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -305,6 +323,7 @@ const SnailLogComponent = defineComponent({
|
|||||||
class="virtual-list"
|
class="virtual-list"
|
||||||
itemSize={85}
|
itemSize={85}
|
||||||
item-resizable
|
item-resizable
|
||||||
|
ignore-item-resize
|
||||||
padding-bottom={16}
|
padding-bottom={16}
|
||||||
items={logList.value}
|
items={logList.value}
|
||||||
scrollbar-props={{ xScrollable: true }}
|
scrollbar-props={{ xScrollable: true }}
|
||||||
@ -322,7 +341,7 @@ const SnailLogComponent = defineComponent({
|
|||||||
<span class="log-hljs-thread mr-12px inline-block">{`[${message.thread}]`}</span>
|
<span class="log-hljs-thread mr-12px inline-block">{`[${message.thread}]`}</span>
|
||||||
</div>
|
</div>
|
||||||
<div class="log-hljs-location">{`${message.location}: `}</div>
|
<div class="log-hljs-location">{`${message.location}: `}</div>
|
||||||
<div class="pl-6px">- {`${message.message}`}</div>
|
<div>{messageComponent(message)}</div>
|
||||||
<div>{throwableComponent(message)}</div>
|
<div>{throwableComponent(message)}</div>
|
||||||
<NDivider />
|
<NDivider />
|
||||||
</pre>
|
</pre>
|
||||||
@ -479,6 +498,14 @@ const SnailLogComponent = defineComponent({
|
|||||||
max-height: calc(100vh - 101px);
|
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) {
|
.n-divider:not(.n-divider--vertical) {
|
||||||
margin-top: 6px;
|
margin-top: 6px;
|
||||||
margin-bottom: 6px;
|
margin-bottom: 6px;
|
||||||
|
Loading…
Reference in New Issue
Block a user