From 6d835e947e7407683470cd0135eaadfb52aee48a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E8=87=AA=E8=BE=BE?= <980324341@qq.com> Date: Thu, 8 Oct 2026 18:39:19 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E5=BA=97=E9=93=BA=E5=AF=86=E9=92=A5):=20?= =?UTF-8?q?=E7=AD=9B=E9=80=89=E6=94=B9=E8=B5=B0=E6=9C=8D=E5=8A=A1=E7=AB=AF?= =?UTF-8?q?=E3=80=81=E6=96=B0=E5=A2=9E=E8=AE=A4=E5=BD=93=E5=89=8D=20tab?= =?UTF-8?q?=EF=BC=8C=E6=93=8D=E4=BD=9C=E5=88=97=E4=B8=8D=E5=86=8D=E8=A3=81?= =?UTF-8?q?=E6=8E=89=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 三家公司的密钥挤在一页上,而"筛选"是拿当前页那 10 行在前端筛的:total 不动, 第 2 家的令牌要翻到它所在页才筛得出来。操作列给 160px 装不下三颗按钮, 最后一颗(删除)被 td 的 overflow:hidden + table-layout:fixed 整颗裁掉—— DOM 里在、事件也在,就是看不见点不到,这就是"没有删除功能"的真相。 - GET /api/admin/shop-keys 新增 keyword / token / whitelist_status,在公司读范围之内 由服务端筛。keyword 那组 OR 必须括起来:不括就被后续 AND 短路成 「备注名命中 OR (账号命中 AND 本公司)」,第 2 家的 tab 能读到第 1 家的令牌。 - create 的归属改为过读门(认当前 tab),不再只认操作者会话那一家。 读认 tab、写认会话=两把尺子:admin 是 super_admin 且 company_id=1, 他在别家 tab 点新增会"提示已新增、行却落进米椿花名下",再点一次就撞令牌唯一键。 这一条推翻 10-06 定案,controller 的反向钉子(create 不许碰读门)同步换成 「tab 必须过门 + 不许把请求原值直传下去」。 - 操作列 160→270px,.ops-cell 补 flex-wrap: wrap,把"超宽=静默消失"退化成"多占一行"; 同族结构隐患一次扫过 8 个页面(宽度够不够是像素账,会不会消失是结构账)。 - 护栏:ops-cell-must-wrap 钉跨页结构,shop-key-filter-params 钉参数下发与列宽; source-pin 棘轮补第二把尺子 reads=全文读点(体内+体外), pins 降而 reads 不同步降=把 readSource 挪出用例体冒充改进,当场红。 验证:将要提交的树(HEAD + 本批白名单)在独立 worktree 实跑——前端 1762 例 0 红、 vue-tsc rc=0、Java 41 例 0 红且 959 主源 + 498 测试源全量编译过(证明不依赖并行会话 未提交的符号);主树全量 1766 例 0 红。变异自证三支全杀:摘掉一页的 flex-wrap ⇒ 恰好 1 红点名该页;把体内读盘挪进 helper ⇒ 棘轮 1 红且文案点名"不算改进"; 归属退回按会话、controller 绕门直传原值 ⇒ 各自红。 --- .../src/pages/account/GroupsPage.vue | 1 + .../src/pages/account/MenusPage.vue | 1 + .../src/pages/account/UsersPage.vue | 1 + .../src/pages/asin/AsinInvalidPage.vue | 1 + .../src/pages/asin/DedupeRegistryPage.vue | 1 + .../src/pages/asin/ProductCategoryPage.vue | 1 + .../RecordsDigitalHumanVersionPage.vue | 1 + .../src/pages/shop/ShopKeysPage.vue | 61 +- .../src/pages/shop/ShopManagePage.vue | 1 + admin-frontend-vue/src/pages/shop/shop-dto.ts | 39 +- .../src/pages/shop/shop-key-api.ts | 16 +- .../src/pages/shop/shop-key-model.ts | 17 +- .../tests/baselines/source-pin-ledger.json | 713 ++++++++++++------ .../tests/company-tab-wiring.test.ts | 6 +- .../tests/ops-cell-must-wrap.test.ts | 66 ++ .../tests/shop-key-filter-params.test.ts | 120 +++ .../tests/source-pin-ratchet.test.ts | 133 +++- admin-frontend-vue/tests/task-81.test.ts | 3 +- .../shopkey/controller/ShopKeyController.java | 21 +- .../shopkey/service/ShopKeyService.java | 57 +- .../ShopKeyControllerCompanyScopeTest.java | 73 +- .../ShopKeyServiceCompanyScopeTest.java | 130 +++- 22 files changed, 1139 insertions(+), 324 deletions(-) create mode 100644 admin-frontend-vue/tests/ops-cell-must-wrap.test.ts create mode 100644 admin-frontend-vue/tests/shop-key-filter-params.test.ts 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) 白名单状态 创建时间 修改时间 - 操作 + 操作 -