diff --git a/docs/HANDOFF.md b/docs/HANDOFF.md index 9cb5e9d..2d8e100 100644 --- a/docs/HANDOFF.md +++ b/docs/HANDOFF.md @@ -1,5 +1,15 @@ # 开发交接(2026-10-23) +## 2026-10-26 订单中心与发送前收集批次 + +- 用户确认保留11:00/17:00自动发送,发送前可以编辑,未编辑继续使用分类模板。邮件批次新增“收集中”,按当前发送窗口、分类、规则版本、模板及普通/惠州模式分组;订单中心有对应批次入口。读取分组不写业务订单或冻结批次,不把未匹配记录放入订单中心。 +- 收集窗口资格复用restricted-test.orderInWindow,与实际prepare一致,包括先前明确纳入待办的处理规则;普通历史订单不移动到新窗口。截止时点后内容只读;既有prepared/sending/sent/unknown不提供编辑接口。 +- 管理员可编辑本批标题及纯文本/HTML正文,保留自动订单明细变量和普通通知目录变量,新订单到达仍加入邮件;编辑存入batch-content-drafts,只作用于本批,不改模板、规则或BPM原文。支持版本冲突、来源配置变化阻断、保存失败保留输入及离页保护。归档未完成时也可提前保存文案,冻结时仍检查全部归档与来源就绪。 +- prepare通过原composeBatch读取本批编辑并保存contentEdit证据,账户签名自动追加。冻结后后续改模板/签名不重写正文,仍由既有调度器与隔离SMTP策略发送;不新增人工发送入口。新批次HTML预览独立鉴权并受CSP和sandbox限制。 +- 订单/批次详情使用居中弹窗;点批次内订单打开其来源、摘要、归档与状态详情,可返回原批次,地址和筛选不跳转。弹窗关闭/换页中止请求并清理控件、遮罩与滚动锁;后台更新只提示刷新,不重画正在阅读的详情。 +- 真实只读核对:现有1条pending海外订单符合当前11:00窗口,可直接显示收集批次,无需补造订单/归档/邮件记录。已办通知补漏、缺少适配流程及完整业务验收仍未完成,本次不宣称全业务闭环。 +- 本轮44项相关回归通过;独立复核发现的两项P2及弹窗打开过渡期间离页滚动锁均已补回归并修复。备份后更新原本机测试服务,实机验证315198收集批次、可编辑控件和关联订单弹窗/返回;没有保存真实批次文案,没有人工发信或办理BPM。账号、模板、规则、订单、批次及发信记录核对一致,状态和发送计划保持原值。 + ## 2026-10-26 BPM竞态修复 - 基于远端42d19c7,修复SignalR握手尚未完成时onClose先于reject的问题:首次关闭在推进轮询状态后立即安排待办/知会只读对账;旧票据使重复关闭和catch不重复推进或入队。既有退避、业务日历、停用及身份隔离继续生效。 diff --git a/docs/business-configuration.md b/docs/business-configuration.md index 4abe8d2..e4fe51d 100644 --- a/docs/business-configuration.md +++ b/docs/business-configuration.md @@ -1,5 +1,13 @@ # 业务配置与 Excel 导入 +## 订单中心与邮件批次 + +符合分类规则的订单进入订单中心后,在邮件批次页自动归入当前窗口的“收集中”批次。同分类、同规则/模板及通知模式聚合,不同分类分开。点击订单中心“查看收集中批次”或批次“查看详情”可打开弹窗;批次内点击订单可查看该订单详情,再返回原批次,不跳转到订单列表。 + +管理员可在发送截止前编辑本批次标题及纯文本/HTML正文。请保留 `{{订单明细}}` 或 `{{订单列表}}`,普通通知还须保留 `{{存放地址}}`,使后续到达订单自动进入邮件而不覆盖人工说明。账户签名自动追加;保存只影响该批次,规则模板及BPM原文不变。订单还在归档时可提前写文案,归档未完成仍不能发送。 + +11:00/17:00沿用原计划和业务日历,按最新已保存内容冻结发送;未编辑使用原模板。截止后、已冻结、发送中、已发送或结果不明的批次均不可编辑。来源配置变化后须重新核对保存,不自动丢弃人工内容。错过窗口的普通历史订单不自动补发,结果不明不自动重发。收集显示不代表来源、PDF/归档或发送验收全部通过。 + ## 邮件模板与账户签名 “邮件模板”可直接新建,或打开现有模板后点击“编辑模板”。可以维护标题、正文、适用产品线,正文可选择纯文本或HTML源码;“预览正文”不会发信。保存后的内容存入加密数据库,刷新、重启后保留。待确认模板须确认生效后才可被规则使用;编辑已生效模板保留原分类关联并更新版本,只影响后续新冻结批次。历史版本保持只读,可复制编辑。 diff --git a/docs/superpowers/plans/2026-10-26-collecting-batches.md b/docs/superpowers/plans/2026-10-26-collecting-batches.md new file mode 100644 index 0000000..8d88aa7 --- /dev/null +++ b/docs/superpowers/plans/2026-10-26-collecting-batches.md @@ -0,0 +1,14 @@ +# 订单中心与收集批次实施 + +用户确认:保留11:00/17:00定时自动发送,发送前可编辑,未编辑使用原模板。 + +新增“收集中”视图,按当前发送窗口、分类、规则版本、模板及通知模式自动分组。读取分组不创建订单或冻结批次;编辑内容独立持久化,发送时由既有prepare冻结。归档、权限、当前来源复核和邮件隔离不变。历史窗口不搬入当前批次。 + +正文可编辑纯文本/HTML,保留自动订单明细变量及普通通知存放地址变量,新订单到达时仍自动加入。编辑只影响本批次,不修改模板或BPM原文;账户签名由既有逻辑追加。截止时点后以及prepared/sending/sent/unknown不可编辑。 + +- [x] 失败测试:当前窗口自动归类、未匹配排除、动态成员、内容持久化/并发/权限、冻结使用编辑结果。 +- [x] 实现collecting-batches独立模块,接入查询与prepare,继续复用composeBatch。 +- [x] 批次编辑/HTML预览、订单中心批次入口、批次订单弹窗及返回原批次,稳定阅读与离页保护。 +- [x] 隔离端到端、相关回归与独立复核,备份后更新本机,原数据保留,提交推送。不人工触发真实邮件、不办理BPM。 + +验收:44项相关回归通过(6项收集后端、2项弹窗编辑、11项查询、7项Excel执行桥接、16项发信策略、2项普通/惠州记录兼容)。独立复核两项P2已补失败测试并修复;追加弹窗过渡期间离页清理回归通过。旧未分类记录测试样本补上分类证据以符合现有订单中心准入要求。 diff --git a/package.json b/package.json index eb9caa2..1f63680 100644 --- a/package.json +++ b/package.json @@ -13,7 +13,7 @@ "service:stop": "node scripts/service.cjs stop", "service:restart": "node scripts/service.cjs restart", "test": "npm run test:business", - "test:business": "node --test --test-concurrency=1 tests/mail/sample-send.test.cjs tests/mail/template-editing.test.cjs tests/mail/template-editor-ui.test.cjs tests/order-rules/scope-catalog.test.cjs tests/order-rules/field-mapping-ui.test.cjs tests/order-rules/scope-search-ui.test.cjs tests/order-rules/excel-import-contract.test.cjs tests/order-rules/excel-execution-bridge.test.cjs tests/order-rules/excel-import-flow-ui.test.cjs tests/order-rules/query.test.cjs tests/order-rules/scheduled-mail-policy.test.cjs", + "test:business": "node --test --test-concurrency=1 tests/mail/sample-send.test.cjs tests/mail/template-editing.test.cjs tests/mail/template-editor-ui.test.cjs tests/order-rules/scope-catalog.test.cjs tests/order-rules/field-mapping-ui.test.cjs tests/order-rules/scope-search-ui.test.cjs tests/order-rules/excel-import-contract.test.cjs tests/order-rules/excel-execution-bridge.test.cjs tests/order-rules/excel-import-flow-ui.test.cjs tests/order-rules/collecting-batches.test.cjs tests/order-rules/collecting-batches-ui.test.cjs tests/order-rules/query.test.cjs tests/order-rules/scheduled-mail-policy.test.cjs", "test:full": "node --test --test-concurrency=2 \"tests/**/*.test.cjs\"" }, "engines": { diff --git a/src/app/assets.cjs b/src/app/assets.cjs index 7f13005..ba1405c 100644 --- a/src/app/assets.cjs +++ b/src/app/assets.cjs @@ -40,6 +40,7 @@ function createAssets(){ '/field-mappings.css':{path:path.join(webRoot,'modules/field-mappings/view.css'),type:'text/css'}, '/order-notifications-shared.js':{path:path.join(webRoot,'modules/order-notifications/shared.js'),type:'text/javascript'}, '/modules/order-notifications/detail.js':{path:path.join(webRoot,'modules/order-notifications/detail.js'),type:'text/javascript'}, + '/modules/order-notifications/batch-editor.js':{path:path.join(webRoot,'modules/order-notifications/batch-editor.js'),type:'text/javascript'}, '/modules/order-notifications/records.js':{path:path.join(webRoot,'modules/order-notifications/records.js'),type:'text/javascript'}, '/order-notifications.js':{path:path.join(webRoot,'modules/order-notifications/view.js'),type:'text/javascript'}, '/order-rules.js':{path:path.join(webRoot,'modules/order-rules/view.js'),type:'text/javascript'}, diff --git a/src/app/request.cjs b/src/app/request.cjs index 312fffd..43c727a 100644 --- a/src/app/request.cjs +++ b/src/app/request.cjs @@ -14,7 +14,7 @@ async function readBody(request,fail){ let body; if(request.method==='POST') { if(!/^application\/json(?:;|$)/i.test(request.headers['content-type'] || ''))fail(415,'需要 JSON 数据。'); - const mailEditor=/^\/api\/mail\/(?:templates(?:\/[\w-]+\/save)?|preview)(?:\?|$)/.test(request.url||''),mailAccount=/^\/api\/mail\/channels(?:\?|$)/.test(request.url||''),maxBytes=mailEditor?4*1024*1024:mailAccount?256*1024:128*1024; + const mailEditor=/^\/api\/mail\/(?:templates(?:\/[\w-]+\/save)?|preview)(?:\?|$)/.test(request.url||''),mailAccount=/^\/api\/mail\/channels(?:\?|$)/.test(request.url||''),batchEditor=/^\/api\/order-rules\/batches\/collecting-[a-f0-9]{32}\/content(?:\?|$)/.test(request.url||''),maxBytes=mailEditor||batchEditor?4*1024*1024:mailAccount?256*1024:128*1024; if(Number(request.headers['content-length'] || 0)>maxBytes){request.resume();fail(413,'提交内容过大。');} const chunks=[];let size=0; for await(const chunk of request){size+=chunk.length;if(size>maxBytes)fail(413,'提交内容过大。');chunks.push(chunk);} diff --git a/src/modules/order-rules/api.cjs b/src/modules/order-rules/api.cjs index 05658ca..4738499 100644 --- a/src/modules/order-rules/api.cjs +++ b/src/modules/order-rules/api.cjs @@ -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); diff --git a/src/modules/order-rules/collecting-batches.cjs b/src/modules/order-rules/collecting-batches.cjs new file mode 100644 index 0000000..4f0b745 --- /dev/null +++ b/src/modules/order-rules/collecting-batches.cjs @@ -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()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}; diff --git a/src/modules/order-rules/query-api.cjs b/src/modules/order-rules/query-api.cjs index 2de2108..74bf2b1 100644 --- a/src/modules/order-rules/query-api.cjs +++ b/src/modules/order-rules/query-api.cjs @@ -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'&¶ms.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||'
'+require('../mail/parser.cjs').escape(batch.text||batch.error||'暂无可用正文')+'
'));return true;} const match=/^\/api\/order-rules\/(orders|batches)(?:\/([^/]+)(?:\/files\/(\d+))?)?$/.exec(route); if(!match)return false; const [,kind,encoded,index]=match;let id; diff --git a/src/modules/order-rules/query.cjs b/src/modules/order-rules/query.cjs index 6b8c7a0..b51c4e9 100644 --- a/src/modules/order-rules/query.cjs +++ b/src/modules/order-rules/query.cjs @@ -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); diff --git a/src/modules/order-rules/template.cjs b/src/modules/order-rules/template.cjs index 7fea148..868b71f 100644 --- a/src/modules/order-rules/template.cjs +++ b/src/modules/order-rules/template.cjs @@ -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}; diff --git a/tests/order-rules/collecting-batches-ui.test.cjs b/tests/order-rules/collecting-batches-ui.test.cjs new file mode 100644 index 0000000..d1e9451 --- /dev/null +++ b/tests/order-rules/collecting-batches-ui.test.cjs @@ -0,0 +1,14 @@ +'use strict'; +const test=require('node:test'),assert=require('node:assert/strict'),crypto=require('node:crypto'); +const {orderDrivenUI}=require('../fixtures/order-driven-ui.cjs'); +async function setup(t){const f=await orderDrivenUI(t,'#notification-batches'),s=f.runtime.orderRules;s.clock=()=>new Date('2026-10-26T01:00:00Z');s.capabilities={liveTodo:true,pdfExport:true,automaticArchive:true};const {activateReferenceMapping}=require('../fixtures/activate-field-mapping.cjs'),sample=activateReferenceMapping(s).sample,old=s.get('rules','bs-change').draft,rule=s.saveRule({...old,archiveDirectory:'\\\\fixture\\orders',to:['2639266652@qq.com'],cc:[],filenameDate:'receivedAt',bodyTemplateId:''},'admin');s.put('rules',{...s.get('rules',rule.id),published:{...rule,status:'enabled'}});s.saveSettings({...s.settings(),channelId:'fixture-channel',enabled:true,processingEnabled:true},'admin');const order=s.ingest({...sample,connectionId:f.sample.connectionId,taskId:'batch-ui-order',instanceId:'batch-ui-instance',receivedAt:'2026-10-26T00:30:00Z'},'fixture');assert.equal(order.status,'identified',order.error);const bytes=Buffer.from('%PDF-1.7 fixture');s.recordArchive(order.id,{archivedAt:s.now(),files:[{name:'order.pdf',path:'C:\\fixture\\order.pdf',size:bytes.length,sha256:crypto.createHash('sha256').update(bytes).digest('hex'),kind:'pdf'}]},'fixture');await f.page.getByRole('button',{name:'刷新数据',exact:true}).click();return {...f,order};} +test('collecting batch saves HTML, opens linked orders in a modal and returns without navigation',{timeout:90000},async t=>{ + const {page,runtime,order}=await setup(t);await page.getByRole('button',{name:'查看详情',exact:true}).click();const dialog=page.getByRole('dialog',{name:'业务详情',exact:true});await dialog.getByRole('heading',{name:'编辑本批次邮件',exact:true}).waitFor(); + await dialog.getByLabel('本批次邮件标题',{exact:true}).fill('当前批次 {{订单号}}');await dialog.getByLabel('批次正文格式',{exact:true}).selectOption('html');await dialog.getByLabel('本批次邮件正文',{exact:true}).fill('

