优化:未分类连续维护与柏拉图预汇总,同步已发布修复

This commit is contained in:
2026-11-01 12:40:50 +08:00
parent 572873c6b8
commit 38290f5fec
135 changed files with 17613 additions and 663 deletions
+94
View File
@@ -0,0 +1,94 @@
import { editClassification, type ClassificationSelection, type ClassificationRuleOptions } from './classificationMaintenance.ts';
import type { DataWorkflowOperation, DataWorkflowStatus } from './NoCodeDataTypes.ts';
export type ClassificationCommand = { selection: ClassificationSelection; target: string; options: ClassificationRuleOptions };
export type ClassificationJob = ClassificationCommand & { id: string; status: 'queued'|'submitting'|'running'|'paused'|'failed'|'completed'; operationId?: string; error?: string; releaseId?: string };
type Dependencies = {
status: () => Promise<DataWorkflowStatus>;
apply: (definition: Record<string,unknown>, releaseId: string|null) => Promise<DataWorkflowOperation>;
operation: (id: string) => Promise<DataWorkflowOperation>;
persist: (jobs: ClassificationJob[]) => void;
completed: () => void;
wait: () => Promise<void>;
};
/** One operation at a time; rebase each command on the newly published mapping. */
export class ClassificationQueue {
private jobs: ClassificationJob[];
private listeners = new Set<()=>void>();
private processing = false;
private stopped = false;
private deps: Dependencies;
constructor(deps: Dependencies, saved: ClassificationJob[] = []) {
this.deps=deps;
this.jobs = saved.map(job => job.status === 'submitting' ? {...job,status:'failed',error:'提交结果尚未确认,请刷新列表后重试'} : job);
}
snapshot = () => this.jobs;
subscribe = (listener: ()=>void) => { this.listeners.add(listener); return () => {this.listeners.delete(listener);}; };
private emit() { this.deps.persist(this.jobs); this.listeners.forEach(listener=>listener()); }
private patch(id: string, value: Partial<ClassificationJob>) { this.jobs=this.jobs.map(job=>job.id===id?{...job,...value}:job);this.emit(); }
enqueue(command: ClassificationCommand, base: Record<string,unknown>, defaults: unknown[]) {
if(this.stopped)throw new Error('请重新打开对应关系页面');
// Validate against the current editor plus queued commands before hiding anything.
let definition=base;
for(const job of this.jobs.filter(job=>!['failed','completed'].includes(job.status))) definition=editClassification(definition,job.selection,job.target,defaults,job.options);
editClassification(definition,command.selection,command.target,defaults,command.options);
const job:ClassificationJob={...structuredClone(command),id:crypto.randomUUID(),status:'queued'};
this.jobs=[...this.jobs,job];this.emit();void this.run();return job.id;
}
retry(id: string) {
const job=this.jobs.find(job=>job.id===id);if(!job||!['failed','paused'].includes(job.status))return;
const resume=job.status==='paused'&&!!job.operationId;
this.patch(id,{status:resume?'running':'queued',operationId:resume?job.operationId:undefined,error:undefined});void this.run();
}
acknowledge(ids: string[]) { this.jobs=this.jobs.filter(job=>job.status!=='completed'||!ids.includes(job.id));this.emit(); }
dismiss(id: string) { this.jobs=this.jobs.filter(job=>job.id!==id||job.status!=='failed');this.emit(); }
stop() { this.stopped=true; }
resume() { this.stopped=false;void this.run(); }
async run() {
if(this.processing||this.stopped)return;this.processing=true;
try {
while(!this.stopped) {
// A failed progress read pauses the queue to avoid duplicate publication.
if(this.jobs.some(job=>job.status==='paused'))return;
const job=this.jobs.find(job=>['queued','running'].includes(job.status));if(!job)return;
try {
let operationId=job.operationId;
if(!operationId) {
const status=await this.deps.status();if(this.stopped)return;
const base=status.activeMapping?.definition;if(!base)throw new Error('当前配置读取失败,请刷新后重试');
const definition=editClassification(base,job.selection,job.target,status.defaultRules??[],job.options);
this.patch(job.id,{status:'submitting'});
const operation=await this.deps.apply(definition,status.currentReleaseId);
if(!operation.operationId)throw new Error('未收到更新任务编号,请刷新确认后重试');
operationId=operation.operationId;this.patch(job.id,{status:'running',operationId});
}
while(!this.stopped) {
const operation=await this.deps.operation(operationId);
if(operation.status==='FAILED') { this.patch(job.id,{status:'failed',error:(operation.errors??[]).map(item=>item.message).filter(Boolean).join(';')||'分类更新失败'});this.deps.completed();break; }
if(operation.status==='COMPLETED') { this.patch(job.id,{status:'completed',releaseId:String(operation.currentReleaseId??operation.releaseId??'')});this.deps.completed();break; }
await this.deps.wait();
}
} catch(error) {
const current=this.jobs.find(item=>item.id===job.id);
this.patch(job.id,{status:current?.operationId?'paused':'failed',error:error instanceof Error?error.message:'分类更新失败'});
if(current?.operationId)return;
}
}
} finally {this.processing=false;}
}
}
const values: Record<string,string> = {'@department':'department','@product':'product','PDT代码':'pdtCode','销售片区':'salesRegion','客户代码':'customerCode','@group':'businessGroup'};
export function classificationHides(row: Record<string,unknown>, kind: ClassificationSelection['kind'], jobs: ClassificationJob[]) {
return jobs.some(job=>{
if(job.status==='failed'||job.selection.kind!==kind)return false;
if(kind==='projectGroup')return row.customerCode===job.selection.row.customerCode&&row.businessGroup===job.selection.row.businessGroup;
const stage=job.options.stage??String(job.selection.row.stage);
if(stage!=='all'&&stage!==row.stage)return false;
return (job.options.conditions??[]).every(condition=>{
const value=String(row[values[condition.field]]??'');
return condition.operator==='IS_BLANK'?value.trim()==='':value===condition.value;
});
});
}