feat: collect editable scheduled batches and show order details in modals

This commit is contained in:
abaishu0730 committed 2026-10-26 09:53:45 +08:00
1 parent 8d010a05cd
commit c19be938fc
20 files changed
+212 -34

No files matched your search

+2
View File
@@ -12,6 +12,8 @@ async function orderRuleApi({orderRules,mail,workspace,user,url,route,method,bod
if(method!=='POST')fail('没有找到此规则操作。',404);
if(user.role==='viewer')fail('只读成员不能编辑规则或提交样本。',403);
const actor=user.username;
const content=/^\/api\/order-rules\/batches\/(collecting-[a-f0-9]{32})\/content$/.exec(route);
if(content){const saved=require('./collecting-batches.cjs').save(orderRules,content[1],body,user);workspace?.record(user,'编辑批次内容',saved.id);reply(200,require('./query.cjs').batchDetail({orderRules,workspace},saved.id,user));return true;}
const migration=/^\/api\/order-rules\/rules\/([\w-]+)\/migration\/(preview|apply)$/.exec(route);
if(migration){if(user.role!=='admin')fail('仅管理员可迁移规则。',403);if(!body||Object.keys(body).some(k=>!['version','idempotencyKey','note'].includes(k)))fail('迁移参数无效。');reply(200,orderRules[migration[2]==='preview'?'previewMigration':'applyMigration'](migration[1],body,actor));return true;}
const trial=/^\/api\/order-rules\/rules\/([\w-]+)\/trial$/.exec(route);
@@ -0,0 +1,56 @@
'use strict';
const crypto=require('node:crypto');
const {fail}=require('./validation.cjs'),{upcomingWindow}=require('./window.cjs'),{delivery}=require('./delivery.cjs');
const digest=value=>crypto.createHash('sha256').update(JSON.stringify(value)).digest('hex');
const idFor=(rule,cutoff,mode='normal')=>'collecting-'+digest([rule.id,rule.version,rule.categoryId,mode,new Date(cutoff).toISOString(),mode==='huizhou'?rule.huizhouTemplateId:rule.bodyTemplateId]).slice(0,32);
function definition(store,rule,cutoff,mode,template){
const signature=store.settings().channelId?store.signatureResolver?.(store.settings().channelId):null;
const subject=template?.subject||rule.subjectPrefix||rule.name,format=template?.html?'html':'text',body=template?.html||template?.text||[rule.intro,'{{订单明细}}',mode==='normal'?'存放地址:{{存放地址}}':''].filter(Boolean).join('\n\n');
return {context:digest([rule,new Date(cutoff).toISOString(),mode,template?[template.id,template.version,template.bindingVersion]:null,signature?[signature.channelId,signature.version]:null]),subject,format,body};
}
function contentFor(store,rule,cutoff,mode,template){
const id=idFor(rule,cutoff,mode),saved=store.get('batch-content-drafts',id);if(!saved)return null;
const base=definition(store,rule,cutoff,mode,template);if(saved.context!==base.context)fail('本批次模板、规则或发件账户已变化,请重新核对并保存批次内容。',409);
if(template?.attachments?.length)fail('业务通知模板禁止附件,批次编辑不能覆盖此限制。',409);
return {template:{...(template||{}),id:template?.id||rule.bodyTemplateId||id,version:template?.version||rule.version,notificationMode:mode,status:'active',attachments:[],subject:saved.subject,text:saved.text,html:saved.html},edit:{id,version:saved.version,updatedAt:saved.updatedAt,updatedBy:saved.updatedBy}};
}
function list(store,{cutoff}={}){
if(typeof store.clock!=='function'||typeof store.schedule!=='function'||typeof store.calendar!=='function')return [];
const window=cutoff?require('./window.cjs').windowForCutoff(cutoff,store.schedule(),store.calendar()):upcomingWindow(store.clock(),store.schedule(),store.calendar());if(!window)return [];
const groups=new Map(),frozen=store.all('batches');
for(const order of store.all('orders')){
const rule=order.ruleSnapshot;if(order.removedAt||!rule?.id||!rule.categoryId||!require('./scopes.cjs').matchesScope(rule,order.event||{}))continue;
if(order.blockedByBatchId||order.missedWindow||order.status==='ignored'||!require('./restricted-test.cjs').orderInWindow(store,order,window))continue;
for(const mode of ['normal','huizhou']){
const notice=delivery(order,mode);if(!notice||notice.batchId||!['identified','preparing','archived','pending','blocked','failed'].includes(notice.status))continue;
if(mode==='huizhou'&&rule.huizhouEnabled!==true)continue;
if(frozen.some(b=>b.categoryId===rule.categoryId&&(b.notificationMode||'normal')===mode&&b.cutoff===window.end))continue;
const id=idFor(rule,window.end,mode);if(!groups.has(id))groups.set(id,{id,status:'collecting',categoryId:rule.categoryId,notificationMode:mode,cutoff:window.end,window,windowStart:window.start,windowEnd:window.end,rule,orders:[],orderIds:[],attachments:[],createdAt:order.ingestedAt||order.createdAt,...(rule.testRunId?{testRunId:rule.testRunId}:{})});const group=groups.get(id);group.orders.push(order);group.orderIds.push(order.id);
}
}
return [...groups.values()].map(group=>{
const {rule,orders,...value}=group,saved=store.get('batch-content-drafts',group.id);let template,sourceError;try{template=store.templateResolver?.(rule.categoryId,rule,group.notificationMode);}catch(error){sourceError=error.message;}let base;try{base=definition(store,rule,window.end,group.notificationMode,template);}catch(error){sourceError=error.message;base={context:digest([rule,window.end,group.notificationMode]),subject:rule.subjectPrefix||rule.name,format:'text',body:'{{订单明细}}\n{{存放地址}}'};}
const row={...value,version:saved?.version||0,context:base.context,editor:saved?{subject:saved.subject,format:saved.format,body:saved.body}:base,edited:!!saved,editable:!sourceError&&+store.clock()<Date.parse(window.end),subject:saved?.subject||base.subject,to:rule.to,cc:rule.cc||[],orderNos:orders.map(o=>o.event?.orderNo).filter(Boolean),ruleSnapshot:rule};
try{if(sourceError)fail(sourceError,409);const snapshot=require('./template.cjs').composeBatch(rule,require('./huizhou.cjs').ordersForMode(orders,group.notificationMode),window.end,store,{window,notificationMode:group.notificationMode});Object.assign(row,{subject:snapshot.subject,text:snapshot.text,html:snapshot.html,template:snapshot.template,signature:snapshot.signature});}
catch(error){row.error=error.message;row.text='';row.html='';}
return row;
});
}
function get(store,id){const group=list(store).find(b=>b.id===id);if(!group)fail('收集批次已结束、冻结或不存在,请刷新。',409);return group;}
function save(store,id,input,actor){
if(actor?.role!=='admin')fail('仅管理员可以编辑批次邮件内容。',403);
return store.transaction(()=>{
const group=get(store,id);if(!group.editable)fail('本批次已到发送截止时间,不能再编辑。',409);
if(!input||Object.keys(input).some(k=>!['version','context','subject','format','body'].includes(k))||input.version!==group.version||input.context!==group.context)fail('批次版本或来源配置已变化,请刷新后重新编辑。',409);
if(typeof input.subject!=='string'||!input.subject.trim()||input.subject.length>300||/[\x00-\x1f]/.test(input.subject))fail('邮件标题无效。');
const content=require('../mail/content.cjs').normalizeBody(input);require('../mail/parser.cjs').validateVariables(input.subject,content.text,content.html);
if(!/{{\s*(订单明细|订单列表)\s*}}/.test(input.body))fail('请保留 {{订单明细}} 或 {{订单列表}},以便新增订单自动加入邮件。');
if(group.notificationMode==='normal'&&!/{{\s*存放地址\s*}}/.test(input.body))fail('普通通知请保留 {{存放地址}}。');
const value={id,version:group.version+1,context:group.context,subject:input.subject.trim(),...content,updatedAt:store.now(),updatedBy:actor.username};store.put('batch-content-drafts',value);
const template=store.templateResolver?.(group.ruleSnapshot.categoryId,group.ruleSnapshot,group.notificationMode);contentFor(store,group.ruleSnapshot,group.cutoff,group.notificationMode,template);
const signature=store.settings().channelId?store.signatureResolver?.(store.settings().channelId):null;require('../mail/content.cjs').appendSignature({subject:value.subject,text:value.text,html:value.html},signature,store.settings().maxMessageBytes);
if(16384+Buffer.byteLength(value.subject+value.text+value.html)*2>store.settings().maxMessageBytes)fail('编辑后的批次内容超过邮件容量限制。',409);
const rendered=get(store,id);store.audit(actor.username,'编辑收集中批次',id+' v'+value.version);return rendered;
});
}
module.exports={idFor,list,get,save,contentFor};
+2
View File
@@ -7,6 +7,8 @@ async function orderRuleQueryApi(context){
if((route==='/api/order-rules'||route.startsWith('/api/order-rules/'))&&!context.orderRules)fail('分类通知规则服务未启动。',503);
const params=url instanceof URL?url.searchParams:new URL(String(url||route),'http://localhost').searchParams;
if(route==='/api/order-rules'&&params.get('view')==='summary'){reply(200,query.summary(context,user));return true;}
const preview=/^\/api\/order-rules\/batches\/([^/]+)\/preview$/.exec(route);
if(preview){let id;try{id=decodeURIComponent(preview[1]);}catch{fail('路径编码无效。');}const batch=query.batchDetail(context,id,user);response.writeHead(200,{'Content-Type':'text/html; charset=utf-8','Content-Security-Policy':"default-src 'none'; img-src data:; style-src 'unsafe-inline'; sandbox; base-uri 'none'; form-action 'none'"});response.end(require('../mail/content.cjs').previewDocument(batch.html||'<pre>'+require('../mail/parser.cjs').escape(batch.text||batch.error||'暂无可用正文')+'</pre>'));return true;}
const match=/^\/api\/order-rules\/(orders|batches)(?:\/([^/]+)(?:\/files\/(\d+))?)?$/.exec(route);
if(!match)return false;
const [,kind,encoded,index]=match;let id;
+13 -11
View File
@@ -5,7 +5,7 @@ const {fail}=require('./validation.cjs');
const {notifications,modeOf}=require('./delivery.cjs');
const cache=new WeakMap();
const orderStates=['candidate','identified','preparing','archived','pending','batched','blocked','unknown','sent','failed','capturing','archiving','queued','ignored'];
const batchStates=['prepared','sending','unknown','failed','sent','cancelled'];
const batchStates=['collecting','prepared','sending','unknown','failed','sent','cancelled'];
function records(store){
const revision=store.queryRevision?.();
const saved=cache.get(store);
@@ -41,7 +41,7 @@ function orderRow(order,task){
return {...event,...pick(order,['id','status','categoryId','error','reason','batchId','createdAt','updatedAt','orderNo','receivedAt']),...(order?{notifications:notifications(order),...(order.ruleSnapshot?.testRunId?{testRunId:order.ruleSnapshot.testRunId}:{})}:{}),
id:order?.id||'task:'+task.id,connectionId:order?.sample?.connectionId||event.connectionId||task?.connectionId,
error:task?.error||order?.error,executionTaskId:task?.id,executionStatus:task?.status,exceptionId:task?.exceptionId,orderNo:order?.orderNo||event.orderNo||event.serialNum||event.taskId,
categoryId:order?.categoryId||order?.ruleSnapshot?.categoryId||order?.ruleSnapshot?.id||task?.categoryIds?.[0]||'',status:task&&['failed','blocked','unknown','capturing','archiving'].includes(task.status)?task.status:order?.status||task?.status};
categoryName:order?.ruleSnapshot?.name||'',categoryId:order?.categoryId||order?.ruleSnapshot?.categoryId||order?.ruleSnapshot?.id||task?.categoryIds?.[0]||'',status:task&&['failed','blocked','unknown','capturing','archiving'].includes(task.status)?task.status:order?.status||task?.status};
}
function currentTasks(context,user){
const tasks=new Map();for(const task of records(context.orderRules).tasks){if(task.supersededBy||!task.orderId||!canReadConnection(context.workspace,user,task.connectionId))continue;const old=tasks.get(task.orderId);if(!old||Number(!!task.conflict)>Number(!!old.conflict)||!!task.conflict===!!old.conflict&&String(task.createdAt||'')>=String(old.createdAt||''))tasks.set(task.orderId,task);}return tasks;
@@ -51,6 +51,8 @@ function visibleOrders(context,user){
const data=records(context.orderRules),tasks=currentTasks(context,user);
const rows=data.orders.filter(o=>classified(o,tasks.get(o.id))&&canReadOrder(context.workspace,user,o)).map(o=>orderRow(o,tasks.get(o.id)));
for(const task of data.tasks)if(!task.orderId&&!task.supersededBy&&classified(null,task)&&canReadConnection(context.workspace,user,task.connectionId))rows.push(orderRow(null,task));
const collecting=require('./collecting-batches.cjs').list(context.orderRules).filter(b=>canReadBatch(context.workspace,user,b,context.orderRules));
for(const row of rows)row.collectingBatches=collecting.filter(b=>b.orderIds.includes(row.id)).map(b=>({id:b.id,subject:b.subject,cutoff:b.cutoff}));
return rows;
}
function page(rows,input,revision){
@@ -76,14 +78,14 @@ function publicRevision(context,user){
const sources=context.workspace?.recordSources?.()||context.workspace?.connectionSources?.()||[];
return crypto.createHash('sha256').update(JSON.stringify([records(context.orderRules).revision,user?.username,user?.role,sources.map(c=>[c.id,c.owner,c.status])])).digest('hex').slice(0,24);
}
function queryOrders(context,input,user){return page(visibleOrders(context,user),filters(input,'orders'),publicRevision(context,user));}
function queryOrders(context,input,user){const rows=visibleOrders(context,user),revision=crypto.createHash('sha256').update(publicRevision(context,user)+JSON.stringify(rows.map(r=>[r.id,r.collectingBatches]))).digest('hex').slice(0,24);return page(rows,filters(input,'orders'),revision);}
function batchRow(context,batch){
return {...pick(batch,['id','version','categoryId','subject','status','error','createdAt','windowStart','windowEnd','cutoff','orderNos','testRunId']),notificationMode:modeOf(batch),windowStart:batch.windowStart||batch.window?.start,windowEnd:batch.windowEnd||batch.window?.end||batch.cutoff,orderCount:batch.orderIds?.length||0,connectionIds:[...new Set((batch.orderIds||[]).map(id=>{const o=context.orderRules.get('orders',id);return o?.sample?.connectionId||o?.event?.connectionId||o?.connectionId;}).filter(Boolean))]};
return {...pick(batch,['id','version','categoryId','subject','status','error','createdAt','windowStart','windowEnd','cutoff','orderNos','testRunId']),categoryName:batch.ruleSnapshot?.name||context.orderRules.get('rules',batch.categoryId)?.draft?.name||batch.categoryId,notificationMode:modeOf(batch),windowStart:batch.windowStart||batch.window?.start,windowEnd:batch.windowEnd||batch.window?.end||batch.cutoff,orderCount:batch.orderIds?.length||0,connectionIds:[...new Set((batch.orderIds||[]).map(id=>{const o=context.orderRules.get('orders',id);return o?.sample?.connectionId||o?.event?.connectionId||o?.connectionId;}).filter(Boolean))]};
}
function queryBatches(context,input,user){
const f=filters(input,'batches'),data=records(context.orderRules);
const rows=data.batches.filter(b=>canReadBatch(context.workspace,user,b,context.orderRules)&&(f.scope==='all'||!['sent','cancelled'].includes(b.status))).map(b=>batchRow(context,b));
return page(rows,f,publicRevision(context,user));
const rows=[...data.batches,...require('./collecting-batches.cjs').list(context.orderRules)].filter(b=>canReadBatch(context.workspace,user,b,context.orderRules)&&(f.scope==='all'||!['sent','cancelled'].includes(b.status))).map(b=>batchRow(context,b));
return page(rows,f,crypto.createHash('sha256').update(publicRevision(context,user)+JSON.stringify(rows)).digest('hex').slice(0,24));
}
function orderDetail(context,id,user){
if(id.startsWith('candidate:'))fail('未匹配分类规则的记录不属于订单中心。',404);
@@ -91,12 +93,12 @@ function orderDetail(context,id,user){
const order=id.startsWith('task:')?null:context.orderRules.get('orders',id);
if(!classified(order,task)||(order?!canReadOrder(context.workspace,user,order):!task||!canReadConnection(context.workspace,user,task.connectionId)))fail('订单不存在或无权查看。',404);
const files=(order?.archive?.files||[]).map((file,index)=>({...pick(file,['name','size','sha256','kind']),index,url:'/api/order-rules/orders/'+encodeURIComponent(id)+'/files/'+index}));
return {...orderRow(order,task),event:identity(order?.event||task?.row),executionTask:taskEvidence(task,context,user),files,archivedAt:order?.archive?.archivedAt,archiveGeneration:order?.archiveGeneration||1,ruleVersion:order?.ruleSnapshot?.version,batches:data.batches.filter(b=>b.orderIds?.includes(id)&&canReadBatch(context.workspace,user,b,context.orderRules)).map(b=>batchRow(context,b))};
return {...orderRow(order,task),event:identity(order?.event||task?.row),executionTask:taskEvidence(task,context,user),files,archivedAt:order?.archive?.archivedAt,archiveGeneration:order?.archiveGeneration||1,ruleVersion:order?.ruleSnapshot?.version,batches:[...data.batches,...require('./collecting-batches.cjs').list(context.orderRules)].filter(b=>b.orderIds?.includes(id)&&canReadBatch(context.workspace,user,b,context.orderRules)).map(b=>batchRow(context,b))};
}
function batchDetail(context,id,user){
const batch=context.orderRules.get('batches',id);
const batch=id.startsWith('collecting-')?require('./collecting-batches.cjs').get(context.orderRules,id):context.orderRules.get('batches',id);
if(!batch||!canReadBatch(context.workspace,user,batch,context.orderRules))fail('批次不存在或无权查看。',404);
return {...batchRow(context,batch),...pick(batch,['to','cc','text','window','sentAt','resolvedAt','resolution','manual','originalBatchId']),orders:(batch.orderIds||[]).map(id=>context.orderRules.get('orders',id)).filter(Boolean).map(o=>orderRow(o)),attachments:(batch.attachments||[]).map(a=>pick(a,['name','filename','size','sha256']))};
return {...batchRow(context,batch),...pick(batch,['to','cc','text','html','window','sentAt','resolvedAt','resolution','manual','originalBatchId','template','signature','contentEdit','editor','edited','context','editable']),orders:(batch.orderIds||[]).map(id=>context.orderRules.get('orders',id)).filter(Boolean).map(o=>orderRow(o)),attachments:(batch.attachments||[]).map(a=>pick(a,['name','filename','size','sha256']))};
}
async function readOrderFile(context,id,index,user){
orderDetail(context,id,user);
@@ -115,10 +117,10 @@ async function readOrderFile(context,id,index,user){
function summary(context,user){
const result=context.orderRules.snapshot({includeRecords:false});
delete result.orders;delete result.batches;delete result.audit;delete result.fields;
const rows=visibleOrders(context,user),data=records(context.orderRules),batches=data.batches.filter(b=>canReadBatch(context.workspace,user,b,context.orderRules));
const rows=visibleOrders(context,user),data=records(context.orderRules),batches=[...data.batches,...require('./collecting-batches.cjs').list(context.orderRules)].filter(b=>canReadBatch(context.workspace,user,b,context.orderRules));
const count=(items,status)=>items.filter(i=>status.includes(i.status)).length;
result.scans=context.orderRules.all('execution-scans').filter(s=>canReadConnection(context.workspace,user,s.connectionId||s.id)).map(s=>pick(s,['id','connectionId','status','startedAt','finishedAt','rowCount','targetCount','error']));
result.counts={orders:rows.length,blocked:rows.filter(row=>['blocked','failed'].includes(row.status)||row.notifications?.huizhou?.status==='blocked').length,unknown:count(batches,['unknown']),activeBatches:count(batches,['prepared','sending','unknown','failed'])};
result.counts={orders:rows.length,blocked:rows.filter(row=>['blocked','failed'].includes(row.status)||row.notifications?.huizhou?.status==='blocked').length,unknown:count(batches,['unknown']),activeBatches:count(batches,['collecting','prepared','sending','unknown','failed'])};
result.issues=data.issues.filter(issue=>!['resolved','retired'].includes(issue.status)).filter(issue=>user.role==='admin'||((issue.orderIds?.length||issue.taskIds?.length)&& (issue.orderIds||[]).every(id=>canReadOrder(context.workspace,user,context.orderRules.get('orders',id)))&&(issue.taskIds||[]).every(id=>canReadConnection(context.workspace,user,context.orderRules.get('execution-tasks',id)?.connectionId)))).slice(-50).map(i=>{const linked=context.workspace?.businessIssue?.(i.id);return pick(linked?{...i,status:linked.status,owner:linked.owner,exceptionId:linked.id}:i,['id','status','type','message','error','component','notificationMode','owner','owners','exceptionId','createdAt','batchId','orderIds','taskIds']);}).filter(i=>!['resolved','retired'].includes(i.status));
result.templateUsage=context.orderRules.all('rules').map(r=>({categoryId:r.published?.categoryId||r.draft?.categoryId,name:r.draft?.name,templateId:r.published?.bodyTemplateId||'',huizhouEnabled:r.published?.huizhouEnabled===true,huizhouTemplateId:r.published?.huizhouTemplateId||'',legacyBinding:!!r.published&&r.published.bodyTemplateId===undefined,publishedVersion:r.published?.version||null,status:r.published?.status||'draft'}));
result.revision=crypto.createHash('sha256').update(publicRevision(context,user)+JSON.stringify([result.window,result.issues])).digest('hex').slice(0,24);
+2 -1
View File
@@ -55,7 +55,8 @@ function applyHuizhouTemplate(snapshot,template,orders,maxMessageBytes){
function composeBatch(rule,orders,cutoff,store,{window,notificationMode='normal',simulation=false}={}){
const settings=store.settings(),signature=settings.channelId?store.signatureResolver?.(settings.channelId):null;
const snapshot=require('./batch.cjs').buildBatch(signature?.enabled?{...rule,signature:''}:rule,orders,cutoff,{...(!simulation?{store}:{}),maxMessageBytes:settings.maxMessageBytes,window,notificationMode});
const rendered=applyBodyTemplate(snapshot,store.templateResolver?.(rule.categoryId,rule,notificationMode),orders,settings.maxMessageBytes);
const template=store.templateResolver?.(rule.categoryId,rule,notificationMode),override=require('./collecting-batches.cjs').contentFor(store,rule,cutoff,notificationMode,template);
const rendered=applyBodyTemplate(snapshot,override?.template||template,orders,settings.maxMessageBytes);if(override)rendered.contentEdit=override.edit;
return require('../mail/content.cjs').appendSignature(rendered,signature,settings.maxMessageBytes);
}
module.exports={applyBodyTemplate,composeBatch};