新增:查询页面快照并修复筛选选框闪烁
页面快照支持勾选查询条件、指标卡片、趋势、汇总表、不良构成和细分缺陷图,复制PNG或下载;增加取消、分阶段提示和等待超时恢复。 修复公共Select弹层准备帧被opacity覆盖导致的先闪出再展开,并取消查询字段原生label的重复点击转发。 同步已经验收上线的销售订单类型映射、排除筛选及预聚合,以及其线上权限、删除确认配套源码;保留既有公式编辑和名录编码修改。源码范围按发布清单冻结,不纳入本机数据、凭据及未发布工作。 验证:前后端独立源码构建通过;10项前端检查、4项订单分类单元测试通过;实际系统剪贴板粘贴PNG验证通过;线上配置及筛选结果与发布前一致,后端未重启。
This commit is contained in:
@@ -1,3 +1,4 @@
|
||||
import { useDeleteConfirmation } from './useDeleteConfirmation';
|
||||
import { useEffect, useMemo, useState } from 'react';
|
||||
import {
|
||||
Alert, App, Button, Empty, Form, Input, InputNumber, Modal, Popconfirm,
|
||||
@@ -200,6 +201,7 @@ export function M01Insights({ query, onUnauthorized }: { query: QueryParams; onU
|
||||
}
|
||||
|
||||
export function M02SavedViews({ query, view, onUnauthorized, onApply }: { query: QueryParams; view: ViewKind; onUnauthorized: (error: unknown) => boolean; onApply: (context: Partial<QueryParams>) => void }) {
|
||||
const confirmDelete = useDeleteConfirmation();
|
||||
const { message } = App.useApp();
|
||||
const [items, setItems] = useState<Row[]>([]);
|
||||
const [sharedItems, setSharedItems] = useState<Row[]>([]);
|
||||
@@ -293,7 +295,7 @@ export function M02SavedViews({ query, view, onUnauthorized, onApply }: { query:
|
||||
{ title: '视图名称', dataIndex: 'name', key: 'name', width: 210 },
|
||||
{ title: '分组维度', key: 'groupBy', width: 140, render: (_, row) => text(record(row.definition).groupBy, '总体') },
|
||||
{ title: '数据范围', key: 'dataScope', width: 180, render: () => '打开时使用当前数据' },
|
||||
{ title: '操作', key: 'actions', width: 250, render: (_, row) => <span className="completion-actions"><Button type="link" loading={busyId === String(row.id)} onClick={() => void open(row)}>打开</Button><Button type="link" onClick={() => void manageShares(row)}>共享</Button><Popconfirm title="删除此个人比较视图?" onConfirm={() => void remove(row)}><Button type="link" danger loading={busyId === String(row.id)}>删除</Button></Popconfirm></span> },
|
||||
{ title: '操作', key: 'actions', width: 250, render: (_, row) => <span className="completion-actions"><Button type="link" loading={busyId === String(row.id)} onClick={() => void open(row)}>打开</Button><Button type="link" onClick={() => void manageShares(row)}>共享</Button><Button type="link" danger loading={busyId === String(row.id)} onClick={()=>confirmDelete({title:`删除个人视图“${text(row.name || row.title,"当前视图")}”?`,description:"确认后立即删除此个人比较视图,原始业务数据保留。",onConfirm:()=>remove(row)})}>删除</Button></span> },
|
||||
];
|
||||
const sharedColumns: ColumnsType<Row> = [
|
||||
{ title: '视图名称', dataIndex: 'name', key: 'name', width: 230 },
|
||||
@@ -336,6 +338,7 @@ export function M02SavedViews({ query, view, onUnauthorized, onApply }: { query:
|
||||
}
|
||||
|
||||
export function ScrapAnalyticsPanel({ query, onUnauthorized }: { query: QueryParams; onUnauthorized: (error: unknown) => boolean }) {
|
||||
const confirmDelete = useDeleteConfirmation();
|
||||
const [stage, setStage] = useState<Stage>('black');
|
||||
const [dimension, setDimension] = useState('category');
|
||||
const [limit, setLimit] = useState(10);
|
||||
@@ -493,7 +496,7 @@ export function ScrapAnalyticsPanel({ query, onUnauthorized }: { query: QueryPar
|
||||
{ title: '阶段 / 对象', dataIndex: 'subject', key: 'subject', width: 260, render: value => typeof value === 'string' ? value : (() => { const subject = record(value); return `${subject.stage === 'black' ? '黑片' : subject.stage === 'bright' ? '亮片' : '—'} · ${text(subject.label)}`; })() },
|
||||
{ title: '重算综合率', key: 'snapshot', align: 'right', width: 130, render: (_, row) => { const summary = record(record(row.metricSnapshot || row.snapshot).summary); return pct(summary.compositeRate); } },
|
||||
{ title: '证据状态', key: 'evidence', width: 125, render: (_, row) => row.evidenceAvailable === false ? <Tag color="gold">当前不可见</Tag> : <Tag color="green">已重新授权</Tag> },
|
||||
{ title: '操作', key: 'remove', width: 90, render: (_, row) => <Button type="link" danger loading={checklistBusy} onClick={() => void removeChecklistItem(row)}>移除</Button> },
|
||||
{ title: '操作', key: 'remove', width: 90, render: (_, row) => <Button type="link" danger loading={checklistBusy} onClick={() => confirmDelete({title:`移除核查证据“${text(row.title || row.label || row.name || row.objectKey,"当前证据")}”?`,description:"仅从核查清单中移除这项证据,原始业务数据保留;确认后立即生效。",confirmText:"确认移除",onConfirm:()=>removeChecklistItem(row)})}>移除</Button> },
|
||||
];
|
||||
const impactRows = list(impactResult?.groups);
|
||||
const impactColumns: ColumnsType<Row> = [
|
||||
@@ -541,6 +544,7 @@ export function ScrapAnalyticsPanel({ query, onUnauthorized }: { query: QueryPar
|
||||
}
|
||||
|
||||
export function TargetVersionAdmin({ onUnauthorized }: { onUnauthorized: (error: unknown) => boolean }) {
|
||||
const confirmDelete = useDeleteConfirmation();
|
||||
const { message } = App.useApp();
|
||||
const [items, setItems] = useState<Row[]>([]);
|
||||
const [loading, setLoading] = useState(true);
|
||||
@@ -583,10 +587,7 @@ export function TargetVersionAdmin({ onUnauthorized }: { onUnauthorized: (error:
|
||||
? { ...item, values: { ...record(item.values), [String(year)]: value } }
|
||||
: item));
|
||||
};
|
||||
const removeRow = (row: Row) => {
|
||||
const key = String(row.editorKey || '');
|
||||
setTargetRows(current => current.filter(item => String(item.editorKey || '') !== key));
|
||||
};
|
||||
const removeRow = (row: Row) => confirmDelete({title:`删除“${dimensionKeys.map(key=>String(row[key]||'')).filter(Boolean).join(' / ') || '总体'}”的目标行?`,description:`将移除当前编辑内容中“${metricOptions.find(item=>item.value===row.metric)?.label || '所选指标'}”及其各年度目标,保存目标后生效。`,onConfirm:()=>{const key=String(row.editorKey || '');setTargetRows(current=>current.filter(item=>String(item.editorKey || '')!==key));}});
|
||||
const isScopeRow = (row: Row) => row.editorScope === true;
|
||||
const overallRows = targetRows.filter(row => !isScopeRow(row));
|
||||
const scopeRows = targetRows.filter(isScopeRow);
|
||||
|
||||
@@ -8,6 +8,7 @@ import { pageUsesResources } from './resourceInvalidation';
|
||||
import type { AuthUser, QueryParams } from './types';
|
||||
import type { PageKey } from './QualityWorkspace';
|
||||
import { PageCacheContext, WORKSPACE_INVALIDATED } from './pageCache';
|
||||
import { canAccessWorkspacePage } from './userRoles';
|
||||
|
||||
const loadQueryPage = () => import('./QueryPage');
|
||||
const loadStageProductPage = () => import('./StageProductPage');
|
||||
@@ -129,10 +130,24 @@ export const CachedWorkspacePages = forwardRef<WorkspaceNavigation, {
|
||||
const navigate = (next: PageKey, query?: QueryParams, resultRef?: ResultRef) => {
|
||||
if (next === 'imports') next = 'sources';
|
||||
if (next === requested.current && !query && !resultRef) return;
|
||||
let navigationQuery:Partial<QueryParams>|undefined=query;
|
||||
if(!query&&!resultRef&&QUERY_PAGES.includes(current.current)&&QUERY_PAGES.includes(next)) {
|
||||
const source=readQueryLocation(entries.current.get(current.current)?.search||location.search);
|
||||
const destination=readQueryLocation(entries.current.get(next)?.search||'');
|
||||
const sourceKey=Object.hasOwn(source.extraFilters||{},'salesOrderTypeNotIn')?'salesOrderTypeNotIn':'salesOrderType';
|
||||
const destinationKey=Object.hasOwn(destination.extraFilters||{},'salesOrderTypeNotIn')?'salesOrderTypeNotIn':'salesOrderType';
|
||||
const selected=source.extraFilters?.[sourceKey];
|
||||
if(sourceKey!==destinationKey||JSON.stringify(selected||[])!==JSON.stringify(destination.extraFilters?.[destinationKey]||[])) {
|
||||
const extraFilters={...destination.extraFilters};
|
||||
delete extraFilters.salesOrderType;delete extraFilters.salesOrderTypeNotIn;
|
||||
if(selected?.length||sourceKey==='salesOrderTypeNotIn')extraFilters[sourceKey]=[...(selected||[])];
|
||||
navigationQuery={...destination,extraFilters};
|
||||
}
|
||||
}
|
||||
const params = new URLSearchParams({ page: next });
|
||||
if (query) params.set('context', encode({ query, ...(resultRef ? { resultRef } : {}) }));
|
||||
if (navigationQuery) params.set('context', encode({ query:navigationQuery, ...(resultRef ? { resultRef } : {}) }));
|
||||
const cached = entries.current.get(next);
|
||||
void enter(next, query || resultRef || !cached ? `?${params}` : cached.search, Boolean(query || resultRef) || !retained(next));
|
||||
void enter(next, navigationQuery || resultRef || !cached ? `?${params}` : cached.search, Boolean(navigationQuery || resultRef) || !retained(next));
|
||||
};
|
||||
useImperativeHandle(ref, () => ({ navigate, syncLocation: () => {
|
||||
const next = new URLSearchParams(location.search).get('page') as PageKey || 'overall';
|
||||
@@ -171,7 +186,7 @@ export const CachedWorkspacePages = forwardRef<WorkspaceNavigation, {
|
||||
return <div key={`${name}-${entry.key}`} className="page-view" data-page={name} hidden={!active} inert={active && navigationBusy} style={!active ? { display: 'none' } : undefined}>
|
||||
<PageCacheContext.Provider value={{ active, initialSearch: entry.initialSearch, refreshKey: refreshKey + (entry.revision || 0), currentReleaseId: revisions.current?.currentReleaseId, authRevision: revisions.current?.authRevision, dataRevision: revisions.current?.dataRevision, onLocationChange: search => { entry.search = search; } }}>
|
||||
<Suspense fallback={<div className="loading-panel"><Spin />正在打开页面…</div>}>
|
||||
{name === 'blackProduct' || name === 'brightProduct' ? <StageProductPage stage={name === 'blackProduct' ? 'black' : 'bright'} onUnauthorized={onUnauthorized} /> : QUERY_PAGES.includes(name) ? <QueryPage page={name} onUnauthorized={onUnauthorized} onNavigate={navigate} /> : <ManagementPages page={name} user={user} onUnauthorized={onUnauthorized} onNavigate={navigate} />}
|
||||
{!canAccessWorkspacePage(user, name) ? <Alert type="info" showIcon message="当前角色没有此页面的访问权限" action={<Button onClick={() => navigate('overall')}>返回质量查询</Button>} /> : name === 'blackProduct' || name === 'brightProduct' ? <StageProductPage stage={name === 'blackProduct' ? 'black' : 'bright'} onUnauthorized={onUnauthorized} /> : QUERY_PAGES.includes(name) ? <QueryPage page={name} onUnauthorized={onUnauthorized} onNavigate={navigate} /> : <ManagementPages page={name} user={user} onUnauthorized={onUnauthorized} onNavigate={navigate} />}
|
||||
</Suspense>
|
||||
</PageCacheContext.Provider>
|
||||
</div>;
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
import { useDeleteConfirmation } from './useDeleteConfirmation';
|
||||
import { useContext, useRef, useState, type ReactNode } from 'react';
|
||||
import { Alert, App, AutoComplete, Button, Input, Modal, Select, Space, Tag } from 'antd';
|
||||
import { DeleteOutlined, PlusOutlined } from '@ant-design/icons';
|
||||
@@ -13,6 +14,7 @@ export function ClassificationRuleEditor({ children, onUnauthorized }: {
|
||||
onUnauthorized: (error: unknown)=>boolean;
|
||||
}) {
|
||||
const context=useContext(MappingEditorContext);
|
||||
const confirmDelete = useDeleteConfirmation();
|
||||
const {message}=App.useApp();
|
||||
const [selection,setSelection]=useState<ClassificationSelection|null>(null);
|
||||
const [conditions,setConditions]=useState<ClassificationCondition[]>([]);
|
||||
@@ -66,7 +68,7 @@ export function ClassificationRuleEditor({ children, onUnauthorized }: {
|
||||
options={[{value:'EQUALS',label:'等于'},{value:'IS_BLANK',label:'为空'}]} onChange={operator=>{setConditions(conditions.map(c=>c===condition?{...c,operator,value:operator==='IS_BLANK'?'':c.value}:c));resetPreview();setBusy(false);}}/>
|
||||
<Input aria-label={`${labels[condition.field]}匹配值`} disabled={condition.operator==='IS_BLANK'} value={condition.value} maxLength={200}
|
||||
placeholder={condition.operator==='IS_BLANK'?'空值':'填写匹配值'} onChange={e=>{setConditions(conditions.map(c=>c===condition?{...c,value:e.target.value}:c));resetPreview();setBusy(false);}}/>
|
||||
<Button aria-label={`移除${labels[condition.field]}条件`} icon={<DeleteOutlined/>} disabled={conditions.length===1} onClick={()=>{setConditions(conditions.filter(c=>c!==condition));resetPreview();setBusy(false);}}>移除</Button>
|
||||
<Button aria-label={`移除${labels[condition.field]}条件`} icon={<DeleteOutlined/>} disabled={conditions.length===1} onClick={()=>confirmDelete({title:`移除“${labels[condition.field]}”条件?`,description:"将从当前分类规则中移除此条件,保存分类规则后生效。",confirmText:"确认移除",onConfirm:()=>{setConditions(conditions.filter(c=>c!==condition));resetPreview();setBusy(false);}})}>移除</Button>
|
||||
</div>)}</div></>}
|
||||
<label className="classification-target">{project?'项目组':'业务分组'}<AutoComplete aria-label={project?'目标项目组':'目标业务分组'} value={target} maxLength={160} options={(project?context?.projectGroups??[]:context?.groups??[]).map(value=>({value}))}
|
||||
filterOption={(input,option)=>String(option?.value).includes(input)} placeholder={project?'选择项目组':'选择业务分组'} onChange={value=>{setTarget(value);resetPreview();setBusy(false);}}/></label>
|
||||
|
||||
@@ -6,9 +6,11 @@ import { DownOutlined, UpOutlined } from '@ant-design/icons';
|
||||
import { api } from './api';
|
||||
import type { FilterField } from './types';
|
||||
import { readableSelectPopup } from './readableSelectPopup';
|
||||
import { salesOrderTypeSelection,updateSalesOrderTypeSelection } from './salesOrderTypes';
|
||||
import './sales-order-types.css';
|
||||
|
||||
function FieldSelect({ field, value, onChange, onUnauthorized }: { field: FilterField; value: string[]; onChange: (values: string[]) => void; onUnauthorized: (error: unknown) => boolean }) {
|
||||
const { active } = usePageCache();
|
||||
export function FilterFieldSelect({ field, value, onChange, onUnauthorized,releaseId,stage,exclude,onExclude }: { field: FilterField; value: string[]; onChange: (values: string[]) => void; onUnauthorized: (error: unknown) => boolean;releaseId?:string;stage?:'black'|'bright';exclude?:boolean;onExclude?:(exclude:boolean)=>void }) {
|
||||
const { active,refreshKey } = usePageCache();
|
||||
const [search, setSearch] = useState('');
|
||||
const [choices, setChoices] = useState<string[]>([]);
|
||||
const [loading, setLoading] = useState(true);
|
||||
@@ -22,26 +24,35 @@ function FieldSelect({ field, value, onChange, onUnauthorized }: { field: Filter
|
||||
const current = ++generation.current, controller = new AbortController();
|
||||
setLoading(true); setChoices([]); setError('');
|
||||
const timer = window.setTimeout(() => {
|
||||
api.filterFieldOptions(field.key, search, controller.signal).then(result => {
|
||||
api.filterFieldOptions(field.key, search, controller.signal,releaseId,stage).then(result => {
|
||||
if (generation.current !== current) return;
|
||||
setChoices(result.values); setHasMore(result.hasMore);
|
||||
}).catch(e => { if (generation.current === current && !onUnauthorized(e)) setError(e.message || '选项加载失败'); })
|
||||
.finally(() => { if (generation.current === current) setLoading(false); });
|
||||
}, search ? 250 : 0);
|
||||
return () => { window.clearTimeout(timer); controller.abort(); generation.current++; };
|
||||
}, [active, field.key, search, revision, onUnauthorized]);
|
||||
return <label className="query-field query-extra-field"><span>{field.label}</span><Select mode="multiple" allowClear showSearch aria-label={field.label}
|
||||
}, [active, field.key, search, revision, onUnauthorized,releaseId,stage,refreshKey]);
|
||||
const selection=<Select className={onExclude?'sales-order-type-values':undefined} mode="multiple" allowClear showSearch aria-label={field.label}
|
||||
{...readableSelectPopup} maxTagCount="responsive" value={value} loading={showLoading} filterOption={false} searchValue={search} onSearch={setSearch}
|
||||
onChange={values => { onChange(values); setSearch(''); }} placeholder="全部"
|
||||
options={[...new Set([...choices, ...value.filter(v => v !== '__EMPTY__')])].map(v => ({ label: v, value: v })).concat(field.allowEmpty ? [{ label: '空值', value: '__EMPTY__' }] : [])}
|
||||
onChange={values => { onChange(values); setSearch(''); }} placeholder={onExclude&&exclude?'选择要排除的类型':'全部'}
|
||||
options={[...new Set([...choices, ...value.filter(v => v !== '__EMPTY__')])].map(v => ({ label: v, value: v })).concat(field.allowEmpty ? [{ label: field.key==='salesOrderType'?'未匹配':'空值', value: '__EMPTY__' }] : [])}
|
||||
notFoundContent={showLoading ? <Spin size="small" /> : error ? <Button size="small" onClick={() => setRevision(n => n + 1)}>加载失败,重试</Button> : '暂无匹配项'}
|
||||
popupRender={menu => <>{menu}{hasMore && <div className="query-options-hint">选项较多,请输入关键字查找</div>}{error && <div role="alert" className="query-options-hint">{error}</div>}</>}
|
||||
/></label>;
|
||||
/>;
|
||||
// A label can associate with only one input. With two Selects it forwards box clicks to the mode input.
|
||||
const FieldContainer='div';
|
||||
return <FieldContainer className={`query-field query-extra-field${onExclude?' sales-order-type-field':''}`} role="group" aria-label={field.label}><span>{field.label}</span>{onExclude?<div className="sales-order-type-controls"><Select className="sales-order-type-mode" aria-label="销售订单类型筛选方式" value={exclude?'exclude':'include'} options={[{label:'包含',value:'include'},{label:'排除',value:'exclude'}]} onChange={value=>onExclude(value==='exclude')}/>{selection}</div>:selection}</FieldContainer>;
|
||||
}
|
||||
|
||||
export function ExtraQueryFilters({ projectGroup, projectGroups, onProjectGroup, value, onChange, onUnauthorized }: {
|
||||
export function SalesOrderTypeSelect({filters,onChange,...props}:{field:FilterField;filters:Record<string,string[]>;onChange:(filters:Record<string,string[]>)=>void;onUnauthorized:(error:unknown)=>boolean;releaseId?:string;stage?:'black'|'bright'}) {
|
||||
const {exclude,values}=salesOrderTypeSelection(filters);
|
||||
return <FilterFieldSelect {...props} value={values} exclude={exclude} onExclude={next=>onChange(updateSalesOrderTypeSelection(filters,next,values))} onChange={next=>onChange(updateSalesOrderTypeSelection(filters,exclude,next))}/>;
|
||||
}
|
||||
|
||||
export function ExtraQueryFilters({ projectGroup, projectGroups, onProjectGroup, value, onChange, onUnauthorized,releaseId }: {
|
||||
projectGroup: string[]; projectGroups?: string[]; onProjectGroup: (values: string[]) => void;
|
||||
value: Record<string, string[]>; onChange: (value: Record<string, string[]>) => void; onUnauthorized: (error: unknown) => boolean;
|
||||
releaseId?:string;
|
||||
}) {
|
||||
const { active } = usePageCache();
|
||||
const [open, setOpen] = useState(false);
|
||||
@@ -56,16 +67,16 @@ export function ExtraQueryFilters({ projectGroup, projectGroups, onProjectGroup,
|
||||
return () => { alive = false; controller.abort(); };
|
||||
}, [active, open, revision, onUnauthorized]);
|
||||
const count = (projectGroup.length ? 1 : 0) + Object.values(value).filter(v => v.length).length;
|
||||
const summary = [projectGroup.length ? `项目组:${projectGroup.map(v => v === '__UNASSIGNED__' ? '未分类' : v).join('、')}` : '', ...Object.entries(value).filter(([, values]) => values.length).map(([key, values]) => `${fields.find(f => f.key === key)?.label || key}:${values.map(v => v === '__EMPTY__' ? '空值' : v).join('、')}`)].filter(Boolean).join(';');
|
||||
const summary = [projectGroup.length ? `项目组:${projectGroup.map(v => v === '__UNASSIGNED__' ? '未分类' : v).join('、')}` : '', ...Object.entries(value).filter(([, values]) => values.length).map(([key, values]) => `${key==='salesOrderTypeNotIn'?'销售订单类型(排除)':fields.find(f => f.key === key)?.label || key}:${values.map(v => v === '__EMPTY__' ? key.startsWith('salesOrderType')?'未匹配':'空值' : v).join('、')}`)].filter(Boolean).join(';');
|
||||
return <>
|
||||
<div className="query-more-toggle" title={summary || undefined}><Button type="text" size="small" icon={open ? <UpOutlined /> : <DownOutlined />} aria-expanded={open} onClick={() => setOpen(v => !v)}>更多筛选{count ? `(已选 ${count} 项)` : ''}</Button>
|
||||
{count > 0 && <Button type="link" size="small" onClick={() => { onProjectGroup([]); onChange({}); }}>清除</Button>}
|
||||
</div>
|
||||
{open && error && <Alert className="query-extra-error" type="error" showIcon message={error} action={<Button onClick={() => setRevision(n => n + 1)}>重试</Button>} />}
|
||||
{open && <div className="query-extra-fields">
|
||||
{projectGroups && <label className="query-field query-extra-field"><span>项目组</span><Select aria-label="项目组" mode="multiple" maxTagCount="responsive" allowClear showSearch optionFilterProp="label" {...readableSelectPopup} value={projectGroup} onChange={onProjectGroup} placeholder="全部" options={[...projectGroups.map(v => ({ label: v, value: v })), { label: '未分类', value: '__UNASSIGNED__' }]} /></label>}
|
||||
{fields.map(field => <FieldSelect key={field.key} field={field} value={value[field.key] || []} onUnauthorized={onUnauthorized} onChange={values => { const next = { ...value }; if (values.length) next[field.key] = values; else delete next[field.key]; onChange(next); }} />)}
|
||||
{Object.keys(value).filter(key => !fields.some(f => f.key === key)).map(key => <Alert key={key} type="warning" message={`筛选字段 ${key} 当前不可用,请清除后继续查询。`} />)}
|
||||
{projectGroups && <div role="group" className="query-field query-extra-field"><span>项目组</span><Select aria-label="项目组" mode="multiple" maxTagCount="responsive" allowClear showSearch optionFilterProp="label" {...readableSelectPopup} value={projectGroup} onChange={onProjectGroup} placeholder="全部" options={[...projectGroups.map(v => ({ label: v, value: v })), { label: '未分类', value: '__UNASSIGNED__' }]} /></div>}
|
||||
{fields.map(field => field.key==='salesOrderType'?<SalesOrderTypeSelect key={field.key} field={field} releaseId={releaseId} filters={value} onUnauthorized={onUnauthorized} onChange={onChange}/>:<FilterFieldSelect key={field.key} field={field} releaseId={releaseId} value={value[field.key] || []} onUnauthorized={onUnauthorized} onChange={values => { const next = { ...value }; if (values.length) next[field.key] = values; else delete next[field.key]; onChange(next); }} />)}
|
||||
{Object.keys(value).filter(key => !fields.some(f => f.key === (key==='salesOrderTypeNotIn'?'salesOrderType':key))).map(key => <Alert key={key} type="warning" message={`筛选字段 ${key} 当前不可用,请清除后继续查询。`} />)}
|
||||
</div>}
|
||||
</>;
|
||||
}
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
import { useDeleteConfirmation } from './useDeleteConfirmation';
|
||||
import { ConfigurationWorkbookActions } from './ConfigurationWorkbookActions';
|
||||
import { useEffect, useState } from 'react';
|
||||
import { Alert, App, Button, Checkbox, Input, Select, Space } from 'antd';
|
||||
@@ -5,8 +6,10 @@ import { QualityTable as Table } from './QualityTable';
|
||||
import { PlusOutlined } from '@ant-design/icons';
|
||||
import { api } from './api';
|
||||
import type { FilterField } from './types';
|
||||
import { SalesOrderTypeSettings } from './SalesOrderTypeSettings';
|
||||
|
||||
export function FilterFieldSettings({ canManage, onUnauthorized }: { canManage: boolean; onUnauthorized: (error: unknown) => boolean }) {
|
||||
const confirmDelete = useDeleteConfirmation();
|
||||
const { message } = App.useApp();
|
||||
const [fields, setFields] = useState<FilterField[]>([]);
|
||||
const [columns, setColumns] = useState<{ black: string[]; bright: string[] }>({ black: [], bright: [] });
|
||||
@@ -38,7 +41,8 @@ export function FilterFieldSettings({ canManage, onUnauthorized }: { canManage:
|
||||
...(['black', 'bright'] as const).map(stage => ({ title: stage === 'black' ? '黑片来源列' : '亮片来源列', key: stage, width: 240, render: (_: unknown, f: FilterField) => <Select size="small" aria-label={`${stage === 'black' ? '黑片' : '亮片'}来源列 ${f.key}`} showSearch optionFilterProp="label" style={{ width: '100%' }} value={f[stage === 'black' ? 'blackColumn' : 'brightColumn'] || undefined} disabled={!canManage || saving} placeholder="选择来源列" options={[...new Set([...columns[stage], f[stage === 'black' ? 'blackColumn' : 'brightColumn']].filter(Boolean))].map(v => ({ label: v, value: v }))} onChange={v => update(f.key, { [stage === 'black' ? 'blackColumn' : 'brightColumn']: v })} /> })),
|
||||
{ title: '允许空值', key: 'empty', width: 100, render: (_, f) => <Checkbox aria-label={`允许空值 ${f.label || f.key}`} checked={f.allowEmpty} disabled={!canManage || saving} onChange={e => update(f.key, { allowEmpty: e.target.checked })} /> },
|
||||
{ title: '启用', key: 'enabled', width: 80, render: (_, f) => <Checkbox aria-label={`启用 ${f.label || f.key}`} checked={f.enabled} disabled={!canManage || saving} onChange={e => update(f.key, { enabled: e.target.checked })} /> },
|
||||
...(canManage ? [{ title: '操作', key: 'actions', width: 80, render: (_: unknown, f: FilterField) => <Button size="small" type="link" danger disabled={saving} onClick={() => { setFields(items => items.filter(item => item.key !== f.key)); setDirty(true); }}>移除</Button> }] : []),
|
||||
...(canManage ? [{ title: '操作', key: 'actions', width: 80, render: (_: unknown, f: FilterField) => <Button size="small" type="link" danger disabled={saving} onClick={() => confirmDelete({title:`移除查询字段“${f.label || f.key}”?`,description:"只移除查询字段配置,不删除原始数据。保存设置后生效。",confirmText:"确认移除",onConfirm:()=>{setFields(items => items.filter(item => item.key !== f.key));setDirty(true);}})}>移除</Button> }] : []),
|
||||
]} />
|
||||
{canManage&&<SalesOrderTypeSettings onUnauthorized={onUnauthorized}/>}
|
||||
</section>;
|
||||
}
|
||||
|
||||
@@ -71,8 +71,8 @@ function analysisDeepLink(sessionId: string, turnId: string): string {
|
||||
function InspectionStrategyPanel({ user, onUnauthorized }: { user: AuthUser; onUnauthorized: (error: unknown) => boolean }) {
|
||||
const { message } = App.useApp();
|
||||
const { active } = usePageCache();
|
||||
const canManage = user.roles.some(role => ['SYSTEM_ADMIN', 'SYSTEM_OPERATOR'].includes(role));
|
||||
const canRun = user.roles.some(role => ['QUALITY_VIEWER', 'BUSINESS_ANALYST'].includes(role));
|
||||
const canManage = user.roles.some(role => ['SYSTEM_ADMIN'].includes(role));
|
||||
const canRun = user.roles.some(role => ['SYSTEM_ADMIN', 'DATA_ADMIN', 'USER'].includes(role));
|
||||
const [strategies, setStrategies] = useState<Row[]>([]);
|
||||
const [releaseId, setReleaseId] = useState('');
|
||||
const [runs, setRuns] = useState<Row[]>([]);
|
||||
@@ -215,7 +215,7 @@ function InspectionStrategyPanel({ user, onUnauthorized }: { user: AuthUser; onU
|
||||
{error && <ErrorPanel title={"巡检数据读取或执行失败"} error={strategiesLoaded ? `${error};以下为上次成功读取的策略。` : error} onRetry={() => { void load(); if (releaseId) void loadRuns(releaseId); }} />}
|
||||
{loading && !strategiesLoaded ? <div className="completion-loading"><Spin />读取巡检策略…</div> : strategiesLoaded && canManage ? strategies.length ? <Table size="small" bordered columns={strategyColumns} dataSource={strategies} rowKey={row => String(row.id)} pagination={false} scroll={{ x: 1300 }} /> : <Empty description="服务端当前没有已登记的巡检策略" /> : null}
|
||||
<div className="completion-filter-row">{canRun && <Button type="primary" loading={running} disabled={!releaseId} onClick={() => void run()}>对当前数据执行巡检</Button>}</div>
|
||||
{!canRun && <Alert showIcon type="info" message="当前账号不能执行巡检" description="运行和结果查看需要服务端授权的质量查看或业务分析角色及明细查询权限。" />}
|
||||
{!canRun && <Alert showIcon type="info" message="当前账号不能执行巡检" description="执行和查看巡检需要用户权限及明细访问授权。" />}
|
||||
{canRun && (runsLoaded ? runs.length ? <Table size="small" bordered columns={runColumns} dataSource={runs} rowKey={row => String(row.id)} pagination={{ pageSize: 15, showSizeChanger: false }} scroll={{ x: 1120 }} /> : <Empty description={releaseId ? '当前数据尚无巡检运行记录' : '当前还没有可巡检的数据'} /> : runRead.busy ? <div className="completion-loading"><Spin />读取巡检运行记录…</div> : null)}
|
||||
<Modal className="management-modal" open={editing !== null} title={editing?.id ? `编辑巡检策略 · ${text(editing.name)}` : '新建巡检策略'} okText="保存策略" confirmLoading={saving} onCancel={() => { setEditing(null); form.resetFields(); }} onOk={() => void save()} width={Math.min(820, window.innerWidth - 24)}>
|
||||
<Form form={form} layout="vertical"><Form.Item name="name" label="策略名称" rules={[{ required: true, whitespace: true }]}><Input maxLength={100} /></Form.Item><Form.Item name="active" label="启用策略" valuePropName="checked"><Switch checkedChildren="启用" unCheckedChildren="停用" /></Form.Item><h3>巡检规则</h3><div className="governance-form-grid">{booleanFields.map(([key, label]) => <Form.Item key={key} name={key} label={label} valuePropName="checked"><Switch /></Form.Item>)}{metricFields.map(field => <Form.Item key={field.key} name={field.key} label={field.label} rules={[{ required: true }]}><InputNumber min={field.min} max={field.max} step={field.step} style={{ width: '100%' }} /></Form.Item>)}</div><p className="completion-note">阈值范围由服务端校验;保存后对后续巡检生效。</p></Form><Alert showIcon type="info" message="受控 AI 下钻" description="启用后仅为巡检发现创建绑定当前用户、当前数据与授权范围的持久化分析轮次;模型不接收业务数据行或业务数值。最多选择 1–3 项。" />
|
||||
@@ -276,9 +276,9 @@ export function SourceGovernancePanel({ user, currentReleaseId, onUnauthorized }
|
||||
const [resolveForm] = Form.useForm<Row>();
|
||||
const [tab, setTab] = useState('coverage');
|
||||
const tabRef = useRef(tab); tabRef.current = tab;
|
||||
const canMaintain = user.roles.some(role => ['SYSTEM_ADMIN', 'DATA_MAINTAINER'].includes(role));
|
||||
const canReview = user.roles.some(role => ['SYSTEM_ADMIN', 'DATA_PUBLISHER'].includes(role));
|
||||
const canDownload = user.roles.some(role => ['SYSTEM_ADMIN', 'DATA_MAINTAINER', 'DATA_PUBLISHER', 'BUSINESS_ANALYST', 'QUALITY_VIEWER', 'AUDIT_VIEWER'].includes(role));
|
||||
const canMaintain = user.roles.some(role => ['SYSTEM_ADMIN', 'DATA_ADMIN'].includes(role));
|
||||
const canReview = user.roles.some(role => ['SYSTEM_ADMIN', 'DATA_ADMIN'].includes(role));
|
||||
const canDownload = user.roles.some(role => ['SYSTEM_ADMIN', 'DATA_ADMIN', 'USER'].includes(role));
|
||||
const stage = Form.useWatch('stage', protocolForm);
|
||||
const changeType = Form.useWatch('type', changeForm);
|
||||
const resolveDecision = Form.useWatch('decision', resolveForm);
|
||||
@@ -524,7 +524,7 @@ export function BackupOperationsPanel({ user, onUnauthorized, onNavigate }: { us
|
||||
const [error, setError] = useState('');
|
||||
const [planOpen, setPlanOpen] = useState(false);
|
||||
const [form] = Form.useForm<Row>();
|
||||
const canManage = user.roles.some(role => ['SYSTEM_ADMIN', 'SYSTEM_OPERATOR'].includes(role));
|
||||
const canManage = user.roles.some(role => ['SYSTEM_ADMIN'].includes(role));
|
||||
const load = useCallback(() => read.run(async () => { try { setData(await api.governanceBackups()); setLoaded(true); setError(''); } catch (value) { if (!onUnauthorized(value)) setError(value instanceof Error ? value.message : '备份状态读取失败'); } }), [onUnauthorized, read.run]);
|
||||
useEffect(() => { if (active && !loaded) void load(); }, [active, loaded, load]);
|
||||
useMaintenanceRefresh(load);
|
||||
@@ -582,7 +582,7 @@ export function OperationsMonitorPanel({ user, onUnauthorized }: { user: AuthUse
|
||||
const [policyError, setPolicyError] = useState('');
|
||||
const [policyForm] = Form.useForm<Row>();
|
||||
const actionLock = useRef(false);
|
||||
const canRefresh = user.roles.some(role => ['SYSTEM_ADMIN', 'SYSTEM_OPERATOR'].includes(role));
|
||||
const canRefresh = user.roles.some(role => ['SYSTEM_ADMIN'].includes(role));
|
||||
const load = useCallback(() => read.run(async () => {
|
||||
try { setData(await api.governanceMonitor()); setLoaded(true); setError(''); }
|
||||
catch (value) { if (!onUnauthorized(value)) setError(value instanceof Error ? value.message : '运行监控读取失败'); }
|
||||
@@ -696,7 +696,7 @@ export function ServiceIdentityPanel({ user, onUnauthorized }: { user: AuthUser;
|
||||
catch (value) { if (!onUnauthorized(value)) setError(value instanceof Error ? value.message : '服务身份读取失败'); }
|
||||
}), [identityRead.run, onUnauthorized]);
|
||||
const loadBindings = useCallback(() => bindingRead.run(async () => {
|
||||
const canReadBindings = user.roles.some(role => ['SYSTEM_ADMIN', 'SYSTEM_OPERATOR'].includes(role));
|
||||
const canReadBindings = user.roles.some(role => ['SYSTEM_ADMIN'].includes(role));
|
||||
if (!canReadBindings) { setBindings([]); setBindingLoaded(true); return; }
|
||||
try { setBindings(collectionItems(await api.serviceBindings())); setBindingLoaded(true); setBindingError(''); }
|
||||
catch (value) { if (!onUnauthorized(value)) setBindingError(value instanceof Error ? value.message : '服务绑定读取失败'); }
|
||||
|
||||
+38
-33
@@ -2,6 +2,7 @@ import { ConfigurationWorkbookActions } from './ConfigurationWorkbookActions';
|
||||
import { MappingEditorContext } from './MappingEditorContext';
|
||||
import { ClassificationRuleEditor } from './ClassificationRuleEditor';
|
||||
import { ManagementSections } from './ManagementSections';
|
||||
import { ROLE_LABELS, ROLE_DESCRIPTIONS, USER_ROLE_OPTIONS } from './userRoles';
|
||||
import type { ClassificationSelection } from './classificationMaintenance';
|
||||
import { TasksMonitorPage } from './TasksMonitorPage';
|
||||
import { configurationDateTime, currentConfigurationName } from './configurationName';
|
||||
@@ -153,17 +154,6 @@ function decodeAnalysisLinkContext(encoded: string | null): AnalysisLinkContext
|
||||
}
|
||||
}
|
||||
|
||||
const ROLE_LABELS: Record<string, string> = {
|
||||
AUDIT_VIEWER: '审计查看',
|
||||
BUSINESS_ANALYST: '业务分析',
|
||||
DATA_MAINTAINER: '数据维护',
|
||||
DATA_PUBLISHER: '数据发布',
|
||||
QUALITY_VIEWER: '质量查看',
|
||||
RULE_MAINTAINER: '规则维护',
|
||||
SYSTEM_ADMIN: '系统管理',
|
||||
SYSTEM_OPERATOR: '运行维护',
|
||||
};
|
||||
|
||||
function shownRole(value: unknown): string {
|
||||
const role = String(value ?? '');
|
||||
return ROLE_LABELS[role] ?? role;
|
||||
@@ -238,7 +228,7 @@ function RulesWorkspace({ user, onUnauthorized, onNavigate }: Omit<ManagementPag
|
||||
const editFormula = (code: string) => { setFocusMetric({ code: METRIC_KEYS[code] || code, request: Date.now() }); setSection('settings'); };
|
||||
return <ManagementSections selectedKey={section} onSelect={setSection} items={[
|
||||
{ key: 'dictionary', label: '指标说明', children: <MetricDictionaryPanel user={user} onUnauthorized={onUnauthorized} onEditFormula={editFormula} /> },
|
||||
...(user.roles.some(role => ['SYSTEM_ADMIN', 'RULE_MAINTAINER'].includes(role)) ? [{ key: 'targets', label: '质量目标', children: <QualityTargetsPanel onUnauthorized={onUnauthorized} /> }] : []),
|
||||
{ key: 'targets', label: '质量目标', children: <QualityTargetsPanel onUnauthorized={onUnauthorized} /> },
|
||||
{ key: 'settings', label: '计算设置', children: <ConfigManagementPage kind="rules" user={user} onUnauthorized={onUnauthorized} onNavigate={onNavigate} focusMetric={focusMetric} /> },
|
||||
]} />;
|
||||
}
|
||||
@@ -249,7 +239,7 @@ function ManagementPageContents({ page, user, onUnauthorized, onNavigate }: Mana
|
||||
if (page === 'access') return <AccessPage user={user} onUnauthorized={onUnauthorized} />;
|
||||
if (page === 'basis') return <BasisPage onUnauthorized={onUnauthorized} />;
|
||||
if (page === 'rules') return <RulesWorkspace user={user} onUnauthorized={onUnauthorized} onNavigate={onNavigate} />;
|
||||
if (page === 'masterData') return <ManagementSections items={[{ key: 'catalog', label: '基础名录', children: <ConfigManagementPage kind={page} user={user} onUnauthorized={onUnauthorized} onNavigate={onNavigate} /> },{ key: 'filters', label: '查询字段', children: <FilterFieldSettings canManage={user.roles.some(role => ['SYSTEM_ADMIN','DATA_MAINTAINER'].includes(role))} onUnauthorized={onUnauthorized} /> }]} />;
|
||||
if (page === 'masterData') return <ManagementSections items={[{ key: 'catalog', label: '基础名录', children: <ConfigManagementPage kind={page} user={user} onUnauthorized={onUnauthorized} onNavigate={onNavigate} /> },{ key: 'filters', label: '查询字段', children: <FilterFieldSettings canManage={user.roles.some(role => ['SYSTEM_ADMIN', 'DATA_ADMIN'].includes(role))} onUnauthorized={onUnauthorized} /> }]} />;
|
||||
if (page === 'mappings') return <MappingMaintenancePage user={user} onUnauthorized={onUnauthorized} onNavigate={onNavigate} />;
|
||||
const resource: Record<string, { endpoint: 'imports' | 'tasks'; title: string; subtitle: string }> = {
|
||||
imports: { endpoint: 'imports', title: '导入与校验记录', subtitle: '接收后的来源文件及其校验任务状态。' },
|
||||
@@ -454,8 +444,8 @@ function ConfigManagementPage({ kind, user, onUnauthorized, onNavigate, extraSec
|
||||
const title = isRules ? '计算规则' : kind === 'masterData' ? '基础数据' : '对应关系';
|
||||
const testMode = workflowStatus?.simplified === true && workflowStatus.mode === 'TEST';
|
||||
const canManage = user.roles.some(role => isRules
|
||||
? ['SYSTEM_ADMIN', 'RULE_MAINTAINER'].includes(role)
|
||||
: ['SYSTEM_ADMIN', 'DATA_MAINTAINER', 'RULE_MAINTAINER'].includes(role));
|
||||
? ['SYSTEM_ADMIN'].includes(role)
|
||||
: ['SYSTEM_ADMIN', 'DATA_ADMIN'].includes(role));
|
||||
const canApplyWorkflow = (isRules ? workflowStatus?.capabilities?.canApplyRule : workflowStatus?.capabilities?.canApplyMapping) ?? workflowStatus?.capabilities?.canApply ?? canManage;
|
||||
const workflowMappingBase = workflowStatus?.activeMapping
|
||||
? { ...items.find(item => String(item.id || '') === String(workflowStatus.activeMapping?.id || '')), ...workflowStatus.activeMapping }
|
||||
@@ -651,7 +641,7 @@ function ConfigManagementPage({ kind, user, onUnauthorized, onNavigate, extraSec
|
||||
</div>}
|
||||
{error && <Alert showIcon type="error" message="配置清单读取失败" description={itemsLoaded ? `${error};下方仍显示上次成功结果。` : error} action={!itemsLoaded ? <Button size="small" onClick={() => void load()}>重试</Button> : undefined} />}
|
||||
{isRules && ruleSchemaError && <Alert showIcon type="error" message="规则编辑结构读取失败" description={ruleSchemaError} />}
|
||||
{!canApplyWorkflow && <Alert showIcon type="info" message="当前账号可查看配置;保存和更新报表需要发布权限。" />}
|
||||
{!canApplyWorkflow && <Alert showIcon type="info" message={isRules ? '计算规则由系统管理员维护,当前账号可查看。' : '当前账号可查看配置;维护数据需要数据管理员权限。'} />}
|
||||
{workflowOperation.error && <Alert showIcon type="error" message="保存或报表更新失败" description={workflowOperation.error} action={workflowOperation.operation?.operationId ? <Button size="small" onClick={workflowOperation.resume}>重试读取进度</Button> : undefined} />}
|
||||
{workflowOperation.operation && <section className="nc-operation-status panel"><div><strong>{simpleStageLabel[String(workflowOperation.operation.stage || workflowOperation.operation.status)] || '正在处理'}</strong></div>{workflowOperation.busy ? <Spin size="small" /> : <Progress percent={String(workflowOperation.operation.status).toUpperCase() === 'COMPLETED' ? 100 : 0} status={String(workflowOperation.operation.status).toUpperCase() === 'FAILED' ? 'exception' : 'success'} />}</section>}
|
||||
</>;
|
||||
@@ -761,7 +751,7 @@ function ConfigManagementPage({ kind, user, onUnauthorized, onNavigate, extraSec
|
||||
}
|
||||
|
||||
function MappingMaintenancePage({ user, onUnauthorized, onNavigate }: Omit<ManagementPageProps, 'page'>) {
|
||||
const canEdit=user.roles.some(role=>['SYSTEM_ADMIN','DATA_MAINTAINER','RULE_MAINTAINER'].includes(role));
|
||||
const canEdit=user.roles.some(role=>['SYSTEM_ADMIN', 'DATA_ADMIN'].includes(role));
|
||||
return <ConfigManagementPage kind="mappings" user={user} onUnauthorized={onUnauthorized} onNavigate={onNavigate} extraSections={[
|
||||
{key:'groups',label:'业务分组未分类',children:<ClassificationRuleEditor onUnauthorized={onUnauthorized}>{edit=><UnclassifiedSourcesPanel onUnauthorized={onUnauthorized} onEdit={canEdit?edit:undefined}/>}</ClassificationRuleEditor>},
|
||||
{key:'projects',label:'项目组未分类',children:<ClassificationRuleEditor onUnauthorized={onUnauthorized}>{edit=><MappingIssueResolutionPanel onUnauthorized={onUnauthorized} onEdit={canEdit?edit:undefined}/>}</ClassificationRuleEditor>},
|
||||
@@ -843,7 +833,7 @@ function MetricDictionaryPanel({ user, onUnauthorized, onEditFormula }: { user:
|
||||
const [editing, setEditing] = useState<Record<string, unknown> | null>(null);
|
||||
const [inspecting, setInspecting] = useState<Record<string, unknown> | null>(null);
|
||||
const [form] = Form.useForm<{ name: string; aliases: string; description: string; reason: string }>();
|
||||
const canManage = user.roles.some(role => ['SYSTEM_ADMIN', 'RULE_MAINTAINER'].includes(role));
|
||||
const canManage = user.roles.some(role => ['SYSTEM_ADMIN'].includes(role));
|
||||
|
||||
const load = useCallback(() => read.run(async () => {
|
||||
try { const result = await api.metricDictionary(); setItems(collectionItems(result)); setLoaded(true); setDictionaryError(''); }
|
||||
@@ -914,8 +904,8 @@ function TaskTable({ items, importOnly, user, onUnauthorized, onRefresh }: { ite
|
||||
const [issuesRunId, setIssuesRunId] = useState('');
|
||||
const [busyId, setBusyId] = useState('');
|
||||
const actionLock = useRef(false);
|
||||
const canRetry = user.roles.some(role => ['SYSTEM_ADMIN', 'DATA_MAINTAINER'].includes(role));
|
||||
const canCancel = user.roles.some(role => ['SYSTEM_ADMIN', 'DATA_MAINTAINER', 'SYSTEM_OPERATOR'].includes(role));
|
||||
const canRetry = user.roles.some(role => ['SYSTEM_ADMIN', 'DATA_ADMIN'].includes(role));
|
||||
const canCancel = user.roles.some(role => ['SYSTEM_ADMIN', 'DATA_ADMIN'].includes(role));
|
||||
const runIdOf = (row: Record<string, unknown>) => {
|
||||
const payload = row.payload && typeof row.payload === 'object' ? row.payload as Record<string, unknown> : {};
|
||||
return String(row.importRunId || payload.importRunId || '');
|
||||
@@ -1745,7 +1735,7 @@ function AnalysisPage({ onUnauthorized, user }: { onUnauthorized: (error: unknow
|
||||
{ key: 'delete', icon: <DeleteOutlined />, label: '删除', danger: true, disabled: analysisIsRunning(item.activeTurnStatus) },
|
||||
], onClick: ({ key }) => {
|
||||
if (key === 'rename') { setRenameTarget(item); setRenameTitle(String(item.title || '')); }
|
||||
else if (key === 'delete') modal.confirm({ title: '删除此会话及其分析记录?', content: '删除后无法恢复', okText: '删除', cancelText: '取消', okButtonProps: { danger: true }, onOk: () => deleteSession(String(item.id)) });
|
||||
else if (key === 'delete') modal.confirm({ className:'management-modal deletion-confirmation', title: `删除会话“${String(item.title || '未命名会话')}”?`, content: '此会话及其分析记录将被删除,删除后无法恢复。', okText: '确认删除', cancelText: '取消', autoFocusButton:'cancel', maskClosable:false, okButtonProps: { danger: true }, onOk: () => deleteSession(String(item.id)) });
|
||||
} }}><Button className="analysis-session-menu" type="text" icon={<MoreOutlined />} aria-label={`会话操作 ${toText(item.title || '未命名会话')}`} /></Dropdown></div>)}</div> : <Empty image={Empty.PRESENTED_IMAGE_SIMPLE} description="暂无历史会话" /> : null}
|
||||
</aside>
|
||||
<section className="panel analysis-chat-panel">
|
||||
@@ -1881,8 +1871,8 @@ function isObjectRecord(value: unknown): value is Record<string, unknown> {
|
||||
|
||||
function AccessPage({ user, onUnauthorized }: { user: AuthUser; onUnauthorized: (error: unknown) => boolean }) {
|
||||
const canManageUsers = user.roles.includes('SYSTEM_ADMIN');
|
||||
const canReadAudit = user.roles.some(role => ['SYSTEM_ADMIN', 'AUDIT_VIEWER'].includes(role));
|
||||
const canViewServiceIdentities = user.roles.some(role => ['SYSTEM_ADMIN', 'SYSTEM_OPERATOR', 'AUDIT_VIEWER'].includes(role));
|
||||
const canReadAudit = user.roles.some(role => ['SYSTEM_ADMIN'].includes(role));
|
||||
const canViewServiceIdentities = user.roles.some(role => ['SYSTEM_ADMIN'].includes(role));
|
||||
const defaultTab = canManageUsers ? 'users' : canReadAudit ? 'audit' : canViewServiceIdentities ? 'services' : '';
|
||||
const [activeTab] = useState(defaultTab);
|
||||
const tabs = [
|
||||
@@ -1894,7 +1884,7 @@ function AccessPage({ user, onUnauthorized }: { user: AuthUser; onUnauthorized:
|
||||
return <div className="management-page">
|
||||
<PageHeader title="权限与审计" />
|
||||
|
||||
{tabs.length > 0 ? <ManagementSections initialKey={activeTab} items={[...tabs, { key: 'summary', label: '当前授权', children: <section className="panel access-summary"><div><span>当前账号</span><strong>{user.displayName || user.username}</strong>{user.displayName && user.displayName !== user.username && <small>{user.username}</small>}</div><div><span>角色</span><strong>{user.roles.length} 项</strong><small className="role-list role-summary-list">{user.roles.length ? user.roles.map((role, index) => <span key={`${role}-${index}`}>{shownRole(role)}</span>) : '服务端未返回角色'}</small></div><div><span>授权产业部</span><strong>{user.departments.length ? user.departments.map(name => name === '质量管理部' ? '质量中心' : name).join('、') : '未返回范围'}</strong></div><div><span>授权分组</span><strong>{user.groups.length ? user.groups.join('、') : user.roles.includes('SYSTEM_ADMIN') ? '未限制' : '未返回范围'}</strong></div></section> }]} /> : <Alert showIcon type="info" message="当前账号没有用户管理或审计记录读取权限" />}
|
||||
{tabs.length > 0 ? <ManagementSections initialKey={activeTab} items={[...tabs, { key: 'summary', label: '当前授权', children: <section className="panel access-summary"><div><span>当前账号</span><strong>{user.displayName || user.username}</strong>{user.displayName && user.displayName !== user.username && <small>{user.username}</small>}</div><div><span>角色</span><strong>{shownRole(user.roles[0])}</strong></div><div><span>授权产业部</span><strong>{user.departments.length ? user.departments.map(name => name === '质量管理部' ? '质量中心' : name).join('、') : '未返回范围'}</strong></div><div><span>授权分组</span><strong>{user.groups.length ? user.groups.join('、') : user.roles.includes('SYSTEM_ADMIN') ? '未限制' : '未返回范围'}</strong></div></section> }]} /> : <Alert showIcon type="info" message="当前账号没有用户管理或审计记录读取权限" />}
|
||||
</div>;
|
||||
}
|
||||
|
||||
@@ -1921,8 +1911,6 @@ function ResourceTab({ onUnauthorized }: { onUnauthorized: (error: unknown) => b
|
||||
</div>;
|
||||
}
|
||||
|
||||
const ROLE_OPTIONS = ['SYSTEM_ADMIN', 'QUALITY_VIEWER', 'BUSINESS_ANALYST', 'DATA_MAINTAINER', 'RULE_MAINTAINER', 'DATA_PUBLISHER', 'SYSTEM_OPERATOR', 'AUDIT_VIEWER'];
|
||||
|
||||
function UsersResourceTab({ user, onUnauthorized }: { user: AuthUser; onUnauthorized: (error: unknown) => boolean }) {
|
||||
const { message } = App.useApp();
|
||||
const { active } = usePageCache();
|
||||
@@ -1936,7 +1924,9 @@ function UsersResourceTab({ user, onUnauthorized }: { user: AuthUser; onUnauthor
|
||||
const [error, setError] = useState('');
|
||||
const saveLock = useRef(false);
|
||||
const [editing, setEditing] = useState<Record<string, unknown> | null>(null);
|
||||
const [form] = Form.useForm<{ username: string; displayName: string; password: string; active: boolean; forcePasswordChange: boolean; roles: string[]; departments: string[]; groups: string[] }>();
|
||||
const [form] = Form.useForm<{ username: string; displayName: string; password: string; active: boolean; forcePasswordChange: boolean; role: string; departments: string[]; groups: string[] }>();
|
||||
const selectedRole = Form.useWatch('role', form);
|
||||
const [deleting, setDeleting] = useState<Record<string, unknown> | null>(null);
|
||||
const canManage = user.roles.includes('SYSTEM_ADMIN');
|
||||
|
||||
const load = useCallback(() => read.run(async () => {
|
||||
@@ -1960,7 +1950,7 @@ function UsersResourceTab({ user, onUnauthorized }: { user: AuthUser; onUnauthor
|
||||
form.setFieldsValue({
|
||||
username: String(record?.username || ''), displayName: String(record?.displayName || ''), password: '',
|
||||
active: record?.active !== false, forcePasswordChange: record?.forcePasswordChange === true,
|
||||
roles: Array.isArray(record?.roles) ? record.roles.map(String) : [],
|
||||
role: Array.isArray(record?.roles) ? String(record.roles[0] || 'USER') : 'USER',
|
||||
departments: Array.isArray(record?.departments) ? record.departments.map(String) : [],
|
||||
groups: Array.isArray(record?.groups) ? record.groups.map(String) : [],
|
||||
});
|
||||
@@ -1973,9 +1963,9 @@ function UsersResourceTab({ user, onUnauthorized }: { user: AuthUser; onUnauthor
|
||||
setBusy(true);
|
||||
const id = String(editing?.id || '');
|
||||
if (id) {
|
||||
await api.updateUser(id, { displayName: values.displayName.trim(), active: values.active, forcePasswordChange: values.forcePasswordChange, roles: values.roles, departments: values.departments, groups: values.groups, expectedRowVersion: Number(editing?.rowVersion || 0) });
|
||||
await api.updateUser(id, { displayName: values.displayName.trim(), active: values.active, forcePasswordChange: values.forcePasswordChange, roles: [values.role], departments: values.departments, groups: values.groups, expectedRowVersion: Number(editing?.rowVersion || 0) });
|
||||
} else {
|
||||
await api.createUser({ username: values.username.trim(), displayName: values.displayName.trim(), password: values.password, roles: values.roles, departments: values.departments, groups: values.groups });
|
||||
await api.createUser({ username: values.username.trim(), displayName: values.displayName.trim(), password: values.password, roles: [values.role], departments: values.departments, groups: values.groups });
|
||||
}
|
||||
message.success(id ? '用户权限已更新' : '用户已创建');
|
||||
setEditing(null); form.resetFields(); await load();
|
||||
@@ -1986,6 +1976,18 @@ function UsersResourceTab({ user, onUnauthorized }: { user: AuthUser; onUnauthor
|
||||
} finally { saveLock.current = false; setBusy(false); }
|
||||
};
|
||||
|
||||
const removeUser = async () => {
|
||||
if (!deleting || saveLock.current) return;
|
||||
saveLock.current = true; setBusy(true);
|
||||
try {
|
||||
await api.deleteUser(String(deleting.id), Number(deleting.rowVersion));
|
||||
setDeleting(null); message.success('账号已删除,历史记录已保留'); await load();
|
||||
} catch (value) {
|
||||
if (!onUnauthorized(value)) message.error(apiMessage(value));
|
||||
if (value instanceof ApiError && [404, 409].includes(value.status)) { setDeleting(null); await load(); }
|
||||
} finally { saveLock.current = false; setBusy(false); }
|
||||
};
|
||||
|
||||
const columns: ColumnsType<Record<string, unknown>> = [
|
||||
{ title: '账号', dataIndex: 'username', key: 'username', fixed: 'left', width: 170 },
|
||||
{ title: '显示名称', dataIndex: 'displayName', key: 'displayName', width: 180 },
|
||||
@@ -1993,18 +1995,21 @@ function UsersResourceTab({ user, onUnauthorized }: { user: AuthUser; onUnauthor
|
||||
{ title: '角色', dataIndex: 'roles', key: 'roles', width: 250, render: value => Array.isArray(value) ? value.length ? <span className="role-list">{value.map((role, index) => <span key={`${String(role)}-${index}`}>{shownRole(role)}</span>)}</span> : '—' : '—' },
|
||||
{ title: '授权产业部', dataIndex: 'departments', key: 'departments', width: 230, render: value => Array.isArray(value) ? value.map(item => shownDepartment(String(item))).join('、') || '未限制' : '—' },
|
||||
{ title: '授权分组', dataIndex: 'groups', key: 'groups', width: 180, render: value => Array.isArray(value) ? value.join('、') || '未限制' : '—' },
|
||||
{ title: '操作', key: 'actions', fixed: 'right', width: 110, align: 'center', render: (_, row) => canManage ? <Button type="link" onClick={() => openEditor(row)}>编辑授权</Button> : <span className="muted-dash">权限不足</span> },
|
||||
{ title: '操作', key: 'actions', fixed: 'right', width: 180, align: 'center', render: (_, row) => canManage ? <><Button type="link" disabled={busy} onClick={() => openEditor(row)}>编辑授权</Button><Button type="link" danger disabled={busy || row.id === user.id} title={row.id === user.id ? '不能删除当前登录账号' : undefined} onClick={() => setDeleting(row)}>删除</Button></> : <span className="muted-dash">权限不足</span> },
|
||||
];
|
||||
return <div className="resource-tab">
|
||||
{error && <Alert type="error" showIcon message="用户清单读取失败" description={usersLoaded || optionsLoaded ? `${error};已成功读取的内容仍保留。` : error} action={<Button size="small" onClick={() => void load()}>重试</Button>} />}
|
||||
<div className="resource-toolbar"><strong>用户清单</strong><span>{users.length} 个账号</span>{canManage && <Button type="primary" onClick={() => openEditor()}>新建用户</Button>}<Button icon={<ReloadOutlined />} onClick={() => void load()}>刷新</Button></div>
|
||||
{loading && !usersLoaded ? <div className="loading-panel"><Spin />正在读取用户与授权范围…</div> : usersLoaded ? users.length ? <div className="resource-table"><Table size="small" bordered columns={columns} dataSource={users} rowKey={row => String(row.id)} pagination={{ pageSize: TABLE_PAGE_SIZE, showSizeChanger: false }} scroll={{ x: 1210 }} /></div> : <Empty image={Empty.PRESENTED_IMAGE_SIMPLE} description="服务端当前没有用户" /> : null}
|
||||
{loading && !usersLoaded ? <div className="loading-panel"><Spin />正在读取用户与授权范围…</div> : usersLoaded ? users.length ? <div className="resource-table"><Table size="small" bordered columns={columns} dataSource={users} rowKey={row => String(row.id)} pagination={{ pageSize: TABLE_PAGE_SIZE, showSizeChanger: false }} scroll={{ x: 1280 }} /></div> : <Empty image={Empty.PRESENTED_IMAGE_SIMPLE} description="服务端当前没有用户" /> : null}
|
||||
<Modal className="management-modal" open={Boolean(deleting)} title={`删除账号 ${String(deleting?.username || '')}`} okText="删除账号" cancelText="取消" okButtonProps={{ danger: true }} confirmLoading={busy} cancelButtonProps={{ disabled: busy }} closable={!busy} maskClosable={!busy} onCancel={() => { if (!busy) setDeleting(null); }} onOk={() => void removeUser()}>
|
||||
<p>删除后,该账号将无法登录,并从用户清单移除。已有业务数据和操作记录会保留。</p>
|
||||
</Modal>
|
||||
<Modal className="management-modal" open={Boolean(editing)} title={editing?.id ? '编辑用户授权' : '新建用户'} width={700} confirmLoading={busy} onCancel={() => setEditing(null)} onOk={() => void save()}>
|
||||
<Alert className="user-management-note" showIcon type="info" message="需至少保留一个启用的系统管理员;未配置产业部的非管理员账号可能没有业务数据访问范围。" />
|
||||
<Form form={form} layout="vertical">
|
||||
{!editing?.id && <><Form.Item name="username" label="登录账号" rules={[{ required: true, whitespace: true, message: '请填写登录账号' }]}><Input autoComplete="off" /></Form.Item><Form.Item name="password" label="初始密码" rules={[{ required: true, min: 6, message: '初始密码至少6位' }]}><Input.Password autoComplete="new-password" /></Form.Item></>}
|
||||
<Form.Item name="displayName" label="显示名称" rules={[{ required: true, whitespace: true, message: '请填写显示名称' }]}><Input /></Form.Item>
|
||||
<Form.Item name="roles" label="角色" rules={[{ required: true, message: '至少选择一个角色' }]}><Select mode="multiple" options={ROLE_OPTIONS.map(value => ({ label: shownRole(value), value }))} /></Form.Item>
|
||||
<Form.Item name="role" label="角色" extra={ROLE_DESCRIPTIONS[selectedRole]} rules={[{ required: true, message: '请选择一个角色' }]}><Select options={USER_ROLE_OPTIONS} /></Form.Item>
|
||||
<Form.Item name="departments" label="授权产业部"><Select {...readableSelectPopup} mode="multiple" options={departments.map(value => ({ label: shownDepartment(value), value }))} placeholder="选择数据范围;空范围可能无法读取业务数据" /></Form.Item>
|
||||
<Form.Item name="groups" label="授权业务分组"><Select {...readableSelectPopup} mode="multiple" options={groups.map(value => ({ label: value, value }))} placeholder="选择可访问的业务分组" /></Form.Item>
|
||||
{Boolean(editing?.id) && <div className="user-access-toggles"><Form.Item name="active" label="账号状态" valuePropName="checked"><Switch checkedChildren="启用" unCheckedChildren="停用" /></Form.Item><Form.Item name="forcePasswordChange" label="下次登录修改密码" valuePropName="checked"><Switch /></Form.Item></div>}
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
import { useDeleteConfirmation } from './useDeleteConfirmation';
|
||||
import { configurationDateTime } from './configurationName';
|
||||
import { useCallback, useEffect, useRef, useState } from 'react';
|
||||
import { Alert, App, Button, Checkbox, Empty, Form, Input, InputNumber, Modal, Progress, Select, Spin, Steps, Tag } from 'antd';
|
||||
@@ -52,6 +53,7 @@ export type PendingSourceDeletion = { ids: string[]; releaseId: string | null };
|
||||
type SourceDraft = { id: string; file: File; workbook: WorkbookPreview; stage: DataStage; year: number; month: number; sheetName: string; headerRow: number; fieldMap: Record<string, string>; mode: 'ADD' | 'REPLACE'; targetId: string; scopeCode: string };
|
||||
|
||||
function SimplifiedDataWorkflow({ options, workflowStatus, pendingDeletion, onDeleted, onBusyChange, onUnauthorized, onRefresh }: { options: SourceUploadOptions; workflowStatus: DataWorkflowStatus; pendingDeletion: PendingSourceDeletion; onDeleted: (ids: string[]) => void; onBusyChange: (busy: boolean) => void; onUnauthorized: (error: unknown) => boolean; onRefresh: () => void }) {
|
||||
const confirmDelete = useDeleteConfirmation();
|
||||
const { message } = App.useApp();
|
||||
const input = useRef<HTMLInputElement>(null);
|
||||
const configured = useRef(new Map<string, { signature: string; sourceId: string }>());
|
||||
@@ -84,7 +86,7 @@ function SimplifiedDataWorkflow({ options, workflowStatus, pendingDeletion, onDe
|
||||
const duplicateSlots = new Set(slots).size !== slots.length;
|
||||
const canImport = hasImportCapability && drafts.length > 0 && drafts.every(draftReady) && !duplicateSlots && !pendingDeletion.ids.length;
|
||||
const reportError = (value: unknown) => { if (!onUnauthorized(value)) setError(failure(value)); };
|
||||
const removeDraft = (id: string) => { setDrafts(previous => previous.filter(item => item.id !== id)); configured.current.delete(id); };
|
||||
const removeDraft = (id: string) => confirmDelete({title:`移除文件“${drafts.find(item=>item.id===id)?.workbook.sourceFile || "选中的文件"}”?`,description:"仅从本次导入列表移除,此文件的字段对应设置也将移除。电脑上的原文件及已接收来源保留。",confirmText:"确认移除",onConfirm:()=>{setDrafts(previous => previous.filter(item => item.id !== id));configured.current.delete(id);}});
|
||||
const readFiles = async (files: File[]) => {
|
||||
if (!files.length || importBusy || actionLock.current) return;
|
||||
actionLock.current = true;
|
||||
@@ -136,13 +138,18 @@ function SimplifiedDataWorkflow({ options, workflowStatus, pendingDeletion, onDe
|
||||
await uploadOperation.start(() => api.importDataWorkflow({ sourceIds }));
|
||||
} catch (value) { reportError(value); } finally { actionLock.current = false; setBusy(false); }
|
||||
};
|
||||
const recalculate = async () => {
|
||||
const performRecalculation = async () => {
|
||||
if (actionLock.current) return; actionLock.current = true;
|
||||
setError('');
|
||||
try { await recalcOperation.start(() => pendingDeletion.ids.length ? api.deleteDataWorkflowSources({ sourceIds: pendingDeletion.ids, expectedCurrentReleaseId: pendingDeletion.releaseId }) : api.recalculateDataWorkflow()); }
|
||||
catch (value) { reportError(value); }
|
||||
finally { actionLock.current = false; }
|
||||
};
|
||||
const recalculate = () => {
|
||||
if (actionLock.current) return;
|
||||
if (!pendingDeletion.ids.length) return performRecalculation();
|
||||
confirmDelete({title:`删除 ${pendingDeletion.ids.length} 个来源并更新报表?`,description:<><p>将从当前查询结果移除以下来源并更新报表,原文件和处理记录保留。</p><ul>{pendingDeletion.ids.slice(0,10).map((id,index)=><li key={id}>{options.targets.find(item=>item.documentId===id)?.sourceFile || `第 ${index+1} 个待删除来源`}</li>)}</ul>{pendingDeletion.ids.length>10&&<p>另有 {pendingDeletion.ids.length-10} 个待删除来源。</p>}</>,confirmText:'确认删除并更新',onConfirm:performRecalculation});
|
||||
};
|
||||
return <div className="nc-simplified-intake">
|
||||
<section className="panel nc-simple-upload-panel">
|
||||
<div className="nc-simple-upload-heading"><div><span className="nc-eyebrow">测试数据维护</span><h2>导入来源并更新报表</h2><p>支持一次选择多个 Excel 文件,分别核对年月与阶段后统一导入。</p></div><div className="nc-simple-upload-actions">{workflowStatus.capabilities?.canRecalculate !== false && <Button icon={<ReloadOutlined />} disabled={importBusy} loading={recalcOperation.busy} onClick={() => void recalculate()}>{pendingDeletion.ids.length ? `更新报表(${pendingDeletion.ids.length}项删除)` : '更新报表'}</Button>}</div></div>
|
||||
@@ -207,8 +214,8 @@ export function DataWorkflowHub({ user, sources, currentReleaseId, pendingDeleti
|
||||
const optionsAttempted = useRef(false);
|
||||
const candidatesAttempted = useRef(false);
|
||||
const [resumeId, setResumeId] = useState('');
|
||||
const canMaintain = rolesAllow(user, ['SYSTEM_ADMIN', 'DATA_MAINTAINER']);
|
||||
const canPublish = rolesAllow(user, ['SYSTEM_ADMIN', 'DATA_PUBLISHER']);
|
||||
const canMaintain = rolesAllow(user, ['SYSTEM_ADMIN', 'DATA_ADMIN']);
|
||||
const canPublish = rolesAllow(user, ['SYSTEM_ADMIN', 'DATA_ADMIN']);
|
||||
const loadOptions = useCallback(() => optionsRead.run(async () => {
|
||||
try { setOptions(await api.sourceUploadOptions()); setOptionError(''); }
|
||||
catch (error) { if (!onUnauthorized(error)) setOptionError(failure(error)); }
|
||||
@@ -249,6 +256,7 @@ export function DataWorkflowHub({ user, sources, currentReleaseId, pendingDeleti
|
||||
}
|
||||
|
||||
export function SourceFilesPanel({ user, sources, sourcesLoaded, loading, pendingIds, maintenanceBusy, onToggleDelete, onClearDeletes, onUnauthorized, onRefresh }: { user: AuthUser; sources: SourceItem[]; sourcesLoaded: boolean; loading: boolean; pendingIds: string[]; maintenanceBusy: boolean; onToggleDelete: (id: string) => void; onClearDeletes: () => void; onUnauthorized: (error: unknown) => boolean; onRefresh: () => void }) {
|
||||
const confirmDelete = useDeleteConfirmation();
|
||||
const { message } = App.useApp();
|
||||
const { active } = usePageCache();
|
||||
const [showDeleted, setShowDeleted] = useState(false);
|
||||
@@ -262,7 +270,7 @@ export function SourceFilesPanel({ user, sources, sourcesLoaded, loading, pendin
|
||||
const [deletedError, setDeletedError] = useState('');
|
||||
const [workflowStatusLoaded, setWorkflowStatusLoaded] = useState(false);
|
||||
const [selected, setSelected] = useState<{ id: string; restore: boolean } | null>(() => { const id = new URLSearchParams(window.location.search).get('sourceDeleteId'); return id ? { id, restore: false } : null; });
|
||||
const canOperate = rolesAllow(user, ['SYSTEM_ADMIN', 'DATA_MAINTAINER', 'DATA_PUBLISHER']);
|
||||
const canOperate = rolesAllow(user, ['SYSTEM_ADMIN', 'DATA_ADMIN']);
|
||||
const loadDeleted = useCallback(() => deletedRead.run(async () => {
|
||||
try { const result = await api.deletedSources(); setDeleted(result.items); setDeletedLoaded(true); setDeletedError(''); }
|
||||
catch (value) { if (!onUnauthorized(value)) setDeletedError(failure(value)); }
|
||||
@@ -311,7 +319,7 @@ export function SourceFilesPanel({ user, sources, sourcesLoaded, loading, pendin
|
||||
const onCurrentRelease = currentSourceIds?.includes(row.id) ?? false;
|
||||
const permitted = !simplified || (showDeleted ? workflowStatus?.capabilities?.canRestoreSource !== false : currentSourceIds !== null && workflowStatus?.capabilities?.canDeleteSource !== false && (!onCurrentRelease || workflowStatus?.capabilities?.canDeleteCurrentSource !== false));
|
||||
if (!workflowStatusLoaded || !canOperate || !permitted) return null;
|
||||
return <Button type="link" danger={!showDeleted} icon={showDeleted ? <UndoOutlined /> : <DeleteOutlined />} disabled={sourceOperation.busy || maintenanceBusy || loading} onClick={() => simplified ? showDeleted ? void runSourceOperation(row.id, true) : onToggleDelete(row.id) : setSelected({ id: row.id, restore: showDeleted })}>{simplified ? showDeleted ? '恢复并更新报表' : pendingIds.includes(row.id) ? '撤销删除' : '删除' : showDeleted ? '恢复' : '删除'}</Button>;
|
||||
return <Button type="link" danger={!showDeleted} icon={showDeleted ? <UndoOutlined /> : <DeleteOutlined />} disabled={sourceOperation.busy || maintenanceBusy || loading} onClick={() => {if(!simplified){setSelected({id:row.id,restore:showDeleted});return;}if(showDeleted){void runSourceOperation(row.id,true);return;}if(pendingIds.includes(row.id)){onToggleDelete(row.id);return;}confirmDelete({title:`删除来源“${row.sourceFile}”?`,description:"将标记为待删除,当前报表暂不改变。点击“更新报表”后才生效,原文件和处理记录保留。",confirmText:"标记删除",onConfirm:()=>onToggleDelete(row.id)});}}>{simplified ? showDeleted ? '恢复并更新报表' : pendingIds.includes(row.id) ? '撤销删除' : '删除' : showDeleted ? '恢复' : '删除'}</Button>;
|
||||
} },
|
||||
]} locale={{ emptyText: showDeleted ? '没有已删除的来源。' : '尚无来源文件,点击“上传新数据”开始。' }} /> : null}
|
||||
</section>
|
||||
@@ -334,7 +342,7 @@ function SourceDeletionDialog({ user, sourceId, restoring, sources, onUnauthoriz
|
||||
const request = preview?.changeRequest; const requestStatus = String(request?.status || '');
|
||||
const isRequested = preview?.nextAction === 'REVIEW_WITHDRAWAL'; const isApproved = preview?.nextAction === 'BUILD_WITHDRAWAL_CANDIDATE'; const isBuilt = preview?.nextAction === 'RECONCILE_CANDIDATE';
|
||||
const withdrawing = preview?.mode === 'WITHDRAW_CURRENT' || isRequested || isApproved || isBuilt;
|
||||
const canPublish = rolesAllow(user, ['SYSTEM_ADMIN', 'DATA_PUBLISHER']);
|
||||
const canPublish = rolesAllow(user, ['SYSTEM_ADMIN', 'DATA_ADMIN']);
|
||||
const canReview = preview?.canReview ?? canPublish; const canBuild = preview?.canBuild ?? canPublish;
|
||||
const awaitingTask = preview?.nextAction === 'WAIT_FOR_TASK';
|
||||
const canStart = Boolean(preview?.canDelete && !awaitingTask && !preview.hidden && !isRequested && !isApproved && !isBuilt);
|
||||
@@ -422,7 +430,7 @@ function DataUploadWizard({ user, mode, purpose, handoffSourceId, initialReason,
|
||||
const [differenceReason, setDifferenceReason] = useState(''); const [confirmDifferences, setConfirmDifferences] = useState(false); const [publishConfirmed, setPublishConfirmed] = useState(false); const [published, setPublished] = useState(false);
|
||||
const target = options.targets.find(item => item.documentId === targetId); const fields = options.fields[stage] || [];
|
||||
const headers = workbook?.preview.headers || []; const missingFields = fields.filter(field => field.required && !fieldMap[field.name]); const duplicateColumns = Object.values(fieldMap).length !== new Set(Object.values(fieldMap)).size;
|
||||
const canPublish = rolesAllow(user, ['SYSTEM_ADMIN', 'DATA_PUBLISHER']);
|
||||
const canPublish = rolesAllow(user, ['SYSTEM_ADMIN', 'DATA_ADMIN']);
|
||||
const reportError = useCallback((value: unknown) => { if (!onUnauthorized(value)) setError(failure(value)); }, [onUnauthorized]);
|
||||
const loadCandidate = async (id: string, isCurrent: () => boolean = () => activeRef.current) => {
|
||||
if (!activeRef.current || !isCurrent()) return false;
|
||||
|
||||
@@ -2,14 +2,10 @@ import { useEffect, useRef, useState } from 'react';
|
||||
import { Alert, App, Button, Descriptions, Form, Input, Modal, Tabs } from 'antd';
|
||||
import { api } from './api';
|
||||
import type { AuthUser } from './types';
|
||||
import { ROLE_LABELS as roles } from './userRoles';
|
||||
|
||||
export type AccountTab = 'profile' | 'password';
|
||||
type PasswordValues = { currentPassword: string; newPassword: string; confirmation: string };
|
||||
const roles: Record<string, string> = {
|
||||
DATA_MAINTAINER: '数据维护', DATA_PUBLISHER: '数据发布', QUALITY_VIEWER: '质量查看',
|
||||
RULE_MAINTAINER: '规则维护', SYSTEM_ADMIN: '系统管理', SYSTEM_OPERATOR: '运行维护',
|
||||
BUSINESS_ANALYST: '业务分析', AUDIT_VIEWER: '审计查看',
|
||||
};
|
||||
|
||||
export default function PersonalAccount({ user, tab, onClose, onUserChange, onUnauthorized, onLogout }: {
|
||||
user: AuthUser; tab: AccountTab | null; onClose: () => void;
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
import { useDeleteConfirmation } from './useDeleteConfirmation';
|
||||
import { useCallback, useEffect, useRef, useState } from 'react';
|
||||
import { Alert, App, Button, Checkbox, Empty, Form, Input, InputNumber, Modal, Popconfirm, Select, Spin } from 'antd';
|
||||
import { Alert, App, Button, Checkbox, Empty, Form, Input, InputNumber, Modal, Select, Spin } from 'antd';
|
||||
import { PlusOutlined, ReloadOutlined } from '@ant-design/icons';
|
||||
import { CompactManagementTables, QualityTable as Table } from './QualityTable';
|
||||
import { ApiError, api } from './api';
|
||||
@@ -15,6 +16,7 @@ const targetInput=(row:Row)=>Object.fromEntries(['metric','periodType','year','p
|
||||
type TargetForm={year:number;metric:string;scope:string;department?:string;group?:string;product?:string;projectGroup?:string;value:number|null;inherit:boolean};
|
||||
|
||||
export function QualityTargetsPanel({onUnauthorized}:{onUnauthorized:(error:unknown)=>boolean}){
|
||||
const confirmDelete = useDeleteConfirmation();
|
||||
const {message}=App.useApp();const [version,setVersion]=useState<Row|null>(null),[targets,setTargets]=useState<Row[]>([]),[references,setReferences]=useState<Row>({});
|
||||
const [loading,setLoading]=useState(true),[error,setError]=useState(''),[saving,setSaving]=useState(false),[editing,setEditing]=useState<Row|null>(null);
|
||||
const [year,setYear]=useState(new Date().getFullYear()),[metric,setMetric]=useState('COMPOSITE_RATE');
|
||||
@@ -81,7 +83,7 @@ export function QualityTargetsPanel({onUnauthorized}:{onUnauthorized:(error:unkn
|
||||
{loading&&!version?<div className="loading-panel"><Spin/>读取质量目标…</div>:version?<Table size="small" bordered rowKey="key" pagination={{pageSize:15,showSizeChanger:false}} scroll={{x:780}} dataSource={tableRows} columns={[
|
||||
{title:'年度',dataIndex:'year',width:90},{title:'适用范围',dataIndex:'scopeName',width:270},{title:'指标',dataIndex:'metric',width:225,render:v=>METRIC_NAMES[String(v)]||String(v)},
|
||||
{title:'目标值',dataIndex:'displayValue',width:120,render:percent},{title:'目标来源',width:150,render:(_,row)=>row.inherited?String(row.inheritSource||'沿用总体目标'):row.exists?'单独设置':'未设置'},
|
||||
{title:'操作',width:185,render:(_,row)=><span className="task-actions"><Button type="link" onClick={()=>open(row)}>{row.inherited?'设置覆盖':'编辑'}</Button>{Boolean(row.exists)&&Object.keys(dimensions(row.dimensions)).length>0&&<Popconfirm title="删除该范围的单独目标?" onConfirm={()=>persist(targets.filter(item=>String(item.periodType).toUpperCase()!=='YEAR'||identity(item)!==identity(row)))}><Button type="link" danger disabled={saving}>删除覆盖值</Button></Popconfirm>}</span>},
|
||||
{title:'操作',width:185,render:(_,row)=><span className="task-actions"><Button type="link" onClick={()=>open(row)}>{row.inherited?'设置覆盖':'编辑'}</Button>{Boolean(row.exists)&&Object.keys(dimensions(row.dimensions)).length>0&&<Button type="link" danger disabled={saving} onClick={()=>confirmDelete({title:`删除“${String(row.scopeName)}”的单独目标?`,description:`确认后立即生效,该范围将改为沿用上级或总体目标。${row.year}年其他范围的目标不变。`,onConfirm:()=>persist(targets.filter(item=>String(item.periodType).toUpperCase()!=='YEAR'||identity(item)!==identity(row)))})}>删除覆盖值</Button>}</span>},
|
||||
]}/>:!loading&&!error?<Empty description="当前没有启用的质量目标"/>:null}
|
||||
<Modal className="management-modal" open={Boolean(editing)} title={editing?.inherited?'设置范围目标':editing?.newRecord?'新增质量目标':'编辑质量目标'} okText="保存目标" confirmLoading={saving} onCancel={()=>setEditing(null)} onOk={()=>void save()} width={640}>
|
||||
<Form form={form} layout="vertical"><div className="structured-config-form-grid"><Form.Item name="year" label="年度" rules={[{required:true}]}><InputNumber min={2000} max={2100} precision={0} style={{width:'100%'}}/></Form.Item><Form.Item name="metric" label="指标" rules={[{required:true}]}><Select {...readableSelectPopup} options={Object.entries(METRIC_NAMES).map(([value,label])=>({value,label}))}/></Form.Item></div>
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
import { canAccessWorkspacePage } from './userRoles';
|
||||
import { useCallback, useEffect, useRef, useState } from 'react';
|
||||
import {
|
||||
Alert,
|
||||
@@ -187,6 +188,7 @@ export default function QualityWorkspace({ appearance, onAppearanceChange }: Qua
|
||||
if (sessionLoading) return <div className="screen-state"><Spin indicator={<LoadingOutlined spin />} /> <span>正在连接质量数据分析平台…</span></div>;
|
||||
if (sessionError) return <div className="screen-state"><div className="state-card"><strong>服务暂不可用</strong><p>{sessionError}</p><Button onClick={() => window.location.reload()}>重新连接</Button></div></div>;
|
||||
if (!user) return <LoginPage onSuccess={setUser} />;
|
||||
const visibleNavGroups = navGroups.map(group => ({ ...group, items: group.items.filter(([key]) => canAccessWorkspacePage(user, key)) })).filter(group => group.items.length);
|
||||
|
||||
return (
|
||||
<div className={`app-shell${sidebarCollapsed ? ' sidebar-collapsed' : ''}`}>
|
||||
@@ -196,7 +198,7 @@ export default function QualityWorkspace({ appearance, onAppearanceChange }: Qua
|
||||
<span className="brand-copy">质量数据分析平台</span>
|
||||
</button>
|
||||
<nav className="side-navigation" aria-label="主导航">
|
||||
{navGroups.map(group => (
|
||||
{visibleNavGroups.map(group => (
|
||||
<div className="nav-group" key={group.label}>
|
||||
<div className="nav-group-label">{group.label}</div>
|
||||
{group.items.map(([key, label, Icon]) => (
|
||||
@@ -255,7 +257,7 @@ export default function QualityWorkspace({ appearance, onAppearanceChange }: Qua
|
||||
<div className="mobile-brand">
|
||||
<span className="brand-mark" aria-hidden="true"><i /><i /><i /></span><strong>质量数据分析平台</strong>
|
||||
<Select<PageKey> {...readableSelectPopup} aria-label="页面导航" value={page} onChange={value => navigate(value)} options={[
|
||||
...navGroups.map(group => ({ label: group.label, options: group.items.map(([value, label]) => ({ value, label })) })),
|
||||
...visibleNavGroups.map(group => ({ label: group.label, options: group.items.map(([value, label]) => ({ value, label })) })),
|
||||
]} />
|
||||
<Button type="text" icon={<UserOutlined />} aria-label="打开个人账户" onClick={() => setAccountTab('profile')} />
|
||||
</div>
|
||||
|
||||
+34
-18
@@ -1,3 +1,4 @@
|
||||
import { QuerySnapshotButton } from './QuerySnapshotButton';
|
||||
import { loadedQueryScope, queryForLocation, readQueryLocation } from './queryLoadingScope';
|
||||
import { AnimatedMetricText, SmoothTableFrame, useAnimatedMetricText, useRetainedResult } from './QueryResultMotion';
|
||||
import { trendBarPalette } from './trendBarPalette';
|
||||
@@ -432,7 +433,7 @@ export default function QueryPage({ page, onUnauthorized }: {
|
||||
useEffect(() => {
|
||||
if (!active) return;
|
||||
const url = new URL(window.location.href);
|
||||
if (!['overall', 'department', 'group', 'product'].includes(url.searchParams.get('page') || '')) return;
|
||||
if (!['overall', 'department', 'group', 'product'].includes(url.searchParams.get('page') || 'overall')) return;
|
||||
const bytes = new TextEncoder().encode(JSON.stringify({ query: queryForLocation(queryParams, initialQuery.releaseId) }));
|
||||
let binary = '';
|
||||
for (const byte of bytes) binary += String.fromCharCode(byte);
|
||||
@@ -615,7 +616,7 @@ export default function QueryPage({ page, onUnauthorized }: {
|
||||
|
||||
const years = (options?.years || []).map(value => { const numeric = Number(String(value).match(/\d{4}/)?.[0]); return { label: `${numeric}年`, value: numeric }; }).filter(item => Number.isFinite(item.value));
|
||||
const filterSelect = (label: string, value: string[], choices: string[] | undefined, change: (value: string[]) => void, allowUnassigned = true) => (
|
||||
<label className="query-field query-primary-field" key={label}>
|
||||
<div role="group" className="query-field query-primary-field" key={label}>
|
||||
<span>{label}</span>
|
||||
<Select
|
||||
maxTagCount="responsive"
|
||||
@@ -630,7 +631,7 @@ export default function QueryPage({ page, onUnauthorized }: {
|
||||
onChange={change}
|
||||
aria-label={label}
|
||||
/>
|
||||
</label>
|
||||
</div>
|
||||
);
|
||||
|
||||
const activeDefectData = trendObject
|
||||
@@ -706,7 +707,7 @@ export default function QueryPage({ page, onUnauthorized }: {
|
||||
return (
|
||||
<div className="query-page">
|
||||
{optionsError && <Alert showIcon type="error" message="查询选项加载失败" description={optionsError} action={<Button size="small" icon={<ReloadOutlined />} onClick={() => { setOptionsLoading(true); api.options().then(result => { setOptions(result); setOptionsError(''); }).catch(e => { if (!onUnauthorized(e)) setOptionsError(chooseError(e)); }).finally(() => setOptionsLoading(false)); }}>重试</Button>} />}
|
||||
<section className="query-toolbar panel" aria-label="查询条件">
|
||||
<section className="query-toolbar panel" data-snapshot-module="filters" aria-label="查询条件">
|
||||
<Segmented
|
||||
value={period}
|
||||
options={[{ label: '年度', value: 'year' }, { label: '季度', value: 'quarter' }, { label: '月度', value: 'month' }]}
|
||||
@@ -727,15 +728,15 @@ export default function QueryPage({ page, onUnauthorized }: {
|
||||
}}
|
||||
aria-label="统计周期"
|
||||
/>
|
||||
<label className="query-field query-period-field query-period-year"><span>年份</span><Select aria-label="年份" value={year} options={years.length ? years : [{ label: `${year}年`, value: year }]} onChange={value => { automaticPeriod.current = false; setYear(value); }} loading={optionsLoading} /></label>
|
||||
{period === 'month' && <label className="query-field query-period-field query-period-month"><span>月份</span><Select aria-label="月份" value={month} options={MONTHS.map((label, index) => ({ label, value: index + 1 }))} onChange={value => { automaticPeriod.current = false; setMonth(value); }} /></label>}
|
||||
{period === 'quarter' && <label className="query-field query-period-field query-period-quarter"><span>季度</span><Select aria-label="季度" value={quarter} options={[1, 2, 3, 4].map(value => ({ label: `第${value}季度`, value }))} onChange={value => { automaticPeriod.current = false; setQuarter(value); }} /></label>}
|
||||
<div role="group" className="query-field query-period-field query-period-year"><span>年份</span><Select aria-label="年份" value={year} options={years.length ? years : [{ label: `${year}年`, value: year }]} onChange={value => { automaticPeriod.current = false; setYear(value); }} loading={optionsLoading} /></div>
|
||||
{period === 'month' && <div role="group" className="query-field query-period-field query-period-month"><span>月份</span><Select aria-label="月份" value={month} options={MONTHS.map((label, index) => ({ label, value: index + 1 }))} onChange={value => { automaticPeriod.current = false; setMonth(value); }} /></div>}
|
||||
{period === 'quarter' && <div role="group" className="query-field query-period-field query-period-quarter"><span>季度</span><Select aria-label="季度" value={quarter} options={[1, 2, 3, 4].map(value => ({ label: `第${value}季度`, value }))} onChange={value => { automaticPeriod.current = false; setQuarter(value); }} /></div>}
|
||||
{filterSelect('产业部', department, options?.departments?.filter(name => !RETIRED_DEPARTMENTS.has(name)), values => { setDepartment(values); setGroup([]); setProduct([]); })}
|
||||
{filterSelect('业务分组', group, allowedGroups, values => { setGroup(values); setProduct([]); }, !department.length)}
|
||||
{filterSelect('产品', product, department.length || group.length ? organizationPathOptions.products : options?.products, setProduct)}
|
||||
|
||||
<ExtraQueryFilters key={queryRevision} projectGroup={projectGroup} projectGroups={options?.projectGroupStatus === 'READY' ? options.projectGroups : undefined} onProjectGroup={setProjectGroup} value={extraFilters} onChange={setExtraFilters} onUnauthorized={onUnauthorized} />
|
||||
<div className="query-toolbar-tail">
|
||||
<ExtraQueryFilters key={queryRevision} releaseId={queryParams.releaseId} projectGroup={projectGroup} projectGroups={options?.projectGroupStatus === 'READY' ? options.projectGroups : undefined} onProjectGroup={setProjectGroup} value={extraFilters} onChange={setExtraFilters} onUnauthorized={onUnauthorized} />
|
||||
<div className="query-toolbar-tail"><QuerySnapshotButton title={drilledProduct ? `${drilledProduct} · 产品质量查询` : page === 'overall' ? '总体合格率' : `${scopeName}质量查询`} queryKey={JSON.stringify([queryParams,trendMode,trendObject,trendStage,trendGranularity,rateBasis,fullFields,defectDisplay,queryRevision])} disabled={queryBusy || summaryBusy || !summaryMetricsData} onUnauthorized={onUnauthorized} />
|
||||
<span className={`query-status ${queryBusy || summaryBusy ? 'busy' : currentMetricsError || summaryMetricsError ? 'failed' : ''}`}><i />{queryBusy || summaryBusy ? '正在查询' : currentMetricsError || summaryMetricsError ? '查询失败' : '查询完成'}</span>
|
||||
<Button type="default" onClick={() => { automaticPeriod.current = false; const previous = defaultQueryMonth(options); const previousQuarter = previousCompleteQuarter(); setViewOverride(); setDrilledProduct(''); setDepartment([]); setGroup([]); setProduct([]); setProjectGroup([]); setExtraFilters({}); setSearch(''); setAppliedSearch(''); setTrendObject(''); setYear(page === 'overall' ? new Date().getFullYear() : previous.year); setMonth(previous.month); setQuarter(previousQuarter.quarter); setPeriod(page === 'overall' ? 'year' : 'month'); setTrendGranularity('month'); }}>重置</Button>
|
||||
</div>
|
||||
@@ -747,7 +748,7 @@ export default function QueryPage({ page, onUnauthorized }: {
|
||||
|
||||
{currentMetricsError && <Alert showIcon type="error" message={data ? "更新失败,当前显示上次结果" : "质量指标查询失败"} description={currentMetricsError} action={<Button size="small" icon={<ReloadOutlined />} onClick={() => setQueryRevision(value => value + 1)}>重试</Button>} />}
|
||||
{drilledProduct && summaryMetricsError && <Alert showIcon type="error" message="当前产品指标查询失败" description={summaryMetricsError} action={<Button size="small" onClick={() => setQueryRevision(value => value + 1)}>重试</Button>} />}
|
||||
<section className={`metric-strip ${!displayedSummaryData ? 'query-awaiting-data' : ''}`} aria-label="质量指标" aria-busy={summaryBusy} inert={!summaryMetricsData}>
|
||||
<section className={`metric-strip ${!displayedSummaryData ? 'query-awaiting-data' : ''}`} data-snapshot-module="metrics" aria-label="质量指标" aria-busy={summaryBusy} inert={!summaryMetricsData}>
|
||||
<div className="rate-basis-control"><Segmented size="small" value={rateBasis} options={[{ label: '原口径', value: 'original' }, { label: '去本部报废', value: 'withoutHeadquartersScrap' }]} onChange={value => setRateBasis(value as typeof rateBasis)} aria-label="合格率口径" /></div>
|
||||
<MetricCard primary label="综合合格率" value={rateText(visibleCompositeRate(rowForSummary, rateBasis))} onClick={() => setBasisOpen(true)} />
|
||||
<MetricCard label="黑片合格率" value={rateText(visibleStageRate(rowForSummary, 'black'))} note={!displayedSummaryData ? (summaryBusy ? '正在更新…' : '指标暂不可用') : hasStageRows(rowForSummary, 'black') ? hasValidRateDenominator(rowForSummary, 'black') ? `合格重量 ${numberText(rowForSummary?.black?.qualifiedWeight)} kg` : '按当前启用规则及空值策略计算' : '缺少黑片来源'} stage="black" onClick={() => openRecords(null, 'black')} />
|
||||
@@ -832,7 +833,7 @@ export default function QueryPage({ page, onUnauthorized }: {
|
||||
{defectsRefreshing && <span className="defect-refresh-indicator"><Spin size="small" />正在更新</span>}
|
||||
</div>
|
||||
{trendObjectMetricsError && <Alert showIcon type="warning" message="当前趋势对象的不良数据读取失败" description={trendObjectMetricsError} />}
|
||||
<div className="defect-stage-grid" inert={!activeDefectData}>
|
||||
<div className="defect-stage-grid" data-snapshot-module="defects" inert={!activeDefectData}>
|
||||
{(['black', 'bright'] as const).map(stage => {
|
||||
const items = stage === 'black' ? blackDefectItems : brightDefectItems;
|
||||
return <section className="defect-stage-column" key={stage} aria-label={`${stage === 'black' ? '黑片' : '亮片'}不良构成`}>
|
||||
@@ -921,7 +922,14 @@ export function DefectParetoPanel({ releaseId, query, externalScrapWeight, onUna
|
||||
...(query.includeUnassigned ? { includeUnassigned: true } : {}),
|
||||
}), [query.year, query.month, query.quarter, query.department, query.group, query.product, query.productSearch, query.projectGroup, query.extraFilters, query.columnFilters, query.includeUnassigned]);
|
||||
const fineQueryKey = JSON.stringify(fineQuery);
|
||||
const visible = useResourceVisibility(container, active);
|
||||
const [snapshotRequested, setSnapshotRequested] = useState(false);
|
||||
useEffect(() => {
|
||||
const root = container.current?.closest('.query-page');
|
||||
const request = (event: Event) => { if (active && (event as CustomEvent<{modules:string[]}>).detail?.modules.includes('pareto')) setSnapshotRequested(true); };
|
||||
root?.addEventListener('quality:query-snapshot', request);
|
||||
return () => root?.removeEventListener('quality:query-snapshot', request);
|
||||
}, [active]);
|
||||
const visible = useResourceVisibility(container, active) || snapshotRequested;
|
||||
const showLoading = useDelayedIndicator(loading);
|
||||
|
||||
useEffect(() => {
|
||||
@@ -1043,7 +1051,7 @@ export function DefectParetoPanel({ releaseId, query, externalScrapWeight, onUna
|
||||
instance.setOption(option, { replaceMerge: ['series'], lazyUpdate: false });
|
||||
}, [items, totalWeight, themeRevision, active]);
|
||||
|
||||
return <section className="defect-pareto-section" aria-busy={loading || pending} aria-label={onlyStage ? `${onlyStage === 'black' ? '黑片' : '亮片'}报废重量柏拉图` : '综合报废重量柏拉图'}>
|
||||
return <section className="defect-pareto-section" data-snapshot-module="pareto" data-snapshot-ready={error ? 'error' : responses && !loading && !pending ? 'true' : 'false'} aria-busy={loading || pending} aria-label={onlyStage ? `${onlyStage === 'black' ? '黑片' : '亮片'}报废重量柏拉图` : '综合报废重量柏拉图'}>
|
||||
<div className="defect-pareto-heading"><strong>{onlyStage ? `${onlyStage === 'black' ? '黑片' : '亮片'}报废重量柏拉图` : '黑片与亮片综合报废重量柏拉图'}</strong>{showLoading && <span className="defect-refresh-indicator"><Spin size="small" />正在更新</span>}</div>
|
||||
{error && <Alert showIcon type="warning" message="细分报废重量读取失败" description={error} />}
|
||||
{!loading && !releaseId && <Empty image={Empty.PRESENTED_IMAGE_SIMPLE} description="当前没有已发布数据版本" />}
|
||||
@@ -1179,7 +1187,14 @@ function trendBarWidth(chartWidth: number, count: number): number {
|
||||
export function TrendChart({ rows, mode, stage, rateBasis, targetRate, selectedPeriod, onMonth, onlyStage }: { rows: TrendMetricRow[]; mode: 'production' | 'defects'; stage: Stage; rateBasis: 'original' | 'withoutHeadquartersScrap'; targetRate: number | null; selectedPeriod?: string; onMonth: (value: number | string) => void; onlyStage?: Stage }) {
|
||||
const { active } = usePageCache();
|
||||
const container = useRef<HTMLDivElement>(null);
|
||||
const visible = useResourceVisibility(container, active);
|
||||
const [snapshotRequested, setSnapshotRequested] = useState(false);
|
||||
useEffect(() => {
|
||||
const root = container.current?.closest('.query-page');
|
||||
const request = (event: Event) => { if (active && (event as CustomEvent<{modules:string[]}>).detail?.modules.includes('trend')) setSnapshotRequested(true); };
|
||||
root?.addEventListener('quality:query-snapshot', request);
|
||||
return () => root?.removeEventListener('quality:query-snapshot', request);
|
||||
}, [active]);
|
||||
const visible = useResourceVisibility(container, active) || snapshotRequested;
|
||||
const chart = useRef<ReturnType<typeof echarts.init> | null>(null);
|
||||
const onMonthRef = useRef(onMonth);
|
||||
const rowsRef = useRef(rows);
|
||||
@@ -1557,6 +1572,7 @@ export function RecordsDrawer({
|
||||
<BusinessValue value={raw} />
|
||||
</details>;
|
||||
} },
|
||||
...(retainedResult?.rows.some(record=>Object.hasOwn(record,'salesOrderType'))?[{title:'销售订单类型',dataIndex:'salesOrderType',key:'salesOrderType',width:170,render:(value:string|null)=>value||'未匹配'}]:[]),
|
||||
{ title: '工作表', dataIndex: 'sheet', key: 'sheet', width: 120 },
|
||||
{ title: '行号', dataIndex: 'rowNumber', key: 'rowNumber', align: 'right', width: 85 },
|
||||
{ title: '月份', dataIndex: 'month', key: 'month', align: 'center', width: 100, render: value => {
|
||||
@@ -1574,14 +1590,14 @@ export function RecordsDrawer({
|
||||
return <Drawer className="source-records-drawer" open={open} onClose={onClose} width={Math.min(1120, window.innerWidth)} title={<div className="drawer-title">来源明细 <small>{row?.label || (month ? MONTHS[month - 1] : '当前筛选条件')}</small></div>} destroyOnClose>
|
||||
<div className="drawer-controls"><Segmented disabled={lockedStage} value={stage} options={[{ label: '黑片', value: 'black' }, { label: '亮片', value: 'bright' }]} onChange={value => { onStage(value as Stage); setPage(1); setRawFields([]); setField(undefined); setFieldSearch(''); setSelectedColumns(undefined); setSort(undefined); }} aria-label="明细阶段" /><span>{result ? `共 ${result.total} 条来源记录 · 已载入 ${rawFields.length} 个原始字段` : '按当前查询条件获取原始来源行'}</span><Button size="small" icon={<DownloadOutlined />} loading={exporting} disabled={fetching || !result || !!error} onClick={exportRecords} title={lockedStage ? '导出当前阶段和筛选范围的全部来源明细' : '导出当前查询范围全部来源明细,含黑片和亮片两个工作表'}>导出明细 Excel</Button></div>
|
||||
<div className="record-query-tools">
|
||||
<label><span>字段检索</span><Select {...readableSelectPopup} allowClear showSearch optionFilterProp="label" placeholder="选择原始字段" value={field} options={rawFields.map(name => ({ label: name, value: name }))} onChange={value => { setField(value); setPage(1); }} /></label>
|
||||
<div role="group"><span>字段检索</span><Select aria-label="字段检索" {...readableSelectPopup} allowClear showSearch optionFilterProp="label" placeholder="选择原始字段" value={field} options={rawFields.map(name => ({ label: name, value: name }))} onChange={value => { setField(value); setPage(1); }} /></div>
|
||||
<Input allowClear disabled={!field} prefix={<SearchOutlined />} placeholder={field ? `搜索字段:${field}` : '先选择检索字段'} value={fieldSearch} onChange={event => { setFieldSearch(event.target.value); setPage(1); }} />
|
||||
<label><span>显示列</span><Select {...readableSelectPopup} mode="multiple" allowClear showSearch optionFilterProp="label" placeholder="默认显示前 8 个字段" value={selectedColumns} options={rawFields.map(name => ({ label: name, value: name }))} onChange={value => { setSelectedColumns(value); setPage(1); }} /></label>
|
||||
<label><span>排序字段</span><Select {...readableSelectPopup} allowClear showSearch optionFilterProp="label" placeholder="默认顺序" value={sort} options={[
|
||||
<div role="group"><span>显示列</span><Select aria-label="显示列" {...readableSelectPopup} mode="multiple" allowClear showSearch optionFilterProp="label" placeholder="默认显示前 8 个字段" value={selectedColumns} options={rawFields.map(name => ({ label: name, value: name }))} onChange={value => { setSelectedColumns(value); setPage(1); }} /></div>
|
||||
<div role="group"><span>排序字段</span><Select aria-label="排序字段" {...readableSelectPopup} allowClear showSearch optionFilterProp="label" placeholder="默认顺序" value={sort} options={[
|
||||
{ label: '月份', value: 'month' }, { label: '来源文件', value: 'sourceFile' }, { label: '工作表', value: 'sheet' }, { label: '行号', value: 'rowNumber' },
|
||||
{ label: '产业部', value: 'department' }, { label: '业务分组', value: 'group' }, { label: '项目组', value: 'projectGroup' }, { label: '产品', value: 'product' },
|
||||
...(field ? [{ label: `原始字段:${field}`, value: 'rawField' }] : []),
|
||||
]} onChange={value => { setSort(value); setPage(1); }} /></label>
|
||||
]} onChange={value => { setSort(value); setPage(1); }} /></div>
|
||||
<Segmented value={direction} options={[{ label: '升序', value: 'asc' }, { label: '降序', value: 'desc' }]} onChange={value => { setDirection(value as 'asc' | 'desc'); setPage(1); }} aria-label="排序方向" />
|
||||
</div>
|
||||
{error && <Alert type="error" showIcon message={retainedResult ? "更新失败,当前显示上次结果" : "来源明细加载失败"} description={error} action={<Button size="small" onClick={() => setRevision(value => value + 1)}>重试</Button>} />}
|
||||
|
||||
@@ -16,7 +16,7 @@ export function QueryTrendPanel({ panelRef, id, mode, onMode, granularity, onGra
|
||||
scopeName: string; stageSwitch?: ReactNode; children: ReactNode;
|
||||
}) {
|
||||
const periodName = granularity === 'month' ? '月度' : granularity === 'quarter' ? '季度' : '年度';
|
||||
return <section className="panel section-panel trend-panel" ref={panelRef} id={id}>
|
||||
return <section className="panel section-panel trend-panel" data-snapshot-module="trend" ref={panelRef} id={id}>
|
||||
<div className="section-heading-row trend-heading-row">
|
||||
<div className="section-heading"><h2>{periodName}变化趋势</h2></div>
|
||||
<Segmented value={mode} options={[{ label: '合格率与产量', value: 'production' }, { label: '不良率', value: 'defects' }, { label: `${periodName}数据`, value: 'data' }]} onChange={onMode} aria-label="趋势视图" />
|
||||
@@ -24,8 +24,8 @@ export function QueryTrendPanel({ panelRef, id, mode, onMode, granularity, onGra
|
||||
<div className="trend-controls">
|
||||
{mode === 'data' && <Segmented value={defectDisplay} options={[{ label: '不良重量', value: 'weight' }, { label: '不良率', value: 'rate' }]} onChange={onDefectDisplay} aria-label="趋势不良显示方式" />}
|
||||
{mode === 'data' && <Segmented value={fullFields ? 'full' : 'key'} options={[{ label: '关键指标', value: 'key' }, { label: '完整指标', value: 'full' }]} onChange={value => onFullFields(value === 'full')} aria-label="趋势字段显示" />}
|
||||
<label className="query-field trend-granularity"><span>趋势粒度</span><Select {...readableSelectPopup} value={granularity} options={[{ label: '按月', value: 'month' }, { label: '按季度', value: 'quarter' }, { label: '按年度', value: 'year' }]} onChange={onGranularity} aria-label="趋势粒度" /></label>
|
||||
<label className="query-field trend-object"><span>趋势对象</span><Select {...readableSelectPopup} allowClear placeholder={`当前${scopeName}筛选`} value={object || undefined} options={objects} onChange={onObject} aria-label="趋势对象" /></label>
|
||||
<div role="group" className="query-field trend-granularity"><span>趋势粒度</span><Select {...readableSelectPopup} value={granularity} options={[{ label: '按月', value: 'month' }, { label: '按季度', value: 'quarter' }, { label: '按年度', value: 'year' }]} onChange={onGranularity} aria-label="趋势粒度" /></div>
|
||||
<div role="group" className="query-field trend-object"><span>趋势对象</span><Select {...readableSelectPopup} allowClear placeholder={`当前${scopeName}筛选`} value={object || undefined} options={objects} onChange={onObject} aria-label="趋势对象" /></div>
|
||||
{mode !== 'data' && stageSwitch}
|
||||
</div>
|
||||
{children}
|
||||
@@ -38,7 +38,7 @@ export function QueryTablePanel({ heading, busy, search, onSearchChange, onSearc
|
||||
fullFields: boolean; onFullFields: (value: boolean) => void; defectDisplay: DefectDisplay; onDefectDisplay: (value: DefectDisplay) => void;
|
||||
returnControls?: ReactNode; exporting: boolean; exportDisabled: boolean; onExport: () => void; children: ReactNode;
|
||||
}) {
|
||||
return <section className="panel section-panel table-panel">
|
||||
return <section className="panel section-panel table-panel" data-snapshot-module="table" aria-busy={busy}>
|
||||
<div className="section-heading-row">
|
||||
{heading}
|
||||
<div className="table-tools">
|
||||
|
||||
@@ -0,0 +1,80 @@
|
||||
import { useEffect, useRef, useState } from 'react';
|
||||
import { Alert, App, Button, Checkbox, Modal, Space } from 'antd';
|
||||
import { CameraOutlined, CopyOutlined, DownloadOutlined } from '@ant-design/icons';
|
||||
import { api } from './api';
|
||||
import { usePageCache } from './pageCache';
|
||||
import { captureQuerySnapshot, parseSnapshotModules, QUERY_SNAPSHOT_MODULES, snapshotFilename, snapshotTask, type QuerySnapshotModule } from './querySnapshot';
|
||||
import './query-snapshot.css';
|
||||
|
||||
const STORAGE = 'quality-query-snapshot-modules-v1';
|
||||
function savedModules() {
|
||||
try { const value = localStorage.getItem(STORAGE); return parseSnapshotModules(value ? JSON.parse(value) : undefined); }
|
||||
catch { return parseSnapshotModules(undefined); }
|
||||
}
|
||||
|
||||
export function QuerySnapshotButton({ title, queryKey, disabled, onUnauthorized }: { title: string; queryKey: string; disabled?: boolean; onUnauthorized: (error: unknown) => boolean }) {
|
||||
const { message } = App.useApp();
|
||||
const { authRevision, dataRevision } = usePageCache();
|
||||
const host = useRef<HTMLSpanElement>(null), alive = useRef(true), version = useRef(queryKey);
|
||||
version.current = queryKey;
|
||||
const [open, setOpen] = useState(false), [selected, setSelected] = useState<QuerySnapshotModule[]>(savedModules);
|
||||
const [available, setAvailable] = useState<QuerySnapshotModule[]>([]), [busy, setBusy] = useState(false), [error, setError] = useState(''), [progress, setProgress] = useState('');
|
||||
const job = useRef<AbortController | null>(null);
|
||||
const cached = useRef<{ key: string; blob: Blob } | null>(null);
|
||||
useEffect(() => { alive.current = true; setBusy(false); return () => { alive.current = false; job.current?.abort(); }; }, []);
|
||||
const show = () => {
|
||||
const root = host.current?.closest<HTMLElement>('.query-page'); if (!root) return;
|
||||
const available = QUERY_SNAPSHOT_MODULES.filter(module => root.querySelector(`[data-snapshot-module="${module.key}"]`)).map(module => module.key);
|
||||
cached.current = null;
|
||||
setAvailable(available); setError(''); setOpen(true);
|
||||
};
|
||||
const chosen = selected.filter(key => available.includes(key));
|
||||
const change = (values: QuerySnapshotModule[]) => { setSelected(values); try { localStorage.setItem(STORAGE, JSON.stringify(values)); } catch { /* In-memory selection remains usable. */ } };
|
||||
const exportImage = async (copy: boolean) => {
|
||||
if (!chosen.length || busy) return;
|
||||
const root = host.current?.closest<HTMLElement>('.query-page'); if (!root) return;
|
||||
const requestedVersion = version.current, controller = new AbortController();
|
||||
job.current = controller;
|
||||
const cancelled = () => controller.signal.aborted || !alive.current || version.current !== requestedVersion;
|
||||
const cacheKey = JSON.stringify([requestedVersion, chosen, document.documentElement.dataset.workspaceTheme]);
|
||||
setBusy(true); setError(''); setProgress('正在核对当前查询…');
|
||||
const prepare = async () => {
|
||||
const state = await api.workspaceState();
|
||||
if ((authRevision && state.authRevision !== authRevision) || (dataRevision && state.dataRevision !== dataRevision)) throw new Error('页面数据或权限已更新,请刷新后生成快照');
|
||||
if (cancelled()) throw new Error('已取消生成快照');
|
||||
if (cached.current?.key === cacheKey) return cached.current.blob;
|
||||
const blob = await captureQuerySnapshot(root, chosen, title, cancelled, controller.signal, text => { if (!cancelled()) setProgress(text); });
|
||||
if (!cancelled()) cached.current = { key: cacheKey, blob };
|
||||
return blob;
|
||||
};
|
||||
try {
|
||||
if (copy) {
|
||||
if (!navigator.clipboard?.write || typeof ClipboardItem === 'undefined') throw new Error('此浏览器暂不支持复制图片,请使用下载图片');
|
||||
const image = await snapshotTask(prepare(), controller.signal, 45000, '生成图片超时,请减少模块后重试');
|
||||
if (cancelled()) return;
|
||||
setProgress('图片已生成,正在写入剪贴板…');
|
||||
const nativeWriting = navigator.clipboard.write([new ClipboardItem({ 'image/png': image })]);
|
||||
await snapshotTask(nativeWriting, controller.signal, 8000, '剪贴板响应超时,图片已生成,可直接点击下载图片');
|
||||
} else {
|
||||
const blob = await snapshotTask(prepare(), controller.signal, 45000, '生成图片超时,请减少模块后重试'); if (cancelled()) return;
|
||||
const url = URL.createObjectURL(blob), link = document.createElement('a');
|
||||
link.href = url; link.download = snapshotFilename(title); document.body.append(link); link.click(); link.remove();
|
||||
window.setTimeout(() => URL.revokeObjectURL(url), 1000);
|
||||
}
|
||||
if (!cancelled()) { message.success(copy ? '图片已复制到剪贴板' : '图片已开始下载'); setOpen(false); }
|
||||
} catch (value) {
|
||||
if (!controller.signal.aborted && alive.current && !onUnauthorized(value)) setError(value instanceof Error ? value.name === 'NotAllowedError' ? '浏览器未允许复制图片,请使用下载图片' : value.message : '图片生成失败,请重试');
|
||||
} finally { controller.abort(); if (job.current === controller) { job.current = null; if (alive.current) setBusy(false); } }
|
||||
};
|
||||
return <span ref={host} className="query-snapshot-controls">
|
||||
<Button icon={<CameraOutlined />} disabled={disabled} onClick={show}>页面快照</Button>
|
||||
<Modal title="页面快照" open={open} width={470} onCancel={() => { job.current?.abort(); setOpen(false); }} closable mask={{ closable: !busy }}
|
||||
footer={<Space>{busy && <Button onClick={() => { job.current?.abort(); setBusy(false); setProgress(''); }}>取消生成</Button>}<Button icon={<DownloadOutlined />} disabled={!chosen.length} onClick={() => void exportImage(false)} loading={busy}>下载图片</Button><Button type="primary" icon={<CopyOutlined />} disabled={!chosen.length} onClick={() => void exportImage(true)} loading={busy}>复制到剪贴板</Button></Space>}>
|
||||
<Checkbox checked={chosen.length === available.length && available.length > 0} indeterminate={chosen.length > 0 && chosen.length < available.length} disabled={busy} onChange={event => change(event.target.checked ? available : [])}>全选</Checkbox>
|
||||
<Checkbox.Group className="query-snapshot-modules" value={chosen} disabled={busy} options={QUERY_SNAPSHOT_MODULES.filter(module => available.includes(module.key)).map(module => ({ label: module.label, value: module.key }))} onChange={values => change(values as QuerySnapshotModule[])} />
|
||||
<p className="query-snapshot-note">汇总表按当前分页和显示列生成。</p>
|
||||
{busy && <p role="status">{progress}</p>}
|
||||
{error && <Alert showIcon type="error" message={error} />}
|
||||
</Modal>
|
||||
</span>;
|
||||
}
|
||||
@@ -1,3 +1,4 @@
|
||||
import { useDeleteConfirmation } from './useDeleteConfirmation';
|
||||
import { useEffect, useRef, useState } from 'react';
|
||||
import { Alert, Button, Form, Input, Modal, Select } from 'antd';
|
||||
import { ArrowDownOutlined, ArrowUpOutlined, PlusOutlined } from '@ant-design/icons';
|
||||
@@ -13,6 +14,7 @@ const missingLabels: Record<string, string> = { PROPAGATE:'任一输入缺失,
|
||||
const outcomeLabels: Record<string, string> = { ONE:'取1', ZERO:'取0', NULL:'保留空白', ERROR:'停止并报错' };
|
||||
|
||||
export function ResultFormulaModal({ result, existing, schema, availableTargets, onCancel, onApply }: Props) {
|
||||
const confirmDelete = useDeleteConfirmation();
|
||||
const [draft, setDraft] = useState<ResultFormula>(() => structuredClone(result));
|
||||
const [error, setError] = useState('');
|
||||
const errorHost = useRef<HTMLDivElement>(null);
|
||||
@@ -69,7 +71,7 @@ export function ResultFormulaModal({ result, existing, schema, availableTargets,
|
||||
{branchIndexes.length === 0 && baseFormula}
|
||||
{(branchIndexes.length > 0) && <p className="result-priority-hint">{draft.rules.some(rule=>rule.otherwiseFormula !== undefined) ? '已设置其他情况取值,最终取值以完整公式为准。' : '条件同时满足时,上方分支优先。'}</p>}
|
||||
{branchIndexes.map((index, position) => { const rule=draft.rules[index], when=obj(rule.when); return <section className="result-condition-branch" key={index}>
|
||||
<div className="result-branch-heading"><strong>条件 {position + 1}</strong><span className="task-actions"><Button size="small" type="text" aria-label={`条件${position+1}提高优先级`} icon={<ArrowUpOutlined/>} disabled={position===0} onClick={()=>moveBranch(index,-1)}/><Button size="small" type="text" aria-label={`条件${position+1}降低优先级`} icon={<ArrowDownOutlined/>} disabled={position===branchIndexes.length-1} onClick={()=>moveBranch(index,1)}/><Button size="small" type="link" danger onClick={()=>remove(index)}>移除</Button></span></div>
|
||||
<div className="result-branch-heading"><strong>条件 {position + 1}</strong><span className="task-actions"><Button size="small" type="text" aria-label={`条件${position+1}提高优先级`} icon={<ArrowUpOutlined/>} disabled={position===0} onClick={()=>moveBranch(index,-1)}/><Button size="small" type="text" aria-label={`条件${position+1}降低优先级`} icon={<ArrowDownOutlined/>} disabled={position===branchIndexes.length-1} onClick={()=>moveBranch(index,1)}/><Button size="small" type="link" danger onClick={()=>confirmDelete({title:`移除条件 ${position + 1}?`,description:"将从当前结果公式中移除此条件分支,点击“应用修改”后更新编辑内容,保存并更新报表后生效。",confirmText:"确认移除",onConfirm:()=>remove(index)})}>移除</Button></span></div>
|
||||
<div className="result-condition-fields">
|
||||
<Form.Item label="条件字段" htmlFor={`result-field-${index}`}><Select id={`result-field-${index}`} {...readableSelectPopup} value={String(when.field || '')} options={Object.entries(fields).map(([value,name])=>({value,label:String(name)}))} onChange={field=>condition(index,{field})}/></Form.Item>
|
||||
<Form.Item label="判断方式" htmlFor={`result-operator-${index}`}><Select id={`result-operator-${index}`} value={String(when.operator || '')} options={strings(schema.conditionOperators).map(value=>({value,label:conditionOperators[value]||value}))} onChange={operator=>condition(index,{operator})}/></Form.Item>
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
import { useDeleteConfirmation } from './useDeleteConfirmation';
|
||||
import { useEffect, useState } from 'react';
|
||||
import { Alert, Button, Checkbox, Collapse, Dropdown, Form, Input, Modal, Select, Tabs } from 'antd';
|
||||
import { MoreOutlined, PlusOutlined } from '@ant-design/icons';
|
||||
@@ -16,6 +17,7 @@ const nullLabels: Record<string, string> = { PROPAGATE:'任一输入缺失,运
|
||||
const resultLabels = (rate: boolean): Record<string, string> => ({ ONE: rate ? '按100%处理' : '取1', ZERO: rate ? '按0%处理' : '取0', NULL:'保留空白', ERROR:'停止并报错' });
|
||||
|
||||
export function RuleSettingsEditor({ value, onChange, schema, schemaError, showWorkbookActions = true, focusMetric, readOnly = false }: Props) {
|
||||
const confirmDelete = useDeleteConfirmation();
|
||||
const [tab, setTab] = useState('black');
|
||||
const [sourceEdit, setSourceEdit] = useState<{ stage: string; alias: string; header: string } | null>(null);
|
||||
const [sourceForm] = Form.useForm<{ header: string }>();
|
||||
@@ -67,10 +69,10 @@ export function RuleSettingsEditor({ value, onChange, schema, schemaError, showW
|
||||
const next = planResultMove(value, result.stage, result.target, direction, schema);
|
||||
if (next.definition) { onChange(next.definition); setOrderError(''); } else setOrderError(next.reason || '该调整会破坏计算依赖');
|
||||
};
|
||||
const remove = (result: ResultFormula) => {
|
||||
const remove = (result: ResultFormula) => confirmDelete({ title:`移除“${label(result.target)}”的完整公式?`, description:`将移除此结果的全部取值及 ${result.rules.filter(rule=>rule.when).length} 个条件分支,保存并更新报表后生效。`, confirmText:"确认移除", onConfirm:() => {
|
||||
const next = replaceResultFormula(value, result, []), issue = newResultIssue(value, next, schema);
|
||||
if (issue) setOrderError(issue); else { onChange(next); setOrderError(''); }
|
||||
};
|
||||
}});
|
||||
const rowColumns = [
|
||||
{ title:'执行顺序', key:'sequence', width:90, render:(_: unknown, _row: ResultFormula, position: number) => position + 1 },
|
||||
{ title:'计算结果', dataIndex:'target', width:200, render:label },
|
||||
|
||||
@@ -0,0 +1,45 @@
|
||||
import { useEffect,useRef,useState } from 'react';
|
||||
import { Alert,App,Button,Modal,Select,Space,Table } from 'antd';
|
||||
import { UploadOutlined } from '@ant-design/icons';
|
||||
import { api } from './api';
|
||||
import type { SalesOrderTypePreview,SalesOrderTypeStatus,SalesOrderTypeVersion } from './salesOrderTypes';
|
||||
|
||||
export function SalesOrderTypeSettings({onUnauthorized}:{onUnauthorized:(error:unknown)=>boolean}) {
|
||||
const {message,modal}=App.useApp();
|
||||
const [status,setStatus]=useState<SalesOrderTypeStatus>();
|
||||
const [error,setError]=useState('');const [busy,setBusy]=useState(false);
|
||||
const [open,setOpen]=useState(false);const [history,setHistory]=useState(false);
|
||||
const [file,setFile]=useState<File>();const [mode,setMode]=useState<'MERGE'|'REPLACE'>('MERGE');
|
||||
const [preview,setPreview]=useState<SalesOrderTypePreview>();
|
||||
const input=useRef<HTMLInputElement>(null);const generation=useRef(0);
|
||||
const failure=(e:unknown)=>{if(!onUnauthorized(e))setError(e instanceof Error?e.message:'操作失败');};
|
||||
const load=()=>api.salesOrderTypeStatus().then(setStatus);
|
||||
useEffect(()=>{let alive=true;api.salesOrderTypeStatus().then(value=>{if(alive)setStatus(value);}).catch(e=>{if(alive&&!onUnauthorized(e))setError(e instanceof Error?e.message:'对应表读取失败');});return()=>{alive=false;generation.current++;};},[onUnauthorized]);
|
||||
const current=status?.versions.find(version=>version.id===status.versionId);
|
||||
const inspect=async()=>{
|
||||
if(!file)return;const revision=++generation.current;setBusy(true);setError('');setPreview(undefined);
|
||||
try{const result=await api.salesOrderTypePreview(file,mode);if(revision===generation.current)setPreview(result);}
|
||||
catch(e){if(revision===generation.current)failure(e);}finally{if(revision===generation.current)setBusy(false);}
|
||||
};
|
||||
const commit=async()=>{
|
||||
if(!file||!preview)return;setBusy(true);setError('');
|
||||
try{await api.importSalesOrderTypes(file,mode,preview.expectedVersion,preview.sha256);await load();setOpen(false);setPreview(undefined);message.success('销售订单类型对应表已更新');}
|
||||
catch(e){failure(e);setPreview(undefined);}finally{setBusy(false);}
|
||||
};
|
||||
const restore=(version:SalesOrderTypeVersion)=>modal.confirm({title:'恢复此销售订单对应表?',content:'历史质量数据的后续查询将采用此版本的对应关系。',okText:'恢复',onOk:async()=>{setBusy(true);try{await api.activateSalesOrderTypes(version.id,status?.versionId||'');await load();setHistory(false);message.success('对应表已恢复');}catch(e){failure(e);throw e;}finally{setBusy(false);}}});
|
||||
return <section className="sales-order-type-settings" style={{marginTop:24}}>
|
||||
<div className="section-heading-row"><strong>销售订单类型对应</strong><Space><Button size="small" disabled={busy||!status?.versions.length} onClick={()=>setHistory(true)}>历史版本</Button><Button size="small" icon={<UploadOutlined/>} disabled={busy} onClick={()=>{setFile(undefined);setPreview(undefined);setError('');setOpen(true);}}>导入对应表</Button></Space></div>
|
||||
<p>{current?`${current.rowCount.toLocaleString('zh-CN')} 个订单 · ${current.sourceFile}`:'尚未导入销售订单类型对应表'}</p>
|
||||
{error&&!open&&<Alert showIcon type="error" message={error}/>}
|
||||
<Modal open={open} title="导入销售订单类型对应表" onCancel={()=>{if(!busy){generation.current++;setOpen(false);}}} maskClosable={!busy} closable={!busy} footer={<Space><Button disabled={busy} onClick={()=>setOpen(false)}>取消</Button>{preview?<Button type="primary" loading={busy} onClick={()=>void commit()}>确认导入</Button>:<Button type="primary" loading={busy} disabled={!file} onClick={()=>void inspect()}>预览</Button>}</Space>}>
|
||||
<Space direction="vertical" style={{width:'100%'}}>
|
||||
{error&&<Alert showIcon type="error" message={error}/>}
|
||||
<Select aria-label="销售订单对应表导入方式" value={mode} disabled={busy} style={{width:'100%'}} options={[{label:'增量更新',value:'MERGE'},{label:'整表替换',value:'REPLACE'}]} onChange={value=>{setMode(value);setPreview(undefined);}}/>
|
||||
<input ref={input} type="file" accept=".xlsx,.xls" aria-label="销售订单对应表文件" disabled={busy} onChange={event=>{setFile(event.target.files?.[0]);setPreview(undefined);}}/>
|
||||
{mode==='REPLACE'&&<Alert type="warning" message="整表替换会移除未在本次文件中出现的订单对应关系。"/>}
|
||||
{preview&&<><p>导入 {preview.summary.imported.toLocaleString('zh-CN')} 个订单,生效后共 {preview.summary.total.toLocaleString('zh-CN')} 个。</p><Space wrap><span>新增 {preview.summary.added}</span><span>变更 {preview.summary.updated}</span><span>不变 {preview.summary.unchanged}</span><span>移除 {preview.summary.removed}</span></Space></>}
|
||||
</Space>
|
||||
</Modal>
|
||||
<Modal open={history} title="销售订单对应表历史版本" footer={null} onCancel={()=>setHistory(false)} width={760}><Table size="small" rowKey="id" dataSource={status?.versions||[]} pagination={{pageSize:6}} columns={[{title:'来源文件',dataIndex:'sourceFile'},{title:'订单数',dataIndex:'rowCount',render:(n:number)=>n.toLocaleString('zh-CN')},{title:'导入时间',dataIndex:'createdAt',render:(value:string)=>new Date(value).toLocaleString('zh-CN')},{title:'操作',render:(_,version:SalesOrderTypeVersion)=>version.id===status?.versionId?'当前版本':<Button size="small" disabled={busy} onClick={()=>restore(version)}>恢复</Button>}]}/></Modal>
|
||||
</section>;
|
||||
}
|
||||
@@ -1,3 +1,4 @@
|
||||
import { QuerySnapshotButton } from './QuerySnapshotButton';
|
||||
import { loadedQueryScope, queryForLocation } from './queryLoadingScope';
|
||||
import { SmoothTableFrame, useRetainedResult } from './QueryResultMotion';
|
||||
import { queryScrapWeight } from './queryMetricValues';
|
||||
@@ -7,6 +8,8 @@ import { ArrowLeftOutlined, DownOutlined, UpOutlined } from '@ant-design/icons';
|
||||
import { api, decodeQueryValueList, encodeQueryValueList } from './api';
|
||||
import { MetricTable, MetricCard, DefectBreakdown, DefectParetoPanel, SectionHeading, RecordsDrawer, TrendChart, TrendTable, fullYearTrend, queryFromLocation } from './QueryPage';
|
||||
import { StageSourceFilters } from './StageSourceFilters';
|
||||
import { SalesOrderTypeSelect } from './ExtraQueryFilters';
|
||||
import { salesOrderTypeSelection } from './salesOrderTypes';
|
||||
import { stageProductQuery, sortStageRowsByTotalWeight } from './stageProductQuery';
|
||||
import { usePageCache } from './pageCache';
|
||||
import { useDelayedIndicator } from './useDelayedBusy';
|
||||
@@ -14,7 +17,7 @@ import { defaultQueryMonth, previousCompleteMonth, previousCompleteQuarter } fro
|
||||
import { readableSelectPopup } from './readableSelectPopup';
|
||||
import { readableMetricFormula } from './publicDataDisplay';
|
||||
import { defaultFullMetricFields } from './metricColumnPlan';
|
||||
import type { MetricRow, MetricsResponse, OptionsResponse, PeriodKind, QueryParams, SourceColumnField, SourceColumnFilter, Stage, TrendResponse } from './types';
|
||||
import type { FilterField, MetricRow, MetricsResponse, OptionsResponse, PeriodKind, QueryParams, SourceColumnField, SourceColumnFilter, Stage, TrendResponse } from './types';
|
||||
import { QueryTrendPanel, QueryTablePanel } from './QueryPanels';
|
||||
import { selectTrendPeriod as nextTrendPeriod } from './trendPeriodSelection';
|
||||
import './stage-product.css';
|
||||
@@ -30,6 +33,8 @@ export default function StageProductPage({stage,onUnauthorized}:{stage:Stage;onU
|
||||
const [department,setDepartment]=useState(()=>decodeQueryValueList(initial.department));const [group,setGroup]=useState(()=>decodeQueryValueList(initial.group));const [product,setProduct]=useState(()=>decodeQueryValueList(initial.product));const [projectGroup,setProjectGroup]=useState(()=>decodeQueryValueList(initial.projectGroup));
|
||||
const [sourceFilters,setSourceFilters]=useState<SourceColumnFilter[]>(initial.columnFilters||[]);const [search,setSearch]=useState(initial.productSearch||'');const [appliedSearch,setAppliedSearch]=useState(initial.productSearch||'');const includeUnassigned=true;
|
||||
const [moreFiltersOpen,setMoreFiltersOpen]=useState(false);
|
||||
const [extraFilters,setExtraFilters]=useState<Record<string,string[]>>(initial.extraFilters||{});
|
||||
const [extraFields,setExtraFields]=useState<FilterField[]>([]);
|
||||
const [options,setOptions]=useState<OptionsResponse|null>(null);const [catalog,setCatalog]=useState<{releaseId:string;sourceFields:SourceColumnField[]}|null>(null);const [supportError,setSupportError]=useState('');const [supportLoading,setSupportLoading]=useState(true);
|
||||
const [applied,setApplied]=useState<QueryParams|null>(null);const [revision,setRevision]=useState(0);const [response,setResponse]=useState<{key:string;value:MetricsResponse}|null>(null);const [loading,setLoading]=useState(false);const [failure,setFailure]=useState<{key:string;message:string}|null>(null);
|
||||
const [defectDisplay,setDefectDisplay]=useState<'weight'|'rate'>('weight');
|
||||
@@ -44,7 +49,7 @@ export default function StageProductPage({stage,onUnauthorized}:{stage:Stage;onU
|
||||
const loadSupport=useCallback(async()=>{
|
||||
const generation=++supportGeneration.current;supportController.current?.abort();const controller=new AbortController();supportController.current=controller;
|
||||
setSupportLoading(true);setSupportError('');
|
||||
try{const [choices,source]=await Promise.all([api.options(controller.signal),api.sourceColumnCatalog(initial.releaseId||currentReleaseId||undefined,controller.signal)]);if(generation!==supportGeneration.current)return;if(automaticPeriod.current){const available=defaultQueryMonth(choices);setYear(available.year);setMonth(available.month);automaticPeriod.current=false;}setOptions(choices);setCatalog(source);}
|
||||
try{const [choices,source,filterFields]=await Promise.all([api.options(controller.signal),api.sourceColumnCatalog(initial.releaseId||currentReleaseId||undefined,controller.signal),api.filterFields(false,controller.signal)]);if(generation!==supportGeneration.current)return;if(automaticPeriod.current){const available=defaultQueryMonth(choices);setYear(available.year);setMonth(available.month);automaticPeriod.current=false;}setOptions(choices);setCatalog(source);setExtraFields(filterFields.filter(field=>field.key==='salesOrderType'));}
|
||||
catch(error){if(generation===supportGeneration.current&&!onUnauthorized(error))setSupportError(error instanceof Error?error.message:'查询条件读取失败');}
|
||||
finally{if(generation===supportGeneration.current)setSupportLoading(false);}
|
||||
},[onUnauthorized,initial.releaseId,currentReleaseId]);
|
||||
@@ -52,8 +57,8 @@ export default function StageProductPage({stage,onUnauthorized}:{stage:Stage;onU
|
||||
const fields=useMemo(()=>catalog?.sourceFields.filter(field=>field.type==='source_value'&&field.stages.includes(stage))||[],[catalog,stage]);
|
||||
const exactProductSearch=useMemo(()=>(options?.products||[]).find(name=>name.trim().toLocaleLowerCase()===appliedSearch.trim().toLocaleLowerCase())||'', [options,appliedSearch]);
|
||||
const queryProducts=useMemo(()=>drilledProduct?[drilledProduct]:exactProductSearch?product.length&&!product.includes(exactProductSearch)?['__codex_no_product_search_match__']:[exactProductSearch]:product,[drilledProduct,exactProductSearch,product]);
|
||||
useEffect(()=>{setDrilledProduct('');},[year,department,group,product,projectGroup,sourceFilters]);
|
||||
const draft=useMemo(()=>stageProductQuery({year,...(period==='month'?{month}:period==='quarter'?{quarter}:{}),department:encodeQueryValueList(department),group:encodeQueryValueList(group),product:encodeQueryValueList(queryProducts),projectGroup:encodeQueryValueList(projectGroup),productSearch:drilledProduct?undefined:appliedSearch.trim()||undefined,includeUnassigned,view:'product',trendGranularity:'month',releaseId:initial.releaseId||currentReleaseId||catalog?.releaseId},stage,sourceFilters),[year,period,month,quarter,department,group,queryProducts,drilledProduct,projectGroup,appliedSearch,includeUnassigned,catalog,stage,sourceFilters,initial.releaseId,currentReleaseId]);
|
||||
useEffect(()=>{setDrilledProduct('');},[year,department,group,product,projectGroup,sourceFilters,extraFilters]);
|
||||
const draft=useMemo(()=>stageProductQuery({year,...(period==='month'?{month}:period==='quarter'?{quarter}:{}),department:encodeQueryValueList(department),group:encodeQueryValueList(group),product:encodeQueryValueList(queryProducts),projectGroup:encodeQueryValueList(projectGroup),productSearch:drilledProduct?undefined:appliedSearch.trim()||undefined,includeUnassigned,extraFilters,view:'product',trendGranularity:'month',releaseId:initial.releaseId||currentReleaseId||catalog?.releaseId},stage,sourceFilters),[year,period,month,quarter,department,group,queryProducts,drilledProduct,projectGroup,appliedSearch,includeUnassigned,catalog,stage,sourceFilters,extraFilters,initial.releaseId,currentReleaseId]);
|
||||
// Apply organizational/source filters directly, like the other query pages. Product text search keeps its explicit submit.
|
||||
useEffect(()=>{if(active&&catalog&&!supportLoading&&!supportError)setApplied(previous=>JSON.stringify(previous)===JSON.stringify(draft)?previous:draft);},[active,catalog,draft,supportLoading,supportError]);
|
||||
const queryKey=JSON.stringify({query:applied,revision});const current=response?.key===queryKey?response.value:null;const error=failure?.key===queryKey?failure.message:'';
|
||||
@@ -78,15 +83,16 @@ export default function StageProductPage({stage,onUnauthorized}:{stage:Stage;onU
|
||||
const submit=()=>{automaticPeriod.current=false;setAppliedSearch(search.trim());setDrilledProduct('');setRevision(v=>v+1);};
|
||||
const setTrendObject=(value?:string)=>{const selected=value||'';setDrilledProduct('');setSearch(selected);setAppliedSearch(selected);};
|
||||
const returnToProducts=()=>{setDrilledProduct('');setSearch(drillParentSearch.current);setAppliedSearch(drillParentSearch.current);setTrendMode('production');};
|
||||
const reset=()=>{automaticPeriod.current=false;const previous=defaultQueryMonth(options);setYear(previous.year);setMonth(previous.month);setQuarter(previousCompleteQuarter().quarter);setPeriod('month');setTrendGranularity('month');setDepartment([]);setGroup([]);setProduct([]);setProjectGroup([]);setSourceFilters([]);setSearch('');setAppliedSearch('');setDrilledProduct('');setApplied(stageProductQuery({year:previous.year,month:previous.month,includeUnassigned,view:'product',trendGranularity:'month',releaseId:catalog?.releaseId},stage,[]));setRevision(v=>v+1);};
|
||||
const reset=()=>{automaticPeriod.current=false;const previous=defaultQueryMonth(options);setYear(previous.year);setMonth(previous.month);setQuarter(previousCompleteQuarter().quarter);setPeriod('month');setTrendGranularity('month');setDepartment([]);setGroup([]);setProduct([]);setProjectGroup([]);setSourceFilters([]);setExtraFilters({});setSearch('');setAppliedSearch('');setDrilledProduct('');setApplied(stageProductQuery({year:previous.year,month:previous.month,includeUnassigned,view:'product',trendGranularity:'month',releaseId:catalog?.releaseId},stage,[]));setRevision(v=>v+1);};
|
||||
const groups=(options?.groups||[]).filter(name=>!department.length||department.includes(options?.groupDepartments?.[name]||''));
|
||||
const paths=options?.organizationPaths||[];const products=department.length||group.length?[...new Set(paths.filter(path=>(!department.length||department.includes(path.department||''))&&(!group.length||group.includes(path.group||''))).map(path=>path.product).filter((v):v is string=>!!v))]:options?.products||[];
|
||||
const trendOptions=useMemo(()=>[...products.map(value=>({label:value,value})),...(drilledProduct==='__UNASSIGNED__'?[{label:'未分类',value:drilledProduct}]:[])],[products,drilledProduct]);
|
||||
const trendObject=drilledProduct||exactProductSearch;
|
||||
const drilledLabel=drilledProduct==='__UNASSIGNED__'?'未分类':drilledProduct;
|
||||
const select=(name:string,value:string[],choices:string[],change:(v:string[])=>void,extra=false)=><label className={`query-field ${extra?'query-extra-field':'query-primary-field'}`}><span>{name}</span><Select {...readableSelectPopup} mode="multiple" allowClear showSearch optionFilterProp="label" aria-label={name} placeholder="全部" maxTagCount="responsive" value={value} options={[...new Set([...choices,...value])].map(v=>({label:v==='__UNASSIGNED__'?'未分类':v,value:v}))} onChange={change}/></label>;
|
||||
const moreFilterCount=(projectGroup.length?1:0)+sourceFilters.length;
|
||||
const moreFilterSummary=[projectGroup.length?`项目组:${projectGroup.map(v=>v==='__UNASSIGNED__'?'未分类':v).join('、')}`:'',...sourceFilters.map(rule=>fields.find(field=>field.key===rule.field)?.label||rule.field)].filter(Boolean).join(';');
|
||||
const select=(name:string,value:string[],choices:string[],change:(v:string[])=>void,extra=false)=><div role="group" className={`query-field ${extra?'query-extra-field':'query-primary-field'}`}><span>{name}</span><Select {...readableSelectPopup} mode="multiple" allowClear showSearch optionFilterProp="label" aria-label={name} placeholder="全部" maxTagCount="responsive" value={value} options={[...new Set([...choices,...value])].map(v=>({label:v==='__UNASSIGNED__'?'未分类':v,value:v}))} onChange={change}/></div>;
|
||||
const moreFilterCount=(projectGroup.length?1:0)+sourceFilters.length+Object.values(extraFilters).filter(values=>values.length).length;
|
||||
const salesSelection=salesOrderTypeSelection(extraFilters);
|
||||
const moreFilterSummary=[salesSelection.values.length?`销售订单类型${salesSelection.exclude?'(排除)':''}:`+salesSelection.values.map(value=>value==='__EMPTY__'?'未匹配':value).join('、'):'',projectGroup.length?`项目组:${projectGroup.map(v=>v==='__UNASSIGNED__'?'未分类':v).join('、')}`:'',...sourceFilters.map(rule=>fields.find(field=>field.key===rule.field)?.label||rule.field)].filter(Boolean).join(';');
|
||||
const displayed = useRetainedResult(current && applied ? { data: current, query: applied } : null);
|
||||
const sortedRows=useMemo(()=>sortStageRowsByTotalWeight(displayed?.data.rows||[],stage),[displayed?.data,stage]);
|
||||
const trendRefreshing=!trendError&&(trendLoading||trendResponse?.key!==trendKey);
|
||||
@@ -99,26 +105,27 @@ export default function StageProductPage({stage,onUnauthorized}:{stage:Stage;onU
|
||||
const formulaKey=stage==='black'?'blackRate':rateBasis==='original'?'brightRate':'brightRateWithoutHeadquartersScrap';
|
||||
return <div className="query-page stage-product-page">
|
||||
{supportError&&<Alert showIcon type="error" message="查询条件读取失败" description={supportError} action={<Button onClick={()=>void loadSupport()}>重试</Button>}/>}
|
||||
<section className="query-toolbar panel" aria-label={`${label}汇总条件`}>
|
||||
<section className="query-toolbar panel" data-snapshot-module="filters" aria-label={`${label}汇总条件`}>
|
||||
<Segmented aria-label="统计周期" value={period} options={[{label:'年度',value:'year'},{label:'季度',value:'quarter'},{label:'月度',value:'month'}]} onChange={v=>{automaticPeriod.current=false;setPeriod(v as PeriodKind);}}/>
|
||||
<label className="query-field query-period-field query-period-year"><span>年份</span><Select aria-label="年份" value={year} onChange={v=>{automaticPeriod.current=false;setYear(v);}} options={(options?.years?.length?options.years:[year]).map(v=>({label:`${v}年`,value:v}))}/></label>
|
||||
{period==='month'&&<label className="query-field query-period-field query-period-month"><span>月份</span><Select aria-label="月份" value={month} onChange={v=>{automaticPeriod.current=false;setMonth(v);}} options={Array.from({length:12},(_,i)=>({label:`${String(i+1).padStart(2,'0')}月`,value:i+1}))}/></label>}
|
||||
{period==='quarter'&&<label className="query-field query-period-field query-period-quarter"><span>季度</span><Select aria-label="季度" value={quarter} onChange={v=>{automaticPeriod.current=false;setQuarter(v);}} options={[1,2,3,4].map(v=>({label:`第${v}季度`,value:v}))}/></label>}
|
||||
<div role="group" className="query-field query-period-field query-period-year"><span>年份</span><Select aria-label="年份" value={year} onChange={v=>{automaticPeriod.current=false;setYear(v);}} options={(options?.years?.length?options.years:[year]).map(v=>({label:`${v}年`,value:v}))}/></div>
|
||||
{period==='month'&&<div role="group" className="query-field query-period-field query-period-month"><span>月份</span><Select aria-label="月份" value={month} onChange={v=>{automaticPeriod.current=false;setMonth(v);}} options={Array.from({length:12},(_,i)=>({label:`${String(i+1).padStart(2,'0')}月`,value:i+1}))}/></div>}
|
||||
{period==='quarter'&&<div role="group" className="query-field query-period-field query-period-quarter"><span>季度</span><Select aria-label="季度" value={quarter} onChange={v=>{automaticPeriod.current=false;setQuarter(v);}} options={[1,2,3,4].map(v=>({label:`第${v}季度`,value:v}))}/></div>}
|
||||
{select('产业部',department,options?.departments||[],values=>{setDepartment(values);setGroup([]);setProduct([]);})}
|
||||
{select('业务分组',group,groups,values=>{setGroup(values);setProduct([]);})}
|
||||
{select('产品',product,products,setProduct)}
|
||||
<div className="query-more-toggle" title={moreFilterSummary||undefined}>
|
||||
<Button type="text" size="small" icon={moreFiltersOpen?<UpOutlined/>:<DownOutlined/>} aria-expanded={moreFiltersOpen} aria-controls={`stage-more-filters-${stage}`} onClick={()=>setMoreFiltersOpen(open=>!open)}>更多筛选{moreFilterCount?`(已选 ${moreFilterCount} 项)`:''}</Button>
|
||||
{moreFilterCount>0&&<Button type="link" size="small" onClick={()=>{setProjectGroup([]);setSourceFilters([]);}}>清除</Button>}
|
||||
{moreFilterCount>0&&<Button type="link" size="small" onClick={()=>{setProjectGroup([]);setSourceFilters([]);setExtraFilters({});}}>清除</Button>}
|
||||
</div>
|
||||
<div className="query-toolbar-tail"><span className={`query-status ${queryBusy?'busy':queryFailed?'failed':''}`}><i/>{queryBusy?'正在查询':queryFailed?'查询失败':'查询完成'}</span><Button type="default" onClick={reset}>重置</Button></div>
|
||||
<div className="query-toolbar-tail"><QuerySnapshotButton title={`${label}汇总`} queryKey={JSON.stringify([draft,trendMode,trendObject,trendGranularity,rateBasis,fullFields,defectDisplay,revision])} disabled={queryBusy || !current} onUnauthorized={onUnauthorized} /><span className={`query-status ${queryBusy?'busy':queryFailed?'failed':''}`}><i/>{queryBusy?'正在查询':queryFailed?'查询失败':'查询完成'}</span><Button type="default" onClick={reset}>重置</Button></div>
|
||||
{moreFiltersOpen&&<div className="query-extra-fields" id={`stage-more-filters-${stage}`}>
|
||||
{extraFields.map(field=><SalesOrderTypeSelect key={field.key} field={field} filters={extraFilters} releaseId={draft.releaseId} stage={stage} onUnauthorized={onUnauthorized} onChange={setExtraFilters}/>)}
|
||||
{options?.projectGroupStatus==='READY'&&select('项目组',projectGroup,options.projectGroups||[],setProjectGroup,true)}
|
||||
{catalog&&<StageSourceFilters stage={stage} fields={fields} query={draft} value={sourceFilters} onChange={setSourceFilters} onUnauthorized={onUnauthorized}/>}
|
||||
</div>}
|
||||
</section>
|
||||
{error&&<Alert showIcon type="error" message={response?"更新失败,当前显示上次结果":"查询失败"} description={error} action={<Button onClick={()=>setRevision(v=>v+1)}>重试</Button>}/>}
|
||||
<section className="metric-strip stage-metric-strip" aria-label="质量指标" aria-busy={loading} inert={!current}>
|
||||
<section className="metric-strip stage-metric-strip" data-snapshot-module="metrics" aria-label="质量指标" aria-busy={loading} inert={!current}>
|
||||
{stage==='bright'&&<div className="rate-basis-control"><Segmented size="small" aria-label="合格率口径" value={rateBasis} options={[{label:'原口径',value:'original'},{label:'去本部报废',value:'withoutHeadquartersScrap'}]} onChange={v=>setRateBasis(v as typeof rateBasis)}/></div>}
|
||||
<MetricCard primary stage={stage} label={`${label}合格率`} value={rate(stageRate)} onClick={()=>setBasisOpen(true)}/>
|
||||
<MetricCard label="合格重量" value={`${weight(summary?.qualifiedWeight)} kg`} onClick={()=>openDetail(null,stage)}/>
|
||||
@@ -155,7 +162,7 @@ export default function StageProductPage({stage,onUnauthorized}:{stage:Stage;onU
|
||||
<section className="panel section-panel defects-panel" aria-busy={loading||!current}>
|
||||
<div className="section-heading-row"><SectionHeading title="不良具体构成"/></div>
|
||||
<div className="stage-defect-comparison">
|
||||
<section className="defect-stage-column" inert={!current||loading} aria-label={`${label}不良构成`}>
|
||||
<section className="defect-stage-column" data-snapshot-module="defects" inert={!current||loading} aria-label={`${label}不良构成`}>
|
||||
<h3 className={`defect-stage-title ${stage}`}><i/>{label}</h3>
|
||||
{displayed?.data.defects[stage]?.length ? <DefectBreakdown items={displayed.data.defects[stage]} stage={stage} totalWeight={summary?.totalWeight} maximum={Math.max(0,...displayed.data.defects[stage].map(item=>item.weight||0))} onDetail={()=>openDetail(null,stage)}/> : <Empty image={Empty.PRESENTED_IMAGE_SIMPLE} description={loading?'正在查询不良数据…':'当前条件下暂无不良分类数据'}/>}
|
||||
</section>
|
||||
|
||||
@@ -16,8 +16,8 @@ function SourceValues({field,stage,query,value,onChange,onUnauthorized}:{field:S
|
||||
if(!active)return;
|
||||
const generation=++current.current,controller=new AbortController();setBusy(true);setError('');setChoices([]);
|
||||
const timer=window.setTimeout(()=>{
|
||||
const {year,month,quarter,department,group,product,projectGroup,includeUnassigned,columnFilters,releaseId}=query;
|
||||
void api.sourceColumnValues({releaseId,period:{year,...(month?{month}:{}),...(quarter?{quarter}:{})},filters:{...(department?{department}:{}),...(group?{group}:{}),...(product?{product}:{}),...(projectGroup?{projectGroup}:{}),includeUnassigned:!!includeUnassigned,columnFilters:(columnFilters||[]).filter(rule=>rule.field!==field.key)},field:field.key,stages:[stage],search,limit:50,offset:0},controller.signal)
|
||||
const {year,month,quarter,department,group,product,projectGroup,includeUnassigned,columnFilters,releaseId,extraFilters}=query;
|
||||
void api.sourceColumnValues({releaseId,period:{year,...(month?{month}:{}),...(quarter?{quarter}:{})},filters:{...(department?{department}:{}),...(group?{group}:{}),...(product?{product}:{}),...(projectGroup?{projectGroup}:{}),...(extraFilters?{extraFilters}:{}),includeUnassigned:!!includeUnassigned,columnFilters:(columnFilters||[]).filter(rule=>rule.field!==field.key)},field:field.key,stages:[stage],search,limit:50,offset:0},controller.signal)
|
||||
.then(result=>{if(current.current!==generation)return;setChoices(result.values.filter((v):v is string=>typeof v==='string'));setMore(result.hasMore===true||(result.total??0)>50);})
|
||||
.catch(failure=>{if(controller.signal.aborted||current.current!==generation)return;if(!onUnauthorized(failure))setError(failure instanceof Error?failure.message:'选项读取失败');})
|
||||
.finally(()=>{if(current.current===generation)setBusy(false);});
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
import { useDeleteConfirmation } from './useDeleteConfirmation';
|
||||
import { newMasterDataCode } from './masterDataIdentity';
|
||||
import { ConfigurationWorkbookActions } from './ConfigurationWorkbookActions';
|
||||
import { matchRuleConflicts } from './classificationMaintenance';
|
||||
@@ -145,6 +146,7 @@ function BatchImport({ open, title, columns, existing, writeTarget = '草稿', o
|
||||
}
|
||||
|
||||
export function MappingDefinitionEditor({ value, onChange, simplified = false, readOnly = false }: DefinitionProps & { simplified?: boolean; readOnly?: boolean }) {
|
||||
const confirmDelete = useDeleteConfirmation();
|
||||
const { message } = App.useApp();
|
||||
const [kind, setKind] = useState<MappingKind>('categoryLookup'); const [search, setSearch] = useState(''); const [status, setStatus] = useState('all');
|
||||
const [editing, setEditing] = useState<MappingRow | null>(null); const [newRow, setNewRow] = useState(false); const [importing, setImporting] = useState(false); const [editError, setEditError] = useState('');
|
||||
@@ -158,7 +160,7 @@ export function MappingDefinitionEditor({ value, onChange, simplified = false, r
|
||||
...(info.secondary ? [{ title: info.secondary, dataIndex: 'secondary', key: 'secondary', width: 180 }] : []),
|
||||
{ title: info.target, dataIndex: 'target', key: 'target', width: 220, render: target => target === null ? <span className="structured-config-muted">未配置</span> : target },
|
||||
{ title: '状态', dataIndex: 'enabled', key: 'enabled', width: 100, render: enabled => <Tag color={enabled ? 'green' : 'default'}>{enabled ? '启用' : '停用'}</Tag> },
|
||||
...(!readOnly ? [{ title: '操作', key: 'actions', width: 205, render: (_: unknown, row: MappingRow) => <span className="task-actions"><Button type="link" onClick={() => openRow(row)}>编辑</Button><Button type="link" onClick={() => onChange(setMappingRows(value, kind, rows.map(item => item.key === row.key ? { ...item, enabled: !item.enabled } : item)))}>{row.enabled ? '停用' : '恢复'}</Button><Button type="link" danger onClick={() => onChange(setMappingRows(value, kind, rows.filter(item => item.key !== row.key)))}>删除</Button></span> }] : []),
|
||||
...(!readOnly ? [{ title: '操作', key: 'actions', width: 205, render: (_: unknown, row: MappingRow) => <span className="task-actions"><Button type="link" onClick={() => openRow(row)}>编辑</Button><Button type="link" onClick={() => onChange(setMappingRows(value, kind, rows.map(item => item.key === row.key ? { ...item, enabled: !item.enabled } : item)))}>{row.enabled ? '停用' : '恢复'}</Button><Button type="link" danger onClick={() => confirmDelete({title:`删除这条${info.label}?`,description:`来源“${row.source}”对应“${row.target}”。删除后需保存并更新报表才生效。`,onConfirm:()=>onChange(setMappingRows(value, kind, rows.filter(item => item.key !== row.key)))})}>删除</Button></span> }] : []),
|
||||
];
|
||||
const headers = [info.source, ...(info.secondary ? [info.secondary] : []), info.target, '启用'];
|
||||
return <div className="structured-config-editor">
|
||||
@@ -209,6 +211,7 @@ const metadataOptions = (value: unknown, fallback: MatchOption[]): MatchOption[]
|
||||
: fallback;
|
||||
|
||||
export function MatchRulesDefinitionEditor({ value, onChange, metadata, readOnly = false }: DefinitionProps & { metadata?: MatchMetadata | null; readOnly?: boolean }) {
|
||||
const confirmDelete = useDeleteConfirmation();
|
||||
const [editing, setEditing] = useState<MatchRule | null>(null);
|
||||
const [search,setSearch]=useState('');
|
||||
const [error, setError] = useState('');
|
||||
@@ -249,7 +252,7 @@ export function MatchRulesDefinitionEditor({ value, onChange, metadata, readOnly
|
||||
{ title: '匹配条件', width: 410, render: (_, row) => <span className="structured-match-readable">{readableRule(row)}</span> },
|
||||
{ title: '阶段', dataIndex: 'stage', width: 104, render: stage => labelFor(stages, String(stage)) },
|
||||
{ title: '状态', dataIndex: 'enabled', width: 84, render: enabled => <Tag color={enabled ? 'green' : 'default'}>{enabled ? '启用' : '停用'}</Tag> },
|
||||
...(!readOnly ? [{ title: '操作', width: 150, render: (_: unknown, row: MatchRule) => <span className="task-actions"><Button type="link" onClick={() => open(row)}>编辑</Button><Button type="link" onClick={() => commit(rules.map(item => item.id === row.id ? { ...item, enabled: !item.enabled } : item))}>{row.enabled ? '停用' : '启用'}</Button><Button type="link" danger onClick={() => commit(rules.filter(item => item.id !== row.id))}>删除</Button></span> }] : []),
|
||||
...(!readOnly ? [{ title: '操作', width: 150, render: (_: unknown, row: MatchRule) => <span className="task-actions"><Button type="link" onClick={() => open(row)}>编辑</Button><Button type="link" onClick={() => commit(rules.map(item => item.id === row.id ? { ...item, enabled: !item.enabled } : item))}>{row.enabled ? '停用' : '启用'}</Button><Button type="link" danger onClick={() => confirmDelete({title:`删除匹配规则“${row.name || "未命名规则"}”?`,description:"将移除这条规则及其匹配条件,保存并更新报表后生效。",onConfirm:()=>commit(rules.filter(item => item.id !== row.id))})}>删除</Button></span> }] : []),
|
||||
]} locale={{ emptyText: '还没有条件匹配规则' }} />
|
||||
<Modal className="management-modal structured-config-modal" open={Boolean(editing)} title={editing?.id ? '编辑条件匹配规则' : '新增条件匹配规则'} width={860} okText="保存规则" onCancel={() => setEditing(null)} onOk={() => {
|
||||
if (!editing) return;
|
||||
@@ -267,7 +270,7 @@ export function MatchRulesDefinitionEditor({ value, onChange, metadata, readOnly
|
||||
{ title: '字段', width: 250, render: (_, condition, index) => <AutoComplete value={condition.field} options={fields} style={{ width: '100%' }} filterOption={(input, option) => String(option?.label || '').toLowerCase().includes(input.toLowerCase())} placeholder="选择或输入字段" onChange={field => setEditing({ ...editing, conditions: editing.conditions.map((row, rowIndex) => rowIndex === index ? { ...row, field } : row) })} /> },
|
||||
{ title: '判断方式', width: 180, render: (_, condition, index) => <Select {...readableSelectPopup} value={condition.operator} options={operators} style={{ width: '100%' }} onChange={operator => setEditing({ ...editing, conditions: editing.conditions.map((row, rowIndex) => rowIndex === index ? { ...row, operator, ...(operatorDescription(operator) ? {} : { value: undefined }) } : row) })} /> },
|
||||
{ title: '判断值', render: (_, condition, index) => ['IS_BLANK', 'IS_NOT_BLANK'].includes(condition.operator) ? <span className="structured-config-muted">无需填写</span> : <Input value={condition.value} onChange={event => setEditing({ ...editing, conditions: editing.conditions.map((row, rowIndex) => rowIndex === index ? { ...row, value: event.target.value } : row) })} /> },
|
||||
{ title: '', width: 82, render: (_, __, index) => <Button type="link" danger disabled={editing.conditions.length <= 1} onClick={() => setEditing({ ...editing, conditions: editing.conditions.filter((__, rowIndex) => rowIndex !== index) })}>移除</Button> },
|
||||
{ title: '', width: 82, render: (_, __, index) => <Button type="link" danger disabled={editing.conditions.length <= 1} onClick={() => confirmDelete({title:`移除条件 ${index + 1}?`,description:"将从当前匹配规则中移除此条件,保存规则后生效。",confirmText:"确认移除",onConfirm:()=>setEditing({ ...editing, conditions: editing.conditions.filter((__, rowIndex) => rowIndex !== index) })})}>移除</Button> },
|
||||
]} />
|
||||
<Form.Item label="处理范围"><Switch checked={editing.onlyUnclassified===true} disabled={!['group','projectGroup'].includes(editing.target) || rules.some(rule=>rule.id===editing.id && rule.onlyUnclassified===true)} checkedChildren="仅未分类" unCheckedChildren="全部匹配行" onChange={onlyUnclassified=>setEditing({...editing,onlyUnclassified})}/></Form.Item><div className="structured-config-form-grid" style={{ marginTop: 16 }}><Form.Item label="目标类型"><Select value={editing.target} options={targets} disabled={editing.onlyUnclassified===true} onChange={target => setEditing({ ...editing, target })} /></Form.Item><Form.Item label="匹配结果" required><Input value={editing.value} maxLength={190} onChange={event => setEditing({ ...editing, value: event.target.value })} placeholder="例如:工业电机-VCM" /></Form.Item></div>
|
||||
{error && <Alert showIcon type="error" message={error} />}
|
||||
@@ -277,6 +280,7 @@ export function MatchRulesDefinitionEditor({ value, onChange, metadata, readOnly
|
||||
}
|
||||
|
||||
export function MasterDataDefinitionEditor({ value, onChange, publishedNames, simplified = false, readOnly = false }: DefinitionProps & { publishedNames?: Partial<Record<MasterKind, string[]>> & { groupDepartments?: Record<string, string | null> }; simplified?: boolean; readOnly?: boolean }) {
|
||||
const confirmDelete = useDeleteConfirmation();
|
||||
const { message } = App.useApp(); const [kind, setKind] = useState<MasterKind>('departments'); const [search, setSearch] = useState('');
|
||||
const [editing, setEditing] = useState<MasterRow | null>(null); const [originalCode, setOriginalCode] = useState<string | null>(null); const [error, setError] = useState(''); const [importing, setImporting] = useState(false);
|
||||
const [departmentAtOpen, setDepartmentAtOpen] = useState<{ value: string } | null>(null);
|
||||
@@ -298,7 +302,7 @@ export function MasterDataDefinitionEditor({ value, onChange, publishedNames, si
|
||||
onChange(next); message.success(count ? `已从当前配置及对应值载入 ${count} 个名称,请核对后保存` : '现有名称均已在名录中');
|
||||
};
|
||||
const departments = masterRows(value, 'departments');
|
||||
const columns: ColumnsType<MasterRow> = [{ title: '名称', dataIndex: 'name', key: 'name', width: 300 }, ...(kind === 'groups' ? [{ title: '所属产业部', key: 'department', width: 220, render: (_: unknown, row: MasterRow) => { const department = departmentFor(row); const parent = departments.find(item => item.name === department); return department ? `${department}${parent && !parent.enabled ? '(已停用)' : ''}` : <span className="structured-config-muted">未设置</span>; } }] : []), { title: '状态', dataIndex: 'enabled', key: 'enabled', width: 100, render: enabled => <Tag color={enabled ? 'green' : 'default'}>{enabled ? '启用' : '停用'}</Tag> }, ...(!readOnly ? [{ title: '操作', key: 'actions', width: 205, render: (_: unknown, row: MasterRow) => <span className="task-actions"><Button type="link" onClick={() => openRow(row)}>编辑</Button><Button type="link" onClick={() => onChange(setMasterRows(value, kind, rows.map(item => item.code === row.code ? { ...item, enabled: !item.enabled } : item)))}>{row.enabled ? '停用' : '恢复'}</Button><Button type="link" danger onClick={() => onChange(setMasterRows(value, kind, rows.filter(item => item.code !== row.code)))}>删除</Button></span> }] : [])];
|
||||
const columns: ColumnsType<MasterRow> = [{ title: '名称', dataIndex: 'name', key: 'name', width: 300 }, ...(kind === 'groups' ? [{ title: '所属产业部', key: 'department', width: 220, render: (_: unknown, row: MasterRow) => { const department = departmentFor(row); const parent = departments.find(item => item.name === department); return department ? `${department}${parent && !parent.enabled ? '(已停用)' : ''}` : <span className="structured-config-muted">未设置</span>; } }] : []), { title: '状态', dataIndex: 'enabled', key: 'enabled', width: 100, render: enabled => <Tag color={enabled ? 'green' : 'default'}>{enabled ? '启用' : '停用'}</Tag> }, ...(!readOnly ? [{ title: '操作', key: 'actions', width: 205, render: (_: unknown, row: MasterRow) => <span className="task-actions"><Button type="link" onClick={() => openRow(row)}>编辑</Button><Button type="link" onClick={() => onChange(setMasterRows(value, kind, rows.map(item => item.code === row.code ? { ...item, enabled: !item.enabled } : item)))}>{row.enabled ? '停用' : '恢复'}</Button><Button type="link" danger onClick={() => confirmDelete({title:`删除${masterLabels[kind]}“${row.name}”?`,description:"将从当前名录移除,保存并更新报表后生效。请确认相关对应关系不再使用此项。",onConfirm:()=>onChange(setMasterRows(value, kind, rows.filter(item => item.code !== row.code)))})}>删除</Button></span> }] : [])];
|
||||
const csvHeaders = kind === 'groups' ? ['名称', '启用', '所属产业部'] : ['名称', '启用'];
|
||||
const departmentValue = Form.useWatch('department', form);
|
||||
const selectedDepartment = typeof departmentValue === 'string' ? departmentValue : '';
|
||||
|
||||
@@ -26,7 +26,7 @@ export function TasksMonitorPage({user,onUnauthorized}:{user:AuthUser;onUnauthor
|
||||
const loading = sectionLoading();
|
||||
const [filter,setFilter]=useState('all'); const [selected,setSelected]=useState<MonitorRow|null>(null);
|
||||
const actionInFlight = useRef(false);
|
||||
const canManage=user.roles.some(role=>['SYSTEM_ADMIN','SYSTEM_OPERATOR'].includes(role));
|
||||
const canManage=user.roles.some(role=>['SYSTEM_ADMIN'].includes(role));
|
||||
function sectionLoading() { return section === 'tasks' ? taskBusy.busy : backupBusy.busy; }
|
||||
const loadTasks=useCallback(()=>taskBusy.run(async()=>{
|
||||
try { const value=await api.taskOverview();setItems(value.items);setTaskError('');setTasksLoaded(true); }
|
||||
@@ -74,6 +74,6 @@ export function TasksMonitorPage({user,onUnauthorized}:{user:AuthUser;onUnauthor
|
||||
</> },
|
||||
...(canManage ? [{ key:'monitor', label:'运行监控与告警', children:<OperationsMonitorPanel user={user} onUnauthorized={onUnauthorized}/> },{ key:'backups', label:'备份管理', children:<BackupOperationsPanel user={user} onUnauthorized={onUnauthorized}/> }] : []),
|
||||
]} />
|
||||
<Drawer open={!!selected} title="任务详情" width={Math.min(620,window.innerWidth)} onClose={()=>setSelected(null)}>{selected&&<dl className="nc-form-grid"><dt>任务</dt><dd>{monitorLabel(selected.type,'后台任务')}</dd><dt>状态</dt><dd>{monitorLabel(selected.status)}</dd><dt>阶段</dt><dd>{monitorLabel(selected.stage,monitorLabel(selected.status))}</dd>{Number(selected.total)>0&&<><dt>已处理 / 总数</dt><dd>{String(selected.processed??0)} / {String(selected.total)}</dd></>}<dt>提交时间</dt><dd>{configurationDateTime(selected.createdAt)}</dd>{isFailed(selected)&&<><dt>失败原因</dt><dd style={{whiteSpace:'pre-wrap',overflowWrap:'anywhere'}}>{taskFailure(selected)}</dd></>}<dt>任务编号</dt><dd style={{overflowWrap:'anywhere'}}>{String(selected.id)}</dd></dl>}{selected?.sourceKind==='TASK'&&<div className="completion-actions">{selected.status==='FAILED'&&!!selected.importRunId&&user.roles.some(role=>['SYSTEM_ADMIN','DATA_MAINTAINER'].includes(role))&&<Button loading={busy} onClick={()=>void runAction(selected,'retry')}>重试导入</Button>}{selected.status==='QUEUED'&&user.roles.some(role=>['SYSTEM_ADMIN','SYSTEM_OPERATOR','DATA_MAINTAINER'].includes(role))&&<Button danger loading={busy} onClick={()=>void runAction(selected,'cancel')}>取消排队任务</Button>}</div>}{selected?.sourceKind==='ANALYSIS'&&!!selected.sessionId&&<Button href={`?page=analysis&sessionId=${encodeURIComponent(String(selected.sessionId))}&turnId=${encodeURIComponent(String(selected.id))}`}>查看分析记录</Button>}</Drawer>
|
||||
<Drawer open={!!selected} title="任务详情" width={Math.min(620,window.innerWidth)} onClose={()=>setSelected(null)}>{selected&&<dl className="nc-form-grid"><dt>任务</dt><dd>{monitorLabel(selected.type,'后台任务')}</dd><dt>状态</dt><dd>{monitorLabel(selected.status)}</dd><dt>阶段</dt><dd>{monitorLabel(selected.stage,monitorLabel(selected.status))}</dd>{Number(selected.total)>0&&<><dt>已处理 / 总数</dt><dd>{String(selected.processed??0)} / {String(selected.total)}</dd></>}<dt>提交时间</dt><dd>{configurationDateTime(selected.createdAt)}</dd>{isFailed(selected)&&<><dt>失败原因</dt><dd style={{whiteSpace:'pre-wrap',overflowWrap:'anywhere'}}>{taskFailure(selected)}</dd></>}<dt>任务编号</dt><dd style={{overflowWrap:'anywhere'}}>{String(selected.id)}</dd></dl>}{selected?.sourceKind==='TASK'&&<div className="completion-actions">{selected.status==='FAILED'&&!!selected.importRunId&&user.roles.some(role=>['SYSTEM_ADMIN', 'DATA_ADMIN'].includes(role))&&<Button loading={busy} onClick={()=>void runAction(selected,'retry')}>重试导入</Button>}{selected.status==='QUEUED'&&user.roles.some(role=>['SYSTEM_ADMIN', 'DATA_ADMIN'].includes(role))&&<Button danger loading={busy} onClick={()=>void runAction(selected,'cancel')}>取消排队任务</Button>}</div>}{selected?.sourceKind==='ANALYSIS'&&!!selected.sessionId&&<Button href={`?page=analysis&sessionId=${encodeURIComponent(String(selected.sessionId))}&turnId=${encodeURIComponent(String(selected.id))}`}>查看分析记录</Button>}</Drawer>
|
||||
</>;
|
||||
}
|
||||
|
||||
+17
-1
@@ -1,6 +1,7 @@
|
||||
import { WORKSPACE_INVALIDATED } from './pageCache';
|
||||
import { consumeEventStream, type StreamEvent } from './eventStream';
|
||||
import { publicErrorMessage } from './publicDataDisplay';
|
||||
import type { SalesOrderTypePreview,SalesOrderTypeStatus } from './salesOrderTypes';
|
||||
import {
|
||||
clearReadCache,
|
||||
configureRequestScope,
|
||||
@@ -205,11 +206,22 @@ async function mutateForm<T>(path: string, body: FormData): Promise<T> {
|
||||
}
|
||||
|
||||
export const api = {
|
||||
salesOrderTypeStatus() { return request<SalesOrderTypeStatus>('/api/sales-order-types'); },
|
||||
async salesOrderTypePreview(file:File,mode:string) {
|
||||
const body=new FormData();body.append('file',file);body.append('mode',mode);
|
||||
const token=csrfToken??await refreshCsrf();
|
||||
return request<SalesOrderTypePreview>('/api/sales-order-types/preview',{method:'POST',headers:{'X-XSRF-TOKEN':token},body},900_000);
|
||||
},
|
||||
importSalesOrderTypes(file:File,mode:string,expectedVersion:string,sha256:string) {
|
||||
const body=new FormData();body.append('file',file);body.append('mode',mode);body.append('expectedVersion',expectedVersion);body.append('sha256',sha256);
|
||||
return mutateForm<{versionId:string}>('/api/sales-order-types/import',body);
|
||||
},
|
||||
activateSalesOrderTypes(versionId:string,expectedVersion:string) { return mutate<{versionId:string}>('/api/sales-order-types/activate',{versionId,expectedVersion}); },
|
||||
sourceColumnCatalog(releaseId?: string, signal?: AbortSignal) { return request<{releaseId:string;sourceFields:SourceColumnField[]}>(`/api/analysis/source/catalog?${toQuery({releaseId})}`, { signal }); },
|
||||
sourceColumnValues(body: Record<string,unknown>, signal?: AbortSignal) { return queryPost<{values:Array<string|null>;hasMore?:boolean;total?:number;limit?:number}>('/api/analysis/source/values',body,signal); },
|
||||
workspaceState() { return request<{ authRevision: string; dataRevision: string; currentReleaseId: string | null }>('/api/workspace/state', {}, 8000); },
|
||||
filterFields(manage = false, signal?: AbortSignal) { return request<FilterField[]>(`/api/filter-fields?manage=${manage}`, { signal }); },
|
||||
filterFieldOptions(key: string, search = '', signal?: AbortSignal) { return request<{ values: string[]; hasMore: boolean }>(`/api/filter-fields/options?${toQuery({key, search})}`, { signal }); },
|
||||
filterFieldOptions(key: string, search = '', signal?: AbortSignal,releaseId?:string,stage?:string) { return request<{ values: string[]; hasMore: boolean }>(`/api/filter-fields/options?${toQuery({key, search,releaseId,stage})}`, { signal }); },
|
||||
filterFieldColumns() { return request<{ black: string[]; bright: string[] }>('/api/filter-fields/columns'); },
|
||||
saveFilterFields(fields: FilterField[]) { return mutate<FilterField[]>('/api/filter-fields', fields, 'PUT'); },
|
||||
refreshCsrf,
|
||||
@@ -452,6 +464,9 @@ export const api = {
|
||||
updateUser(id: string, body: Record<string, unknown>) {
|
||||
return mutate<unknown>(`/api/users/${encodeURIComponent(id)}`, body, 'PUT');
|
||||
},
|
||||
deleteUser(id: string, expectedRowVersion: number) {
|
||||
return mutate<{ deleted: boolean; id: string }>(`/api/users/${encodeURIComponent(id)}`, { expectedRowVersion }, 'DELETE');
|
||||
},
|
||||
analysis(body: { query: string; sessionId?: string; context?: Record<string, unknown> }) {
|
||||
return mutate<unknown>('/api/analysis', body);
|
||||
},
|
||||
@@ -778,6 +793,7 @@ function isImmutableRead(path: string): boolean {
|
||||
|
||||
function requestResourceTags(path: string): string[] {
|
||||
const pathname = requestPath(path);
|
||||
if(pathname.startsWith('/api/sales-order-types'))return ['configuration','metrics','trend','records','options','catalog','query'];
|
||||
if (pathname.startsWith('/api/metrics')) return ['metrics', 'trend', 'query'];
|
||||
if (pathname.startsWith('/api/options')) return ['options', 'query'];
|
||||
if (pathname.startsWith('/api/filter-fields') || pathname === '/api/analysis/source/catalog') return ['options', 'catalog', 'configuration'];
|
||||
|
||||
@@ -658,3 +658,5 @@
|
||||
@media(max-width:760px) {
|
||||
.page-view:is([data-page="rules"],[data-page="mappings"],[data-page="masterData"],[data-page="tasks"],[data-page="access"]) .panel { padding-inline: 12px; }
|
||||
}
|
||||
|
||||
.deletion-confirmation :is(.ant-modal-title,.ant-modal-confirm-title,.ant-modal-confirm-content){overflow-wrap:anywhere}
|
||||
|
||||
@@ -17,7 +17,6 @@
|
||||
background: var(--surface, #fff) !important;
|
||||
border: 1px solid var(--line);
|
||||
box-shadow: 0 6px 18px rgba(18, 30, 52, .18);
|
||||
opacity: 1;
|
||||
}
|
||||
.source-records-drawer .ant-table-tbody > tr > td { padding: 8px 9px; vertical-align: top; }
|
||||
.source-fields summary { width: fit-content; color: var(--blue-dark); cursor: pointer; font-size: 12px; }
|
||||
@@ -41,7 +40,7 @@
|
||||
display: grid; grid-template-columns: minmax(170px, .85fr) minmax(180px, 1fr) minmax(220px, 1.3fr) minmax(160px, .8fr) auto;
|
||||
gap: 10px; align-items: end; margin: 10px 0 14px;
|
||||
}
|
||||
.record-query-tools > label { display: grid; gap: 5px; color: var(--ink-muted); font-size: 11px; }
|
||||
.record-query-tools > :is(label,[role="group"]) { display: grid; gap: 5px; color: var(--ink-muted); font-size: 11px; }
|
||||
.record-query-tools .ant-select { width: 100%; }
|
||||
.record-query-tools .ant-segmented { align-self: end; }
|
||||
.record-query-tools + .ant-alert { margin-bottom: 12px; }
|
||||
|
||||
@@ -0,0 +1,11 @@
|
||||
.query-snapshot-controls { display:inline-flex; }
|
||||
.query-snapshot-modules { display:grid; grid-template-columns:1fr 1fr; gap:14px 18px; width:100%; margin-top:20px; }
|
||||
.query-snapshot-note { color:var(--ink-muted); margin:20px 0 4px; }
|
||||
.query-snapshot-capture { box-sizing:border-box; gap:12px; overflow:visible; }
|
||||
.query-snapshot-heading { display:flex; align-items:center; justify-content:space-between; gap:16px; padding:4px 0 8px; color:var(--ink); }
|
||||
.query-snapshot-heading strong { font-size:20px; }
|
||||
.query-snapshot-heading span { color:var(--ink-muted); font-size:12px; }
|
||||
.query-snapshot-capture > * { flex-shrink:0; }
|
||||
.query-snapshot-capture .query-snapshot-filter-summary { width:100%; flex-basis:100%; color:var(--ink); white-space:normal; overflow-wrap:anywhere; }
|
||||
.query-snapshot-capture .query-snapshot-defect-module { background:var(--surface); border:1px solid var(--line); padding:16px; border-radius:var(--panel-radius,4px); }
|
||||
.query-snapshot-capture :is(.ant-btn,.object-drilldown,.table-value,.header-link) { cursor:default; }
|
||||
@@ -0,0 +1,124 @@
|
||||
export const QUERY_SNAPSHOT_MODULES = [
|
||||
{ key: 'filters', label: '查询条件' }, { key: 'metrics', label: '指标卡片' },
|
||||
{ key: 'trend', label: '变化趋势' }, { key: 'table', label: '汇总表' },
|
||||
{ key: 'defects', label: '不良构成' }, { key: 'pareto', label: '细分缺陷柏拉图' },
|
||||
] as const;
|
||||
export type QuerySnapshotModule = typeof QUERY_SNAPSHOT_MODULES[number]['key'];
|
||||
const KEYS = new Set<string>(QUERY_SNAPSHOT_MODULES.map(module => module.key));
|
||||
|
||||
export function parseSnapshotModules(raw: unknown): QuerySnapshotModule[] {
|
||||
if (!Array.isArray(raw)) return QUERY_SNAPSHOT_MODULES.map(module => module.key);
|
||||
return QUERY_SNAPSHOT_MODULES.filter(module => raw.includes(module.key) && KEYS.has(module.key)).map(module => module.key);
|
||||
}
|
||||
|
||||
export function snapshotImageSize(width: number, height: number) {
|
||||
if (!Number.isFinite(width) || !Number.isFinite(height) || width <= 0 || height <= 0) throw new Error('页面尺寸无效,请重试');
|
||||
const pixelRatio = Math.min(2, 16384 / width, 16384 / height, Math.sqrt(32_000_000 / (width * height)));
|
||||
if (pixelRatio < 1) throw new Error('所选内容过长,请减少模块或汇总表每页条数');
|
||||
return { width: Math.ceil(width), height: Math.ceil(height), pixelRatio };
|
||||
}
|
||||
|
||||
export function snapshotFilename(title: string, date = new Date()) {
|
||||
const stamp = `${date.getFullYear()}${String(date.getMonth() + 1).padStart(2, '0')}${String(date.getDate()).padStart(2, '0')}-${String(date.getHours()).padStart(2, '0')}${String(date.getMinutes()).padStart(2, '0')}${String(date.getSeconds()).padStart(2, '0')}`;
|
||||
return `${title.replace(/[\\/:*?"<>|]/g, '_')}-页面快照-${stamp}.png`;
|
||||
}
|
||||
|
||||
export function snapshotModuleElements(root: HTMLElement, selected: QuerySnapshotModule[]) {
|
||||
return QUERY_SNAPSHOT_MODULES.filter(module => selected.includes(module.key)).map(module => {
|
||||
const node = root.querySelector<HTMLElement>(`[data-snapshot-module="${module.key}"]`);
|
||||
if (!node || !node.offsetWidth) throw new Error(`当前页面没有可导出的“${module.label}”`);
|
||||
return { ...module, node };
|
||||
});
|
||||
}
|
||||
|
||||
export function snapshotTask<T>(task: Promise<T>, signal: AbortSignal, timeoutMs: number, timeoutMessage: string): Promise<T> {
|
||||
return new Promise((resolve, reject) => {
|
||||
let settled = false;
|
||||
const abort = () => finish(() => reject(new Error('已取消生成快照')));
|
||||
const timer = setTimeout(() => finish(() => reject(new Error(timeoutMessage))), timeoutMs);
|
||||
function finish(done: () => void) { if (settled) return; settled = true; clearTimeout(timer); signal.removeEventListener('abort', abort); done(); }
|
||||
task.then(value => finish(() => resolve(value)), error => finish(() => reject(error)));
|
||||
if (signal.aborted) abort();
|
||||
else signal.addEventListener('abort', abort, { once: true });
|
||||
});
|
||||
}
|
||||
|
||||
/** Clone the selected modules only; never hide or reflow the live query page. */
|
||||
export async function captureQuerySnapshot(root: HTMLElement, selected: QuerySnapshotModule[], title: string, cancelled: () => boolean, signal: AbortSignal, progress: (message: string) => void): Promise<Blob> {
|
||||
if (!selected.length) throw new Error('请至少选择一个模块');
|
||||
const check = () => { if (cancelled() || !root.isConnected || !root.offsetWidth) throw new Error('查询页面已变化,请重新生成快照'); };
|
||||
check();
|
||||
root.dispatchEvent(new CustomEvent('quality:query-snapshot', { detail: { modules: selected } }));
|
||||
const modules = snapshotModuleElements(root, selected);
|
||||
progress('正在等待所选模块加载完成…');
|
||||
const started = performance.now();
|
||||
let previous = '', stableSince = performance.now();
|
||||
while (true) {
|
||||
check();
|
||||
const failed = modules.find(({ node }) => node.dataset.snapshotReady === 'error');
|
||||
if (failed) throw new Error(`“${failed.label}”读取失败,请重试后生成快照`);
|
||||
const busy = modules.some(({ node }) => node.dataset.snapshotReady === 'false' || node.matches('[aria-busy="true"],[inert]') || node.querySelector('[aria-busy="true"],[inert]'));
|
||||
const signature = modules.map(({ node }) => node.innerHTML).join('');
|
||||
if (signature !== previous || busy) { previous = signature; stableSince = performance.now(); }
|
||||
if (!busy && performance.now() - stableSince >= 250) break;
|
||||
if (performance.now() - started > 30_000) throw new Error('所选模块仍在更新,请等待查询完成后重试');
|
||||
await new Promise(resolve => setTimeout(resolve, 80));
|
||||
}
|
||||
await snapshotTask(root.ownerDocument.fonts.ready, signal, 5000, '字体尚未加载完成,请稍后重试');
|
||||
progress('正在生成图片…');
|
||||
check();
|
||||
const frame = document.createElement('div');
|
||||
frame.className = `${root.className} query-snapshot-capture`;
|
||||
frame.setAttribute('aria-hidden', 'true');
|
||||
frame.inert = true;
|
||||
Object.assign(frame.style, { position: 'fixed', left: '-100000px', top: '0', width: `${root.offsetWidth + 32}px`, padding: '16px', margin: '0', zIndex: '-1', pointerEvents: 'none', background: getComputedStyle(document.documentElement).backgroundColor });
|
||||
const heading = document.createElement('header');
|
||||
heading.className = 'query-snapshot-heading';
|
||||
const name = document.createElement('strong'); name.textContent = title;
|
||||
const time = document.createElement('span'); time.textContent = new Date().toLocaleString('zh-CN');
|
||||
heading.append(name, time); frame.append(heading);
|
||||
try {
|
||||
for (const { key, node } of modules) {
|
||||
const clone = node.cloneNode(true) as HTMLElement;
|
||||
clone.removeAttribute('inert'); clone.removeAttribute('aria-busy');
|
||||
// Canvas-based renderers need their pixels copied; SVG charts already clone losslessly.
|
||||
const canvases = [...node.querySelectorAll('canvas')];
|
||||
[...clone.querySelectorAll('canvas')].forEach((canvas, index) => {
|
||||
const image = document.createElement('img'); image.src = canvases[index].toDataURL();
|
||||
image.style.cssText = canvas.style.cssText; image.width = canvases[index].width; image.height = canvases[index].height;
|
||||
canvas.replaceWith(image);
|
||||
});
|
||||
const sourceInputs = [...node.querySelectorAll<HTMLInputElement>('input')];
|
||||
[...clone.querySelectorAll<HTMLInputElement>('input')].forEach((input, index) => {
|
||||
input.value = sourceInputs[index].value; input.setAttribute('value', input.value); input.checked = sourceInputs[index].checked;
|
||||
});
|
||||
// Preserve the current horizontal table viewport in the rasterizer's non-scrolling clone.
|
||||
const sourceScrollers = [...node.querySelectorAll<HTMLElement>('.ant-table-content,.ant-table-body')];
|
||||
[...clone.querySelectorAll<HTMLElement>('.ant-table-content,.ant-table-body')].forEach((scroll, index) => {
|
||||
const original = sourceScrollers[index];
|
||||
if (original.scrollLeft && scroll.firstElementChild) {
|
||||
scroll.style.overflow = 'hidden';
|
||||
(scroll.firstElementChild as HTMLElement).style.transform = `translateX(-${original.scrollLeft}px)`;
|
||||
}
|
||||
});
|
||||
if (key === 'filters') {
|
||||
const more = node.querySelector<HTMLElement>('.query-more-toggle');
|
||||
if (more?.title && more.querySelector('[aria-expanded="false"]')) {
|
||||
const summary = document.createElement('div'); summary.className = 'query-snapshot-filter-summary'; summary.textContent = more.title; clone.append(summary);
|
||||
}
|
||||
}
|
||||
clone.querySelectorAll('.query-snapshot-controls,.query-toolbar-tail,.query-status,.query-more-toggle,.query-export-button,.ant-select-dropdown,.ant-table-filter-trigger,.ant-tooltip,.mobile-scroll-hint').forEach(element => element.remove());
|
||||
if (key === 'defects' || key === 'pareto') clone.classList.add('query-snapshot-defect-module');
|
||||
frame.append(clone);
|
||||
}
|
||||
root.append(frame);
|
||||
await snapshotTask(Promise.all([...frame.querySelectorAll('img')].map(image => image.decode().catch(() => undefined))), signal, 5000, '图片资源读取超时,请重试');
|
||||
check();
|
||||
const size = snapshotImageSize(frame.offsetWidth, frame.scrollHeight);
|
||||
const { toBlob } = await snapshotTask(import('html-to-image'), signal, 10000, '图片组件加载超时,请重试');
|
||||
const blob = await snapshotTask(toBlob(frame, { ...size, skipAutoScale: true, skipFonts: true, backgroundColor: frame.style.background, style: { position: 'static', left: '0', top: '0', zIndex: 'auto', pointerEvents: 'none' } }), signal, 15000, '图片生成超时,请减少模块后重试');
|
||||
check();
|
||||
if (!blob || blob.size < 100) throw new Error('图片生成失败,请重试');
|
||||
return blob;
|
||||
} finally { frame.remove(); }
|
||||
}
|
||||
@@ -0,0 +1,5 @@
|
||||
.sales-order-type-controls { display:flex; gap:6px; flex:1; min-width:0; }
|
||||
.sales-order-type-controls > .sales-order-type-mode { flex:0 0 78px; width:78px; min-width:78px; }
|
||||
.sales-order-type-controls > .sales-order-type-values { flex:1; min-width:0; width:0; }
|
||||
.query-extra-field.sales-order-type-field { min-width:340px; }
|
||||
@media(max-width:600px) { .query-extra-field.sales-order-type-field { min-width:0; } }
|
||||
@@ -0,0 +1,22 @@
|
||||
export interface SalesOrderTypeVersion {
|
||||
id:string; sourceFile:string; rowCount:number; importMode:string; createdAt:string;
|
||||
}
|
||||
export interface SalesOrderTypeStatus {
|
||||
versionId:string; versions:SalesOrderTypeVersion[]; types:string[];
|
||||
}
|
||||
export interface SalesOrderTypePreview {
|
||||
sourceFile:string; sha256:string; expectedVersion:string;
|
||||
summary:{added:number;updated:number;unchanged:number;removed:number;imported:number;total:number};
|
||||
}
|
||||
|
||||
export const SALES_ORDER_TYPE='salesOrderType';
|
||||
export const SALES_ORDER_TYPE_EXCLUDED='salesOrderTypeNotIn';
|
||||
export function salesOrderTypeSelection(filters:Record<string,string[]>) {
|
||||
const exclude=Object.hasOwn(filters,SALES_ORDER_TYPE_EXCLUDED);
|
||||
return {exclude,values:filters[exclude?SALES_ORDER_TYPE_EXCLUDED:SALES_ORDER_TYPE]||[]};
|
||||
}
|
||||
export function updateSalesOrderTypeSelection(filters:Record<string,string[]>,exclude:boolean,values:string[]) {
|
||||
const next={...filters};delete next[SALES_ORDER_TYPE];delete next[SALES_ORDER_TYPE_EXCLUDED];
|
||||
if(values.length||exclude)next[exclude?SALES_ORDER_TYPE_EXCLUDED:SALES_ORDER_TYPE]=[...values];
|
||||
return next;
|
||||
}
|
||||
@@ -146,6 +146,7 @@ export interface OptionsResponse {
|
||||
}
|
||||
|
||||
export interface RecordRow {
|
||||
salesOrderType?: string | null;
|
||||
id: string;
|
||||
sourceFile: string;
|
||||
sheet: string;
|
||||
|
||||
@@ -0,0 +1,31 @@
|
||||
import { App } from 'antd';
|
||||
import { useCallback, useEffect, useRef } from 'react';
|
||||
import type { ReactNode } from 'react';
|
||||
|
||||
type DeleteConfirmation = { title: string; description: ReactNode; confirmText?: string; onConfirm: () => unknown | Promise<unknown> };
|
||||
|
||||
/** 删除只在明确确认后执行;取消、Esc 和关闭页面均不触发操作。 */
|
||||
export function useDeleteConfirmation() {
|
||||
const { modal } = App.useApp();
|
||||
const active = useRef<ReturnType<typeof modal.confirm> | null>(null);
|
||||
useEffect(() => () => { active.current?.destroy(); active.current = null; }, []);
|
||||
return useCallback(({ title, description, confirmText = '确认删除', onConfirm }: DeleteConfirmation) => {
|
||||
if (active.current) return;
|
||||
let running = false, cancelled = false;
|
||||
active.current = modal.confirm({
|
||||
className: 'management-modal deletion-confirmation', title, content: description,
|
||||
okText: confirmText, cancelText: '取消', autoFocusButton: 'cancel', maskClosable: false,
|
||||
okButtonProps: { danger: true },
|
||||
onOk: async () => {
|
||||
if (running || cancelled || !active.current) return;
|
||||
running = true;
|
||||
active.current?.update({ cancelButtonProps: { disabled: true }, keyboard: false });
|
||||
try { await onConfirm(); } catch (error) {
|
||||
running = false; active.current?.update({ cancelButtonProps: { disabled: false }, keyboard: true }); throw error;
|
||||
}
|
||||
},
|
||||
onCancel: () => { cancelled = true; },
|
||||
afterClose: () => { cancelled = true; active.current = null; },
|
||||
});
|
||||
}, [modal]);
|
||||
}
|
||||
@@ -0,0 +1,20 @@
|
||||
import type { AuthUser } from './types';
|
||||
|
||||
export const ROLE_LABELS: Record<string, string> = {
|
||||
USER: '用户', DATA_ADMIN: '数据管理员', SYSTEM_ADMIN: '系统管理员',
|
||||
};
|
||||
export const USER_ROLE_OPTIONS = ['USER', 'DATA_ADMIN', 'SYSTEM_ADMIN'].map(value => ({ value, label: ROLE_LABELS[value] }));
|
||||
export const ROLE_DESCRIPTIONS: Record<string, string> = {
|
||||
USER: '查询授权数据、查看明细、智能分析及报告导出。',
|
||||
DATA_ADMIN: '包含用户权限,并可维护、导入、发布数据、维护对应关系及目标值。',
|
||||
SYSTEM_ADMIN: '包含全部业务权限,并可管理账号授权、计算规则、AI 配置、服务身份及系统运行。',
|
||||
};
|
||||
|
||||
export function canAccessWorkspacePage(user: AuthUser, page: string): boolean {
|
||||
const role = user.roles.length === 1 ? user.roles[0] : '';
|
||||
if (role === 'SYSTEM_ADMIN') return true;
|
||||
if (!['USER', 'DATA_ADMIN'].includes(role)) return false;
|
||||
if (page === 'access') return false;
|
||||
if (['sources', 'imports', 'rules', 'mappings', 'masterData', 'tasks'].includes(page)) return role === 'DATA_ADMIN';
|
||||
return true;
|
||||
}
|
||||
@@ -136,6 +136,12 @@ body, .app-shell, .main-column { color: var(--ink); background: var(--background
|
||||
/* Flat maintenance navigation: one full-width frozen bar, plain tools underneath. */
|
||||
.management-sections > .ant-tabs-nav { isolation: isolate; background: var(--surface); box-shadow: 0 1px 0 var(--line); }
|
||||
.management-sections .flat-config-page .flat-config-panel { padding: 4px 8px 8px; border: 0; box-shadow: none; }
|
||||
/* Keep nested service tabs in the page scroll context, above their own tools. */
|
||||
.management-sections .governance-service-identities { overflow: visible; }
|
||||
.governance-service-identities > .management-sections > .ant-tabs-nav { margin: 0 0 12px; }
|
||||
.governance-service-identities > .management-sections > .ant-tabs-body-holder > .ant-tabs-body > .ant-tabs-content { padding: 0; border: 0; }
|
||||
.page-view[data-page="access"] .governance-service-identities .section-panel { padding: 0; border: 0; box-shadow: none; }
|
||||
.governance-service-identities .completion-panel-heading { flex-wrap: wrap; margin-bottom: 12px; }
|
||||
.flat-config-toolbar { display: flex; align-items: center; justify-content: space-between; gap: 12px; margin-bottom: 14px; min-height: 32px; }
|
||||
.config-type-filter { display: inline-flex; align-items: center; gap: 8px; flex: 0 0 auto; }
|
||||
.config-type-filter > span { white-space: nowrap; }
|
||||
|
||||
Reference in New Issue
Block a user