@@ -771,6 +780,71 @@
updateShopManageAccess();
});
}
+ function applyTabAccess(tabName, canUse) {
+ var tab = document.querySelector('.tab[data-tab="' + tabName + '"]');
+ var panel = document.getElementById('panel-' + tabName);
+ if (tab) tab.style.display = canUse ? '' : 'none';
+ if (panel) panel.style.display = canUse ? '' : 'none';
+ if (!canUse && tab && tab.classList.contains('active')) {
+ tab.classList.remove('active');
+ if (panel) panel.classList.remove('active');
+ var usersTab = document.querySelector('.tab[data-tab="users"]');
+ var usersPanel = document.getElementById('panel-users');
+ if (usersTab) usersTab.classList.add('active');
+ if (usersPanel) usersPanel.classList.add('active');
+ }
+ }
+ function updateAdminOnlyAccess() {
+ var canUse = currentUserRole === 'super_admin';
+ applyTabAccess('columns', canUse);
+ applyTabAccess('shop-keys', canUse);
+ }
+ function updateDedupeTotalDataAccess() {
+ var canUse = currentUserRole === 'super_admin' ||
+ !!currentUserAdminPermissionKeys['admin_dedupe_total_data'] ||
+ !!currentUserAdminPermissionRoutes['dedupe-total-data'];
+ applyTabAccess('dedupe-total-data', canUse);
+ }
+ function updateShopManageAccess() {
+ var canUse = currentUserRole === 'super_admin' ||
+ !!currentUserAdminPermissionKeys['admin_shop_manage'] ||
+ !!currentUserAdminPermissionRoutes['shop-manage'];
+ applyTabAccess('shop-manage', canUse);
+ }
+ function loadCurrentUserAdminPermissions() {
+ currentUserAdminPermissionKeys = {};
+ currentUserAdminPermissionRoutes = {};
+ updateAdminOnlyAccess();
+ if (!currentUserId || currentUserRole === 'super_admin') {
+ updateDedupeTotalDataAccess();
+ updateShopManageAccess();
+ return;
+ }
+ fetch('/api/admin/user/' + currentUserId + '/column-permissions?menu_type=admin')
+ .then(function(r) { return r.json(); })
+ .then(function(res) {
+ if (!res.success) {
+ updateAdminOnlyAccess();
+ updateDedupeTotalDataAccess();
+ updateShopManageAccess();
+ return;
+ }
+ (res.items || []).forEach(function(item) {
+ var columnKey = (item.column_key || '').trim();
+ var routePath = (item.route_path || '').trim();
+ if (columnKey) currentUserAdminPermissionKeys[columnKey] = true;
+ if (routePath) currentUserAdminPermissionRoutes[routePath] = true;
+ });
+ updateAdminOnlyAccess();
+ updateDedupeTotalDataAccess();
+ updateShopManageAccess();
+ })
+ .catch(function() {
+ updateAdminOnlyAccess();
+ updateDedupeTotalDataAccess();
+ updateShopManageAccess();
+ });
+ }
var allColumnsList = [];
function loadColumnsForPermission() {
fetch('/api/admin/columns')
@@ -1994,6 +2068,115 @@
document.getElementById('editColumnModal').classList.remove('show');
};
+ function loadColumns() {
+ fetch('/api/admin/columns')
+ .then(function(r) { return r.json(); })
+ .then(function(res) {
+ var tbody = document.getElementById('columnListBody');
+ if (!res.success) {
+ tbody.innerHTML = '
| 加载失败: ' + (res.error || '') + ' |
';
+ return;
+ }
+ allColumnsList = res.items || [];
+ if (allColumnsList.length === 0) {
+ tbody.innerHTML = '
| 暂无栏目，请先在上方新增 |
';
+ } else {
+ tbody.innerHTML = allColumnsList.map(function(c) {
+ return '
| ' + c.id + ' | ' + (c.name || '') + ' | ' + (c.column_key || '') + ' | ' + (c.route_path || '') + ' | ' + (c.created_at || '') + ' | ' +
+ ' ' +
+ ' |
';
+ }).join('');
+ }
+ bindColumnActions();
+ })
+ .catch(function() {
+ document.getElementById('columnListBody').innerHTML = '
| 请求失败 |
';
+ });
+ }
+ function bindColumnActions() {
+ document.querySelectorAll('[data-column-edit]').forEach(function(btn) {
+ btn.onclick = function() {
+ document.getElementById('editColumnId').value = btn.dataset.columnEdit || '';
+ document.getElementById('editColumnName').value = (btn.dataset.name || '').replace(/"/g, '"');
+ document.getElementById('editColumnKey').value = (btn.dataset.key || '').replace(/"/g, '"');
+ document.getElementById('editColumnRoutePath').value = (btn.dataset.route || '').replace(/"/g, '"');
+ document.getElementById('msgEditColumn').textContent = '';
+ document.getElementById('editColumnModal').classList.add('show');
+ };
+ });
+ document.querySelectorAll('[data-column-delete]').forEach(function(btn) {
+ btn.onclick = function() {
+ if (!confirm('确定删除栏目「' + (btn.dataset.name || '').replace(/"/g, '"') + '」吗？')) return;
+ fetch('/api/admin/column/' + btn.dataset.columnDelete, { method: 'DELETE' })
+ .then(function(r) { return r.json(); })
+ .then(function(res) {
+ if (res.success) { loadColumns(); loadColumnsForPermission(); }
+ else { alert(res.error || '删除失败'); }
+ });
+ };
+ });
+ }
+ document.getElementById('btnAddColumn').onclick = function() {
+ var name = (document.getElementById('columnName').value || '').trim();
+ var key = (document.getElementById('columnKey').value || '').trim();
+ var routePath = (document.getElementById('columnRoutePath').value || '').trim();
+ var msgEl = document.getElementById('msgColumn');
+ msgEl.textContent = '';
+ msgEl.className = 'msg';
+ if (!name) { msgEl.textContent = '请填写栏目名'; msgEl.classList.add('err'); return; }
+ if (!key) { msgEl.textContent = '请填写栏目标识'; msgEl.classList.add('err'); return; }
+ if (!routePath) { msgEl.textContent = '请填写菜单路由'; msgEl.classList.add('err'); return; }
+ fetch('/api/admin/column', {
+ method: 'POST',
+ headers: { 'Content-Type': 'application/json' },
+ body: JSON.stringify({ name: name, column_key: key, route_path: routePath, menu_type: 'admin' })
+ })
+ .then(function(r) { return r.json(); })
+ .then(function(res) {
+ if (res.success) {
+ msgEl.textContent = res.msg || '新增成功';
+ msgEl.classList.add('ok');
+ document.getElementById('columnName').value = '';
+ document.getElementById('columnKey').value = '';
+ document.getElementById('columnRoutePath').value = '';
+ loadColumns();
+ loadColumnsForPermission();
+ } else {
+ msgEl.textContent = res.error || '新增失败';
+ msgEl.classList.add('err');
+ }
+ })
+ .catch(function() { msgEl.textContent = '请求失败'; msgEl.classList.add('err'); });
+ };
+ document.getElementById('btnSaveColumn').onclick = function() {
+ var cid = document.getElementById('editColumnId').value;
+ var name = (document.getElementById('editColumnName').value || '').trim();
+ var key = (document.getElementById('editColumnKey').value || '').trim();
+ var routePath = (document.getElementById('editColumnRoutePath').value || '').trim();
+ var msgEl = document.getElementById('msgEditColumn');
+ msgEl.textContent = '';
+ msgEl.className = 'msg';
+ if (!name) { msgEl.textContent = '请填写栏目名'; msgEl.classList.add('err'); return; }
+ if (!key) { msgEl.textContent = '请填写栏目标识'; msgEl.classList.add('err'); return; }
+ if (!routePath) { msgEl.textContent = '请填写菜单路由'; msgEl.classList.add('err'); return; }
+ fetch('/api/admin/column/' + cid, {
+ method: 'PUT',
+ headers: { 'Content-Type': 'application/json' },
+ body: JSON.stringify({ name: name, column_key: key, route_path: routePath, menu_type: 'admin' })
+ })
+ .then(function(r) { return r.json(); })
+ .then(function(res) {
+ if (res.success) {
+ document.getElementById('editColumnModal').classList.remove('show');
+ loadColumns();
+ loadColumnsForPermission();
+ } else {
+ msgEl.textContent = res.error || '保存失败';
+ msgEl.classList.add('err');
+ }
+ });
+ };
+
// ========== 分页 ==========
function renderPagination(elId, total, page, pageSize, onPage) {
var el = document.getElementById(elId);
diff --git a/frontend-vue/src/pages/brand/components/BrandDeleteBrandTab.vue b/frontend-vue/src/pages/brand/components/BrandDeleteBrandTab.vue
index 9e3f585..e9277b2 100644
--- a/frontend-vue/src/pages/brand/components/BrandDeleteBrandTab.vue
+++ b/frontend-vue/src/pages/brand/components/BrandDeleteBrandTab.vue
@@ -54,6 +54,10 @@
+
{{ running ? '正在读取删除品牌数据，请稍候…' : '解析后会在右侧展示按国家分组的去重结果' }}
@@ -133,9 +137,6 @@
{{ getTaskStatusInfo(item).text }}
-
保存中...
+
@@ -100,6 +107,7 @@
import { computed, onMounted, onUnmounted, ref } from 'vue'
import { ElMessage } from 'element-plus'
import BrandTopBar from '@/pages/brand/components/BrandTopBar.vue'
+import { LISTING_FILTER_OPTIONS, type ListingFilterValue } from '@/pages/brand/components/listingFilters'
import { activateShopMatchTask, addShopMatchCandidate, createShopMatchTask, deleteShopMatchCandidate, deleteShopMatchHistory, deleteShopMatchTask, getShopMatchCountryPreference, getShopMatchDashboard, getShopMatchHistory, getShopMatchResultDownloadUrl, getShopMatchTasksBatch, listShopMatchCandidates, matchShopMatchShops, putShopMatchCountryPreference, type ShopMatchCandidateVo, type ShopMatchDashboardVo, type ShopMatchHistoryItem, type ShopMatchShopQueueItem, type ShopMatchTaskDetailVo } from '@/shared/api/java-modules'
import { getPywebviewApi } from '@/shared/bridges/pywebview'
@@ -108,6 +116,7 @@ const shopInput = ref('')
const candidates = ref
([])
const selectedCandidates = ref([])
const matchedItems = ref([])
+const shopMatchListingFilter = ref('Active')
const adding = ref(false)
const matching = ref(false)
const pushing = ref(false)
@@ -144,6 +153,7 @@ function sessionKey() { return `shop-match:tasks:${uidForStorage()}` }
function taskStatusStorageKey() { return `shop-match:task-status:${uidForStorage()}` }
function taskSnapshotsStorageKey() { return `shop-match:task-snapshots:${uidForStorage()}` }
function matchedItemsStorageKey() { return `shop-match:matched-items:${uidForStorage()}` }
+function setStorageJson(key: string, value: unknown, shouldRemove: boolean) { if (shouldRemove) window.localStorage.removeItem(key); else window.localStorage.setItem(key, JSON.stringify(value)) }
function rowKeyForMatch(row: ShopMatchShopQueueItem) { return `${(row.shopName || '').trim()}::${row.shopId || ''}` }
function taskRowKey(item: ShopMatchHistoryItem) { return `${normalizeTaskId(item.taskId)}-${item.resultId || 0}-${item.shopName || ''}` }
function countryLabel(code: string) { return COUNTRY_OPTIONS.find((item) => item.code === code)?.label || code }
@@ -164,13 +174,13 @@ function formatDateTime(value?: string) { return value ? value.replace('T', ' ')
function formatTimeOnly(value?: string) { return value ? value.slice(11, 16) : '-' }
function uniqueTaskRows(rows: ShopMatchHistoryItem[], snapshots: Record, section: 'current' | 'history') { const map = new Map(); for (const row of rows) map.set(taskRowKey(row), row); for (const [taskIdText, snapshot] of Object.entries(snapshots)) { const taskId = normalizeTaskId(taskIdText); const first = snapshot.items?.[0]; if (!first || !taskId) continue; const terminal = isTaskTerminalById(taskId); if ((section === 'current' && terminal) || (section === 'history' && !terminal)) continue; const key = taskRowKey({ ...first, taskId }); if (!map.has(key)) map.set(key, { ...first, taskId }) } return Array.from(map.values()) }
function loadPollingIdsFromStorage() { try { const raw = window.localStorage.getItem(sessionKey()); const parsed = raw ? JSON.parse(raw) : []; pollingTaskIds.value = Array.isArray(parsed) ? parsed.filter((item): item is number => typeof item === 'number' && item > 0) : [] } catch { pollingTaskIds.value = [] } }
-function savePollingIds() { window.localStorage.setItem(sessionKey(), JSON.stringify(pollingTaskIds.value)) }
+function savePollingIds() { setStorageJson(sessionKey(), pollingTaskIds.value, pollingTaskIds.value.length === 0) }
function loadTaskDetailsFromStorage() { try { const raw = window.localStorage.getItem(taskStatusStorageKey()); taskDetails.value = raw ? JSON.parse(raw) : {} } catch { taskDetails.value = {} } }
-function saveTaskDetailsToStorage() { window.localStorage.setItem(taskStatusStorageKey(), JSON.stringify(taskDetails.value)) }
+function saveTaskDetailsToStorage() { setStorageJson(taskStatusStorageKey(), taskDetails.value, Object.keys(taskDetails.value).length === 0) }
function loadTaskSnapshotsFromStorage() { try { const raw = window.localStorage.getItem(taskSnapshotsStorageKey()); taskSnapshots.value = raw ? JSON.parse(raw) : {} } catch { taskSnapshots.value = {} } }
-function saveTaskSnapshotsToStorage() { window.localStorage.setItem(taskSnapshotsStorageKey(), JSON.stringify(taskSnapshots.value)) }
+function saveTaskSnapshotsToStorage() { setStorageJson(taskSnapshotsStorageKey(), taskSnapshots.value, Object.keys(taskSnapshots.value).length === 0) }
function loadMatchedItemsFromStorage() { try { const raw = window.localStorage.getItem(matchedItemsStorageKey()); matchedItems.value = raw ? JSON.parse(raw) : [] } catch { matchedItems.value = [] } }
-function saveMatchedItemsToStorage() { window.localStorage.setItem(matchedItemsStorageKey(), JSON.stringify(matchedItems.value)) }
+function saveMatchedItemsToStorage() { setStorageJson(matchedItemsStorageKey(), matchedItems.value, matchedItems.value.length === 0) }
function syncPollingIdsWithTaskState() { const nextIds = pollingTaskIds.value.filter((taskId) => (taskDetails.value[taskId] || taskSnapshots.value[taskId]?.task?.status) === 'RUNNING'); if (nextIds.length === pollingTaskIds.value.length) return; pollingTaskIds.value = nextIds; savePollingIds() }
function addPollingTask(taskId: number) { if (!pollingTaskIds.value.includes(taskId)) { pollingTaskIds.value = [...pollingTaskIds.value, taskId]; savePollingIds() } }
function clearDispatchTimer(taskId: number) { const timer = dispatchTimers.get(taskId); if (timer) { window.clearTimeout(timer); dispatchTimers.delete(taskId) } }
@@ -209,7 +219,7 @@ async function runMatch() { const names = selectedCandidates.value.map((item) =>
function removeMatchedRow(row: ShopMatchShopQueueItem) { matchedItems.value = matchedItems.value.filter((item) => rowKeyForMatch(item) !== rowKeyForMatch(row)); saveMatchedItemsToStorage() }
function removeMatchedRowsLocally(rows: ShopMatchHistoryItem[] | ShopMatchShopQueueItem[]) { const keys = new Set(rows.map((row) => rowKeyForMatch(row as ShopMatchShopQueueItem))); matchedItems.value = matchedItems.value.filter((item) => !keys.has(rowKeyForMatch(item))); saveMatchedItemsToStorage() }
function parseScheduleValues() { if (!scheduleEnabled.value) return undefined; const values = schedulePickerValues.value.map((item) => item.trim()).filter(Boolean); if (!values.length) throw new Error('请至少选择一个执行时间'); const withTime = values.map((value) => { const normalized = normalizeScheduleValue(value); const date = resolveScheduleDateTime(normalized); if (!date) throw new Error(`时间格式无效: ${value}`); return { raw: formatScheduleDateTime(date), time: date.getTime() } }).sort((a, b) => a.time - b.time); for (let i = 1; i < withTime.length; i += 1) if (withTime[i].time === withTime[i - 1].time) throw new Error('执行时间不能重复'); return withTime.map((item) => item.raw) }
-function buildQueuePayload(taskId: number, item: Pick, countryCodes: string[], stageIndex?: number, finalStage = true) { return { type: 'shop-match-run', ts: Date.now(), data: { taskId, user_id: currentUserId(), items: [{ shopName: item.shopName, shopId: item.shopId, platform: item.platform, companyName: item.companyName, matched: true, matchStatus: item.matchStatus, matchMessage: item.matchMessage }], country_codes: [...countryCodes], stage_index: stageIndex, final_stage: finalStage } } }
+function buildQueuePayload(taskId: number, item: Pick, countryCodes: string[], stageIndex?: number, finalStage = true) { return { type: 'shop-match-run', ts: Date.now(), data: { taskId, user_id: currentUserId(), items: [{ shopName: item.shopName, shopId: item.shopId, platform: item.platform, companyName: item.companyName, matched: true, matchStatus: item.matchStatus, matchMessage: item.matchMessage }], country_codes: [...countryCodes], risk_listing_filter: shopMatchListingFilter.value, stage_index: stageIndex, final_stage: finalStage } } }
function nextScheduleStage(taskId: number) { const task = taskSnapshots.value[taskId]?.task; const stages = task?.scheduleStages || []; const currentStageIndex = task?.currentStageIndex; if (typeof currentStageIndex !== 'number') return null; const stage = stages.find((item) => item.stageIndex === currentStageIndex); if (!stage?.scheduledAt) return null; return { stageIndex: currentStageIndex, scheduledAt: stage.scheduledAt, finalStage: currentStageIndex === stages.length - 1 } }
async function dispatchScheduledTask(taskId: number, item: ShopMatchHistoryItem) { const api = getPywebviewApi(); if (!api?.enqueue_json) throw new Error('当前客户端未提供 enqueue_json'); const stage = nextScheduleStage(taskId); const snapshot = taskSnapshots.value[taskId]; const countryCodes = snapshot?.task?.countryCodes || orderedCountryCodes.value; if (!stage) throw new Error(`任务 ${taskId} 缺少待执行阶段`); clearDispatchTimer(taskId); await activateShopMatchTask(taskId, stage.stageIndex); taskDetails.value = { ...taskDetails.value, [taskId]: 'RUNNING' }; if (snapshot?.task) taskSnapshots.value = { ...taskSnapshots.value, [taskId]: { ...snapshot, task: { ...snapshot.task, status: 'RUNNING', activeStageIndex: stage.stageIndex } } }; saveTaskSnapshotsToStorage(); saveTaskDetailsToStorage(); const payload = buildQueuePayload(taskId, item, countryCodes, stage.stageIndex, stage.finalStage); queuePayloadText.value = JSON.stringify(payload, null, 2); const result = await api.enqueue_json(payload); if (!result?.success) throw new Error(result?.error || `任务 ${taskId} 推送失败`); addPollingTask(taskId); queuePushResult.value = `任务 ${taskId} 已推送第 ${stage.stageIndex + 1} 轮`; ensurePolling(true) }
function hasRunningTask() { return Object.values(taskDetails.value).some((status) => status === 'RUNNING') || Object.values(taskSnapshots.value).some((detail) => detail.task?.status === 'RUNNING') }
@@ -247,6 +257,7 @@ async function deleteTaskRecord(item: ShopMatchHistoryItem) {
} else if (resultId > 0) {
await deleteShopMatchHistory(resultId)
historyItems.value = historyItems.value.filter((row) => Number(row.resultId || 0) !== resultId)
+ removeMatchedRowsLocally([item])
} else {
throw new Error('缺少可删除的任务标识')
}
diff --git a/frontend-vue/src/pages/brand/components/BrandTopBar.vue b/frontend-vue/src/pages/brand/components/BrandTopBar.vue
index ea54b7c..b2a07c7 100644
--- a/frontend-vue/src/pages/brand/components/BrandTopBar.vue
+++ b/frontend-vue/src/pages/brand/components/BrandTopBar.vue
@@ -5,22 +5,33 @@
返回首页