优化:名录编码自动生成并隐藏维护入口

This commit is contained in:
2026-11-03 13:11:00 +08:00
parent 52d92c95d8
commit 1aeccddd4d
8 changed files with 126 additions and 36 deletions
@@ -184,11 +184,15 @@ public class MasterDataWorkbookService {
line++; String code = text(source, columns, "code"), name = text(source, columns, "name");
if (code.isBlank() && !name.isBlank()) {
code = codesByName.getOrDefault(name, "REF-" + UUID.nameUUIDFromBytes((kind + ":" + name).getBytes(java.nio.charset.StandardCharsets.UTF_8)));
if (existing.containsKey(code) && !name.equals(existing.get(code).get("name"))) throw bad("第" + line + "行自动编码与已有记录冲突,请指定编码列");
while ((existing.containsKey(code) && !name.equals(existing.get(code).get("name")))
|| imported.containsKey(code) && !name.equals(imported.get(code).get("name")))
code = "REF-" + UUID.randomUUID();
}
if (code.isBlank() || name.isBlank() || code.length() > 100 || name.length() > 190) throw bad("第" + line + "行编码或名称为空/过长");
if (imported.containsKey(code) || !names.add(name)) throw bad("第" + line + "行编码或名称重复,未写入草稿");
imported.put(code, new LinkedHashMap<>(Map.of("code", code, "name", name, "enabled", enabled(text(source, columns, "enabled"), line))));
Map<String, Object> item = new LinkedHashMap<>(existing.getOrDefault(code, Map.of()));
item.putAll(Map.of("code", code, "name", name, "enabled", enabled(text(source, columns, "enabled"), line)));
imported.put(code, item);
}
int added = 0, updated = 0, disabled = 0;
for (var row : imported.entrySet()) { if (existing.containsKey(row.getKey())) updated++; else added++; }
@@ -42,6 +42,20 @@ class MasterDataWorkbookServiceTest {
assertEquals(0,again.get("added"));
assertEquals(generated,((Map<?,?>)((List<?>)((Map<?,?>)definition.get("masterData")).get("products")).get(1)).get("code"));
}
@Test void automaticCodeCollisionIsResolvedAndExistingOwnershipIsPreserved() {
String reserved = "REF-" + java.util.UUID.nameUUIDFromBytes("groups:新分组".getBytes(java.nio.charset.StandardCharsets.UTF_8));
Map<String,Object> definition = new LinkedHashMap<>(Map.of("masterData", Map.of("groups", List.of(
Map.of("code",reserved,"name","已有分组","enabled",true,"department","原产业部","extra","keep")))));
var input = List.of(Map.of("名称","已有分组"),Map.of("名称","新分组"));
MasterDataWorkbookService.importMaster(definition,input,"groups","MERGE",Map.of("name","名称"));
var rows=(List<?>)((Map<?,?>)definition.get("masterData")).get("groups");
var original=(Map<?,?>)rows.getFirst();var added=(Map<?,?>)rows.get(1);
assertEquals(reserved,original.get("code"));assertEquals("原产业部",original.get("department"));assertEquals("keep",original.get("extra"));
assertNotEquals(reserved,added.get("code"));
MasterDataWorkbookService.importMaster(definition,input,"groups","MERGE",Map.of("name","名称"));
assertEquals(2,((List<?>)((Map<?,?>)definition.get("masterData")).get("groups")).size());
}
@Test void replaceReferenceTableRetainsOmittedNamesAsDisabledAndPreservesOtherKinds() {
Map<String,Object> definition = new LinkedHashMap<>(Map.of("masterData",Map.of("products",List.of(Map.of("code","OLD","name","旧产品","enabled",true)),"departments",List.of(Map.of("code","D","name","产业部","enabled",true)))));
var result=MasterDataWorkbookService.importMaster(definition,List.of(Map.of("编码","NEW","名称","新产品")),"products","REPLACE",Map.of("code","编码","name","名称"));
+4 -3
View File
@@ -2,7 +2,7 @@ import { useMemo, useRef, useState } from 'react';
import { Alert, App, Button, Modal, Radio, Select, Space, Tag } from 'antd';
import { DownloadOutlined, UploadOutlined } from '@ant-design/icons';
import { QualityTable as Table } from './QualityTable';
import { downloadConfigurationWorkbook, importConfigurationTables, readConfigurationWorkbook, type ConfigurationScope, type ConfigurationTable, type Definition, type ImportMode } from './configurationWorkbook';
import { configurationPreviewTable, downloadConfigurationWorkbook, importConfigurationTables, readConfigurationWorkbook, type ConfigurationScope, type ConfigurationTable, type Definition, type ImportMode } from './configurationWorkbook';
export function ConfigurationWorkbookActions({value,onChange,scope,label,defaults=[],readOnly=false,validate,onPaste,whole=false,disabled=false}: {
value:Definition;onChange:(value:Definition)=>void;scope:ConfigurationScope;label:string;defaults?:unknown[];readOnly?:boolean;
@@ -21,7 +21,8 @@ export function ConfigurationWorkbookActions({value,onChange,scope,label,default
try{if(!/\.xlsx$/i.test(file.name))throw new Error('请选择.xlsx格式的Excel文件');const loaded=await readConfigurationWorkbook(await file.arrayBuffer());setTables(loaded);setSelected(loaded[0]?.name??'');}
catch(value){setError(value instanceof Error?value.message:'Excel读取失败');}finally{setBusy(false);if(input.current)input.current.value='';}
};
const table=tables?.find(table=>table.name===selected);
const selectedTable=tables?.find(table=>table.name===selected);
const table=selectedTable?configurationPreviewTable(selectedTable):undefined;
const apply=()=>{if(!evaluated?.result)return;onChange(evaluated.result.definition);setOpen(false);message.success('已导入当前编辑,保存配置后生效');};
return <>
<Button icon={<DownloadOutlined/>} disabled={disabled} loading={busy&&!open} onClick={()=>{setBusy(true);void downloadConfigurationWorkbook(label,value,scope,defaults).catch(error=>message.error(error instanceof Error?error.message:'导出失败')).finally(()=>setBusy(false));}}>{whole?'导出整本Excel':'导出Excel'}</Button>
@@ -30,7 +31,7 @@ export function ConfigurationWorkbookActions({value,onChange,scope,label,default
okText="应用到当前编辑" okButtonProps={{disabled:busy||!evaluated?.result}} footer={(_, {OkBtn,CancelBtn})=><>{onPaste&&<Button onClick={()=>{setOpen(false);onPaste();}}>粘贴表格</Button>}<CancelBtn/><OkBtn/></>}>
<div className="configuration-import-toolbar"><input ref={input} className="visually-hidden-file" type="file" accept=".xlsx" aria-label={`选择${label}Excel文件`} onChange={event=>void choose(event.target.files?.[0])}/><Button icon={<UploadOutlined/>} loading={busy} onClick={()=>input.current?.click()}>选择Excel文件</Button>
<Radio.Group aria-label="配置导入方式" value={mode} onChange={event=>setMode(event.target.value)} options={[{value:'MERGE',label:'合并更新'},{value:'REPLACE',label:'替换文件中的表'}]}/></div>
<p className="structured-config-note">合并按编号或源条件更新;替换只影响文件包含的工作表。导入后由页面保存按钮生效。</p>
<p className="structured-config-note">名录按名称匹配,导出文件中的已有记录可直接改名;其他配置按编号或源条件更新。替换只影响文件包含的工作表。导入后由页面保存按钮生效。</p>
{(error||evaluated?.error)&&<Alert showIcon type="error" message="尚未写入" description={error||evaluated?.error}/>}
{evaluated?.result&&<Table size="small" bordered rowKey="name" pagination={false} dataSource={evaluated.result.changes} columns={[
{title:'配置表',dataIndex:'name'},{title:'表格行数',dataIndex:'rows',align:'right'},{title:'新增',dataIndex:'added',align:'right'},{title:'更新',dataIndex:'updated',align:'right'},
+1 -1
View File
@@ -557,7 +557,7 @@ function DataUploadWizard({ user, mode, purpose, handoffSourceId, initialReason,
}
const MASTER_KINDS: { value: MasterWorkbookKind; label: string; columns: { key: string; label: string; required?: boolean }[] }[] = [
...[{ value: 'departments', label: '产业部' }, { value: 'groups', label: '业务分组' }, { value: 'products', label: '产品' }, { value: 'projectGroups', label: '项目组' }].map(item => ({ ...item, value: item.value as MasterWorkbookKind, columns: [{ key: 'code', label: '编码(可选)' }, { key: 'name', label: '名称', required: true }, { key: 'enabled', label: '启用状态(可选)' }] })),
...[{ value: 'departments', label: '产业部' }, { value: 'groups', label: '业务分组' }, { value: 'products', label: '产品' }, { value: 'projectGroups', label: '项目组' }].map(item => ({ ...item, value: item.value as MasterWorkbookKind, columns: [{ key: 'name', label: '名称', required: true }, { key: 'enabled', label: '启用状态(可选)' }] })),
{ value: 'categoryLookup', label: '业务分组对应', columns: [{ key: 'source', label: 'PDT代码', required: true }, { key: 'secondary', label: '销售片区', required: true }, { key: 'target', label: '业务分组', required: true }, { key: 'enabled', label: '启用状态(可选)' }] },
{ value: 'projectGroupLookup', label: '项目组对应', columns: [{ key: 'source', label: '客户代码', required: true }, { key: 'secondary', label: '业务分组', required: true }, { key: 'target', label: '项目组', required: true }, { key: 'enabled', label: '启用状态(可选)' }] },
{ value: 'departmentLookup', label: '产业部对应', columns: [{ key: 'source', label: '源事业部', required: true }, { key: 'target', label: '统一产业部', required: true }, { key: 'enabled', label: '启用状态(可选)' }] },
+27 -27
View File
@@ -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>;
+30 -2
View File
@@ -1,4 +1,5 @@
/** Editable Excel exchange for configuration. Import never publishes or mutates the supplied base. */
import { newMasterDataCode } from './masterDataIdentity.ts';
export type Definition = Record<string, unknown>;
export type ConfigurationScope = 'all'|'catalogs'|'lookups'|'matchRules'|'rules'|'filterFields'|keyof typeof CATALOGS|keyof typeof LOOKUPS;
export type ConfigurationTable = { name: string; headers: string[]; rows: string[][] };
@@ -32,6 +33,12 @@ function unique<T>(rows:T[],key:(row:T)=>string,label:string){const keys=new Set
function merge<T>(base:T[],incoming:T[],key:(row:T)=>string,mode:ImportMode){if(mode==='REPLACE')return incoming;const index=new Map(incoming.map(row=>[key(row),row]));const existing=new Set(base.map(key));return [...base.map(row=>index.get(key(row))??row),...incoming.filter(row=>!existing.has(key(row)))];}
function include(scope:ConfigurationScope,key:string,group:string){return scope==='all'||scope===key||scope===group;}
export function configurationPreviewTable(table:ConfigurationTable):ConfigurationTable {
if (!Object.values(CATALOGS).some(name=>name===table.name)) return table;
const visible=table.headers.map((header,index)=>({header,index})).filter(item=>item.header!=='编码');
return {...table,headers:visible.map(item=>item.header),rows:table.rows.map(row=>visible.map(item=>row[item.index]))};
}
export function configurationTables(value:Definition,scope:ConfigurationScope='all',defaults:unknown[]=[]):ConfigurationTable[]{
const tables:ConfigurationTable[]=[];
for(const [key,name] of Object.entries(CATALOGS))if(include(scope,key,'catalogs'))tables.push({name,headers:['编码','名称','状态',...(key==='groups'?['所属产业部']:[])],
@@ -67,6 +74,25 @@ export function importConfigurationTables(base:Definition,tables:ConfigurationTa
for(const incomingTable of tables){
let table=incomingTable;
const original=expected.find(item=>item.name===table.name);if(!original)throw new Error(`工作表“${table.name}”不属于当前配置类型`);
const catalogKind=Object.entries(CATALOGS).find(([,name])=>name===table.name)?.[0];
if(catalogKind){
// Code-free spreadsheets are accepted; old exports retain an automatically hidden identity column.
if(!equal(table.headers,original.headers)&&table.headers.includes('名称')&&new Set(table.headers).size===table.headers.length&&table.headers.every(header=>original.headers.includes(header))){
const headers=table.headers;const previous=array(object(base.masterData)[catalogKind]);
const byCode=new Map(previous.map(row=>[text(row.code),row])),byName=new Map(previous.map(row=>[text(row.name),row]));
table={...table,headers:original.headers,rows:table.rows.map((cells,n)=>{
if(cells.length!==headers.length)throw new Error(`${table.name}第${n+2}行列数不匹配`);
const name=cells[headers.indexOf('名称')],code=cells[headers.indexOf('编码')];
const old=code?byCode.get(code):byName.get(name);
return original.headers.map(header=>headers.includes(header)?cells[headers.indexOf(header)]:header==='所属产业部'?text(old?.department):'');
})};
}
if(equal(table.headers,original.headers)){
const prior=array(object(base.masterData)[catalogKind]);const byName=new Map(prior.map(row=>[text(row.name),text(row.code)]));
const used=new Set([...prior.map(row=>text(row.code)),...table.rows.map(row=>row[0])]);
table={...table,rows:table.rows.map(row=>{if(row[0]||!row[1])return row;const code=byName.get(row[1])||newMasterDataCode(used);used.add(code);return[code,...row.slice(1)];})};
}
}
if(table.name==='条件匹配'&&equal(table.headers,original.headers.slice(0,-1))){const prior=new Map(array(Array.isArray(base.matchRules)?base.matchRules:defaults).map(rule=>[text(rule.id),rule]));table={...table,headers:original.headers,rows:table.rows.map(row=>[...row,yes(prior.get(row[0])?.onlyUnclassified===true)])};}
if(names.has(table.name))throw new Error(`重复工作表:${table.name}`);names.add(table.name);
if(!equal(table.headers,original.headers))throw new Error(`${table.name}表头不匹配,请使用本页面导出的表格`);
@@ -80,11 +106,12 @@ export function importConfigurationTables(base:Definition,tables:ConfigurationTa
if(catalog){
const [kind]=catalog;const previous=array(object(base.masterData)[kind]);const byCode=new Map(previous.map(row=>[text(row.code),row]));oldIds=previous.map(row=>text(row.code));
const incoming=table.rows.map(([code,name,status,department],n)=>{
if(!code||!name||code.length>100||name.length>190)throw new Error(`${table.name}第${n+2}行编码或名称无效`);
if(!code||code.length>100)throw new Error(`${table.name}第${n+2}行记录标识异常,请重新导出后重试`);
if(!name||name.length>190)throw new Error(`${table.name}第${n+2}行名称无效`);
const old=byCode.get(code);const row:Definition={...old,code,name,enabled:enabled(status,old?.enabled!==false)};
if(kind==='groups'&&(department!==text(old?.department)||Object.hasOwn(old??{},'department')||(!old&&department)))row.department=department;
return row;
});unique(incoming,row=>text(row.code),table.name);newIds=incoming.map(row=>text(row.code));
});if(new Set(incoming.map(row=>row.code)).size!==incoming.length)throw new Error(`${table.name}同一记录重复,请检查重复行`);newIds=incoming.map(row=>text(row.code));
const merged=merge(previous,incoming,row=>text(row.code),mode);unique(merged,row=>text(row.name),table.name+'名称');
result.masterData={...object(result.masterData),[kind]:merged};
}else if(lookup){
@@ -147,6 +174,7 @@ export async function createConfigurationWorkbook(value:Definition,scope:Configu
const sheet=workbook.addWorksheet(table.name,{views:[{state:'frozen',ySplit:1,xSplit:1}]});
const numeric=new Set(['优先级','条件序号','顺序','排序']);
sheet.columns=table.headers.map(header=>({header,width:header.includes('编号')||header.includes('编码')?46:header.includes('条件')||header.includes('公式')||header.includes('分类')?32:22}));
if(Object.values(CATALOGS).some(name=>name===table.name))sheet.getColumn(1).hidden=true;
table.rows.forEach(row=>sheet.addRow(row.map((value,index)=>numeric.has(table.headers[index])&&value!==''?Number(value):value)));sheet.columns.forEach((column,index)=>{column.numFmt=numeric.has(table.headers[index])?'0':'@';column.alignment={vertical:'middle',wrapText:true};});
sheet.getRow(1).font={bold:true,color:{argb:'FFFFFFFF'}};sheet.getRow(1).fill={type:'pattern',pattern:'solid',fgColor:{argb:'FF5769B8'}};sheet.getRow(1).height=30;
sheet.autoFilter={from:{row:1,column:1},to:{row:Math.max(1,table.rows.length+1),column:table.headers.length}};
+7
View File
@@ -0,0 +1,7 @@
/** Internal catalog identity never needs user input. Existing identities survive renames. */
export function newMasterDataCode(existing: Iterable<string>): string {
const used = existing instanceof Set ? existing : new Set(existing);
let code: string;
do { code = `REF-${crypto.randomUUID()}`; } while (used.has(code));
return code;
}
@@ -1,6 +1,6 @@
import test from 'node:test';
import assert from 'node:assert/strict';
import { configurationTables, importConfigurationTables, createConfigurationWorkbook, readConfigurationWorkbook } from '../src/configurationWorkbook.ts';
import { configurationPreviewTable, configurationTables, importConfigurationTables, createConfigurationWorkbook, readConfigurationWorkbook } from '../src/configurationWorkbook.ts';
const rule={onlyUnclassified:true,id:'rule_001',name:'指定分类',priority:-9900,stage:'all',enabled:true,target:'group',value:'G',conditions:[{field:'PDT代码',operator:'EQUALS',value:'00001'},{field:'销售片区',operator:'IS_BLANK',value:''}]};
const base={schemaVersion:3,unknown:{retain:[1,null]},masterData:{departments:[{code:'0001',name:'A',enabled:true}],groups:[{code:'002',name:'G',enabled:true,department:'A',unknown:'keep'}],products:[],projectGroups:[]},
@@ -11,8 +11,44 @@ test('all configuration sheets round-trip through a real xlsx with codes, nulls,
const tables=await readConfigurationWorkbook(await workbook.xlsx.writeBuffer());
for(const mode of ['MERGE','REPLACE'])assert.deepEqual(importConfigurationTables(source,tables,'all',mode).definition,source);
assert.equal(tables.find(t=>t.name==='产业部名录').rows[0][0],'0001');
assert.equal(workbook.getWorksheet('产业部名录').getColumn(1).hidden,true);
assert.deepEqual(configurationPreviewTable(tables.find(t=>t.name==='产业部名录')).headers,['名称','状态']);
assert.deepEqual(source,base);assert.equal(workbook.getWorksheet('产业部名录').getCell('A2').numFmt,'@');
});
test('all four catalogs accept name-only files and preserve existing identity, metadata and ownership',()=>{
for(const kind of ['departments','groups','products','projectGroups']){
const source={masterData:{[kind]:[{code:'existing',name:'原名称',enabled:false,department:'所属产业部',extra:'keep'}]}};
const table=configurationTables(source,kind)[0];
table.headers.shift();table.rows=kind==='groups'?[['原名称','启用','所属产业部'],['新增名称','启用','']]:[['原名称','启用'],['新增名称','启用']];
const result=importConfigurationTables(source,[table],kind,'MERGE');const rows=result.definition.masterData[kind];
assert.equal(rows[0].code,'existing');assert.equal(rows[0].extra,'keep');assert.equal(rows[0].department,'所属产业部');assert.equal(rows[0].enabled,true);
assert.match(rows[1].code,/^REF-/);assert.notEqual(rows[0].code,rows[1].code);
assert.equal(result.changes[0].added,1);assert.equal(result.changes[0].updated,1);
assert.deepEqual(importConfigurationTables(result.definition,[table],kind,'MERGE').definition,result.definition);
}
});
test('hidden identity lets an exported row be renamed, and new rows need only a name',async()=>{
const book=await createConfigurationWorkbook(base,'groups');const sheet=book.getWorksheet('业务分组名录');
sheet.getCell('B2').value='改名分组';sheet.addRow(['','新分组','启用','A']);
const tables=await readConfigurationWorkbook(await book.xlsx.writeBuffer());
const result=importConfigurationTables(base,tables,'groups','MERGE').definition.masterData.groups;
assert.equal(result.length,2);assert.equal(result[0].code,'002');assert.equal(result[0].name,'改名分组');assert.equal(result[0].unknown,'keep');
assert.match(result[1].code,/^REF-/);assert.equal(result[1].department,'A');
assert.deepEqual(configurationPreviewTable(tables[0]).rows.map(row=>row[0]),['改名分组','新分组']);
});
test('catalogs accept only the required name column without losing state or group ownership',()=>{
const source={masterData:{groups:[{code:'kept',name:'G',enabled:false,department:'A',extra:'keep'}]}};
const table={name:'业务分组名录',headers:['名称'],rows:[['G'],['新组']]};
const result=importConfigurationTables(source,[table],'groups','MERGE').definition;
assert.deepEqual(result.masterData.groups[0],source.masterData.groups[0]);assert.match(result.masterData.groups[1].code,/^REF-/);
assert.equal(result.masterData.groups[1].enabled,true);
const reordered={name:'业务分组名录',headers:['名称','编码'],rows:[['G','kept']]};
assert.deepEqual(configurationPreviewTable(reordered),{name:'业务分组名录',headers:['名称'],rows:[['G']]});
assert.deepEqual(importConfigurationTables(source,[reordered],'groups','MERGE').definition,source);
});
test('edits upsert by source key, and replace removes only records in supplied tables',()=>{
const tables=configurationTables(base,'categoryLookup');tables[0].rows[0][2]='新分组';
const imported=importConfigurationTables(base,tables,'categoryLookup','MERGE');