优化:名录编码自动生成并隐藏维护入口
This commit is contained in:
@@ -1,3 +1,4 @@
|
||||
import { newMasterDataCode } from './masterDataIdentity';
|
||||
import { ConfigurationWorkbookActions } from './ConfigurationWorkbookActions';
|
||||
import { matchRuleConflicts } from './classificationMaintenance';
|
||||
import { useEffect, useMemo, useState } from 'react';
|
||||
@@ -27,7 +28,7 @@ function objectValue(value: unknown): Record<string, unknown> { return value &&
|
||||
const SYSTEM_DEFINITION_METADATA_KEYS = new Set([
|
||||
'schemaversion', 'ruleversion', 'ruleversionid', 'engineversion', 'formulaversion', 'parserversion',
|
||||
'mappingversion', 'mappingversionid', 'basemappingversionid', 'versionid', 'versionno',
|
||||
'releaseid', 'currentreleaseid', 'revisionid', 'sourcerevisionid', 'rowversion',
|
||||
'releaseid', 'currentreleaseid', 'revisionid', 'sourcerevisionid', 'rowversion', 'masterdata',
|
||||
]);
|
||||
function isSystemDefinitionMetadataField(key: string): boolean {
|
||||
return SYSTEM_DEFINITION_METADATA_KEYS.has(key.replace(/[^a-z0-9]/gi, '').toLowerCase());
|
||||
@@ -96,9 +97,9 @@ export function validateStructuredMappingDefinition(value: ConfigDefinition, _gr
|
||||
const codes = new Set<string>(); const names = new Set<string>();
|
||||
masterRows(value, kind).forEach((row, index) => {
|
||||
const prefix = `${masterLabels[kind]}名录第 ${index + 1} 行`;
|
||||
if (!row.code.trim() || !row.name.trim()) errors.push(`${prefix}:编码和名称必填`);
|
||||
if (row.code.length > 100 || row.name.length > 190) errors.push(`${prefix}:编码最多100字、名称最多190字`);
|
||||
if (codes.has(row.code)) errors.push(`${prefix}:编码“${row.code}”重复`);
|
||||
if (!row.code.trim() || !row.name.trim()) errors.push(`${prefix}:记录标识缺失或名称未填写`);
|
||||
if (row.code.length > 100 || row.name.length > 190) errors.push(`${prefix}:记录标识异常或名称超过190字`);
|
||||
if (codes.has(row.code)) errors.push(`${prefix}:记录标识重复,请刷新后重试`);
|
||||
if (names.has(row.name)) errors.push(`${prefix}:名称“${row.name}”重复`);
|
||||
codes.add(row.code); names.add(row.name);
|
||||
});
|
||||
@@ -138,7 +139,7 @@ function BatchImport({ open, title, columns, existing, writeTarget = '草稿', o
|
||||
}}>
|
||||
<p>粘贴 CSV 或从表格复制的内容,列顺序为:{columns.join('、')}。首行可含表头;启用列可填写 true/false。</p>
|
||||
<Input.TextArea value={text} onChange={event => setText(event.target.value)} rows={10} spellCheck={false} aria-label={`${title}批量导入内容`} placeholder={columns.join(',')} />
|
||||
{existing && <Checkbox checked={replace} onChange={event => setReplace(event.target.checked)}>按相同编码或源条件更新已有记录(不勾选时重复即停止导入)</Checkbox>}
|
||||
{existing && <Checkbox checked={replace} onChange={event => setReplace(event.target.checked)}>按相同名称或源条件更新已有记录(不勾选时重复即停止导入)</Checkbox>}
|
||||
{error && <Alert showIcon type="error" message="导入未写入" description={error} />}
|
||||
</Modal>;
|
||||
}
|
||||
@@ -289,24 +290,24 @@ export function MasterDataDefinitionEditor({ value, onChange, publishedNames, si
|
||||
const candidates = [...(publishedNames?.[masterKind] ?? []), ...mappingKinds.filter(item => mappingInfo[item].master === masterKind).flatMap(mappingKind => mappingRows(value, mappingKind).map(row => row.target))];
|
||||
for (const name of candidates) {
|
||||
if (name === null || !name || names.has(name)) continue;
|
||||
let code = name.slice(0, 100); let suffix = 2; while (codes.has(code)) { const tail = `-${suffix++}`; code = `${name.slice(0, 100 - tail.length)}${tail}`; }
|
||||
const code = newMasterDataCode(codes);
|
||||
added.push({ code, name, enabled: true }); names.add(name); codes.add(code); count++;
|
||||
}
|
||||
next = setMasterRows(next, masterKind, [...existing, ...added]);
|
||||
}
|
||||
onChange(next); message.success(count ? `已从当前配置及对应值载入 ${count} 个名称,请核对编码后保存` : '现有名称均已在名录中');
|
||||
onChange(next); message.success(count ? `已从当前配置及对应值载入 ${count} 个名称,请核对后保存` : '现有名称均已在名录中');
|
||||
};
|
||||
const departments = masterRows(value, 'departments');
|
||||
const columns: ColumnsType<MasterRow> = [{ title: '编码', dataIndex: 'code', key: 'code', width: 220 }, { 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 csvHeaders = kind === 'groups' ? ['编码', '名称', '启用', '所属产业部'] : ['编码', '名称', '启用'];
|
||||
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 csvHeaders = kind === 'groups' ? ['名称', '启用', '所属产业部'] : ['名称', '启用'];
|
||||
const departmentValue = Form.useWatch('department', form);
|
||||
const selectedDepartment = typeof departmentValue === 'string' ? departmentValue : '';
|
||||
const departmentOptions = departments.filter(row => row.enabled || row.name === selectedDepartment).map(row => ({ value: row.name, label: `${row.name}${row.enabled ? '' : '(已停用)'}`, disabled: !row.enabled }));
|
||||
if (selectedDepartment && !departmentOptions.some(option => option.value === selectedDepartment)) departmentOptions.push({ value: selectedDepartment, label: `${selectedDepartment}(未在产业部名录中)`, disabled: true });
|
||||
const visibleRows = rows.filter(row => `${row.code} ${row.name} ${kind === 'groups' ? departmentFor(row) : ''}`.toLowerCase().includes(search.toLowerCase()));
|
||||
const visibleRows = rows.filter(row => `${row.name} ${kind === 'groups' ? departmentFor(row) : ''}`.toLowerCase().includes(search.toLowerCase()));
|
||||
return <div className="structured-config-editor">
|
||||
{!simplified && <div className="structured-config-intro"><p>维护产业部、业务分组、产品及项目组的统一名录。编码与名称必须唯一。</p>{!simplified && <Button onClick={loadExisting}>从当前配置及对应关系载入名录</Button>}</div>}
|
||||
<div className="structured-config-toolbar"><label className="config-type-filter"><span>名录类型</span><Select {...readableSelectPopup} aria-label="名录类型" value={kind} options={masterKinds.map(key=>({value:key,label:masterLabels[key]}))} onChange={key=>{setKind(key);setSearch('');}} /></label><Input.Search value={search} onChange={event => setSearch(event.target.value)} placeholder="查找编码、名称或所属产业部" allowClear aria-label={`查找${label}`} /><span>{rows.length} 条 · 启用 {rows.filter(row => row.enabled).length}</span><div className="structured-config-actions"><ConfigurationWorkbookActions value={value} onChange={onChange} scope={kind} label={`${label}名录`} readOnly={readOnly} validate={validateStructuredMappingDefinition} onPaste={()=>setImporting(true)} />{!readOnly && <><Button type="primary" icon={<PlusOutlined />} onClick={() => openRow()}>新增{label}</Button></>}</div></div>
|
||||
{!simplified && <div className="structured-config-intro"><p>维护产业部、业务分组、产品及项目组的统一名录。名称必须唯一。</p>{!simplified && <Button onClick={loadExisting}>从当前配置及对应关系载入名录</Button>}</div>}
|
||||
<div className="structured-config-toolbar"><label className="config-type-filter"><span>名录类型</span><Select {...readableSelectPopup} aria-label="名录类型" value={kind} options={masterKinds.map(key=>({value:key,label:masterLabels[key]}))} onChange={key=>{setKind(key);setSearch('');}} /></label><Input.Search value={search} onChange={event => setSearch(event.target.value)} placeholder="查找名称或所属产业部" allowClear aria-label={`查找${label}`} /><span>{rows.length} 条 · 启用 {rows.filter(row => row.enabled).length}</span><div className="structured-config-actions"><ConfigurationWorkbookActions value={value} onChange={onChange} scope={kind} label={`${label}名录`} readOnly={readOnly} validate={validateStructuredMappingDefinition} onPaste={()=>setImporting(true)} />{!readOnly && <><Button type="primary" icon={<PlusOutlined />} onClick={() => openRow()}>新增{label}</Button></>}</div></div>
|
||||
<Table size="small" bordered rowKey="code" columns={columns} dataSource={visibleRows} pagination={{ pageSize: 15, showSizeChanger: false }} scroll={{ x: kind === 'groups' ? 940 : 720 }} locale={{ emptyText: `尚未维护${label}名录` }} />
|
||||
<p className="structured-config-note">停用项保留在名录中;启用中的对应关系如引用停用名称,校验将指出具体位置。已有分析记录保留生成时使用的名称。</p>
|
||||
<Modal className="management-modal structured-config-modal" open={Boolean(editing)} title={`${originalCode === null ? '新增' : '编辑'}${label}`} width={520} okText={simplified ? '保存此行' : '写入草稿'} onCancel={() => setEditing(null)} onOk={() => { void form.validateFields().then(fields => {
|
||||
@@ -314,26 +315,25 @@ export function MasterDataDefinitionEditor({ value, onChange, publishedNames, si
|
||||
const department = String(fields.department ?? '').trim();
|
||||
const persistDepartment = kind === 'groups' && (!existing || Object.hasOwn(existing, 'department')
|
||||
|| department !== (departmentAtOpen?.value ?? '') || (!!department && fields.name.trim() !== existing.name));
|
||||
const row: MasterRow = { ...existing, code: fields.code.trim(), name: fields.name.trim(), enabled: fields.enabled, ...(persistDepartment ? { department } : {}) };
|
||||
if (rows.some(item => item.code !== originalCode && (item.code === row.code || item.name === row.name))) { setError('编码或名称已存在,请编辑已有行'); return; }
|
||||
const row: MasterRow = { ...existing, code: existing?.code || newMasterDataCode(rows.map(item => item.code)), name: fields.name.trim(), enabled: fields.enabled, ...(persistDepartment ? { department } : {}) };
|
||||
if (rows.some(item => item.code !== originalCode && (item.code === row.code || item.name === row.name))) { setError('名称已存在,请编辑已有行'); return; }
|
||||
onChange(setMasterRows(value, kind, originalCode === null ? [...rows, row] : rows.map(item => item.code === originalCode ? row : item))); setEditing(null);
|
||||
}).catch(() => undefined); }}><Form form={form} layout="vertical"><Form.Item name="code" label="编码" rules={[{ required: true, whitespace: true, message: '请填写编码' }]}><Input maxLength={100} /></Form.Item><Form.Item name="name" label="名称" rules={[{ required: true, whitespace: true, message: '请填写名称' }]}><Input maxLength={190} /></Form.Item>{kind === 'groups' && <Form.Item name="department" label="所属产业部"><Select {...readableSelectPopup} allowClear placeholder="可不设置;选择启用中的产业部" options={departmentOptions} /></Form.Item>}<Form.Item name="enabled" label="状态" valuePropName="checked"><Switch checkedChildren="启用" unCheckedChildren="停用" /></Form.Item></Form>{error && <Alert showIcon type="error" message={error} />}</Modal>
|
||||
}).catch(() => undefined); }}><Form form={form} layout="vertical"><Form.Item name="name" label="名称" rules={[{ required: true, whitespace: true, message: '请填写名称' }]}><Input maxLength={190} /></Form.Item>{kind === 'groups' && <Form.Item name="department" label="所属产业部"><Select {...readableSelectPopup} allowClear placeholder="可不设置;选择启用中的产业部" options={departmentOptions} /></Form.Item>}<Form.Item name="enabled" label="状态" valuePropName="checked"><Switch checkedChildren="启用" unCheckedChildren="停用" /></Form.Item></Form>{error && <Alert showIcon type="error" message={error} />}</Modal>
|
||||
<BatchImport open={importing} title={`${label}名录`} columns={csvHeaders} existing={rows.length > 0} writeTarget={simplified ? '当前配置' : '草稿'} onCancel={() => setImporting(false)} onImport={(input, replace) => {
|
||||
const incoming: MasterRow[] = []; const codes = new Set<string>(); const names = new Set<string>();
|
||||
const incoming: MasterRow[] = []; const codes = new Set(rows.map(row => row.code)); const names = new Set<string>();
|
||||
input.forEach((cells, index) => {
|
||||
const maxColumns = kind === 'groups' ? 4 : 3;
|
||||
if (cells.length < 2 || cells.length > maxColumns || !cells[0] || !cells[1]) throw new Error(`第 ${index + 1} 行应包含编码、名称${kind === 'groups' ? '、可选启用状态及可选所属产业部' : '及可选启用状态'}`);
|
||||
if (codes.has(cells[0]) || names.has(cells[1])) throw new Error(`第 ${index + 1} 行编码或名称在导入内容中重复`); codes.add(cells[0]); names.add(cells[1]);
|
||||
const previous = rows.find(row => row.code === cells[0]);
|
||||
if (previous && !replace) throw new Error(`第 ${index + 1} 行编码已存在:${cells[0]}`);
|
||||
if (rows.some(row => row.name === cells[1] && row.code !== cells[0] && !input.some(candidate => candidate[0] === row.code))) throw new Error(`第 ${index + 1} 行名称已被其他编码使用:${cells[1]}`);
|
||||
const renamedParent = kind === 'groups' && previous && previous.name !== cells[1] && !Object.hasOwn(previous, 'department')
|
||||
? departmentFor(previous) : '';
|
||||
incoming.push({ ...previous, code: cells[0], name: cells[1], enabled: parseEnabled(cells[2], index + 1) ?? previous?.enabled ?? true,
|
||||
...(kind === 'groups' && cells.length >= 4 ? { department: cells[3] } : renamedParent ? { department: renamedParent } : {}) });
|
||||
const maxColumns = kind === 'groups' ? 3 : 2;
|
||||
const name = cells[0]?.trim();
|
||||
if (!name || cells.length > maxColumns) throw new Error(`第 ${index + 1} 行应包含名称${kind === 'groups' ? '、可选启用状态及可选所属产业部' : '及可选启用状态'}`);
|
||||
if (names.has(name)) throw new Error(`第 ${index + 1} 行名称在导入内容中重复`); names.add(name);
|
||||
const previous = rows.find(row => row.name === name);
|
||||
if (previous && !replace) throw new Error(`第 ${index + 1} 行名称已存在:${name}`);
|
||||
const code = previous?.code || newMasterDataCode(codes); codes.add(code);
|
||||
incoming.push({ ...previous, code, name, enabled: parseEnabled(cells[1], index + 1) ?? previous?.enabled ?? true,
|
||||
...(kind === 'groups' && cells.length >= 3 ? { department: cells[2] } : {}) });
|
||||
});
|
||||
const changed = new Set(incoming.map(row => row.code)); const result = [...rows.filter(row => !changed.has(row.code)), ...incoming];
|
||||
if (new Set(result.map(row => row.name)).size !== result.length) throw new Error('导入后名称重复,请检查编码与名称');
|
||||
if (new Set(result.map(row => row.name)).size !== result.length) throw new Error('导入后名称重复,请检查名称');
|
||||
onChange(setMasterRows(value, kind, result)); setImporting(false); message.success(simplified ? `已将 ${incoming.length} 个名称加入当前编辑` : `已将 ${incoming.length} 个名称写入草稿,请保存后校验`);
|
||||
}} />
|
||||
</div>;
|
||||
|
||||
Reference in New Issue
Block a user