fix(cr2-frontend): 代理归属回退、换号继承确认与请求竞态收口

- CR-04:全局代理加 proxy_uid 归属,跨账号不再静默回退/补报
- CR-12:取消静默继承,设置页显式确认;同 OS 作用域、locked 代理排除、无效快照清除、uid+epoch 双校验、登出 capture 超时
- CR-26/27:关键词分页初始值与档位一致;两页面请求序号闸丢弃旧响应

vue-tsc 两前端 rc=0;定向 35 + 8 + 2 例全绿。
This commit is contained in:
2026-10-26 11:33:37 +08:00
parent b5e4c45add
commit b963561043
16 changed files with 1245 additions and 136 deletions
@@ -10,6 +10,7 @@ import { showAdminFeedback } from '@/components/admin-feedback-ui'
import { openAdminConfirm } from '@/components/admin-confirm'
import OldPagination from '@/components/OldPagination.vue'
import LoadFailureBar from '@/components/LoadFailureBar.vue'
import { createLatestRequestGate } from '@/utils/latest-request'
import {
GATING_COUNTRIES,
GATING_SOURCES,
@@ -50,6 +51,10 @@ const batchText = ref('')
const importBusy = ref(false)
const busyRowId = ref(0)
// 快速改筛选/翻页时先发的请求可能后返回;列表与统计各一个序号闸(CR-27)
const pageGate = createLatestRequestGate()
const statsGate = createLatestRequestGate()
const countryOptions = GATING_COUNTRIES.filter((country) => country !== '全部')
const typeOptions = GATING_TYPES
@@ -72,30 +77,37 @@ function feedback(message: string, kind: AdminFeedbackKind): void {
}
async function loadStats(): Promise<void> {
const token = statsGate.begin()
statsLoading.value = true
statsError.value = ''
try {
stats.value = await fetchBrandGatingStats()
const result = await fetchBrandGatingStats()
if (!statsGate.isCurrent(token)) return
stats.value = result
} catch (error) {
if (!statsGate.isCurrent(token)) return
statsError.value = actionableErrorText(error)
} finally {
statsLoading.value = false
if (statsGate.isCurrent(token)) statsLoading.value = false
}
}
async function loadPage(nextPage = page.value): Promise<void> {
const token = pageGate.begin()
pageLoading.value = true
loadError.value = ''
try {
const result = await fetchBrandGatingPage(filter, nextPage, pageSize.value)
if (!pageGate.isCurrent(token)) return
rows.value = result.rows
total.value = result.total
page.value = nextPage
loaded.value = true
} catch (error) {
if (!pageGate.isCurrent(token)) return
loadError.value = actionableErrorText(error)
} finally {
pageLoading.value = false
if (pageGate.isCurrent(token)) pageLoading.value = false
}
}
@@ -10,7 +10,9 @@ import { useCompanyTabStore } from '@/stores/company-tab'
import { actionableErrorText } from '@/components/admin-feedback'
import OldPagination from '@/components/OldPagination.vue'
import LoadFailureBar from '@/components/LoadFailureBar.vue'
import { createLatestRequestGate } from '@/utils/latest-request'
import {
KEYWORD_USAGE_PAGE_SIZE,
KEYWORD_USAGE_SCENES,
createKeywordUsageFilter,
keywordUsageCountsText,
@@ -40,16 +42,21 @@ const overviewLoading = ref(false)
const usageRows = ref<KeywordUsageRow[]>([])
const usageTotal = ref(0)
const usagePage = ref(1)
const usagePageSize = ref(15)
const usagePageSize = ref(KEYWORD_USAGE_PAGE_SIZE)
const usageCounts = ref<KeywordUsageCounts>({ copy: 0, copyExisting: 0, copyDeleted: 0, add: 0 })
const usageLoading = ref(false)
const deleteRows = ref<KeywordUsageRow[]>([])
const deleteTotal = ref(0)
const deletePage = ref(1)
const deletePageSize = ref(15)
const deletePageSize = ref(KEYWORD_USAGE_PAGE_SIZE)
const deleteLoading = ref(false)
// 切公司/快速改筛选时,先发的请求可能后返回;每个加载口径各一个序号闸(CR-27)
const overviewGate = createLatestRequestGate()
const usageGate = createLatestRequestGate()
const deleteGate = createLatestRequestGate()
const statsCards = computed(() => {
const stats = overview.value?.stats
return [
@@ -76,42 +83,52 @@ function queryParams() {
}
async function loadOverview(): Promise<void> {
const token = overviewGate.begin()
overviewLoading.value = true
try {
overview.value = await fetchKeywordUsageOverview({ companyId: companyTab.requestCompanyId })
const result = await fetchKeywordUsageOverview({ companyId: companyTab.requestCompanyId })
if (!overviewGate.isCurrent(token)) return
overview.value = result
} catch (error) {
if (!overviewGate.isCurrent(token)) return
loadError.value = actionableErrorText(error)
} finally {
overviewLoading.value = false
if (overviewGate.isCurrent(token)) overviewLoading.value = false
}
}
async function loadUsage(page = usagePage.value): Promise<void> {
const token = usageGate.begin()
usageLoading.value = true
try {
const result = await fetchKeywordUsage({ ...queryParams(), page, pageSize: usagePageSize.value })
if (!usageGate.isCurrent(token)) return
usageRows.value = result.rows
usageTotal.value = result.total
usageCounts.value = result.counts
usagePage.value = page
} catch (error) {
if (!usageGate.isCurrent(token)) return
loadError.value = actionableErrorText(error)
} finally {
usageLoading.value = false
if (usageGate.isCurrent(token)) usageLoading.value = false
}
}
async function loadDeletes(page = deletePage.value): Promise<void> {
const token = deleteGate.begin()
deleteLoading.value = true
try {
const result = await fetchKeywordUsageDeletes({ ...queryParams(), page, pageSize: deletePageSize.value })
if (!deleteGate.isCurrent(token)) return
deleteRows.value = result.rows
deleteTotal.value = result.total
deletePage.value = page
} catch (error) {
if (!deleteGate.isCurrent(token)) return
loadError.value = actionableErrorText(error)
} finally {
deleteLoading.value = false
if (deleteGate.isCurrent(token)) deleteLoading.value = false
}
}
@@ -55,6 +55,9 @@ export interface KeywordUsageOverview {
export const KEYWORD_USAGE_SCENES = ['已使用', '添加关键词'] as const
/** 初始每页条数:必须落在 OldPagination 的档位(10/20/50/100)里(CR-26)。 */
export const KEYWORD_USAGE_PAGE_SIZE = 10
export function createKeywordUsageFilter(): KeywordUsageFilter {
return { user: '', country: '', keyword: '', scene: '' }
}
@@ -0,0 +1,27 @@
/**
* 只让最后一次请求落地(CR-27)。
*
* 快速切公司/筛选时,先发的请求可能后返回;如果直接写 ref,旧响应会覆盖新结果。
* 每个加载函数在发请求前 `begin()` 拿一个 token,回写前 `isCurrent(token)` 验一次;
* 新请求一发出,旧 token 立即作废(不需要 AbortController 也能丢掉晚到的响应)。
*/
export interface LatestRequestGate {
/** 开一次新请求并作废之前所有 token(含未返回的那些)。 */
begin(): number
/** 这个 token 是否仍是最后一次 `begin()` 发出的。 */
isCurrent(token: number): boolean
}
export function createLatestRequestGate(): LatestRequestGate {
let latest = 0
return {
begin(): number {
latest += 1
return latest
},
isCurrent(token: number): boolean {
// token 只由 begin() 发出(从 1 起);0 不是合法 token,避免未发请求时误判为当前
return token > 0 && token === latest
},
}
}