diff --git a/admin-frontend-vue/src/pages/account/GroupsPage.vue b/admin-frontend-vue/src/pages/account/GroupsPage.vue index d8f859ab5..47d5e3954 100644 --- a/admin-frontend-vue/src/pages/account/GroupsPage.vue +++ b/admin-frontend-vue/src/pages/account/GroupsPage.vue @@ -355,6 +355,7 @@ h3 { align-items: center; gap: 8px; white-space: nowrap; + flex-wrap: wrap; } .empty-tip { diff --git a/admin-frontend-vue/src/pages/account/MenusPage.vue b/admin-frontend-vue/src/pages/account/MenusPage.vue index c592ac11c..4942d35ce 100644 --- a/admin-frontend-vue/src/pages/account/MenusPage.vue +++ b/admin-frontend-vue/src/pages/account/MenusPage.vue @@ -538,6 +538,7 @@ tr.is-column-dragging td { align-items: center; gap: 8px; white-space: nowrap; + flex-wrap: wrap; } .empty-tip { diff --git a/admin-frontend-vue/src/pages/account/UsersPage.vue b/admin-frontend-vue/src/pages/account/UsersPage.vue index 100861f6c..870f028cf 100644 --- a/admin-frontend-vue/src/pages/account/UsersPage.vue +++ b/admin-frontend-vue/src/pages/account/UsersPage.vue @@ -449,6 +449,7 @@ h3 { align-items: center; gap: 8px; white-space: nowrap; + flex-wrap: wrap; } .expiry-cell-expired { color: #c0392b; diff --git a/admin-frontend-vue/src/pages/asin/AsinInvalidPage.vue b/admin-frontend-vue/src/pages/asin/AsinInvalidPage.vue index 5187ba3dd..6cfbdb0e9 100644 --- a/admin-frontend-vue/src/pages/asin/AsinInvalidPage.vue +++ b/admin-frontend-vue/src/pages/asin/AsinInvalidPage.vue @@ -408,6 +408,7 @@ h3 { align-items: center; gap: 8px; white-space: nowrap; + flex-wrap: wrap; } .empty-tip { diff --git a/admin-frontend-vue/src/pages/asin/DedupeRegistryPage.vue b/admin-frontend-vue/src/pages/asin/DedupeRegistryPage.vue index f2e567109..cc8f6e020 100644 --- a/admin-frontend-vue/src/pages/asin/DedupeRegistryPage.vue +++ b/admin-frontend-vue/src/pages/asin/DedupeRegistryPage.vue @@ -700,6 +700,7 @@ h3 { gap: 8px; white-space: nowrap; text-align: right; + flex-wrap: wrap; } .empty-tip { diff --git a/admin-frontend-vue/src/pages/asin/ProductCategoryPage.vue b/admin-frontend-vue/src/pages/asin/ProductCategoryPage.vue index f79f3484d..b4ba11da4 100644 --- a/admin-frontend-vue/src/pages/asin/ProductCategoryPage.vue +++ b/admin-frontend-vue/src/pages/asin/ProductCategoryPage.vue @@ -710,6 +710,7 @@ h3 { align-items: center; gap: 8px; white-space: nowrap; + flex-wrap: wrap; } .load-more-row td { diff --git a/admin-frontend-vue/src/pages/records/RecordsDigitalHumanVersionPage.vue b/admin-frontend-vue/src/pages/records/RecordsDigitalHumanVersionPage.vue index fb1ae02d7..f11964fa1 100644 --- a/admin-frontend-vue/src/pages/records/RecordsDigitalHumanVersionPage.vue +++ b/admin-frontend-vue/src/pages/records/RecordsDigitalHumanVersionPage.vue @@ -488,6 +488,7 @@ h3 { align-items: center; gap: 8px; white-space: nowrap; + flex-wrap: wrap; } .empty-tip { diff --git a/admin-frontend-vue/src/pages/shop/ShopKeysPage.vue b/admin-frontend-vue/src/pages/shop/ShopKeysPage.vue index f2db3d304..f1888f0f4 100644 --- a/admin-frontend-vue/src/pages/shop/ShopKeysPage.vue +++ b/admin-frontend-vue/src/pages/shop/ShopKeysPage.vue @@ -7,8 +7,8 @@ import { ElMessage } from 'element-plus' import { useCompanyTabStore } from '@/stores/company-tab' import { fetchShopKeyList, submitCreateShopKey, updateShopKey, deleteShopKey, checkShopKeyWhitelist } from './shop-key-api.ts' import { emptyShopKeyForm, normalizeZiniaoToken, validateProxyUrl } from './shop-key-form-model.ts' -import type { ShopKeyItem } from './shop-dto.ts' -import { whitelistStatusMeta } from './shop-key-model.ts' +import type { IpWhitelistStatus, ShopKeyItem } from './shop-dto.ts' +import { whitelistStatusMeta, whitelistStatusOptions } from './shop-key-model.ts' import OldPagination from '@/components/OldPagination.vue' const companyTab = useCompanyTabStore() @@ -19,15 +19,13 @@ const page = ref(1) const pageSize = ref(10) const jumpPage = ref('') const totalPages = computed(() => Math.max(1, Math.ceil(total.value / pageSize.value))) -/** 筛选:备注名/紫鸟账号(用户要求店铺密钥列表补筛选)。 */ -const filterKeyword = ref('') -const filteredRows = computed(() => { - const kw = (filterKeyword.value || '').trim().toLowerCase() - if (!kw) return rows.value - return rows.value.filter((r) => - `${r.remarkName || ''} ${r.ziniaoAccountName || ''}`.toLowerCase().includes(kw), - ) -}) +/** 筛选:三个条件全部交后端做。曾经的"备注名/紫鸟账号"是前端 computed,只在**当前这一页的 + * 10 行**里过滤且 total 纹丝不动 —— 第 11 行起就筛不掉,翻页后结果还会自己变回去。 */ +const filter = reactive({ keyword: '', token: '', whitelistStatus: null as IpWhitelistStatus | null }) +const statusOptions = whitelistStatusOptions() +const anyFilterActive = computed( + () => Boolean(filter.keyword.trim() || filter.token.trim() || filter.whitelistStatus), +) const dialogVisible = ref(false) const editingId = ref(null) @@ -61,6 +59,9 @@ async function load() { const result = await fetchShopKeyList({ page: page.value, pageSize: pageSize.value, + keyword: filter.keyword.trim() || undefined, + token: filter.token.trim() || undefined, + whitelistStatus: filter.whitelistStatus || undefined, companyId: companyTab.requestCompanyId, }) rows.value = result.items @@ -130,7 +131,7 @@ async function submit() { saving.value = true try { if (creating) { - await submitCreateShopKey({ ...form }) + await submitCreateShopKey({ ...form }, companyTab.requestCompanyId) } else { await updateShopKey(editingId.value as number, { ...form }) } @@ -178,7 +179,16 @@ function goJump() { changePage(Math.min(Math.max(n, 1), totalPages.value)) } -watch(() => companyTab.activeId, () => { filterKeyword.value = ''; page.value = 1; void load() }) +function apply() { + page.value = 1 + void load() +} + +// 切公司 = 清掉全部筛选 + 回第 1 页 + 重取数,与其余 9 页同一条约定 +// (护栏 company-tab-wiring 的 WATCH_BODY_PINS 逐字钉着这一行)。 +// 筛选改到服务端做之后这条更要守:留着上一家填的词去筛新一家,首屏就是一张 +// 「暂无匹配密钥」而框里还显示着那个词——tab 看着像坏了,请求/后端/权限三处都没错。 +watch(() => companyTab.activeId, () => { filter.keyword = ''; filter.token = ''; filter.whitelistStatus = null; page.value = 1; void load() }) onMounted(load) @@ -194,8 +204,19 @@ onMounted(load)
- +
+
+ + +
+
+ + + + +
+
@@ -210,12 +231,12 @@ onMounted(load) 白名单状态 创建时间 修改时间 - 操作 + 操作 -