新增:查询页面快照并修复筛选选框闪烁
页面快照支持勾选查询条件、指标卡片、趋势、汇总表、不良构成和细分缺陷图,复制PNG或下载;增加取消、分阶段提示和等待超时恢复。 修复公共Select弹层准备帧被opacity覆盖导致的先闪出再展开,并取消查询字段原生label的重复点击转发。 同步已经验收上线的销售订单类型映射、排除筛选及预聚合,以及其线上权限、删除确认配套源码;保留既有公式编辑和名录编码修改。源码范围按发布清单冻结,不纳入本机数据、凭据及未发布工作。 验证:前后端独立源码构建通过;10项前端检查、4项订单分类单元测试通过;实际系统剪贴板粘贴PNG验证通过;线上配置及筛选结果与发布前一致,后端未重启。
This commit is contained in:
@@ -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 : '';
|
||||
|
||||
Reference in New Issue
Block a user