style(sj_1.1.0-beta3): 修复页面异常样式

This commit is contained in:
xlsea 2024-07-13 09:33:09 +08:00
parent 3317040c0c
commit 7e8195d7f9
4 changed files with 21 additions and 23 deletions

View File

@ -267,7 +267,7 @@ const SnailLogComponent = defineComponent({
> >
{{ {{
default: ({ item: message }: { item: Api.JobLog.JobMessage }) => ( default: ({ item: message }: { item: Api.JobLog.JobMessage }) => (
<pre key={message.time_stamp} class="h-85px"> <pre key={message.time_stamp} class="min-h-85px">
<div> <div>
<span class="log-hljs-time inline-block">{timestampToDate(message.time_stamp)}</span> <span class="log-hljs-time inline-block">{timestampToDate(message.time_stamp)}</span>
<span <span
@ -277,10 +277,8 @@ 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> <div class="pl-6px">- {`${message.message}`}</div>
<span class="pl-6px">- {`${message.message}`}</span> <div>{throwableComponent(message.throwable)}</div>
{throwableComponent(message.throwable)}
</div>
<NDivider /> <NDivider />
</pre> </pre>
) )
@ -494,4 +492,8 @@ const SnailLogComponent = defineComponent({
.tool-header { .tool-header {
width: calc(50vw - 72px); width: calc(50vw - 72px);
} }
:deep(.n-collapse-item__content-inner) {
padding-top: 0 !important;
}
</style> </style>

View File

@ -46,12 +46,13 @@ const { columnChecks, columns, data, getData, loading, mobilePagination, searchP
}, },
columns: () => [ columns: () => [
{ {
type: 'selection' type: 'selection',
width: 30
}, },
{ {
key: 'id', key: 'id',
align: 'center', align: 'center',
width: 120, width: 60,
title: () => { title: () => {
return ( return (
<div class="flex-center"> <div class="flex-center">
@ -87,7 +88,7 @@ const { columnChecks, columns, data, getData, loading, mobilePagination, searchP
key: 'groupName', key: 'groupName',
title: $t('page.jobBatch.groupName'), title: $t('page.jobBatch.groupName'),
align: 'left', align: 'left',
minWidth: 120 width: 120
}, },
{ {
key: 'taskType', key: 'taskType',
@ -114,19 +115,19 @@ const { columnChecks, columns, data, getData, loading, mobilePagination, searchP
key: 'jobName', key: 'jobName',
title: $t('page.jobBatch.jobName'), title: $t('page.jobBatch.jobName'),
align: 'center', align: 'center',
minWidth: 120 width: 120
}, },
{ {
key: 'executionAt', key: 'executionAt',
title: $t('page.jobBatch.executionAt'), title: $t('page.jobBatch.executionAt'),
align: 'center', align: 'center',
minWidth: 120 width: 120
}, },
{ {
key: 'taskBatchStatus', key: 'taskBatchStatus',
title: $t('page.jobBatch.taskBatchStatus'), title: $t('page.jobBatch.taskBatchStatus'),
align: 'center', align: 'center',
minWidth: 120, width: 120,
render: row => { render: row => {
if (row.taskBatchStatus === null) { if (row.taskBatchStatus === null) {
return null; return null;
@ -147,7 +148,7 @@ const { columnChecks, columns, data, getData, loading, mobilePagination, searchP
key: 'operationReason', key: 'operationReason',
title: $t('page.jobBatch.operationReason'), title: $t('page.jobBatch.operationReason'),
align: 'center', align: 'center',
minWidth: 120, width: 120,
render: row => { render: row => {
if (row.operationReason === null) { if (row.operationReason === null) {
return null; return null;
@ -161,13 +162,13 @@ const { columnChecks, columns, data, getData, loading, mobilePagination, searchP
key: 'createDt', key: 'createDt',
title: $t('common.createDt'), title: $t('common.createDt'),
align: 'center', align: 'center',
minWidth: 120 width: 120
}, },
{ {
key: 'operate', key: 'operate',
title: $t('common.operate'), title: $t('common.operate'),
align: 'center', align: 'center',
width: 170, width: 160,
render: row => { render: row => {
const stopBtn = () => { const stopBtn = () => {
if (row.taskBatchStatus === 1 || row.taskBatchStatus === 2) { if (row.taskBatchStatus === 1 || row.taskBatchStatus === 2) {
@ -302,7 +303,7 @@ async function handleStopJob(id: string) {
:columns="columns" :columns="columns"
:data="data" :data="data"
:flex-height="!appStore.isMobile" :flex-height="!appStore.isMobile"
:scroll-x="2000" :scroll-x="1200"
:loading="loading" :loading="loading"
remote remote
:row-key="row => row.id" :row-key="row => row.id"

View File

@ -27,19 +27,14 @@ function search() {
</script> </script>
<template> <template>
<SearchForm :model="model" @search="search" @reset="reset"> <SearchForm btn-span="24 m:9 xl:3" :model="model" @search="search" @reset="reset">
<NFormItemGi span="24 s:12 m:6" :label="$t('page.retryLog.groupName')" path="groupName" class="pr-24px"> <NFormItemGi span="24 s:12 m:6" :label="$t('page.retryLog.groupName')" path="groupName" class="pr-24px">
<SelectGroup v-model:value="model.groupName" clearable /> <SelectGroup v-model:value="model.groupName" clearable />
</NFormItemGi> </NFormItemGi>
<NFormItemGi span="24 s:12 m:6" :label="$t('page.retryLog.sceneName')" path="sceneName" class="pr-24px"> <NFormItemGi span="24 s:12 m:6" :label="$t('page.retryLog.sceneName')" path="sceneName" class="pr-24px">
<SelectScene v-model:value="model.sceneName" :group-name="model.groupName as string" clearable /> <SelectScene v-model:value="model.sceneName" :group-name="model.groupName as string" clearable />
</NFormItemGi> </NFormItemGi>
<NFormItemGi <NFormItemGi span="24 s:12 m:15 l:12 xl:9" :label="$t('page.common.createTime')" path="datetimeRange">
span="24 s:24 m:15 l:12 xl:9"
:label="$t('page.common.createTime')"
path="datetimeRange"
class="pr-24px"
>
<DatetimeRange v-model:value="model.datetimeRange!" /> <DatetimeRange v-model:value="model.datetimeRange!" />
</NFormItemGi> </NFormItemGi>
</SearchForm> </SearchForm>

View File

@ -29,7 +29,7 @@ function search() {
</script> </script>
<template> <template>
<SearchForm :model="model" @search="search" @reset="reset"> <SearchForm btn-span="24 xl:3" :model="model" @search="search" @reset="reset">
<NFormItemGi span="24 s:12 m:6" :label="$t('page.retryLog.groupName')" path="groupName" class="pr-24px"> <NFormItemGi span="24 s:12 m:6" :label="$t('page.retryLog.groupName')" path="groupName" class="pr-24px">
<SelectGroup v-model:value="model.groupName" clearable /> <SelectGroup v-model:value="model.groupName" clearable />
</NFormItemGi> </NFormItemGi>