|
|
@@ -1,4 +1,4 @@
|
|
|
-import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
|
|
|
+import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
|
|
|
import { api } from '../api/client';
|
|
|
import type { DataObject, RunInfo, Workspace } from '../api/types';
|
|
|
import { Badge, DataTable, ProgressBar, Spinner } from '../components/Common';
|
|
|
@@ -39,12 +39,16 @@ export function ProcessPage({ workspace, onToast, onChanged }: ProcessPageProps)
|
|
|
const [cutoff, setCutoff] = useState('');
|
|
|
const [countrySystem, setCountrySystem] = useState('ISO');
|
|
|
const [groupBy, setGroupBy] = useState<string[]>(['c1', 'c2']);
|
|
|
+ const [filters, setFilters] = useState<Array<{ column: string; value: string }>>([]);
|
|
|
+ const [filterColumn, setFilterColumn] = useState('c1');
|
|
|
+ const [filterValue, setFilterValue] = useState('');
|
|
|
const [run, setRun] = useState<RunInfo | null>(null);
|
|
|
const [result, setResult] = useState<DataObject | null>(null);
|
|
|
const [previewTable, setPreviewTable] = useState<string>('');
|
|
|
const [previewData, setPreviewData] = useState<{ columns: string[]; rows: Array<Record<string, unknown>> } | null>(null);
|
|
|
const [history, setHistory] = useState<RunInfo[]>([]);
|
|
|
const timer = useRef<number | null>(null);
|
|
|
+ const runCancels = useRef<Array<() => void>>([]);
|
|
|
|
|
|
const loadFiles = useCallback(async () => {
|
|
|
if (!workspace) return;
|
|
|
@@ -96,8 +100,15 @@ export function ProcessPage({ workspace, onToast, onChanged }: ProcessPageProps)
|
|
|
}
|
|
|
};
|
|
|
|
|
|
- useEffect(() => stopPolling, []);
|
|
|
+ useEffect(() => {
|
|
|
+ return () => {
|
|
|
+ stopPolling();
|
|
|
+ for (const cancel of runCancels.current) cancel();
|
|
|
+ runCancels.current = [];
|
|
|
+ };
|
|
|
+ }, []);
|
|
|
|
|
|
+ /** 轮询兜底:SSE 不可用(代理/浏览器限制)时使用。 */
|
|
|
const pollRun = (runId: string) => {
|
|
|
stopPolling();
|
|
|
timer.current = window.setInterval(async () => {
|
|
|
@@ -106,17 +117,7 @@ export function ProcessPage({ workspace, onToast, onChanged }: ProcessPageProps)
|
|
|
setRun(current);
|
|
|
if (current.status === 'succeeded' || current.status === 'failed') {
|
|
|
stopPolling();
|
|
|
- if (current.status === 'succeeded' && current.object_id) {
|
|
|
- const object = await api.getObject(current.object_id);
|
|
|
- setResult(object);
|
|
|
- const first = object.tables[0]?.name ?? '';
|
|
|
- setPreviewTable(first);
|
|
|
- onToast('success', '处理完成,已生成统计结果');
|
|
|
- onChanged();
|
|
|
- void loadFiles();
|
|
|
- } else {
|
|
|
- onToast('error', current.error || '处理失败');
|
|
|
- }
|
|
|
+ await finishRun(current);
|
|
|
}
|
|
|
} catch (error) {
|
|
|
stopPolling();
|
|
|
@@ -125,6 +126,59 @@ export function ProcessPage({ workspace, onToast, onChanged }: ProcessPageProps)
|
|
|
}, 700);
|
|
|
};
|
|
|
|
|
|
+ const finishRun = async (current: RunInfo) => {
|
|
|
+ if (current.status === 'succeeded' && current.object_id) {
|
|
|
+ const object = await api.getObject(current.object_id);
|
|
|
+ setResult(object);
|
|
|
+ setPreviewTable(object.tables[0]?.name ?? '');
|
|
|
+ onToast('success', '处理完成,已生成统计结果');
|
|
|
+ onChanged();
|
|
|
+ void loadFiles();
|
|
|
+ } else if (current.status === 'failed') {
|
|
|
+ onToast('error', current.error || '处理失败');
|
|
|
+ }
|
|
|
+ };
|
|
|
+
|
|
|
+ /** 进度优先用 SSE(架构文档要求的形态),断了自动退回轮询。 */
|
|
|
+ const watchRun = (runId: string) => {
|
|
|
+ stopPolling();
|
|
|
+ let settled = false;
|
|
|
+ const cancel = api.streamRun(runId, {
|
|
|
+ onProgress(data) {
|
|
|
+ setRun((current) => ({
|
|
|
+ ...(current ?? ({ id: runId } as RunInfo)),
|
|
|
+ id: runId,
|
|
|
+ status: data.status,
|
|
|
+ progress: data.progress,
|
|
|
+ message: data.message,
|
|
|
+ object_id: data.object_id,
|
|
|
+ error: data.error,
|
|
|
+ input_object: current?.input_object ?? '',
|
|
|
+ operation: current?.operation ?? '',
|
|
|
+ started_at: current?.started_at ?? new Date().toISOString(),
|
|
|
+ finished_at: null,
|
|
|
+ params: current?.params ?? {},
|
|
|
+ }));
|
|
|
+ },
|
|
|
+ onDone(data) {
|
|
|
+ if (settled) return;
|
|
|
+ settled = true;
|
|
|
+ void (async () => {
|
|
|
+ const final = await api.getRun(runId);
|
|
|
+ setRun(final);
|
|
|
+ await finishRun(final);
|
|
|
+ })();
|
|
|
+ },
|
|
|
+ onError(error) {
|
|
|
+ if (settled) return;
|
|
|
+ settled = true;
|
|
|
+ onToast('error', `进度流中断,改用轮询:${error.message}`);
|
|
|
+ pollRun(runId);
|
|
|
+ },
|
|
|
+ });
|
|
|
+ runCancels.current.push(cancel);
|
|
|
+ };
|
|
|
+
|
|
|
const start = async () => {
|
|
|
if (!workspace || !selected) {
|
|
|
onToast('error', '请选择一份原始数据');
|
|
|
@@ -144,7 +198,10 @@ export function ProcessPage({ workspace, onToast, onChanged }: ProcessPageProps)
|
|
|
country_code_system: countrySystem,
|
|
|
};
|
|
|
if (cutoff) options.cutoff_date = cutoff;
|
|
|
- if (operation === 'custom_aggregate') options.group_by = groupBy;
|
|
|
+ if (operation === 'custom_aggregate') {
|
|
|
+ options.group_by = groupBy;
|
|
|
+ options.filters = Object.fromEntries(filters.filter((item) => item.column && item.value).map((item) => [item.column, item.value]));
|
|
|
+ }
|
|
|
const created = await api.startProcess({
|
|
|
workspace_id: workspace.id,
|
|
|
input_object_id: selected,
|
|
|
@@ -175,6 +232,11 @@ export function ProcessPage({ workspace, onToast, onChanged }: ProcessPageProps)
|
|
|
// eslint-disable-next-line react-hooks/exhaustive-deps
|
|
|
}, [result?.id]);
|
|
|
|
|
|
+ const sourceName = useMemo(
|
|
|
+ () => rawFiles.find((item) => item.id === (run?.input_object ?? selected))?.name ?? '',
|
|
|
+ [rawFiles, run?.input_object, selected],
|
|
|
+ );
|
|
|
+
|
|
|
const groupedTables = useMemo(() => {
|
|
|
if (!result) return [];
|
|
|
return result.tables.map((table) => ({ ...table, meta: classifySheet(table.name) }));
|
|
|
@@ -295,6 +357,58 @@ export function ProcessPage({ workspace, onToast, onChanged }: ProcessPageProps)
|
|
|
</button>
|
|
|
))}
|
|
|
</div>
|
|
|
+
|
|
|
+ <h3>5. 过滤条件(可选)</h3>
|
|
|
+ <div className="filter-row">
|
|
|
+ <select value={filterColumn} onChange={(event) => setFilterColumn(event.target.value)} disabled={running}>
|
|
|
+ {GROUP_BY_OPTIONS.map(([value, label]) => (
|
|
|
+ <option key={value} value={value}>
|
|
|
+ {label}
|
|
|
+ </option>
|
|
|
+ ))}
|
|
|
+ </select>
|
|
|
+ <input
|
|
|
+ type="text"
|
|
|
+ placeholder="等于某个值,例如 电容器 / 2025 / DDR5"
|
|
|
+ value={filterValue}
|
|
|
+ disabled={running}
|
|
|
+ onChange={(event) => setFilterValue(event.target.value)}
|
|
|
+ onKeyDown={(event) => {
|
|
|
+ if (event.key === 'Enter' && filterValue.trim()) {
|
|
|
+ event.preventDefault();
|
|
|
+ setFilters((current) => [...current.filter((item) => item.column !== filterColumn), { column: filterColumn, value: filterValue.trim() }]);
|
|
|
+ setFilterValue('');
|
|
|
+ }
|
|
|
+ }}
|
|
|
+ />
|
|
|
+ <button
|
|
|
+ type="button"
|
|
|
+ className="ghost"
|
|
|
+ disabled={running || !filterValue.trim()}
|
|
|
+ onClick={() => {
|
|
|
+ setFilters((current) => [...current.filter((item) => item.column !== filterColumn), { column: filterColumn, value: filterValue.trim() }]);
|
|
|
+ setFilterValue('');
|
|
|
+ }}
|
|
|
+ >
|
|
|
+ 添加
|
|
|
+ </button>
|
|
|
+ </div>
|
|
|
+ {filters.length > 0 && (
|
|
|
+ <div className="chips">
|
|
|
+ {filters.map((item) => (
|
|
|
+ <button
|
|
|
+ key={item.column}
|
|
|
+ type="button"
|
|
|
+ className="chip chip-verified"
|
|
|
+ title="点击移除"
|
|
|
+ onClick={() => setFilters((current) => current.filter((entry) => entry.column !== item.column))}
|
|
|
+ >
|
|
|
+ {GROUP_BY_OPTIONS.find(([value]) => value === item.column)?.[1] ?? item.column} = {item.value} ×
|
|
|
+ </button>
|
|
|
+ ))}
|
|
|
+ </div>
|
|
|
+ )}
|
|
|
+ <p className="muted">过滤条件只对"自定义聚合"生效;全套统计报表按固定口径出全量数据。</p>
|
|
|
</>
|
|
|
)}
|
|
|
|
|
|
@@ -349,12 +463,30 @@ export function ProcessPage({ workspace, onToast, onChanged }: ProcessPageProps)
|
|
|
<a className="button-link" href={api.downloadUrl(result.id, '统计结果.xlsx')} target="_blank" rel="noreferrer">
|
|
|
下载 统计结果.xlsx
|
|
|
</a>
|
|
|
- {result.meta.lineage && (
|
|
|
- <span className="muted mono" title={JSON.stringify(result.meta.lineage, null, 2)}>
|
|
|
- 血缘 {String((result.meta.lineage as any).output_hash ?? '').slice(0, 18)}…
|
|
|
- </span>
|
|
|
- )}
|
|
|
</div>
|
|
|
+
|
|
|
+ {result.meta.lineage && (
|
|
|
+ <div className="lineage-box">
|
|
|
+ <h4>血缘(这批结果怎么来的,可复核)</h4>
|
|
|
+ <dl className="lineage-grid">
|
|
|
+ <dt>输入文件</dt>
|
|
|
+ <dd>{sourceName || result.parents?.[0] || '—'}</dd>
|
|
|
+ <dt>输入指纹</dt>
|
|
|
+ <dd>{String((result.meta.lineage as any).input_sha256 ?? '—')}</dd>
|
|
|
+ <dt>参数哈希</dt>
|
|
|
+ <dd>{String((result.meta.lineage as any).params_hash ?? '—')}</dd>
|
|
|
+ <dt>输出哈希</dt>
|
|
|
+ <dd>{String((result.meta.lineage as any).output_hash ?? '—')}</dd>
|
|
|
+ <dt>引擎</dt>
|
|
|
+ <dd>
|
|
|
+ {String((result.meta.lineage as any).engine?.name ?? '—')} v
|
|
|
+ {String((result.meta.lineage as any).engine?.version ?? '—')}
|
|
|
+ </dd>
|
|
|
+ <dt>产出时间</dt>
|
|
|
+ <dd>{String((result.meta.lineage as any).started_at ?? relativeTime(result.created_at))}</dd>
|
|
|
+ </dl>
|
|
|
+ </div>
|
|
|
+ )}
|
|
|
{result.meta.warnings && result.meta.warnings.length > 0 && (
|
|
|
<ul className="warn-list">
|
|
|
{result.meta.warnings.map((text, index) => (
|