批次专用说明

{{订单明细}}

{{存放地址}}

');await dialog.getByRole('button',{name:'保存批次内容',exact:true}).click();await dialog.getByText('批次内容已保存,按计划自动发送。',{exact:true}).waitFor();assert.equal(runtime.orderRules.all('batch-content-drafts').length,1);assert.equal(runtime.orderRules.all('batches').length,0); + await dialog.getByRole('button',{name:order.event.orderNo,exact:true}).click();await dialog.getByRole('heading',{name:'处理进度',exact:true}).waitFor();assert.match(page.url(),/#notification-batches/);assert.equal(await dialog.getByRole('button',{name:'返回批次',exact:true}).count(),1);await dialog.getByRole('button',{name:'返回批次',exact:true}).click();assert.match(await dialog.getByLabel('本批次邮件正文',{exact:true}).inputValue(),/批次专用说明/); + await dialog.getByRole('button',{name:'关闭详情',exact:true}).click();await page.reload();await page.getByRole('button',{name:'查看详情',exact:true}).click();await dialog.getByLabel('本批次邮件正文',{exact:true}).waitFor();assert.match(await dialog.getByLabel('本批次邮件正文',{exact:true}).inputValue(),/批次专用说明/);await page.setViewportSize({width:390,height:844});assert.equal(await page.evaluate(()=>document.documentElement.scrollWidth<=innerWidth),true);await page.goto(new URL('/#notification-orders',page.url()).href);await page.getByRole('button',{name:'查看收集中批次',exact:true}).waitFor();await page.waitForFunction(()=>!document.querySelector('.modal-backdrop')&&document.body.style.overflow==='');assert.equal(await page.evaluate(()=>document.body.style.overflow),''); +}); +test('order center opens its collecting batch and failed saves keep inputs and dirty-close protection',{timeout:90000},async t=>{ + const {page,runtime}=await setup(t);await page.goto(new URL('/#notification-orders',page.url()).href);await page.getByRole('button',{name:'查看收集中批次',exact:true}).click();const dialog=page.getByRole('dialog',{name:'业务详情',exact:true});await dialog.getByLabel('本批次邮件标题',{exact:true}).fill('未保存修改'); + await page.route('**/api/order-rules/batches/*/content',r=>r.fulfill({status:503,json:{error:'隔离批次保存失败'}}));await dialog.getByRole('button',{name:'保存批次内容',exact:true}).click();await dialog.getByText('隔离批次保存失败',{exact:true}).waitFor();await dialog.getByRole('button',{name:'关闭详情',exact:true}).click();await page.getByRole('button',{name:'留在此页',exact:true}).click();assert.equal(await dialog.getByLabel('本批次邮件标题',{exact:true}).inputValue(),'未保存修改');assert.equal(runtime.orderRules.all('batch-content-drafts').length,0); +}); diff --git a/tests/order-rules/collecting-batches.test.cjs b/tests/order-rules/collecting-batches.test.cjs new file mode 100644 index 0000000..216b623 --- /dev/null +++ b/tests/order-rules/collecting-batches.test.cjs @@ -0,0 +1,40 @@ +'use strict'; +const test=require('node:test'),assert=require('node:assert/strict'),fs=require('node:fs'),os=require('node:os'),path=require('node:path'),crypto=require('node:crypto'); +const {RuleStore}=require('../../src/modules/order-rules/store.cjs'),{activateReferenceMapping}=require('../fixtures/activate-field-mapping.cjs'); +const actor={username:'admin',role:'admin'}; +function fixture(t){const dir=fs.mkdtempSync(path.join(os.tmpdir(),'collecting-batches-'));let now=new Date('2026-10-26T01:00:00Z');const s=new RuleStore(dir,{clock:()=>now,capabilities:{liveTodo:true,pdfExport:true,automaticArchive:true}});t.after(()=>{s.close();assert.equal(path.dirname(fs.realpathSync(dir)).toLowerCase(),fs.realpathSync(os.tmpdir()).toLowerCase());fs.rmSync(dir,{recursive:true,force:true});});const e=activateReferenceMapping(s).sample,old=s.get('rules','bs-change').draft,rule=s.saveRule({...old,archiveDirectory:'\\\\fixture\\orders',to:['2639266652@qq.com'],cc:[],filenameDate:'receivedAt',bodyTemplateId:''},'admin');s.put('rules',{...s.get('rules',rule.id),published:{...rule,status:'enabled'}});s.saveSettings({...s.settings(),channelId:'fixture-channel',processingEnabled:true,enabled:true},'admin'); + const add=(id,time='2026-10-26T00:30:00Z')=>{const o=s.ingest({...e,taskId:id,instanceId:'instance-'+id,receivedAt:time,title:'订单号:'+id+'机芯号:CORE',fields:{...e.fields,[require('../../src/modules/order-rules/catalog.cjs').adapters.find(a=>a.id==='bs-change').fields.orderNo]:id}},'fixture');assert.equal(o.status,'identified',o.error);const bytes=Buffer.from('%PDF-1.7 fixture');s.recordArchive(o.id,{archivedAt:now.toISOString(),files:[{name:id+'.pdf',path:'C:\\fixture\\'+id+'.pdf',size:bytes.length,sha256:crypto.createHash('sha256').update(bytes).digest('hex'),kind:'pdf'}]},'fixture');return s.get('orders',o.id);};return {s,dir,rule,add,setNow:value=>now=new Date(value)};} +test('matched current-window orders collect by category, stay dynamic and freeze edited HTML once',t=>{ + const f=fixture(t),c=require('../../src/modules/order-rules/collecting-batches.cjs'),a=f.add('ONE'),initial=c.list(f.s);assert.equal(initial.length,1);assert.equal(f.s.all('batches').length,0);assert.equal(initial[0].status,'collecting');assert.equal(initial[0].orderIds[0],a.id); + const draft=c.save(f.s,initial[0].id,{version:0,context:initial[0].context,subject:'本批 {{订单号}}',format:'html',body:'

