Add files via upload

This commit is contained in:
公明
2026-04-15 00:38:07 +08:00
committed by GitHub
parent 62241e0e66
commit 1cf34797b8
3 changed files with 263 additions and 26 deletions
+241 -4
View File
@@ -8208,6 +8208,21 @@ header {
.tasks-filters select {
min-width: 100%;
}
.batch-queues-filters.tasks-filters.batch-queues-filters--compact {
flex-direction: row;
flex-wrap: wrap;
align-items: center;
}
.batch-queues-filters.tasks-filters.batch-queues-filters--compact select {
min-width: 120px;
width: auto;
}
.batch-queues-filters__search {
flex: 1 1 100%;
}
.tasks-batch-actions {
flex-direction: column;
@@ -8258,8 +8273,10 @@ header {
.batch-queues-board .batch-queues-list {
margin-bottom: 0;
padding: 12px 16px;
padding: 14px 16px;
box-sizing: border-box;
/* 与卡片底色区分,flex gap 才能被看见,避免「白贴白」连成一片 */
background: var(--bg-secondary);
}
.batch-queues-board #batch-queues-pagination {
@@ -8281,6 +8298,45 @@ header {
margin-bottom: 12px;
}
/* 任务管理 · 筛选条:标签与控件同一行,降低占用高度 */
.batch-queues-filters.tasks-filters.batch-queues-filters--compact {
padding: 8px 12px;
margin-bottom: 10px;
gap: 10px 16px;
align-items: center;
}
.batch-queues-filters.tasks-filters.batch-queues-filters--compact label {
flex-direction: row;
align-items: center;
gap: 8px;
}
.batch-queues-filters.tasks-filters.batch-queues-filters--compact label > span {
flex-shrink: 0;
font-size: 0.8125rem;
max-width: 9em;
line-height: 1.25;
}
.batch-queues-filters.tasks-filters.batch-queues-filters--compact select {
min-width: 120px;
padding: 6px 10px;
font-size: 0.8125rem;
}
.batch-queues-filters.tasks-filters.batch-queues-filters--compact input[type="text"] {
padding: 6px 10px;
font-size: 0.8125rem;
min-width: 0;
}
.batch-queues-filters__search {
flex: 1 1 220px;
min-width: 0;
max-width: none;
}
.batch-queues-header {
display: flex;
justify-content: space-between;
@@ -8299,15 +8355,15 @@ header {
.batch-queues-list {
display: flex;
flex-direction: column;
gap: 12px;
gap: 14px;
margin-bottom: 28px;
}
.batch-queue-item {
background: var(--bg-primary);
border: 1px solid var(--border-color);
border-radius: 14px;
padding: 14px 16px;
border-radius: 12px;
padding: 11px 16px 12px;
box-shadow: var(--shadow-sm);
transition: border-color 0.2s ease, box-shadow 0.2s ease, transform 0.2s ease;
cursor: pointer;
@@ -8334,6 +8390,148 @@ header {
min-width: 0;
}
/* 任务管理 · 队列卡片:单行主网格 + 进度列内统计,降低高度 */
.batch-queue-item__inner--grid {
display: grid;
grid-template-columns: minmax(0, 1fr) minmax(128px, auto) minmax(88px, 14%) 44px;
grid-template-rows: auto;
grid-template-areas: "lead cluster progress actions";
column-gap: 22px;
align-items: center;
gap: 0;
}
.batch-queue-item__lead {
grid-area: lead;
min-width: 0;
}
.batch-queue-item__title-row {
display: flex;
align-items: center;
gap: 10px;
min-width: 0;
}
.batch-queue-item__role-icon {
flex-shrink: 0;
width: 32px;
height: 32px;
display: flex;
align-items: center;
justify-content: center;
font-size: 1rem;
line-height: 1;
border-radius: 9px;
background: var(--bg-secondary);
border: 1px solid var(--border-color);
}
.batch-queue-item__titles {
flex: 1;
min-width: 0;
}
.batch-queue-item__inner--grid .batch-queue-card-title {
font-size: 0.9375rem;
line-height: 1.3;
}
.batch-queue-item__cluster {
grid-area: cluster;
display: flex;
flex-direction: column;
align-items: flex-end;
gap: 10px;
text-align: right;
max-width: min(100%, 360px);
justify-self: end;
}
/* 状态徽章与百分比同一行,用 gap 明确分隔(避免视觉上「贴住」) */
.batch-queue-item__status-inline {
display: flex;
flex-direction: row;
flex-wrap: wrap;
align-items: center;
justify-content: flex-end;
gap: 10px 20px;
max-width: 100%;
min-width: 0;
}
.batch-queue-item__progress-col {
grid-area: progress;
min-width: 0;
display: flex;
flex-direction: column;
align-items: stretch;
align-self: center;
}
.batch-queue-item__actions-col {
grid-area: actions;
justify-self: end;
align-self: center;
padding-left: 6px;
}
.batch-queue-item__idline--lead {
display: block;
margin: 4px 0 0;
font-size: 0.6875rem;
color: var(--text-muted, var(--text-secondary));
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
.batch-queue-item__idline--lead code {
font-size: 0.65rem;
}
.batch-queue-item__inner--grid .batch-queue-item__config {
margin-top: 3px;
margin-bottom: 0;
display: -webkit-box;
-webkit-line-clamp: 2;
-webkit-box-orient: vertical;
overflow: hidden;
}
.batch-queue-item__inner--grid .batch-queue-item__sublabel {
font-size: 0.75rem;
color: var(--text-secondary);
max-width: 100%;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.batch-queue-item__inner--grid .batch-queue-item__pct {
flex: 0 0 auto;
text-align: right;
font-size: 0.75rem;
letter-spacing: 0.02em;
font-weight: 600;
color: var(--text-primary);
line-height: 1.25;
white-space: nowrap;
}
.batch-queue-progress-bar--card-row {
height: 6px;
}
.batch-queue-item--no-actions .batch-queue-item__inner--grid {
grid-template-columns: minmax(0, 1fr) minmax(128px, auto) minmax(88px, 16%);
grid-template-areas: "lead cluster progress";
}
.batch-queue-item--no-actions .batch-queue-item__actions-col {
display: none;
}
.batch-queue-item__top {
display: flex;
align-items: flex-start;
@@ -9371,6 +9569,45 @@ header {
align-items: flex-start;
}
.batch-queue-item__inner--grid {
grid-template-columns: 1fr auto;
grid-template-areas:
"lead actions"
"cluster cluster"
"progress progress";
row-gap: 8px;
}
.batch-queue-item--no-actions .batch-queue-item__inner--grid {
grid-template-columns: 1fr;
grid-template-areas:
"lead"
"cluster"
"progress";
}
.batch-queue-item__cluster {
align-items: flex-start;
text-align: left;
max-width: none;
justify-self: stretch;
}
.batch-queue-item__status-inline {
justify-content: flex-start;
width: 100%;
}
.batch-queue-item__inner--grid .batch-queue-item__pct {
text-align: left;
}
.batch-queue-item__idline--lead {
white-space: normal;
overflow: visible;
text-overflow: clip;
}
.batch-queue-item__top {
flex-wrap: wrap;
gap: 8px 10px;
+20 -20
View File
@@ -1133,34 +1133,34 @@ function renderBatchQueues() {
? `<h4 class="batch-queue-card-title">${escapeHtml(queue.title)}</h4>`
: `<h4 class="batch-queue-card-title batch-queue-card-title--muted">${escapeHtml(_t('tasks.batchQueueUntitled'))}</h4>`;
const doneCount = stats.completed + stats.failed + stats.cancelled;
const statsCompact = `<span class="batch-queue-statsline__item">${escapeHtml(_t('tasks.totalLabel'))}\u00a0${stats.total}</span><span class="batch-queue-statsline__sep">\u00b7</span><span class="batch-queue-statsline__item">${escapeHtml(_t('tasks.pendingLabel'))}\u00a0${stats.pending}</span><span class="batch-queue-statsline__sep">\u00b7</span><span class="batch-queue-statsline__item">${escapeHtml(_t('tasks.runningLabel'))}\u00a0${stats.running}</span><span class="batch-queue-statsline__sep">\u00b7</span><span class="batch-queue-statsline__item batch-queue-statsline__item--ok">${escapeHtml(_t('tasks.completedLabel'))}\u00a0${stats.completed}</span><span class="batch-queue-statsline__sep">\u00b7</span><span class="batch-queue-statsline__item batch-queue-statsline__item--err">${escapeHtml(_t('tasks.failedLabel'))}\u00a0${stats.failed}</span>${stats.cancelled > 0 ? `<span class="batch-queue-statsline__sep">\u00b7</span><span class="batch-queue-statsline__item">${escapeHtml(_t('tasks.cancelledLabel'))}\u00a0${stats.cancelled}</span>` : ''}`;
const noActionsClass = canDelete ? '' : ' batch-queue-item--no-actions';
return `
<div class="batch-queue-item batch-queue-item--compact${cardMod}" data-queue-id="${queue.id}" onclick="showBatchQueueDetail('${queue.id}')">
<div class="batch-queue-item__inner">
<div class="batch-queue-item__top">
<div class="batch-queue-item__title-col">
${titleBlock}
<p class="batch-queue-item__config">${configLine}${cronPausedNote}</p>
<p class="batch-queue-item__idline"><code title="${escapeHtml(queue.id)}">${shortId}</code><span class="batch-queue-item__idsep">\u00b7</span><span>${escapeHtml(_t('tasks.createdTimeLabel'))}\u00a0${escapeHtml(new Date(queue.createdAt).toLocaleString())}</span></p>
</div>
<div class="batch-queue-item__top-actions" onclick="event.stopPropagation();">
${canDelete ? `<button type="button" class="batch-queue-icon-btn" onclick="deleteBatchQueueFromList('${queue.id}')" title="${escapeHtml(_t('tasks.deleteQueue'))}" aria-label="${escapeHtml(_t('tasks.deleteQueue'))}"><svg class="batch-queue-icon-btn__svg" width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="M3 6h18"/><path d="M19 6v14a2 2 0 0 1-2 2H7a2 2 0 0 1-2-2V6"/><path d="M8 6V4a2 2 0 0 1 2-2h4a2 2 0 0 1 2 2v2"/><path d="M10 11v6"/><path d="M14 11v6"/></svg></button>` : ''}
<div class="batch-queue-item batch-queue-item--compact${cardMod}${noActionsClass}" data-queue-id="${queue.id}" onclick="showBatchQueueDetail('${queue.id}')">
<div class="batch-queue-item__inner batch-queue-item__inner--grid">
<div class="batch-queue-item__lead">
<div class="batch-queue-item__title-row">
<span class="batch-queue-item__role-icon" aria-hidden="true">${escapeHtml(roleIcon)}</span>
<div class="batch-queue-item__titles">${titleBlock}</div>
</div>
<p class="batch-queue-item__config">${configLine}${cronPausedNote}</p>
<p class="batch-queue-item__idline batch-queue-item__idline--lead"><code title="${escapeHtml(queue.id)}">${shortId}</code><span class="batch-queue-item__idsep">\u00b7</span><span>${escapeHtml(_t('tasks.createdTimeLabel'))}\u00a0${escapeHtml(new Date(queue.createdAt).toLocaleString())}</span></p>
</div>
<div class="batch-queue-item__mid">
<div class="batch-queue-item__mid-left">
<div class="batch-queue-item__cluster">
<div class="batch-queue-item__status-inline">
<span class="batch-queue-status ${pres.class}">${escapeHtml(pres.text)}</span>
${pres.sublabel ? `<span class="batch-queue-item__sublabel">${escapeHtml(pres.sublabel)}</span>` : ''}
</div>
<div class="batch-queue-item__mid-right">
<div class="batch-queue-progress-bar batch-queue-progress-bar--card batch-queue-progress-bar--list">
<div class="batch-queue-progress-fill${progressFillMod}" style="width: ${progress}%"></div>
</div>
<span class="batch-queue-item__pct">${progress}%\u00a0<span class="batch-queue-item__pct-frac">(${doneCount}/${stats.total})</span></span>
</div>
${pres.sublabel ? `<span class="batch-queue-item__sublabel">${escapeHtml(pres.sublabel)}</span>` : ''}
</div>
<div class="batch-queue-item__progress-col">
<div class="batch-queue-progress-bar batch-queue-progress-bar--card batch-queue-progress-bar--list batch-queue-progress-bar--card-row">
<div class="batch-queue-progress-fill${progressFillMod}" style="width: ${progress}%"></div>
</div>
</div>
<div class="batch-queue-item__actions-col" onclick="event.stopPropagation();">
${canDelete ? `<button type="button" class="batch-queue-icon-btn" onclick="deleteBatchQueueFromList('${queue.id}')" title="${escapeHtml(_t('tasks.deleteQueue'))}" aria-label="${escapeHtml(_t('tasks.deleteQueue'))}"><svg class="batch-queue-icon-btn__svg" width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="M3 6h18"/><path d="M19 6v14a2 2 0 0 1-2 2H7a2 2 0 0 1-2-2V6"/><path d="M8 6V4a2 2 0 0 1 2-2h4a2 2 0 0 1 2 2v2"/><path d="M10 11v6"/><path d="M14 11v6"/></svg></button>` : ''}
</div>
<div class="batch-queue-statsline" aria-label="${escapeHtml(_t('tasks.batchQueueTitle'))}">${statsCompact}</div>
</div>
</div>
`;
+2 -2
View File
@@ -1137,7 +1137,7 @@
<!-- 批量任务队列列表 -->
<div class="batch-queues-section" id="batch-queues-section" style="display: none;">
<!-- 筛选控件 -->
<div class="batch-queues-filters tasks-filters">
<div class="batch-queues-filters tasks-filters batch-queues-filters--compact">
<label>
<span data-i18n="tasksPage.statusFilter">状态筛选</span>
<select id="batch-queues-status-filter" onchange="filterBatchQueues()">
@@ -1149,7 +1149,7 @@
<option value="cancelled" data-i18n="tasksPage.statusCancelled">已取消</option>
</select>
</label>
<label style="flex: 1; max-width: 300px;">
<label class="batch-queues-filters__search">
<span data-i18n="tasksPage.searchQueuePlaceholder">搜索队列ID、标题或创建时间</span>
<input type="text" id="batch-queues-search" data-i18n="tasksPage.searchKeywordPlaceholder" data-i18n-attr="placeholder" placeholder="输入关键字搜索..."
oninput="filterBatchQueues()">