修复:分类规则仅处理未分类并保留已有归属

This commit is contained in:
2026-10-31 19:18:46 +08:00
parent aa7c320dc6
commit cbe7fc17bb
20 changed files with 320 additions and 36 deletions
+4 -3
View File
@@ -7,7 +7,7 @@ export function classificationConditions(row: Record<string, unknown>) {
return [['@department', row.department], ['@product', row.product], ['PDT代码', row.pdtCode], ['销售片区', row.salesRegion]].map(([field,value]) => ({field: String(field), operator: text(value) ? 'EQUALS' : 'IS_BLANK', value: text(value)}));
}
export function classificationSignature(stage: string, conditions: ClassificationCondition[]) {
return JSON.stringify([stage, (Array.isArray(conditions) ? conditions : []).map(c => [c.field, c.operator, c.value ?? '']).sort((a,b)=>JSON.stringify(a).localeCompare(JSON.stringify(b)))]);
return JSON.stringify([stage, (Array.isArray(conditions) ? conditions : []).map(c => [c.field, c.operator, c.value ?? '']).sort((a,b)=>JSON.stringify(a)<JSON.stringify(b)?-1:JSON.stringify(a)>JSON.stringify(b)?1:0)]);
}
export function classificationRuleId(row: Record<string, unknown>, options: ClassificationRuleOptions = {}) {
const scope = classificationSignature(options.stage ?? text(row.stage), options.conditions ?? classificationConditions(row));
@@ -45,12 +45,13 @@ export function editClassification(base: Definition, selection: ClassificationSe
if (!conditions.length || conditions.length > 4 || new Set(conditions.map(c=>c.field)).size !== conditions.length) throw new Error('请保留至少一项且不重复的匹配条件');
if (conditions.some(c=>!['@department','@product','PDT代码','销售片区'].includes(c.field) || !['EQUALS','IS_BLANK'].includes(c.operator) || (c.operator === 'EQUALS' && !c.value.trim()))) throw new Error('请检查匹配条件');
const rules = Array.isArray(result.matchRules) ? result.matchRules as Definition[] : structuredClone(defaultRules) as Definition[];
const id = classificationRuleId(row, {conditions,stage});
const same = rules.find(rule=>rule.target==='group' && rule.value===target && classificationSignature(String(rule.stage),rule.conditions as ClassificationCondition[])===classificationSignature(stage,conditions));
const id = same?.id ? String(same.id) : classificationRuleId(row, {conditions,stage});
const prior = rules.find(rule => rule.id === id);
if (prior && classificationSignature(String(prior.stage), prior.conditions as ClassificationCondition[]) !== classificationSignature(stage,conditions)) throw new Error('规则标识冲突,请在条件匹配中维护');
const duplicate = rules.find(rule=>rule.enabled !== false && rule.target === 'group' && rule.value !== target && classificationSignature(String(rule.stage), rule.conditions as ClassificationCondition[]) === classificationSignature(stage,conditions));
if (duplicate) throw new Error(`相同条件已指向“${String(duplicate.value)}”,请在条件匹配中编辑已有规则`);
result.matchRules = [{ id, name: options.name?.trim() || `${target}分类规则`, enabled: true, priority: -10000 + (4-conditions.length)*100 + (stage === 'all' ? 10 : 0), stage, conditions, target: 'group', value: target }, ...rules.filter(rule => rule.id !== id)];
result.matchRules = [{ id, name: options.name?.trim() || `${target}分类规则`, enabled: true, onlyUnclassified:true, priority: -10000 + (4-conditions.length)*100 + (stage === 'all' ? 10 : 0), stage, conditions, target: 'group', value: target }, ...rules.filter(rule => rule.id !== id)];
if ((result.matchRules as unknown[]).length > 100) throw new Error('条件规则已满100条,请先整理规则');
}
return result;