自定义说明

{{订单明细}}

{{存放地址}}

'},actor);assert.equal(draft.version,1); + const b=f.add('TWO'),next=c.get(f.s,initial[0].id);assert.equal(next.orderIds.length,2);assert.match(next.text,/自定义说明/);assert.match(next.text,/ONE/);assert.match(next.text,/TWO/);assert.equal(next.orderIds[1],b.id);assert.equal(f.s.get('rules','bs-change').draft.intro,f.rule.intro); + assert.throws(()=>c.save(f.s,next.id,{version:0,context:next.context,subject:'冲突',format:'text',body:'{{订单明细}}\n{{存放地址}}'},actor),e=>e.status===409); + f.setNow('2026-10-26T03:00:00Z');assert.throws(()=>c.save(f.s,next.id,{version:1,context:next.context,subject:'太晚',format:'text',body:'{{订单明细}}\n{{存放地址}}'},actor),e=>e.status===409); + const [frozen]=f.s.prepare('2026-10-26T03:00:00Z','fixture');assert(frozen);assert.match(frozen.text,/自定义说明/);assert.equal(frozen.contentEdit.version,1);assert.deepEqual(frozen.orderIds,[a.id,b.id]);assert.deepEqual(frozen.attachments,[]);assert.equal(c.list(f.s).length,0); +}); +test('unknown candidates and historical windows do not collect; editing validates variables and operator scope',t=>{ + const f=fixture(t),c=require('../../src/modules/order-rules/collecting-batches.cjs');f.add('CURRENT');const group=c.list(f.s)[0];f.s.put('orders',{id:'unmatched',status:'blocked',event:{receivedAt:'2026-10-26T00:00:00Z'}});assert.equal(c.list(f.s).length,1); + for(const body of ['没有订单区','{{订单明细}}','{{不存在}}\n{{订单明细}}\n{{存放地址}}'])assert.throws(()=>c.save(f.s,group.id,{version:0,context:group.context,subject:'标题',format:'text',body},actor));assert.equal(f.s.all('batch-content-drafts').length,0); + assert.throws(()=>c.save(f.s,group.id,{version:0,context:group.context,subject:'标题',format:'text',body:'{{订单明细}}\n{{存放地址}}'},{username:'viewer',role:'viewer'}),e=>e.status===403); + f.setNow('2026-10-26T04:00:00Z');assert.equal(c.list(f.s).length,0);assert.equal(f.s.all('batches').length,0); +}); +test('query links both directions, preserves edits on disk and rechecks template context before freeze',t=>{ + const f=fixture(t),c=require('../../src/modules/order-rules/collecting-batches.cjs'),q=require('../../src/modules/order-rules/query.cjs'),a=f.add('DISK');let template={id:'sample-template',version:1,subject:'通知',text:'{{订单明细}}\n{{存放地址}}',html:'',attachments:[]};f.s.templateResolver=()=>template; + const context={orderRules:f.s},group=c.list(f.s)[0];assert.equal(q.queryBatches(context,{},actor).items[0].id,group.id);assert.equal(q.queryOrders(context,{},actor).items[0].collectingBatches[0].id,group.id);assert.equal(q.orderDetail(context,a.id,actor).batches[0].id,group.id);assert.equal(q.batchDetail(context,group.id,actor).orders[0].id,a.id); + c.save(f.s,group.id,{version:0,context:group.context,subject:'持久编辑',format:'text',body:'持久说明\n{{订单明细}}\n{{存放地址}}'},actor);const db=new RuleStore(f.dir,{clock:()=>new Date('2026-10-26T01:00:00Z')});try{assert.equal(db.all('batch-content-drafts')[0].subject,'持久编辑');}finally{db.close();} + template={...template,version:2};assert.match(c.get(f.s,group.id).error,/已变化/);f.setNow('2026-10-26T03:00:00Z');assert.equal(f.s.prepare('2026-10-26T03:00:00Z','fixture').length,0);assert.match(f.s.all('window-results')[0].error,/已变化/); +}); +test('different categories stay separate and missing templates do not hide the entire batch page',t=>{ + const f=fixture(t),c=require('../../src/modules/order-rules/collecting-batches.cjs'),a=f.add('CATEGORY-A'),other=structuredClone(a);other.id='second-category-order';other.event.processName='第二流程';other.ruleSnapshot={...other.ruleSnapshot,id:'second-category',categoryId:'second-category',name:'另一分类',scopes:[{processName:'第二流程',nodeName:other.event.nodeName}]};other.categoryId='second-category';f.s.put('orders',other); + assert.equal(c.list(f.s).length,2);f.s.templateResolver=(category)=>{if(category==='second-category')throw Object.assign(Error('隔离模板已停用'),{status:409});return null;};const groups=c.list(f.s);assert.equal(groups.length,2);assert.match(groups.find(b=>b.categoryId==='second-category').error,/模板已停用/);assert(groups.find(b=>b.categoryId==='bs-change').text); +}); +test('content can be saved while a member is still preparing its archive without bypassing send prerequisites',t=>{ + const f=fixture(t),c=require('../../src/modules/order-rules/collecting-batches.cjs'),a=f.add('ARCHIVING');a.status='preparing';a.archive=null;f.s.put('orders',a);const group=c.list(f.s)[0];assert(group.error); + const saved=c.save(f.s,group.id,{version:0,context:group.context,subject:'提前编辑',format:'text',body:'提前说明\n{{订单明细}}\n{{存放地址}}'},actor);assert.equal(saved.version,1);assert(saved.error);assert.equal(f.s.all('batch-content-drafts').length,1); + f.setNow('2026-10-26T03:00:00Z');assert.equal(f.s.prepare('2026-10-26T03:00:00Z','fixture').length,0);assert.equal(f.s.all('batches').length,0); +}); +test('manually admitted backlog uses the same current-window eligibility as the freeze operation',t=>{ + const f=fixture(t),c=require('../../src/modules/order-rules/collecting-batches.cjs'),a=f.add('ADMITTED'),row=a.sample,keys=['source','portalSource','taskId','instanceId','revision','processName','nodeName','processVersion','receivedAt'],snapshot=Object.fromEntries(keys.filter(k=>Object.hasOwn(row,k)).map(k=>[k,row[k]])),snapshotHash=crypto.createHash('sha256').update(JSON.stringify(Object.fromEntries(Object.keys(snapshot).sort().map(k=>[k,snapshot[k]])))).digest('hex'); + f.s.put('restricted-test',{id:'main',value:{id:'admitted-run',enabled:true,rules:[],currentBacklog:[{snapshot,snapshotHash,testRunId:'admitted-run',admittedAt:'2026-10-26T01:00:00Z'}]}});f.setNow('2026-10-26T08:00:00Z'); + const window=require('../../src/modules/order-rules/window.cjs').upcomingWindow(f.s.clock(),f.s.schedule(),f.s.calendar());assert.equal(require('../../src/modules/order-rules/restricted-test.cjs').orderInWindow(f.s,a,window),true);assert.equal(c.list(f.s)[0]?.orderIds[0],a.id); +}); diff --git a/tests/order-rules/huizhou-ui.test.cjs b/tests/order-rules/huizhou-ui.test.cjs index a31ecde..43009f1 100644 --- a/tests/order-rules/huizhou-ui.test.cjs +++ b/tests/order-rules/huizhou-ui.test.cjs @@ -85,10 +85,10 @@ test('order list retains execution failure and conflict causes beside independen const f=await fixture(t),{runtime,page}=f; const cases=[{id:'execution-failed',status:'failed',error:'归档读取校验失败,通知尚待处理'},{id:'execution-conflict',status:'blocked',error:'新来源修订与已归档版本冲突,请核对',conflict:true}]; for(const item of cases){ - runtime.orderRules.put('orders',{id:item.id,status:'sent',error:'普通路已有结果说明',event:{connectionId:'c',orderNo:item.id,receivedAt:'2026-10-21T01:00:00Z'},notifications:{huizhou:{status:'pending',batchId:null,error:'惠州路独立等待原因',orderNos:['H-200'],issues:[]}}}); + runtime.orderRules.put('orders',{id:item.id,categoryId:'bs-change',status:'sent',error:'普通路已有结果说明',event:{connectionId:'c',orderNo:item.id,receivedAt:'2026-10-21T01:00:00Z'},notifications:{huizhou:{status:'pending',batchId:null,error:'惠州路独立等待原因',orderNos:['H-200'],issues:[]}}}); runtime.orderRules.put('execution-tasks',{id:'task-'+item.id,orderId:item.id,connectionId:'c',version:1,status:item.status,error:item.error,conflict:item.conflict||false,row:{orderNo:item.id}}); } - runtime.orderRules.put('execution-tasks',{id:'bare-execution',connectionId:'c',version:1,status:'failed',error:'尚未生成订单的采集失败',row:{orderNo:'bare-execution'}}); + runtime.orderRules.put('execution-tasks',{id:'bare-execution',categoryIds:['bs-change'],connectionId:'c',version:1,status:'failed',error:'尚未生成订单的采集失败',row:{orderNo:'bare-execution'}}); await f.open('#notification-orders'); for(const item of cases){const row=page.locator('tr').filter({has:page.getByText(item.id,{exact:true})});await row.waitFor();const text=await row.innerText();assert.ok(text.includes(item.error),text);assert.match(text,/普通通知.*已提交邮件服务器/s);assert.match(text,/惠州通知.*等待汇总/s);assert.match(text,/普通路已有结果说明/);assert.match(text,/惠州路独立等待原因/);} const bare=page.locator('tr').filter({has:page.getByText('bare-execution',{exact:true})});assert.match(await bare.innerText(),/尚未生成订单的采集失败/);assert.doesNotMatch(await bare.innerText(),/普通通知|惠州通知/); diff --git a/web/index.html b/web/index.html index 8eb42ac..e5e72f7 100644 --- a/web/index.html +++ b/web/index.html @@ -1,3 +1,3 @@ 订单通知中心 -
正在连接订单通知中心…
+
正在连接订单通知中心…
diff --git a/web/modules/order-notifications/batch-editor.js b/web/modules/order-notifications/batch-editor.js new file mode 100644 index 0000000..2e2e104 --- /dev/null +++ b/web/modules/order-notifications/batch-editor.js @@ -0,0 +1,15 @@ +'use strict'; +window.BatchContentEditor={ + render(d,{esc,user}){ + if(d.status!=='collecting')return ''; + if(user.role!=='admin'||!d.editable)return '

本批次内容只读;管理员可在发送截止前编辑。

'; + const e=d.editor||{};return '

编辑本批次邮件

只修改这一批,不改邮件模板。保留 {{订单明细}} 或 {{订单列表}},新增订单会自动加入;普通通知还须保留 {{存放地址}}。账户签名自动追加。截止时点按已保存内容自动冻结发送。

'; + }, + bind(host,d,{api,isActive,onSaved}){ + const form=host.querySelector('[data-batch-content-editor]');if(!form)return {dispose(){}};let busy=false,disposed=false;const read=()=>({version:d.version,context:d.context,subject:form.elements.subject.value,format:form.elements.format.value,body:form.elements.body.value}),live=()=>!disposed&&isActive()&&form.isConnected;let baseline=JSON.stringify(read()); + async function action(work){if(busy||!live())return false;busy=true;const locked=[...form.querySelectorAll('input,textarea,select,button')];locked.forEach(e=>e.disabled=true);const notice=form.querySelector('[role=alert]');notice.textContent='';try{return await work();}catch(e){if(live())notice.textContent=e.message;return false;}finally{busy=false;if(live())locked.forEach(e=>e.disabled=false);}} + async function save(){if(!live()||!form.reportValidity())return false;const input=read();return action(async()=>{const saved=await api('/order-rules/batches/'+encodeURIComponent(d.id)+'/content',input);if(!live())return true;d.version=saved.version;d.context=saved.context;baseline=JSON.stringify(read());await onSaved(saved);return true;});} + const unregister=window.PageLifecycle.register({dirty:()=>live()&&JSON.stringify(read())!==baseline,save});form.onsubmit=e=>{e.preventDefault();return save();};form.querySelector('[data-batch-preview]').onclick=()=>{const input=read();return action(async()=>{const frame=form.querySelector('iframe');await window.MailTemplateEditor.preview(frame,api,{format:input.format,body:input.body});if(live())frame.hidden=false;});}; + return {dispose(){disposed=true;unregister();}}; + } +}; diff --git a/web/modules/order-notifications/detail.js b/web/modules/order-notifications/detail.js index c2ea096..ea41566 100644 --- a/web/modules/order-notifications/detail.js +++ b/web/modules/order-notifications/detail.js @@ -1,25 +1,34 @@ 'use strict'; window.BusinessRecordDetail=(()=>{ function mount(container,{api,esc,formatDate,user,isActive,onChanged}){ - const panel=window.RecordUi.details(container,'业务详情');let revision=0,controller; + const panel=window.RecordUi.details(container,'业务详情',{modal:true});let revision=0,controller,editor; const field=(label,value)=>window.RecordUi.field(esc,label,value); - const statuses={candidate:'未匹配通知规则',disabled:'未开启',empty:'无匹配惠州明细',not_applicable:'历史订单,不追加通知',ignored:'历史保留,不自动补发',pending:'等待汇总',identified:'已识别',preparing:'准备归档',archived:'已归档',batched:'已编入批次',blocked:'受阻',failed:'失败',unknown:'结果待核实',sent:'已提交邮件服务器',prepared:'已冻结待发',sending:'发送中',cancelled:'已取消'}; + const statuses={collecting:'收集中',candidate:'未匹配通知规则',disabled:'未开启',empty:'无匹配惠州明细',not_applicable:'历史订单,不追加通知',ignored:'历史保留,不自动补发',pending:'等待汇总',identified:'已识别',preparing:'准备归档',archived:'已归档',batched:'已编入批次',blocked:'受阻',failed:'失败',unknown:'结果待核实',sent:'已提交邮件服务器',prepared:'已冻结待发',sending:'发送中',cancelled:'已取消'}; function form(action,label,options=''){return `

${label}

${options}
`;} function notificationBody(mode,notice){ if(!notice)return ''; - const batch=notice.batchId?''+esc(notice.batchId)+'':'尚未编入批次'; + const batch=notice.batchId?''+esc(notice.batchId)+'':'尚未冻结为发送批次'; return '

'+(mode==='huizhou'?'惠州通知':'普通通知')+'

'+field('状态',statuses[notice.status]||notice.status)+field('原因',notice.error)+(mode==='huizhou'?field('入选惠州订单',(notice.orderNos||[]).join('、')):'')+'
邮件批次
'+batch+'
'+(notice.issues?.length?'':'')+'
'; } function orderBody(d){ const t=d.executionTask,e=d.event||{}; if(d.status==='candidate')return '

未匹配通知规则

当前流程或节点未命中 Excel 通知规则,不会归档或发送邮件。

'+field('原因',d.reason)+field('流程',e.processName)+field('当前节点',e.nodeName)+field('BPM任务',e.taskId)+field('接收时间',formatDate(e.receivedAt))+'
'; - return `

处理进度

${field('订单',d.orderNo)}${field('状态',statuses[d.status]||d.status)}${field('原因',t?.error||d.error||d.reason)}${field('执行步骤',t?.step)}${field('执行任务',t?.id)}${field('规则版本',d.ruleVersion)}
${notificationBody('normal',d.notifications?.normal)}${notificationBody('huizhou',d.notifications?.huizhou)}

来源

${field('连接',d.connectionId)}${field('流程',e.processName)}${field('节点',e.nodeName)}${field('流程实例',e.instanceId)}${field('BPM任务',e.taskId)}${field('来源版本',e.revision)}${field('接收时间',formatDate(e.receivedAt))}

PDF / 归档

归档代次 ${esc(d.archiveGeneration)} · ${esc(formatDate(d.archivedAt))}

${d.files.map(f=>`

${esc(f.name||'下载归档 PDF')} · ${esc(f.size)} 字节

`).join('')||'

尚无可验证归档文件

'}

邮件批次

${d.batches.map(b=>`

${esc(b.subject||b.id)} · ${b.notificationMode==='huizhou'?'惠州通知':'普通通知'} · ${esc(statuses[b.status]||b.status)}

`).join('')||'

尚未编入批次

'}${t?.exceptionId?`处理关联异常`:''}${t?.revisionEvidence?`

修订核对

${['revision','orderNo','title','receivedAt','processName','nodeName','quantity','brief'].map(key=>``).join('')}
信息原修订新修订
${esc(key)}${esc(t.revisionEvidence.previous[key]||'—')}${esc(t.revisionEvidence.incoming[key]||'—')}
`:''}${user.role==='admin'&&t?.conflict&&!t.missedWindow&&!['unknown','sent','sending','batched'].includes(d.status)?form('revision','保存修订核对',''):''}${user.role!=='viewer'&&t&&!t.conflict&&!t.missedWindow&&['failed','blocked'].includes(t.status)?form('retry','重试失败任务'):''}`; + return `

处理进度

${field('订单',d.orderNo)}${field('状态',statuses[d.status]||d.status)}${field('原因',t?.error||d.error||d.reason)}${field('执行步骤',t?.step)}${field('执行任务',t?.id)}${field('规则版本',d.ruleVersion)}
${notificationBody('normal',d.notifications?.normal)}${notificationBody('huizhou',d.notifications?.huizhou)}

来源

${field('连接',d.connectionId)}${field('流程',e.processName)}${field('节点',e.nodeName)}${field('流程实例',e.instanceId)}${field('BPM任务',e.taskId)}${field('来源版本',e.revision)}${field('接收时间',formatDate(e.receivedAt))}

订单摘要

${esc(e.brief||e.title||'未取得摘要')}

PDF / 归档

归档代次 ${esc(d.archiveGeneration)} · ${esc(formatDate(d.archivedAt))}

${d.files.map(f=>`

${esc(f.name||'下载归档 PDF')} · ${esc(f.size)} 字节

`).join('')||'

尚无可验证归档文件

'}

邮件批次

${d.batches.map(b=>`

· ${b.notificationMode==='huizhou'?'惠州通知':'普通通知'} · ${esc(statuses[b.status]||b.status)}

`).join('')||'

尚未编入批次

'}${t?.exceptionId?`处理关联异常`:''}${t?.revisionEvidence?`

修订核对

${['revision','orderNo','title','receivedAt','processName','nodeName','quantity','brief'].map(key=>``).join('')}
信息原修订新修订
${esc(key)}${esc(t.revisionEvidence.previous[key]||'—')}${esc(t.revisionEvidence.incoming[key]||'—')}
`:''}${user.role==='admin'&&t?.conflict&&!t.missedWindow&&!['unknown','sent','sending','batched'].includes(d.status)?form('revision','保存修订核对',''):''}${user.role!=='viewer'&&t&&!t.conflict&&!t.missedWindow&&['failed','blocked'].includes(t.status)?form('retry','重试失败任务'):''}`; } - function batchBody(d){return `
${field('主题',d.subject)}${field('通知模式',d.notificationMode==='huizhou'?'惠州通知':'普通通知')}${field('类别',d.categoryId)}${field('状态',statuses[d.status]||d.status)}${field('原因 / 超时说明',d.error)}${field('时段开始',formatDate(d.windowStart||d.window?.start))}${field('截止时间',formatDate(d.windowEnd||d.cutoff||d.window?.end))}${field('收件人',(d.to||[]).join('、'))}${field('抄送',(d.cc||[]).join('、'))}

冻结正文

${esc(d.text||'无正文')}

冻结附件

${d.attachments.map(a=>`

${esc(a.name||a.filename)} · ${esc(a.size||'—')} 字节

`).join('')||'无附件'}

关联订单

${d.orders.map(o=>`

${esc(o.orderNo||o.id)}

`).join('')}

SMTP 接受不代表最终送达。结果不明时必须先核验,不会自动补发。

${user.role==='admin'&&d.status==='unknown'?form('resolve','保存核验结论',''):''}${user.role==='admin'&&d.status==='failed'?form('resend','人工补发原冻结批次'):''}`;} - async function load(kind,id,trigger){ - const request=++revision;controller?.abort();controller=new AbortController();panel.show('

正在加载详情…

',trigger); + function batchBody(d){return `
${field('主题',d.subject)}${field('通知模式',d.notificationMode==='huizhou'?'惠州通知':'普通通知')}${field('类别',d.categoryName||d.categoryId)}${field('状态',statuses[d.status]||d.status)}${field('原因 / 超时说明',d.error)}${field('时段开始',formatDate(d.windowStart||d.window?.start))}${field('截止时间',formatDate(d.windowEnd||d.cutoff||d.window?.end))}${field('收件人',(d.to||[]).join('、'))}${field('抄送',(d.cc||[]).join('、'))}

${d.status==='collecting'?'当前汇总正文':'冻结正文'}

${esc(d.text||'无正文')}
查看实际HTML邮件预览
${window.BatchContentEditor.render(d,{esc,user})}

附件

${d.attachments.map(a=>`

${esc(a.name||a.filename)} · ${esc(a.size||'—')} 字节

`).join('')||'无附件'}

关联订单

${d.orders.map(o=>`

`).join('')}

SMTP 接受不代表最终送达。结果不明时必须先核验,不会自动补发。

${user.role==='admin'&&d.status==='unknown'?form('resolve','保存核验结论',''):''}${user.role==='admin'&&d.status==='failed'?form('resend','人工补发原冻结批次'):''}`;} + async function load(kind,id,trigger,back=null){ + const request=++revision;editor?.dispose();controller?.abort();controller=new AbortController();panel.show('

正在加载详情…

',trigger); try{const d=await api('/order-rules/'+kind+'/'+encodeURIComponent(id),undefined,{signal:controller.signal});if(!isActive()||request!==revision)return; - panel.show((d.testRunId?'
受限稳定性测试 · 固定QQ收件箱/桌面归档
':'')+(kind==='orders'?orderBody(d):batchBody(d)),trigger); + show(kind,d,trigger,request,back); + }catch(error){if(isActive()&&request===revision)panel.show('

'+esc(error.message)+'

',trigger);} + } + function show(kind,d,trigger,request,back=null){ + editor?.dispose(); + panel.show((back?'':'')+(d.testRunId?'
受限稳定性测试 · 固定QQ收件箱/桌面归档
':'')+(kind==='orders'?orderBody(d):batchBody(d)),trigger); + panel.element.querySelector('[data-back-batch]')?.addEventListener('click',()=>window.PageLifecycle.guard(()=>{const request=++revision;controller?.abort();show('batches',back.d,back.trigger,request);})); + panel.element.querySelectorAll('[data-related-order]').forEach(button=>button.onclick=()=>window.PageLifecycle.guard(()=>load('orders',button.dataset.relatedOrder,button,{d,trigger}))); + panel.element.querySelectorAll('[data-related-batch]').forEach(button=>button.onclick=()=>window.PageLifecycle.guard(()=>load('batches',button.dataset.relatedBatch,button))); + editor=window.BatchContentEditor.bind(panel.element,d,{api,isActive:()=>isActive()&&request===revision,onSaved:async saved=>{if(!isActive()||request!==revision)return;show(kind,saved,trigger,request,back);onChanged();const notice=panel.element.querySelector('[data-batch-content-editor] [role=alert]');if(notice)notice.textContent='批次内容已保存,按计划自动发送。';}}); container.querySelectorAll('[data-business-action]').forEach(form=>form.onsubmit=async event=>{ event.preventDefault();const button=form.querySelector('button'),notice=form.querySelector('[role=alert]');if(button.disabled)return; const action=form.dataset.businessAction,t=d.executionTask,body={version:t&&['revision','retry'].includes(action)?t.version:d.version,note:form.elements.note.value}; @@ -28,17 +37,16 @@ window.BusinessRecordDetail=(()=>{ const path=action==='revision'||action==='retry'?'/order-execution/tasks/'+encodeURIComponent(t.id)+'/'+(action==='revision'?'resolve':'retry'):'/order-rules/batches/'+encodeURIComponent(d.id)+'/'+action; button.disabled=true;try{await api(path,body);if(!isActive()||request!==revision)return;notice.textContent='操作已提交,请关闭详情并刷新列表核对实际结果。';onChanged();}catch(error){if(isActive()&&request===revision){notice.textContent=error.message;button.disabled=false;}} }); - }catch(error){if(isActive()&&request===revision)panel.show('

'+esc(error.message)+'

',trigger);} } let approvedClose=false; panel.element.addEventListener('keydown',event=>{if(event.key==='Escape'){event.preventDefault();event.stopImmediatePropagation();panel.hide();}},true); - panel.element.addEventListener('hide.bs.offcanvas',event=>{ + panel.element.addEventListener('hide.bs.modal',event=>{ if(approvedClose||!isActive()){revision++;controller?.abort();return;} event.preventDefault();window.PageLifecycle.guard(()=>{approvedClose=true;panel.hide();approvedClose=false;}); }); - panel.element.addEventListener('hidden.bs.offcanvas',()=>{panel.clear();}); + panel.element.addEventListener('hidden.bs.modal',()=>{editor?.dispose();panel.clear();}); const open=(kind,id,trigger)=>window.PageLifecycle.guard(()=>load(kind,id,trigger)); - window.PageLifecycle?.onDispose(()=>{revision++;controller?.abort();});return {open}; + window.PageLifecycle?.onDispose(()=>{revision++;editor?.dispose();controller?.abort();});return {open}; } return {mount}; })(); diff --git a/web/modules/order-notifications/records.js b/web/modules/order-notifications/records.js index 2ceb66d..af30c36 100644 --- a/web/modules/order-notifications/records.js +++ b/web/modules/order-notifications/records.js @@ -2,14 +2,14 @@ window.BusinessRecordViews=(()=>{ async function render(container,options,kind){ const {api,esc,formatDate,user,isActive}=options,view=kind==='orders'?'notification-orders':'notification-batches',filters=window.RecordState.read(view); - const states=kind==='orders'?['identified','preparing','archived','pending','batched','blocked','failed','unknown','sent','capturing','archiving','ignored']:['prepared','sending','unknown','failed','sent','cancelled']; - const labels={candidate:'未匹配通知规则',disabled:'未开启',empty:'无匹配惠州明细',not_applicable:'历史订单,不追加通知',ignored:'历史保留,不自动补发',identified:'已识别',preparing:'准备归档',archived:'已归档',pending:'等待汇总',batched:'已编入批次',blocked:'受阻',failed:'失败',unknown:'待核实',sent:'已提交邮件服务器',capturing:'采集中',archiving:'归档中',prepared:'已冻结待发',sending:'发送中',cancelled:'已取消'}; + const states=kind==='orders'?['identified','preparing','archived','pending','batched','blocked','failed','unknown','sent','capturing','archiving','ignored']:['collecting','prepared','sending','unknown','failed','sent','cancelled']; + const labels={collecting:'收集中',candidate:'未匹配通知规则',disabled:'未开启',empty:'无匹配惠州明细',not_applicable:'历史订单,不追加通知',ignored:'历史保留,不自动补发',identified:'已识别',preparing:'准备归档',archived:'已归档',pending:'等待汇总',batched:'已编入批次',blocked:'受阻',failed:'失败',unknown:'待核实',sent:'已提交邮件服务器',capturing:'采集中',archiving:'归档中',prepared:'已冻结待发',sending:'发送中',cancelled:'已取消'}; const catalogs={categories:new Map(),connections:new Map()}; const select=(name,label)=>``; const input=(name,label,type='text')=>``; container.innerHTML=`

${kind==='orders'?'订单中心':'邮件批次'}

${input('q','搜索订单 / 标识 / 主题')}
${select('categoryId','类别')}
${select('connectionId','来源连接')}
${kind==='batches'?`
`:''}
${input('from',kind==='batches'?'窗口截止日期从(北京时间)':'接收日期从(北京时间)','date')}
${input('to',kind==='batches'?'窗口截止日期至':'接收日期至','date')}
${window.RecordUi.footer}
${kind==='orders'&&user.role!=='viewer'?'

扫描并处理订单

读取授权待办、采集真实字段、生成 PDF 并归档;BPM 节点由人工办理。邮件按独立开关和批次调度发送。

':''}`; let table;const detail=window.BusinessRecordDetail.mount(container,{...options,onChanged:()=>{const error=container.querySelector('[data-record-error]');error.hidden=false;error.textContent='业务状态已变化,请刷新记录核对。';}}); - function draw(data){const host=container.querySelector('[data-arrival-list]');host.innerHTML=`
${data.items.map((row,index)=>``).join('')||''}
${kind==='orders'?'订单 / 类别':'主题 / 类别'}状态与原因接收 / 创建时间详情
${esc(row.orderNo||row.subject||row.id)}
${esc(catalogs.categories.get(row.categoryId)||row.categoryId||'未分类')}
${row.testRunId?'受限测试':''}${kind==='batches'?''+(row.notificationMode==='huizhou'?'惠州通知':'普通通知')+'':''}
${esc(labels[row.status]||row.status)}${kind==='orders'&&row.notifications?['normal','huizhou'].map(mode=>{const notice=row.notifications[mode];return notice?'
'+(mode==='huizhou'?'惠州通知':'普通通知')+':'+esc(labels[notice.status]||notice.status)+'
'+esc(notice.error||'')+'
'+(notice.issues?.length?'
'+notice.issues.map(esc).join(';')+'
':'')+'
':'';}).join(''):''}
${esc(row.error||row.reason||'')}
${esc(formatDate(row.receivedAt||row.createdAt))}
暂无匹配记录
`;host.querySelectorAll('[data-business-detail]').forEach(button=>button.onclick=()=>detail.open(kind,data.items[Number(button.dataset.businessDetail)].id,button));} + function draw(data){const host=container.querySelector('[data-arrival-list]');host.innerHTML=`
${data.items.map((row,index)=>``).join('')||''}
${kind==='orders'?'订单 / 类别':'主题 / 类别'}状态与原因接收 / 创建时间详情
${esc(row.orderNo||row.subject||row.id)}
${esc(catalogs.categories.get(row.categoryId)||row.categoryName||row.categoryId||'未分类')}
${row.testRunId?'受限测试':''}${kind==='batches'?'
'+Number(row.orderCount||0)+' 个订单 · '+esc(formatDate(row.windowEnd||row.cutoff))+' 截止
':(row.collectingBatches||[]).map(b=>'').join('')}${kind==='batches'?''+(row.notificationMode==='huizhou'?'惠州通知':'普通通知')+'':''}
${esc(labels[row.status]||row.status)}${kind==='orders'&&row.notifications?['normal','huizhou'].map(mode=>{const notice=row.notifications[mode];return notice?'
'+(mode==='huizhou'?'惠州通知':'普通通知')+':'+esc(labels[notice.status]||notice.status)+'
'+esc(notice.error||'')+'
'+(notice.issues?.length?'
'+notice.issues.map(esc).join(';')+'
':'')+'
':'';}).join(''):''}
${esc(row.error||row.reason||'')}
${esc(formatDate(row.receivedAt||row.createdAt))}
暂无匹配记录
`;host.querySelectorAll('[data-collecting-detail]').forEach(button=>button.onclick=()=>detail.open('batches',button.dataset.collectingDetail,button));host.querySelectorAll('[data-business-detail]').forEach(button=>button.onclick=()=>detail.open(kind,data.items[Number(button.dataset.businessDetail)].id,button));} const names=Object.keys(filters).filter(k=>!['page','pageSize'].includes(k)); table=window.RecordTable.mount({view,container,isActive,api,endpoint:'/order-rules/'+kind,render:draw,readDraft:()=>Object.fromEntries(names.map(k=>[k,container.querySelector('[name="'+k+'"]').value.trim()])),writeDraft(next){for(const k of names)container.querySelector('[name="'+k+'"]').value=next[k];}}); const workspaceRead=api('/workspace'); diff --git a/web/modules/records/shared.js b/web/modules/records/shared.js index 00dd238..6dfc528 100644 --- a/web/modules/records/shared.js +++ b/web/modules/records/shared.js @@ -1,6 +1,11 @@ 'use strict'; window.RecordUi=(()=>{ - function details(container,title){ + function details(container,title,{modal=false}={}){ + if(modal){ + const panel=document.createElement('section');panel.className='modal fade';panel.tabIndex=-1;panel.setAttribute('aria-label',title);panel.innerHTML='';panel.querySelector('h2').textContent=title;container.append(panel); + const instance=new window.tabler.Modal(panel);let disposed=false,opening=false,shown=false,bodyStyle;panel.addEventListener('show.bs.modal',()=>{opening=true;bodyStyle={overflow:document.body.style.overflow,paddingRight:document.body.style.paddingRight};});panel.addEventListener('shown.bs.modal',()=>{opening=false;shown=true;if(disposed)instance.hide();});panel.addEventListener('hidden.bs.modal',()=>{shown=false;});const destroy=()=>new Promise(resolve=>{if(disposed)return resolve();disposed=true;let timer,finished=false;const finish=()=>{if(finished)return;finished=true;clearTimeout(timer);instance.dispose();panel.remove();if(bodyStyle&&!document.querySelector('.modal.show,.modal.showing')){document.body.classList.remove('modal-open');document.body.style.overflow=bodyStyle.overflow;document.body.style.paddingRight=bodyStyle.paddingRight;}resolve();};if(opening||shown){panel.addEventListener('hidden.bs.modal',finish,{once:true});if(!opening)instance.hide();timer=setTimeout(finish,1500);}else finish();});window.PageLifecycle?.onDispose(destroy); + return {element:panel,hide(){instance.hide();},clear(){panel.querySelector('.modal-body').replaceChildren();},show(html,trigger){if(disposed)return;panel.querySelector('.modal-body').innerHTML=html;instance.show(trigger);},destroy}; + } const panel=document.createElement('section');panel.className='offcanvas offcanvas-end record-detail';panel.tabIndex=-1;panel.setAttribute('aria-label',title); panel.innerHTML='

';panel.querySelector('h2').textContent=title;container.append(panel); const instance=new window.tabler.Offcanvas(panel);let disposed=false; diff --git a/web/modules/records/state.js b/web/modules/records/state.js index 67f62c3..7c87b24 100644 --- a/web/modules/records/state.js +++ b/web/modules/records/state.js @@ -4,7 +4,7 @@ window.RecordState=(()=>{ const route=hash=>String(hash||'').replace(/^#/,'').split('?')[0]; const isRecord=hash=>routes.includes(route(hash)); const defaults=view=>view.startsWith('notification-')?{q:'',categoryId:'',connectionId:'',status:'',from:'',to:'',page:1,pageSize:25,...(view==='notification-batches'?{scope:'active'}:{})}:view==='records'?{scope:'current',business:'orders',kind:'all',q:'',connectionId:'',from:'',to:'',page:1,pageSize:25}:{q:'',status:'',page:1,pageSize:25}; - function normalize(view,input={}){const result=defaults(view);for(const field of Object.keys(result)){const value=input[field];if(value===undefined)continue;if(field==='page'){const n=Number(value);if(Number.isSafeInteger(n)&&n>0&&n<=1000000)result.page=n;}else if(field==='pageSize'){if([25,50,100].includes(Number(value)))result.pageSize=Number(value);}else if(field==='q'||field==='connectionId'||field==='categoryId'){if(typeof value==='string')result[field]=value.slice(0,200);}else if(field==='from'||field==='to'){if(typeof value==='string'&&/^\d{4}-\d{2}-\d{2}$/.test(value)&&Number.isFinite(Date.parse(value+'T00:00:00Z'))&&new Date(value+'T00:00:00Z').toISOString().slice(0,10)===value)result[field]=value;}else if(({scope:view==='notification-batches'?['active','all']:['current','archived','all'],business:['orders','all'],kind:['all','todo','inform'],status:view.startsWith('notification-')?['','identified','preparing','archived','pending','batched','blocked','unknown','sent','failed','capturing','archiving','queued','ignored','prepared','sending','cancelled']:['','success','running','error','interrupted']})[field]?.includes(value))result[field]=value;}return result;} + function normalize(view,input={}){const result=defaults(view);for(const field of Object.keys(result)){const value=input[field];if(value===undefined)continue;if(field==='page'){const n=Number(value);if(Number.isSafeInteger(n)&&n>0&&n<=1000000)result.page=n;}else if(field==='pageSize'){if([25,50,100].includes(Number(value)))result.pageSize=Number(value);}else if(field==='q'||field==='connectionId'||field==='categoryId'){if(typeof value==='string')result[field]=value.slice(0,200);}else if(field==='from'||field==='to'){if(typeof value==='string'&&/^\d{4}-\d{2}-\d{2}$/.test(value)&&Number.isFinite(Date.parse(value+'T00:00:00Z'))&&new Date(value+'T00:00:00Z').toISOString().slice(0,10)===value)result[field]=value;}else if(({scope:view==='notification-batches'?['active','all']:['current','archived','all'],business:['orders','all'],kind:['all','todo','inform'],status:view.startsWith('notification-')?['','identified','preparing','archived','pending','batched','blocked','unknown','sent','failed','capturing','archiving','queued','ignored','collecting','prepared','sending','cancelled']:['','success','running','error','interrupted']})[field]?.includes(value))result[field]=value;}return result;} function serialize(view,filters){const normal=normalize(view,filters),base=defaults(view),params=new URLSearchParams();for(const field of Object.keys(base))if(normal[field]!==base[field])params.set(field,normal[field]);return '#'+view+(params.size?'?'+params:'');} function write(){if(!key)return;try{sessionStorage.setItem(key,JSON.stringify(cache));}catch{}} function clear(){try{for(let i=sessionStorage.length-1;i>=0;i--){const name=sessionStorage.key(i);if(name?.startsWith(prefix))sessionStorage.removeItem(name);}}catch{}key=null;cache={};if(isRecord(location.hash))history.replaceState({appIndex:history.state?.appIndex},'','#'+route(location.hash));}