feat(需求): ①全站列表/卡片分页统一为共享 OldPagination(共N条+10/20/50/100条数可选+跳页) ②创建用户菜单权限改左右布局(后台|桌面端并排) ③修复角色筛选失效(normalizeUserPageParams 白名单丢 role 字段)

This commit is contained in:
2026-09-07 00:02:30 +08:00
parent d0cf95793f
commit 65b48c6026
18 changed files with 323 additions and 245 deletions
@@ -24,9 +24,9 @@ const loading = ref(false)
const tasks = ref<ImageVideoRow[]>([])
const totalTasks = ref(0)
const page = ref(1)
const pageSize = 20
const pageSize = ref(20)
const jumpPage = ref('')
const totalPages = computed(() => Math.max(1, Math.ceil(totalTasks.value / pageSize)))
const totalPages = computed(() => Math.max(1, Math.ceil(totalTasks.value / pageSize.value)))
const filter = reactive<ImageVideoFilter & { dateRange: string[] }>({ ...createImageVideoFilter(), dateRange: [] })
const selection = ref<Set<string>>(new Set())
@@ -103,7 +103,7 @@ function toFilter(): ImageVideoFilter {
async function load() {
loading.value = true
try {
const result = await fetchImageVideoTasks(toFilter(), page.value, pageSize)
const result = await fetchImageVideoTasks(toFilter(), page.value, pageSize.value)
tasks.value = result.items
totalTasks.value = result.total
page.value = result.page
@@ -133,6 +133,13 @@ function changePage(next: number) {
void load()
}
function changeSize(size: number) {
pageSize.value = size
page.value = 1
load()
}
function goJump() {
const n = Number.parseInt(jumpPage.value, 10)
if (Number.isNaN(n)) {
@@ -356,19 +363,7 @@ onMounted(load)
</template>
<div v-else-if="!loading" class="empty-tip">暂无符合条件的视频任务</div>
</div>
<div class="pagination">
<span class="page-total">共 {{ totalTasks }} 条</span>
<button type="button" :disabled="page <= 1" @click="changePage(page - 1)">上一页</button>
<span class="page-cur">第 {{ page }} / {{ totalPages }} 页</span>
<button type="button" :disabled="page >= totalPages" @click="changePage(page + 1)">下一页</button>
<span class="page-jump">
跳至
<input v-model="jumpPage" type="text" inputmode="numeric" @keyup.enter="goJump" />
页
<button type="button" @click="goJump">跳转</button>
</span>
</div>
<OldPagination :total="totalTasks" :page="page" :page-size="pageSize" @change="changePage" @size-change="changeSize" />
</section>
<el-drawer v-model="detailVisible" title="任务明细" size="720px">
@@ -25,20 +25,21 @@ import {
toggleShopDataSelection,
} from './shop-data-selection.ts'
import { useAdminSessionStore } from '@/stores/admin-session'
import OldPagination from '@/components/OldPagination.vue'
const session = useAdminSessionStore()
const loading = ref(false)
const groups = ref<ShopDataTaskGroup[]>([])
const totalShops = ref(0)
const page = ref(1)
const pageSize = 20
const pageSize = ref(20)
const pageJump = ref('')
const totalPages = computed(() => Math.max(1, Math.ceil(totalShops.value / pageSize)))
const totalPages = computed(() => Math.max(1, Math.ceil(totalShops.value / pageSize.value)))
// 卡片宫格分页:一行 3 个、一页 9 张卡片(在店铺分页的结果文件内翻页)。
const cardPage = ref(1)
const cardPageSize = 9
const cardPageSize = ref(10)
const cardJump = ref('')
const cardTotalPages = computed(() => Math.max(1, Math.ceil(allResultRows.value.length / cardPageSize)))
const cardTotalPages = computed(() => Math.max(1, Math.ceil(allResultRows.value.length / cardPageSize.value)))
const filter = reactive<ShopDataFilter & { dateRange: string[] }>({ ...createShopDataFilter(), dateRange: [] })
const selection = ref<Set<string>>(new Set())
@@ -91,7 +92,7 @@ function toFilter(): ShopDataFilter {
async function load() {
loading.value = true
try {
const result = await fetchShopDataTaskList(toFilter(), page.value, pageSize)
const result = await fetchShopDataTaskList(toFilter(), page.value, pageSize.value)
groups.value = result.items
totalShops.value = result.total
page.value = result.page
@@ -122,6 +123,13 @@ function changePage(next: number) {
void load()
}
function changeShopSize(size: number) {
pageSize.value = size
page.value = 1
cardPage.value = 1
void load()
}
function goPageJump() {
const n = Number.parseInt(pageJump.value, 10)
if (Number.isNaN(n)) {
@@ -133,7 +141,7 @@ function goPageJump() {
const allResultRows = computed(() => groups.value.flatMap((group) => group.results))
const pagedResultRows = computed(() =>
allResultRows.value.slice((cardPage.value - 1) * cardPageSize, cardPage.value * cardPageSize),
allResultRows.value.slice((cardPage.value - 1) * cardPageSize.value, cardPage.value * cardPageSize.value),
)
const selectionCount = computed(() => countShopDataSelection(selection.value))
@@ -141,6 +149,11 @@ function changeCardPage(p: number) {
cardPage.value = p
}
function changeCardSize(size: number) {
cardPageSize.value = size
cardPage.value = 1
}
function goCardJump() {
const n = Number.parseInt(cardJump.value, 10)
if (Number.isNaN(n)) {
@@ -325,13 +338,7 @@ onMounted(load)
</div>
<div class="sd-toolbar-side">
<span class="sd-summary">共 {{ totalShops }} 家店铺 · 本页 {{ resultFileCount() }} 个结果文件</span>
<span class="sd-shop-pager">
<button type="button" :disabled="page <= 1" @click="changePage(page - 1)">上一页</button>
<span class="page-cur">第 {{ page }} / {{ totalPages }} 页</span>
<button type="button" :disabled="page >= totalPages" @click="changePage(page + 1)">下一页</button>
<input v-model="pageJump" type="text" inputmode="numeric" placeholder="页" @keyup.enter="goPageJump" />
<button type="button" class="jump-btn" @click="goPageJump">跳转</button>
</span>
<OldPagination v-if="totalShops > 0" :total="totalShops" :page="page" :page-size="pageSize" @change="changePage" @size-change="changeShopSize" />
</div>
</div>
@@ -393,18 +400,7 @@ onMounted(load)
<div v-else-if="!loading" class="empty-tip">暂无符合条件的店铺数据记录</div>
</div>
<div class="pagination">
<span class="page-total">本页数据 · 共 {{ allResultRows.length }} 个结果文件</span>
<button type="button" :disabled="cardPage <= 1" @click="changeCardPage(cardPage - 1)">上一页</button>
<span class="page-cur">第 {{ cardPage }} / {{ cardTotalPages }} 页</span>
<button type="button" :disabled="cardPage >= cardTotalPages" @click="changeCardPage(cardPage + 1)">下一页</button>
<span class="page-jump">
跳至
<input v-model="cardJump" type="text" inputmode="numeric" @keyup.enter="goCardJump" />
页
<button type="button" @click="goCardJump">跳转</button>
</span>
</div>
<OldPagination v-if="allResultRows.length > 0" :total="allResultRows.length" :page="cardPage" :page-size="cardPageSize" @change="changeCardPage" @size-change="changeCardSize" />
</section>
<el-dialog v-model="permissionVisible" title="店铺数据记录数据范围授权" width="620px">