mirror of
https://github.com/Ed1s0nZ/CyberStrikeAI.git
synced 2026-07-19 18:38:00 +02:00
Add files via upload
This commit is contained in:
公明
@@ -41,7 +41,10 @@ function buildApiSpecTagToKey() {
|
||||
function translateApiDocTag(tag) {
|
||||
if (!tag) return tag;
|
||||
var key = apiSpecTagToKey[tag];
|
||||
return key ? _t('apiDocs.tags.' + key) : tag;
|
||||
if (!key) return tag;
|
||||
var i18nKey = 'apiDocs.tags.' + key;
|
||||
var translated = _t(i18nKey);
|
||||
return translated === i18nKey ? tag : translated;
|
||||
}
|
||||
function translateApiDocSummaryFromOp(op) {
|
||||
var key = op && op['x-i18n-summary'];
|
||||
|
||||
+722
-15
@@ -1,4 +1,5 @@
|
||||
const ASSET_PAGE_SIZE_KEY = 'cyberstrike.asset_page_size';
|
||||
const ASSET_SAVED_VIEWS_KEY = 'cyberstrike.asset_saved_views';
|
||||
function getAssetPageSize() {
|
||||
try {
|
||||
const value = Number(localStorage.getItem(ASSET_PAGE_SIZE_KEY));
|
||||
@@ -7,15 +8,26 @@ function getAssetPageSize() {
|
||||
return 20;
|
||||
}
|
||||
}
|
||||
const assetPageState = { page: 1, pageSize: getAssetPageSize(), total: 0, totalPages: 1, items: [], projects: [], projectsLoaded: false, detailIndex: -1, editIndex: -1, detailAsset: null, editAsset: null, selected: new Map(), scanMode: 'chat', scanAssets: [], editorTags: [], editorDirty: false, editorBusy: false, editorReturnFocus: null, editorInteractionsReady: false, editorParsedTarget: '' };
|
||||
const assetPageState = { page: 1, pageSize: getAssetPageSize(), total: 0, totalPages: 1, items: [], projects: [], projectsLoaded: false, detailIndex: -1, editIndex: -1, detailAsset: null, editAsset: null, selected: new Map(), selectionQuery: '', allMatchingSelected: false, scanMode: 'chat', scanAssets: [], editorTags: [], editorDirty: false, editorBusy: false, editorReturnFocus: null, editorInteractionsReady: false, editorParsedTarget: '', importRows: [], importFileName: '', importBusy: false, importInteractionsReady: false, importReturnFocus: null };
|
||||
let assetOverviewDays = 30;
|
||||
|
||||
const ASSET_CUSTOM_SELECT_IDS = [
|
||||
'asset-status-filter',
|
||||
'asset-project-filter',
|
||||
'asset-risk-filter',
|
||||
'asset-scan-filter',
|
||||
'asset-environment-filter',
|
||||
'asset-criticality-filter',
|
||||
'asset-sort-filter',
|
||||
'asset-saved-view-select',
|
||||
'asset-batch-project',
|
||||
'asset-edit-project',
|
||||
'asset-edit-status',
|
||||
'asset-edit-environment',
|
||||
'asset-edit-criticality',
|
||||
'asset-bulk-status',
|
||||
'asset-bulk-environment',
|
||||
'asset-bulk-criticality',
|
||||
'asset-page-size-pagination'
|
||||
];
|
||||
|
||||
@@ -25,7 +37,8 @@ function enhanceAssetSelect(select) {
|
||||
const wrapper = select.closest('.settings-custom-select');
|
||||
if (!wrapper) return;
|
||||
wrapper.classList.add('asset-custom-select');
|
||||
wrapper.classList.toggle('asset-custom-select--filter', select.id === 'asset-status-filter' || select.id === 'asset-project-filter');
|
||||
wrapper.classList.toggle('asset-custom-select--filter', Boolean(select.closest('.asset-toolbar')));
|
||||
wrapper.classList.toggle('asset-custom-select--saved-view', select.id === 'asset-saved-view-select');
|
||||
wrapper.classList.toggle('asset-custom-select--pagination', select.id === 'asset-page-size-pagination');
|
||||
}
|
||||
|
||||
@@ -52,6 +65,319 @@ function assetT(key, fallback, options) {
|
||||
return fallback;
|
||||
}
|
||||
|
||||
const ASSET_IMPORT_MAX_ROWS = 100000;
|
||||
const ASSET_IMPORT_MAX_BYTES = 100 * 1024 * 1024;
|
||||
const ASSET_IMPORT_COLUMNS = ['target', 'project', 'tags', 'host', 'ip', 'domain', 'port', 'protocol', 'title', 'server', 'country', 'province', 'city', 'responsible_person', 'department', 'business_system', 'environment', 'criticality', 'status'];
|
||||
const ASSET_IMPORT_HEADER_ALIASES = {
|
||||
target: ['target', 'asset', 'assetaddress', '目标', '资产', '资产地址'],
|
||||
project: ['project', 'projectname', 'projectid', '项目', '项目名称', '项目id', '所属项目'],
|
||||
tags: ['tags', 'tag', '标签'],
|
||||
host: ['host', 'url', '完整url', '主机'],
|
||||
ip: ['ip', 'ipaddress', 'ip地址'],
|
||||
domain: ['domain', '域名'],
|
||||
port: ['port', '端口'],
|
||||
protocol: ['protocol', 'scheme', '协议'],
|
||||
title: ['title', 'pagetitle', '标题', '页面标题'],
|
||||
server: ['server', 'service', 'product', '服务', '产品', '服务指纹'],
|
||||
country: ['country', 'countryregion', '国家', '国家地区'],
|
||||
province: ['province', 'state', '省份', '州'],
|
||||
city: ['city', '城市'],
|
||||
responsible_person: ['responsibleperson', 'owner', '负责人', '责任人'],
|
||||
department: ['department', '部门'],
|
||||
business_system: ['businesssystem', 'system', '业务系统', '系统'],
|
||||
environment: ['environment', 'env', '环境'],
|
||||
criticality: ['criticality', 'importance', '重要性', '重要等级'],
|
||||
status: ['status', '状态']
|
||||
};
|
||||
|
||||
function normalizeAssetImportHeader(value) {
|
||||
return String(value == null ? '' : value).replace(/^\uFEFF/, '').trim().toLowerCase().replace(/[\s_\-/.（）()]+/g, '');
|
||||
}
|
||||
|
||||
function assetImportColumnForHeader(value) {
|
||||
const normalized = normalizeAssetImportHeader(value);
|
||||
return ASSET_IMPORT_COLUMNS.find(column => ASSET_IMPORT_HEADER_ALIASES[column].includes(normalized)) || '';
|
||||
}
|
||||
|
||||
function assetImportTemplateHeaders() {
|
||||
return ASSET_IMPORT_COLUMNS.slice();
|
||||
}
|
||||
|
||||
function downloadAssetTemplate(format) {
|
||||
const headers = assetImportTemplateHeaders();
|
||||
if (format === 'csv') {
|
||||
const csv = '\uFEFF' + headers.join(',') + '\r\n';
|
||||
const link = document.createElement('a');
|
||||
link.href = URL.createObjectURL(new Blob([csv], { type: 'text/csv;charset=utf-8' }));
|
||||
link.download = 'asset-import-template.csv';
|
||||
link.click();
|
||||
setTimeout(() => URL.revokeObjectURL(link.href), 0);
|
||||
return;
|
||||
}
|
||||
if (!window.XLSX) {
|
||||
setAssetImportError(assetT('assets.spreadsheetUnavailable', '表格组件加载失败，请刷新后重试'));
|
||||
return;
|
||||
}
|
||||
const workbook = XLSX.utils.book_new();
|
||||
const assetSheet = XLSX.utils.aoa_to_sheet([headers]);
|
||||
assetSheet['!cols'] = headers.map(name => ({ wch: ['target', 'host'].includes(name) ? 28 : 16 }));
|
||||
assetSheet['!autofilter'] = { ref: `A1:${XLSX.utils.encode_col(headers.length - 1)}1` };
|
||||
const instructions = [
|
||||
[assetT('assets.templateGuideTitle', '资产批量导入填写说明')],
|
||||
[assetT('assets.templateGuideRequired', '必填：target，或 host / ip / domain 中至少一项')],
|
||||
[assetT('assets.templateGuideTarget', 'target 示例：https://example.com:443、example.com、1.1.1.1:22')],
|
||||
[assetT('assets.templateGuideProject', 'project 填写系统中已有的项目名称或项目 ID，留空表示不绑定')],
|
||||
[assetT('assets.templateGuideTags', 'tags 使用逗号分隔，最多 30 个')],
|
||||
[assetT('assets.templateGuideStatus', 'status 仅支持 active / inactive，留空默认为 active')],
|
||||
[assetT('assets.templateGuideLimit', '请在“Assets”工作表中填写，最多 100000 行')]
|
||||
];
|
||||
const guideSheet = XLSX.utils.aoa_to_sheet(instructions);
|
||||
guideSheet['!cols'] = [{ wch: 86 }];
|
||||
XLSX.utils.book_append_sheet(workbook, assetSheet, 'Assets');
|
||||
XLSX.utils.book_append_sheet(workbook, guideSheet, assetT('assets.instructionsSheet', '填写说明').slice(0, 31));
|
||||
XLSX.writeFile(workbook, 'asset-import-template.xlsx');
|
||||
}
|
||||
|
||||
async function openAssetImport() {
|
||||
assetPageState.importReturnFocus = document.activeElement;
|
||||
await ensureAssetProjects(true);
|
||||
resetAssetImport();
|
||||
ensureAssetImportInteractions();
|
||||
if (typeof openAppModal === 'function') openAppModal('asset-import-modal', { focusEl: document.getElementById('asset-import-dropzone') });
|
||||
else document.getElementById('asset-import-modal').style.display = 'flex';
|
||||
}
|
||||
|
||||
function closeAssetImport(force) {
|
||||
if (assetPageState.importBusy && !force) return;
|
||||
if (typeof closeAppModal === 'function') closeAppModal('asset-import-modal');
|
||||
else document.getElementById('asset-import-modal').style.display = 'none';
|
||||
const returnFocus = assetPageState.importReturnFocus;
|
||||
if (returnFocus && typeof returnFocus.focus === 'function') requestAnimationFrame(() => returnFocus.focus());
|
||||
}
|
||||
|
||||
function resetAssetImport() {
|
||||
assetPageState.importRows = [];
|
||||
assetPageState.importFileName = '';
|
||||
assetPageState.importBusy = false;
|
||||
const file = document.getElementById('asset-import-file');
|
||||
if (file) file.value = '';
|
||||
const name = document.getElementById('asset-import-file-name');
|
||||
if (name) name.textContent = assetT('assets.fileNotSelected', '尚未选择文件');
|
||||
const preview = document.getElementById('asset-import-preview-section');
|
||||
if (preview) preview.hidden = true;
|
||||
const body = document.getElementById('asset-import-preview-body');
|
||||
if (body) body.innerHTML = '';
|
||||
setAssetImportError('');
|
||||
setAssetImportBusy(false);
|
||||
}
|
||||
|
||||
function ensureAssetImportInteractions() {
|
||||
if (assetPageState.importInteractionsReady) return;
|
||||
assetPageState.importInteractionsReady = true;
|
||||
const dropzone = document.getElementById('asset-import-dropzone');
|
||||
if (!dropzone) return;
|
||||
['dragenter', 'dragover'].forEach(type => dropzone.addEventListener(type, event => {
|
||||
event.preventDefault();
|
||||
dropzone.classList.add('is-dragging');
|
||||
}));
|
||||
['dragleave', 'drop'].forEach(type => dropzone.addEventListener(type, event => {
|
||||
event.preventDefault();
|
||||
dropzone.classList.remove('is-dragging');
|
||||
}));
|
||||
dropzone.addEventListener('drop', event => handleAssetImportFile(event.dataTransfer?.files?.[0]));
|
||||
}
|
||||
|
||||
function setAssetImportError(message) {
|
||||
const root = document.getElementById('asset-import-error');
|
||||
if (!root) return;
|
||||
root.textContent = message || '';
|
||||
root.hidden = !message;
|
||||
}
|
||||
|
||||
function setAssetImportBusy(busy) {
|
||||
assetPageState.importBusy = Boolean(busy);
|
||||
const submit = document.getElementById('asset-import-submit');
|
||||
if (submit) submit.disabled = Boolean(busy) || !assetPageState.importRows.some(row => !row.error);
|
||||
const dropzone = document.getElementById('asset-import-dropzone');
|
||||
if (dropzone) dropzone.disabled = Boolean(busy);
|
||||
}
|
||||
|
||||
async function handleAssetImportFile(file) {
|
||||
setAssetImportError('');
|
||||
if (!file) return;
|
||||
assetPageState.importRows = [];
|
||||
assetPageState.importFileName = '';
|
||||
const previousPreview = document.getElementById('asset-import-preview-section');
|
||||
if (previousPreview) previousPreview.hidden = true;
|
||||
const selectedName = document.getElementById('asset-import-file-name');
|
||||
if (selectedName) selectedName.textContent = file.name || assetT('assets.fileNotSelected', '尚未选择文件');
|
||||
setAssetImportBusy(false);
|
||||
const extension = String(file.name || '').split('.').pop().toLowerCase();
|
||||
if (!['xlsx', 'csv'].includes(extension)) {
|
||||
setAssetImportError(assetT('assets.fileTypeInvalid', '仅支持 .xlsx 和 .csv 文件'));
|
||||
return;
|
||||
}
|
||||
if (file.size > ASSET_IMPORT_MAX_BYTES) {
|
||||
setAssetImportError(assetT('assets.fileTooLarge', '文件不能超过 100 MB'));
|
||||
return;
|
||||
}
|
||||
if (!window.XLSX) {
|
||||
setAssetImportError(assetT('assets.spreadsheetUnavailable', '表格组件加载失败，请刷新后重试'));
|
||||
return;
|
||||
}
|
||||
setAssetImportBusy(true);
|
||||
try {
|
||||
const workbook = XLSX.read(await file.arrayBuffer(), { type: 'array', cellDates: false });
|
||||
const preferred = workbook.SheetNames.find(name => /^(assets?|资产)$/i.test(String(name).trim()));
|
||||
const sheet = workbook.Sheets[preferred || workbook.SheetNames[0]];
|
||||
const matrix = sheet ? XLSX.utils.sheet_to_json(sheet, { header: 1, defval: '', raw: false, blankrows: false }) : [];
|
||||
parseAssetImportMatrix(matrix, file.name);
|
||||
} catch (error) {
|
||||
console.error('解析资产导入文件失败:', error);
|
||||
setAssetImportError(error?.message || assetT('assets.fileParseFailed', '无法解析文件，请确认文件未损坏且格式正确'));
|
||||
} finally {
|
||||
setAssetImportBusy(false);
|
||||
}
|
||||
}
|
||||
|
||||
function parseAssetImportMatrix(matrix, fileName) {
|
||||
if (!Array.isArray(matrix) || matrix.length < 2) {
|
||||
throw new Error(assetT('assets.fileHasNoData', '文件中没有可导入的数据'));
|
||||
}
|
||||
const headers = matrix[0].map(assetImportColumnForHeader);
|
||||
if (!headers.some(Boolean)) {
|
||||
throw new Error(assetT('assets.headerInvalid', '未识别到模板字段，请使用下载的模板填写'));
|
||||
}
|
||||
const dataRows = matrix.slice(1).filter(row => Array.isArray(row) && row.some(value => String(value ?? '').trim() !== ''));
|
||||
if (!dataRows.length) throw new Error(assetT('assets.fileHasNoData', '文件中没有可导入的数据'));
|
||||
if (dataRows.length > ASSET_IMPORT_MAX_ROWS) {
|
||||
throw new Error(assetT('assets.tooManyRows', `数据不能超过 ${ASSET_IMPORT_MAX_ROWS} 行`, { count: ASSET_IMPORT_MAX_ROWS }));
|
||||
}
|
||||
const seen = new Map();
|
||||
assetPageState.importRows = dataRows.map((row, index) => {
|
||||
const values = {};
|
||||
headers.forEach((column, columnIndex) => {
|
||||
if (column && values[column] == null) values[column] = String(row[columnIndex] ?? '').trim();
|
||||
});
|
||||
const parsed = assetImportRecord(values, index + 2);
|
||||
if (!parsed.error) {
|
||||
const asset = parsed.asset;
|
||||
const key = `${String(asset.domain || asset.ip || asset.host).toLowerCase()}|${asset.port || 0}|${asset.protocol || ''}`;
|
||||
if (seen.has(key)) parsed.error = assetT('assets.duplicateFileRow', `与第 ${seen.get(key)} 行重复`, { row: seen.get(key) });
|
||||
else seen.set(key, parsed.rowNumber);
|
||||
}
|
||||
return parsed;
|
||||
});
|
||||
assetPageState.importFileName = fileName;
|
||||
const name = document.getElementById('asset-import-file-name');
|
||||
if (name) name.textContent = fileName;
|
||||
renderAssetImportPreview();
|
||||
}
|
||||
|
||||
function assetImportRecord(values, rowNumber) {
|
||||
const fail = message => ({ rowNumber, values, asset: null, error: message });
|
||||
const target = values.target || values.host || values.domain || values.ip || '';
|
||||
if (!target) return fail(assetT('assets.importTargetRequired', '缺少目标地址'));
|
||||
let parsed;
|
||||
try { parsed = parseAssetEditorTarget(target); }
|
||||
catch (error) { return fail(error.message); }
|
||||
const rawPort = values.port;
|
||||
const port = rawPort === '' || rawPort == null ? Number(parsed.port || 0) : Number(rawPort);
|
||||
if (!Number.isInteger(port) || port < 0 || port > 65535) return fail(assetT('assets.portInvalid', '端口必须在 1–65535 之间'));
|
||||
const ip = (values.ip || parsed.ip || '').toLowerCase();
|
||||
if (ip && !assetEditorIsIPv4(ip) && !assetEditorIsIPv6(ip)) return fail(assetT('assets.ipInvalid', 'IP 地址格式无效'));
|
||||
const rawDomain = values.domain || parsed.domain || '';
|
||||
const domain = rawDomain ? assetEditorNormalizeDomain(rawDomain) : '';
|
||||
if (rawDomain && !domain) return fail(assetT('assets.domainInvalid', '域名格式无效'));
|
||||
const protocol = (values.protocol || parsed.protocol || '').toLowerCase();
|
||||
if (protocol && !/^[a-z][a-z0-9+.-]{0,31}$/.test(protocol)) return fail(assetT('assets.protocolInvalid', '协议格式无效'));
|
||||
const statuses = { active: 'active', inactive: 'inactive', '活跃': 'active', '停用': 'inactive' };
|
||||
const status = statuses[String(values.status || 'active').toLowerCase()];
|
||||
if (!status) return fail(assetT('assets.importStatusInvalid', '状态仅支持 active 或 inactive'));
|
||||
const environments = { '': '', production: 'production', staging: 'staging', testing: 'testing', development: 'development', other: 'other', '生产': 'production', '预发布': 'staging', '测试': 'testing', '开发': 'development', '其他': 'other' };
|
||||
const environment = environments[String(values.environment || '').toLowerCase()];
|
||||
if (environment == null) return fail('环境值无效');
|
||||
const criticalities = { '': '', critical: 'critical', high: 'high', medium: 'medium', low: 'low', '核心': 'critical', '重要': 'high', '一般': 'medium', '低': 'low' };
|
||||
const criticality = criticalities[String(values.criticality || '').toLowerCase()];
|
||||
if (criticality == null) return fail('重要性值无效');
|
||||
let projectId = '';
|
||||
let projectName = '';
|
||||
if (values.project) {
|
||||
const projectValue = String(values.project).trim().toLowerCase();
|
||||
const project = assetPageState.projects.find(item => String(item.id).toLowerCase() === projectValue || String(item.name).trim().toLowerCase() === projectValue);
|
||||
if (!project) return fail(assetT('assets.importProjectNotFound', `项目不存在或无权访问：${values.project}`, { project: values.project }));
|
||||
projectId = project.id;
|
||||
projectName = project.name;
|
||||
}
|
||||
const tags = String(values.tags || '').split(/[,，;；|]/).map(tag => tag.trim()).filter(Boolean);
|
||||
if (tags.length > 30 || tags.some(tag => Array.from(tag).length > 64)) return fail(assetT('assets.importTagsInvalid', '标签最多 30 个，单个标签最多 64 个字符'));
|
||||
const asset = {
|
||||
host: values.host || parsed.host || '', ip, domain, port, protocol,
|
||||
title: values.title || '', server: values.server || '', country: values.country || '',
|
||||
province: values.province || '', city: values.city || '', responsible_person: values.responsible_person || '',
|
||||
department: values.department || '', business_system: values.business_system || '', environment, criticality, status, tags,
|
||||
project_id: projectId, source: 'manual-import'
|
||||
};
|
||||
const limits = { host: 500, title: 500, domain: 255, protocol: 255, server: 255, country: 255, province: 255, city: 255, responsible_person: 255, department: 255, business_system: 255 };
|
||||
const oversized = Object.keys(limits).find(key => Array.from(String(asset[key] || '')).length > limits[key]);
|
||||
if (oversized) return fail(assetT('assets.importFieldTooLong', `字段 ${oversized} 内容过长`, { field: oversized }));
|
||||
return { rowNumber, values, asset, projectName, error: '' };
|
||||
}
|
||||
|
||||
function renderAssetImportPreview() {
|
||||
const rows = assetPageState.importRows;
|
||||
const valid = rows.filter(row => !row.error).length;
|
||||
const invalid = rows.length - valid;
|
||||
const preview = document.getElementById('asset-import-preview-section');
|
||||
if (preview) preview.hidden = false;
|
||||
const summary = document.getElementById('asset-import-summary');
|
||||
if (summary) summary.textContent = assetT('assets.importPreviewSummary', `共 ${rows.length} 行，${valid} 行有效，${invalid} 行需修正`, { total: rows.length, valid, invalid });
|
||||
const body = document.getElementById('asset-import-preview-body');
|
||||
if (body) body.innerHTML = rows.slice(0, 100).map(row => {
|
||||
const asset = row.asset || {};
|
||||
const target = row.values.target || row.values.host || row.values.domain || row.values.ip || '-';
|
||||
const result = row.error
|
||||
? `<span class="asset-import-result asset-import-result--error">${escapeHtml(row.error)}</span>`
|
||||
: `<span class="asset-import-result asset-import-result--ok">${escapeHtml(assetT('assets.validationPassed', '通过'))}</span>`;
|
||||
return `<tr class="${row.error ? 'has-error' : ''}"><td>${row.rowNumber}</td><td title="${escapeHtml(target)}">${escapeHtml(target)}</td><td>${escapeHtml(row.projectName || row.values.project || '-')}</td><td>${escapeHtml(asset.status || row.values.status || '-')}</td><td>${result}</td></tr>`;
|
||||
}).join('');
|
||||
const note = document.getElementById('asset-import-preview-note');
|
||||
if (note) note.textContent = rows.length > 100 ? assetT('assets.previewLimited', `仅展示前 100 行；提交时将处理全部 ${rows.length} 行`, { count: rows.length }) : '';
|
||||
const submit = document.getElementById('asset-import-submit');
|
||||
if (submit) {
|
||||
submit.textContent = assetT('assets.importValidRowsCount', `导入 ${valid} 条有效数据`, { count: valid });
|
||||
submit.disabled = valid === 0 || assetPageState.importBusy;
|
||||
}
|
||||
}
|
||||
|
||||
async function submitAssetImport() {
|
||||
if (assetPageState.importBusy) return;
|
||||
const assets = assetPageState.importRows.filter(row => !row.error).map(row => row.asset);
|
||||
if (!assets.length) return;
|
||||
setAssetImportError('');
|
||||
setAssetImportBusy(true);
|
||||
try {
|
||||
const response = await apiFetch('/api/assets/import', {
|
||||
method: 'POST', headers: { 'Content-Type': 'application/json' },
|
||||
body: JSON.stringify({ assets, source: 'manual-import', source_query: assetPageState.importFileName })
|
||||
});
|
||||
if (!response.ok) throw new Error(await assetEditorResponseError(response));
|
||||
const result = await response.json();
|
||||
const invalid = assetPageState.importRows.length - assets.length;
|
||||
closeAssetImport(true);
|
||||
await loadAssets(1);
|
||||
if (typeof showInlineToast === 'function') {
|
||||
showInlineToast(assetT('assets.bulkImportDone', `导入完成：新增 ${result.created} 条，更新 ${result.updated} 条，跳过 ${Number(result.skipped || 0) + invalid} 条`, {
|
||||
created: result.created, updated: result.updated, skipped: Number(result.skipped || 0) + invalid
|
||||
}));
|
||||
}
|
||||
} catch (error) {
|
||||
setAssetImportError(assetT('assets.importFailed', '资产入库失败') + ': ' + error.message);
|
||||
} finally {
|
||||
setAssetImportBusy(false);
|
||||
}
|
||||
}
|
||||
|
||||
async function loadAssetOverview() {
|
||||
try {
|
||||
const response = await apiFetch('/api/assets/stats?days=' + assetOverviewDays);
|
||||
@@ -217,20 +543,147 @@ function renderAssetProtocolChart(items, total) {
|
||||
}).join('');
|
||||
}
|
||||
|
||||
const ASSET_FILTER_FIELD_IDS = [
|
||||
'asset-search', 'asset-status-filter', 'asset-project-filter', 'asset-risk-filter', 'asset-vuln-min-filter',
|
||||
'asset-protocol-filter', 'asset-port-filter', 'asset-source-filter', 'asset-tag-filter', 'asset-scan-filter',
|
||||
'asset-country-filter', 'asset-province-filter', 'asset-city-filter', 'asset-responsible-filter',
|
||||
'asset-department-filter', 'asset-business-filter', 'asset-environment-filter', 'asset-criticality-filter',
|
||||
'asset-first-seen-after-filter', 'asset-first-seen-before-filter', 'asset-last-seen-after-filter',
|
||||
'asset-last-seen-before-filter', 'asset-sort-filter'
|
||||
];
|
||||
|
||||
function assetFilterValues() {
|
||||
return Object.fromEntries(ASSET_FILTER_FIELD_IDS.map(id => [id, document.getElementById(id)?.value || '']));
|
||||
}
|
||||
|
||||
function nextAssetFilterDay(value) {
|
||||
if (!value) return '';
|
||||
const date = new Date(value + 'T00:00:00Z');
|
||||
date.setUTCDate(date.getUTCDate() + 1);
|
||||
return date.toISOString().slice(0, 10);
|
||||
}
|
||||
|
||||
function buildAssetFilterParams() {
|
||||
const params = new URLSearchParams();
|
||||
const map = {
|
||||
'asset-search': 'q', 'asset-status-filter': 'status', 'asset-project-filter': 'project_id',
|
||||
'asset-risk-filter': 'risk_level', 'asset-vuln-min-filter': 'min_vulnerabilities',
|
||||
'asset-protocol-filter': 'protocol', 'asset-port-filter': 'port', 'asset-source-filter': 'source',
|
||||
'asset-tag-filter': 'tag', 'asset-country-filter': 'country', 'asset-province-filter': 'province',
|
||||
'asset-city-filter': 'city', 'asset-responsible-filter': 'responsible_person',
|
||||
'asset-department-filter': 'department', 'asset-business-filter': 'business_system',
|
||||
'asset-environment-filter': 'environment', 'asset-criticality-filter': 'criticality',
|
||||
'asset-first-seen-after-filter': 'first_seen_after', 'asset-last-seen-after-filter': 'last_seen_after'
|
||||
};
|
||||
Object.entries(map).forEach(([id, key]) => {
|
||||
const value = document.getElementById(id)?.value.trim() || '';
|
||||
if (value) params.set(key, value);
|
||||
});
|
||||
[
|
||||
['asset-first-seen-before-filter', 'first_seen_before'],
|
||||
['asset-last-seen-before-filter', 'last_seen_before']
|
||||
].forEach(([id, key]) => {
|
||||
const value = nextAssetFilterDay(document.getElementById(id)?.value || '');
|
||||
if (value) params.set(key, value);
|
||||
});
|
||||
const scan = document.getElementById('asset-scan-filter')?.value || '';
|
||||
if (scan === 'never' || scan === 'scanned') params.set('scan_state', scan);
|
||||
else if (/^\d+$/.test(scan)) params.set('scan_overdue_days', scan);
|
||||
const [sortBy, sortOrder] = (document.getElementById('asset-sort-filter')?.value || 'last_seen_at:desc').split(':');
|
||||
if (sortBy) params.set('sort_by', sortBy);
|
||||
if (sortOrder) params.set('sort_order', sortOrder);
|
||||
return params;
|
||||
}
|
||||
|
||||
function toggleAssetAdvancedFilters() {
|
||||
const panel = document.getElementById('asset-advanced-filters');
|
||||
const button = document.getElementById('asset-advanced-toggle');
|
||||
if (!panel) return;
|
||||
panel.hidden = !panel.hidden;
|
||||
if (button) button.setAttribute('aria-expanded', String(!panel.hidden));
|
||||
}
|
||||
|
||||
function resetAssetFilters() {
|
||||
ASSET_FILTER_FIELD_IDS.forEach(id => {
|
||||
const el = document.getElementById(id);
|
||||
if (!el) return;
|
||||
el.value = id === 'asset-sort-filter' ? 'last_seen_at:desc' : '';
|
||||
if (el.tagName === 'SELECT') syncAssetSelect(el);
|
||||
});
|
||||
const saved = document.getElementById('asset-saved-view-select');
|
||||
if (saved) saved.value = '';
|
||||
clearAssetSelection();
|
||||
loadAssets(1);
|
||||
}
|
||||
|
||||
function readAssetSavedViews() {
|
||||
try {
|
||||
const views = JSON.parse(localStorage.getItem(ASSET_SAVED_VIEWS_KEY) || '[]');
|
||||
return Array.isArray(views) ? views : [];
|
||||
} catch (error) {
|
||||
return [];
|
||||
}
|
||||
}
|
||||
|
||||
function renderAssetSavedViews(selectedName) {
|
||||
const select = document.getElementById('asset-saved-view-select');
|
||||
if (!select) return;
|
||||
const views = readAssetSavedViews();
|
||||
select.innerHTML = `<option value="">${escapeHtml(assetT('assets.savedViews', '保存的筛选视图'))}</option>` + views.map(view => `<option value="${escapeHtml(view.name)}">${escapeHtml(view.name)}</option>`).join('');
|
||||
select.value = selectedName || '';
|
||||
syncAssetSelect(select);
|
||||
}
|
||||
|
||||
function saveCurrentAssetView() {
|
||||
const name = prompt('请输入筛选视图名称');
|
||||
if (!name || !name.trim()) return;
|
||||
const cleanName = name.trim().slice(0, 60);
|
||||
const views = readAssetSavedViews().filter(view => view.name !== cleanName);
|
||||
views.push({ name: cleanName, values: assetFilterValues() });
|
||||
try { localStorage.setItem(ASSET_SAVED_VIEWS_KEY, JSON.stringify(views)); } catch (error) { return alert('保存筛选视图失败'); }
|
||||
renderAssetSavedViews(cleanName);
|
||||
if (typeof showInlineToast === 'function') showInlineToast('筛选视图已保存');
|
||||
}
|
||||
|
||||
function applyAssetSavedView(name) {
|
||||
if (!name) return;
|
||||
const view = readAssetSavedViews().find(item => item.name === name);
|
||||
if (!view) return;
|
||||
Object.entries(view.values || {}).forEach(([id, value]) => {
|
||||
const el = document.getElementById(id);
|
||||
if (!el) return;
|
||||
el.value = value || '';
|
||||
if (el.tagName === 'SELECT') syncAssetSelect(el);
|
||||
});
|
||||
document.getElementById('asset-advanced-filters').hidden = false;
|
||||
document.getElementById('asset-advanced-toggle')?.setAttribute('aria-expanded', 'true');
|
||||
clearAssetSelection();
|
||||
loadAssets(1);
|
||||
}
|
||||
|
||||
function deleteCurrentAssetView() {
|
||||
const select = document.getElementById('asset-saved-view-select');
|
||||
const name = select?.value || '';
|
||||
if (!name || !confirm(`删除筛选视图“${name}”吗？`)) return;
|
||||
const views = readAssetSavedViews().filter(view => view.name !== name);
|
||||
try { localStorage.setItem(ASSET_SAVED_VIEWS_KEY, JSON.stringify(views)); } catch (error) { return; }
|
||||
renderAssetSavedViews();
|
||||
}
|
||||
|
||||
async function loadAssets(page) {
|
||||
// 无显式页码表示进入资产库或点击顶部“刷新”，此时同步项目筛选项。
|
||||
// 翻页、搜索等带页码的操作继续复用缓存，避免重复请求项目列表。
|
||||
await ensureAssetProjects(page == null);
|
||||
assetPageState.page = Number(page || assetPageState.page || 1);
|
||||
const params = new URLSearchParams({ page: assetPageState.page, page_size: assetPageState.pageSize });
|
||||
const q = document.getElementById('asset-search')?.value.trim() || '';
|
||||
const status = document.getElementById('asset-status-filter')?.value || '';
|
||||
const projectId = document.getElementById('asset-project-filter')?.value || '';
|
||||
if (q) params.set('q', q);
|
||||
if (status) params.set('status', status);
|
||||
if (projectId) params.set('project_id', projectId);
|
||||
const filterParams = buildAssetFilterParams();
|
||||
const filterQuery = filterParams.toString();
|
||||
if (assetPageState.selectionQuery && assetPageState.selectionQuery !== filterQuery) clearAssetSelection();
|
||||
assetPageState.selectionQuery = filterQuery;
|
||||
const params = new URLSearchParams(filterParams);
|
||||
params.set('page', assetPageState.page);
|
||||
params.set('page_size', assetPageState.pageSize);
|
||||
const body = document.getElementById('asset-table-body');
|
||||
if (body) body.innerHTML = '<tr><td colspan="9" class="muted">' + escapeHtml(assetT('common.loading', '加载中...')) + '</td></tr>';
|
||||
if (body) body.innerHTML = '<tr><td colspan="10" class="muted">' + escapeHtml(assetT('common.loading', '加载中...')) + '</td></tr>';
|
||||
try {
|
||||
const response = await apiFetch('/api/assets?' + params.toString());
|
||||
if (!response.ok) throw new Error(await response.text());
|
||||
@@ -252,7 +705,7 @@ async function loadAssets(page) {
|
||||
assetPageState.items = [];
|
||||
assetPageState.total = 0;
|
||||
assetPageState.totalPages = 1;
|
||||
if (body) body.innerHTML = '<tr><td colspan="9" class="muted">' + escapeHtml(assetT('assets.loadFailed', '加载资产失败')) + '</td></tr>';
|
||||
if (body) body.innerHTML = '<tr><td colspan="10" class="muted">' + escapeHtml(assetT('assets.loadFailed', '加载资产失败')) + '</td></tr>';
|
||||
renderAssetPagination();
|
||||
}
|
||||
}
|
||||
@@ -275,11 +728,43 @@ function assetRiskPresentation(level) {
|
||||
return { level: normalized, label: labels[normalized] };
|
||||
}
|
||||
|
||||
function assetOwnershipMarkup(asset) {
|
||||
const owner = String(asset.responsible_person || '').trim();
|
||||
const department = String(asset.department || '').trim();
|
||||
if (!owner && !department) {
|
||||
return `<span class="asset-ownership-empty">${escapeHtml(assetT('assets.unassigned', '未分配'))}</span>`;
|
||||
}
|
||||
const ownerLabel = assetT('assets.responsiblePerson', '负责人');
|
||||
const departmentLabel = assetT('assets.department', '部门');
|
||||
const title = [
|
||||
owner ? `${ownerLabel}: ${owner}` : '',
|
||||
department ? `${departmentLabel}: ${department}` : ''
|
||||
].filter(Boolean).join(' · ');
|
||||
const primary = owner || department;
|
||||
return `<div class="asset-ownership" title="${escapeHtml(title)}">
|
||||
<span class="asset-ownership__primary">${escapeHtml(primary)}</span>
|
||||
${owner && department ? `<span class="asset-ownership__secondary">${escapeHtml(department)}</span>` : ''}
|
||||
</div>`;
|
||||
}
|
||||
|
||||
function ensureAssetOwnershipColumn() {
|
||||
const table = document.querySelector('#page-asset-library .asset-table');
|
||||
const headerRow = table?.querySelector('thead tr');
|
||||
if (!headerRow || headerRow.querySelector('[data-i18n="assets.ownership"]')) return;
|
||||
const lastScanHeader = headerRow.querySelector('[data-i18n="assets.lastScan"]');
|
||||
if (!lastScanHeader) return;
|
||||
const ownershipHeader = document.createElement('th');
|
||||
ownershipHeader.setAttribute('data-i18n', 'assets.ownership');
|
||||
ownershipHeader.textContent = assetT('assets.ownership', '归属');
|
||||
headerRow.insertBefore(ownershipHeader, lastScanHeader);
|
||||
table.querySelectorAll('#asset-table-body td[colspan="9"]').forEach(cell => cell.setAttribute('colspan', '10'));
|
||||
}
|
||||
|
||||
function renderAssetRows() {
|
||||
const body = document.getElementById('asset-table-body');
|
||||
if (!body) return;
|
||||
if (!assetPageState.items.length) {
|
||||
body.innerHTML = '<tr><td colspan="9" class="muted">' + escapeHtml(assetT('common.noData', '暂无数据')) + '</td></tr>';
|
||||
body.innerHTML = '<tr><td colspan="10" class="muted">' + escapeHtml(assetT('common.noData', '暂无数据')) + '</td></tr>';
|
||||
return;
|
||||
}
|
||||
body.innerHTML = assetPageState.items.map((asset, index) => {
|
||||
@@ -290,10 +775,11 @@ function renderAssetRows() {
|
||||
const risk = assetRiskPresentation(asset.risk_level);
|
||||
const statusLabel = asset.status === 'inactive' ? assetT('assets.statusInactive', '停用') : assetT('assets.statusActive', '活跃');
|
||||
return `<tr>
|
||||
<td class="asset-check-cell"><input type="checkbox" ${assetPageState.selected.has(asset.id) ? 'checked' : ''} onchange="toggleAssetSelection(${index},this.checked)" aria-label="${escapeHtml(assetT('assets.selectAsset', '选择资产'))}"></td>
|
||||
<td class="asset-check-cell"><input type="checkbox" class="theme-checkbox" ${assetPageState.selected.has(asset.id) ? 'checked' : ''} onchange="toggleAssetSelection(${index},this.checked)" aria-label="${escapeHtml(assetT('assets.selectAsset', '选择资产'))}"></td>
|
||||
<td><button class="asset-target-link" title="${escapeHtml(targetHint)}" onclick="openAssetDetail(${index})">${escapeHtml(assetTargetLabel(asset))}</button></td>
|
||||
<td><span class="asset-service" title="${escapeHtml(service)}">${escapeHtml(service)}</span></td>
|
||||
<td>${asset.project_name ? `<span class="asset-project-badge">${escapeHtml(asset.project_name)}</span>` : '<span class="muted">-</span>'}</td>
|
||||
<td>${assetOwnershipMarkup(asset)}</td>
|
||||
<td>${escapeHtml(lastScan)}</td><td>${vulnerabilityCount > 0 ? `<button class="asset-vulnerability-link" onclick="openAssetVulnerabilities(${index})">${vulnerabilityCount}</button>` : '<span class="muted">0</span>'}</td>
|
||||
<td><span class="asset-risk asset-risk--${risk.level}">${escapeHtml(risk.label)}</span></td>
|
||||
<td><span class="asset-status asset-status--${escapeHtml(asset.status || 'active')}">${escapeHtml(statusLabel)}</span></td>
|
||||
@@ -307,7 +793,10 @@ function toggleAssetSelection(index, checked) {
|
||||
const asset = assetPageState.items[Number(index)];
|
||||
if (!asset) return;
|
||||
if (checked) assetPageState.selected.set(asset.id, asset);
|
||||
else assetPageState.selected.delete(asset.id);
|
||||
else {
|
||||
assetPageState.selected.delete(asset.id);
|
||||
assetPageState.allMatchingSelected = false;
|
||||
}
|
||||
updateAssetSelectionUI();
|
||||
}
|
||||
|
||||
@@ -316,22 +805,48 @@ function toggleAssetPageSelection(checked) {
|
||||
if (checked) assetPageState.selected.set(asset.id, asset);
|
||||
else assetPageState.selected.delete(asset.id);
|
||||
});
|
||||
if (!checked) assetPageState.allMatchingSelected = false;
|
||||
renderAssetRows();
|
||||
updateAssetSelectionUI();
|
||||
}
|
||||
|
||||
function clearAssetSelection() {
|
||||
assetPageState.selected.clear();
|
||||
assetPageState.allMatchingSelected = false;
|
||||
closeAssetBatchMenu();
|
||||
renderAssetRows();
|
||||
updateAssetSelectionUI();
|
||||
}
|
||||
|
||||
function closeAssetBatchMenu() {
|
||||
const menu = document.getElementById('asset-batch-more');
|
||||
if (menu) menu.open = false;
|
||||
}
|
||||
|
||||
function updateAssetSelectionUI() {
|
||||
const count = assetPageState.selected.size;
|
||||
const actions = document.getElementById('asset-batch-actions');
|
||||
const label = document.getElementById('asset-selected-count');
|
||||
if (actions) actions.hidden = count === 0;
|
||||
if (label) label.textContent = assetT('assets.selectedCount', `已选择 ${count} 项`, { count });
|
||||
const selectAll = document.getElementById('asset-select-all-results');
|
||||
if (selectAll) {
|
||||
selectAll.hidden = count === 0 || count >= assetPageState.total || assetPageState.allMatchingSelected;
|
||||
selectAll.textContent = assetT('assets.selectAllResults', `选择全部 ${assetPageState.total} 项`, { count: assetPageState.total });
|
||||
}
|
||||
const allSelected = document.getElementById('asset-all-results-selected');
|
||||
if (allSelected) {
|
||||
allSelected.hidden = !assetPageState.allMatchingSelected;
|
||||
allSelected.textContent = assetT('assets.allResultsSelected', `已选择当前筛选结果中的 ${count} 项`, { count });
|
||||
}
|
||||
const merge = document.getElementById('asset-merge-selected');
|
||||
if (merge) {
|
||||
merge.disabled = count < 2;
|
||||
merge.setAttribute('aria-disabled', count < 2 ? 'true' : 'false');
|
||||
merge.title = count < 2
|
||||
? assetT('assets.mergeRequiresMultiple', '请至少选择两个重复资产')
|
||||
: '';
|
||||
}
|
||||
const pageToggle = document.getElementById('asset-select-page');
|
||||
if (pageToggle) {
|
||||
const selectedOnPage = assetPageState.items.filter(asset => assetPageState.selected.has(asset.id)).length;
|
||||
@@ -340,6 +855,26 @@ function updateAssetSelectionUI() {
|
||||
}
|
||||
}
|
||||
|
||||
async function selectAllMatchingAssets() {
|
||||
const button = document.getElementById('asset-select-all-results');
|
||||
if (button) button.disabled = true;
|
||||
try {
|
||||
const params = buildAssetFilterParams();
|
||||
const response = await apiFetch('/api/assets/selection?' + params.toString());
|
||||
if (!response.ok) throw new Error(await assetEditorResponseError(response));
|
||||
const data = await response.json();
|
||||
assetPageState.selected.clear();
|
||||
(data.assets || []).forEach(asset => assetPageState.selected.set(asset.id, asset));
|
||||
assetPageState.allMatchingSelected = true;
|
||||
renderAssetRows();
|
||||
updateAssetSelectionUI();
|
||||
} catch (error) {
|
||||
alert('选择全部结果失败: ' + error.message);
|
||||
} finally {
|
||||
if (button) button.disabled = false;
|
||||
}
|
||||
}
|
||||
|
||||
async function openAssetProjectModal() {
|
||||
const assets = Array.from(assetPageState.selected.values());
|
||||
if (!assets.length) {
|
||||
@@ -396,6 +931,134 @@ async function submitAssetProjectBinding() {
|
||||
}
|
||||
}
|
||||
|
||||
function openAssetBulkEdit() {
|
||||
const count = assetPageState.selected.size;
|
||||
if (!count) return alert('请先选择资产');
|
||||
['asset-bulk-status', 'asset-bulk-responsible', 'asset-bulk-department', 'asset-bulk-business', 'asset-bulk-environment', 'asset-bulk-criticality', 'asset-bulk-add-tags', 'asset-bulk-remove-tags'].forEach(id => {
|
||||
const el = document.getElementById(id);
|
||||
if (el) el.value = '';
|
||||
});
|
||||
document.getElementById('asset-bulk-edit-subtitle').textContent = `将修改 ${count} 个资产；空白字段保持原值`;
|
||||
['asset-bulk-status', 'asset-bulk-environment', 'asset-bulk-criticality'].forEach(syncAssetSelect);
|
||||
if (typeof openAppModal === 'function') openAppModal('asset-bulk-edit-modal');
|
||||
else document.getElementById('asset-bulk-edit-modal').style.display = 'flex';
|
||||
}
|
||||
|
||||
function closeAssetBulkEdit() {
|
||||
if (typeof closeAppModal === 'function') closeAppModal('asset-bulk-edit-modal');
|
||||
else document.getElementById('asset-bulk-edit-modal').style.display = 'none';
|
||||
}
|
||||
|
||||
function assetCommaValues(id) {
|
||||
return (document.getElementById(id)?.value || '').split(/[,，]/).map(value => value.trim()).filter(Boolean);
|
||||
}
|
||||
|
||||
async function submitAssetBulkEdit() {
|
||||
const ids = Array.from(assetPageState.selected.keys());
|
||||
if (!ids.length) return;
|
||||
const body = { asset_ids: ids, add_tags: assetCommaValues('asset-bulk-add-tags'), remove_tags: assetCommaValues('asset-bulk-remove-tags') };
|
||||
const fields = {
|
||||
status: 'asset-bulk-status', responsible_person: 'asset-bulk-responsible', department: 'asset-bulk-department',
|
||||
business_system: 'asset-bulk-business', environment: 'asset-bulk-environment', criticality: 'asset-bulk-criticality'
|
||||
};
|
||||
Object.entries(fields).forEach(([key, id]) => {
|
||||
const value = document.getElementById(id)?.value.trim() || '';
|
||||
if (value) body[key] = value;
|
||||
});
|
||||
if (Object.keys(body).length === 3 && body.add_tags.length === 0 && body.remove_tags.length === 0) return alert('请至少填写一项修改');
|
||||
const button = document.getElementById('asset-bulk-edit-submit');
|
||||
if (button) button.disabled = true;
|
||||
try {
|
||||
const response = await apiFetch('/api/assets/bulk', { method: 'PUT', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify(body) });
|
||||
if (!response.ok) throw new Error(await assetEditorResponseError(response));
|
||||
closeAssetBulkEdit();
|
||||
clearAssetSelection();
|
||||
await loadAssets(assetPageState.page);
|
||||
if (typeof showInlineToast === 'function') showInlineToast(`已更新 ${ids.length} 个资产`);
|
||||
} catch (error) {
|
||||
alert('批量编辑失败: ' + error.message);
|
||||
} finally {
|
||||
if (button) button.disabled = false;
|
||||
}
|
||||
}
|
||||
|
||||
function assetExportRows(assets) {
|
||||
return assets.map(asset => ({
|
||||
target: assetTargetLabel(asset), host: asset.host || '', ip: asset.ip || '', domain: asset.domain || '', port: asset.port || '',
|
||||
protocol: asset.protocol || '', title: asset.title || '', server: asset.server || '', project: asset.project_name || '',
|
||||
responsible_person: asset.responsible_person || '', department: asset.department || '', business_system: asset.business_system || '',
|
||||
environment: asset.environment || '', criticality: asset.criticality || '', country: asset.country || '', province: asset.province || '',
|
||||
city: asset.city || '', source: asset.source || '', status: asset.status || '', tags: (asset.tags || []).join(','),
|
||||
risk_level: asset.risk_level || '', vulnerability_count: Number(asset.vulnerability_count || 0),
|
||||
first_seen_at: asset.first_seen_at || '', last_seen_at: asset.last_seen_at || '', last_scan_at: asset.last_scan_at || ''
|
||||
}));
|
||||
}
|
||||
|
||||
function assetCsvCell(value) {
|
||||
const text = String(value == null ? '' : value);
|
||||
return /[",\r\n]/.test(text) ? `"${text.replaceAll('"', '""')}"` : text;
|
||||
}
|
||||
|
||||
function downloadAssetBlob(blob, filename) {
|
||||
const link = document.createElement('a');
|
||||
link.href = URL.createObjectURL(blob);
|
||||
link.download = filename;
|
||||
link.click();
|
||||
setTimeout(() => URL.revokeObjectURL(link.href), 0);
|
||||
}
|
||||
|
||||
function exportSelectedAssets(format) {
|
||||
const rows = assetExportRows(Array.from(assetPageState.selected.values()));
|
||||
if (!rows.length) return alert('请先选择资产');
|
||||
const stamp = new Date().toISOString().slice(0, 10);
|
||||
if (format === 'csv') {
|
||||
const headers = Object.keys(rows[0]);
|
||||
const csv = '\uFEFF' + [headers.join(','), ...rows.map(row => headers.map(key => assetCsvCell(row[key])).join(','))].join('\r\n');
|
||||
downloadAssetBlob(new Blob([csv], { type: 'text/csv;charset=utf-8' }), `assets-${stamp}.csv`);
|
||||
return;
|
||||
}
|
||||
if (!window.XLSX) return alert('表格组件加载失败，请刷新后重试');
|
||||
const workbook = XLSX.utils.book_new();
|
||||
const sheet = XLSX.utils.json_to_sheet(rows);
|
||||
sheet['!autofilter'] = { ref: sheet['!ref'] };
|
||||
sheet['!cols'] = Object.keys(rows[0]).map(key => ({ wch: ['target', 'host', 'title'].includes(key) ? 30 : 16 }));
|
||||
XLSX.utils.book_append_sheet(workbook, sheet, 'Assets');
|
||||
XLSX.writeFile(workbook, `assets-${stamp}.xlsx`);
|
||||
}
|
||||
|
||||
async function deleteSelectedAssets() {
|
||||
const ids = Array.from(assetPageState.selected.keys());
|
||||
if (!ids.length || !confirm(`确定永久删除选中的 ${ids.length} 个资产吗？`)) return;
|
||||
try {
|
||||
const response = await apiFetch('/api/assets/batch-delete', { method: 'POST', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify({ asset_ids: ids }) });
|
||||
if (!response.ok) throw new Error(await assetEditorResponseError(response));
|
||||
clearAssetSelection();
|
||||
await loadAssets(1);
|
||||
if (typeof showInlineToast === 'function') showInlineToast(`已删除 ${ids.length} 个资产`);
|
||||
} catch (error) {
|
||||
alert('批量删除失败: ' + error.message);
|
||||
}
|
||||
}
|
||||
|
||||
async function mergeSelectedAssets() {
|
||||
const assets = Array.from(assetPageState.selected.values());
|
||||
if (assets.length < 2) return alert('请至少选择两个重复资产');
|
||||
const primary = assets[0];
|
||||
if (!confirm(`将保留“${assetTargetLabel(primary)}”作为主资产，并合并其余 ${assets.length - 1} 个资产。继续吗？`)) return;
|
||||
try {
|
||||
const response = await apiFetch('/api/assets/merge', {
|
||||
method: 'POST', headers: { 'Content-Type': 'application/json' },
|
||||
body: JSON.stringify({ asset_ids: assets.map(asset => asset.id), primary_id: primary.id })
|
||||
});
|
||||
if (!response.ok) throw new Error(await assetEditorResponseError(response));
|
||||
clearAssetSelection();
|
||||
await loadAssets(1);
|
||||
if (typeof showInlineToast === 'function') showInlineToast(`已合并 ${assets.length} 个重复资产`);
|
||||
} catch (error) {
|
||||
alert('合并资产失败: ' + error.message);
|
||||
}
|
||||
}
|
||||
|
||||
function assetScanPromptDefault() {
|
||||
const placeholders = { asset_id: '{{asset_id}}', target: '{{target}}', host: '{{host}}', ip: '{{ip}}', domain: '{{domain}}', port: '{{port}}' };
|
||||
return assetT('assets.defaultScanPrompt', '请对资产 {{target}}（资产ID：{{asset_id}}）进行授权安全扫描，优先检查暴露服务、已知漏洞、弱口令和常见 Web 风险；通过 record_vulnerability 保存确认的漏洞，完成后调用 complete_asset_scan(id={{asset_id}}) 回写上次扫描时间和相关漏洞。', placeholders);
|
||||
@@ -609,6 +1272,11 @@ async function openAssetEditor(indexOrAsset) {
|
||||
document.getElementById('asset-edit-country').value = asset?.country || '';
|
||||
document.getElementById('asset-edit-province').value = asset?.province || '';
|
||||
document.getElementById('asset-edit-city').value = asset?.city || '';
|
||||
document.getElementById('asset-edit-responsible').value = asset?.responsible_person || '';
|
||||
document.getElementById('asset-edit-department').value = asset?.department || '';
|
||||
document.getElementById('asset-edit-business').value = asset?.business_system || '';
|
||||
document.getElementById('asset-edit-environment').value = asset?.environment || '';
|
||||
document.getElementById('asset-edit-criticality').value = asset?.criticality || '';
|
||||
document.getElementById('asset-edit-title-value').value = asset?.title || '';
|
||||
document.getElementById('asset-edit-tags').value = '';
|
||||
assetPageState.editorTags = Array.from(new Set((asset?.tags || []).map(value => String(value).trim()).filter(Boolean)));
|
||||
@@ -616,6 +1284,8 @@ async function openAssetEditor(indexOrAsset) {
|
||||
document.getElementById('asset-edit-status').value = asset?.status || 'active';
|
||||
syncAssetSelect('asset-edit-project');
|
||||
syncAssetSelect('asset-edit-status');
|
||||
syncAssetSelect('asset-edit-environment');
|
||||
syncAssetSelect('asset-edit-criticality');
|
||||
document.getElementById('asset-edit-target').value = assetEditorTargetFromAsset(asset);
|
||||
assetPageState.editorParsedTarget = document.getElementById('asset-edit-target').value.trim();
|
||||
clearAssetEditorErrors();
|
||||
@@ -824,6 +1494,9 @@ function collectAssetEditor() {
|
||||
title: document.getElementById('asset-edit-title-value').value.trim(), status: document.getElementById('asset-edit-status').value,
|
||||
source: existing.source || 'manual', source_query: existing.source_query || '',
|
||||
country: document.getElementById('asset-edit-country').value.trim(), province: document.getElementById('asset-edit-province').value.trim(), city: document.getElementById('asset-edit-city').value.trim(),
|
||||
responsible_person: document.getElementById('asset-edit-responsible').value.trim(), department: document.getElementById('asset-edit-department').value.trim(),
|
||||
business_system: document.getElementById('asset-edit-business').value.trim(), environment: document.getElementById('asset-edit-environment').value,
|
||||
criticality: document.getElementById('asset-edit-criticality').value,
|
||||
project_id: document.getElementById('asset-edit-project').value,
|
||||
tags: assetPageState.editorTags.slice()
|
||||
};
|
||||
@@ -1006,6 +1679,11 @@ function openAssetDetailRecord(asset) {
|
||||
assetDetailItem(assetT('assets.title', '标题/指纹'), escapeHtml(asset.title || ''), true),
|
||||
assetDetailItem(assetT('assets.server', '服务指纹'), escapeHtml(asset.server || '')),
|
||||
assetDetailItem(assetT('assets.location', '地区'), escapeHtml([asset.country, asset.province, asset.city].filter(Boolean).join(' / '))),
|
||||
assetDetailItem(assetT('assets.responsiblePerson', '负责人'), escapeHtml(asset.responsible_person || '')),
|
||||
assetDetailItem(assetT('assets.department', '部门'), escapeHtml(asset.department || '')),
|
||||
assetDetailItem(assetT('assets.businessSystem', '业务系统'), escapeHtml(asset.business_system || '')),
|
||||
assetDetailItem(assetT('assets.environment', '环境'), escapeHtml(asset.environment || '')),
|
||||
assetDetailItem(assetT('assets.criticality', '重要性'), escapeHtml(asset.criticality || '')),
|
||||
assetDetailItem(assetT('assets.source', '来源'), escapeHtml(asset.source || '')),
|
||||
assetDetailItem(assetT('assets.sourceQuery', '来源查询'), asset.source_query ? `<code>${escapeHtml(asset.source_query)}</code>` : ''),
|
||||
assetDetailItem(assetT('assets.tagsLabel', '标签'), tags, true),
|
||||
@@ -1040,12 +1718,30 @@ window.submitAssetScan = submitAssetScan;
|
||||
window.toggleAssetSelection = toggleAssetSelection;
|
||||
window.toggleAssetPageSelection = toggleAssetPageSelection;
|
||||
window.clearAssetSelection = clearAssetSelection;
|
||||
window.closeAssetBatchMenu = closeAssetBatchMenu;
|
||||
window.selectAllMatchingAssets = selectAllMatchingAssets;
|
||||
window.toggleAssetAdvancedFilters = toggleAssetAdvancedFilters;
|
||||
window.resetAssetFilters = resetAssetFilters;
|
||||
window.saveCurrentAssetView = saveCurrentAssetView;
|
||||
window.applyAssetSavedView = applyAssetSavedView;
|
||||
window.deleteCurrentAssetView = deleteCurrentAssetView;
|
||||
window.openAssetBulkEdit = openAssetBulkEdit;
|
||||
window.closeAssetBulkEdit = closeAssetBulkEdit;
|
||||
window.submitAssetBulkEdit = submitAssetBulkEdit;
|
||||
window.exportSelectedAssets = exportSelectedAssets;
|
||||
window.deleteSelectedAssets = deleteSelectedAssets;
|
||||
window.mergeSelectedAssets = mergeSelectedAssets;
|
||||
window.openAssetVulnerabilities = openAssetVulnerabilities;
|
||||
window.changeAssetPageSize = changeAssetPageSize;
|
||||
window.openAssetEditor = openAssetEditor;
|
||||
window.closeAssetEditor = closeAssetEditor;
|
||||
window.saveAsset = saveAsset;
|
||||
window.deleteAsset = deleteAsset;
|
||||
window.openAssetImport = openAssetImport;
|
||||
window.closeAssetImport = closeAssetImport;
|
||||
window.downloadAssetTemplate = downloadAssetTemplate;
|
||||
window.handleAssetImportFile = handleAssetImportFile;
|
||||
window.submitAssetImport = submitAssetImport;
|
||||
window.importSelectedFofaAssets = importSelectedFofaAssets;
|
||||
window.importFofaRowAsset = importFofaRowAsset;
|
||||
window.openAssetDetail = openAssetDetail;
|
||||
@@ -1053,5 +1749,16 @@ window.openAssetDetailRecord = openAssetDetailRecord;
|
||||
window.closeAssetDetail = closeAssetDetail;
|
||||
window.editAssetFromDetail = editAssetFromDetail;
|
||||
|
||||
document.addEventListener('DOMContentLoaded', () => initAssetCustomSelects());
|
||||
document.addEventListener('DOMContentLoaded', () => {
|
||||
ensureAssetOwnershipColumn();
|
||||
initAssetCustomSelects();
|
||||
renderAssetSavedViews();
|
||||
document.addEventListener('click', event => {
|
||||
const menu = document.getElementById('asset-batch-more');
|
||||
if (menu?.open && event.target instanceof Node && !menu.contains(event.target)) closeAssetBatchMenu();
|
||||
});
|
||||
document.addEventListener('keydown', event => {
|
||||
if (event.key === 'Escape') closeAssetBatchMenu();
|
||||
});
|
||||
});
|
||||
document.addEventListener('languagechange', () => ASSET_CUSTOM_SELECT_IDS.forEach(syncAssetSelect));
|
||||
|
||||
+15
-7
@@ -2377,11 +2377,19 @@ async function syncAssistantReasoningContentFromServer(backendMessageId, domAssi
|
||||
const msg = conv.messages.find((m) => m && String(m.id) === String(backendMessageId));
|
||||
if (!msg || !msg.reasoningContent) return;
|
||||
setMessageReasoningContent(domAssistantId, msg.reasoningContent);
|
||||
const pdRes = await apiFetch(`/api/messages/${encodeURIComponent(String(backendMessageId))}/process-details`);
|
||||
const pdJson = await pdRes.json().catch(() => ({}));
|
||||
const details = pdRes.ok && Array.isArray(pdJson.processDetails) ? pdJson.processDetails : [];
|
||||
if (typeof renderProcessDetails === 'function') {
|
||||
renderProcessDetails(domAssistantId, details);
|
||||
// 最终回复到达后同样必须完整恢复过程详情；无参数接口默认仅返回前 50 条，
|
||||
// 否则这里会把 task-events 恢复出的完整时间线再次覆盖成第一页。
|
||||
if (typeof window.loadProcessDetailsPaginated === 'function') {
|
||||
await window.loadProcessDetailsPaginated(domAssistantId, String(backendMessageId));
|
||||
} else {
|
||||
const pdRes = await apiFetch(
|
||||
`/api/messages/${encodeURIComponent(String(backendMessageId))}/process-details?full=1`
|
||||
);
|
||||
const pdJson = await pdRes.json().catch(() => ({}));
|
||||
const details = pdRes.ok && Array.isArray(pdJson.processDetails) ? pdJson.processDetails : [];
|
||||
if (typeof renderProcessDetails === 'function') {
|
||||
renderProcessDetails(domAssistantId, details);
|
||||
}
|
||||
}
|
||||
} catch (e) {
|
||||
console.warn('syncAssistantReasoningContentFromServer failed', e);
|
||||
@@ -4151,7 +4159,7 @@ async function prefetchLastAssistantProcessDetails() {
|
||||
await window.loadProcessDetailsPaginated(last.id, backendId);
|
||||
return;
|
||||
}
|
||||
const res = await apiFetch('/api/messages/' + encodeURIComponent(String(backendId)) + '/process-details');
|
||||
const res = await apiFetch('/api/messages/' + encodeURIComponent(String(backendId)) + '/process-details?full=1');
|
||||
const j = await res.json().catch(() => ({}));
|
||||
if (!res.ok || !Array.isArray(j.processDetails) || j.processDetails.length === 0) return;
|
||||
if (typeof renderProcessDetails === 'function') {
|
||||
@@ -9374,7 +9382,7 @@ function renderBatchConversations(filtered = null) {
|
||||
|
||||
const checkbox = document.createElement('input');
|
||||
checkbox.type = 'checkbox';
|
||||
checkbox.className = 'batch-conversation-checkbox';
|
||||
checkbox.className = 'batch-conversation-checkbox theme-checkbox';
|
||||
checkbox.dataset.conversationId = conv.id;
|
||||
checkbox.addEventListener('change', syncSelectAllBatchCheckbox);
|
||||
|
||||
|
||||
@@ -506,7 +506,7 @@ function renderFofaResults(payload) {
|
||||
|
||||
// 表头（左：勾选列；右：操作列固定）
|
||||
const headerCells = [
|
||||
'<th class="info-collect-col-select"><input type="checkbox" id="fofa-select-all" title="' + escapeHtml(_t('infoCollect.selectAll')) + '"/></th>',
|
||||
'<th class="info-collect-col-select"><input type="checkbox" id="fofa-select-all" class="theme-checkbox" title="' + escapeHtml(_t('infoCollect.selectAll')) + '"/></th>',
|
||||
...visibleFields.map(f => `<th>${escapeHtml(String(f))}</th>`),
|
||||
'<th class="info-collect-col-actions">' + escapeHtml(_t('infoCollect.actions')) + '</th>'
|
||||
].join('');
|
||||
@@ -525,7 +525,7 @@ function renderFofaResults(payload) {
|
||||
const encoded = encodeURIComponent(JSON.stringify(safeRow));
|
||||
const encodedTarget = encodeURIComponent(target || '');
|
||||
|
||||
const selectHtml = '<td class="info-collect-col-select"><input class="fofa-row-select" type="checkbox" data-index="' + idx + '" title="' + escapeHtml(_t('infoCollect.selectRow')) + '"/></td>';
|
||||
const selectHtml = '<td class="info-collect-col-select"><input class="fofa-row-select theme-checkbox" type="checkbox" data-index="' + idx + '" title="' + escapeHtml(_t('infoCollect.selectRow')) + '"/></td>';
|
||||
|
||||
const cellsHtml = visibleFields.map(f => {
|
||||
const val = safeRow[f];
|
||||
|
||||
+257
-79
@@ -1375,11 +1375,19 @@ function integrateProgressToMCPSection(progressId, assistantMessageId, mcpExecut
|
||||
}
|
||||
|
||||
const PROCESS_DETAILS_PAGE_SIZE = 50;
|
||||
const processDetailsAutoLoadObservers = new WeakMap();
|
||||
|
||||
function getProcessDetailsLoadMoreLabel(hasMore) {
|
||||
if (!hasMore) return '';
|
||||
return (typeof window.t === 'function' ? window.t('common.loadMore') : '加载更多') + ' · ' +
|
||||
(typeof window.t === 'function' ? window.t('chat.penetrationTestDetail') : '任务执行详情');
|
||||
function processDetailsContinuousLabel(kind) {
|
||||
if (kind === 'older') {
|
||||
return typeof window.t === 'function' ? window.t('chat.loadingEarlierDetails') : '正在加载更早记录…';
|
||||
}
|
||||
if (kind === 'newer') {
|
||||
return typeof window.t === 'function' ? window.t('chat.loadingLaterDetails') : '正在加载更新记录…';
|
||||
}
|
||||
if (kind === 'retry') {
|
||||
return typeof window.t === 'function' ? window.t('common.retry') : '加载失败，点击重试';
|
||||
}
|
||||
return '';
|
||||
}
|
||||
|
||||
function updateProcessDetailsLoadMoreButton(assistantMessageId, backendMessageId, hasMore) {
|
||||
@@ -1389,79 +1397,171 @@ function updateProcessDetailsLoadMoreButton(assistantMessageId, backendMessageId
|
||||
});
|
||||
}
|
||||
|
||||
function disconnectProcessDetailsAutoLoader(detailsContainer) {
|
||||
if (!detailsContainer) return;
|
||||
const old = processDetailsAutoLoadObservers.get(detailsContainer);
|
||||
if (old) {
|
||||
old.disconnect();
|
||||
processDetailsAutoLoadObservers.delete(detailsContainer);
|
||||
}
|
||||
}
|
||||
|
||||
function scrollProcessDetailsToLatest(assistantMessageId, smooth) {
|
||||
const detailsContainer = document.getElementById('process-details-' + assistantMessageId);
|
||||
if (!detailsContainer) return;
|
||||
const timeline = detailsContainer.querySelector('.progress-timeline');
|
||||
if (!timeline) return;
|
||||
const behavior = smooth === false ? 'auto' : 'smooth';
|
||||
if (timeline.scrollHeight > timeline.clientHeight + 2) {
|
||||
timeline.scrollTo({ top: timeline.scrollHeight, behavior: behavior });
|
||||
return;
|
||||
}
|
||||
const items = timeline.querySelectorAll('.timeline-item');
|
||||
if (!items.length) return;
|
||||
const lastItem = items[items.length - 1];
|
||||
lastItem.scrollIntoView({ behavior: behavior, block: 'nearest' });
|
||||
}
|
||||
|
||||
function updateProcessDetailsJumpLatestVisibility(detailsContainer) {
|
||||
if (!detailsContainer) return;
|
||||
const btn = detailsContainer.querySelector('.process-details-jump-latest');
|
||||
const timeline = detailsContainer.querySelector('.progress-timeline');
|
||||
if (!btn || !timeline) return;
|
||||
const hasUnloadedNewer = detailsContainer.dataset.hasNext === '1';
|
||||
const awayFromTimelineBottom = timeline.scrollHeight - timeline.clientHeight - timeline.scrollTop > 120;
|
||||
btn.classList.toggle('visible', hasUnloadedNewer || awayFromTimelineBottom);
|
||||
}
|
||||
|
||||
async function requestProcessDetailsAutoPage(assistantMessageId, backendMessageId, direction, sentinel) {
|
||||
const detailsContainer = document.getElementById('process-details-' + assistantMessageId);
|
||||
if (!detailsContainer || !sentinel) return;
|
||||
const loadingKey = direction === 'prev' ? 'loadingPrev' : 'loadingMore';
|
||||
const hasKey = direction === 'prev' ? 'hasPrev' : 'hasNext';
|
||||
if (detailsContainer.dataset[hasKey] !== '1' || detailsContainer.dataset[loadingKey] === '1') return;
|
||||
detailsContainer.dataset[loadingKey] = '1';
|
||||
sentinel.classList.add('is-loading');
|
||||
sentinel.textContent = processDetailsContinuousLabel(direction === 'prev' ? 'older' : 'newer');
|
||||
try {
|
||||
await loadProcessDetailsPaginated(assistantMessageId, backendMessageId, {
|
||||
prepend: direction === 'prev',
|
||||
append: direction === 'next',
|
||||
autoLoadAll: false
|
||||
});
|
||||
} catch (e) {
|
||||
console.error('自动加载过程详情失败:', e);
|
||||
sentinel.classList.remove('is-loading');
|
||||
sentinel.classList.add('is-error');
|
||||
sentinel.textContent = processDetailsContinuousLabel('retry');
|
||||
sentinel.onclick = function () {
|
||||
sentinel.onclick = null;
|
||||
sentinel.classList.remove('is-error');
|
||||
requestProcessDetailsAutoPage(assistantMessageId, backendMessageId, direction, sentinel);
|
||||
};
|
||||
} finally {
|
||||
detailsContainer.dataset[loadingKey] = '0';
|
||||
}
|
||||
}
|
||||
|
||||
function updateProcessDetailsPaginationButtons(assistantMessageId, backendMessageId, pageState) {
|
||||
const detailsContainer = document.getElementById('process-details-' + assistantMessageId);
|
||||
if (!detailsContainer) return;
|
||||
const timeline = detailsContainer.querySelector('.progress-timeline');
|
||||
if (!timeline) return;
|
||||
const state = pageState || {};
|
||||
detailsContainer.dataset.hasPrev = state.hasPrev ? '1' : '0';
|
||||
detailsContainer.dataset.hasNext = state.hasNext ? '1' : '0';
|
||||
|
||||
let prevBtn = detailsContainer.querySelector('.process-details-load-prev-btn');
|
||||
if (!state.hasPrev) {
|
||||
if (prevBtn) prevBtn.remove();
|
||||
} else {
|
||||
if (!prevBtn) {
|
||||
prevBtn = document.createElement('button');
|
||||
prevBtn.type = 'button';
|
||||
prevBtn.className = 'mcp-detail-btn process-details-load-prev-btn';
|
||||
const content = detailsContainer.querySelector('.process-details-content');
|
||||
if (content) {
|
||||
detailsContainer.insertBefore(prevBtn, content);
|
||||
} else {
|
||||
detailsContainer.prepend(prevBtn);
|
||||
}
|
||||
}
|
||||
const loadMoreText = typeof window.t === 'function' ? window.t('common.loadMore') : '加载更多';
|
||||
let prevPageText = typeof window.t === 'function' ? window.t('chat.previousPage') : '上一页';
|
||||
if (!prevPageText || prevPageText === 'chat.previousPage') prevPageText = '上一页';
|
||||
prevBtn.textContent = loadMoreText + ' · ' + prevPageText;
|
||||
prevBtn.disabled = false;
|
||||
prevBtn.onclick = async () => {
|
||||
if (detailsContainer.dataset.loadingPrev === '1') return;
|
||||
detailsContainer.dataset.loadingPrev = '1';
|
||||
prevBtn.disabled = true;
|
||||
prevBtn.textContent = typeof window.t === 'function' ? window.t('common.loading') : '加载中…';
|
||||
try {
|
||||
await loadProcessDetailsPaginated(assistantMessageId, backendMessageId, {
|
||||
prepend: true,
|
||||
autoLoadAll: false
|
||||
});
|
||||
} finally {
|
||||
detailsContainer.dataset.loadingPrev = '0';
|
||||
}
|
||||
};
|
||||
detailsContainer.querySelectorAll('.process-details-load-prev-btn, .process-details-load-more-btn').forEach(function (el) {
|
||||
el.remove();
|
||||
});
|
||||
timeline.querySelectorAll('.process-details-auto-sentinel').forEach(function (el) {
|
||||
el.remove();
|
||||
});
|
||||
disconnectProcessDetailsAutoLoader(detailsContainer);
|
||||
|
||||
let topSentinel = null;
|
||||
let bottomSentinel = null;
|
||||
if (state.hasPrev) {
|
||||
topSentinel = document.createElement('button');
|
||||
topSentinel.type = 'button';
|
||||
topSentinel.className = 'process-details-auto-sentinel process-details-auto-sentinel--top';
|
||||
topSentinel.setAttribute('aria-label', processDetailsContinuousLabel('older'));
|
||||
topSentinel.textContent = processDetailsContinuousLabel('older');
|
||||
timeline.prepend(topSentinel);
|
||||
}
|
||||
if (state.hasNext) {
|
||||
bottomSentinel = document.createElement('button');
|
||||
bottomSentinel.type = 'button';
|
||||
bottomSentinel.className = 'process-details-auto-sentinel process-details-auto-sentinel--bottom';
|
||||
bottomSentinel.setAttribute('aria-label', processDetailsContinuousLabel('newer'));
|
||||
bottomSentinel.textContent = processDetailsContinuousLabel('newer');
|
||||
timeline.appendChild(bottomSentinel);
|
||||
}
|
||||
|
||||
let nextBtn = detailsContainer.querySelector('.process-details-load-more-btn');
|
||||
if (!state.hasNext) {
|
||||
if (nextBtn) nextBtn.remove();
|
||||
return;
|
||||
let jumpBtn = detailsContainer.querySelector('.process-details-jump-latest');
|
||||
if (!jumpBtn) {
|
||||
jumpBtn = document.createElement('button');
|
||||
jumpBtn.type = 'button';
|
||||
jumpBtn.className = 'process-details-jump-latest';
|
||||
jumpBtn.textContent = typeof window.t === 'function' ? window.t('chat.backToLatestProgress') : '↓ 回到最新进度';
|
||||
detailsContainer.appendChild(jumpBtn);
|
||||
}
|
||||
if (!nextBtn) {
|
||||
nextBtn = document.createElement('button');
|
||||
nextBtn.type = 'button';
|
||||
nextBtn.className = 'mcp-detail-btn process-details-load-more-btn';
|
||||
detailsContainer.appendChild(nextBtn);
|
||||
}
|
||||
nextBtn.textContent = getProcessDetailsLoadMoreLabel(true);
|
||||
nextBtn.disabled = false;
|
||||
nextBtn.onclick = async () => {
|
||||
if (detailsContainer.dataset.loadingMore === '1') return;
|
||||
detailsContainer.dataset.loadingMore = '1';
|
||||
nextBtn.disabled = true;
|
||||
nextBtn.textContent = typeof window.t === 'function' ? window.t('common.loading') : '加载中…';
|
||||
try {
|
||||
jumpBtn.onclick = async function () {
|
||||
if (detailsContainer.dataset.hasNext === '1') {
|
||||
await loadProcessDetailsPaginated(assistantMessageId, backendMessageId, {
|
||||
append: true,
|
||||
autoLoadAll: false
|
||||
autoLoadAll: false,
|
||||
initialLatest: true
|
||||
});
|
||||
} finally {
|
||||
detailsContainer.dataset.loadingMore = '0';
|
||||
}
|
||||
requestAnimationFrame(function () {
|
||||
scrollProcessDetailsToLatest(assistantMessageId, true);
|
||||
updateProcessDetailsJumpLatestVisibility(detailsContainer);
|
||||
});
|
||||
};
|
||||
|
||||
if (timeline.dataset.continuousScrollBound !== '1') {
|
||||
timeline.dataset.continuousScrollBound = '1';
|
||||
timeline.addEventListener('scroll', function () {
|
||||
updateProcessDetailsJumpLatestVisibility(detailsContainer);
|
||||
}, { passive: true });
|
||||
}
|
||||
|
||||
if (typeof IntersectionObserver === 'function' && (topSentinel || bottomSentinel)) {
|
||||
const root = document.getElementById('chat-messages') || null;
|
||||
const observer = new IntersectionObserver(function (entries) {
|
||||
entries.forEach(function (entry) {
|
||||
if (!entry.isIntersecting) return;
|
||||
if (detailsContainer.dataset.autoLoadSuspended === '1') return;
|
||||
if (entry.target === topSentinel) {
|
||||
requestProcessDetailsAutoPage(assistantMessageId, backendMessageId, 'prev', topSentinel);
|
||||
} else if (entry.target === bottomSentinel) {
|
||||
requestProcessDetailsAutoPage(assistantMessageId, backendMessageId, 'next', bottomSentinel);
|
||||
}
|
||||
});
|
||||
}, { root: root, rootMargin: '180px 0px', threshold: 0.01 });
|
||||
if (topSentinel) observer.observe(topSentinel);
|
||||
if (bottomSentinel) observer.observe(bottomSentinel);
|
||||
processDetailsAutoLoadObservers.set(detailsContainer, observer);
|
||||
} else {
|
||||
if (topSentinel) {
|
||||
topSentinel.textContent = typeof window.t === 'function' ? window.t('common.loadMore') : '加载更早记录';
|
||||
topSentinel.onclick = function () {
|
||||
requestProcessDetailsAutoPage(assistantMessageId, backendMessageId, 'prev', topSentinel);
|
||||
};
|
||||
}
|
||||
if (bottomSentinel) {
|
||||
bottomSentinel.textContent = typeof window.t === 'function' ? window.t('common.loadMore') : '加载更新记录';
|
||||
bottomSentinel.onclick = function () {
|
||||
requestProcessDetailsAutoPage(assistantMessageId, backendMessageId, 'next', bottomSentinel);
|
||||
};
|
||||
}
|
||||
}
|
||||
updateProcessDetailsJumpLatestVisibility(detailsContainer);
|
||||
}
|
||||
|
||||
/**
|
||||
* 分页加载过程详情并增量渲染。默认全量加载供恢复流程使用；
|
||||
* 用户手动展开时传 autoLoadAll=false，只加载一页并展示“加载更多”。
|
||||
* 用户手动展开时由任务状态选择首个历史页或最新页，滚动到边界后自动加载相邻页。
|
||||
*/
|
||||
async function loadProcessDetailsPaginated(assistantMessageId, backendMessageId, options) {
|
||||
if (!assistantMessageId || !backendMessageId || typeof apiFetch !== 'function' || typeof renderProcessDetails !== 'function') {
|
||||
@@ -1481,6 +1581,21 @@ async function loadProcessDetailsPaginated(assistantMessageId, backendMessageId,
|
||||
? parseInt(detailsContainer.dataset.nextOffset, 10) || 0
|
||||
: 0;
|
||||
const anchorId = opts.anchorId != null ? String(opts.anchorId).trim() : '';
|
||||
if (opts.initialLatest && !prepend && !opts.append && !anchorId) {
|
||||
if (detailsContainer) {
|
||||
// 初页渲染完成前禁止顶部哨兵抢先触发；定位到底部后再开放自动加载。
|
||||
detailsContainer.dataset.autoLoadSuspended = '1';
|
||||
}
|
||||
const summaryRes = await apiFetch(
|
||||
'/api/messages/' + encodeURIComponent(String(backendMessageId)) + '/process-details?summary=1'
|
||||
);
|
||||
const summaryJSON = await summaryRes.json().catch(() => ({}));
|
||||
if (!summaryRes.ok) {
|
||||
throw new Error((summaryJSON && summaryJSON.error) ? summaryJSON.error : String(summaryRes.status));
|
||||
}
|
||||
const total = summaryJSON && summaryJSON.summary && Number(summaryJSON.summary.total);
|
||||
offset = Number.isFinite(total) ? Math.max(0, total - PAGE) : 0;
|
||||
}
|
||||
let isFirst = !opts.append;
|
||||
while (true) {
|
||||
const params = new URLSearchParams();
|
||||
@@ -1507,6 +1622,9 @@ async function loadProcessDetailsPaginated(assistantMessageId, backendMessageId,
|
||||
markLoaded: autoLoadAll ? !hasMore : true,
|
||||
toolExecutions: toolExecutions
|
||||
});
|
||||
// renderProcessDetails 对大页分帧渲染；等待一帧后再放置顶部/底部哨兵，
|
||||
// 避免哨兵被后续批次插到时间线中间。
|
||||
await new Promise((resolve) => requestAnimationFrame(resolve));
|
||||
const responseOffset = j && typeof j.offset === 'number' ? j.offset : offset;
|
||||
const total = j && typeof j.total === 'number' ? j.total : responseOffset + details.length;
|
||||
const nextOffset = prepend && existingNextOffset > 0
|
||||
@@ -1519,6 +1637,7 @@ async function loadProcessDetailsPaginated(assistantMessageId, backendMessageId,
|
||||
detailsContainer.dataset.loaded = hasMore ? 'partial' : '1';
|
||||
detailsContainer.dataset.prevOffset = String(prevOffset);
|
||||
detailsContainer.dataset.nextOffset = String(nextOffset);
|
||||
detailsContainer.dataset.total = String(total);
|
||||
}
|
||||
updateProcessDetailsPaginationButtons(assistantMessageId, backendMessageId, {
|
||||
hasPrev: !autoLoadAll && responseOffset > 0,
|
||||
@@ -1530,10 +1649,38 @@ async function loadProcessDetailsPaginated(assistantMessageId, backendMessageId,
|
||||
isFirst = false;
|
||||
await new Promise((resolve) => requestAnimationFrame(resolve));
|
||||
}
|
||||
if (opts.initialLatest) {
|
||||
requestAnimationFrame(function () {
|
||||
scrollProcessDetailsToLatest(assistantMessageId, false);
|
||||
if (detailsContainer) {
|
||||
delete detailsContainer.dataset.autoLoadSuspended;
|
||||
}
|
||||
});
|
||||
} else if (opts.initialStart) {
|
||||
requestAnimationFrame(function () {
|
||||
const container = document.getElementById('process-details-' + assistantMessageId);
|
||||
const timeline = container && container.querySelector('.progress-timeline');
|
||||
if (timeline) timeline.scrollTop = 0;
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
window.loadProcessDetailsPaginated = loadProcessDetailsPaginated;
|
||||
|
||||
function shouldInitiallyOpenProcessDetailsAtLatest(assistantMessageId, detailsContainer) {
|
||||
if (!detailsContainer) return false;
|
||||
// task-events 恢复流会明确给当前详情容器打 is-streaming 标记。
|
||||
if (detailsContainer.classList.contains('is-streaming')) return true;
|
||||
try {
|
||||
const replay = window.__csTaskEventStream;
|
||||
if (replay && replay.active && String(replay.assistantDomId || '') === String(assistantMessageId || '')) {
|
||||
return true;
|
||||
}
|
||||
} catch (e) { /* ignore */ }
|
||||
// 其余情况按终态/历史详情处理，从第一条开始，便于顺序复盘。
|
||||
return false;
|
||||
}
|
||||
|
||||
function resolveEventBackendMessageId(eventData) {
|
||||
if (!eventData || typeof eventData !== 'object') return '';
|
||||
const raw = eventData.messageId != null ? eventData.messageId : eventData.assistantMessageId;
|
||||
@@ -1549,7 +1696,12 @@ function triggerLazyProcessDetailsLoad(assistantMessageId, backendMessageId, det
|
||||
if (timeline) {
|
||||
timeline.innerHTML = '<div class="progress-timeline-empty">' + ((typeof window.t === 'function') ? window.t('common.loading') : '加载中…') + '</div>';
|
||||
}
|
||||
loadProcessDetailsPaginated(assistantMessageId, backendMessageId, { autoLoadAll: false })
|
||||
const openAtLatest = shouldInitiallyOpenProcessDetailsAtLatest(assistantMessageId, detailsContainer);
|
||||
loadProcessDetailsPaginated(assistantMessageId, backendMessageId, {
|
||||
autoLoadAll: false,
|
||||
initialLatest: openAtLatest,
|
||||
initialStart: !openAtLatest
|
||||
})
|
||||
.catch((e) => {
|
||||
console.error('加载过程详情失败:', e);
|
||||
const tl = detailsContainer.querySelector('.progress-timeline');
|
||||
@@ -3146,7 +3298,7 @@ async function restoreWorkflowHitlInlineForConversation(conversationId) {
|
||||
if (typeof loadProcessDetailsPaginated === 'function') {
|
||||
await loadProcessDetailsPaginated(clientMsgId, backendMsgId);
|
||||
} else if (typeof apiFetch === 'function' && backendMsgId) {
|
||||
const res = await apiFetch('/api/messages/' + encodeURIComponent(backendMsgId) + '/process-details');
|
||||
const res = await apiFetch('/api/messages/' + encodeURIComponent(backendMsgId) + '/process-details?full=1');
|
||||
const j = await res.json().catch(function () { return {}; });
|
||||
if (res.ok && typeof renderProcessDetails === 'function') {
|
||||
renderProcessDetails(clientMsgId, (j && Array.isArray(j.processDetails)) ? j.processDetails : []);
|
||||
@@ -3278,7 +3430,7 @@ async function restoreHitlInlineForConversation(conversationId) {
|
||||
if (typeof loadProcessDetailsPaginated === 'function') {
|
||||
await loadProcessDetailsPaginated(clientMsgId, backendMsgId);
|
||||
} else {
|
||||
const res = await apiFetch('/api/messages/' + encodeURIComponent(backendMsgId) + '/process-details');
|
||||
const res = await apiFetch('/api/messages/' + encodeURIComponent(backendMsgId) + '/process-details?full=1');
|
||||
const j = await res.json().catch(function () { return {}; });
|
||||
if (!res.ok) throw new Error((j && j.error) ? j.error : String(res.status));
|
||||
const details = (j && Array.isArray(j.processDetails)) ? j.processDetails : [];
|
||||
@@ -3356,12 +3508,20 @@ async function refreshLastAssistantProcessDetails(conversationId) {
|
||||
wasExpanded = !!(tl && tl.classList.contains('expanded'));
|
||||
}
|
||||
try {
|
||||
const res = await apiFetch('/api/messages/' + encodeURIComponent(backendId) + '/process-details');
|
||||
const j = await res.json().catch(function () { return {}; });
|
||||
if (!res.ok) return;
|
||||
const details = Array.isArray(j.processDetails) ? j.processDetails : [];
|
||||
if (typeof renderProcessDetails === 'function') {
|
||||
renderProcessDetails(clientId, details);
|
||||
// 恢复流程必须遍历全部分页。直接请求无参数接口只会返回最早 50 条，
|
||||
// 长任务刷新后会表现为“旧轮次 → 当前实时轮次”的中间历史缺失。
|
||||
if (typeof loadProcessDetailsPaginated === 'function') {
|
||||
await loadProcessDetailsPaginated(clientId, backendId);
|
||||
} else {
|
||||
const res = await apiFetch(
|
||||
'/api/messages/' + encodeURIComponent(backendId) + '/process-details?full=1'
|
||||
);
|
||||
const j = await res.json().catch(function () { return {}; });
|
||||
if (!res.ok) return;
|
||||
const details = Array.isArray(j.processDetails) ? j.processDetails : [];
|
||||
if (typeof renderProcessDetails === 'function') {
|
||||
renderProcessDetails(clientId, details);
|
||||
}
|
||||
}
|
||||
if (wasExpanded) {
|
||||
expandProcessDetailsTimeline(clientId);
|
||||
@@ -3407,15 +3567,22 @@ async function attachRunningTaskEventStream(conversationId) {
|
||||
if (!asEl || !asEl.id) return false;
|
||||
const backendId = asEl.dataset && asEl.dataset.backendMessageId;
|
||||
if (backendId && typeof renderProcessDetails === 'function') {
|
||||
const res = await apiFetch('/api/messages/' + encodeURIComponent(String(backendId)) + '/process-details');
|
||||
const jd = await res.json().catch(function () { return {}; });
|
||||
if (res.ok && Array.isArray(jd.processDetails)) {
|
||||
renderProcessDetails(asEl.id, jd.processDetails);
|
||||
// renderProcessDetails 会重建时间线节点，需重新挂载 HITL 审批入口
|
||||
if (typeof window.restoreHitlInlineForConversation === 'function') {
|
||||
await window.restoreHitlInlineForConversation(conversationId);
|
||||
// 运行中会话可能远超默认 50 条；完整补齐数据库历史后再接实时事件。
|
||||
if (typeof loadProcessDetailsPaginated === 'function') {
|
||||
await loadProcessDetailsPaginated(asEl.id, String(backendId));
|
||||
} else {
|
||||
const res = await apiFetch(
|
||||
'/api/messages/' + encodeURIComponent(String(backendId)) + '/process-details?full=1'
|
||||
);
|
||||
const jd = await res.json().catch(function () { return {}; });
|
||||
if (res.ok && Array.isArray(jd.processDetails)) {
|
||||
renderProcessDetails(asEl.id, jd.processDetails);
|
||||
}
|
||||
}
|
||||
// 历史重绘会重建时间线节点，需重新挂载 HITL 审批入口。
|
||||
if (typeof window.restoreHitlInlineForConversation === 'function') {
|
||||
await window.restoreHitlInlineForConversation(conversationId);
|
||||
}
|
||||
}
|
||||
expandProcessDetailsTimeline(asEl.id);
|
||||
|
||||
@@ -3482,7 +3649,18 @@ async function attachRunningTaskEventStream(conversationId) {
|
||||
}
|
||||
if (typeof loadActiveTasks === 'function') loadActiveTasks();
|
||||
if (replaySawDone && typeof window.loadConversation === 'function' && window.currentConversationId === conversationId) {
|
||||
const replayTimeline = document.getElementById('process-details-' + asEl.id + '-timeline');
|
||||
const keepExpanded = !!(replayTimeline && replayTimeline.classList.contains('expanded'));
|
||||
await window.loadConversation(conversationId);
|
||||
// loadConversation 使用轻量消息接口，会把详情重新置为懒加载状态；
|
||||
// 任务终态再从 DB 全量对账一次，补回订阅建立期间可能错过的事件。
|
||||
await refreshLastAssistantProcessDetails(conversationId);
|
||||
if (keepExpanded) {
|
||||
const finalAssistant = findLastAssistantMessageElInChat();
|
||||
if (finalAssistant && finalAssistant.id) {
|
||||
expandProcessDetailsTimeline(finalAssistant.id);
|
||||
}
|
||||
}
|
||||
}
|
||||
return true;
|
||||
} catch (e) {
|
||||
@@ -6236,7 +6414,7 @@ function renderMonitorExecutions(executions = [], statusFilter = 'all') {
|
||||
html: `
|
||||
<tr data-execution-id="${executionId}">
|
||||
<td>
|
||||
<input type="checkbox" class="monitor-execution-checkbox" value="${executionId}" ${isSelected ? 'checked' : ''} onchange="toggleExecutionSelection('${jsExecId}', this.checked)" />
|
||||
<input type="checkbox" class="monitor-execution-checkbox theme-checkbox" value="${executionId}" ${isSelected ? 'checked' : ''} onchange="toggleExecutionSelection('${jsExecId}', this.checked)" />
|
||||
</td>
|
||||
<td>${toolName}</td>
|
||||
<td><span class="${statusClass}">${escapeHtml(statusLabel)}</span></td>
|
||||
@@ -6269,7 +6447,7 @@ function renderMonitorExecutions(executions = [], statusFilter = 'all') {
|
||||
const headerHtml = `
|
||||
<tr>
|
||||
<th style="width: 40px;">
|
||||
<input type="checkbox" id="monitor-select-all" onchange="toggleSelectAll(this)" />
|
||||
<input type="checkbox" id="monitor-select-all" class="theme-checkbox" onchange="toggleSelectAll(this)" />
|
||||
</th>
|
||||
<th>${escapeHtml(colTool)}</th>
|
||||
<th>${escapeHtml(colStatus)}</th>
|
||||
|
||||
@@ -8,6 +8,20 @@ let currentProjectId = null;
|
||||
let currentProjectUpdatedAt = null;
|
||||
let currentProjectTab = 'facts';
|
||||
let currentProjectAssets = [];
|
||||
const PROJECT_ASSETS_PAGE_SIZE_KEY = 'cyberstrike.project_assets_page_size';
|
||||
let projectAssetsPagination = {
|
||||
page: 1,
|
||||
pageSize: (() => {
|
||||
try {
|
||||
const size = Number(localStorage.getItem(PROJECT_ASSETS_PAGE_SIZE_KEY));
|
||||
return [10, 20, 50, 100].includes(size) ? size : 20;
|
||||
} catch (e) {
|
||||
return 20;
|
||||
}
|
||||
})(),
|
||||
total: 0,
|
||||
totalPages: 1,
|
||||
};
|
||||
const projectNameById = {};
|
||||
let _projectsListReady = false;
|
||||
let _projectsFetchPromise = null;
|
||||
@@ -974,6 +988,7 @@ function updateProjectStats(stats) {
|
||||
|
||||
async function selectProject(id) {
|
||||
currentProjectId = id;
|
||||
projectAssetsPagination.page = 1;
|
||||
const searchEl = document.getElementById('project-facts-search');
|
||||
const catEl = document.getElementById('project-facts-filter-category');
|
||||
const confEl = document.getElementById('project-facts-filter-confidence');
|
||||
@@ -1032,24 +1047,40 @@ function switchProjectTab(tab) {
|
||||
if (tab === 'vulns') loadProjectVulnerabilities();
|
||||
}
|
||||
|
||||
async function loadProjectAssets() {
|
||||
async function loadProjectAssets(page) {
|
||||
const tbody = document.getElementById('project-assets-tbody');
|
||||
const countEl = document.getElementById('project-assets-count');
|
||||
if (!tbody || !currentProjectId) return;
|
||||
const requestedPage = Math.max(1, Number(page || projectAssetsPagination.page || 1));
|
||||
projectAssetsPagination.page = requestedPage;
|
||||
tbody.innerHTML = `<tr class="is-empty-row"><td colspan="7">${escapeHtml(tpFmt('common.loading', '加载中...'))}</td></tr>`;
|
||||
const qs = new URLSearchParams({ project_id: currentProjectId, page: '1', page_size: '100' });
|
||||
const qs = new URLSearchParams({
|
||||
project_id: currentProjectId,
|
||||
page: String(requestedPage),
|
||||
page_size: String(projectAssetsPagination.pageSize),
|
||||
});
|
||||
const res = await apiFetch(`/api/assets?${qs.toString()}`);
|
||||
if (!res.ok) {
|
||||
currentProjectAssets = [];
|
||||
projectAssetsPagination.total = 0;
|
||||
projectAssetsPagination.totalPages = 1;
|
||||
if (countEl) countEl.textContent = '0';
|
||||
tbody.innerHTML = `<tr class="is-empty-row"><td colspan="7">${escapeHtml(tpFmt('common.loadFailed', '加载失败'))}</td></tr>`;
|
||||
renderProjectAssetsPagination();
|
||||
return;
|
||||
}
|
||||
const data = await res.json();
|
||||
currentProjectAssets = data.assets || [];
|
||||
projectAssetsPagination.page = Number(data.page || requestedPage);
|
||||
projectAssetsPagination.total = Number(data.total || 0);
|
||||
projectAssetsPagination.totalPages = Math.max(1, Number(data.total_pages || 1));
|
||||
if (projectAssetsPagination.page > projectAssetsPagination.totalPages) {
|
||||
return loadProjectAssets(projectAssetsPagination.totalPages);
|
||||
}
|
||||
if (countEl) countEl.textContent = tpFmt('projects.assetCount', `${data.total || 0} 个资产`, { count: data.total || 0 });
|
||||
if (!currentProjectAssets.length) {
|
||||
tbody.innerHTML = `<tr class="is-empty-row"><td colspan="7">${escapeHtml(tpFmt('projects.noBoundAssets', '暂无绑定到此项目的资产'))}</td></tr>`;
|
||||
renderProjectAssetsPagination();
|
||||
return;
|
||||
}
|
||||
tbody.innerHTML = currentProjectAssets.map((asset, index) => {
|
||||
@@ -1068,6 +1099,47 @@ async function loadProjectAssets() {
|
||||
<td class="col-actions"><div class="projects-table-actions"><button type="button" class="projects-action-btn projects-action-btn--view" onclick="openProjectAssetDetail(${index})">${escapeHtml(tpFmt('common.view', '查看'))}</button></div></td>
|
||||
</tr>`;
|
||||
}).join('');
|
||||
renderProjectAssetsPagination();
|
||||
const tableWrap = document.querySelector('#project-panel-assets .projects-table-wrap');
|
||||
if (tableWrap) tableWrap.scrollTop = 0;
|
||||
}
|
||||
|
||||
function renderProjectAssetsPagination() {
|
||||
const root = document.getElementById('project-assets-pagination');
|
||||
if (!root) return;
|
||||
const { page, pageSize, total, totalPages } = projectAssetsPagination;
|
||||
const start = total === 0 ? 0 : (page - 1) * pageSize + 1;
|
||||
const end = total === 0 ? 0 : Math.min(page * pageSize, total);
|
||||
const atFirst = page <= 1 || total === 0;
|
||||
const atLast = page >= totalPages || total === 0;
|
||||
root.innerHTML = `<div class="pagination">
|
||||
<div class="pagination-info">
|
||||
<span>${escapeHtml(tpFmt('projects.paginationShow', `显示 ${start}-${end} / 共 ${total}`, { start, end, total }))}</span>
|
||||
<label class="pagination-page-size">${escapeHtml(tpFmt('projects.paginationPerPage', '每页显示'))}
|
||||
<select id="project-assets-page-size" onchange="changeProjectAssetsPageSize(this.value)">
|
||||
${[10, 20, 50, 100].map(size => `<option value="${size}" ${size === pageSize ? 'selected' : ''}>${size}</option>`).join('')}
|
||||
</select>
|
||||
</label>
|
||||
</div>
|
||||
<div class="pagination-controls">
|
||||
<button type="button" class="btn-secondary" onclick="loadProjectAssets(1)" ${atFirst ? 'disabled' : ''}>${escapeHtml(tpFmt('skillsPage.firstPage', '首页'))}</button>
|
||||
<button type="button" class="btn-secondary" onclick="loadProjectAssets(${Math.max(1, page - 1)})" ${atFirst ? 'disabled' : ''}>${escapeHtml(tpFmt('projects.paginationPrev', '上一页'))}</button>
|
||||
<span class="pagination-page">${escapeHtml(tpFmt('skillsPage.pageOf', `第 ${page} / ${totalPages} 页`, { current: page, total: totalPages }))}</span>
|
||||
<button type="button" class="btn-secondary" onclick="loadProjectAssets(${Math.min(totalPages, page + 1)})" ${atLast ? 'disabled' : ''}>${escapeHtml(tpFmt('projects.paginationNext', '下一页'))}</button>
|
||||
<button type="button" class="btn-secondary" onclick="loadProjectAssets(${totalPages})" ${atLast ? 'disabled' : ''}>${escapeHtml(tpFmt('skillsPage.lastPage', '尾页'))}</button>
|
||||
</div>
|
||||
</div>`;
|
||||
}
|
||||
|
||||
function changeProjectAssetsPageSize(value) {
|
||||
const size = Number(value);
|
||||
if (![10, 20, 50, 100].includes(size)) return;
|
||||
projectAssetsPagination.pageSize = size;
|
||||
projectAssetsPagination.page = 1;
|
||||
try {
|
||||
localStorage.setItem(PROJECT_ASSETS_PAGE_SIZE_KEY, String(size));
|
||||
} catch (e) { /* ignore */ }
|
||||
loadProjectAssets(1);
|
||||
}
|
||||
|
||||
function openProjectAssetDetail(index) {
|
||||
|
||||
@@ -115,6 +115,8 @@
|
||||
exportFofaResults: 'fofa:execute',
|
||||
importSelectedFofaAssets: 'asset:write',
|
||||
importFofaRowAsset: 'asset:write',
|
||||
openAssetImport: 'asset:write',
|
||||
submitAssetImport: 'asset:write',
|
||||
saveAsset: 'asset:write',
|
||||
deleteAsset: 'asset:delete',
|
||||
|
||||
|
||||
+26
-16
@@ -1,5 +1,5 @@
|
||||
// 页面路由管理
|
||||
let currentPage = 'dashboard';
|
||||
let currentPage = null;
|
||||
|
||||
/** chat、漏洞管理页在切换时保留当前 hash 上的查询串（如 ?conversation= / ?conversation_id=） */
|
||||
function buildHashForPage(pageId) {
|
||||
@@ -96,6 +96,19 @@ function initRouter() {
|
||||
|
||||
// 切换页面
|
||||
function switchPage(pageId) {
|
||||
const targetPage = document.getElementById(`page-${pageId}`);
|
||||
if (!targetPage) return;
|
||||
|
||||
// 导航点击会修改 hash，随后浏览器还会触发 hashchange。
|
||||
// 同一页面已经激活时不再重复初始化，避免接口重复请求和页面二次重绘。
|
||||
if (currentPage === pageId && targetPage.classList.contains('active')) {
|
||||
const currentHash = buildHashForPage(pageId);
|
||||
if (window.location.hash.slice(1) !== currentHash) {
|
||||
window.location.hash = currentHash;
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
if (typeof window.syncC2NavOnceFromServer === 'function') {
|
||||
void window.syncC2NavOnceFromServer();
|
||||
}
|
||||
@@ -105,25 +118,22 @@ function switchPage(pageId) {
|
||||
});
|
||||
|
||||
// 显示目标页面
|
||||
const targetPage = document.getElementById(`page-${pageId}`);
|
||||
if (targetPage) {
|
||||
targetPage.classList.add('active');
|
||||
currentPage = pageId;
|
||||
targetPage.classList.add('active');
|
||||
currentPage = pageId;
|
||||
|
||||
const newHash = buildHashForPage(pageId);
|
||||
if (window.location.hash.slice(1) !== newHash) {
|
||||
window.location.hash = newHash;
|
||||
}
|
||||
const newHash = buildHashForPage(pageId);
|
||||
if (window.location.hash.slice(1) !== newHash) {
|
||||
window.location.hash = newHash;
|
||||
}
|
||||
|
||||
// 更新导航状态
|
||||
updateNavState(pageId);
|
||||
// 更新导航状态
|
||||
updateNavState(pageId);
|
||||
|
||||
// 页面特定的初始化
|
||||
initPage(pageId);
|
||||
// 页面特定的初始化
|
||||
initPage(pageId);
|
||||
|
||||
if (typeof applyRBACToUI === 'function') {
|
||||
applyRBACToUI(targetPage);
|
||||
}
|
||||
if (typeof applyRBACToUI === 'function') {
|
||||
applyRBACToUI(targetPage);
|
||||
}
|
||||
}
|
||||
window.switchPage = switchPage;
|
||||
|
||||
+54
-20
@@ -503,6 +503,8 @@ let toolsPagination = {
|
||||
total: 0,
|
||||
totalPages: 0
|
||||
};
|
||||
let toolsLoadController = null;
|
||||
let toolsLoadSequence = 0;
|
||||
|
||||
let c2NavSyncedOnce = false;
|
||||
|
||||
@@ -705,10 +707,8 @@ async function loadConfig(loadTools = true, options = {}) {
|
||||
|
||||
// 填充FOFA配置
|
||||
const fofa = currentConfig.fofa || {};
|
||||
const fofaEmailEl = document.getElementById('fofa-email');
|
||||
const fofaKeyEl = document.getElementById('fofa-api-key');
|
||||
const fofaBaseUrlEl = document.getElementById('fofa-base-url');
|
||||
if (fofaEmailEl) fofaEmailEl.value = fofa.email || '';
|
||||
if (fofaKeyEl) fofaKeyEl.value = fofa.api_key || '';
|
||||
if (fofaBaseUrlEl) fofaBaseUrlEl.value = fofa.base_url || '';
|
||||
|
||||
@@ -1080,17 +1080,28 @@ async function loadToolsList(page = 1, searchKeyword = '', options = {}) {
|
||||
// 等待 i18n 就绪，避免快速刷新时翻译函数未初始化导致显示占位符
|
||||
if (window.i18nReady) await window.i18nReady;
|
||||
const toolsList = document.getElementById('tools-list');
|
||||
const requestSequence = ++toolsLoadSequence;
|
||||
|
||||
// 显示加载状态
|
||||
// 新请求接管列表，取消仍在进行的旧请求，避免连续筛选/切页时旧响应覆盖新结果。
|
||||
if (toolsLoadController) {
|
||||
toolsLoadController.abort();
|
||||
}
|
||||
const controller = new AbortController();
|
||||
toolsLoadController = controller;
|
||||
|
||||
// 清理 DOM 之前先保留用户尚未保存的勾选状态。
|
||||
saveCurrentPageToolStates();
|
||||
|
||||
// 首次加载才显示占位；后续刷新保留旧列表，避免整块内容闪烁和布局跳动。
|
||||
if (toolsList) {
|
||||
// 清空整个容器，包括可能存在的分页控件
|
||||
toolsList.innerHTML = '<div class="tools-list-items"><div class="loading" style="padding: 20px; text-align: center; color: var(--text-muted);">⏳ ' + (typeof window.t === 'function' ? window.t('mcp.loadingTools') : '正在加载工具列表...') + '</div></div>';
|
||||
toolsList.setAttribute('aria-busy', 'true');
|
||||
if (!toolsList.querySelector('.tool-item')) {
|
||||
toolsList.innerHTML = '<div class="tools-list-items"><div class="loading" style="padding: 20px; text-align: center; color: var(--text-muted);">⏳ ' + (typeof window.t === 'function' ? window.t('mcp.loadingTools') : '正在加载工具列表...') + '</div></div>';
|
||||
}
|
||||
}
|
||||
|
||||
let timeoutId = null;
|
||||
try {
|
||||
// 在加载新页面之前，先保存当前页的状态到全局映射
|
||||
saveCurrentPageToolStates();
|
||||
|
||||
const pageSize = toolsPagination.pageSize;
|
||||
let url = `/api/config/tools?page=${page}&page_size=${pageSize}`;
|
||||
if (searchKeyword) {
|
||||
@@ -1107,13 +1118,11 @@ async function loadToolsList(page = 1, searchKeyword = '', options = {}) {
|
||||
}
|
||||
|
||||
// 使用较短的超时时间（10秒），避免长时间等待
|
||||
const controller = new AbortController();
|
||||
const timeoutId = setTimeout(() => controller.abort(), 10000);
|
||||
timeoutId = setTimeout(() => controller.abort(), 10000);
|
||||
|
||||
const response = await apiFetch(url, {
|
||||
signal: controller.signal
|
||||
});
|
||||
clearTimeout(timeoutId);
|
||||
|
||||
if (!response.ok) {
|
||||
if (typeof readApiError === 'function') {
|
||||
@@ -1123,6 +1132,8 @@ async function loadToolsList(page = 1, searchKeyword = '', options = {}) {
|
||||
}
|
||||
|
||||
const result = await response.json();
|
||||
if (requestSequence !== toolsLoadSequence) return;
|
||||
|
||||
allTools = result.tools || [];
|
||||
toolsPagination = {
|
||||
page: result.page || page,
|
||||
@@ -1150,6 +1161,9 @@ async function loadToolsList(page = 1, searchKeyword = '', options = {}) {
|
||||
renderExternalMcpFilterChip();
|
||||
updateExternalMcpCardSelection();
|
||||
} catch (error) {
|
||||
// 被后续请求替代属于正常控制流，不显示错误，也不覆盖新请求的界面。
|
||||
if (controller.signal.aborted && requestSequence !== toolsLoadSequence) return;
|
||||
|
||||
console.error('加载工具列表失败:', error);
|
||||
if (toolsList) {
|
||||
const isTimeout = error.name === 'AbortError' || error.message.includes('timeout');
|
||||
@@ -1158,6 +1172,12 @@ async function loadToolsList(page = 1, searchKeyword = '', options = {}) {
|
||||
: (typeof window.t === 'function' ? window.t('mcp.loadToolsFailed') : '加载工具列表失败') + ': ' + escapeHtml(error.message);
|
||||
toolsList.innerHTML = `<div class="error" style="padding: 20px; text-align: center;">${errorMsg}</div>`;
|
||||
}
|
||||
} finally {
|
||||
if (timeoutId !== null) clearTimeout(timeoutId);
|
||||
if (requestSequence === toolsLoadSequence) {
|
||||
if (toolsList) toolsList.removeAttribute('aria-busy');
|
||||
if (toolsLoadController === controller) toolsLoadController = null;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1287,13 +1307,13 @@ function renderToolsList() {
|
||||
const checkboxId = `tool-${escapeHtml(toolKey).replace(/::/g, '--')}`;
|
||||
|
||||
toolItem.innerHTML = `
|
||||
<input type="checkbox" id="${checkboxId}" ${toolState.enabled ? 'checked' : ''} ${toolState.is_external || tool.is_external ? 'data-external="true"' : ''} onchange="handleToolCheckboxChange('${escapeHtml(toolKey)}', this.checked)" />
|
||||
<input type="checkbox" class="theme-checkbox" id="${checkboxId}" ${toolState.enabled ? 'checked' : ''} ${toolState.is_external || tool.is_external ? 'data-external="true"' : ''} onchange="handleToolCheckboxChange('${escapeHtml(toolKey)}', this.checked)" />
|
||||
<div class="tool-item-info">
|
||||
<div class="tool-item-name">
|
||||
${escapeHtml(tool.name)}
|
||||
${externalBadge}
|
||||
<label class="tool-resident-toggle" title="${typeof window.t === 'function' ? window.t('mcp.alwaysVisibleHint') : '始终常驻在 Tool Search 可见列表'}" onclick="event.stopPropagation()">
|
||||
<input type="checkbox" ${alwaysVisibleChecked ? 'checked' : ''} ${alwaysVisibleLocked ? 'disabled' : ''} onchange="handleToolAlwaysVisibleChange('${escapeHtml(toolKey)}', this.checked)" />
|
||||
<input type="checkbox" class="theme-checkbox" ${alwaysVisibleChecked ? 'checked' : ''} ${alwaysVisibleLocked ? 'disabled' : ''} onchange="handleToolAlwaysVisibleChange('${escapeHtml(toolKey)}', this.checked)" />
|
||||
<span>${typeof window.t === 'function' ? window.t('mcp.alwaysVisibleLabel') : '常驻'}</span>
|
||||
</label>
|
||||
${alwaysVisibleLocked ? `<span class="external-tool-badge" title="${typeof window.t === 'function' ? window.t('mcp.alwaysVisibleBuiltinHint') : '后端内置工具默认常驻，不可关闭'}">${typeof window.t === 'function' ? window.t('mcp.alwaysVisibleBuiltinLabel') : '内置默认'}</span>` : ''}
|
||||
@@ -1883,7 +1903,6 @@ async function applySettings() {
|
||||
},
|
||||
vision: visionPayload,
|
||||
fofa: {
|
||||
email: document.getElementById('fofa-email')?.value.trim() || '',
|
||||
api_key: document.getElementById('fofa-api-key')?.value.trim() || '',
|
||||
base_url: document.getElementById('fofa-base-url')?.value.trim() || ''
|
||||
},
|
||||
@@ -3094,6 +3113,23 @@ async function fetchExternalMCPs() {
|
||||
// MCP 管理页定时刷新外部 MCP 状态（感知后台断连/自动重连）
|
||||
let externalMcpPollTimer = null;
|
||||
const EXTERNAL_MCP_POLL_INTERVAL_MS = 8000;
|
||||
let externalMcpRenderSignature = '';
|
||||
|
||||
function renderExternalMCPData(data, forceRender = false) {
|
||||
const servers = data.servers || {};
|
||||
const stats = data.stats || {};
|
||||
const signature = JSON.stringify({ servers, stats });
|
||||
|
||||
if (!forceRender && signature === externalMcpRenderSignature) {
|
||||
updateExternalMcpCardSelection();
|
||||
return false;
|
||||
}
|
||||
|
||||
externalMcpRenderSignature = signature;
|
||||
renderExternalMCPList(servers);
|
||||
renderExternalMCPStats(stats);
|
||||
return true;
|
||||
}
|
||||
|
||||
function startExternalMcpPoll() {
|
||||
stopExternalMcpPoll();
|
||||
@@ -3118,13 +3154,12 @@ function stopExternalMcpPoll() {
|
||||
}
|
||||
|
||||
// 加载外部MCP列表并渲染
|
||||
async function loadExternalMCPs() {
|
||||
async function loadExternalMCPs(options = {}) {
|
||||
try {
|
||||
// 等待 i18n 就绪，避免快速刷新时翻译函数未初始化导致显示占位符
|
||||
if (window.i18nReady) await window.i18nReady;
|
||||
const data = await fetchExternalMCPs();
|
||||
renderExternalMCPList(data.servers || {});
|
||||
renderExternalMCPStats(data.stats || {});
|
||||
renderExternalMCPData(data, options.forceRender === true);
|
||||
} catch (error) {
|
||||
console.error('加载外部MCP列表失败:', error);
|
||||
const list = document.getElementById('external-mcp-list');
|
||||
@@ -3150,8 +3185,7 @@ async function pollExternalMCPToolCount(name, maxAttempts = 10) {
|
||||
await new Promise(r => setTimeout(r, pollIntervalMs));
|
||||
try {
|
||||
const data = await fetchExternalMCPs();
|
||||
renderExternalMCPList(data.servers || {});
|
||||
renderExternalMCPStats(data.stats || {});
|
||||
renderExternalMCPData(data);
|
||||
if (name != null) {
|
||||
const server = data.servers && data.servers[name];
|
||||
if (server && server.tool_count > 0) break;
|
||||
@@ -3742,7 +3776,7 @@ document.addEventListener('languagechange', function () {
|
||||
const mcpPage = document.getElementById('page-mcp-management');
|
||||
if (mcpPage && mcpPage.classList.contains('active')) {
|
||||
if (typeof loadExternalMCPs === 'function') {
|
||||
loadExternalMCPs().catch(function () { /* ignore */ });
|
||||
loadExternalMCPs({ forceRender: true }).catch(function () { /* ignore */ });
|
||||
}
|
||||
if (typeof updateToolsStats === 'function') {
|
||||
updateToolsStats().catch(function () { /* ignore */ });
|
||||
|
||||
Reference in New Issue
Block a user