direv/admin_new
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

admin_new P0+P1 全批次合并 (84 commits) #2

Merged
direv merged 85 commits from develop into main 2026-08-07 11:27:17 +08:00
Conversation 0 Commits 85 Files Changed 94 +10 -7
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 08cf2067db - Show all commits

17
src/components/DataTable/DataTable.vue
View File

@ -58,7 +58,7 @@ const props = withDefaults(defineProps<Props>(), {
loading: false, loading: false,
total: 0, total: 0,
page: 1, page: 1,
limit: 20, limit: 10, // W17.3.5 默认每页 10 条 (按用户原话)
showPagination: true, showPagination: true,
pageSizes: () => [10, 20, 50, 100], pageSizes: () => [10, 20, 50, 100],
rowKey: 'id', rowKey: 'id',
@ -102,22 +102,22 @@ function onLimitChange(l: number) { emit('limit-change', l) }
@row-click="onRowClick" @row-click="onRowClick"
@selection-change="onSelectionChange" @selection-change="onSelectionChange"
row-class-name="rr-clickable-row" row-class-name="rr-clickable-row"
:header-row-style="{ height: '40px' }" :header-row-style="{ height: '48px' }"
:header-cell-style="{ :header-cell-style="{
background: 'var(--rr-table-header-bg, #F8FAFC)', background: 'var(--rr-table-header-bg, #F8FAFC)',
color: 'var(--rr-text-secondary, #64748B)', color: 'var(--rr-text-secondary, #64748B)',
fontWeight: '600', fontWeight: '600',
fontSize: '12px', fontSize: '12px',
padding: '11px 16px', padding: '14px 16px',
borderBottom: '1px solid var(--rr-border-color, #E2E8F0)', borderBottom: '1px solid var(--rr-border-color, #E2E8F0)',
textTransform: 'uppercase', textTransform: 'uppercase',
letterSpacing: '0.04em', letterSpacing: '0.04em',
whiteSpace: 'nowrap', whiteSpace: 'nowrap',
textAlign: 'left', textAlign: 'left',
height: '40px' lineHeight: '20px'
}" }"
:cell-style="{ :cell-style="{
padding: '12px 16px', padding: '10px 16px',
borderBottom: '1px solid var(--rr-border-color, #E2E8F0)', borderBottom: '1px solid var(--rr-border-color, #E2E8F0)',
color: 'var(--rr-text-secondary, #334155)', color: 'var(--rr-text-secondary, #334155)',
fontSize: '13px', fontSize: '13px',
@ -176,6 +176,7 @@ function onLimitChange(l: number) { emit('limit-change', l) }
:page-size="limit" :page-size="limit"
:total="total" :total="total"
:page-sizes="pageSizes" :page-sizes="pageSizes"
:pager-count="5"
layout="sizes, prev, pager, next, jumper" layout="sizes, prev, pager, next, jumper"
background background
@current-change="onPageChange" @current-change="onPageChange"
@ -234,14 +235,16 @@ function onLimitChange(l: number) { emit('limit-change', l) }
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
padding: 14px 20px; padding: 12px 20px;
font-size: 12.5px; font-size: 13px; /* W17.3.6 跟内容行一致 (13px) */
color: var(--ink-3, #94A3B8); color: var(--ink-3, #94A3B8);
background: var(--rr-bg-card, #FFFFFF); background: var(--rr-bg-card, #FFFFFF);
border-top: 1px solid var(--rr-border-color, #F1F5F9); border-top: 1px solid var(--rr-border-color, #F1F5F9);
&__info { color: var(--ink-3, #94A3B8); } &__info { color: var(--ink-3, #94A3B8); }
:deep(.el-pagination) { :deep(.el-pagination) {
--el-pagination-bg-color: transparent; --el-pagination-bg-color: transparent;
--el-pagination-font-size: 13px; /* W17.3.6 跟内容行 cell 字号一致 (13px) */
font-size: 13px;
} }
:deep(.el-pager li) { :deep(.el-pager li) {
border-radius: 6px; border-radius: 6px;