后管(四面9分批次): 裸提示 92→0、裸 confirm 24→0 且逐处 await、失败态可见并真能重试
- ElMessage.error 全收进 showAdminFeedback(例外清单 CAP=0,唯一保留的裸调用是出口本体); window.confirm 24 处全部改成 await 的 openAdminConfirm(逐处核过所在函数本就 async, 不存在"点了确认不执行"的异步断层)。 - 新增 load-failure-model + LoadFailureBar:22/23 个取数页有失败态与真重试 (只有"知道了"清条不算过),例外仅登录页。 - DedupeRegistryPage / DuplicateCheckPage 补 onUnmounted,并加全树定时器/监听配对判据。 - 去重页那处"能点但后端 403":读侧认 wholeCompany、写侧只认 groupIds/userIds 的不对称 本轮没动后端(前端拿不到与写侧同集合的 groupIds,按它置灰会误伤同事名下真能改的行=静默删功能); 先修更实在的一半——403 的中文原因此前整段丢失,现在走统一文案到界面。 - 验收:node --test 1,818 例 0 红、npx vue-tsc --noEmit rc=0;5 支新判据 26 例。
This commit is contained in:
@@ -1,6 +1,7 @@
|
||||
<script setup lang="ts">
|
||||
import { ElMessage } from 'element-plus'
|
||||
import { copyFeedback, isCopySupported } from './copy-model'
|
||||
import { showAdminFeedback } from '@/components/admin-feedback-ui'
|
||||
|
||||
const props = defineProps<{ text: string }>()
|
||||
|
||||
@@ -13,7 +14,7 @@ async function handleCopy(): Promise<void> {
|
||||
await navigator.clipboard.writeText(props.text)
|
||||
ElMessage.success(copyFeedback(props.text))
|
||||
} catch {
|
||||
ElMessage.error(copyFeedback(''))
|
||||
showAdminFeedback(copyFeedback(''), 'error')
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
@@ -0,0 +1,53 @@
|
||||
<script setup lang="ts">
|
||||
/** 列表加载失败条(四面9分口径 · 后管「模板内失败态只有 4/24 页」)。
|
||||
* 两件事一起做:把失败原因留在页面上(不是一闪而过的 toast),并给出一个真能重跑的出口。
|
||||
* 重试动作由父页面传回自己的取数函数,本组件不自己发请求、也不放占位按钮。 */
|
||||
import { LOAD_FAILURE_RETRY_LABEL } from './load-failure-model'
|
||||
|
||||
defineProps<{ message: string }>()
|
||||
defineEmits<{ (event: 'retry'): void }>()
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<div class="load-failure-bar" role="alert">
|
||||
<span class="load-failure-bar-text">{{ message }}</span>
|
||||
<button class="load-failure-bar-retry" type="button" @click="$emit('retry')">{{ LOAD_FAILURE_RETRY_LABEL }}</button>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<style scoped>
|
||||
/* 自带样式:各页的 .btn 是 scoped 的,套不到子组件内部的元素上。 */
|
||||
.load-failure-bar {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
gap: 12px;
|
||||
margin: 0 0 14px;
|
||||
padding: 10px 14px;
|
||||
border: 1px solid #e0bfc4;
|
||||
border-radius: 10px;
|
||||
background: #fdf3f4;
|
||||
color: #8f4650;
|
||||
font-size: 13px;
|
||||
line-height: 1.6;
|
||||
}
|
||||
.load-failure-bar-text {
|
||||
min-width: 0;
|
||||
overflow-wrap: anywhere;
|
||||
}
|
||||
.load-failure-bar-retry {
|
||||
flex: none;
|
||||
min-height: 32px;
|
||||
padding: 5px 14px;
|
||||
border: 1px solid #b35f6a;
|
||||
border-radius: 8px;
|
||||
background: linear-gradient(135deg, #c06d77, #b35f6a);
|
||||
color: #ffffff;
|
||||
font-family: inherit;
|
||||
font-size: 13px;
|
||||
cursor: pointer;
|
||||
}
|
||||
.load-failure-bar-retry:hover {
|
||||
background: linear-gradient(135deg, #cb7c84, #b96570);
|
||||
}
|
||||
</style>
|
||||
@@ -341,7 +341,7 @@ async function readAll() {
|
||||
unreadCount.value = 0
|
||||
} catch (error) {
|
||||
console.warn('[admin-notification] 全部已读失败:', error)
|
||||
ElMessage.error(error instanceof Error ? error.message : '操作失败')
|
||||
showAdminFeedback(error instanceof Error ? error.message : '操作失败', 'error')
|
||||
} finally {
|
||||
markingAll.value = false
|
||||
}
|
||||
|
||||
@@ -0,0 +1,49 @@
|
||||
/**
|
||||
* 列表加载失败态模型(四面9分口径 · 后管「模板内失败态只有 4/24 页」):
|
||||
* 把「请求失败了」归一成一条可读中文,配 LoadFailureBar.vue 的那个真能重跑的按钮用。
|
||||
*
|
||||
* 纯逻辑、不依赖 Vue 也不依赖 Element,`node --test` 直接 import 跑行为断言。
|
||||
* 文案把关复用 api/user-notice:后端把底层异常原文拼进 message 时,界面只留中文主干。
|
||||
*/
|
||||
import { userNotice } from '../api/user-notice.ts'
|
||||
|
||||
/** 失败条上那个按钮的字样:必须是「重试」而不是一句「知道了」——撤入口同时得是出口。 */
|
||||
export const LOAD_FAILURE_RETRY_LABEL = '重试'
|
||||
|
||||
/** 从 axios 错误 / Error / 字符串里取后端给的原因;取不到、或原文不是中文时返回空串。 */
|
||||
export function failureDetail(error: unknown): string {
|
||||
const data = (error as { response?: { data?: unknown } } | undefined)?.response?.data
|
||||
if (data && typeof data === 'object') {
|
||||
const record = data as Record<string, unknown>
|
||||
for (const key of ['message', 'error', 'msg']) {
|
||||
const value = record[key]
|
||||
if (typeof value === 'string' && value.trim()) return userNotice(value, '')
|
||||
}
|
||||
}
|
||||
if (error instanceof Error && error.message.trim()) return userNotice(error.message, '')
|
||||
if (typeof error === 'string' && error.trim()) return userNotice(error, '')
|
||||
return ''
|
||||
}
|
||||
|
||||
/**
|
||||
* 后端按范围拒掉的句子(`无权操作该总数据`、`缺少归属公司…`)补一句人话:
|
||||
* 这类失败不是页面坏了,重试一百次也是同一个结果,得把出路说清楚。
|
||||
*/
|
||||
export const SCOPE_REFUSAL_NOTE = '这一行不在你当前可操作的分组/公司范围内,需要由平台超级管理员处理'
|
||||
const SCOPE_REFUSAL = /无权|缺少归属公司/
|
||||
|
||||
/** 命中范围拒绝时返回补充说明,否则空串。 */
|
||||
export function scopeRefusalNote(detail: string): string {
|
||||
return SCOPE_REFUSAL.test(detail || '') ? SCOPE_REFUSAL_NOTE : ''
|
||||
}
|
||||
|
||||
/** 「本页兜底文案:后端原因」;没有可读原因时只留兜底文案,不拼出「加载失败:」这种半截句。 */
|
||||
export function loadFailureMessage(error: unknown, fallback: string): string {
|
||||
const head = (fallback || '').trim()
|
||||
const detail = failureDetail(error)
|
||||
if (!detail) return head
|
||||
const note = scopeRefusalNote(detail)
|
||||
const reason = note ? `${detail}(${note})` : detail
|
||||
if (!head || head.includes(detail)) return head || reason
|
||||
return `${head}:${reason}`
|
||||
}
|
||||
@@ -1,7 +1,7 @@
|
||||
<script setup lang="ts">
|
||||
import { computed, watch } from 'vue'
|
||||
import { useRoute, useRouter } from 'vue-router'
|
||||
import { ElMessage, ElMessageBox } from 'element-plus'
|
||||
import { ElMessageBox } from 'element-plus'
|
||||
import { useAdminSessionStore } from '@/stores/admin-session'
|
||||
import { joinAdminPath } from '@/config/app'
|
||||
import { pageTitleOf, topbarUserOf } from '@/layout/topbar-model'
|
||||
@@ -17,6 +17,7 @@ import ExpiryNotice from '@/components/ExpiryNotice.vue'
|
||||
import OperationGuide from '@/layout/OperationGuide.vue'
|
||||
import CompanyTabs from '@/layout/CompanyTabs.vue'
|
||||
import { crumbsForActiveRoute, resolveDocumentTitle, updateDocumentTitle } from '@/layout/title-breadcrumb'
|
||||
import { showAdminFeedback } from '@/components/admin-feedback-ui'
|
||||
import {
|
||||
LOGOUT_CONFIRM_CANCEL,
|
||||
LOGOUT_CONFIRM_MESSAGE,
|
||||
@@ -59,7 +60,7 @@ async function signOut() {
|
||||
signOut: () => session.signOut(),
|
||||
})
|
||||
} catch (error) {
|
||||
ElMessage.error(error instanceof Error ? error.message : '退出登录失败')
|
||||
showAdminFeedback(error instanceof Error ? error.message : '退出登录失败', 'error')
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
@@ -3,16 +3,19 @@
|
||||
* 可见范围由后端收窄(超管全部、公司内 admin 只自己公司);写操作仅超管,这里隐藏入口只是配合,
|
||||
* 真正的把关在 CompanyController,页面不得当作权限边界。 */
|
||||
import { computed, onMounted, ref } from 'vue'
|
||||
import { ElMessage } from 'element-plus'
|
||||
|
||||
import { formatDateTime } from '@/utils/datetime'
|
||||
import { fetchCompanies } from '@/api/companies'
|
||||
import { COMPANY_STATUS_ACTIVE, type CompanyItem } from '@/api/companies-dto'
|
||||
import { useAdminSessionStore } from '@/stores/admin-session'
|
||||
import OldPagination from '@/components/OldPagination.vue'
|
||||
import CompanyEditorDialog from './CompanyEditorDialog.vue'
|
||||
import { showAdminFeedback } from '@/components/admin-feedback-ui'
|
||||
import LoadFailureBar from '@/components/LoadFailureBar.vue'
|
||||
|
||||
const session = useAdminSessionStore()
|
||||
const loading = ref(false)
|
||||
const loadFailure = ref('')
|
||||
const rows = ref<CompanyItem[]>([])
|
||||
const editorVisible = ref(false)
|
||||
const editingCompany = ref<CompanyItem | null>(null)
|
||||
@@ -33,10 +36,12 @@ function changeSize(size: number) { pageSize.value = size; page.value = 1 }
|
||||
|
||||
async function loadCompanies() {
|
||||
loading.value = true
|
||||
loadFailure.value = ''
|
||||
try {
|
||||
rows.value = await fetchCompanies()
|
||||
} catch (error) {
|
||||
ElMessage.error(error instanceof Error ? error.message : '公司列表加载失败')
|
||||
loadFailure.value = error instanceof Error ? error.message : '公司列表加载失败'
|
||||
showAdminFeedback(loadFailure.value, 'error')
|
||||
} finally {
|
||||
loading.value = false
|
||||
}
|
||||
@@ -70,6 +75,7 @@ onMounted(loadCompanies)
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<LoadFailureBar v-if="loadFailure" :message="loadFailure" @retry="loadCompanies" />
|
||||
<div class="table-scroll">
|
||||
<table>
|
||||
<thead>
|
||||
|
||||
@@ -11,10 +11,13 @@ import { deleteShopGroup, fetchShopGroups } from './shop-group-api'
|
||||
import type { ShopGroupItem } from './shop-group-model'
|
||||
import GroupEditorDialog from './GroupEditorDialog.vue'
|
||||
import OldPagination from '@/components/OldPagination.vue'
|
||||
import { showAdminFeedback } from '@/components/admin-feedback-ui'
|
||||
import LoadFailureBar from '@/components/LoadFailureBar.vue'
|
||||
|
||||
const session = useAdminSessionStore()
|
||||
const companyTab = useCompanyTabStore()
|
||||
const loading = ref(false)
|
||||
const loadFailure = ref('')
|
||||
const rows = ref<ShopGroupItem[]>([])
|
||||
const editorVisible = ref(false)
|
||||
const editingGroup = ref<ShopGroupItem | null>(null)
|
||||
@@ -47,10 +50,12 @@ function canEditOf(group: ShopGroupItem): boolean {
|
||||
|
||||
async function loadGroups() {
|
||||
loading.value = true
|
||||
loadFailure.value = ''
|
||||
try {
|
||||
rows.value = await fetchShopGroups(companyTab.requestCompanyId)
|
||||
} catch (error) {
|
||||
ElMessage.error(error instanceof Error ? error.message : '数据权限分组加载失败')
|
||||
loadFailure.value = error instanceof Error ? error.message : '数据权限分组加载失败'
|
||||
showAdminFeedback(loadFailure.value, 'error')
|
||||
} finally {
|
||||
loading.value = false
|
||||
}
|
||||
@@ -78,7 +83,7 @@ async function removeGroup(group: ShopGroupItem) {
|
||||
ElMessage.success('删除成功')
|
||||
await loadGroups()
|
||||
} catch (error) {
|
||||
ElMessage.error(error instanceof Error ? error.message : '删除失败')
|
||||
showAdminFeedback(error instanceof Error ? error.message : '删除失败', 'error')
|
||||
}
|
||||
}
|
||||
|
||||
@@ -104,6 +109,7 @@ onMounted(loadGroups)
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<LoadFailureBar v-if="loadFailure" :message="loadFailure" @retry="loadGroups" />
|
||||
<div class="table-scroll">
|
||||
<table>
|
||||
<thead>
|
||||
|
||||
@@ -7,6 +7,9 @@ import { ElMessage, ElMessageBox } from 'element-plus'
|
||||
import OldPagination from '@/components/OldPagination.vue'
|
||||
import { useCompanyTabStore } from '@/stores/company-tab'
|
||||
import { createMenu, deleteMenu, loadMenuManageTree, reorderMenus, updateMenu } from './menu-manage-api'
|
||||
import { showAdminFeedback } from '@/components/admin-feedback-ui'
|
||||
import { openAdminConfirm } from '@/components/admin-confirm'
|
||||
import LoadFailureBar from '@/components/LoadFailureBar.vue'
|
||||
import {
|
||||
MENU_TYPE_OPTIONS,
|
||||
createMenuForm,
|
||||
@@ -31,6 +34,7 @@ interface MenuRow extends MenuManageNode {
|
||||
|
||||
const companyTab = useCompanyTabStore()
|
||||
const loading = ref(false)
|
||||
const loadFailure = ref('')
|
||||
const rows = ref<MenuManageNode[]>([])
|
||||
/** 筛选:菜单名称/类型(用户要求账户域子菜单补筛选条件)。 */
|
||||
const filterName = ref('')
|
||||
@@ -85,10 +89,12 @@ function parentNameOf(node: MenuManageNode): string {
|
||||
|
||||
async function loadMenus() {
|
||||
loading.value = true
|
||||
loadFailure.value = ''
|
||||
try {
|
||||
rows.value = await loadMenuManageTree(companyTab.requestCompanyId)
|
||||
} catch (error) {
|
||||
ElMessage.error(error instanceof Error ? error.message : '菜单列表加载失败')
|
||||
loadFailure.value = error instanceof Error ? error.message : '菜单列表加载失败'
|
||||
showAdminFeedback(loadFailure.value, 'error')
|
||||
} finally {
|
||||
loading.value = false
|
||||
}
|
||||
@@ -154,7 +160,7 @@ async function onDrop(event: DragEvent, target: MenuManageNode): Promise<void> {
|
||||
ElMessage.success('排序已保存')
|
||||
await loadMenus()
|
||||
} catch (error) {
|
||||
ElMessage.error(error instanceof Error ? error.message : '排序保存失败')
|
||||
showAdminFeedback(error instanceof Error ? error.message : '排序保存失败', 'error')
|
||||
}
|
||||
}
|
||||
|
||||
@@ -183,7 +189,7 @@ async function saveMenu() {
|
||||
createVisible.value = false
|
||||
await loadMenus()
|
||||
} catch (error) {
|
||||
ElMessage.error(error instanceof Error ? error.message : '保存失败')
|
||||
showAdminFeedback(error instanceof Error ? error.message : '保存失败', 'error')
|
||||
} finally {
|
||||
saving.value = false
|
||||
}
|
||||
@@ -196,13 +202,13 @@ async function removeMenu(node: MenuManageNode) {
|
||||
return
|
||||
}
|
||||
// 对齐旧版:原生 confirm。
|
||||
if (!window.confirm(`确定删除菜单“${node.name}”吗?`)) return
|
||||
if (!(await openAdminConfirm({ message: `确定删除菜单“${node.name}”吗?`, danger: true }))) return
|
||||
try {
|
||||
await deleteMenu(node.id)
|
||||
ElMessage.success('删除成功')
|
||||
await loadMenus()
|
||||
} catch (error) {
|
||||
ElMessage.error(error instanceof Error ? error.message : '删除失败')
|
||||
showAdminFeedback(error instanceof Error ? error.message : '删除失败', 'error')
|
||||
}
|
||||
}
|
||||
|
||||
@@ -238,6 +244,7 @@ onMounted(loadMenus)
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<LoadFailureBar v-if="loadFailure" :message="loadFailure" @retry="loadMenus" />
|
||||
<div class="table-scroll columns-table-scroll">
|
||||
<table>
|
||||
<thead>
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<script setup lang="ts">
|
||||
import { computed, onMounted, ref, watch } from 'vue'
|
||||
import { ElMessage } from 'element-plus'
|
||||
|
||||
import OldPagination from '@/components/OldPagination.vue'
|
||||
import { orderedPair, todayDateInput } from '@/utils/datetime'
|
||||
import {
|
||||
@@ -10,6 +10,8 @@ import {
|
||||
import type { GroupOption } from '@/api/user-secrets'
|
||||
import { useAdminSessionStore } from '@/stores/admin-session'
|
||||
import { useCompanyTabStore } from '@/stores/company-tab'
|
||||
import { showAdminFeedback } from '@/components/admin-feedback-ui'
|
||||
import LoadFailureBar from '@/components/LoadFailureBar.vue'
|
||||
|
||||
const session = useAdminSessionStore()
|
||||
const companyTab = useCompanyTabStore()
|
||||
@@ -17,6 +19,7 @@ const companyTab = useCompanyTabStore()
|
||||
const isSuperAdmin = computed(() => session.isSuperAdmin)
|
||||
|
||||
const loading = ref(false)
|
||||
const loadFailure = ref('')
|
||||
const rows = ref<AdminUserSecretUsageRow[]>([])
|
||||
const total = ref(0)
|
||||
const page = ref(1)
|
||||
@@ -46,6 +49,7 @@ function formatCount(value: number | undefined) {
|
||||
|
||||
async function load() {
|
||||
loading.value = true
|
||||
loadFailure.value = ''
|
||||
try {
|
||||
const result = await fetchUserSecretUsage({
|
||||
startDate: startDate.value || undefined,
|
||||
@@ -66,7 +70,8 @@ async function load() {
|
||||
proxyCalls: Number(result?.proxyCalls || 0),
|
||||
}
|
||||
} catch (error) {
|
||||
ElMessage.error(error instanceof Error ? error.message : '加载失败')
|
||||
loadFailure.value = error instanceof Error ? error.message : '加载失败'
|
||||
showAdminFeedback(loadFailure.value, 'error')
|
||||
} finally {
|
||||
loading.value = false
|
||||
}
|
||||
@@ -160,6 +165,7 @@ onMounted(load)
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<LoadFailureBar v-if="loadFailure" :message="loadFailure" @retry="load" />
|
||||
<div class="usage-table-scroll">
|
||||
<table>
|
||||
<thead>
|
||||
|
||||
@@ -15,6 +15,9 @@ import {
|
||||
} from '@/api/user-secrets'
|
||||
import { useAdminSessionStore } from '@/stores/admin-session'
|
||||
import { useCompanyTabStore } from '@/stores/company-tab'
|
||||
import { showAdminFeedback } from '@/components/admin-feedback-ui'
|
||||
import { openAdminConfirm } from '@/components/admin-confirm'
|
||||
import LoadFailureBar from '@/components/LoadFailureBar.vue'
|
||||
|
||||
const session = useAdminSessionStore()
|
||||
const companyTab = useCompanyTabStore()
|
||||
@@ -22,6 +25,7 @@ const companyTab = useCompanyTabStore()
|
||||
const isSuperAdmin = computed(() => session.isSuperAdmin)
|
||||
|
||||
const loading = ref(false)
|
||||
const loadFailure = ref('')
|
||||
const rows = ref<AdminUserSecretRow[]>([])
|
||||
const total = ref(0)
|
||||
const page = ref(1)
|
||||
@@ -111,6 +115,7 @@ function rowStatusTooltip(row: AdminUserSecretRow) {
|
||||
|
||||
async function load() {
|
||||
loading.value = true
|
||||
loadFailure.value = ''
|
||||
try {
|
||||
const result = await fetchUserSecretList({
|
||||
keyword: keyword.value.trim() || undefined,
|
||||
@@ -124,7 +129,8 @@ async function load() {
|
||||
total.value = Number(result?.total || 0)
|
||||
groupOptions.value = result?.groupOptions || []
|
||||
} catch (error) {
|
||||
ElMessage.error(error instanceof Error ? error.message : '加载失败')
|
||||
loadFailure.value = error instanceof Error ? error.message : '加载失败'
|
||||
showAdminFeedback(loadFailure.value, 'error')
|
||||
} finally {
|
||||
loading.value = false
|
||||
}
|
||||
@@ -166,7 +172,7 @@ async function check(row: AdminUserSecretRow) {
|
||||
}
|
||||
load()
|
||||
} catch (error) {
|
||||
ElMessage.error(error instanceof Error ? error.message : '检测失败')
|
||||
showAdminFeedback(error instanceof Error ? error.message : '检测失败', 'error')
|
||||
} finally {
|
||||
checkingId.value = null
|
||||
}
|
||||
@@ -174,13 +180,13 @@ async function check(row: AdminUserSecretRow) {
|
||||
|
||||
async function remove(row: AdminUserSecretRow) {
|
||||
const who = row.username || `UID ${row.userId}`
|
||||
if (!window.confirm(`确定清空「${who}」的全部密钥与代理配置吗?后台锁定的代理会一并清除并解锁,该用户需要重新配置。`)) return
|
||||
if (!(await openAdminConfirm({ message: `确定清空「${who}」的全部密钥与代理配置吗?后台锁定的代理会一并清除并解锁,该用户需要重新配置。`, danger: true }))) return
|
||||
try {
|
||||
await deleteUserSecret(row.userId)
|
||||
ElMessage.success('已清空')
|
||||
load()
|
||||
} catch (error) {
|
||||
ElMessage.error(error instanceof Error ? error.message : '清空失败')
|
||||
showAdminFeedback(error instanceof Error ? error.message : '清空失败', 'error')
|
||||
}
|
||||
}
|
||||
|
||||
@@ -203,7 +209,7 @@ async function fillProxy(row: AdminUserSecretRow) {
|
||||
ElMessage.success(row.proxy?.locked ? '已更新锁定代理' : '已代填并锁定代理')
|
||||
load()
|
||||
} catch (error) {
|
||||
ElMessage.error(error instanceof Error ? error.message : '代填失败')
|
||||
showAdminFeedback(error instanceof Error ? error.message : '代填失败', 'error')
|
||||
} finally {
|
||||
proxyBusyId.value = null
|
||||
}
|
||||
@@ -212,14 +218,14 @@ async function fillProxy(row: AdminUserSecretRow) {
|
||||
/** 解锁代理:清空后台代填值,该用户恢复自行配置。 */
|
||||
async function unlockProxy(row: AdminUserSecretRow) {
|
||||
const who = row.username || `UID ${row.userId}`
|
||||
if (!window.confirm(`确定解除「${who}」的代理锁定吗?解锁后当前后台代理值会被清空,客户端恢复自行配置。`)) return
|
||||
if (!(await openAdminConfirm({ message: `确定解除「${who}」的代理锁定吗?解锁后当前后台代理值会被清空,客户端恢复自行配置。`, danger: true }))) return
|
||||
proxyBusyId.value = row.userId
|
||||
try {
|
||||
await clearUserSecretModule(row.userId, 'proxy')
|
||||
ElMessage.success('已解锁')
|
||||
load()
|
||||
} catch (error) {
|
||||
ElMessage.error(error instanceof Error ? error.message : '解锁失败')
|
||||
showAdminFeedback(error instanceof Error ? error.message : '解锁失败', 'error')
|
||||
} finally {
|
||||
proxyBusyId.value = null
|
||||
}
|
||||
@@ -274,6 +280,7 @@ onMounted(load)
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<LoadFailureBar v-if="loadFailure" :message="loadFailure" @retry="load" />
|
||||
<div class="secrets-table-scroll">
|
||||
<table>
|
||||
<thead>
|
||||
|
||||
@@ -20,6 +20,8 @@ import { formatExpiryCell } from './user-expiry'
|
||||
import CreateUserDialog from './CreateUserDialog.vue'
|
||||
import EditUserDialog from './EditUserDialog.vue'
|
||||
import OldPagination from '@/components/OldPagination.vue'
|
||||
import { showAdminFeedback } from '@/components/admin-feedback-ui'
|
||||
import { openAdminConfirm } from '@/components/admin-confirm'
|
||||
|
||||
const session = useAdminSessionStore()
|
||||
const companyTab = useCompanyTabStore()
|
||||
@@ -84,7 +86,7 @@ async function loadUsers() {
|
||||
}
|
||||
} catch (error) {
|
||||
loadError.value = error instanceof Error ? error.message : '用户列表加载失败'
|
||||
ElMessage.error(loadError.value)
|
||||
showAdminFeedback(loadError.value, 'error')
|
||||
} finally {
|
||||
loading.value = false
|
||||
}
|
||||
@@ -108,13 +110,13 @@ async function removeUser(row: AdminUser) {
|
||||
return
|
||||
}
|
||||
// 对齐旧版:浏览器原生 confirm 确认后删除。
|
||||
if (!window.confirm(deleteConfirmMessage(row))) return
|
||||
if (!(await openAdminConfirm({ message: deleteConfirmMessage(row), danger: true }))) return
|
||||
try {
|
||||
await deleteUser(row.id)
|
||||
ElMessage.success('删除成功')
|
||||
await loadUsers()
|
||||
} catch (error) {
|
||||
ElMessage.error(error instanceof Error ? error.message : '删除失败')
|
||||
showAdminFeedback(error instanceof Error ? error.message : '删除失败', 'error')
|
||||
}
|
||||
}
|
||||
|
||||
@@ -126,13 +128,13 @@ async function toggleDisable(row: AdminUser) {
|
||||
ElMessage.warning(reason)
|
||||
return
|
||||
}
|
||||
if (!window.confirm(disableConfirmMessage(row, wantDisable))) return
|
||||
if (!(await openAdminConfirm({ message: disableConfirmMessage(row, wantDisable), danger: false }))) return
|
||||
try {
|
||||
await setUserDisabled(row.id, wantDisable)
|
||||
ElMessage.success(wantDisable ? '已停用,该账号会被强制退出到登录页' : '已解除停用')
|
||||
await loadUsers()
|
||||
} catch (error) {
|
||||
ElMessage.error(error instanceof Error ? error.message : '操作失败')
|
||||
showAdminFeedback(error instanceof Error ? error.message : '操作失败', 'error')
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -11,8 +11,12 @@ import { invalidAsinDeleteText, recordSourceLabel } from '../invalidasin/invalid
|
||||
import { createEmptyInvalidAsinForm, invalidAsinFormFromItem, validateInvalidAsinForm } from '../invalidasin/invalid-asin-form-model.ts'
|
||||
import type { ShopGroupOption } from '../shop/shop-dto.ts'
|
||||
import OldPagination from '@/components/OldPagination.vue'
|
||||
import { showAdminFeedback } from '@/components/admin-feedback-ui'
|
||||
import { openAdminConfirm } from '@/components/admin-confirm'
|
||||
import LoadFailureBar from '@/components/LoadFailureBar.vue'
|
||||
|
||||
const loading = ref(false)
|
||||
const loadFailure = ref('')
|
||||
const rows = ref<InvalidAsinItem[]>([])
|
||||
const total = ref(0)
|
||||
const page = ref(1)
|
||||
@@ -40,6 +44,7 @@ async function loadGroups() {
|
||||
|
||||
async function load() {
|
||||
loading.value = true
|
||||
loadFailure.value = ''
|
||||
try {
|
||||
const result = await fetchInvalidAsinPage({
|
||||
page: page.value,
|
||||
@@ -52,7 +57,8 @@ async function load() {
|
||||
total.value = result.total
|
||||
page.value = result.page
|
||||
} catch (error) {
|
||||
ElMessage.error(error instanceof Error ? error.message : '数据加载失败')
|
||||
loadFailure.value = error instanceof Error ? error.message : '数据加载失败'
|
||||
showAdminFeedback(loadFailure.value, 'error')
|
||||
} finally {
|
||||
loading.value = false
|
||||
}
|
||||
@@ -118,7 +124,7 @@ async function submit() {
|
||||
dialogVisible.value = false
|
||||
load()
|
||||
} catch (error) {
|
||||
ElMessage.error(error instanceof Error ? error.message : '保存失败')
|
||||
showAdminFeedback(error instanceof Error ? error.message : '保存失败', 'error')
|
||||
} finally {
|
||||
saving.value = false
|
||||
}
|
||||
@@ -126,13 +132,13 @@ async function submit() {
|
||||
|
||||
async function remove(row: InvalidAsinItem) {
|
||||
// 对齐旧版:原生 confirm。
|
||||
if (!window.confirm(invalidAsinDeleteText(row))) return
|
||||
if (!(await openAdminConfirm({ message: invalidAsinDeleteText(row), danger: true }))) return
|
||||
try {
|
||||
await deleteInvalidAsin(row.id)
|
||||
ElMessage.success('已删除')
|
||||
load()
|
||||
} catch (error) {
|
||||
ElMessage.error(error instanceof Error ? error.message : '删除失败')
|
||||
showAdminFeedback(error instanceof Error ? error.message : '删除失败', 'error')
|
||||
}
|
||||
}
|
||||
|
||||
@@ -168,6 +174,7 @@ onMounted(() => {
|
||||
<button class="btn" type="button" @click="apply">查询</button>
|
||||
</div>
|
||||
|
||||
<LoadFailureBar v-if="loadFailure" :message="loadFailure" @retry="load" />
|
||||
<div class="table-scroll invalid-asin-table-scroll">
|
||||
<table>
|
||||
<thead>
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
import { formatDateTime, orderedPair } from '@/utils/datetime'
|
||||
/** 数据去重总数据(registry) · 像素复刻旧版 admin.html panel-dedupe-total-data(自绘:分组摘要 + 双行筛选 + 旧式表格/分页 + 编辑/导入弹窗 + 导出等待遮罩)。
|
||||
* script 逻辑沿用现有 Vue 实现(查询/编辑/删除/导入轮询/导出秒表)。 */
|
||||
import { computed, onMounted, reactive, ref, watch } from 'vue'
|
||||
import { computed, onMounted, onUnmounted, reactive, ref, watch } from 'vue'
|
||||
import { ElMessage } from 'element-plus'
|
||||
import {
|
||||
fetchDedupeTotalList,
|
||||
@@ -26,6 +26,10 @@ import { toExportUrl } from './dedupe-total-export.ts'
|
||||
import OldPagination from '@/components/OldPagination.vue'
|
||||
import { useAdminSessionStore } from '@/stores/admin-session'
|
||||
import { useCompanyTabStore } from '@/stores/company-tab'
|
||||
import { showAdminFeedback } from '@/components/admin-feedback-ui'
|
||||
import { loadFailureMessage } from '@/components/load-failure-model'
|
||||
import { openAdminConfirm } from '@/components/admin-confirm'
|
||||
import LoadFailureBar from '@/components/LoadFailureBar.vue'
|
||||
|
||||
const session = useAdminSessionStore()
|
||||
const companyTab = useCompanyTabStore()
|
||||
@@ -33,6 +37,7 @@ const companyTab = useCompanyTabStore()
|
||||
const isSuperAdmin = computed(() => session.isSuperAdmin)
|
||||
|
||||
const loading = ref(false)
|
||||
const loadFailure = ref('')
|
||||
const rows = ref<DedupeTotalItem[]>([])
|
||||
const total = ref(0)
|
||||
const page = ref(1)
|
||||
@@ -79,6 +84,8 @@ const exporting = ref(false)
|
||||
const exportWaitVisible = ref(false)
|
||||
const exportWaitSeconds = ref(0)
|
||||
let exportWaitTimer: ReturnType<typeof setInterval> | null = null
|
||||
/** 页面已卸载:导入轮询的下一拍不再发请求(离开页面后不该再挂 5 分钟的节拍)。 */
|
||||
let pageDisposed = false
|
||||
|
||||
function startExportWait(): void {
|
||||
exportWaitSeconds.value = 0
|
||||
@@ -98,6 +105,7 @@ function stopExportWait(): void {
|
||||
|
||||
async function load(): Promise<void> {
|
||||
loading.value = true
|
||||
loadFailure.value = ''
|
||||
try {
|
||||
const result = await fetchDedupeTotalList(
|
||||
toDedupeListParams(filter, page.value, pageSize.value, pendingCursor, companyTab.requestCompanyId),
|
||||
@@ -109,7 +117,8 @@ async function load(): Promise<void> {
|
||||
pageCursor.value = result.nextLastId ?? null
|
||||
pendingCursor = null
|
||||
} catch (error) {
|
||||
ElMessage.error(error instanceof Error ? error.message : '去重数据加载失败')
|
||||
loadFailure.value = loadFailureMessage(error, '去重数据加载失败')
|
||||
showAdminFeedback(loadFailure.value, 'error')
|
||||
} finally {
|
||||
loading.value = false
|
||||
}
|
||||
@@ -173,7 +182,7 @@ async function saveEdit(): Promise<void> {
|
||||
ElMessage.success('保存成功')
|
||||
await load()
|
||||
} catch (error) {
|
||||
ElMessage.error(error instanceof Error ? error.message : '保存失败')
|
||||
showAdminFeedback(loadFailureMessage(error, '保存失败'), 'error')
|
||||
} finally {
|
||||
editSaving.value = false
|
||||
}
|
||||
@@ -181,13 +190,13 @@ async function saveEdit(): Promise<void> {
|
||||
|
||||
async function removeRow(row: DedupeTotalItem): Promise<void> {
|
||||
// 对齐旧版:浏览器原生 confirm 确认后删除。
|
||||
if (!window.confirm(`确定删除总数据“${row.dataValue}”吗?`)) return
|
||||
if (!(await openAdminConfirm({ message: `确定删除总数据“${row.dataValue}”吗?`, danger: true }))) return
|
||||
try {
|
||||
await deleteDedupeTotal(row.id)
|
||||
ElMessage.success('删除成功')
|
||||
await load()
|
||||
} catch (error) {
|
||||
ElMessage.error(error instanceof Error ? error.message : '删除失败')
|
||||
showAdminFeedback(loadFailureMessage(error, '删除失败'), 'error')
|
||||
}
|
||||
}
|
||||
|
||||
@@ -237,6 +246,7 @@ function sleep(ms: number): Promise<void> {
|
||||
|
||||
async function pollImport(poll: () => Promise<DedupeImportProgress>): Promise<DedupeImportProgress> {
|
||||
for (let i = 0; i < 300; i += 1) {
|
||||
if (pageDisposed) throw new Error('页面已离开,导入进度停止跟踪')
|
||||
const progress = await poll()
|
||||
importProgress.value = importOutcomeText(progress)
|
||||
if (importTaskFinished(progress)) return progress
|
||||
@@ -250,7 +260,7 @@ async function submitImport(): Promise<void> {
|
||||
const file = importFile.value as File
|
||||
const groupId = importGroupId.value as number
|
||||
if (importMode.value === 'delete') {
|
||||
if (!window.confirm('确定按 Excel 中的 ASIN 批量删除匹配的总数据吗?')) return
|
||||
if (!(await openAdminConfirm({ message: '确定按 Excel 中的 ASIN 批量删除匹配的总数据吗?', danger: true }))) return
|
||||
}
|
||||
const mode = importMode.value
|
||||
importRunning.value = true
|
||||
@@ -268,10 +278,10 @@ async function submitImport(): Promise<void> {
|
||||
ElMessage.success(mode === 'add' ? '导入完成' : '删除导入完成')
|
||||
await load()
|
||||
} else {
|
||||
ElMessage.error(importOutcomeText(finished))
|
||||
showAdminFeedback(importOutcomeText(finished), 'error')
|
||||
}
|
||||
} catch (error) {
|
||||
ElMessage.error(error instanceof Error ? error.message : '导入失败')
|
||||
showAdminFeedback(loadFailureMessage(error, '导入失败'), 'error')
|
||||
} finally {
|
||||
importRunning.value = false
|
||||
}
|
||||
@@ -303,7 +313,7 @@ async function doExport(): Promise<void> {
|
||||
URL.revokeObjectURL(url)
|
||||
ElMessage.success('导出完成')
|
||||
} catch (error) {
|
||||
ElMessage.error(error instanceof Error ? error.message : '导出失败,请重试')
|
||||
showAdminFeedback(loadFailureMessage(error, '导出失败,请重试'), 'error')
|
||||
} finally {
|
||||
stopExportWait()
|
||||
exporting.value = false
|
||||
@@ -327,6 +337,12 @@ onMounted(() => {
|
||||
void load()
|
||||
void loadGroups()
|
||||
})
|
||||
|
||||
// 导出秒表是 setInterval:不随页面卸载收掉的话,离开本页后它仍在每秒改一个已经没人看的 ref。
|
||||
onUnmounted(() => {
|
||||
pageDisposed = true
|
||||
stopExportWait()
|
||||
})
|
||||
</script>
|
||||
|
||||
<template>
|
||||
@@ -383,6 +399,7 @@ onMounted(() => {
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<LoadFailureBar v-if="loadFailure" :message="loadFailure" @retry="load" />
|
||||
<div class="table-scroll dedupe-table-scroll">
|
||||
<table>
|
||||
<thead>
|
||||
|
||||
@@ -17,8 +17,12 @@ import { categoryDraftError, createProductCategoryDraft, toCategorySaveRequest,
|
||||
import { buildProductCategoryExportUrl } from './product-category-export.ts'
|
||||
import { formatDateTime } from '@/utils/datetime'
|
||||
import OldPagination from '@/components/OldPagination.vue'
|
||||
import { showAdminFeedback } from '@/components/admin-feedback-ui'
|
||||
import { openAdminConfirm } from '@/components/admin-confirm'
|
||||
import LoadFailureBar from '@/components/LoadFailureBar.vue'
|
||||
|
||||
const loading = ref(false)
|
||||
const loadFailure = ref('')
|
||||
const tree = ref<ProductCategoryNode[]>([])
|
||||
const keyword = ref('')
|
||||
const selected = ref<ProductCategoryNode | null>(null)
|
||||
@@ -67,6 +71,7 @@ const rootTotal = ref(0)
|
||||
/** 拉取根级当前页(对齐 admin.js loadProductCategoryChildren(null) 懒加载根)。 */
|
||||
async function loadTree(): Promise<void> {
|
||||
loading.value = true
|
||||
loadFailure.value = ''
|
||||
try {
|
||||
const result = await fetchProductCategoryChildren(null, rootPage.value, rootPageSize.value)
|
||||
const state = { page: result.page, total: result.total, hasMore: result.hasMore, loading: false }
|
||||
@@ -75,7 +80,8 @@ async function loadTree(): Promise<void> {
|
||||
tree.value = result.items
|
||||
rootTotal.value = result.total
|
||||
} catch (error) {
|
||||
ElMessage.error(error instanceof Error ? error.message : '类目加载失败')
|
||||
loadFailure.value = error instanceof Error ? error.message : '类目加载失败'
|
||||
showAdminFeedback(loadFailure.value, 'error')
|
||||
} finally {
|
||||
loading.value = false
|
||||
}
|
||||
@@ -167,7 +173,7 @@ async function loadChildrenPage(parent: ProductCategoryNode | null, page: number
|
||||
const fallback = childrenState.get(key) ?? { page: 0, total: 0, hasMore: false, loading: false }
|
||||
fallback.loading = false
|
||||
childrenState.set(key, fallback)
|
||||
ElMessage.error(error instanceof Error ? error.message : '子类目加载失败')
|
||||
showAdminFeedback(error instanceof Error ? error.message : '子类目加载失败', 'error')
|
||||
}
|
||||
}
|
||||
|
||||
@@ -201,7 +207,7 @@ async function runSearch(page: number): Promise<void> {
|
||||
searchPage.value = result.page
|
||||
searchHasMore.value = result.hasMore
|
||||
} catch (error) {
|
||||
ElMessage.error(error instanceof Error ? error.message : '类目搜索失败')
|
||||
showAdminFeedback(error instanceof Error ? error.message : '类目搜索失败', 'error')
|
||||
} finally {
|
||||
searchLoading.value = false
|
||||
}
|
||||
@@ -257,7 +263,7 @@ async function removeCategory(node: ProductCategoryNode): Promise<void> {
|
||||
return
|
||||
}
|
||||
// 对齐旧版:原生 confirm。
|
||||
if (!window.confirm(`确定删除“${node.name}”?`)) return
|
||||
if (!(await openAdminConfirm({ message: `确定删除“${node.name}”?`, danger: true }))) return
|
||||
try {
|
||||
await deleteProductCategory(node.id)
|
||||
ElMessage.success('已删除')
|
||||
@@ -265,7 +271,7 @@ async function removeCategory(node: ProductCategoryNode): Promise<void> {
|
||||
if (searching.value) void runSearch(1)
|
||||
else void loadTree()
|
||||
} catch (error) {
|
||||
ElMessage.error(error instanceof Error ? error.message : '删除失败')
|
||||
showAdminFeedback(error instanceof Error ? error.message : '删除失败', 'error')
|
||||
}
|
||||
}
|
||||
|
||||
@@ -289,7 +295,7 @@ async function submit(): Promise<void> {
|
||||
if (searching.value) void runSearch(1)
|
||||
else void loadTree()
|
||||
} catch (err) {
|
||||
ElMessage.error(err instanceof Error ? err.message : '保存失败')
|
||||
showAdminFeedback(err instanceof Error ? err.message : '保存失败', 'error')
|
||||
} finally {
|
||||
saving.value = false
|
||||
}
|
||||
@@ -322,6 +328,7 @@ onMounted(loadTree)
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<LoadFailureBar v-if="loadFailure" :message="loadFailure" @retry="loadTree" />
|
||||
<div class="table-scroll category-table-scroll">
|
||||
<table>
|
||||
<thead>
|
||||
|
||||
@@ -19,6 +19,9 @@ import type { ShopGroupOption } from '../shop/shop-dto.ts'
|
||||
import OldPagination from '@/components/OldPagination.vue'
|
||||
import { useAdminSessionStore } from '@/stores/admin-session'
|
||||
import { useCompanyTabStore } from '@/stores/company-tab'
|
||||
import { showAdminFeedback } from '@/components/admin-feedback-ui'
|
||||
import { openAdminConfirm } from '@/components/admin-confirm'
|
||||
import LoadFailureBar from '@/components/LoadFailureBar.vue'
|
||||
|
||||
const session = useAdminSessionStore()
|
||||
const companyTab = useCompanyTabStore()
|
||||
@@ -26,6 +29,7 @@ const companyTab = useCompanyTabStore()
|
||||
const isSuperAdmin = computed(() => session.isSuperAdmin)
|
||||
|
||||
const loading = ref(false)
|
||||
const loadFailure = ref('')
|
||||
const rows = ref<QueryAsinItem[]>([])
|
||||
const total = ref(0)
|
||||
const page = ref(1)
|
||||
@@ -69,7 +73,7 @@ function normalizeAsinInput(country: string): void {
|
||||
|
||||
async function removeShopAsin(item: QueryAsinItem) {
|
||||
// 删除该店铺全部站点的 ASIN 配置(逐国调用现有端点)。
|
||||
if (!window.confirm(`确定删除店铺“${item.shopName}”的全部站点 ASIN 配置吗?`)) return
|
||||
if (!(await openAdminConfirm({ message: `确定删除店铺“${item.shopName}”的全部站点 ASIN 配置吗?`, danger: true }))) return
|
||||
try {
|
||||
for (const country of QUERY_ASIN_COUNTRIES) {
|
||||
if (asinOf(item, country)) await deleteQueryAsinCountryAsin(item.id, country)
|
||||
@@ -77,7 +81,7 @@ async function removeShopAsin(item: QueryAsinItem) {
|
||||
ElMessage.success('已删除')
|
||||
await load()
|
||||
} catch (error) {
|
||||
ElMessage.error(error instanceof Error ? error.message : '删除失败')
|
||||
showAdminFeedback(error instanceof Error ? error.message : '删除失败', 'error')
|
||||
}
|
||||
}
|
||||
|
||||
@@ -102,7 +106,7 @@ async function saveConfig(): Promise<void> {
|
||||
}
|
||||
}
|
||||
if (errors.length) {
|
||||
ElMessage.error(errors.join(';'))
|
||||
showAdminFeedback(errors.join(';'), 'error')
|
||||
} else {
|
||||
ElMessage.success('保存成功')
|
||||
drawerVisible.value = false
|
||||
@@ -151,7 +155,7 @@ async function onCreateGroupChange(): Promise<void> {
|
||||
shopNames.value = await fetchShopNamesByGroup(createGroupId.value, companyTab.requestCompanyId)
|
||||
} catch (error) {
|
||||
shopNames.value = []
|
||||
ElMessage.error(error instanceof Error ? error.message : '店铺列表加载失败')
|
||||
showAdminFeedback(error instanceof Error ? error.message : '店铺列表加载失败', 'error')
|
||||
} finally {
|
||||
shopNamesLoading.value = false
|
||||
}
|
||||
@@ -242,7 +246,7 @@ async function submitImport(): Promise<void> {
|
||||
return
|
||||
}
|
||||
if (importMode.value === 'delete') {
|
||||
if (!window.confirm('确定按 Excel 中的分组、店铺名和国家 ASIN 批量删除吗?')) return
|
||||
if (!(await openAdminConfirm({ message: '确定按 Excel 中的分组、店铺名和国家 ASIN 批量删除吗?', danger: true }))) return
|
||||
}
|
||||
const mode = importMode.value
|
||||
const groupId = importGroupId.value ?? undefined
|
||||
@@ -263,7 +267,7 @@ async function submitImport(): Promise<void> {
|
||||
if (progress.status === 'failed') {
|
||||
importVisible.value = false
|
||||
resetImport()
|
||||
ElMessage.error((progress as { errorMessage?: string }).errorMessage || (mode === 'add' ? '导入失败' : '删除导入失败'))
|
||||
showAdminFeedback((progress as { errorMessage?: string }).errorMessage || (mode === 'add' ? '导入失败' : '删除导入失败'), 'error')
|
||||
return
|
||||
}
|
||||
importProgress.value = progress.status === 'pending' ? '等待导入任务开始…' : '导入处理中…'
|
||||
@@ -271,7 +275,7 @@ async function submitImport(): Promise<void> {
|
||||
}
|
||||
throw new Error('查询导入进度超时,请稍后刷新列表确认结果')
|
||||
} catch (error) {
|
||||
ElMessage.error(error instanceof Error ? error.message : '导入失败')
|
||||
showAdminFeedback(error instanceof Error ? error.message : '导入失败', 'error')
|
||||
} finally {
|
||||
importRunning.value = false
|
||||
}
|
||||
@@ -298,6 +302,7 @@ async function loadGroups() {
|
||||
|
||||
async function load() {
|
||||
loading.value = true
|
||||
loadFailure.value = ''
|
||||
try {
|
||||
const result = await fetchQueryAsinList({
|
||||
page: page.value,
|
||||
@@ -312,7 +317,8 @@ async function load() {
|
||||
total.value = result.total
|
||||
page.value = result.page
|
||||
} catch (error) {
|
||||
ElMessage.error(error instanceof Error ? error.message : '数据加载失败')
|
||||
loadFailure.value = error instanceof Error ? error.message : '数据加载失败'
|
||||
showAdminFeedback(loadFailure.value, 'error')
|
||||
} finally {
|
||||
loading.value = false
|
||||
}
|
||||
@@ -394,6 +400,7 @@ onMounted(() => {
|
||||
<button class="btn btn-secondary" type="button" @click="doExport">导出 XLSX</button>
|
||||
</div>
|
||||
|
||||
<LoadFailureBar v-if="loadFailure" :message="loadFailure" @retry="load" />
|
||||
<div class="table-scroll query-asin-table-scroll">
|
||||
<table>
|
||||
<thead>
|
||||
|
||||
@@ -19,6 +19,9 @@ import type { ShopGroupOption } from '../shop/shop-dto.ts'
|
||||
import OldPagination from '@/components/OldPagination.vue'
|
||||
import { useAdminSessionStore } from '@/stores/admin-session'
|
||||
import { useCompanyTabStore } from '@/stores/company-tab'
|
||||
import { showAdminFeedback } from '@/components/admin-feedback-ui'
|
||||
import { openAdminConfirm } from '@/components/admin-confirm'
|
||||
import LoadFailureBar from '@/components/LoadFailureBar.vue'
|
||||
|
||||
const session = useAdminSessionStore()
|
||||
const companyTab = useCompanyTabStore()
|
||||
@@ -26,6 +29,7 @@ const companyTab = useCompanyTabStore()
|
||||
const isSuperAdmin = computed(() => session.isSuperAdmin)
|
||||
|
||||
const loading = ref(false)
|
||||
const loadFailure = ref('')
|
||||
const rows = ref<SkipPriceItem[]>([])
|
||||
const total = ref(0)
|
||||
const page = ref(1)
|
||||
@@ -95,7 +99,7 @@ async function onCreateGroupChange(): Promise<void> {
|
||||
shopNames.value = await fetchShopNamesByGroup(createGroupId.value, companyTab.requestCompanyId)
|
||||
} catch (error) {
|
||||
shopNames.value = []
|
||||
ElMessage.error(error instanceof Error ? error.message : '店铺列表加载失败')
|
||||
showAdminFeedback(error instanceof Error ? error.message : '店铺列表加载失败', 'error')
|
||||
} finally {
|
||||
shopNamesLoading.value = false
|
||||
}
|
||||
@@ -208,7 +212,7 @@ async function saveConfig(): Promise<void> {
|
||||
}
|
||||
}
|
||||
if (errors.length) {
|
||||
ElMessage.error(errors.join(';'))
|
||||
showAdminFeedback(errors.join(';'), 'error')
|
||||
} else {
|
||||
ElMessage.success('保存成功')
|
||||
drawerVisible.value = false
|
||||
@@ -240,7 +244,7 @@ async function removeRow(item: SkipPriceItem): Promise<void> {
|
||||
}
|
||||
await load()
|
||||
} catch (error) {
|
||||
ElMessage.error(error instanceof Error ? error.message : '删除失败')
|
||||
showAdminFeedback(error instanceof Error ? error.message : '删除失败', 'error')
|
||||
}
|
||||
}
|
||||
|
||||
@@ -296,7 +300,7 @@ async function submitImport(): Promise<void> {
|
||||
return
|
||||
}
|
||||
if (importMode.value === 'delete') {
|
||||
if (!window.confirm('确定按 Excel 中的删除ASIN批量删除该店铺跳过跟价 ASIN 吗?')) return
|
||||
if (!(await openAdminConfirm({ message: '确定按 Excel 中的删除ASIN批量删除该店铺跳过跟价 ASIN 吗?', danger: true }))) return
|
||||
}
|
||||
const mode = importMode.value
|
||||
const groupId = importGroupId.value as number
|
||||
@@ -317,7 +321,7 @@ async function submitImport(): Promise<void> {
|
||||
if (progress.status === 'failed') {
|
||||
importVisible.value = false
|
||||
resetImport()
|
||||
ElMessage.error(progress.errorMessage || (mode === 'add' ? '导入失败' : '删除导入失败'))
|
||||
showAdminFeedback(progress.errorMessage || (mode === 'add' ? '导入失败' : '删除导入失败'), 'error')
|
||||
return
|
||||
}
|
||||
importProgress.value = progress.status === 'pending' ? '等待导入任务开始…' : '导入处理中…'
|
||||
@@ -325,7 +329,7 @@ async function submitImport(): Promise<void> {
|
||||
}
|
||||
throw new Error('查询导入进度超时,请稍后刷新列表确认结果')
|
||||
} catch (error) {
|
||||
ElMessage.error(error instanceof Error ? error.message : '导入失败')
|
||||
showAdminFeedback(error instanceof Error ? error.message : '导入失败', 'error')
|
||||
} finally {
|
||||
importRunning.value = false
|
||||
}
|
||||
@@ -351,13 +355,15 @@ async function loadGroups() {
|
||||
|
||||
async function load() {
|
||||
loading.value = true
|
||||
loadFailure.value = ''
|
||||
try {
|
||||
const result = await fetchSkipPriceList(toSkipPriceParams(filter, page.value, pageSize.value, companyTab.requestCompanyId))
|
||||
rows.value = result.items
|
||||
total.value = result.total
|
||||
page.value = result.page
|
||||
} catch (error) {
|
||||
ElMessage.error(error instanceof Error ? error.message : '数据加载失败')
|
||||
loadFailure.value = error instanceof Error ? error.message : '数据加载失败'
|
||||
showAdminFeedback(loadFailure.value, 'error')
|
||||
} finally {
|
||||
loading.value = false
|
||||
}
|
||||
@@ -447,6 +453,7 @@ onMounted(() => {
|
||||
<button class="btn btn-secondary" type="button" @click="doExport">导出 XLSX</button>
|
||||
</div>
|
||||
|
||||
<LoadFailureBar v-if="loadFailure" :message="loadFailure" @retry="load" />
|
||||
<div class="table-scroll skip-price-asin-table-scroll">
|
||||
<table>
|
||||
<thead>
|
||||
|
||||
@@ -9,6 +9,9 @@ import { formatDateTime, orderedPair, todayDateInput } from '@/utils/datetime'
|
||||
import { useCompanyTabStore } from '@/stores/company-tab'
|
||||
import { fetchHistoryUserOptions } from './history-api.ts'
|
||||
import type { HistoryUserOption } from './history-user-option.ts'
|
||||
import { showAdminFeedback } from '@/components/admin-feedback-ui'
|
||||
import { openAdminConfirm } from '@/components/admin-confirm'
|
||||
import LoadFailureBar from '@/components/LoadFailureBar.vue'
|
||||
import {
|
||||
deleteDeviceLogFile,
|
||||
deleteDeviceLogOverride,
|
||||
@@ -53,6 +56,7 @@ function formatBytes(bytes: number | null | undefined): string {
|
||||
const companyTab = useCompanyTabStore()
|
||||
|
||||
const loading = ref(false)
|
||||
const loadFailure = ref('')
|
||||
const rows = ref<DeviceLogFileRow[]>([])
|
||||
const total = ref(0)
|
||||
const page = ref(1)
|
||||
@@ -76,6 +80,7 @@ const totalPages = computed(() => Math.max(1, Math.ceil(total.value / pageSize.v
|
||||
|
||||
async function load() {
|
||||
loading.value = true
|
||||
loadFailure.value = ''
|
||||
try {
|
||||
const result = await fetchDeviceLogFiles({
|
||||
source: sourceFilter.value || undefined,
|
||||
@@ -90,7 +95,8 @@ async function load() {
|
||||
total.value = Number(result?.total || 0)
|
||||
if (result?.retentionDays) retentionDays.value = result.retentionDays
|
||||
} catch (error) {
|
||||
ElMessage.error(error instanceof Error ? error.message : '日志列表加载失败')
|
||||
loadFailure.value = error instanceof Error ? error.message : '日志列表加载失败'
|
||||
showAdminFeedback(loadFailure.value, 'error')
|
||||
} finally {
|
||||
loading.value = false
|
||||
}
|
||||
@@ -167,7 +173,7 @@ async function loadContent(scrollToBottom: boolean) {
|
||||
if (viewerPre.value) viewerPre.value.scrollTop = viewerPre.value.scrollHeight
|
||||
}
|
||||
} catch (error) {
|
||||
ElMessage.error(error instanceof Error ? error.message : '日志内容加载失败')
|
||||
showAdminFeedback(error instanceof Error ? error.message : '日志内容加载失败', 'error')
|
||||
} finally {
|
||||
viewerLoading.value = false
|
||||
}
|
||||
@@ -179,13 +185,13 @@ function loadMore() {
|
||||
}
|
||||
|
||||
async function remove(row: DeviceLogFileRow) {
|
||||
if (!window.confirm(`确认删除「${row.fileName}」(${row.deviceName || row.deviceId})的云端日志?删除后不可恢复。`)) return
|
||||
if (!(await openAdminConfirm({ message: `确认删除「${row.fileName}」(${row.deviceName || row.deviceId})的云端日志?删除后不可恢复。`, danger: true }))) return
|
||||
try {
|
||||
await deleteDeviceLogFile(row.id)
|
||||
ElMessage.success('已删除')
|
||||
load()
|
||||
} catch (error) {
|
||||
ElMessage.error(error instanceof Error ? error.message : '删除失败')
|
||||
showAdminFeedback(error instanceof Error ? error.message : '删除失败', 'error')
|
||||
}
|
||||
}
|
||||
|
||||
@@ -221,7 +227,7 @@ async function loadConfig() {
|
||||
overrides.value = data.overrides || []
|
||||
devices.value = (await fetchDeviceLogDevices()) || []
|
||||
} catch (error) {
|
||||
ElMessage.error(error instanceof Error ? error.message : '采集配置加载失败')
|
||||
showAdminFeedback(error instanceof Error ? error.message : '采集配置加载失败', 'error')
|
||||
} finally {
|
||||
configLoading.value = false
|
||||
}
|
||||
@@ -234,7 +240,7 @@ async function saveGlobalMode(mode: string) {
|
||||
globalMode.value = mode
|
||||
ElMessage.success(`全局采集模式已切换为「${modeLabel(mode)}」`)
|
||||
} catch (error) {
|
||||
ElMessage.error(error instanceof Error ? error.message : '保存失败')
|
||||
showAdminFeedback(error instanceof Error ? error.message : '保存失败', 'error')
|
||||
}
|
||||
}
|
||||
|
||||
@@ -251,19 +257,19 @@ async function addOverride() {
|
||||
newOverrideKey.value = ''
|
||||
await loadConfig()
|
||||
} catch (error) {
|
||||
ElMessage.error(error instanceof Error ? error.message : '保存失败')
|
||||
showAdminFeedback(error instanceof Error ? error.message : '保存失败', 'error')
|
||||
}
|
||||
}
|
||||
|
||||
async function removeOverride(row: DeviceLogOverride) {
|
||||
const who = row.deviceName || row.deviceId
|
||||
if (!window.confirm(`确认删除终端「${who}」的采集覆盖(回落到全局默认)?`)) return
|
||||
if (!(await openAdminConfirm({ message: `确认删除终端「${who}」的采集覆盖(回落到全局默认)?`, danger: true }))) return
|
||||
try {
|
||||
await deleteDeviceLogOverride(row.id)
|
||||
ElMessage.success('已删除')
|
||||
await loadConfig()
|
||||
} catch (error) {
|
||||
ElMessage.error(error instanceof Error ? error.message : '删除失败')
|
||||
showAdminFeedback(error instanceof Error ? error.message : '删除失败', 'error')
|
||||
}
|
||||
}
|
||||
|
||||
@@ -316,6 +322,7 @@ onMounted(() => {
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<LoadFailureBar v-if="loadFailure" :message="loadFailure" @retry="load" />
|
||||
<div class="logs-table-scroll">
|
||||
<table>
|
||||
<thead>
|
||||
|
||||
@@ -23,8 +23,12 @@ import { canReleaseDigitalHumanVersion, releaseDigitalHumanConfirmText } from '.
|
||||
import { canSetLatestDigitalHumanVersion, setLatestDigitalHumanConfirmText } from './digitalhuman-latest.ts'
|
||||
import OldPagination from '@/components/OldPagination.vue'
|
||||
import { digitalHumanStatusDisplay } from './digitalhuman-status-display.ts'
|
||||
import { showAdminFeedback } from '@/components/admin-feedback-ui'
|
||||
import { openAdminConfirm } from '@/components/admin-confirm'
|
||||
import LoadFailureBar from '@/components/LoadFailureBar.vue'
|
||||
|
||||
const loading = ref(false)
|
||||
const loadFailure = ref('')
|
||||
const items = ref<DigitalHumanVersion[]>([])
|
||||
|
||||
/** 分页(对齐 admin.js:6311 pageSize=20 + 数字页码 + 跳转;Java 列表接口不分页,前端分页呈现)。 */
|
||||
@@ -54,11 +58,13 @@ const downloadingVersion = ref<string | null>(null)
|
||||
|
||||
async function load() {
|
||||
loading.value = true
|
||||
loadFailure.value = ''
|
||||
try {
|
||||
items.value = (await fetchDigitalHumanVersions()).items
|
||||
// 页码越界回钳见下方 watch(items)。
|
||||
} catch (error) {
|
||||
ElMessage.error(error instanceof Error ? error.message : '版本列表加载失败')
|
||||
loadFailure.value = error instanceof Error ? error.message : '版本列表加载失败'
|
||||
showAdminFeedback(loadFailure.value, 'error')
|
||||
} finally {
|
||||
loading.value = false
|
||||
}
|
||||
@@ -116,7 +122,7 @@ async function submitUpload() {
|
||||
form.value = { version: '', file: null, changelog: '', minClientVersion: '' }
|
||||
load()
|
||||
} catch (error) {
|
||||
ElMessage.error(error instanceof Error ? error.message : '上传失败')
|
||||
showAdminFeedback(error instanceof Error ? error.message : '上传失败', 'error')
|
||||
} finally {
|
||||
uploading.value = false
|
||||
}
|
||||
@@ -126,14 +132,14 @@ async function release(row: DigitalHumanVersion) {
|
||||
const text = releaseDigitalHumanConfirmText(row.version)
|
||||
if (!text) return
|
||||
// 对齐旧版:原生 confirm。
|
||||
if (!window.confirm(text)) return
|
||||
if (!(await openAdminConfirm({ message: text, danger: false }))) return
|
||||
confirming.value = row.version
|
||||
try {
|
||||
await releaseDigitalHumanVersion(row.version)
|
||||
ElMessage.success('已发布')
|
||||
load()
|
||||
} catch (error) {
|
||||
ElMessage.error(error instanceof Error ? error.message : '发布失败')
|
||||
showAdminFeedback(error instanceof Error ? error.message : '发布失败', 'error')
|
||||
} finally {
|
||||
confirming.value = null
|
||||
}
|
||||
@@ -142,14 +148,14 @@ async function release(row: DigitalHumanVersion) {
|
||||
async function setLatest(row: DigitalHumanVersion) {
|
||||
const text = setLatestDigitalHumanConfirmText(row.version)
|
||||
if (!text) return
|
||||
if (!window.confirm(text)) return
|
||||
if (!(await openAdminConfirm({ message: text, danger: false }))) return
|
||||
confirming.value = row.version
|
||||
try {
|
||||
await setLatestDigitalHumanVersion(row.version)
|
||||
ElMessage.success('已设为最新')
|
||||
load()
|
||||
} catch (error) {
|
||||
ElMessage.error(error instanceof Error ? error.message : '操作失败')
|
||||
showAdminFeedback(error instanceof Error ? error.message : '操作失败', 'error')
|
||||
} finally {
|
||||
confirming.value = null
|
||||
}
|
||||
@@ -170,7 +176,7 @@ async function download(row: DigitalHumanVersion) {
|
||||
anchor.click()
|
||||
document.body.removeChild(anchor)
|
||||
} catch (error) {
|
||||
ElMessage.error(error instanceof Error ? error.message : '下载失败')
|
||||
showAdminFeedback(error instanceof Error ? error.message : '下载失败', 'error')
|
||||
} finally {
|
||||
downloadingVersion.value = null
|
||||
}
|
||||
@@ -179,14 +185,14 @@ async function download(row: DigitalHumanVersion) {
|
||||
async function remove(row: DigitalHumanVersion) {
|
||||
const text = digitalHumanDeleteConfirmText(row.version)
|
||||
if (!text) return
|
||||
if (!window.confirm(text)) return
|
||||
if (!(await openAdminConfirm({ message: text, danger: true }))) return
|
||||
confirming.value = row.version
|
||||
try {
|
||||
await deleteDigitalHumanVersion(row.version)
|
||||
ElMessage.success('删除成功')
|
||||
load()
|
||||
} catch (error) {
|
||||
ElMessage.error(error instanceof Error ? error.message : '删除失败')
|
||||
showAdminFeedback(error instanceof Error ? error.message : '删除失败', 'error')
|
||||
} finally {
|
||||
confirming.value = null
|
||||
}
|
||||
@@ -214,6 +220,7 @@ onMounted(load)
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<LoadFailureBar v-if="loadFailure" :message="loadFailure" @retry="load" />
|
||||
<div class="table-scroll digital-human-version-table-scroll">
|
||||
<table>
|
||||
<thead>
|
||||
|
||||
@@ -8,8 +8,12 @@ import { ElMessage } from 'element-plus'
|
||||
import { fetchSoftwareVersions, uploadSoftwareVersion, deleteSoftwareVersions } from './version-api.ts'
|
||||
import type { SoftwareVersionItem } from './version-dto.ts'
|
||||
import { isNonEmptyVersion } from './version-dto.ts'
|
||||
import { showAdminFeedback } from '@/components/admin-feedback-ui'
|
||||
import { openAdminConfirm } from '@/components/admin-confirm'
|
||||
import LoadFailureBar from '@/components/LoadFailureBar.vue'
|
||||
|
||||
const loading = ref(false)
|
||||
const loadFailure = ref('')
|
||||
const items = ref<SoftwareVersionItem[]>([])
|
||||
/** 版本号搜索(客户端过滤)。 */
|
||||
const versionKeyword = ref('')
|
||||
@@ -51,25 +55,25 @@ async function removeSelected() {
|
||||
const rows = items.value.filter((row) => selectedIds.value.has(row.id))
|
||||
const sample = rows.slice(0, 3).map((row) => row.version).join('、')
|
||||
const summary = rows.length > 3 ? `${sample} 等 ${rows.length} 个` : sample
|
||||
if (!window.confirm(`确认删除选中的 ${rows.length} 个版本(${summary})?此操作不可恢复。`)) return
|
||||
if (!(await openAdminConfirm({ message: `确认删除选中的 ${rows.length} 个版本(${summary})?此操作不可恢复。`, danger: true }))) return
|
||||
try {
|
||||
await deleteSoftwareVersions(Array.from(selectedIds.value))
|
||||
ElMessage.success(`已删除 ${rows.length} 个版本`)
|
||||
selectedIds.value = new Set()
|
||||
await load()
|
||||
} catch (error) {
|
||||
ElMessage.error(error instanceof Error ? error.message : '删除失败')
|
||||
showAdminFeedback(error instanceof Error ? error.message : '删除失败', 'error')
|
||||
}
|
||||
}
|
||||
async function removeOne(row: SoftwareVersionItem) {
|
||||
if (!window.confirm(`确认删除版本 ${row.version}?此操作不可恢复。`)) return
|
||||
if (!(await openAdminConfirm({ message: `确认删除版本 ${row.version}?此操作不可恢复。`, danger: true }))) return
|
||||
try {
|
||||
await deleteSoftwareVersions([row.id])
|
||||
ElMessage.success('删除成功')
|
||||
selectedIds.value = new Set([...selectedIds.value].filter((id) => id !== row.id))
|
||||
await load()
|
||||
} catch (error) {
|
||||
ElMessage.error(error instanceof Error ? error.message : '删除失败')
|
||||
showAdminFeedback(error instanceof Error ? error.message : '删除失败', 'error')
|
||||
}
|
||||
}
|
||||
|
||||
@@ -84,10 +88,12 @@ const uploadMsgOk = ref(false)
|
||||
|
||||
async function load() {
|
||||
loading.value = true
|
||||
loadFailure.value = ''
|
||||
try {
|
||||
items.value = (await fetchSoftwareVersions()).items
|
||||
} catch (error) {
|
||||
ElMessage.error(error instanceof Error ? error.message : '版本列表加载失败')
|
||||
loadFailure.value = error instanceof Error ? error.message : '版本列表加载失败'
|
||||
showAdminFeedback(loadFailure.value, 'error')
|
||||
} finally {
|
||||
loading.value = false
|
||||
}
|
||||
@@ -161,6 +167,7 @@ onMounted(load)
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<LoadFailureBar v-if="loadFailure" :message="loadFailure" @retry="load" />
|
||||
<div class="table-scroll version-table-scroll">
|
||||
<table>
|
||||
<thead>
|
||||
|
||||
@@ -10,8 +10,12 @@ import { ElMessage } from 'element-plus'
|
||||
import { fetchTutorialPackages, uploadTutorialPackage, deleteTutorialPackages } from './tutorial-api.ts'
|
||||
import { formatFileSize } from './tutorial-model.ts'
|
||||
import type { TutorialPackageItem } from './tutorial-dto.ts'
|
||||
import { showAdminFeedback } from '@/components/admin-feedback-ui'
|
||||
import { openAdminConfirm } from '@/components/admin-confirm'
|
||||
import LoadFailureBar from '@/components/LoadFailureBar.vue'
|
||||
|
||||
const loading = ref(false)
|
||||
const loadFailure = ref('')
|
||||
const items = ref<TutorialPackageItem[]>([])
|
||||
/** 文件名搜索(客户端过滤)。 */
|
||||
const keyword = ref('')
|
||||
@@ -108,25 +112,25 @@ async function removeSelected() {
|
||||
const rows = items.value.filter((row) => selectedIds.value.has(row.id))
|
||||
const sample = rows.slice(0, 3).map((row) => row.fileName).join('、')
|
||||
const summary = rows.length > 3 ? `${sample} 等 ${rows.length} 个` : sample
|
||||
if (!window.confirm(`确认删除选中的 ${rows.length} 个教程包(${summary})?此操作不可恢复。`)) return
|
||||
if (!(await openAdminConfirm({ message: `确认删除选中的 ${rows.length} 个教程包(${summary})?此操作不可恢复。`, danger: true }))) return
|
||||
try {
|
||||
await deleteTutorialPackages(Array.from(selectedIds.value))
|
||||
ElMessage.success(`已删除 ${rows.length} 个教程包`)
|
||||
selectedIds.value = new Set()
|
||||
await load()
|
||||
} catch (error) {
|
||||
ElMessage.error(error instanceof Error ? error.message : '删除失败')
|
||||
showAdminFeedback(error instanceof Error ? error.message : '删除失败', 'error')
|
||||
}
|
||||
}
|
||||
async function removeOne(row: TutorialPackageItem) {
|
||||
if (!window.confirm(`确认删除教程包 ${row.fileName}?此操作不可恢复。`)) return
|
||||
if (!(await openAdminConfirm({ message: `确认删除教程包 ${row.fileName}?此操作不可恢复。`, danger: true }))) return
|
||||
try {
|
||||
await deleteTutorialPackages([row.id])
|
||||
ElMessage.success('删除成功')
|
||||
selectedIds.value = new Set([...selectedIds.value].filter((id) => id !== row.id))
|
||||
await load()
|
||||
} catch (error) {
|
||||
ElMessage.error(error instanceof Error ? error.message : '删除失败')
|
||||
showAdminFeedback(error instanceof Error ? error.message : '删除失败', 'error')
|
||||
}
|
||||
}
|
||||
|
||||
@@ -141,10 +145,12 @@ const uploadMsgOk = ref(false)
|
||||
|
||||
async function load() {
|
||||
loading.value = true
|
||||
loadFailure.value = ''
|
||||
try {
|
||||
items.value = (await fetchTutorialPackages()).items
|
||||
} catch (error) {
|
||||
ElMessage.error(error instanceof Error ? error.message : '教程包列表加载失败')
|
||||
loadFailure.value = error instanceof Error ? error.message : '教程包列表加载失败'
|
||||
showAdminFeedback(loadFailure.value, 'error')
|
||||
} finally {
|
||||
loading.value = false
|
||||
}
|
||||
@@ -213,6 +219,7 @@ onMounted(load)
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<LoadFailureBar v-if="loadFailure" :message="loadFailure" @retry="load" />
|
||||
<div class="table-scroll tutorial-table-scroll">
|
||||
<table>
|
||||
<thead>
|
||||
|
||||
@@ -10,9 +10,13 @@ import { emptyShopKeyForm, normalizeZiniaoToken, validateProxyUrl } from './shop
|
||||
import type { IpWhitelistStatus, ShopKeyItem } from './shop-dto.ts'
|
||||
import { whitelistStatusMeta, whitelistStatusOptions } from './shop-key-model.ts'
|
||||
import OldPagination from '@/components/OldPagination.vue'
|
||||
import { showAdminFeedback } from '@/components/admin-feedback-ui'
|
||||
import { openAdminConfirm } from '@/components/admin-confirm'
|
||||
import LoadFailureBar from '@/components/LoadFailureBar.vue'
|
||||
|
||||
const companyTab = useCompanyTabStore()
|
||||
const loading = ref(false)
|
||||
const loadFailure = ref('')
|
||||
const rows = ref<ShopKeyItem[]>([])
|
||||
const total = ref(0)
|
||||
const page = ref(1)
|
||||
@@ -55,6 +59,7 @@ function whitelistTooltip(row: ShopKeyItem): string {
|
||||
|
||||
async function load() {
|
||||
loading.value = true
|
||||
loadFailure.value = ''
|
||||
try {
|
||||
const result = await fetchShopKeyList({
|
||||
page: page.value,
|
||||
@@ -68,7 +73,8 @@ async function load() {
|
||||
total.value = result.total
|
||||
page.value = result.page
|
||||
} catch (error) {
|
||||
ElMessage.error(error instanceof Error ? error.message : '密钥列表加载失败')
|
||||
loadFailure.value = error instanceof Error ? error.message : '密钥列表加载失败'
|
||||
showAdminFeedback(loadFailure.value, 'error')
|
||||
} finally {
|
||||
loading.value = false
|
||||
}
|
||||
@@ -98,13 +104,13 @@ async function checkWhitelist(row: ShopKeyItem) {
|
||||
if (updated.ipWhitelistStatus === 'ALLOWED') {
|
||||
ElMessage.success('白名单检测通过')
|
||||
} else if (updated.ipWhitelistStatus === 'BLOCKED') {
|
||||
ElMessage.error(`白名单未放行:${updated.ipWhitelistMessage || '请求被拒绝'}`)
|
||||
showAdminFeedback(`白名单未放行:${updated.ipWhitelistMessage || '请求被拒绝'}`, 'error')
|
||||
} else {
|
||||
ElMessage.warning(updated.ipWhitelistMessage || '检测未通过')
|
||||
}
|
||||
load()
|
||||
} catch (error) {
|
||||
ElMessage.error(error instanceof Error ? error.message : '检测失败')
|
||||
showAdminFeedback(error instanceof Error ? error.message : '检测失败', 'error')
|
||||
} finally {
|
||||
checkingId.value = null
|
||||
}
|
||||
@@ -139,7 +145,7 @@ async function submit() {
|
||||
dialogVisible.value = false
|
||||
load()
|
||||
} catch (error) {
|
||||
ElMessage.error(error instanceof Error ? error.message : '保存失败')
|
||||
showAdminFeedback(error instanceof Error ? error.message : '保存失败', 'error')
|
||||
} finally {
|
||||
saving.value = false
|
||||
}
|
||||
@@ -147,13 +153,13 @@ async function submit() {
|
||||
|
||||
async function remove(row: ShopKeyItem) {
|
||||
// 对齐旧版:原生 confirm。
|
||||
if (!window.confirm(`确定删除店铺密钥“${row.ziniaoAccountName}”吗?`)) return
|
||||
if (!(await openAdminConfirm({ message: `确定删除店铺密钥“${row.ziniaoAccountName}”吗?`, danger: true }))) return
|
||||
try {
|
||||
await deleteShopKey(row.id)
|
||||
ElMessage.success('已删除')
|
||||
load()
|
||||
} catch (error) {
|
||||
ElMessage.error(error instanceof Error ? error.message : '删除失败')
|
||||
showAdminFeedback(error instanceof Error ? error.message : '删除失败', 'error')
|
||||
}
|
||||
}
|
||||
|
||||
@@ -219,6 +225,7 @@ onMounted(load)
|
||||
<button class="btn" type="button" @click="apply">查询</button>
|
||||
</div>
|
||||
|
||||
<LoadFailureBar v-if="loadFailure" :message="loadFailure" @retry="load" />
|
||||
<div class="shop-key-table-scroll">
|
||||
<table>
|
||||
<thead>
|
||||
|
||||
@@ -17,12 +17,16 @@ import {
|
||||
import { emptyShopManageForm } from './shop-manage-form-model.ts'
|
||||
import type { ShopCredential, ShopGroupOption, ShopSummary } from './shop-dto.ts'
|
||||
import OldPagination from '@/components/OldPagination.vue'
|
||||
import { showAdminFeedback } from '@/components/admin-feedback-ui'
|
||||
import { openAdminConfirm } from '@/components/admin-confirm'
|
||||
import LoadFailureBar from '@/components/LoadFailureBar.vue'
|
||||
|
||||
const session = useAdminSessionStore()
|
||||
const companyTab = useCompanyTabStore()
|
||||
/** 仅超管需要分组维度:非超管数据由后端裁剪到本人分组,分组筛选/列一律不展示。 */
|
||||
const isSuperAdmin = computed(() => session.isSuperAdmin)
|
||||
const loading = ref(false)
|
||||
const loadFailure = ref('')
|
||||
const rows = ref<ShopSummary[]>([])
|
||||
const total = ref(0)
|
||||
const page = ref(1)
|
||||
@@ -70,7 +74,7 @@ async function togglePassword(row: ShopSummary) {
|
||||
revealedPasswordCache.value[row.id] = cred.password
|
||||
} catch (error) {
|
||||
revealedRowId.value = null
|
||||
ElMessage.error(error instanceof Error ? error.message : '读取密码失败')
|
||||
showAdminFeedback(error instanceof Error ? error.message : '读取密码失败', 'error')
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -79,12 +83,13 @@ async function loadGroups() {
|
||||
try {
|
||||
groups.value = await fetchShopManageGroups(companyTab.requestCompanyId)
|
||||
} catch (error) {
|
||||
ElMessage.error(error instanceof Error ? error.message : '分组加载失败')
|
||||
showAdminFeedback(error instanceof Error ? error.message : '分组加载失败', 'error')
|
||||
}
|
||||
}
|
||||
|
||||
async function load() {
|
||||
loading.value = true
|
||||
loadFailure.value = ''
|
||||
try {
|
||||
const result = await fetchShopManageList({
|
||||
page: page.value,
|
||||
@@ -97,7 +102,8 @@ async function load() {
|
||||
total.value = result.total
|
||||
page.value = result.page
|
||||
} catch (error) {
|
||||
ElMessage.error(error instanceof Error ? error.message : '店铺列表加载失败')
|
||||
loadFailure.value = error instanceof Error ? error.message : '店铺列表加载失败'
|
||||
showAdminFeedback(loadFailure.value, 'error')
|
||||
} finally {
|
||||
loading.value = false
|
||||
}
|
||||
@@ -178,7 +184,7 @@ async function submit() {
|
||||
dialogVisible.value = false
|
||||
load()
|
||||
} catch (error) {
|
||||
ElMessage.error(error instanceof Error ? error.message : '保存失败')
|
||||
showAdminFeedback(error instanceof Error ? error.message : '保存失败', 'error')
|
||||
} finally {
|
||||
saving.value = false
|
||||
}
|
||||
@@ -189,19 +195,19 @@ async function showCredential(row: ShopSummary) {
|
||||
credential.value = await fetchShopCredential(row.id, row.shopName)
|
||||
credentialVisible.value = true
|
||||
} catch (error) {
|
||||
ElMessage.error(error instanceof Error ? error.message : '读取凭证失败')
|
||||
showAdminFeedback(error instanceof Error ? error.message : '读取凭证失败', 'error')
|
||||
}
|
||||
}
|
||||
|
||||
async function remove(row: ShopSummary) {
|
||||
// 对齐旧版:原生 confirm。
|
||||
if (!window.confirm(`确定删除店铺“${row.shopName}”吗?`)) return
|
||||
if (!(await openAdminConfirm({ message: `确定删除店铺“${row.shopName}”吗?`, danger: true }))) return
|
||||
try {
|
||||
await deleteShopManage(row.id)
|
||||
ElMessage.success('已删除')
|
||||
load()
|
||||
} catch (error) {
|
||||
ElMessage.error(error instanceof Error ? error.message : '删除失败')
|
||||
showAdminFeedback(error instanceof Error ? error.message : '删除失败', 'error')
|
||||
}
|
||||
}
|
||||
|
||||
@@ -242,6 +248,7 @@ onMounted(() => {
|
||||
<button class="btn" type="button" @click="apply">查询</button>
|
||||
</div>
|
||||
|
||||
<LoadFailureBar v-if="loadFailure" :message="loadFailure" @retry="load" />
|
||||
<div class="table-scroll shop-manage-table-scroll">
|
||||
<table>
|
||||
<thead>
|
||||
|
||||
@@ -9,6 +9,8 @@ import { ElMessage } from 'element-plus'
|
||||
import OldPagination from '@/components/OldPagination.vue'
|
||||
import { useCompanyTabStore } from '@/stores/company-tab'
|
||||
import { formatDateTime, orderedPair } from '@/utils/datetime'
|
||||
import { showAdminFeedback } from '@/components/admin-feedback-ui'
|
||||
import LoadFailureBar from '@/components/LoadFailureBar.vue'
|
||||
import {
|
||||
fetchTaskCenterOverview,
|
||||
fetchTaskCenterShopOptions,
|
||||
@@ -77,6 +79,7 @@ const taskTotal = ref(0)
|
||||
const taskPage = ref(1)
|
||||
const taskPageSize = ref(20)
|
||||
const tasksLoading = ref(false)
|
||||
const tasksFailure = ref('')
|
||||
|
||||
// ---------------------------------------------------------------- 变体采集
|
||||
|
||||
@@ -111,7 +114,7 @@ async function loadOverview() {
|
||||
try {
|
||||
overview.value = await fetchTaskCenterOverview(companyTab.requestCompanyId)
|
||||
} catch (error) {
|
||||
ElMessage.error(errorText(error, '汇总数据加载失败'))
|
||||
showAdminFeedback(errorText(error, '汇总数据加载失败'), 'error')
|
||||
}
|
||||
}
|
||||
|
||||
@@ -120,12 +123,13 @@ async function loadShopOptions() {
|
||||
try {
|
||||
shopOptions.value = (await fetchTaskCenterShopOptions(companyTab.requestCompanyId)) || []
|
||||
} catch (error) {
|
||||
ElMessage.error(errorText(error, '店铺候选加载失败'))
|
||||
showAdminFeedback(errorText(error, '店铺候选加载失败'), 'error')
|
||||
}
|
||||
}
|
||||
|
||||
async function loadTasks(silent = false) {
|
||||
if (!silent) tasksLoading.value = true
|
||||
tasksFailure.value = ''
|
||||
try {
|
||||
const result = await fetchTaskCenterTasks(
|
||||
buildTaskQuery(filter, taskPage.value, taskPageSize.value, companyTab.requestCompanyId),
|
||||
@@ -133,7 +137,8 @@ async function loadTasks(silent = false) {
|
||||
tasks.value = result?.items || []
|
||||
taskTotal.value = Number(result?.total || 0)
|
||||
} catch (error) {
|
||||
ElMessage.error(errorText(error, '任务列表加载失败'))
|
||||
tasksFailure.value = errorText(error, '任务列表加载失败')
|
||||
showAdminFeedback(tasksFailure.value, 'error')
|
||||
} finally {
|
||||
if (!silent) tasksLoading.value = false
|
||||
}
|
||||
@@ -149,7 +154,7 @@ async function loadVariants(silent = false) {
|
||||
variantTotal.value = tabCount(result?.total)
|
||||
} catch (error) {
|
||||
variantTotal.value = null
|
||||
ElMessage.error(errorText(error, '变体采集加载失败'))
|
||||
showAdminFeedback(errorText(error, '变体采集加载失败'), 'error')
|
||||
} finally {
|
||||
if (!silent) variantLoading.value = false
|
||||
}
|
||||
@@ -254,7 +259,7 @@ async function openDetail(row: TaskCenterTaskRow) {
|
||||
detail.value = await fetchTaskCenterTaskDetail(row.taskNo, companyTab.requestCompanyId)
|
||||
if (!detail.value) ElMessage.warning('任务不存在或无权查看')
|
||||
} catch (error) {
|
||||
ElMessage.error(errorText(error, '任务详情加载失败'))
|
||||
showAdminFeedback(errorText(error, '任务详情加载失败'), 'error')
|
||||
detailVisible.value = false
|
||||
} finally {
|
||||
detailLoading.value = false
|
||||
@@ -407,6 +412,7 @@ onUnmounted(() => {
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<LoadFailureBar v-if="tasksFailure" :message="tasksFailure" @retry="loadTasks" />
|
||||
<div class="table-scroll">
|
||||
<table>
|
||||
<thead>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
* 数据源保持自家后端:/duplicate-check-console(指标/店铺/撞款全集/分组统计) + /duplicate-check-ledger(台账分页) + /duplicate-check-export(Excel)。
|
||||
* 分组归属来自「店铺管理」真实店铺分组,本页只读展示,仅用于分组撞款范围切换。
|
||||
*/
|
||||
import { computed, onMounted, reactive, ref, watch } from 'vue'
|
||||
import { computed, onMounted, onUnmounted, reactive, ref, watch } from 'vue'
|
||||
import { useAdminSessionStore } from '@/stores/admin-session'
|
||||
import { useCompanyTabStore } from '@/stores/company-tab'
|
||||
import type { DuplicateItem, DuplicateOccurrence, DuplicateMetrics, DuplicateShop } from './duplicate-model.ts'
|
||||
@@ -414,6 +414,11 @@ function siteColor(code: string): string {
|
||||
// loadConsole 的重挑分支(groupStats 为空时不触发)里留着一个不属于本公司的 selectedGroup。
|
||||
watch(() => companyTab.activeId, () => { filter.shop = ''; filter.group = ''; selectedGroup.value = ''; scope.value = 'global'; void loadConsole(); void loadLedger(1) })
|
||||
|
||||
// 卸载时收掉 toast 的 2.4s 收尾定时器:否则离开本页后它还会去摸一个已经不存在的节点。
|
||||
onUnmounted(() => {
|
||||
window.clearTimeout(toastTimer)
|
||||
})
|
||||
|
||||
onMounted(() => {
|
||||
loadConsole()
|
||||
// 台账 Tab 计数打开即显示:挂载时预取第一页拿 total(对齐 reference 渲染即见台账条数)。
|
||||
@@ -432,6 +437,7 @@ onMounted(() => {
|
||||
|
||||
<div v-if="loadError" class="load-banner">
|
||||
<span>{{ loadError }}</span>
|
||||
<button class="btn btn-ghost btn-sm" type="button" @click="loadConsole">重试</button>
|
||||
<button class="btn btn-ghost btn-sm" type="button" @click="loadError = ''">知道了</button>
|
||||
</div>
|
||||
|
||||
|
||||
@@ -21,10 +21,13 @@ import { imageVideoDownloadFilename, videoKeysOf } from './image-video-view.ts'
|
||||
import { useAdminSessionStore } from '@/stores/admin-session'
|
||||
import { useCompanyTabStore } from '@/stores/company-tab'
|
||||
import OldPagination from '@/components/OldPagination.vue'
|
||||
import { showAdminFeedback } from '@/components/admin-feedback-ui'
|
||||
import LoadFailureBar from '@/components/LoadFailureBar.vue'
|
||||
|
||||
const session = useAdminSessionStore()
|
||||
const companyTab = useCompanyTabStore()
|
||||
const loading = ref(false)
|
||||
const loadFailure = ref('')
|
||||
const tasks = ref<ImageVideoRow[]>([])
|
||||
const totalTasks = ref(0)
|
||||
const page = ref(1)
|
||||
@@ -122,13 +125,15 @@ function toFilter(): ImageVideoFilter {
|
||||
|
||||
async function load() {
|
||||
loading.value = true
|
||||
loadFailure.value = ''
|
||||
try {
|
||||
const result = await fetchImageVideoTasks(toFilter(), page.value, pageSize.value, companyTab.requestCompanyId)
|
||||
tasks.value = result.items
|
||||
totalTasks.value = result.total
|
||||
page.value = result.page
|
||||
} catch (error) {
|
||||
ElMessage.error(error instanceof Error ? error.message : '视频任务加载失败')
|
||||
loadFailure.value = error instanceof Error ? error.message : '视频任务加载失败'
|
||||
showAdminFeedback(loadFailure.value, 'error')
|
||||
} finally {
|
||||
loading.value = false
|
||||
}
|
||||
@@ -201,7 +206,7 @@ async function openDetail(task: ImageVideoRow) {
|
||||
try {
|
||||
detail.value = await fetchImageVideoTaskDetail(task.taskId)
|
||||
} catch (error) {
|
||||
ElMessage.error(error instanceof Error ? error.message : '详情加载失败')
|
||||
showAdminFeedback(error instanceof Error ? error.message : '详情加载失败', 'error')
|
||||
detailVisible.value = false
|
||||
} finally {
|
||||
detailLoading.value = false
|
||||
@@ -218,7 +223,7 @@ async function downloadVideo(task: ImageVideoRow, index: number, video: ImageVid
|
||||
} catch {
|
||||
// 打包失败降级:直接打开该视频地址以便下载。
|
||||
if (video.displayUrl) window.open(video.displayUrl, '_blank')
|
||||
else ElMessage.error('视频下载失败')
|
||||
else showAdminFeedback('视频下载失败', 'error')
|
||||
} finally {
|
||||
downloadingKey.value = ''
|
||||
}
|
||||
@@ -237,7 +242,7 @@ async function downloadBatch() {
|
||||
const note = errorCount ? `,${errorCount} 个失败` : ''
|
||||
ElMessage.success(`正在打包 ${fileCount ?? keys.length} 个视频${note}`)
|
||||
} catch (error) {
|
||||
ElMessage.error(error instanceof Error ? error.message : '批量下载失败')
|
||||
showAdminFeedback(error instanceof Error ? error.message : '批量下载失败', 'error')
|
||||
} finally {
|
||||
downloading.value = false
|
||||
}
|
||||
@@ -269,7 +274,7 @@ async function openPermission() {
|
||||
permPage.value = 1
|
||||
permissionVisible.value = true
|
||||
} catch (error) {
|
||||
ElMessage.error(error instanceof Error ? error.message : '权限用户加载失败')
|
||||
showAdminFeedback(error instanceof Error ? error.message : '权限用户加载失败', 'error')
|
||||
}
|
||||
}
|
||||
|
||||
@@ -286,7 +291,7 @@ async function savePermission() {
|
||||
ElMessage.success('保存成功')
|
||||
permissionVisible.value = false
|
||||
} catch (error) {
|
||||
ElMessage.error(error instanceof Error ? error.message : '保存失败')
|
||||
showAdminFeedback(error instanceof Error ? error.message : '保存失败', 'error')
|
||||
} finally {
|
||||
permissionSaving.value = false
|
||||
}
|
||||
@@ -328,6 +333,7 @@ onMounted(load)
|
||||
</section>
|
||||
|
||||
<section class="panel-box iv-panel">
|
||||
<LoadFailureBar v-if="loadFailure" :message="loadFailure" @retry="load" />
|
||||
<div class="iv-toolbar">
|
||||
<div class="iv-toolbar-main">
|
||||
<button v-if="session.isSuperAdmin" class="btn btn-secondary" type="button" @click="openPermission">权限配置</button>
|
||||
|
||||
@@ -27,10 +27,14 @@ import {
|
||||
import { useAdminSessionStore } from '@/stores/admin-session'
|
||||
import { useCompanyTabStore } from '@/stores/company-tab'
|
||||
import OldPagination from '@/components/OldPagination.vue'
|
||||
import { showAdminFeedback } from '@/components/admin-feedback-ui'
|
||||
import { openAdminConfirm } from '@/components/admin-confirm'
|
||||
import LoadFailureBar from '@/components/LoadFailureBar.vue'
|
||||
|
||||
const session = useAdminSessionStore()
|
||||
const companyTab = useCompanyTabStore()
|
||||
const loading = ref(false)
|
||||
const loadFailure = ref('')
|
||||
const groups = ref<ShopDataTaskGroup[]>([])
|
||||
const totalShops = ref(0)
|
||||
const page = ref(1)
|
||||
@@ -127,13 +131,15 @@ function toFilter(): ShopDataFilter {
|
||||
|
||||
async function load() {
|
||||
loading.value = true
|
||||
loadFailure.value = ''
|
||||
try {
|
||||
const result = await fetchShopDataTaskList(toFilter(), page.value, pageSize.value, companyTab.requestCompanyId)
|
||||
groups.value = result.items
|
||||
totalShops.value = result.total
|
||||
page.value = result.page
|
||||
} catch (error) {
|
||||
ElMessage.error(error instanceof Error ? error.message : '店铺数据记录加载失败')
|
||||
loadFailure.value = error instanceof Error ? error.message : '店铺数据记录加载失败'
|
||||
showAdminFeedback(loadFailure.value, 'error')
|
||||
} finally {
|
||||
loading.value = false
|
||||
}
|
||||
@@ -223,7 +229,7 @@ async function downloadRow(row: ShopDataResultRow) {
|
||||
downloadProgress.visible = false
|
||||
ElMessage.success('下载已开始')
|
||||
} catch (error) {
|
||||
ElMessage.error(error instanceof Error ? error.message : '下载失败')
|
||||
showAdminFeedback(error instanceof Error ? error.message : '下载失败', 'error')
|
||||
} finally {
|
||||
busyKey.value = ''
|
||||
}
|
||||
@@ -244,7 +250,7 @@ async function downloadBatch() {
|
||||
const note = zip.errorCount ? `,${zip.errorCount} 个失败(详见包内错误清单)` : ''
|
||||
ElMessage.success(`已下载 ${zip.fileCount ?? resultIds.length} 个文件${note}`)
|
||||
} catch (error) {
|
||||
ElMessage.error(error instanceof Error ? error.message : '批量下载失败')
|
||||
showAdminFeedback(error instanceof Error ? error.message : '批量下载失败', 'error')
|
||||
} finally {
|
||||
busyKey.value = ''
|
||||
}
|
||||
@@ -252,14 +258,14 @@ async function downloadBatch() {
|
||||
|
||||
async function removeRowByRow(row: ShopDataResultRow) {
|
||||
// 管理端真删:删除该店这条店铺数据记录(累计档 + 文件 + 明细),前台任务记录仍保留但文件不可再下载
|
||||
if (!window.confirm(`确认删除店铺“${row.shopName}”这条店铺数据记录及其数据文件?此操作不可恢复。`)) return
|
||||
if (!(await openAdminConfirm({ message: `确认删除店铺“${row.shopName}”这条店铺数据记录及其数据文件?此操作不可恢复。`, danger: true }))) return
|
||||
deletingKey.value = row.resultId
|
||||
try {
|
||||
await deleteShopDataResultHistory(row.resultId)
|
||||
ElMessage.success('删除成功')
|
||||
await load()
|
||||
} catch (error) {
|
||||
ElMessage.error(error instanceof Error ? error.message : `删除店铺“${row.shopName}”的记录失败`)
|
||||
showAdminFeedback(error instanceof Error ? error.message : `删除店铺“${row.shopName}”的记录失败`, 'error')
|
||||
} finally {
|
||||
deletingKey.value = ''
|
||||
}
|
||||
@@ -280,7 +286,7 @@ async function openPermission() {
|
||||
permPage.value = 1
|
||||
permissionVisible.value = true
|
||||
} catch (error) {
|
||||
ElMessage.error(error instanceof Error ? error.message : '权限用户加载失败')
|
||||
showAdminFeedback(error instanceof Error ? error.message : '权限用户加载失败', 'error')
|
||||
}
|
||||
}
|
||||
|
||||
@@ -296,7 +302,7 @@ async function savePermission() {
|
||||
ElMessage.success('保存成功')
|
||||
permissionVisible.value = false
|
||||
} catch (error) {
|
||||
ElMessage.error(error instanceof Error ? error.message : '保存失败')
|
||||
showAdminFeedback(error instanceof Error ? error.message : '保存失败', 'error')
|
||||
} finally {
|
||||
permissionSaving.value = false
|
||||
}
|
||||
@@ -347,6 +353,7 @@ onMounted(load)
|
||||
</section>
|
||||
|
||||
<section class="panel-box">
|
||||
<LoadFailureBar v-if="loadFailure" :message="loadFailure" @retry="load" />
|
||||
<div class="sd-toolbar">
|
||||
<div class="sd-toolbar-main">
|
||||
<label class="sd-select-all">
|
||||
|
||||
@@ -15,7 +15,7 @@ test('align_users_row_buttons_old_btn', () => {
|
||||
assert.match(s, /class="btn btn-sm"[^>]*@click="openEdit\(row\)"/, '编辑用旧版 btn-sm 实心小按钮')
|
||||
assert.match(s, /class="btn btn-sm btn-danger"[^>]*@click="removeUser\(row\)"/, '删除用旧版 btn-sm btn-danger')
|
||||
assert.doesNotMatch(s, /el-button/, '用户页已自绘,无 EP 按钮')
|
||||
assert.match(s, /window\.confirm\(deleteConfirmMessage\(row\)\)/, '删除确认走原生 confirm 对齐旧版')
|
||||
assert.match(s, /openAdminConfirm\(\{ message: deleteConfirmMessage\(row\), danger: true \}\)/, '删除确认走统一确认出口,文案仍取旧版模型')
|
||||
})
|
||||
|
||||
test('align_groups_row_buttons_old_btn', () => {
|
||||
@@ -30,5 +30,5 @@ test('align_menus_row_buttons_old_btn', () => {
|
||||
assert.match(s, /class="btn btn-sm"[^>]*@click="openEdit\(row\)"/, '编辑用旧版 btn-sm 实心小按钮')
|
||||
assert.match(s, /class="btn btn-sm btn-danger"[^>]*@click="removeMenu\(row\)"/, '删除用旧版 btn-sm btn-danger')
|
||||
assert.doesNotMatch(s, /el-button[^>]*@click="openEdit/, '行内不再用 EP 按钮')
|
||||
assert.match(s, /window\.confirm\(`确定删除菜单/, '删除确认走原生 confirm 对齐旧版')
|
||||
assert.match(s, /openAdminConfirm\(\{ message: `确定删除菜单/, '删除确认走统一确认出口,文案对齐旧版')
|
||||
})
|
||||
|
||||
@@ -22,7 +22,7 @@ test('align_invalid_asin_row_buttons_old_btn', () => {
|
||||
const s = readSource('src/pages/asin/AsinInvalidPage.vue')
|
||||
assertOldRowButton(s, 'openEdit(row)', '不符合ASIN')
|
||||
assertOldRowButton(s, 'remove(row)', '不符合ASIN')
|
||||
assert.match(s, /window\.confirm\(invalidAsinDeleteText\(row\)\)/, '删除确认原生 confirm 对齐旧版')
|
||||
assert.match(s, /openAdminConfirm\(\{ message: invalidAsinDeleteText\(row\), danger: true \}\)/, '删除确认走统一确认出口,文案仍取旧版模型')
|
||||
})
|
||||
|
||||
test('align_query_asin_config_old_btn', () => {
|
||||
@@ -57,7 +57,7 @@ test('align_dedupe_registry_row_buttons_old_btn', () => {
|
||||
assert.match(s, /class="btn btn-sm"[^>]*@click="openEdit\(row\)"/, '编辑用旧版 btn-sm 实心小按钮')
|
||||
assert.match(s, /class="btn btn-sm btn-danger"[^>]*@click="removeRow\(row\)"/, '删除用旧版 btn-sm btn-danger')
|
||||
assert.doesNotMatch(s, /el-button/, '去重汇总已自绘,无 EP 按钮')
|
||||
assert.match(s, /window\.confirm\(`确定删除总数据/, '删除确认文案对齐旧版(原生 confirm)')
|
||||
assert.match(s, /openAdminConfirm\(\{ message: `确定删除总数据/, '删除确认文案对齐旧版,出口统一为 openAdminConfirm')
|
||||
})
|
||||
|
||||
test('align_asin_actions_cell_spacing', () => {
|
||||
|
||||
@@ -16,7 +16,7 @@ test('align_shop_manage_row_buttons_old_btn', () => {
|
||||
assert.match(s, /class="btn btn-sm btn-secondary"[^>]*@click="showCredential\(row\)"/, '凭证用旧版 btn-sm btn-secondary')
|
||||
assert.match(s, /class="btn btn-sm btn-danger"[^>]*@click="remove\(row\)"/, '删除用旧版 btn-sm btn-danger')
|
||||
assert.doesNotMatch(s, /el-button[^>]*@click="openEdit/, '行内不再用 EP 按钮')
|
||||
assert.match(s, /window\.confirm\(`确定删除店铺/, '删除确认原生 confirm 对齐旧版')
|
||||
assert.match(s, /openAdminConfirm\(\{ message: `确定删除店铺/, '删除确认走统一确认出口,文案对齐旧版')
|
||||
})
|
||||
|
||||
test('align_shop_keys_row_buttons_old_btn', () => {
|
||||
@@ -39,7 +39,7 @@ test('align_digital_human_row_buttons_old_btn', () => {
|
||||
assert.match(s, /class="btn btn-sm btn-secondary"[^>]*@click="download\(row\)"/, '下载用旧版 btn-sm btn-secondary')
|
||||
assert.match(s, /class="btn btn-sm btn-danger"[^>]*@click="remove\(row\)"/, '删除用旧版 btn-sm btn-danger')
|
||||
assert.doesNotMatch(s, /el-button[^>]*@click="release/, '行内不再用 EP 按钮')
|
||||
assert.match(s, /window\.confirm\(text\)/, '确认走原生 confirm 对齐旧版')
|
||||
assert.match(s, /openAdminConfirm\(\{ message: text, danger: /, '确认走统一确认出口,文案仍由模型给出')
|
||||
})
|
||||
|
||||
test('align_image_video_detail_and_download_old_btn', () => {
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
{
|
||||
"note": "readSource 钉子逐文件基线。两把尺子:pins=落在用例体内的读盘,reads=全文读点总数(含模块级夹具与 helper)。都只许减;pins 下降而 reads 没同步下降=把读盘挪出体内,不算改进。由 tests/source-pin-ratchet.test.ts 生成。",
|
||||
"totals": {
|
||||
"files": 238,
|
||||
"cases": 1707,
|
||||
"pins": 436,
|
||||
"reads": 621
|
||||
"files": 244,
|
||||
"cases": 1726,
|
||||
"pins": 448,
|
||||
"reads": 639
|
||||
},
|
||||
"files": {
|
||||
"admin-scaffold.test.ts": {
|
||||
@@ -213,9 +213,9 @@
|
||||
"reads": 0
|
||||
},
|
||||
"company-tab-wiring.test.ts": {
|
||||
"cases": 7,
|
||||
"pins": 3,
|
||||
"reads": 7
|
||||
"cases": 0,
|
||||
"pins": 0,
|
||||
"reads": 2
|
||||
},
|
||||
"company-user-create.test.ts": {
|
||||
"cases": 9,
|
||||
@@ -227,11 +227,21 @@
|
||||
"pins": 2,
|
||||
"reads": 9
|
||||
},
|
||||
"confirm-exit-ledger.test.ts": {
|
||||
"cases": 5,
|
||||
"pins": 3,
|
||||
"reads": 5
|
||||
},
|
||||
"date-filter-default-today.test.ts": {
|
||||
"cases": 3,
|
||||
"pins": 1,
|
||||
"reads": 2
|
||||
},
|
||||
"date-range-order.test.ts": {
|
||||
"cases": 0,
|
||||
"pins": 0,
|
||||
"reads": 0
|
||||
},
|
||||
"datetime-format.test.ts": {
|
||||
"cases": 8,
|
||||
"pins": 0,
|
||||
@@ -242,6 +252,11 @@
|
||||
"pins": 6,
|
||||
"reads": 6
|
||||
},
|
||||
"dedupe-write-forbidden-reason.test.ts": {
|
||||
"cases": 6,
|
||||
"pins": 4,
|
||||
"reads": 4
|
||||
},
|
||||
"device-logs-user-filter.test.ts": {
|
||||
"cases": 5,
|
||||
"pins": 5,
|
||||
@@ -252,6 +267,11 @@
|
||||
"pins": 0,
|
||||
"reads": 0
|
||||
},
|
||||
"error-feedback-exit-ledger.test.ts": {
|
||||
"cases": 4,
|
||||
"pins": 3,
|
||||
"reads": 4
|
||||
},
|
||||
"expiry-notice.test.ts": {
|
||||
"cases": 7,
|
||||
"pins": 2,
|
||||
@@ -262,6 +282,11 @@
|
||||
"pins": 1,
|
||||
"reads": 1
|
||||
},
|
||||
"load-failure-visibility.test.ts": {
|
||||
"cases": 6,
|
||||
"pins": 2,
|
||||
"reads": 5
|
||||
},
|
||||
"login-failure-must-show-reason.test.ts": {
|
||||
"cases": 7,
|
||||
"pins": 1,
|
||||
@@ -1187,6 +1212,11 @@
|
||||
"pins": 3,
|
||||
"reads": 5
|
||||
},
|
||||
"timer-cleanup-pairing.test.ts": {
|
||||
"cases": 5,
|
||||
"pins": 3,
|
||||
"reads": 5
|
||||
},
|
||||
"user-disable.test.ts": {
|
||||
"cases": 7,
|
||||
"pins": 2,
|
||||
|
||||
@@ -0,0 +1,125 @@
|
||||
/**
|
||||
* 二次确认出口的收口台账(四面9分口径 · 后管「流程 6.0 / 交互 6.0:三套确认并存」)。
|
||||
*
|
||||
* 评审实测:`window.confirm` **23 处/15 文件**,而封装好的 `openAdminConfirm` 只有 1 个消费者。
|
||||
* 三套确认并存的问题是"取消"在两个域里读法相反、危险操作的分量全靠各页自己领会。
|
||||
* 本批次把 24 处 `window.confirm` 全并到 `openAdminConfirm`(都在 `async function` 里,await 不断调用链)。
|
||||
*
|
||||
* 这条台账管两件事,缺一不可:
|
||||
* ① `window.confirm(` 全树归零,例外要登记、只许减;
|
||||
* ② **每一处 `openAdminConfirm(` 必须被 await**——它是 Promise,不 await 就是
|
||||
* "点了确认也不执行"的行为回归(评审特别点过这一条)。同步换异步不是免费的。
|
||||
* 外加一条口径审计:文案里出现「删除/清空」的确认必须是 danger 形态(红色、按钮「确认删除」),
|
||||
* 不许有危险操作混在「请确认操作」里。
|
||||
*/
|
||||
import test from 'node:test'
|
||||
import assert from 'node:assert/strict'
|
||||
import { readdirSync, statSync } from 'node:fs'
|
||||
import { join } from 'node:path'
|
||||
import { occurrences, readSource } from './helpers.ts'
|
||||
|
||||
const CONFIRM_MODULE = 'src/components/admin-confirm.ts'
|
||||
/** 例外名单只许减:本批次结束时 native confirm 归零。 */
|
||||
const NATIVE_CONFIRM_LEDGER_CAP = 0
|
||||
/** 分母硬钉:2026-10-10 实测 openAdminConfirm 调用 25 处(24 处新收口 + GroupsPage 原有 1 处)。 */
|
||||
const CONFIRM_CALLS_FLOOR = 25
|
||||
|
||||
const NATIVE_CONFIRM_LEDGER: Array<{ file: string; reason: string }> = []
|
||||
|
||||
function sourceFiles(): string[] {
|
||||
const out: string[] = []
|
||||
const walk = (dir: string): void => {
|
||||
for (const name of readdirSync(dir)) {
|
||||
const abs = join(dir, name)
|
||||
if (name.endsWith('.d.ts')) continue
|
||||
if (statSync(abs).isDirectory()) walk(abs)
|
||||
else if (name.endsWith('.vue') || name.endsWith('.ts')) out.push(abs.split(/[\\/]+/).join('/'))
|
||||
}
|
||||
}
|
||||
walk('src')
|
||||
return out
|
||||
}
|
||||
|
||||
/** 去掉行注释:注释里提一句 window.confirm 不该被数成调用点。 */
|
||||
function withoutLineComments(src: string): string {
|
||||
return src.split('\n')
|
||||
.filter((line) => !/^\s*(\/\/|\*)/.test(line))
|
||||
.join('\n')
|
||||
}
|
||||
|
||||
/** native confirm 调用点:`window.confirm(` 以及裸 `confirm(`(logout.ts 那种注入回调的形态要排除)。 */
|
||||
export function nativeConfirmSites(src: string): number {
|
||||
const code = withoutLineComments(src)
|
||||
return occurrences(code, 'window.confirm(')
|
||||
}
|
||||
|
||||
/** 返回未被 await 的 openAdminConfirm 调用(调用点前 30 字符内必须以 `await ` 收尾)。 */
|
||||
export function unawaitedConfirmCalls(src: string): string[] {
|
||||
const code = withoutLineComments(src)
|
||||
const bad: string[] = []
|
||||
let at = code.indexOf('openAdminConfirm(')
|
||||
while (at >= 0) {
|
||||
const before = code.slice(Math.max(0, at - 30), at)
|
||||
const isDefinition = /function\s+$/.test(before)
|
||||
if (!isDefinition && !/\bawait\s+$/.test(before)) bad.push(`${before.trim()}openAdminConfirm(`)
|
||||
at = code.indexOf('openAdminConfirm(', at + 1)
|
||||
}
|
||||
return bad
|
||||
}
|
||||
|
||||
/** 文案含「删除/清空」却没走 danger 形态的调用行。 */
|
||||
export function dangerMismatchLines(src: string): string[] {
|
||||
return withoutLineComments(src).split('\n')
|
||||
.filter((line) => line.includes('openAdminConfirm({'))
|
||||
.filter((line) => /删除|清空/.test(line) ? !line.includes('danger: true') : !line.includes('danger:'))
|
||||
}
|
||||
|
||||
const FILES = sourceFiles()
|
||||
const NATIVE_OFFENDERS = FILES
|
||||
.filter((rel) => rel !== CONFIRM_MODULE && nativeConfirmSites(readSource(rel)) > 0)
|
||||
const CONFIRM_CALL_LINES = FILES
|
||||
.filter((rel) => rel !== CONFIRM_MODULE)
|
||||
.flatMap((rel) => readSource(rel).split('\n').filter((l) => l.includes('openAdminConfirm(')))
|
||||
|
||||
test('分母硬钉:扫描覆盖整棵 src,且统一确认出口的调用点真的在', () => {
|
||||
assert.ok(FILES.length >= 180, `只扫到 ${FILES.length} 个源文件,扫描规则可能已失效`)
|
||||
assert.ok(CONFIRM_CALL_LINES.length >= CONFIRM_CALLS_FLOOR,
|
||||
`openAdminConfirm 调用只有 ${CONFIRM_CALL_LINES.length} 处:24 处收口没落地或扫漏了`)
|
||||
})
|
||||
|
||||
test('window.confirm 归零:名单外一律点名,名单只许减且每条必须仍然成立', () => {
|
||||
assert.ok(NATIVE_CONFIRM_LEDGER.length <= NATIVE_CONFIRM_LEDGER_CAP,
|
||||
`例外名单从 ${NATIVE_CONFIRM_LEDGER_CAP} 涨到 ${NATIVE_CONFIRM_LEDGER.length}:这条口径只许减`)
|
||||
assert.deepEqual(NATIVE_OFFENDERS.slice().sort(), NATIVE_CONFIRM_LEDGER.map((e) => e.file).sort(),
|
||||
`native confirm 与名单不等值:${NATIVE_OFFENDERS.join(', ')}`)
|
||||
for (const entry of NATIVE_CONFIRM_LEDGER) {
|
||||
assert.ok(nativeConfirmSites(readSource(entry.file)) > 0, `${entry.file} 已无 native confirm,登记该删`)
|
||||
}
|
||||
})
|
||||
|
||||
test('每一处 openAdminConfirm 都被 await:不等待就等于点了确认也不执行', () => {
|
||||
const offenders = FILES
|
||||
.filter((rel) => rel !== CONFIRM_MODULE)
|
||||
.flatMap((rel) => unawaitedConfirmCalls(readSource(rel)).map((s) => `${rel}: ${s}`))
|
||||
assert.deepEqual(offenders, [], `未等待的确认调用(同步分支被改成异步的那类回归):\n${offenders.join('\n')}`)
|
||||
})
|
||||
|
||||
test('危险确认必须是 danger 形态:删除/清空心须配「确认删除」', () => {
|
||||
const offenders = FILES
|
||||
.filter((rel) => rel !== CONFIRM_MODULE)
|
||||
.flatMap((rel) => dangerMismatchLines(readSource(rel)).map((l) => `${rel}: ${l.trim()}`))
|
||||
assert.deepEqual(offenders, [], `文案与确认形态不匹配(或漏了 danger 键):\n${offenders.join('\n')}`)
|
||||
})
|
||||
|
||||
test('非零对照:注入一处 native confirm、一处未 await、一处 danger 不匹配都要被红', () => {
|
||||
const injected = "async function f() {\n if (!window.confirm('确定删除该项吗?')) return\n}\n"
|
||||
assert.equal(nativeConfirmSites(injected), 1, '扫不出 native confirm ⇒ 归零断言恒绿')
|
||||
const notAwaited = "async function f() {\n if (!(openAdminConfirm({ message: 'x', danger: true }))) return\n}\n"
|
||||
assert.equal(unawaitedConfirmCalls(notAwaited).length, 1, '扫不出未 await ⇒ 第二条断言恒绿')
|
||||
const awaited = "async function f() {\n if (!(await openAdminConfirm({ message: 'x', danger: true }))) return\n}\n"
|
||||
assert.deepEqual(unawaitedConfirmCalls(awaited), [])
|
||||
const wrongDanger = "await openAdminConfirm({ message: '确定删除店铺吗?', danger: false })"
|
||||
assert.equal(dangerMismatchLines(wrongDanger).length, 1, '扫不出 danger 不匹配 ⇒ 第三条断言恒绿')
|
||||
assert.deepEqual(dangerMismatchLines(awaited), [])
|
||||
assert.equal(nativeConfirmSites("// 这里写着 window.confirm( 只是注释"), 0)
|
||||
})
|
||||
@@ -0,0 +1,118 @@
|
||||
/**
|
||||
* 去重库「前端能点、后端按范围拒」这一处(四面9分口径 · 后管「交互 6.0:1 处能点但后端 403」)。
|
||||
*
|
||||
* 判据来自后端 `DedupeTotalDataService`,两条谓词不是同一个口径:
|
||||
* 读侧 `applyGroupScope`:`scope.wholeCompany()`(公司超管)走 **`company_id = 本公司`**,整家公司的行全给看;
|
||||
* 写侧 `ensureRecordAccess` / `resolveAccessibleGroup`:只认 **`scope.groupIds()`**(本公司成员当组长的分组)
|
||||
* 与 `group_id IS NULL && uploaderUserId ∈ scope.userIds()`。
|
||||
* 于是「代导入行」(平台超管在 A 公司 tab 里把行挂到 B 公司的分组上)与「上传账号已被硬删的行」这两族
|
||||
* 会**看得见、改不了**:点编辑/删除直接被 403 拒。
|
||||
*
|
||||
* 这一支钉三件事:
|
||||
* ① 403 的中文原因(`无权操作该总数据`)必须真的到达界面——此前写路径取的是
|
||||
* `error instanceof Error ? error.message`,而 HTTP-403 是 axios 抛的,那句 message 是
|
||||
* `Request failed with status code 403`(英文、且把响应体里后端写的原因整段丢掉);
|
||||
* ② 前后端文案不许各说各话:后端那两句拒绝理由改字,本用例红;
|
||||
* ③ 不许用「客户端猜一个条件把按钮禁用」来糊:客户端拿不到 companyGroupIds,
|
||||
* 按 `groups` 下拉收窄会误伤同事名下**真能改**的行(假阴性=静默删功能)。
|
||||
* 要把这个入口收窄,得先让后端把可写标志随列表下发(现成的先例:用户菜单授权树的 `grantable`)。
|
||||
*/
|
||||
import test from 'node:test'
|
||||
import assert from 'node:assert/strict'
|
||||
import { existsSync } from 'node:fs'
|
||||
import { readSource } from './helpers.ts'
|
||||
import { failureDetail, loadFailureMessage, scopeRefusalNote } from '../src/components/load-failure-model.ts'
|
||||
|
||||
const PAGE = 'src/pages/asin/DedupeRegistryPage.vue'
|
||||
const BACKEND = '../backend-java/src/main/java/com/nanri/aiimage/modules/dedupe/service/DedupeTotalDataService.java'
|
||||
/** 后端按范围拒人时写进响应的原话(HTTP 403 + 响应体 message)。 */
|
||||
const BACKEND_REFUSALS = ['无权操作该总数据', '无权操作该分组数据']
|
||||
|
||||
function fnBody(src: string, name: string): string {
|
||||
const at = src.search(new RegExp(`(?:async\\s+)?function\\s+${name}\\s*\\(`))
|
||||
assert.ok(at >= 0, `${name} 不在了:入口被改名或删掉,本用例得重看`)
|
||||
const open = src.indexOf('{', at)
|
||||
let depth = 0
|
||||
for (let i = open; i < src.length; i++) {
|
||||
if (src[i] === '{') depth += 1
|
||||
else if (src[i] === '}') {
|
||||
depth -= 1
|
||||
if (depth === 0) return src.slice(open + 1, i)
|
||||
}
|
||||
}
|
||||
throw new Error(`${name} 括号不配对`)
|
||||
}
|
||||
|
||||
/** 模拟后端 GlobalExceptionHandler 对 ResponseStatusException 的产物:HTTP 403 + 中文 reason 在响应体里。 */
|
||||
function http403(reason: string): unknown {
|
||||
return Object.assign(new Error(`Request failed with status code 403`), {
|
||||
isAxiosError: true,
|
||||
response: { status: 403, data: { success: false, code: 403, message: reason } },
|
||||
})
|
||||
}
|
||||
|
||||
test('后端源码仍在(跨树判据的前提:文件不在了要红,不能静默跳过)', () => {
|
||||
assert.ok(existsSync(BACKEND), `找不到后端判据源文件 ${BACKEND}:整条跨树对账失去依据`)
|
||||
})
|
||||
|
||||
test('403 的中文原因必须到达界面,而不是 axios 那句英文', () => {
|
||||
const err = http403('无权操作该总数据')
|
||||
// 收口前各写路径的写法:英文原文上屏,后端原因整段丢失
|
||||
const before = err instanceof Error ? err.message : '删除失败'
|
||||
assert.equal(before, 'Request failed with status code 403')
|
||||
assert.equal(/[\u4e00-\u9fff]/.test(before), false, '对照本体必须是"界面上一个中文都没有"的那种')
|
||||
// 收口后:本页兜底 + 后端原因 + 出路
|
||||
const after = loadFailureMessage(err, '删除失败')
|
||||
assert.match(after, /删除失败:无权操作该总数据/)
|
||||
assert.match(after, /平台超级管理员/, '按范围拒人要把出路一起说清楚')
|
||||
assert.equal(failureDetail(err), '无权操作该总数据')
|
||||
})
|
||||
|
||||
test('去重页四条写路径都把错误交给 loadFailureMessage,不再直接取 error.message', () => {
|
||||
const src = readSource(PAGE)
|
||||
for (const name of ['saveEdit', 'removeRow', 'submitImport', 'doExport']) {
|
||||
const body = fnBody(src, name)
|
||||
assert.match(body, /loadFailureMessage\(error,/, `${name} 的失败提示没有带出后端原因`)
|
||||
assert.equal(/error instanceof Error \? error\.message/.test(body), false,
|
||||
`${name} 还留着 error.message 那套写法:HTTP 403 时会把英文原文弹给用户`)
|
||||
}
|
||||
assert.match(src, /import \{ loadFailureMessage \} from '@\/components\/load-failure-model'/)
|
||||
})
|
||||
|
||||
test('前后端拒绝文案对账:后端改字,这条要红', () => {
|
||||
const backend = readSource(BACKEND)
|
||||
for (const reason of BACKEND_REFUSALS) {
|
||||
assert.ok(backend.includes(`"${reason}"`), `后端已不再用「${reason}」这句话拒人:前端那句补充说明要跟着改`)
|
||||
assert.match(scopeRefusalNote(reason), /平台超级管理员/, `「${reason}」没被识别成范围拒绝`)
|
||||
}
|
||||
// 业务校验类的中文(本公司已存在该数据)不许被套上越权说明
|
||||
assert.equal(scopeRefusalNote('本公司已存在该数据'), '')
|
||||
})
|
||||
|
||||
test('读写两条谓词确实不同口径(不对称仍在=这条台账还没到可关闭的时候)', () => {
|
||||
const backend = readSource(BACKEND)
|
||||
// 取 4 参那一条真身:3 参重载只是 `applyGroupScope(query, scope, groupId, false)` 的转发壳,
|
||||
// 用懒匹配会停在壳上,把"整家公司都放行"那半边看漏。
|
||||
const readSide = /private void applyGroupScope\(LambdaQueryWrapper<DedupeTotalDataEntity> query,\s*\n?\s*AccessScope scope, Long groupId, boolean groupPrevalidated\)\s*\{[\s\S]*?\n \}/
|
||||
.exec(backend)
|
||||
assert.ok(readSide, 'applyGroupScope 不在了:读侧裁剪改写法了,本用例要重读')
|
||||
assert.match(readSide[0], /scope\.wholeCompany\(\)/, '读侧不再有 wholeCompany 分支:这条不对称可能已被收口')
|
||||
assert.match(readSide[0], /getCompanyId, scope\.companyId\(\)/,
|
||||
'读侧已不按 company_id 给整家公司放行:请重判前端入口是否还需要收窄')
|
||||
const writeSide = /private void ensureRecordAccess\([\s\S]*?\n \}/.exec(backend)
|
||||
assert.ok(writeSide, 'ensureRecordAccess 不在了:写侧改判据了,本用例要重读')
|
||||
assert.match(writeSide[0], /scope\.groupIds\(\)\.contains/, '写侧不再按 groupIds 拒人')
|
||||
assert.equal(/scope\.wholeCompany\(\)/.test(writeSide[0]), false,
|
||||
'写侧也开始认 wholeCompany:读写字面口径一致了,可以把"能点但拒"这条台账关掉')
|
||||
})
|
||||
|
||||
test('不许用客户端猜测禁用行内入口:那会误伤真能改的行', () => {
|
||||
const src = readSource(PAGE)
|
||||
const opsCell = /<td class="ops-cell">[\s\S]*?<\/td>/.exec(src)
|
||||
assert.ok(opsCell, '行内操作列结构变了:这条判据要重写')
|
||||
assert.equal(/:disabled=|v-if=/.test(opsCell[0]), false,
|
||||
'行内编辑/删除上加了客户端权限闸——但前端拿不到后端写侧的 companyGroupIds,'
|
||||
+ '按分组下拉收窄会把同事名下"看得见也改得动"的行一起禁掉(静默删功能)。'
|
||||
+ '要收窄请先让后端在列表响应里下发可写标志(先例:用户菜单授权树的 grantable)。')
|
||||
assert.match(opsCell[0], /@click="removeRow\(row\)"/, '删除入口本身不在了:本用例失效')
|
||||
})
|
||||
@@ -0,0 +1,143 @@
|
||||
/**
|
||||
* 统一提示出口的收口台账(四面9分口径 · 后管「复用 6.0」)。
|
||||
*
|
||||
* 评审实测:`showAdminFeedback` 只有 17 处调用,而裸 `ElMessage.error` **92 处**——同一件事
|
||||
* (把后端或本地的错误文本弹给用户)有两种写法,新页面跟着抄哪一种全看运气,文案与时长也无从统一。
|
||||
* 这一支把 92 处机械可换的全部换成 `showAdminFeedback(msg, 'error')`,然后把「还剩哪几处裸调用」
|
||||
* 落成一张显式名单:
|
||||
* ① 名单外的任何裸 `ElMessage.error(` 一律红(新增拦在提交前,而不是等下轮评审再数一遍);
|
||||
* ② 名单里每一条都必须在文件里仍然成立(防止台账烂成没人删的历史账);
|
||||
* ③ 名单本身只许减(BARE_SITE_LEDGER_CAP=0)。
|
||||
*
|
||||
* 判据不锚行号:锚的是「哪个文件里还有裸调用」与「出口调用行的形状」。
|
||||
*/
|
||||
import test from 'node:test'
|
||||
import assert from 'node:assert/strict'
|
||||
import { readdirSync, statSync } from 'node:fs'
|
||||
import { join } from 'node:path'
|
||||
import { occurrences, readSource } from './helpers.ts'
|
||||
|
||||
const EXIT_MODULE = 'src/components/admin-feedback-ui.ts'
|
||||
/** 例外名单只许减:收口批次结束时是 0 处(出口实现自己那一处不算名单,另用例单独钉)。 */
|
||||
const BARE_SITE_LEDGER_CAP = 0
|
||||
/** 出口实现里那一处 `ElMessage.error(m)` 是这条出口的本体。 */
|
||||
const EXIT_MODULE_CALLS = 1
|
||||
/** 分母硬钉:2026-10-10 实测走统一出口的 error 行 ≥ 92(92 处收口 + 批次前已有的几处)。 */
|
||||
const EXIT_ERROR_LINES_FLOOR = 92
|
||||
|
||||
/** 名单:不机械替换的裸调用,逐条给理由。新增一条 = 本用例红(超上限),且必须仍能对上实际代码。 */
|
||||
const BARE_SITE_LEDGER: Array<{ file: string; reason: string }> = []
|
||||
|
||||
function blankComments(src: string): string {
|
||||
return src
|
||||
.replace(/\/\*[\s\S]*?\*\//g, (block) => block.replace(/[^\n]/g, ' '))
|
||||
.replace(/^[ \t]*\/\/[^\n]*/gm, (line) => ' '.repeat(line.length))
|
||||
}
|
||||
|
||||
/** 剥掉注释与字符串字面量的内容:字符串里的 "ElMessage.error(" 字样不能算调用点。 */
|
||||
function stripNonCode(src: string): string {
|
||||
const out: string[] = []
|
||||
let i = 0
|
||||
const n = src.length
|
||||
while (i < n) {
|
||||
const two = src.slice(i, i + 2)
|
||||
if (two === '/*') {
|
||||
const close = src.indexOf('*/', i + 2)
|
||||
const end = close < 0 ? n : close + 2
|
||||
for (let k = i; k < end; k++) out.push(src[k] === '\n' ? '\n' : ' ')
|
||||
i = end; continue
|
||||
}
|
||||
if (two === '//') {
|
||||
const nl = src.indexOf('\n', i + 2)
|
||||
const end = nl < 0 ? n : nl
|
||||
for (let k = i; k < end; k++) out.push(src[k] === '\n' ? '\n' : ' ')
|
||||
i = end; continue
|
||||
}
|
||||
const q = src[i]
|
||||
if (q === '"' || q === "'" || q === '`') {
|
||||
let k = i + 1
|
||||
out.push(' ')
|
||||
while (k < n) {
|
||||
if (src[k] === '\\') { out.push(' ', src[k + 1] === '\n' ? '\n' : ' '); k += 2; continue }
|
||||
if (src[k] === q) { out.push(' '); k++; break }
|
||||
out.push(src[k] === '\n' ? '\n' : ' ')
|
||||
k++
|
||||
}
|
||||
i = k; continue
|
||||
}
|
||||
out.push(src[i]); i++
|
||||
}
|
||||
return out.join('')
|
||||
}
|
||||
|
||||
/** 在一个源码文本里数裸 ElMessage.error(注释与字符串里的字样不算)。 */
|
||||
export function bareErrorCount(src: string): number {
|
||||
return occurrences(stripNonCode(src), 'ElMessage.error(')
|
||||
}
|
||||
|
||||
/**
|
||||
* 数「走统一出口的 error 行」:一行里同时出现 `showAdminFeedback(` 与 `, 'error')`。
|
||||
* 用整行而不是 `showAdminFeedback\([^)]*, 'error'\)`——参数里带函数调用(`errorText(error, '…')`)时
|
||||
* `[^)]*` 会在第一个右括号处收口,分母会凭空少一截,把"扫不到"读成"没有"。
|
||||
*/
|
||||
export function exitErrorLineCount(src: string): number {
|
||||
return blankComments(src).split('\n')
|
||||
.filter((line) => line.includes('showAdminFeedback(') && line.includes(", 'error')")).length
|
||||
}
|
||||
|
||||
function sourceFiles(): string[] {
|
||||
const out: string[] = []
|
||||
const walk = (dir: string): void => {
|
||||
for (const name of readdirSync(dir)) {
|
||||
const abs = join(dir, name)
|
||||
if (name.endsWith('.d.ts')) continue
|
||||
if (statSync(abs).isDirectory()) walk(abs)
|
||||
else if (name.endsWith('.vue') || name.endsWith('.ts')) out.push(abs.split(/[\\/]+/).join('/'))
|
||||
}
|
||||
}
|
||||
walk('src')
|
||||
return out
|
||||
}
|
||||
|
||||
const FILES = sourceFiles()
|
||||
/** 出口实现之外,全树仍然裸打 ElMessage.error 的文件。 */
|
||||
const offenders = FILES.filter((rel) => rel !== EXIT_MODULE && bareErrorCount(readSource(rel)) > 0)
|
||||
|
||||
test('分母硬钉:扫描真的覆盖整棵 src,统一出口的 error 也确实被数到', () => {
|
||||
// 2026-10-10 实测 src 下 212 个 .vue/.ts;掉一档说明 walk 或后缀判据坏了。
|
||||
assert.ok(FILES.length >= 180, `只扫到 ${FILES.length} 个源文件,扫描规则可能已失效`)
|
||||
const viaExit = FILES.reduce((sum, rel) => sum + exitErrorLineCount(readSource(rel)), 0)
|
||||
assert.ok(viaExit >= EXIT_ERROR_LINES_FLOOR,
|
||||
`走统一出口的 error 只有 ${viaExit} 处:92 处收口没落地,或被整体扫漏了("扫不到"不等于"没有")`)
|
||||
})
|
||||
|
||||
test('出口实现里那一处 ElMessage.error 是出口本体,恰好一处', () => {
|
||||
assert.equal(bareErrorCount(readSource(EXIT_MODULE)), EXIT_MODULE_CALLS,
|
||||
'admin-feedback-ui.ts 是唯一允许裸 ElMessage.error 的地方,且只能有出口那 1 处')
|
||||
})
|
||||
|
||||
test('名单外的裸 ElMessage.error 一律点名;名单只许减、每条必须仍然成立', () => {
|
||||
assert.ok(BARE_SITE_LEDGER.length <= BARE_SITE_LEDGER_CAP,
|
||||
`例外名单从 ${BARE_SITE_LEDGER_CAP} 涨到 ${BARE_SITE_LEDGER.length}:这条口径只许减`)
|
||||
assert.deepEqual(offenders.slice().sort(), BARE_SITE_LEDGER.map((e) => e.file).sort(),
|
||||
`裸调用文件与名单不等值。名单外新增=${offenders.filter((f) => !BARE_SITE_LEDGER.some((e) => e.file === f))},`
|
||||
+ `名单里已消失(该删掉这条登记)=${BARE_SITE_LEDGER.filter((e) => !offenders.includes(e.file)).map((e) => e.file)}`)
|
||||
// 登记的每一条都得真的还有裸调用:烂账(登记了但代码里已经没有了)同样算破口。
|
||||
for (const entry of BARE_SITE_LEDGER) {
|
||||
assert.ok(bareErrorCount(readSource(entry.file)) > 0, `${entry.file} 已无裸调用,这条登记该删`)
|
||||
assert.ok(entry.reason.trim().length >= 8, `${entry.file} 的例外理由没写清楚`)
|
||||
}
|
||||
})
|
||||
|
||||
test('非零对照:扫描会抓到裸调用,也不会把统一出口误报成裸调用', () => {
|
||||
const injected = "try { await x() } catch (e) { ElMessage.error('店铺列表加载失败') }\n"
|
||||
assert.equal(bareErrorCount(injected), 1, '扫不出注入的裸调用 ⇒ 上面那条"名单外点名"是恒绿的')
|
||||
assert.equal(exitErrorLineCount(injected), 0)
|
||||
const migrated = "try { await x() } catch (e) { showAdminFeedback('店铺列表加载失败', 'error') }\n"
|
||||
assert.equal(bareErrorCount(migrated), 0)
|
||||
assert.equal(exitErrorLineCount(migrated), 1, '统一出口的 error 支必须被分母数到')
|
||||
// 参数里再套一层函数调用时,分母仍然数得到(这条正是 `[^)]*` 写法会静默漏掉的那种)。
|
||||
assert.equal(exitErrorLineCount("showAdminFeedback(errorText(error, '任务列表加载失败'), 'error')"), 1)
|
||||
assert.equal(bareErrorCount('// ElMessage.error( 只是注释里的字样'), 0, '注释里的字样算进来会让本用例永远红')
|
||||
assert.equal(bareErrorCount("const doc = 'ElMessage.error( 出现在字符串里'"), 0)
|
||||
})
|
||||
@@ -0,0 +1,178 @@
|
||||
/**
|
||||
* 失败态可见 + 重试真能跑(四面9分口径 · 后管「交互 6.0:模板内失败态只有 4/24 页、重试按钮 2」)。
|
||||
*
|
||||
* 一条列表页的硬规矩(本仓界面铁律):**撤入口/重试入口必须同时是一条真能办成事的出口**。
|
||||
* 所以这里不数「有没有红色文案」,而是逐页判三件事:
|
||||
* ① 请求失败的 catch 真的把原因写进一个失败 ref(`<ref>.value =` 落在 catch 窗口里);
|
||||
* ② 那个 ref 被模板 `v-if` 出来(不是一闪而过的 toast);
|
||||
* ③ 页面上有一个重试入口,且它绑的函数在同一个文件里真的定义着(`@retry="load"` 指向不存在的
|
||||
* 函数、或者只有「知道了」这种清掉红条的假出口,都算没过)。
|
||||
*
|
||||
* 名单(只许减):确实不该有重试按钮的页登记理由——登录页的出口是「再按一次登录」。
|
||||
*/
|
||||
import test from 'node:test'
|
||||
import assert from 'node:assert/strict'
|
||||
import { readdirSync } from 'node:fs'
|
||||
import { readSource } from './helpers.ts'
|
||||
import {
|
||||
LOAD_FAILURE_RETRY_LABEL,
|
||||
failureDetail,
|
||||
loadFailureMessage,
|
||||
scopeRefusalNote,
|
||||
} from '../src/components/load-failure-model.ts'
|
||||
|
||||
/** 分母硬钉:2026-10-10 实测「有 *Loading = ref(false) 且 onMounted 取数」的页面 23 个。 */
|
||||
const UNIVERSE_FLOOR = 20
|
||||
/** 例外名单只许减:本轮只有登录页不进这条口径。 */
|
||||
const LEDGER_CAP = 1
|
||||
|
||||
const LEDGER: Array<{ file: string; reason: string }> = [
|
||||
{
|
||||
file: 'src/pages/login/LoginPage.vue',
|
||||
reason: '登录不是取数页:失败原因已由 errorMessage 的 role="alert" 说出,'
|
||||
+ '重试入口就是那张表单上的「登录」按钮本身,再加一个重试按钮是重复入口',
|
||||
},
|
||||
]
|
||||
|
||||
function pageFiles(): string[] {
|
||||
const out: string[] = []
|
||||
for (const domain of readdirSync('src/pages')) {
|
||||
for (const name of readdirSync(`src/pages/${domain}`)) {
|
||||
if (name.endsWith('.vue')) out.push(`src/pages/${domain}/${name}`)
|
||||
}
|
||||
}
|
||||
return out.sort()
|
||||
}
|
||||
|
||||
function templateOf(src: string): string {
|
||||
const at = src.indexOf('<template>')
|
||||
return at < 0 ? '' : src.slice(at)
|
||||
}
|
||||
|
||||
/** 页面的失败态判定:返回缺了哪几条(空数组 = 过)。 */
|
||||
export function failureGaps(src: string): string[] {
|
||||
const tmpl = templateOf(src)
|
||||
const refs = [...src.matchAll(/const (\w*(?:[Ff]ailure|[Ee]rror)\w*) = ref\(/g)].map((m) => m[1])
|
||||
const missing: string[] = []
|
||||
const rendered = refs.filter((r) => new RegExp(`v-if="[^"]*\\b${r}\\b`).test(tmpl))
|
||||
const writtenInCatch = refs.filter((r) => new RegExp(`catch[\\s\\S]{0,320}?${r}\\.value\\s*=`).test(src))
|
||||
if (rendered.length === 0) missing.push(`失败原因没被模板 v-if 出来(refs=${refs.join('/')})`)
|
||||
if (writtenInCatch.length === 0) missing.push('catch 里没有把失败原因写进任何失败 ref')
|
||||
const candidates = [...tmpl.matchAll(/@retry="(\w+)"|@click="(\w+)"[^>]*>\s*重试/g)]
|
||||
.map((m) => m[1] || m[2])
|
||||
.filter((fn): fn is string => Boolean(fn))
|
||||
const real = candidates.filter((fn) => new RegExp(`(?:function|const)\\s+${fn}\\s*[(=]`).test(src))
|
||||
if (real.length === 0) missing.push(`没有真能重跑的入口(重试绑的函数须在页内定义;候选=${candidates.join('/')})`)
|
||||
return missing
|
||||
}
|
||||
|
||||
const UNIVERSE = pageFiles().filter((rel) => {
|
||||
const src = readSource(rel)
|
||||
return /\w*[Ll]oading = ref\(false\)/.test(src) && src.includes('onMounted(')
|
||||
})
|
||||
const ledgerHas = (rel: string) => LEDGER.some((e) => e.file === rel)
|
||||
const offenders = UNIVERSE.filter((rel) => !ledgerHas(rel) && failureGaps(readSource(rel)).length > 0)
|
||||
const staleLedger = LEDGER.filter((e) => !UNIVERSE.includes(e.file) || failureGaps(readSource(e.file)).length === 0)
|
||||
|
||||
test('分母硬钉:整棵 pages 都扫到,取数页数量不像被过滤掉', () => {
|
||||
assert.ok(pageFiles().length >= 24, `只扫到 ${pageFiles().length} 个页面文件,扫描规则可能已失效`)
|
||||
assert.ok(UNIVERSE.length >= UNIVERSE_FLOOR,
|
||||
`首屏取数的页面只认出 ${UNIVERSE.length} 个(阈值 ${UNIVERSE_FLOOR}):判据漏了,"没有缺口"就读成了"没有请求"`)
|
||||
})
|
||||
|
||||
test('每个取数页都要有可见失败态 + 真能重跑的入口(名单外点名,名单只许减)', () => {
|
||||
assert.ok(LEDGER.length <= LEDGER_CAP, `例外名单从 ${LEDGER_CAP} 涨到 ${LEDGER.length}:这条口径只许减`)
|
||||
assert.deepEqual(offenders, [], `失败态缺失的页面:\n${offenders
|
||||
.map((f) => `${f}\n - ${failureGaps(readSource(f)).join('\n - ')}`).join('\n')}`)
|
||||
assert.deepEqual(staleLedger.map((e) => e.file), [],
|
||||
'名单里的页面已经补齐失败态(或已不是取数页),这条登记该删掉')
|
||||
for (const entry of LEDGER) assert.ok(entry.reason.length >= 12, `${entry.file} 的例外理由没写清楚`)
|
||||
})
|
||||
|
||||
test('失败文案模型:后端的中文原因进得来,英文原文进不来,取不到就只留兜底句', () => {
|
||||
const forbidden403 = { response: { status: 403, data: { message: '无权操作该总数据' } } }
|
||||
assert.equal(failureDetail(forbidden403), '无权操作该总数据')
|
||||
assert.equal(loadFailureMessage(forbidden403, '删除失败'),
|
||||
`删除失败:无权操作该总数据(${scopeRefusalNote('无权操作该总数据')})`)
|
||||
// unwrap 抛出来的 Error(BusinessException 走 HTTP 200 + body)同样要能带出原因
|
||||
assert.equal(loadFailureMessage(new Error('本公司已存在该数据'), '保存失败'), '保存失败:本公司已存在该数据')
|
||||
// 后端把底层英文拼进 message:界面只留中文主干
|
||||
assert.equal(loadFailureMessage(new Error('Internal Server Error'), '导出失败,请重试'), '导出失败,请重试')
|
||||
assert.equal(loadFailureMessage(undefined, '数据加载失败'), '数据加载失败')
|
||||
assert.equal(loadFailureMessage('网关超时', '数据加载失败'), '数据加载失败:网关超时')
|
||||
// 兜底句里已经含原因时不重复拼一遍
|
||||
assert.equal(loadFailureMessage(new Error('去重数据加载失败'), '去重数据加载失败'), '去重数据加载失败')
|
||||
})
|
||||
|
||||
test('范围拒绝要给出路,不是只说"失败了"', () => {
|
||||
assert.match(scopeRefusalNote('无权操作该分组数据'), /平台超级管理员/)
|
||||
assert.match(scopeRefusalNote('缺少归属公司:请先在页面上方选择公司'), /平台超级管理员/)
|
||||
assert.equal(scopeRefusalNote('本公司已存在该数据'), '', '普通业务校验不该被加成越权文案')
|
||||
assert.equal(LOAD_FAILURE_RETRY_LABEL, '重试', '按钮字样必须是能办成事的「重试」,不是「知道了」')
|
||||
})
|
||||
|
||||
test('重试入口的失败态组件本身不是占位:它把点击回抛给页面', () => {
|
||||
const bar = readSource('src/components/LoadFailureBar.vue')
|
||||
assert.match(bar, /\$emit\('retry'\)/, '按钮必须把动作交回页面的取数函数')
|
||||
assert.match(bar, /defineEmits<\{\s*\(event: 'retry'\): void\s*\}>\(\)/)
|
||||
assert.match(bar, /role="alert"/, '失败要对读屏与低视力用户可见')
|
||||
})
|
||||
|
||||
test('非零对照:造一个"loading 结束但没有失败分支"的页面会被点名', () => {
|
||||
const placeholder = `<script setup lang="ts">
|
||||
import { onMounted, ref } from 'vue'
|
||||
const loading = ref(false)
|
||||
const rows = ref([])
|
||||
async function load() {
|
||||
loading.value = true
|
||||
try { rows.value = await fetchRows() } catch (e) { showAdminFeedback('加载失败', 'error') }
|
||||
finally { loading.value = false }
|
||||
}
|
||||
onMounted(load)
|
||||
</script>
|
||||
<template>
|
||||
<div class="table-scroll"><table><tbody><tr><td>{{ rows.length }}</td></tr></tbody></table></div>
|
||||
</template>
|
||||
`
|
||||
const gaps = failureGaps(placeholder)
|
||||
assert.equal(gaps.length, 3, `缺口应当被逐条点名,实测=${JSON.stringify(gaps)}`)
|
||||
assert.match(gaps.join(' '), /v-if/)
|
||||
assert.match(gaps.join(' '), /重试/)
|
||||
|
||||
const dismissed = `<script setup lang="ts">
|
||||
import { onMounted, ref } from 'vue'
|
||||
const loading = ref(false)
|
||||
const loadError = ref('')
|
||||
async function load() {
|
||||
loading.value = true
|
||||
try { } catch (e) { loadError.value = '加载失败' } finally { loading.value = false }
|
||||
}
|
||||
function retry() { void load() }
|
||||
onMounted(load)
|
||||
</script>
|
||||
<template>
|
||||
<div v-if="loadError" class="msg err">
|
||||
<span>{{ loadError }}</span>
|
||||
<button type="button" @click="loadError = ''">知道了</button>
|
||||
</div>
|
||||
</template>
|
||||
`
|
||||
assert.equal(failureGaps(dismissed).length, 1, '只有「知道了」这种清条按钮 = 撤入口不是出口,必须被点名')
|
||||
assert.match(failureGaps(dismissed)[0], /重试/)
|
||||
|
||||
const wired = `<script setup lang="ts">
|
||||
import { onMounted, ref } from 'vue'
|
||||
const loading = ref(false)
|
||||
const loadFailure = ref('')
|
||||
async function load() {
|
||||
loading.value = true
|
||||
try { } catch (e) { loadFailure.value = '加载失败' } finally { loading.value = false }
|
||||
}
|
||||
onMounted(load)
|
||||
</script>
|
||||
<template>
|
||||
<LoadFailureBar v-if="loadFailure" :message="loadFailure" @retry="load" />
|
||||
</template>
|
||||
`
|
||||
assert.deepEqual(failureGaps(wired), [], '补齐形态必须判成过,否则上面那条"名单外点名"没有区分力')
|
||||
})
|
||||
@@ -47,7 +47,9 @@ test('test_task_003_layout_contract_boundary_single_item', () => {
|
||||
test('test_task_003_layout_contract_boundary_limit_or_missing_field', () => {
|
||||
// 边界上限:Element Plus 交互能力按需命名导入,不整包拖入壳层。
|
||||
const layout = readSource(LAYOUT)
|
||||
assert.match(layout, /import\s*\{\s*ElMessage(?:,\s*\w+)*\s*\}\s*from\s*['"]element-plus['"]/)
|
||||
assert.match(layout, /import\s*\{\s*ElMessageBox(?:,\s*\w+)*\s*\}\s*from\s*['"]element-plus['"]/)
|
||||
assert.doesNotMatch(layout, /import\s*\{[^}]*\bElMessage\b[^}]*\}\s*from\s*['"]element-plus['"]/,
|
||||
'壳层提示走 showAdminFeedback 统一出口,不再直接命名导入 ElMessage')
|
||||
assert.equal(occurrences(layout, 'import ElementPlus'), 0, '壳层不得整包导入 ElementPlus')
|
||||
})
|
||||
|
||||
|
||||
@@ -281,7 +281,7 @@ test('task_center_page_handles_empty_and_error_states', () => {
|
||||
const page = readSource(PAGE)
|
||||
assert.match(page, /暂无符合条件的任务/, '任务空态')
|
||||
assert.match(page, /暂无变体采集任务/, '变体空态:四态口径下不再限定「在跑」')
|
||||
assert.match(page, /ElMessage\.error/, '接口失败提示')
|
||||
assert.match(page, /showAdminFeedback\([^\n]*, 'error'\)/, '接口失败提示走统一出口')
|
||||
assert.match(page, /resetFilter/, '筛选重置接线')
|
||||
assert.match(page, /@size-change="changeTaskSize"/, '分页每页条数切换')
|
||||
assert.match(page, /@size-change="changeVariantSize"/, '变体分页每页条数切换')
|
||||
|
||||
@@ -0,0 +1,199 @@
|
||||
/**
|
||||
* 定时器 / 事件监听的清理配对(四面9分口径 · 后管「稳定 7.0:定时器清理配对只有 2/4」)。
|
||||
*
|
||||
* 评审点名:`DedupeRegistryPage.vue`(导出秒表 setInterval + 导入轮询)与 `DuplicateCheckPage.vue`
|
||||
* (toast 收尾 setTimeout)**没有 `onUnmounted`**——离开页面后定时器还在跑,每秒改一个没人看的 ref,
|
||||
* 而导入轮询最多还会再打 300 拍。这一支把配对关系落成判据:
|
||||
* ① 有 `setInterval(` 的文件必须同时有 `clearInterval(` 和一个卸载钩子;
|
||||
* ② 有 `addEventListener(` 的文件必须同时有 `removeEventListener(` 和一个卸载钩子;
|
||||
* ③ 一次性 `setTimeout(` 也要有配对,除非落在下面这张例外名单里(名单只许减,锚构造名不锚行号)。
|
||||
* 光有 clearInterval 不算过:只在"用户点了取消"那条路径清理,页面被路由切走时照样漏。
|
||||
*/
|
||||
import test from 'node:test'
|
||||
import assert from 'node:assert/strict'
|
||||
import { readdirSync, statSync } from 'node:fs'
|
||||
import { join } from 'node:path'
|
||||
import { readSource } from './helpers.ts'
|
||||
|
||||
/** 分母硬钉:2026-10-10 实测 setInterval 3 处、addEventListener 4 处、setTimeout 5 处。 */
|
||||
const REPEATING_SITE_FLOOR = 7
|
||||
/** 例外名单只许减:三条 sleep() 节拍原语。 */
|
||||
const LEDGER_CAP = 3
|
||||
|
||||
const LEDGER: Array<{ file: string; construct: string; token: string; reason: string }> = [
|
||||
{
|
||||
file: 'src/pages/asin/DedupeRegistryPage.vue',
|
||||
construct: 'function sleep(',
|
||||
token: 'setTimeout(',
|
||||
reason: 'sleep() 是导入进度轮询的一次性节拍原语,不重复自持;跨卸载的泄漏由本页 pageDisposed '
|
||||
+ '闸门收口(onUnmounted 里置位,pollImport 下一拍直接抛),所以这一处不需要 clearTimeout',
|
||||
},
|
||||
{
|
||||
file: 'src/pages/asin/QueryAsinPage.vue',
|
||||
construct: 'function sleep(',
|
||||
token: 'setTimeout(',
|
||||
reason: '同 DedupeRegistryPage 的轮询节拍原语;本页 importProgress 轮询用完后自行走完,'
|
||||
+ '未接卸载中断(本批次只登记不扩改),名单只许减',
|
||||
},
|
||||
{
|
||||
file: 'src/pages/asin/SkipPricePage.vue',
|
||||
construct: 'function sleep(',
|
||||
token: 'setTimeout(',
|
||||
reason: '同上:sleep() 节拍原语,卸载中断未接,登记在案等下一批收口',
|
||||
},
|
||||
]
|
||||
|
||||
const REPEATING: Array<{ token: string; mate: string; what: string }> = [
|
||||
{ token: 'setInterval(', mate: 'clearInterval(', what: '重复定时器' },
|
||||
{ token: 'addEventListener(', mate: 'removeEventListener(', what: '事件监听' },
|
||||
{ token: 'setTimeout(', mate: 'clearTimeout(', what: '一次性定时器' },
|
||||
]
|
||||
|
||||
function codeOf(src: string): string {
|
||||
return src.split('\n').filter((line) => !/^\s*(\/\/|\*|\/\*)/.test(line)).join('\n')
|
||||
}
|
||||
|
||||
function hasHook(code: string): boolean {
|
||||
return code.includes('onUnmounted(') || code.includes('onBeforeUnmount(')
|
||||
}
|
||||
|
||||
/** 一个文件里未配对的定时器/监听(返回缺哪几条,空 = 过)。 */
|
||||
export function cleanupGaps(code: string, ledgerTokens: string[] = []): string[] {
|
||||
const gaps: string[] = []
|
||||
for (const { token, mate, what } of REPEATING) {
|
||||
if (!code.includes(token)) continue
|
||||
if (ledgerTokens.includes(token)) continue
|
||||
if (!code.includes(mate)) gaps.push(`${what}:有 ${token} 却没有 ${mate}`)
|
||||
if (!hasHook(code)) gaps.push(`${what}:${token} 所在文件没有 onUnmounted/onBeforeUnmount`)
|
||||
}
|
||||
return gaps
|
||||
}
|
||||
|
||||
function sourceFiles(): string[] {
|
||||
const out: string[] = []
|
||||
const walk = (dir: string): void => {
|
||||
for (const name of readdirSync(dir)) {
|
||||
const abs = join(dir, name)
|
||||
if (name.endsWith('.d.ts')) continue
|
||||
if (statSync(abs).isDirectory()) walk(abs)
|
||||
else if (name.endsWith('.vue') || name.endsWith('.ts')) out.push(abs.split(/[\\/]+/).join('/'))
|
||||
}
|
||||
}
|
||||
walk('src')
|
||||
return out
|
||||
}
|
||||
|
||||
const FILES = sourceFiles()
|
||||
/** 例外只在「登记的那个构造确实还在文件里」时生效:删掉了 sleep 也等于删掉了这条豁免。 */
|
||||
const ledgerTokensFor = (rel: string, code: string): string[] =>
|
||||
LEDGER.filter((e) => e.file === rel && code.includes(e.construct)).map((e) => e.token)
|
||||
const offenders = FILES
|
||||
.map((rel) => {
|
||||
const code = codeOf(readSource(rel))
|
||||
return { rel, gaps: cleanupGaps(code, ledgerTokensFor(rel, code)) }
|
||||
})
|
||||
.filter((x) => x.gaps.length > 0)
|
||||
|
||||
test('分母硬钉:重复定时器/监听的数量像被真的数到了', () => {
|
||||
assert.ok(FILES.length >= 180, `只扫到 ${FILES.length} 个源文件`)
|
||||
const sites = FILES.reduce((sum, rel) => {
|
||||
const code = codeOf(readSource(rel))
|
||||
return sum + (code.match(/setInterval\(/g) || []).length + (code.match(/addEventListener\(/g) || []).length
|
||||
}, 0)
|
||||
assert.ok(sites >= REPEATING_SITE_FLOOR,
|
||||
`setInterval+addEventListener 只数到 ${sites} 处(阈值 ${REPEATING_SITE_FLOOR}):判据扫空了会把"漏清理"读成"没有定时器"`)
|
||||
})
|
||||
|
||||
test('每处定时器/监听都有配对的清理 + 卸载钩子(名单外点名,名单只许减)', () => {
|
||||
assert.ok(LEDGER.length <= LEDGER_CAP, `例外名单从 ${LEDGER_CAP} 涨到 ${LEDGER.length}:这条口径只许减`)
|
||||
assert.deepEqual(offenders.map((x) => `${x.rel} -> ${x.gaps.join(';')}`), [],
|
||||
`清理没配对的页面:\n${offenders.map((x) => `${x.rel}: ${x.gaps.join(';')}`).join('\n')}`)
|
||||
// 名单里的每一条都要仍然成立:构造还在、文件确实还有裸 setTimeout。
|
||||
for (const entry of LEDGER) {
|
||||
const code = codeOf(readSource(entry.file))
|
||||
assert.ok(code.includes(entry.construct), `${entry.file} 里已经找不到 ${entry.construct},这条登记该删`)
|
||||
assert.ok(code.includes('setTimeout('), `${entry.file} 已无 setTimeout,这条登记该删`)
|
||||
assert.ok(entry.reason.length >= 16, `${entry.file} 的例外理由没写清楚`)
|
||||
}
|
||||
})
|
||||
|
||||
/** 取 `onUnmounted(() => { ... })` 的钩子体(到配对的右括为止,最多 400 字符)。 */
|
||||
export function unmountHookBody(code: string): string {
|
||||
const at = code.search(/on(?:Before)?Unmounted\(\s*\(\s*\)\s*=>\s*\{/)
|
||||
if (at < 0) return ''
|
||||
const open = code.indexOf('{', at)
|
||||
let depth = 0
|
||||
for (let i = open; i < code.length && i - open < 400; i++) {
|
||||
if (code[i] === '{') depth += 1
|
||||
else if (code[i] === '}') {
|
||||
depth -= 1
|
||||
if (depth === 0) return code.slice(open + 1, i)
|
||||
}
|
||||
}
|
||||
return code.slice(open + 1, open + 400)
|
||||
}
|
||||
|
||||
/** 找到某个本地函数体的文本(够用到 clearInterval 那一层即可)。 */
|
||||
function localFnBody(code: string, name: string): string {
|
||||
const at = code.search(new RegExp(`function\\s+${name}\\s*\\(`))
|
||||
if (at < 0) return ''
|
||||
const open = code.indexOf('{', at)
|
||||
let depth = 0
|
||||
for (let i = open; i < code.length; i++) {
|
||||
if (code[i] === '{') depth += 1
|
||||
else if (code[i] === '}') {
|
||||
depth -= 1
|
||||
if (depth === 0) return code.slice(open + 1, i)
|
||||
}
|
||||
}
|
||||
return ''
|
||||
}
|
||||
|
||||
/** 卸载钩子真的把定时器收掉了?直接 clear 或调一个内部会 clear 的本地函数都算。 */
|
||||
export function hookClearsTimer(code: string): boolean {
|
||||
const body = unmountHookBody(code)
|
||||
if (!body) return false
|
||||
if (/clear(Interval|Timeout)\(/.test(body)) return true
|
||||
return [...body.matchAll(/(\w+)\(\)/g)]
|
||||
.some((m) => /clear(Interval|Timeout)\(/.test(localFnBody(code, m[1])))
|
||||
}
|
||||
|
||||
test('评审点名的两个文件确实补上了卸载钩子', () => {
|
||||
for (const rel of ['src/pages/asin/DedupeRegistryPage.vue', 'src/pages/tasks/DuplicateCheckPage.vue']) {
|
||||
const code = codeOf(readSource(rel))
|
||||
assert.ok(hasHook(code), `${rel} 仍无 onUnmounted/onBeforeUnmount`)
|
||||
assert.ok(hookClearsTimer(code), `${rel} 的卸载钩子里没有真的清定时器(直接 clear 或调会 clear 的本地函数都算)`)
|
||||
}
|
||||
// 去重页另外半边:离开页面后导入轮询必须自己收口,不然还会再打 300 拍。
|
||||
const dedupe = codeOf(readSource('src/pages/asin/DedupeRegistryPage.vue'))
|
||||
assert.match(dedupe, /pageDisposed = true/)
|
||||
assert.match(dedupe, /if \(pageDisposed\) throw/)
|
||||
})
|
||||
|
||||
test('非零对照:钩子只置个标志位、没清定时器,会被判不过', () => {
|
||||
const fakeHook = `function stop() { /* 这里没清 */ }\n`
|
||||
+ `onUnmounted(() => { stop() })\n`
|
||||
assert.equal(hookClearsTimer(fakeHook), false, '钩子调了个不清定时器的方法也算过 ⇒ 这条判据是软的')
|
||||
const indirect = `function stop() { clearInterval(t) }\n`
|
||||
+ `onUnmounted(() => { stop() })\n`
|
||||
assert.equal(hookClearsTimer(indirect), true, '间接清理要认:不然 stopExportWait() 那种写法会被误判')
|
||||
})
|
||||
|
||||
test('非零对照:造一个只 setInterval 不清理的文件会被点名', () => {
|
||||
const leaked = `const t = setInterval(() => tick(), 1000)\n`
|
||||
assert.deepEqual(cleanupGaps(leaked), [
|
||||
'重复定时器:有 setInterval( 却没有 clearInterval(',
|
||||
'重复定时器:setInterval( 所在文件没有 onUnmounted/onBeforeUnmount',
|
||||
], '漏清理扫不出来 ⇒ 上面那条断言恒绿')
|
||||
|
||||
const hookless = `let t = null\nfunction go() { t = setInterval(() => tick(), 1000) }\nfunction stop() { clearInterval(t) }\n`
|
||||
assert.deepEqual(cleanupGaps(hookless), ['重复定时器:setInterval( 所在文件没有 onUnmounted/onBeforeUnmount'],
|
||||
'只在"点取消"那条路径清理、路由切走仍会漏,这种形态必须判不过')
|
||||
|
||||
const paired = `let t = null\nfunction go() { t = setInterval(() => tick(), 1000) }\n`
|
||||
+ `onUnmounted(() => { clearInterval(t) })\n`
|
||||
assert.deepEqual(cleanupGaps(paired), [])
|
||||
|
||||
const listenerLeak = `window.addEventListener('resize', onResize)\n`
|
||||
assert.equal(cleanupGaps(listenerLeak).length, 2, 'addEventListener 不配对同样要被抓到')
|
||||
})
|
||||
Reference in New Issue
Block a user