Skip to content

Commit 4f29f3a

Browse files
author
zhangtao
committed
refactor(web): 详情弹窗取消整体滚动,长内容独立滚动
1 parent 4bd0e7f commit 4f29f3a

9 files changed

Lines changed: 147 additions & 149 deletions

File tree

‎frontend/web/src/components/modal/fa-dialog/index.vue‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -160,9 +160,7 @@ onUnmounted(() => window.removeEventListener("keydown", onKeydown));
160160
161161
const dialogClass = computed(() => {
162162
const a = attrs.class;
163-
return [props.dialogClass, a, props.formMode === "detail" ? "fa-dialog-detail-scroll" : ""].filter(
164-
Boolean
165-
);
163+
return [props.dialogClass, a].filter(Boolean);
166164
});
167165
168166
const visible = computed({

‎frontend/web/src/styles/element-plus/_overrides.scss‎

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -151,36 +151,6 @@ html.dark .el-card {
151151
padding: 16px !important;
152152
}
153153

154-
// 详情弹窗统一限制高度,使用浏览器原生纵向滚动(不再套 ElScrollbar)
155-
// 原生滚动条沿用主题色,保持与 ElScrollbar 一致的视觉
156-
.el-dialog.fa-dialog-detail-scroll .el-dialog__body {
157-
max-height: 70vh;
158-
overflow-y: auto;
159-
overscroll-behavior: contain;
160-
scrollbar-width: thin;
161-
scrollbar-color: var(--theme-color) transparent;
162-
163-
&::-webkit-scrollbar-thumb {
164-
background-color: var(--theme-color) !important;
165-
}
166-
167-
&::-webkit-scrollbar-thumb:hover {
168-
background-color: color-mix(in srgb, var(--theme-color) 80%, black) !important;
169-
}
170-
}
171-
172-
.dark .el-dialog.fa-dialog-detail-scroll .el-dialog__body {
173-
scrollbar-color: color-mix(in srgb, var(--theme-color) 55%, transparent) transparent;
174-
175-
&::-webkit-scrollbar-thumb {
176-
background-color: color-mix(in srgb, var(--theme-color) 55%, transparent) !important;
177-
}
178-
179-
&::-webkit-scrollbar-thumb:hover {
180-
background-color: color-mix(in srgb, var(--theme-color) 75%, transparent) !important;
181-
}
182-
}
183-
184154
.el-dialog__footer {
185155
padding: 8px 16px 16px !important;
186156
border-top: 1px solid var(--fa-gray-200);

‎frontend/web/src/views/module_ai/memory/index.vue‎

Lines changed: 28 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -83,38 +83,41 @@
8383
>
8484
<template v-if="dialogVisible.type === 'detail'">
8585
<div class="session-detail-body">
86-
<FaDescriptions
87-
:column="4"
88-
:data="detailFormData"
89-
:items="memoryDetailItems"
90-
>
86+
<FaDescriptions :column="4" :data="detailFormData" :items="memoryDetailItems">
9187
<template #metadata="{ row }">
92-
<pre v-if="row?.metadata">{{ JSON.stringify(row?.metadata, null, 2) }}</pre>
88+
<ElScrollbar v-if="row?.metadata" max-height="min(140px, 18vh)">
89+
<pre class="m-0">{{ JSON.stringify(row?.metadata, null, 2) }}</pre>
90+
</ElScrollbar>
9391
<span v-else>无</span>
9492
</template>
9593
</FaDescriptions>
9694

9795
<ElDivider content-position="left">消息记录</ElDivider>
98-
<ElTimeline v-if="detailFormData.messages && detailFormData.messages.length > 0">
99-
<ElTimelineItem
100-
v-for="msg in detailFormData.messages"
101-
:key="msg.id"
102-
:type="msg.role === 'user' ? 'primary' : 'success'"
103-
:icon="msg.role === 'user' ? 'User' : 'ChatDotRound'"
104-
>
105-
<div class="message-item">
106-
<div class="message-header">
107-
<ElTag size="small" :type="msg.role === 'user' ? 'primary' : 'success'">
108-
{{ msg.role === "user" ? "用户" : "助手" }}
109-
</ElTag>
110-
<span v-if="msg.created_at" class="message-time">
111-
{{ formatMsgTime(msg.created_at) }}
112-
</span>
96+
<ElScrollbar
97+
v-if="detailFormData.messages && detailFormData.messages.length > 0"
98+
max-height="min(300px, 36vh)"
99+
>
100+
<ElTimeline>
101+
<ElTimelineItem
102+
v-for="msg in detailFormData.messages"
103+
:key="msg.id"
104+
:type="msg.role === 'user' ? 'primary' : 'success'"
105+
:icon="msg.role === 'user' ? 'User' : 'ChatDotRound'"
106+
>
107+
<div class="message-item">
108+
<div class="message-header">
109+
<ElTag size="small" :type="msg.role === 'user' ? 'primary' : 'success'">
110+
{{ msg.role === "user" ? "用户" : "助手" }}
111+
</ElTag>
112+
<span v-if="msg.created_at" class="message-time">
113+
{{ formatMsgTime(msg.created_at) }}
114+
</span>
115+
</div>
116+
<div class="message-content">{{ msg.content }}</div>
113117
</div>
114-
<div class="message-content">{{ msg.content }}</div>
115-
</div>
116-
</ElTimelineItem>
117-
</ElTimeline>
118+
</ElTimelineItem>
119+
</ElTimeline>
120+
</ElScrollbar>
118121
<FaEmptyState v-else icon="ri:history-line" title="暂无消息记录" compact />
119122
</div>
120123
</template>

‎frontend/web/src/views/module_system/notice/index.vue‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,9 @@
178178
/>
179179
</template>
180180
<template #notice_content>
181-
<FaMarkdownRenderer :content="detailFormData.notice_content ?? ''" />
181+
<ElScrollbar max-height="min(280px, 34vh)">
182+
<FaMarkdownRenderer :content="detailFormData.notice_content ?? ''" />
183+
</ElScrollbar>
182184
</template>
183185
</FaDescriptions>
184186
</template>

‎frontend/web/src/views/module_system/ticket/index.vue‎

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -195,22 +195,26 @@
195195
/>
196196
</template>
197197
<template #ticket_content>
198-
<div
199-
class="box-border min-h-30 bg-(--el-bg-color) border border-(--el-border-color-lighter) rounded-[calc(var(--custom-radius)/3+2px)] p-3"
198+
<ElScrollbar
199+
max-height="min(180px, 24vh)"
200+
class="box-border min-h-30 bg-(--el-bg-color) border border-(--el-border-color-lighter) rounded-[calc(var(--custom-radius)/3+2px)]"
201+
view-class="p-3"
200202
>
201203
<template v-if="detailHasRenderableContent">
202204
<div v-html="detailContentHtml" />
203205
</template>
204206
<p v-else class="m-0 text-sm text-(--el-text-color-placeholder)">暂无内容</p>
205-
</div>
207+
</ElScrollbar>
206208
</template>
207209
<template #reply_content>
208-
<div
210+
<ElScrollbar
209211
v-if="detailFormData.reply"
210-
class="box-border min-h-30 bg-(--el-bg-color) border border-(--el-border-color-lighter) rounded-[calc(var(--custom-radius)/3+2px)] p-3"
212+
max-height="min(180px, 24vh)"
213+
class="box-border min-h-30 bg-(--el-bg-color) border border-(--el-border-color-lighter) rounded-[calc(var(--custom-radius)/3+2px)]"
214+
view-class="p-3"
211215
>
212216
<div v-html="sanitizedReply" />
213-
</div>
217+
</ElScrollbar>
214218
<p v-else class="m-0 text-sm text-(--el-text-color-placeholder)">暂无回复</p>
215219
</template>
216220
</FaDescriptions>
@@ -225,7 +229,7 @@
225229
</span>
226230
</ElDivider>
227231
<div class="flex flex-col gap-3">
228-
<div class="px-1">
232+
<ElScrollbar max-height="min(220px, 28vh)" class="px-1">
229233
<div v-if="commentsLoading" class="py-3">
230234
<ElSkeleton :rows="2" animated />
231235
</div>
@@ -257,7 +261,7 @@
257261
</div>
258262
</template>
259263
<FaEmptyState v-else icon="ri:chat-3-line" title="暂无评论" compact />
260-
</div>
264+
</ElScrollbar>
261265

262266
<!-- 提交评论 -->
263267
<div
@@ -413,6 +417,7 @@ import {
413417
ElDivider,
414418
ElInput,
415419
ElMessageBox,
420+
ElScrollbar,
416421
} from "element-plus";
417422
import DOMPurify from "dompurify";
418423
import FaForm from "@/components/forms/fa-form/index.vue";
@@ -649,8 +654,8 @@ const ticketDetailItems: import("@/components/display/fa-descriptions/index.vue"
649654
{ label: "状态", prop: "status", slot: "status" },
650655
{ label: "处理人", prop: "assigned_by.name" },
651656
{ label: "描述", prop: "description", span: 4 },
652-
{ label: "详细内容", prop: "ticket_content", slot: "ticket_content", span: 4 },
653-
{ label: "回复内容", prop: "reply", slot: "reply_content", span: 4 },
657+
{ label: "详细内容", prop: "ticket_content", slot: "ticket_content", span: 2 },
658+
{ label: "回复内容", prop: "reply", slot: "reply_content", span: 2 },
654659
{ label: "创建人", prop: "created_by.name" },
655660
{ label: "更新人", prop: "updated_by.name" },
656661
{ label: "创建时间", prop: "created_time" },

‎frontend/web/src/views/module_system/version/index.vue‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -124,12 +124,9 @@
124124
</ElTag>
125125
</template>
126126
<template #content="{ row }">
127-
<FaMarkdownRenderer
128-
v-if="row?.content"
129-
:content="String(row.content)"
130-
height="auto"
131-
max-height="260px"
132-
/>
127+
<ElScrollbar v-if="row?.content" max-height="min(260px, 32vh)">
128+
<FaMarkdownRenderer :content="String(row.content)" />
129+
</ElScrollbar>
133130
<span v-else class="text-g-400">—</span>
134131
</template>
135132
</FaDescriptions>

‎frontend/web/src/views/module_task/cronjob/job/index.vue‎

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -363,7 +363,18 @@
363363
:data="logDetailFormData"
364364
:items="logDetailItems"
365365
max-height="70vh"
366-
/>
366+
>
367+
<template #result="{ row }">
368+
<ElScrollbar max-height="min(160px, 20vh)">
369+
<div class="whitespace-pre-wrap break-all">{{ row?.result || "—" }}</div>
370+
</ElScrollbar>
371+
</template>
372+
<template #error="{ row }">
373+
<ElScrollbar max-height="min(160px, 20vh)">
374+
<div class="whitespace-pre-wrap break-all">{{ row?.error || "—" }}</div>
375+
</ElScrollbar>
376+
</template>
377+
</FaDescriptions>
367378
</FaDialog>
368379
</div>
369380
</template>
@@ -861,8 +872,8 @@ const logDetailItems: import("@/components/display/fa-descriptions/index.vue").D
861872
{ label: "触发方式", prop: "trigger_type" },
862873
{ label: "执行状态", prop: "status" },
863874
{ label: "下次执行时间", prop: "next_run_time" },
864-
{ label: "执行结果", prop: "result", span: 4 },
865-
{ label: "错误信息", prop: "error", span: 4 },
875+
{ label: "执行结果", prop: "result", slot: "result", span: 4 },
876+
{ label: "错误信息", prop: "error", slot: "error", span: 4 },
866877
{ label: "创建时间", prop: "created_time" },
867878
{ label: "更新时间", prop: "updated_time" },
868879
];

‎frontend/web/src/views/module_task/storage/transfer/index.vue‎

Lines changed: 45 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -401,49 +401,56 @@
401401
>
402402
传输步骤
403403
</div>
404-
<div v-if="detailSteps.length" class="flex flex-col gap-2">
405-
<template v-for="(step, idx) in detailSteps" :key="step.id ?? idx">
406-
<div
407-
class="rounded-md border border-(--el-border-color-lighter) bg-(--el-fill-color-lighter) px-3 py-2.5"
408-
>
409-
<div class="flex items-center gap-2">
410-
<ElTag :type="idx === 0 ? 'primary' : 'warning'" size="small">#{{ idx + 1 }}</ElTag>
411-
<ElTag :type="statusTypeMap[step.status] || 'info'" size="small">{{
412-
statusText[step.status] || step.status
413-
}}</ElTag>
414-
<span class="ml-auto text-xs text-(--el-text-color-secondary)"
415-
>{{ step.progress }}% · {{ formatSpeed(step.speed) }}</span
404+
<ElScrollbar v-if="detailSteps.length" max-height="min(300px, 36vh)">
405+
<div class="flex flex-col gap-2">
406+
<template v-for="(step, idx) in detailSteps" :key="step.id ?? idx">
407+
<div
408+
class="rounded-md border border-(--el-border-color-lighter) bg-(--el-fill-color-lighter) px-3 py-2.5"
409+
>
410+
<div class="flex items-center gap-2">
411+
<ElTag :type="idx === 0 ? 'primary' : 'warning'" size="small"
412+
>#{{ idx + 1 }}</ElTag
413+
>
414+
<ElTag :type="statusTypeMap[step.status] || 'info'" size="small">{{
415+
statusText[step.status] || step.status
416+
}}</ElTag>
417+
<span class="ml-auto text-xs text-(--el-text-color-secondary)"
418+
>{{ step.progress }}% · {{ formatSpeed(step.speed) }}</span
419+
>
420+
</div>
421+
<div class="mt-1.5 break-all text-xs text-(--el-text-color-regular)">
422+
<span
423+
class="mr-1.5 inline-block rounded-[3px] bg-(--el-color-info) px-1.25 py-0.5 text-[11px] leading-none text-white"
424+
>{{ $t("common.source") }}</span
425+
>{{ sourceName(step.source_id) }} · {{ step.source_path || "—" }}
426+
</div>
427+
<div
428+
class="mt-1 text-center text-[14px] font-bold text-(--el-text-color-placeholder)"
416429
>
417-
</div>
418-
<div class="mt-1.5 break-all text-xs text-(--el-text-color-regular)">
419-
<span
420-
class="mr-1.5 inline-block rounded-[3px] bg-(--el-color-info) px-1.25 py-0.5 text-[11px] leading-none text-white"
421-
>{{ $t("common.source") }}</span
422-
>{{ sourceName(step.source_id) }} · {{ step.source_path || "—" }}
430+
↓
431+
</div>
432+
<div class="mt-1.5 break-all text-xs text-(--el-text-color-regular)">
433+
<span
434+
class="mr-1.5 inline-block rounded-[3px] bg-(--el-color-primary) px-1.25 py-0.5 text-[11px] leading-none text-white"
435+
>目标</span
436+
>{{ sourceName(step.target_id) }} · {{ step.target_path }}
437+
</div>
438+
<div
439+
v-if="step.error_msg"
440+
class="mt-1.5 break-all text-xs text-(--el-color-danger)"
441+
>
442+
{{ step.error_msg }}
443+
</div>
423444
</div>
424445
<div
425-
class="mt-1 text-center text-[14px] font-bold text-(--el-text-color-placeholder)"
446+
v-if="idx < detailSteps.length - 1"
447+
class="text-center text-[18px] font-bold text-(--el-text-color-placeholder)"
426448
>
427-
↓
428-
</div>
429-
<div class="mt-1.5 break-all text-xs text-(--el-text-color-regular)">
430-
<span
431-
class="mr-1.5 inline-block rounded-[3px] bg-(--el-color-primary) px-1.25 py-0.5 text-[11px] leading-none text-white"
432-
>目标</span
433-
>{{ sourceName(step.target_id) }} · {{ step.target_path }}
449+
→
434450
</div>
435-
<div v-if="step.error_msg" class="mt-1.5 break-all text-xs text-(--el-color-danger)">
436-
{{ step.error_msg }}
437-
</div>
438-
</div>
439-
<div
440-
v-if="idx < detailSteps.length - 1"
441-
class="text-center text-[18px] font-bold text-(--el-text-color-placeholder)"
442-
>
443-
→
444-
</div>
445-
</template>
446-
</div>
451+
</template>
452+
</div>
453+
</ElScrollbar>
447454
<FaEmptyState icon="ri:inbox-line" title="暂无步骤" compact />
448455
</template>
449456
</FaDialog>

0 commit comments

Comments
 (0)