fix: retain capture evidence and control failed task recovery

This commit is contained in:
abaishu0730 committed 2026-10-26 11:00:11 +08:00
1 parent c19be938fc
commit 5bae83922c
17 files changed
+333 -35

No files matched your search

+10
View File
@@ -1,5 +1,15 @@
# 开发交接(2026-10-23)
## 2026-10-26 订单采集失败修复与剩余边界
- 修复动态明细 datamap 包含合法隐藏列时被误判的问题:额外列必须有同表隐藏控件,且每条后端记录都确有对应列;仍拒绝跨表映射、不明确行关系及缺少可见字段。
- 后端字段读取成功而静态 PDF 失败时保存独立字段证据 captureEvidenceId,不写入成功 sampleId,不作为 PDF/归档凭据。保存结构原因、表名、行数与字段路径;授权详情弹窗可查看字段值及接口/表/列/行来源,列表不返回字段值。
- 确定性结构、身份及权限错误暂停自动重试;暂时连接错误指数退避(1分钟起,上限30分钟)。只有新鲜完整待办扫描成功才把已离开待办的失败采集任务转为待历史核验;失败扫描与旧发现线索不能推导任务离开。已归档、发送中、已发送、unknown、冲突及替代任务保持保护。
- 原任务重新出现且人工核验后重试,必须重新采集完整 PDF;独立字段证据不得代替成功快照。成功后清理当前“已离开”标记,保留历史证据,重复扫描不重复归档。
- 两个真实海外更改单的历史表单只读证据证明:V7 / 列表1.9 的隐藏列误判已解决,但 HTML 仍包含后端 Columns 与行数据都不存在的 SubsidiaryDelivery1、SubsidiaryDelivery2、SoftRequireImage_Remark。当前继续阻断,不猜测字段别名;是否在 PDF 明确标注未提供后继续,已向业务负责人询问,尚待答复。
- 当前历史列表只提供实例与开始/完成时间,不能恢复原通知节点到达身份;禁止把历史开始时间当通知到达时间、构造任务或自动补发。零售国内返工订单更改评审在两个已核验历史来源均无样本,继续标明未覆盖,不能声称15类实单闭环完成。
- 分类与测试设置现在列出未覆盖流程的具体名称。隔离回归仍使用临时文件/本机 SMTP;真实资料只保存在忽略的 output,未办理 BPM 或手动发送业务邮件。本机更新与最终测试结果以本轮回执为准。
## 2026-10-26 订单中心与发送前收集批次
- 用户确认保留11:00/17:00自动发送,发送前可以编辑,未编辑继续使用分类模板。邮件批次新增“收集中”,按当前发送窗口、分类、规则版本、模板及普通/惠州模式分组;订单中心有对应批次入口。读取分组不写业务订单或冻结批次,不把未匹配记录放入订单中心。
@@ -0,0 +1,12 @@
# 订单采集失败与恢复修复
用户已确认按诊断优先级修复;保持 Excel 精确流程/节点匹配、BPM 只读、PDF 归档后通知、隔离收件和 unknown 不自动重发。
1. 取得失败表单的真实只读结构证据,先用隔离表单复现,再扩展已证实的静态明细布局;不关闭作用域/字段完整性保护。
2. 表单字段成功、PDF 失败时保存独立字段证据,不能将其当作成功 PDF 或归档依据。错误保存具体结构原因。
3. 确定性结构问题暂停自动重试,连接故障有界退避;原任务不在当前通知节点时转人工核验。显式重试仍重新验证身份与节点。
4. 订单详情弹窗显示失败阶段、字段来源和恢复建议,保持账号权限隔离。
5. 核实历史只读来源与缺少适配流程。只有取得原通知任务 ID、原到达时间和归属证据才允许恢复执行;普通历史详情只供诊断,不冒充通知任务。
6. 执行新增失败测试、相关回归与当前业务测试;复核边界后交付。真实样本/业务 PDF/凭据不进 Git,原用户草稿不动。
验收区分代码测试通过与真实业务验收。未能取得证据的流程/恢复来源列为具体阻断,不编造映射或通知身份。
+39 -19
View File
@@ -89,7 +89,7 @@ function hydrateReadonlyDocument({tables,fieldsOnly=false}){
};
for(const element of document.querySelectorAll('[hiddenexpress]')){const expression=element.getAttribute('hiddenexpress')||'';if(!hiddenPredicates.has(expression))hiddenPredicates.set(expression,expression.trim()?predicate(expression):{known:true,value:false});}
const uncertainVisibility=element=>{for(let node=element;node;node=node.parentElement){const expression=node.getAttribute('hiddenexpress');if(expression!==null&&hiddenPredicates.get(expression)?.known===false)return true;}return false;};
const blocked=()=>({blocker:'明细多行表单的行数、字段或表格关系不明确,PDF 快照已阻断;可仅采集字段供核对。'});
const blocked=(reason='AMBIGUOUS_DETAIL_STRUCTURE',table,host,extra={})=>({blocker:'明细多行表单的行数、字段或表格关系不明确,PDF 快照已阻断;可仅采集字段供核对。',diagnostics:{reason,...(table?{tableName:table.TableName,backendRows:table.Rows.length}:{}),...(host?{dynamicArea:host.getAttribute('dynamicarea'),domRows:host.rows.length}:{}),...extra}});
const currentTaskScopeError=table=>{
if(!table.Rows.length||!table.Rows.some(row=>Object.keys(row).some(column=>/^TaskID$/i.test(column))))return null;
const readTask=row=>{const columns=Object.keys(row).filter(column=>/^TaskID$/i.test(column));if(columns.length!==1)return null;const value=row[columns[0]];if(typeof value==='string'&&value.trim())return value;if(typeof value==='number'&&Number.isSafeInteger(value))return String(value);return null;};
@@ -105,29 +105,40 @@ function hydrateReadonlyDocument({tables,fieldsOnly=false}){
const selector='[xdatabind],[data-xdatabind],[data-bind]',expandedPrefixes=new Set();
for(const host of form.querySelectorAll('table[dynamicarea]')){
const ownBindings=[...host.querySelectorAll(selector)].filter(visible);if(!ownBindings.length)continue;
const marker=/^\s*(0|[1-9]\d*)\s*,\s*1\s*$/.exec(host.getAttribute('dynamicarea')||'');if(!marker)return blocked();
const start=Number(marker[1]),hostRows=[...host.rows];if(!Number.isSafeInteger(start)||start>=hostRows.length||hostRows.some(row=>[...row.cells].some(cell=>cell.rowSpan!==1)))return blocked();
const marker=/^\s*(0|[1-9]\d*)\s*,\s*1\s*$/.exec(host.getAttribute('dynamicarea')||'');if(!marker)return blocked('UNSUPPORTED_DYNAMIC_RANGE',null,host);
const start=Number(marker[1]),hostRows=[...host.rows];if(!Number.isSafeInteger(start)||start>=hostRows.length||hostRows.some(row=>[...row.cells].some(cell=>cell.rowSpan!==1)))return blocked('INVALID_TEMPLATE_ROWS',null,host);
const template=hostRows[start];
if(ownBindings.some(element=>element.closest('table')!==host||element.closest('tr')!==template||element.parentElement?.closest(selector)))return blocked();
if(ownBindings.some(element=>element.closest('table')!==host||element.closest('tr')!==template||element.parentElement?.closest(selector)))return blocked('NESTED_OR_CROSS_ROW_BINDING',null,host);
const matches=tables.filter(table=>{const prefix=((table.DataSource?table.DataSource+':':'')+table.TableName).toLowerCase();return ownBindings.every(element=>{const key=binding(element).toLowerCase();return key.startsWith(prefix+'.')&&/^[\p{L}\p{N}_]+$/u.test(key.slice(prefix.length+1));});});
if(matches.length!==1)return blocked();const table=matches[0],prefix=((table.DataSource?table.DataSource+':':'')+table.TableName).toLowerCase();
const scopeError=currentTaskScopeError(table);if(scopeError)return {blocker:scopeError};
if(expandedPrefixes.has(prefix)||bindings.filter(element=>visible(element)&&binding(element)?.toLowerCase().startsWith(prefix+'.')).some(element=>element.closest('table')!==host))return blocked();
if(matches.length!==1)return blocked('AMBIGUOUS_TABLE_BINDING',null,host);const table=matches[0],prefix=((table.DataSource?table.DataSource+':':'')+table.TableName).toLowerCase();
const scopeError=currentTaskScopeError(table);if(scopeError)return {...blocked('TASK_SCOPE_MISMATCH',table,host),blocker:scopeError};
if(expandedPrefixes.has(prefix)||bindings.filter(element=>visible(element)&&binding(element)?.toLowerCase().startsWith(prefix+'.')).some(element=>element.closest('table')!==host))return blocked('CROSS_TABLE_BINDING',table,host);
expandedPrefixes.add(prefix);
const datasource=host.getAttribute('xdatasource');
if(datasource){
// Vendor WriteToTable comes from bound columns. DataSource/Filter describe
// lookup/import, not a predicate for persisted current-order display rows.
const entries=datasource.split(';').map(part=>part.trim()).filter(Boolean),names=entries.filter(part=>/^TableName:/i.test(part));if(names.length!==1||names[0].slice(names[0].indexOf(':')+1).trim().toLowerCase()!==table.TableName.toLowerCase()||entries.some(part=>!/^TableName:[\p{L}\p{N}_]+$/iu.test(part)&&!/^Filter:[\p{L}\p{N}_]+->[\p{L}\p{N}_:.]+$/iu.test(part)))return blocked();
const entries=datasource.split(';').map(part=>part.trim()).filter(Boolean),names=entries.filter(part=>/^TableName:/i.test(part));if(names.length!==1||names[0].slice(names[0].indexOf(':')+1).trim().toLowerCase()!==table.TableName.toLowerCase()||entries.some(part=>!/^TableName:[\p{L}\p{N}_]+$/iu.test(part)&&!/^Filter:[\p{L}\p{N}_]+->[\p{L}\p{N}_:.]+$/iu.test(part)))return blocked('UNSUPPORTED_DATASOURCE',table,host);
}
const groups=new Map();for(const element of ownBindings){const key=binding(element).toLowerCase(),list=groups.get(key)||[];list.push(element);groups.set(key,list);}
const datamap=host.getAttribute('datamap');
if(datamap){const mapped=new Set();for(const part of datamap.split(';').map(part=>part.trim()).filter(Boolean)){const pair=part.split('->');if(pair.length!==2||pair[1].toLowerCase()!==prefix+'.'+pair[0].toLowerCase()||mapped.has(pair[1].toLowerCase()))return blocked();mapped.add(pair[1].toLowerCase());}if([...groups.keys()].some(key=>!mapped.has(key))||[...mapped].some(key=>!groups.has(key)))return blocked();}
for(const controls of groups.values())if(controls.length>1){const type=controls[0].type;if(!['checkbox','radio'].includes(type)||controls.some(control=>control.type!==type||!control.hasAttribute('value')||!control.value.trim())||new Set(controls.map(control=>control.value)).size!==controls.length)return blocked();}
if(datamap){
const mapped=new Set(),allBindings=[...template.querySelectorAll(selector)];
for(const part of datamap.split(';').map(part=>part.trim()).filter(Boolean)){
const pair=part.split('->'),key=pair[1]?.toLowerCase(),column=pair[0]?.toLowerCase();
if(pair.length!==2||key!==prefix+'.'+column||mapped.has(key))return blocked('INVALID_DATAMAP',table,host);
mapped.add(key);
// A mapped hidden column is legitimate only when its actual same-table
// control and backend column prove the relationship. Never infer a column.
if(!groups.has(key)&&(!allBindings.some(element=>element.closest('table')===host&&binding(element)?.toLowerCase()===key&&!visible(element))||table.Rows.some(row=>Object.keys(row).filter(name=>name.toLowerCase()===column).length!==1)))return blocked('UNPROVEN_HIDDEN_MAPPING',table,host,{fieldPaths:[key]});
}
if([...groups.keys()].some(key=>!mapped.has(key)))return blocked('VISIBLE_MAPPING_MISSING',table,host,{fieldPaths:[...groups.keys()].filter(key=>!mapped.has(key))});
}
for(const controls of groups.values())if(controls.length>1){const type=controls[0].type;if(!['checkbox','radio'].includes(type)||controls.some(control=>control.type!==type||!control.hasAttribute('value')||!control.value.trim())||new Set(controls.map(control=>control.value)).size!==controls.length)return blocked('AMBIGUOUS_CHOICE_CONTROLS',table,host);}
const rows=[];
for(const [rowIndex,row]of table.Rows.entries()){
const assignments=new Map();
for(const [key,controls]of groups){const column=key.slice(prefix.length+1),columns=Object.keys(row).filter(name=>name.toLowerCase()===column);if(columns.length!==1)return blocked();const value=row[columns[0]],item={value,rowIndex};
for(const [key,controls]of groups){const column=key.slice(prefix.length+1),columns=Object.keys(row).filter(name=>name.toLowerCase()===column);if(columns.length!==1)return blocked('MISSING_BACKEND_FIELD',table,host,{fieldPaths:[key]});const value=row[columns[0]],item={value,rowIndex};
if(controls.length>1){let selected;if(value===null||value==='')selected=[];else if(Array.isArray(value)&&controls[0].type==='checkbox'&&value.every(option=>['string','number','boolean'].includes(typeof option)))selected=value.map(String);else if(['string','number','boolean'].includes(typeof value))selected=[String(value)];else return blocked();const choices=new Set(controls.map(control=>control.value));if(new Set(selected).size!==selected.length||selected.some(option=>!choices.has(option)))return blocked();for(const control of controls)assignments.set(control,{...item,choiceSelected:selected.includes(control.value)});
}else assignments.set(controls[0],item);
}
@@ -142,16 +153,17 @@ function hydrateReadonlyDocument({tables,fieldsOnly=false}){
const prefix=((table.DataSource?table.DataSource+':':'')+table.TableName).toLowerCase(),bound=bindings.filter(element=>visible(element)&&(binding(element)?.toLowerCase().startsWith(prefix+'.')||binding(element)?.toLowerCase().startsWith(prefix+'[')));
for(const [rowIndex,row]of table.Rows.entries())for(const [column,value]of Object.entries(row)){const key=prefix+'.'+column.toLowerCase(),items=values.get(key)||[];items.push({value,rowIndex});values.set(key,items);}
if(!bound.length)continue;
const scopeError=currentTaskScopeError(table);if(scopeError)return {blocker:scopeError};
const scopeError=currentTaskScopeError(table);if(scopeError)return {...blocked('TASK_SCOPE_MISMATCH',table),blocker:scopeError};
if(bound.every(element=>resolved.has(element)))continue;
if(table.Rows.length>1){
const rows=new Map(),keys=new Set(bound.map(element=>binding(element).toLowerCase()));let container,section;
for(const element of bound){const row=element.closest('tr'),host=element.closest('table'),cell=element.closest('td,th'),key=binding(element).toLowerCase(),items=values.get(key);if(!row||!host||row.closest('table')!==host||!cell||cell.rowSpan!==1||element.parentElement?.closest('[xdatabind],[data-xdatabind],[data-bind]')||!items||items.length!==table.Rows.length)return blocked();if(container&&(container!==host||section!==row.parentElement))return blocked();container=host;section=row.parentElement;const columns=rows.get(row)||new Map();if(columns.has(key))return blocked();columns.set(key,element);rows.set(row,columns);}
if(rows.size!==table.Rows.length||detailTables.has(container))return blocked();detailTables.add(container);
if(rows.size!==table.Rows.length||detailTables.has(container))return blocked('ROW_COUNT_MISMATCH',table,container,{domRows:rows.size});detailTables.add(container);
for(const [index,columns]of [...rows.values()].entries()){if(columns.size!==keys.size||[...keys].some(key=>!columns.has(key)))return blocked();for(const [key,element]of columns)resolved.set(element,values.get(key)[index]);}
}else for(const element of bound){const items=values.get(binding(element).toLowerCase());if(items?.length===1)resolved.set(element,items[0]);}
}
for(const element of bindings.filter(visible))if(!resolved.has(element))return {blocker:uncertainVisibility(element)?'字段所在 hiddenexpress 的可见性不能安全确认,PDF 快照已阻断;不能猜测隐藏缺失字段。':'可见字段缺少已核实的后端值,PDF 快照已阻断。'};
const missing=bindings.filter(element=>visible(element)&&!resolved.has(element));
if(missing.length){const uncertain=missing.some(uncertainVisibility);return {blocker:uncertain?'字段所在 hiddenexpress 的可见性不能安全确认,PDF 快照已阻断;不能猜测隐藏缺失字段。':'可见字段缺少已核实的后端值,PDF 快照已阻断。',diagnostics:{reason:uncertain?'UNSUPPORTED_VISIBILITY':'MISSING_BACKEND_FIELD',fieldPaths:[...new Set(missing.map(binding))]}};}
const printable=(element,item)=>{if(Object.hasOwn(item||{},'choiceSelected'))return item.choiceSelected?'☑':'☐';const raw=item?.value;if(raw!==null&&typeof raw==='object')return null;const text=raw==null?'':String(raw);if(['radio','checkbox'].includes(element.type))return raw===true||text===element.value?'☑':'☐';if(element.tagName==='SELECT')return [...element.options].find(option=>option.value===text)?.textContent||text;return text;};
for(const [element,item]of resolved)if(printable(element,item)===null)return {blocker:'字段包含多个或复合值,PDF 快照已阻断。'};
const copy=document.documentElement.cloneNode(true),originals=[document.documentElement,...document.documentElement.querySelectorAll('*')],copies=[copy,...copy.querySelectorAll('*')];
@@ -168,17 +180,25 @@ function hydrateReadonlyDocument({tables,fieldsOnly=false}){
function allowedResource(value){try{const url=baseURL(value);return !url.search&&!/(?:approve|fulfill|markread|upload|delete)/i.test(url.pathname)&&/\.(?:css|png|jpe?g|gif|webp|woff2?|ttf|ico)$/i.test(url.pathname);}catch{return false;}}
async function captureReadonlyForm({storageState,detailUrl,processName,nodeName,listProcessVersion=null,fieldsOnly=false,requestFactory=options=>loadPlaywright().request.newContext(options),browserFactory=()=>loadPlaywright().chromium.launch(browserOptions()),timeout=20000}){
if(!storageState)fail('BPM 会话需要续登。',401);if(typeof nodeName!=='string'||!nodeName.trim())fail('BPM 到达记录缺少明确当前节点。');
let request,browser,context;
let request,browser,context,partialDetail;
try{
request=await requestFactory({storageState,timeout});const loaded=await loadForm(request,detailUrl,{timeout}),identity={...loaded.identity,...require('./bpm-form-contracts.cjs').resolveFormIdentity({...loaded.identity,url:loaded.url},{processName,listProcessVersion})},tables=await loadData(request,loaded.url,{timeout}),evidence=flattenTables(tables);
const capturedAt=new Date().toISOString(),detail={readOnly:true,...identity,formVersion:identity.formVersion,listProcessVersion,processInstanceId:identity.pid,nodeName,nodeSource:'list.activityName',fields:evidence.fields,fieldSources:evidence.sources,processSteps:[],capturedAt,fieldSource:'DataProvider.GetFormProcessData'};
partialDetail={...identity,detail,snapshot:null,capturedAt,detailUrl:loaded.url.href,fieldsOnly:true,blockedRequests:[]};
browser=await browserFactory();context=await browser.newContext({storageState,javaScriptEnabled:false,serviceWorkers:'block',acceptDownloads:false,permissions:[]});const images=[];
await context.route('**/*',async route=>{try{const incoming=route.request();if(incoming.method()!=='GET')return await route.abort();if(incoming.url()===loaded.url.href&&incoming.isNavigationRequest())return await route.fulfill({status:200,contentType:'text/html; charset=utf-8',body:loaded.bytes});if(incoming.isNavigationRequest()||!allowedResource(incoming.url()))return await route.abort();const response=await request.get(incoming.url(),{maxRedirects:0,timeout});if(response.status()!==200)return await route.abort();const bytes=await response.body();if(bytes.length>MAX_BYTES)return await route.abort();const contentType=(response.headers()['content-type']||'').split(';')[0];if(/^image\/(png|jpeg|gif|webp)$/.test(contentType))images.push({url:incoming.url(),data:'data:'+contentType+';base64,'+bytes.toString('base64')});return await route.fulfill({status:200,headers:{'content-type':contentType||'application/octet-stream'},body:bytes});}catch{await route.abort().catch(()=>{});}});
if(context.routeWebSocket)await context.routeWebSocket(/.*/,socket=>socket.close());const page=await context.newPage();page.on('dialog',dialog=>dialog.dismiss().catch(()=>{}));page.on('download',download=>download.cancel().catch(()=>{}));
const response=await page.goto(loaded.url.href,{waitUntil:'load',timeout});if(!response||response.status()!==200||page.url()!==loaded.url.href)fail('BPM 静态表单未能只读加载。',401);
const hydrated=await page.evaluate(hydrateReadonlyDocument,{tables,fieldsOnly});if(hydrated.blocker)fail(hydrated.blocker);if(hydrated.snapshot)hydrated.snapshot.images=images;
const capturedAt=new Date().toISOString(),detail={readOnly:true,...identity,formVersion:identity.formVersion,listProcessVersion,processInstanceId:identity.pid,nodeName,nodeSource:'list.activityName',fields:evidence.fields,fieldSources:evidence.sources,processSteps:hydrated.processSteps||[],capturedAt,fieldSource:'DataProvider.GetFormProcessData'};
const hydrated=await page.evaluate(hydrateReadonlyDocument,{tables,fieldsOnly});if(hydrated.snapshot)hydrated.snapshot.images=images;
detail.processSteps=hydrated.processSteps||[];
const evidenceHash=crypto.createHash('sha256').update(JSON.stringify(detail)).digest('hex');detail.evidenceHash=evidenceHash;
return {...identity,detail,snapshot:hydrated.snapshot||null,capturedAt,evidenceHash,detailUrl:loaded.url.href,fieldsOnly,blockedRequests:[]};
}catch(error){if(error.status)throw error;fail('BPM 只读字段或静态快照采集失败。',502);}finally{await context?.close().catch(()=>{});await browser?.close().catch(()=>{});await request?.dispose?.().catch(()=>{});}
const captured={...identity,detail,snapshot:hydrated.snapshot||null,capturedAt,evidenceHash,detailUrl:loaded.url.href,fieldsOnly,blockedRequests:[]};
if(hydrated.blocker)throw Object.assign(new Error(hydrated.blocker),{status:409,code:'FORM_STRUCTURE_UNSUPPORTED',diagnostics:hydrated.diagnostics||{reason:'UNSUPPORTED_FORM_LAYOUT'},partialDetail:{...captured,snapshot:null,fieldsOnly:true}});
return captured;
}catch(error){
const cause=error.status?error:Object.assign(new Error('BPM 只读字段或静态快照采集失败。'),{status:502});
if(partialDetail&&!cause.partialDetail){const evidenceHash=crypto.createHash('sha256').update(JSON.stringify(partialDetail.detail)).digest('hex');partialDetail.detail.evidenceHash=evidenceHash;cause.partialDetail={...partialDetail,evidenceHash};}
throw cause;
}finally{await context?.close().catch(()=>{});await browser?.close().catch(()=>{});await request?.dispose?.().catch(()=>{});}
}
module.exports={parseEntryURL,loadForm,loadData,flattenTables,hydrateReadonlyDocument,captureReadonlyForm,allowedResource};
+12 -2
View File
@@ -141,13 +141,23 @@ class BpmOrderProvider{
return this.saved(connection,principal,async storageState=>{
if(row.source!=='todo'||row.configurationOnly||row.demo)throw fail('只读执行只接受真实当前通知任务。');
const rows=await this.client.scan(storageState),same=rows.filter(fresh=>fresh.source===row.source&&String(fresh.taskId)===String(row.taskId)&&(!row.portalSource||fresh.portalSource===row.portalSource));
if(same.length!==1)throw fail('此任务已不在当前列表或来源存在歧义,请重新扫描。');
if(same.length!==1)throw Object.assign(fail('此任务已不在当前列表或来源存在歧义,请核验原通知任务后再恢复。'),{code:'BPM_TASK_NOT_CURRENT'});
const current=same[0];
if(['instanceId','processName','nodeName','processVersion','revision','receivedAt','serialNum','title'].some(key=>String(current[key]??'')!==String(row[key]??'')))throw fail('当前通知任务的节点、版本、摘要或时间已变化,请重新核对。');
const original=row.detailUrl?safeEntry(row.detailUrl):null,fresh=current.detailUrl?safeEntry(current.detailUrl):null;
if(!fresh||original&&(original.target.searchParams.get('tid')!==fresh.target.searchParams.get('tid')||original.target.searchParams.get('pid')!==fresh.target.searchParams.get('pid')))throw fail('通知任务与详情标识不一致。');
const reader=this.readonlyReader||require('../../bpm-readonly-form.cjs').captureReadonlyForm;
const captured=await reader({storageState,detailUrl:current.detailUrl,processName:current.processName,nodeName:current.nodeName,listProcessVersion:current.processVersion,fieldsOnly,browserFactory:this.browserFactory});
let captured;
try{captured=await reader({storageState,detailUrl:current.detailUrl,processName:current.processName,nodeName:current.nodeName,listProcessVersion:current.processVersion,fieldsOnly,browserFactory:this.browserFactory});}
catch(error){
if(error.partialDetail){
const partial=error.partialDetail;
const fields=Object.entries(partial.detail.fields).map(([path,value])=>({path,label:path,value}));
error.partialCapture={sample:{...row,detailUrl:fresh.target.href,connectionId:connection.id,fields:structuredClone(partial.detail.fields),brief:row.title,formVersion:partial.detail.formVersion,formPath:partial.detail.formPath,detailEvidence:{tid:partial.detail.tid,pid:partial.detail.pid,formVersion:partial.detail.formVersion,listProcessVersion:current.processVersion,readOnly:true}},snapshot:{purpose:'field-mapping',fields,sourceUrl:partial.detailUrl,processVersion:current.processVersion,formVersion:partial.detail.formVersion,formPath:partial.detail.formPath,fieldSources:partial.detail.fieldSources,capturedAt:partial.capturedAt,evidenceHash:partial.evidenceHash}};
delete error.partialDetail;
}
this.checks={...this.checks,pdfExport:false,message:error.message};throw error;
}
const fields=Object.entries(captured.detail.fields).map(([path,value])=>({path,label:path,value}));
if(!fields.length||fields.length>4000||fields.every(field=>field.value===null||field.value===''))throw fail('只读表单缺少有效字段或超过采集上限。');
const snapshot={...(captured.snapshot||{purpose:'field-mapping'}),fields,sourceUrl:captured.detailUrl,processVersion:current.processVersion,formVersion:captured.detail.formVersion,formPath:captured.detail.formPath,fieldSources:captured.detail.fieldSources,capturedAt:captured.capturedAt,evidenceHash:captured.evidenceHash};
+55 -5
View File
@@ -47,10 +47,48 @@ class OrderExecutionCoordinator{
}
validateCapture(task,connection,{sample,snapshot}){
for(const key of ['source','portalSource','instanceId','taskId','revision','processName','nodeName','receivedAt']){
if(String(sample?.[key])!==String(task.row[key]))throw Error('采集样本与待办事件身份不一致。');
if(String(sample?.[key])!==String(task.row[key]))throw Object.assign(Error('采集样本与待办事件身份不一致。'),{code:'BPM_CAPTURE_IDENTITY_MISMATCH',status:409});
}
if(sample.connectionId!==connection.id)throw Error('采集样本连接身份不一致。');
if(!snapshot||snapshot.processVersion!==sample.processVersion||!Array.isArray(snapshot.fields))throw Error('采集样本流程版本或实际字段证据不一致。');
if(sample.connectionId!==connection.id)throw Object.assign(Error('采集样本连接身份不一致。'),{code:'BPM_CAPTURE_IDENTITY_MISMATCH',status:409});
if(!snapshot||snapshot.processVersion!==sample.processVersion||!Array.isArray(snapshot.fields))throw Object.assign(Error('采集样本流程版本或实际字段证据不一致。'),{code:'BPM_CAPTURE_IDENTITY_MISMATCH',status:409});
}
captureFailure(task,connection,error){
task.errorCode=typeof error.code==='string'?error.code:'CAPTURE_FAILED';
if(error.diagnostics)task.captureDiagnostics=clone(error.diagnostics);
if(error.partialCapture){
try{
const partial=clone(error.partialCapture);this.validateCapture(task,connection,partial);
// Fields are useful diagnostic evidence, never a completed PDF snapshot.
partial.snapshot={...partial.snapshot,purpose:'field-mapping'};delete partial.snapshot.html;
task.captureEvidenceId=this.store.recordCapture({...partial,taskId:task.id}).id;
delete task.captureEvidenceError;
}catch(evidenceError){task.captureEvidenceError=evidenceError.message;}
}
task.retryCount=(task.retryCount||0)+1;
if(['FORM_STRUCTURE_UNSUPPORTED','BPM_TASK_NOT_CURRENT','BPM_CAPTURE_IDENTITY_MISMATCH'].includes(task.errorCode)||[403,409].includes(Number(error.status))){
task.retryPolicy='manual';delete task.nextRetryAt;
if(task.errorCode==='BPM_TASK_NOT_CURRENT')task.status='blocked';
}else{
task.retryPolicy='automatic';
task.nextRetryAt=new Date(+this.clock()+Math.min(1800000,60000*2**Math.min(task.retryCount-1,5))).toISOString();
}
}
resetCaptureRetry(task){delete task.retryPolicy;delete task.retryCount;delete task.nextRetryAt;delete task.errorCode;delete task.captureDiagnostics;delete task.captureEvidenceError;}
markUnavailableCaptures(rows,connection){
const absent=[];
this.store.transaction(()=>{
for(const task of this.store.all('execution-tasks')){
if(task.connectionId!==connection.id||task.step!=='capture'||!['failed','blocked'].includes(task.status)||task.sampleId||task.conflict||task.missedWindow||task.supersededBy||task.revisionIgnored)continue;
const order=task.orderId&&this.store.get('orders',task.orderId);
if(order&&(order.archive||reserved(order)||['batched','sending','sent','unknown','ignored'].includes(order.status)))continue;
if(rows.some(row=>row.source==='todo'&&taskIdentity.sameTask(task,row)))continue;
if(task.errorCode==='BPM_TASK_NOT_CURRENT'&&task.recovery?.status==='requires-history-verification')continue;
task.recovery={status:'requires-history-verification',at:this.now(),previousErrorCode:task.errorCode||null,previousError:task.error||null,reason:'完整待办对账已成功,但原通知任务不在当前待办;需核验原通知节点及历史到达证据,禁止自动补发。'};
task.sourceUnavailableAt=task.sourceUnavailableAt||this.now();task.errorCode='BPM_TASK_NOT_CURRENT';task.status='blocked';task.retryPolicy='manual';delete task.nextRetryAt;
task.error=task.recovery.reason;this.persist(task);absent.push(task);
}
});
return absent;
}
async checkArchivedRuntime(task,order,connection,principal){
const published=this.store.executionRule(this.store.get('rules',order.ruleSnapshot?.id));
@@ -239,6 +277,7 @@ class OrderExecutionCoordinator{
if(needsRuntimeCheck(order))await this.checkArchivedRuntime(task,order,connection,principal);
continue;
}
if(task.step==='capture'&&(task.retryPolicy==='manual'||input.automatic&&Date.parse(task.nextRetryAt)>+this.clock()))continue;
await this.execute(task,connection,principal,{automatic:input.automatic===true});
}finally{
this.query.processedCount++;
@@ -257,6 +296,9 @@ class OrderExecutionCoordinator{
await this.checkArchivedRuntime(task,order,connection,principal);
}
if(input.automatic&&!this.store.settings().processingEnabled)throw Error('自动处理已暂停,待处理对账保留到恢复后继续。');
// Durable discovery hints can replay an older complete list. Only a fresh,
// fully successful provider scan can establish that a retained task left.
if(trustedRows===undefined)for(const task of this.markUnavailableCaptures(rows,connection))await this.exception(task,connection,false);
this.query={...this.query,status:'complete',finishedAt:this.now(),rowCount:rows.length,targetCount:considered};this.store.put('execution-requests',{id:key,at:this.now()});
}catch(error){this.query={...this.query,status:'failed',error:error.message,finishedAt:this.now()};throw error;}
finally{
@@ -275,7 +317,12 @@ class OrderExecutionCoordinator{
task.status='capturing';task.step='capture';this.persist(task);
const {sample,snapshot}=await this.provider.capture(connection,principal,clone(task.row));
this.validateCapture(task,connection,{sample,snapshot});
const captured=this.store.recordCapture({sample,snapshot,taskId:task.id});task.sampleId=captured.id;task.step='identify';this.persist(task);
const captured=this.store.recordCapture({sample,snapshot,taskId:task.id});task.sampleId=captured.id;task.step='identify';this.resetCaptureRetry(task);
if(task.sourceUnavailableAt||task.recovery?.status==='requires-history-verification'){
task.sourceAvailabilityHistory=[...(task.sourceAvailabilityHistory||[]),{sourceUnavailableAt:task.sourceUnavailableAt||null,recovery:clone(task.recovery||null),verifiedAt:this.now()}].slice(-100);
delete task.sourceUnavailableAt;if(task.recovery?.status==='requires-history-verification')delete task.recovery;
}
this.persist(task);
}
const captured=this.store.get('capture-samples',task.sampleId);let order;
await this.refreshCapabilities(this.store.executionRule(this.store.all('rules').find(r=>task.categoryIds.includes(r.id))));
@@ -296,7 +343,9 @@ class OrderExecutionCoordinator{
await this.exception(task,connection,true);
}catch(error){
if(expectedArchive&&!require('../order-rules/migrations.cjs').archiveContextMatches(this.store,this.store.get('orders',task.orderId),expectedArchive))return;
const uncertain=task.status==='archiving';task.status=uncertain&&this.archive.supportsRecovery!==true?'unknown':'failed';task.error=uncertain?'归档结果待核验,需人工受控恢复:'+error.message:error.message;this.persist(task);await this.exception(task,connection,false);
const uncertain=task.status==='archiving';task.status=uncertain&&this.archive.supportsRecovery!==true?'unknown':'failed';task.error=uncertain?'归档结果待核验,需人工受控恢复:'+error.message:error.message;
if(task.step==='capture')this.captureFailure(task,connection,error);
this.persist(task);await this.exception(task,connection,false);
}
}
adoptRevision(task,order,captured){
@@ -401,6 +450,7 @@ class OrderExecutionCoordinator{
if(typeof input.note!=='string'||input.note.trim().length<5||input.note.length>2000)fail('请填写至少5字重试依据。');
if(!['failed','blocked'].includes(task.status)||task.conflict||task.missedWindow)fail('此任务结果未明确或不允许重试。',409);
this.store.audit(principal.user.username,'人工重试订单任务',id+':'+input.note.trim());
if(task.step==='capture')this.resetCaptureRetry(task);
await this.execute(task,connection,principal);
this.store.put('execution-requests',{id:requestId,taskId:id,inputHash,at:this.now()});
return this.snapshot(principal);
+12 -2
View File
@@ -31,11 +31,21 @@ const pick=(row,keys)=>Object.fromEntries(keys.filter(k=>row?.[k]!==undefined).m
const identity=row=>pick(row,['source','connectionId','instanceId','taskId','revision','processName','nodeName','orderNo','serialNum','receivedAt','quantity','brief','model','project','title']);
function taskEvidence(task,context,user){
if(!task)return null;
const value=pick(task,['id','version','connectionId','status','step','error','exceptionId','conflict','missedWindow','recovery','updatedAt','createdAt']);
const value=pick(task,['id','version','connectionId','status','step','error','errorCode','retryPolicy','nextRetryAt','exceptionId','conflict','missedWindow','recovery','updatedAt','createdAt']);
if(Array.isArray(task.diagnostics))value.diagnostics=task.diagnostics.slice(0,100).map(d=>pick(d,['code','reason','message','table','path','field','rowCount','expectedRows','actualRows']));
if(task.captureDiagnostics)value.captureDiagnostics=pick(task.captureDiagnostics,['reason','tableName','dynamicArea','backendRows','domRows','fieldPaths']);
const previous=(task.history||[]).findLast(h=>h.step==='capture'&&h.error&&h.error!==task.error&&['failed','blocked'].includes(h.status));
if(previous)value.previousCaptureFailure=pick(previous,['at','error']);
value.row=identity(task.row);
if(task.conflictRow){const previous=task.previousTaskId?context.orderRules.get('execution-tasks',task.previousTaskId):task;value.revisionEvidence={previous:identity(previous&&canReadConnection(context.workspace,user,previous.connectionId)?previous.row:undefined),incoming:identity(task.conflictRow)};}
return value;
}
function captureEvidence(context,task,user){
if(!task?.captureEvidenceId||!canReadConnection(context.workspace,user,task.connectionId))return undefined;
const captured=context.orderRules.get('capture-samples',task.captureEvidenceId),sample=captured?.sample;
if(captured?.provenance!=='server-provider'||captured.taskId!==task.id||sample?.connectionId!==task.connectionId||sample.taskId!==task.row?.taskId||sample.instanceId!==task.row?.instanceId)return undefined;
return {id:captured.id,readOnly:true,capturedAt:captured.capturedAt,processVersion:sample.processVersion,fields:(captured.snapshot?.fields||[]).slice(0,1000).map(f=>({...pick(f,['path','label','value']),source:pick(captured.snapshot?.fieldSources?.[f.path],['source','table','column','rowIndex'])}))};
}
function orderRow(order,task){
const event=identity(order?.event||task?.row);
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}:{})}:{}),
@@ -93,7 +103,7 @@ 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,...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))};
return {...orderRow(order,task),event:identity(order?.event||task?.row),executionTask:taskEvidence(task,context,user),captureEvidence:captureEvidence(context,task,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=id.startsWith('collecting-')?require('./collecting-batches.cjs').get(context.orderRules,id):context.orderRules.get('batches',id);
+8
View File
@@ -41,3 +41,11 @@ test('undeclared generic single-row templates do not expand and fieldsOnly remai
test('dynamic row expansion never evaluates hidden expressions or executes page scripts',{timeout:30000},async t=>{
const hydrate=await fixture(t),html=remarksHTML.replace('<table','<table hiddenexpress="(()=>{throw Error(\'NO EVAL\')})()"').replace('</form>','<script>throw Error("NO SCRIPT")</script><script src="https://evil.example/remote.js"></script></form>'),result=await hydrate(html,[backend(remarkTable,[{Remark:'ONE'},{Remark:'TWO'}])]);assert.equal(result.blocker,undefined);assert.doesNotMatch(result.snapshot.html,/<script/);assert.match(result.snapshot.html,/ONE.*TWO/s);assert.deepEqual(result.requests,[]);
});
test('dynamic datamap may include proven hidden columns without dropping visible rows',{timeout:30000},async t=>{
const hydrate=await fixture(t),html='<form><table dynamicarea="0,1" datamap="HRID->Salers.HRID;Name->Salers.Name;Dept->Salers.Dept;FullName->Salers.FullName"><tr><td><input type="hidden" xdatabind="Salers.HRID"><input xdatabind="Salers.Name"></td><td><input xdatabind="Salers.Dept"><input style="display:none" xdatabind="Salers.FullName"></td></tr></table></form>';
const tables=[backend('Salers',[{HRID:'PRIVATE-ID',Name:'A',Dept:'D1',FullName:'PRIVATE-NAME'},{HRID:'PRIVATE-ID2',Name:'B',Dept:'D2',FullName:'PRIVATE-NAME2'}])];
const result=await hydrate(html,tables);assert.equal(result.blocker,undefined);assert.match(result.snapshot.html,/>A<.*>D1<.*>B<.*>D2</s);assert.doesNotMatch(result.snapshot.html,/PRIVATE-ID|PRIVATE-NAME/);
for(const invalid of [html.replace('<input type="hidden" xdatabind="Salers.HRID">',''),html.replace('HRID->Salers.HRID','HRID->Other.HRID'),html.replace('HRID->Salers.HRID','Ghost->Salers.Ghost')])assert.ok((await hydrate(invalid,tables)).blocker);
const missing=[backend('Salers',[{Name:'A',Dept:'D1',FullName:'HIDDEN'}])];assert.ok((await hydrate(html,missing)).blocker);
});
+27
View File
@@ -72,3 +72,30 @@ test('SSO capture keeps transient credentials out of result and DOM scripts cann
assert.equal(result.detailUrl,new URL(finalURL).href);assert.doesNotMatch(JSON.stringify(result),/EPHEMERAL-TOKEN|todo_token|todo_account|DOM-PASSWORD|UNTRUSTED-HIDDEN/);assert.deepEqual(request.calls.map(call=>call.method),['GET','GET','GET','POST']);assert.equal(result.detail.fields['OFR_WY_Applicant.Optional'],null);
const failing={get:async()=>{throw Error(entryURL);}};await assert.rejects(()=>loadForm(failing,entryURL),error=>!error.message.includes('EPHEMERAL-TOKEN')&&!error.message.includes('todo_token'));
});
test('PDF structure failure retains backend evidence without a usable PDF or transient credentials',{timeout:30000},async()=>{
const tables=[{TableName:'Detail',FormTable:true,Rows:[{Qty:2},{Qty:7}]}];
const html='<form><table><tr><td><input xdatabind="Detail.Qty"></td></tr></table></form>';
const options={storageState:{cookies:[],origins:[]},detailUrl:entryURL,processName:'海外运营订单评审',nodeName:'订单专员(订单通知书)',readonlyData:true,requestFactory:async()=>transport(html,tables,entryURL),browserFactory:()=>loadPlaywright().chromium.launch(browserOptions())};
await assert.rejects(()=>captureDetail(options),error=>{
assert.equal(error.code,'FORM_STRUCTURE_UNSUPPORTED');
assert.equal(error.diagnostics.reason,'ROW_COUNT_MISMATCH');
assert.equal(error.diagnostics.tableName,'Detail');
assert.equal(error.diagnostics.backendRows,2);
assert.equal(error.diagnostics.domRows,1);
assert.equal(error.partialDetail.snapshot,null);
assert.equal(error.partialDetail.fieldsOnly,true);
assert.equal(error.partialDetail.detail.fields['Detail[1].Qty'],7);
assert.equal(error.partialDetail.detail.fieldSources['Detail[1].Qty'].rowIndex,1);
assert.doesNotMatch(JSON.stringify(error.partialDetail),/EPHEMERAL-TOKEN|todo_token|todo_account/);
return true;
});
});
test('PDF browser failure still retains the backend fields already read',async()=>{
const request=transport();
await assert.rejects(()=>captureDetail({storageState:{cookies:[],origins:[]},detailUrl:finalURL,processName:'海外运营订单评审',nodeName:'订单专员(订单通知书)',readonlyData:true,requestFactory:async()=>request,browserFactory:async()=>{throw Error('private internal failure');}}),error=>{
assert.equal(error.status,502);assert.equal(error.partialDetail.detail.fields['OFR_WY_Applicant.OrderNum'],'000123');assert.equal(error.partialDetail.snapshot,null);assert.doesNotMatch(error.message,/private internal/);return true;
});
assert.equal(request.disposed,true);
});
+18
View File
@@ -26,3 +26,21 @@ test('changed current task summary or node blocks native capture before any form
let current=row,captures=0;const p=new BpmOrderProvider({manager:manager(),client:{scan:async()=>[current]},readonlyReader:async()=>{captures++;throw Error('must not capture');}});const scanned=(await p.scan(connection,principal))[0];
for(const changed of [{...row,title:'changed'},{...row,nodeName:'BOM确认'}]){current=changed;await assert.rejects(()=>p.capture(connection,principal,scanned),/变化|不一致/);}assert.equal(captures,0);
});
test('provider retains fields-only diagnostics after PDF failure without treating them as a successful capture',async()=>{
const partialDetail={detailUrl:'https://bpm.skyworthdigital.com/YZSoft/Forms/XForm/海外运营订单评审V13.aspx?tid=100&pid=200',detail:{tid:'100',pid:'200',formVersion:'V13',formPath:'/YZSoft/Forms/XForm/海外运营订单评审V13.aspx',fields:{'OFR_WY_Applicant.OrderNum':'000123'},fieldSources:{'OFR_WY_Applicant.OrderNum':{source:'DataProvider.GetFormProcessData'}}},snapshot:null,fieldsOnly:true,capturedAt:'2026-10-26T00:00:00Z',evidenceHash:'evidence'};
const p=new BpmOrderProvider({manager:manager(),client:{scan:async()=>[row]},readonlyReader:async()=>{throw Object.assign(Error('PDF structure'),{status:409,code:'FORM_STRUCTURE_UNSUPPORTED',diagnostics:{reason:'ROW_COUNT_MISMATCH'},partialDetail});}});
const scanned=(await p.scan(connection,principal))[0];
await assert.rejects(()=>p.capture(connection,principal,scanned),error=>{
assert.equal(error.partialCapture.sample.taskId,'200');assert.equal(error.partialCapture.sample.connectionId,'c');
assert.equal(error.partialCapture.snapshot.purpose,'field-mapping');assert.equal(error.partialCapture.snapshot.html,undefined);
assert.equal(error.partialCapture.snapshot.fields[0].value,'000123');
assert.doesNotMatch(JSON.stringify(error.partialCapture),/EPHEMERAL-FIXTURE/);return true;
});
assert.equal(p.capabilities().pdfExport,false);
});
test('task absent from current list has a distinct recovery code and never loads its old form',async()=>{
const p=new BpmOrderProvider({manager:manager(),client:{scan:async()=>[]},readonlyReader:async()=>{throw Error('must not load form');}});
await assert.rejects(()=>p.capture(connection,principal,row),error=>error.code==='BPM_TASK_NOT_CURRENT');
});
+2 -2
View File
@@ -4,7 +4,7 @@ const {main}=require('../src/server.cjs'),{FileArea}=require('../src/storage-fil
const {activateReferenceMapping}=require('./fixtures/activate-field-mapping.cjs');
async function port(){const server=net.createServer();await new Promise(r=>server.listen(0,'127.0.0.1',r));const result=server.address().port;await new Promise(r=>server.close(r));return result;}
test('the canonical native app exposes one authenticated execution chain with real PDF archive and visible candidates',{timeout:120000},async t=>{
test('the canonical native app archives matched orders and excludes unmatched nodes from the order center',{timeout:120000},async t=>{
const temporary=await fs.mkdtemp(path.join(os.tmpdir(),'native-category-http-'));let app;
t.after(async()=>{app?.dashboard.closeAllConnections();app?.server.closeAllConnections();await app?.stop();await fs.rm(temporary,{recursive:true,force:true});});
const bridgePort=await port();let dashboardPort=await port();while(dashboardPort===bridgePort)dashboardPort=await port();
@@ -39,5 +39,5 @@ test('the canonical native app exposes one authenticated execution chain with re
const before=await fs.readdir(path.join(archiveRoot,'orders'));await call('/api/order-execution/scan',{connectionId:connection.id,idempotencyKey:'native-second-scan'},operator);assert.equal(app.orderRules.all('orders').length,1);assert.deepEqual(await fs.readdir(path.join(archiveRoot,'orders')),before);
const list=(await call('/api/order-rules/orders',undefined,operator)).data;assert.equal(list.items[0].id,order.id);const details=(await call('/api/order-rules/orders/'+order.id,undefined,operator)).data;assert.equal(details.files.length,1);assert.equal(details.event.taskId,row.taskId);
row.taskId='900201';row.nodeName='小湃BOM创建';await call('/api/order-execution/scan',{connectionId:connection.id,idempotencyKey:'candidate-scan'},operator);
const candidates=(await call('/api/order-rules/orders?status=candidate',undefined,operator)).data;assert.equal(candidates.total,1);assert.equal(candidates.items[0].status,'candidate');assert.equal(smtpCalls,0);assert.equal(app.orderRules.all('batches').length,0);
const candidates=(await call('/api/order-rules/orders?status=candidate',undefined,operator)).data;assert.equal(candidates.total,0);assert.deepEqual(candidates.items,[]);assert.equal(app.orderRules.all('orders').length,1);assert.equal(smtpCalls,0);assert.equal(app.orderRules.all('batches').length,0);
});
@@ -0,0 +1,92 @@
'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');
const {OrderExecutionCoordinator}=require('../../src/modules/order-execution/coordinator.cjs');
const principal={sessionId:'isolated',user:{username:'admin',role:'admin'}};
function fixture(t){
const dir=fs.mkdtempSync(path.join(os.tmpdir(),'capture-recovery-'));let now=new Date('2026-10-19T02:00:00Z'),captures=0,archives=0;
const clock=()=>now,store=new RuleStore(dir,{clock}),connection={id:'c1',owner:'admin',status:'connected'};
const row={source:'todo',instanceId:'i1',taskId:'t1',revision:'1',processName:'备损订单更改评审',nodeName:'订单专员(订单通知书)',processVersion:'1.4',receivedAt:'2026-10-19T01:00:00Z',serialNum:'S1',title:'订单号:SO-1'};
const capture=()=>({sample:{...row,connectionId:'c1',fields:{order:'SO-1',brief:'真实订单摘要'}},snapshot:{processVersion:'1.4',html:'<p>fresh verified snapshot</p>',fields:[{path:'order',label:'订单号',value:'SO-1'},{path:'brief',label:'摘要',value:'真实订单摘要'}]}});
let error=Object.assign(Error('多行明细关系不明确'),{code:'FORM_STRUCTURE_UNSUPPORTED',diagnostics:{code:'FORM_STRUCTURE_UNSUPPORTED',table:'Detail',reason:'row-count'},partialCapture:capture()});
const provider={capabilities:()=>({liveTodo:true,pdfExport:true}),scan:async()=>[row],capture:async()=>{captures++;if(error)throw error;return capture();}};
const archive={capabilities:()=>({automaticArchive:true,pdfExport:true}),archive:async()=>{archives++;throw Error('must not archive');}};
const execution=new OrderExecutionCoordinator({store,provider,archive,workspace:{getConnection:()=>connection,snapshot:()=>({connections:[connection]})},clock});
store.put('settings',{...store.get('settings','main'),processingEnabled:true,processingSince:'2026-10-19T00:00:00Z'});
t.after(async()=>{await execution.stop();store.close();fs.rmSync(dir,{recursive:true,force:true});});
let request=0;return {store,execution,row,provider,capture,task:()=>store.all('execution-tasks')[0],scan:automatic=>execution.scan({connectionId:'c1',idempotencyKey:'scan-'+(++request),automatic:!!automatic},principal),setError:value=>{error=value;},advance:ms=>{now=new Date(+now+ms);},counts:()=>({captures,archives})};
}
test('unsupported form preserves fields as diagnostic-only evidence and stops scan retries across restart',async t=>{
const f=fixture(t);await f.scan(true);let task=f.task();
assert.ok(task.captureEvidenceId);assert.equal(task.sampleId,undefined);assert.equal(task.orderId,undefined);
const evidence=f.store.get('capture-samples',task.captureEvidenceId);assert.equal(evidence.snapshot.purpose,'field-mapping');assert.equal(evidence.sample.fields.order,'SO-1');
assert.equal(task.errorCode,'FORM_STRUCTURE_UNSUPPORTED');assert.equal(task.retryPolicy,'manual');assert.equal(task.captureDiagnostics.table,'Detail');
await f.scan(true);await f.scan(false);assert.equal(f.counts().captures,1);assert.equal(f.counts().archives,0);
await f.execution.stop();const restarted=new OrderExecutionCoordinator({...f.execution});t.after(()=>restarted.stop());await restarted.scan({connectionId:'c1',idempotencyKey:'restart',automatic:true},principal);assert.equal(f.counts().captures,1);
});
test('partial capture identity mismatch is never persisted or used for order execution',async t=>{
const f=fixture(t),partial=f.capture();partial.sample.taskId='different';
f.setError(Object.assign(Error('invalid form'),{code:'FORM_STRUCTURE_UNSUPPORTED',partialCapture:partial}));await f.scan(true);
assert.equal(f.store.all('capture-samples').length,0);assert.equal(f.task().captureEvidenceId,undefined);assert.equal(f.task().sampleId,undefined);assert.match(f.task().captureEvidenceError,/身份/);assert.equal(f.counts().archives,0);
});
test('transient capture retry uses bounded exponential automatic backoff',async t=>{
const f=fixture(t);f.store.schedule=()=>({times:['23:58','23:59'],weekends:false});f.setError(Object.assign(Error('network timeout'),{code:'ETIMEDOUT'}));await f.scan(true);let task=f.task();
assert.equal(task.retryPolicy,'automatic');assert.equal(task.retryCount,1);assert.equal(Date.parse(task.nextRetryAt)-Date.parse(f.execution.now()),60000);
await f.scan(true);assert.equal(f.counts().captures,1);f.advance(60000);await f.scan(true);task=f.task();assert.equal(task.retryCount,2);assert.equal(Date.parse(task.nextRetryAt)-Date.parse(f.execution.now()),120000);
for(let i=0;i<8;i++){f.advance(3600000);await f.scan(true);}task=f.task();assert.equal(Date.parse(task.nextRetryAt)-Date.parse(f.execution.now()),1800000);
});
test('manual retry resets failure counters but does not promote partial fields to usable PDF evidence',async t=>{
const f=fixture(t);await f.scan(true);const old=f.task(),evidence=old.captureEvidenceId;f.setError(Object.assign(Error('network timeout'),{code:'ETIMEDOUT'}));
await f.execution.retry(old.id,{version:old.version,idempotencyKey:'explicit-retry',note:'已修复表单并核对原任务'},principal);
const task=f.task();assert.equal(f.counts().captures,2);assert.equal(task.retryCount,1);assert.equal(task.retryPolicy,'automatic');assert.equal(task.captureEvidenceId,evidence);assert.equal(task.sampleId,undefined);assert.equal(f.counts().archives,0);
});
test('source no longer current becomes blocked manual and cannot be blindly rediscovered',async t=>{
const f=fixture(t);f.setError(Object.assign(Error('已离开授权通知节点'),{code:'BPM_TASK_NOT_CURRENT'}));await f.scan(true);
assert.equal(f.task().status,'blocked');assert.equal(f.task().errorCode,'BPM_TASK_NOT_CURRENT');assert.equal(f.task().retryPolicy,'manual');await f.scan(true);assert.equal(f.counts().captures,1);
});
test('complete fresh scan marks retained failed capture gone and preserves original evidence',async t=>{
const f=fixture(t);await f.scan(true);const before=f.task();f.provider.scan=async()=>[];await f.scan(true);const task=f.task();
assert.equal(task.status,'blocked');assert.equal(task.errorCode,'BPM_TASK_NOT_CURRENT');assert.equal(task.retryPolicy,'manual');
assert.equal(task.captureEvidenceId,before.captureEvidenceId);assert.deepEqual(task.captureDiagnostics,before.captureDiagnostics);
assert.equal(task.recovery.status,'requires-history-verification');assert.equal(task.recovery.previousErrorCode,'FORM_STRUCTURE_UNSUPPORTED');assert.match(task.error,/历史|离开|不在/);assert.ok(task.sourceUnavailableAt);assert.equal(f.counts().captures,1);
});
test('failed and trusted historical scans do not declare retained tasks absent',async t=>{
const f=fixture(t);await f.scan(true);const task=f.task();f.provider.scan=async()=>{throw Error('incomplete pagination');};
await assert.rejects(f.scan(true),/incomplete pagination/);assert.deepEqual(f.task(),task);
await f.execution.scan({connectionId:'c1',idempotencyKey:'old-hint',automatic:true},principal,{rows:[],runId:'old',startedAt:'2026-10-18T02:00:00Z'});assert.deepEqual(f.task(),task);
});
test('absence does not downgrade archive, uncertain, sent, conflicted or superseded work',async t=>{
const f=fixture(t);await f.scan(true);const seed=f.task();
const variants=[{status:'failed',step:'archive'},{status:'unknown',step:'capture'},{status:'sent',step:'capture'},{status:'sending',step:'capture'},{status:'blocked',step:'capture',conflict:true},{status:'failed',step:'capture',supersededBy:'new-task'},{status:'failed',step:'capture',revisionIgnored:true},{status:'failed',step:'capture',orderId:'archived'}];
f.store.put('orders',{id:'archived',status:'sent',archive:{files:[]}});
for(let i=0;i<variants.length;i++)f.store.put('execution-tasks',{...seed,...variants[i],id:'protected-'+i});
const before=variants.map((_,i)=>f.store.get('execution-tasks','protected-'+i));f.provider.scan=async()=>[];await f.scan(true);
assert.deepEqual(variants.map((_,i)=>f.store.get('execution-tasks','protected-'+i)),before);
});
for(const status of [403,409])test(`deterministic capture status ${status} requires manual recovery`,async t=>{
const f=fixture(t);f.setError(Object.assign(Error('source identity denied'),{status}));await f.scan(true);
assert.equal(f.task().retryPolicy,'manual');assert.equal(f.task().nextRetryAt,undefined);await f.scan(true);assert.equal(f.counts().captures,1);
});
test('manual recovery of reappeared task captures fresh PDF evidence, archives once and clears stale departure state',async t=>{
const f=fixture(t);await f.scan(true);const diagnostic=f.task().captureEvidenceId;
f.provider.scan=async()=>[];await f.scan(true);const departed=f.task();assert.ok(departed.sourceUnavailableAt);
const {activateFieldMapping}=require('../fixtures/activate-field-mapping.cjs');
const adapter=activateFieldMapping(f.store,{sampleId:diagnostic,processName:f.row.processName,processVersion:'1.4',fields:{orderNo:'order',brief:'brief'}},principal.user);
const current=f.store.snapshot().rules.find(rule=>rule.id==='bs-change');
const rule=f.store.saveRule({...current,adapterIds:[adapter.id],to:['2639266652@qq.com'],attachPdf:false,archiveDirectory:'\\\\server\\orders',filenameDate:'receivedAt'},'admin');
assert.equal(f.store.capturedPreview(diagnostic).valid,true);f.store.publish(rule.id,{version:rule.version},'admin');
let archives=0;const output=fs.mkdtempSync(path.join(os.tmpdir(),'recovery-pdf-'));t.after(()=>fs.rmSync(output,{recursive:true,force:true}));
f.execution.archive.read=file=>fs.promises.readFile(file.path);
f.execution.archive.archive=async({snapshot})=>{
archives++;assert.equal(snapshot.html,'<p>fresh verified snapshot</p>');assert.notEqual(snapshot.purpose,'field-mapping');
const bytes=Buffer.from('%PDF-1.7\nisolated recovery snapshot'),file=path.join(output,'SO-1.pdf');fs.writeFileSync(file,bytes);
return {archivedAt:f.execution.now(),files:[{name:'SO-1.pdf',path:file,size:bytes.length,sha256:crypto.createHash('sha256').update(bytes).digest('hex'),kind:'pdf'}]};
};
f.setError(null);f.provider.scan=async()=>[f.row];
await f.execution.retry(departed.id,{version:departed.version,idempotencyKey:'recover-success',note:'原通知任务已恢复且表单适配已核验'},principal);
const recovered=f.task(),order=f.store.get('orders',recovered.orderId);
assert.equal(order.status,'pending',order.error);assert.ok(order.archive);assert.equal(archives,1);assert.notEqual(recovered.sampleId,diagnostic);assert.equal(recovered.captureEvidenceId,diagnostic);
assert.equal(recovered.sourceUnavailableAt,undefined);assert.notEqual(recovered.recovery?.status,'requires-history-verification');
assert.equal(recovered.sourceAvailabilityHistory[0].sourceUnavailableAt,departed.sourceUnavailableAt);
await f.scan(true);assert.equal(f.counts().captures,2);assert.equal(archives,1);assert.equal(f.task().runtimeCheck.status,'ready');assert.equal(f.store.get('capture-samples',diagnostic).snapshot.purpose,'field-mapping');
});
@@ -0,0 +1,17 @@
'use strict';
const test=require('node:test'),assert=require('node:assert/strict');
const {orderDrivenUI}=require('../fixtures/order-driven-ui.cjs');
test('test settings and rule editor name uncovered flows even when all categories are ready',{timeout:90000},async t=>{
const {page}=await orderDrivenUI(t,'#notification-orders'),name='零售国内返工订单更改评审<待适配>';
await page.route('**/api/order-rules?view=summary',async route=>{const response=await route.fetch(),data=await response.json();data.restrictedTest={id:'coverage-test',version:1,enabled:true,ruleCount:15,readyCount:15,recipient:'2639266652@qq.com',archiveRoot:'C:\\isolated',since:'2026-10-26T00:00:00Z',uncovered:[{categoryId:'domestic-change',processName:name}]};await route.fulfill({json:data});});
for(const hash of ['notification-settings','order-rules']){await page.goto(new URL('/#'+hash,page.url()).href);await page.getByText(name,{exact:true}).waitFor();assert.equal(await page.locator('待适配').count(),0);assert.match(await page.locator('#content').innerText(),/domestic-change/);}
});
test('failure modal shows field sources and actionable diagnosis without offering an unsafe immediate retry',{timeout:90000},async t=>{
const {page,runtime,sample}=await orderDrivenUI(t,'#notification-orders'),store=runtime.orderRules;
const task={id:'failed-detail',version:1,connectionId:sample.connectionId,categoryIds:['bs-change'],row:{...sample,taskId:'failure-t1',instanceId:'failure-i1'},status:'failed',step:'capture',error:'明细结构无法确定',errorCode:'FORM_STRUCTURE_UNSUPPORTED',retryPolicy:'manual',captureDiagnostics:{reason:'ROW_COUNT_MISMATCH',tableName:'OrderItems',backendRows:2,domRows:1,fieldPaths:['OrderItems.OrderNum']}};
const capture=store.recordCapture({taskId:task.id,sample:{...task.row,fields:{'OrderItems.OrderNum':'315198'}},snapshot:{processVersion:sample.processVersion,purpose:'field-mapping',fieldSources:{'OrderItems.OrderNum':{source:'DataProvider.GetFormProcessData',table:'OrderItems',column:'OrderNum',rowIndex:0}},fields:[{path:'OrderItems.OrderNum',label:'订单号',value:'315198'}]}});task.captureEvidenceId=capture.id;store.put('execution-tasks',task);
await page.getByRole('button',{name:'刷新数据',exact:true}).click();await page.getByRole('button',{name:'查看详情',exact:true}).click();
const dialog=page.getByRole('dialog',{name:'业务详情',exact:true});await dialog.getByRole('heading',{name:'采集诊断',exact:true}).waitFor();
assert.match(await dialog.innerText(),/停止自动重试/);assert.match(await dialog.innerText(),/明细行数与表单行数不一致/);assert.match(await dialog.innerText(),/DataProvider.GetFormProcessData/);assert.match(await dialog.innerText(),/OrderItems/);assert.match(await dialog.innerText(),/315198/);assert.match(await dialog.innerText(),/OrderItems.OrderNum/);assert.equal(await dialog.getByRole('button',{name:'重试失败任务',exact:true}).count(),0);
await dialog.getByRole('button',{name:'关闭详情',exact:true}).click();task.history=[{status:'failed',step:'capture',error:'之前明细行数与表单行数不一致',at:'2026-10-26T02:00:00Z'}];task.error='当前任务不在原节点';task.errorCode='BPM_TASK_NOT_CURRENT';task.captureDiagnostics={reason:'任务已离开原通知节点'};task.retryPolicy='manual';store.put('execution-tasks',task);await page.getByRole('button',{name:'刷新数据',exact:true}).click();await page.getByRole('button',{name:'查看详情',exact:true}).click();await dialog.getByText(/原通知任务的历史证据/).waitFor();assert.match(await dialog.innerText(),/之前明细行数与表单行数不一致/);await dialog.getByRole('button',{name:'关闭详情',exact:true}).click();task.errorCode='CAPTURE_FAILED';task.retryPolicy='automatic';task.nextRetryAt='2026-10-26T02:03:00Z';store.put('execution-tasks',task);await page.getByRole('button',{name:'刷新数据',exact:true}).click();await page.getByRole('button',{name:'查看详情',exact:true}).click();await dialog.getByText(/临时故障,等待退避后重试/).waitFor();
});
+2 -2
View File
@@ -14,8 +14,8 @@ test('rule picker offers BPM-observed pairs and never offers imported unknown sc
const {page,runtime,base}=await orderDrivenUI(t,'#order-rules');const s=runtime.orderRules,record=s.get('rules','trial-notice');
record.draft.scopes=[{processName:'Excel独有流程',nodeName:'Excel独有节点'}];record.draft.processNames=['Excel独有流程'];record.draft.nodeNames=['Excel独有节点'];s.put('rules',record);
await page.getByRole('button',{name:'刷新规则与字段',exact:true}).click();await page.locator('[data-rule-id="bs-change"]').click();await page.getByRole('button',{name:'添加流程节点',exact:true}).click();
const select=page.getByRole('combobox',{name:'第2行适用流程',exact:true});await select.click();const options=page.locator('#scope-process-1-ts-dropdown');assert.doesNotMatch(await options.innerText(),/Excel独有流程/);assert.match(await options.innerText(),/备损订单更改评审/);
await options.getByText('备损订单更改评审',{exact:true}).click();await page.getByRole('combobox',{name:'第2行触发节点',exact:true}).click();assert.match(await page.locator('#scope-node-1-ts-dropdown').innerText(),/订单专员\(订单通知书\)/);
const select=page.getByRole('combobox',{name:'第2行适用流程',exact:true});await select.click();const options=page.locator('#scope-process-1-ts-dropdown');await options.getByText('备损订单更改评审',{exact:true}).waitFor();assert.doesNotMatch(await options.innerText(),/Excel独有流程/);assert.match(await options.innerText(),/备损订单更改评审/);
await options.getByText('备损订单更改评审',{exact:true}).click();await page.getByRole('combobox',{name:'第2行触发节点',exact:true}).click();await page.locator('#scope-node-1-ts-dropdown [data-selectable]').first().waitFor();assert.match(await page.locator('#scope-node-1-ts-dropdown').innerText(),/订单专员\(订单通知书\)/);
await page.getByRole('button',{name:'删除第2行',exact:true}).click();await page.getByRole('button',{name:'导入 Excel',exact:true}).click();const [download]=await Promise.all([page.waitForEvent('download'),page.getByRole('link',{name:'下载规则导入模板',exact:true}).click()]);assert.equal(download.suggestedFilename(),'规则导入模板.xlsx');
const result=await page.request.post(base+'/api/order-rules/field-mappings/catalog-settings',{headers:{Origin:base},data:{version:1,enabled:'yes'}});assert.equal(result.status(),400);
});
+16
View File
@@ -9,6 +9,22 @@ function fixture(){
return {orderRules:store,workspace:{recordSources:()=>[{id:'a',owner:'alice'},{id:'b',owner:'bob'}]},execution:{archive:{read:async()=>Buffer.from('%PDF-x')}}};
}
const user={username:'alice',role:'operator'};
test('failed task detail exposes bounded read-only evidence only for the same authorized capture',()=>{
const c=fixture(),task={id:'capture-failed',connectionId:'a',categoryIds:['cat'],status:'failed',step:'capture',errorCode:'FORM_STRUCTURE_UNSUPPORTED',retryPolicy:'manual',nextRetryAt:null,diagnostics:[{code:'ROW_MAPPING',table:'OrderItems',reason:'明细行关系不明确',rowCount:2,cookie:'SECRET'}],captureEvidenceId:'evidence',row:{taskId:'T1',instanceId:'I1'}};
c.orderRules.all('execution-tasks').push(task);
const captured={id:'evidence',taskId:task.id,provenance:'server-provider',capturedAt:'2026-10-26T02:00:00Z',sample:{connectionId:'a',taskId:'T1',instanceId:'I1',processVersion:'1.9'},snapshot:{purpose:'field-mapping',fieldSources:{'OrderItems.OrderNum':{source:'DataProvider.GetFormProcessData',table:'OrderItems',column:'OrderNum',rowIndex:0,cookie:'SECRET'}},fields:[{path:'OrderItems.OrderNum',label:'订单号',value:'315198',cookie:'SECRET'}],pdf:Buffer.from('SECRET')}};
const get=c.orderRules.get;c.orderRules.get=(kind,id)=>kind==='capture-samples'?captured:get(kind,id);
task.captureDiagnostics={reason:'动态明细关系不明确',tableName:'OrderItems',backendRows:2,domRows:1,fieldPaths:['OrderItems.OrderNum'],cookie:'SECRET'};
const detail=orderDetail(c,'task:'+task.id,user);
assert.equal(detail.executionTask.retryPolicy,'manual');assert.equal(detail.executionTask.errorCode,'FORM_STRUCTURE_UNSUPPORTED');
assert.equal(detail.captureEvidence.readOnly,true);assert.equal(detail.captureEvidence.fields[0].path,'OrderItems.OrderNum');assert.equal(detail.captureEvidence.fields[0].value,'315198');
assert.equal(detail.executionTask.diagnostics[0].table,'OrderItems');assert.equal(JSON.stringify(detail).includes('SECRET'),false);
assert.equal(detail.executionTask.captureDiagnostics.tableName,'OrderItems');assert.equal(detail.captureEvidence.fields[0].source.table,'OrderItems');assert.equal(detail.captureEvidence.fields[0].source.rowIndex,0);
assert.equal(JSON.stringify(queryOrders(c,{},user)).includes('315198'),false);
captured.sample.connectionId='b';assert.equal(orderDetail(c,'task:'+task.id,user).captureEvidence,undefined);
captured.sample.connectionId='a';captured.taskId='other-task';assert.equal(orderDetail(c,'task:'+task.id,user).captureEvidence,undefined);
assert.throws(()=>orderDetail(c,'task:'+task.id,{username:'bob',role:'operator'}),e=>e.status===404);
});
test('authorized queries paginate to actual last page, filter and reject invalid enums',()=>{
const c=fixture(),result=queryOrders(c,{page:999,pageSize:25},user);assert.equal(result.page,4);assert.equal(result.total,83);assert.equal(result.items.length,8);assert.equal(result.from,76);assert.equal(result.to,83);
assert.equal(JSON.stringify(result).includes('raw'),false);
+9 -1
View File
@@ -10,10 +10,18 @@ window.BusinessRecordDetail=(()=>{
const batch=notice.batchId?'<a href="#notification-batches?scope=all&q='+encodeURIComponent(notice.batchId)+'">'+esc(notice.batchId)+'</a>':'尚未冻结为发送批次';
return '<section class="mt-3"><h3 class="h4">'+(mode==='huizhou'?'惠州通知':'普通通知')+'</h3><dl>'+field('状态',statuses[notice.status]||notice.status)+field('原因',notice.error)+(mode==='huizhou'?field('入选惠州订单',(notice.orderNos||[]).join('、')):'')+'<dt>邮件批次</dt><dd class="text-break">'+batch+'</dd></dl>'+(notice.issues?.length?'<ul class="small text-warning">'+notice.issues.map(issue=>'<li>'+esc(issue)+'</li>').join('')+'</ul>':'')+'</section>';
}
const taskLeftNode=t=>['BPM_TASK_NOT_CURRENT','BPM_TASK_LEFT_NODE'].includes(t?.errorCode);
const diagnosticReasons={ROW_COUNT_MISMATCH:'明细行数与表单行数不一致',INVALID_DATAMAP:'明细字段映射声明无效',UNPROVEN_HIDDEN_MAPPING:'隐藏字段映射缺少可验证的对应关系',VISIBLE_MAPPING_MISSING:'可见字段缺少完整映射',MISSING_BACKEND_FIELD:'表单字段在后台数据中不存在',UNSUPPORTED_VISIBILITY:'表单可见性规则尚不支持',TASK_SCOPE_MISMATCH:'字段不属于当前通知任务'};
function captureBody(d){
const task=d.executionTask,diagnostics=task?.captureDiagnostics,evidence=d.captureEvidence;
if(!task?.errorCode&&!evidence)return '';
const reason=taskLeftNode(task)?'任务已离开当前通知节点,请先核验原通知任务的历史证据;不会改用其他任务或自动补发。':task?.retryPolicy==='manual'?'已停止自动重试。请先核对字段证据并修复表单适配,再提交有依据的重试。':['automatic','backoff'].includes(task?.retryPolicy)?'临时故障,等待退避后重试;等待期间无需重复提交。':'';
return '<section class="mt-3"><h3 class="h4">采集诊断</h3><p>'+esc(reason)+'</p><dl>'+field('错误类型',task?.errorCode)+(task?.previousCaptureFailure?field('此前采集失败',task.previousCaptureFailure.error):'')+field('下次重试',task?.nextRetryAt?formatDate(task.nextRetryAt):'')+(diagnostics?field('原因',diagnosticReasons[diagnostics.reason]||diagnostics.reason)+field('明细表',diagnostics.tableName)+field('模板范围',diagnostics.dynamicArea)+field('后台行数',diagnostics.backendRows)+field('表单行数',diagnostics.domRows)+field('关联字段',(diagnostics.fieldPaths||[]).join('、')):'')+'</dl>'+(evidence?'<h3 class="h4">已采集字段(只读)</h3><p class="small text-secondary">字段采集成功不代表 PDF 或归档完成。采集时间:'+esc(formatDate(evidence.capturedAt))+' · 表单版本:'+esc(evidence.processVersion)+'</p><div class="table-responsive"><table class="table"><thead><tr><th>字段</th><th>来源路径</th><th>采集来源</th><th>值</th></tr></thead><tbody>'+evidence.fields.map(f=>'<tr><td>'+esc(f.label||f.path)+'</td><td class="text-break">'+esc(f.path)+'</td><td class="text-break">'+esc([f.source?.source,f.source?.table,f.source?.column,Number.isInteger(f.source?.rowIndex)?'第 '+(f.source.rowIndex+1)+' 行':''].filter(Boolean).join(' · ')||'未记录来源')+'</td><td class="text-break">'+esc(typeof f.value==='object'?JSON.stringify(f.value):f.value)+'</td></tr>').join('')+'</tbody></table></div>':'')+'</section>';
}
function orderBody(d){
const t=d.executionTask,e=d.event||{};
if(d.status==='candidate')return '<h3 class="h4">未匹配通知规则</h3><p>当前流程或节点未命中 Excel 通知规则,不会归档或发送邮件。</p><dl>'+field('原因',d.reason)+field('流程',e.processName)+field('当前节点',e.nodeName)+field('BPM任务',e.taskId)+field('接收时间',formatDate(e.receivedAt))+'</dl>';
return `<h3 class="h4">处理进度</h3><dl>${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)}</dl>${notificationBody('normal',d.notifications?.normal)}${notificationBody('huizhou',d.notifications?.huizhou)}<h3 class="h4">来源</h3><dl>${field('连接',d.connectionId)}${field('流程',e.processName)}${field('节点',e.nodeName)}${field('流程实例',e.instanceId)}${field('BPM任务',e.taskId)}${field('来源版本',e.revision)}${field('接收时间',formatDate(e.receivedAt))}</dl><h3 class="h4">订单摘要</h3><pre class="notification-brief">${esc(e.brief||e.title||'未取得摘要')}</pre><h3 class="h4">PDF / 归档</h3><p>归档代次 ${esc(d.archiveGeneration)} · ${esc(formatDate(d.archivedAt))}</p>${d.files.map(f=>`<p><a href="${esc(f.url)}">${esc(f.name||'下载归档 PDF')}</a> · ${esc(f.size)} 字节</p>`).join('')||'<p class="text-secondary">尚无可验证归档文件</p>'}<h3 class="h4">邮件批次</h3>${d.batches.map(b=>`<p><button type="button" class="btn btn-link p-0" data-related-batch="${esc(b.id)}">${esc(b.subject||b.id)}</button> · ${b.notificationMode==='huizhou'?'惠州通知':'普通通知'} · ${esc(statuses[b.status]||b.status)}</p>`).join('')||'<p class="text-secondary">尚未编入批次</p>'}${t?.exceptionId?`<a href="#exceptions?id=${encodeURIComponent(t.exceptionId)}">处理关联异常</a>`:''}${t?.revisionEvidence?`<h3 class="h4 mt-3">修订核对</h3><div class="table-responsive"><table class="table"><thead><tr><th>信息</th><th>原修订</th><th>新修订</th></tr></thead><tbody>${['revision','orderNo','title','receivedAt','processName','nodeName','quantity','brief'].map(key=>`<tr><td>${esc(key)}</td><td>${esc(t.revisionEvidence.previous[key]||'—')}</td><td>${esc(t.revisionEvidence.incoming[key]||'—')}</td></tr>`).join('')}</tbody></table></div>`:''}${user.role==='admin'&&t?.conflict&&!t.missedWindow&&!['unknown','sent','sending','batched'].includes(d.status)?form('revision','保存修订核对','<select name="resolution" class="form-select"><option value="adopt">采用新修订</option><option value="ignore">忽略该变更</option></select>'):''}${user.role!=='viewer'&&t&&!t.conflict&&!t.missedWindow&&['failed','blocked'].includes(t.status)?form('retry','重试失败任务'):''}`;
return `<h3 class="h4">处理进度</h3><dl>${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)}</dl>${captureBody(d)}${notificationBody('normal',d.notifications?.normal)}${notificationBody('huizhou',d.notifications?.huizhou)}<h3 class="h4">来源</h3><dl>${field('连接',d.connectionId)}${field('流程',e.processName)}${field('节点',e.nodeName)}${field('流程实例',e.instanceId)}${field('BPM任务',e.taskId)}${field('来源版本',e.revision)}${field('接收时间',formatDate(e.receivedAt))}</dl><h3 class="h4">订单摘要</h3><pre class="notification-brief">${esc(e.brief||e.title||'未取得摘要')}</pre><h3 class="h4">PDF / 归档</h3><p>归档代次 ${esc(d.archiveGeneration)} · ${esc(formatDate(d.archivedAt))}</p>${d.files.map(f=>`<p><a href="${esc(f.url)}">${esc(f.name||'下载归档 PDF')}</a> · ${esc(f.size)} 字节</p>`).join('')||'<p class="text-secondary">尚无可验证归档文件</p>'}<h3 class="h4">邮件批次</h3>${d.batches.map(b=>`<p><button type="button" class="btn btn-link p-0" data-related-batch="${esc(b.id)}">${esc(b.subject||b.id)}</button> · ${b.notificationMode==='huizhou'?'惠州通知':'普通通知'} · ${esc(statuses[b.status]||b.status)}</p>`).join('')||'<p class="text-secondary">尚未编入批次</p>'}${t?.exceptionId?`<a href="#exceptions?id=${encodeURIComponent(t.exceptionId)}">处理关联异常</a>`:''}${t?.revisionEvidence?`<h3 class="h4 mt-3">修订核对</h3><div class="table-responsive"><table class="table"><thead><tr><th>信息</th><th>原修订</th><th>新修订</th></tr></thead><tbody>${['revision','orderNo','title','receivedAt','processName','nodeName','quantity','brief'].map(key=>`<tr><td>${esc(key)}</td><td>${esc(t.revisionEvidence.previous[key]||'—')}</td><td>${esc(t.revisionEvidence.incoming[key]||'—')}</td></tr>`).join('')}</tbody></table></div>`:''}${user.role==='admin'&&t?.conflict&&!t.missedWindow&&!['unknown','sent','sending','batched'].includes(d.status)?form('revision','保存修订核对','<select name="resolution" class="form-select"><option value="adopt">采用新修订</option><option value="ignore">忽略该变更</option></select>'):''}${user.role!=='viewer'&&t&&!t.conflict&&!t.missedWindow&&['failed','blocked'].includes(t.status)&&!taskLeftNode(t)?form('retry',t.retryPolicy==='manual'?'核验后重试采集':'重试失败任务',t.retryPolicy==='manual'?'<label class="form-check mb-2"><input class="form-check-input" type="checkbox" required><span class="form-check-label">已核对原任务证据并完成适配修复</span></label>':''):''}`;
}
function batchBody(d){return `<dl>${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('、'))}</dl><h3 class="h4">${d.status==='collecting'?'当前汇总正文':'冻结正文'}</h3><pre class="notification-brief">${esc(d.text||'无正文')}</pre><details class="mb-3"><summary>查看实际HTML邮件预览</summary><iframe class="mail-preview mt-2" title="批次邮件预览" sandbox src="/api/order-rules/batches/${encodeURIComponent(d.id)}/preview"></iframe></details>${window.BatchContentEditor.render(d,{esc,user})}<h3 class="h4">附件</h3>${d.attachments.map(a=>`<p>${esc(a.name||a.filename)} · ${esc(a.size||'—')} 字节</p>`).join('')||'无附件'}<h3 class="h4 mt-3">关联订单</h3>${d.orders.map(o=>`<p><button type="button" class="btn btn-link p-0" data-related-order="${esc(o.id)}">${esc(o.orderNo||o.id)}</button></p>`).join('')}<p class="small text-secondary">SMTP 接受不代表最终送达。结果不明时必须先核验,不会自动补发。</p>${user.role==='admin'&&d.status==='unknown'?form('resolve','保存核验结论','<select name="resolution" class="form-select"><option value="sent">已核实邮件服务器接受</option><option value="retry">已核实未发送,允许重试</option></select>'):''}${user.role==='admin'&&d.status==='failed'?form('resend','人工补发原冻结批次'):''}`;}
async function load(kind,id,trigger,back=null){
+1 -1
View File
@@ -23,7 +23,7 @@ window.OrderNotificationViews=(()=>{
const card=document.createElement('section');card.className='card settings-width mb-3';container.prepend(card);
let run=data.restrictedTest;
function drawTest(){
card.innerHTML=`<div class="card-header"><h2 class="card-title">受限稳定性测试</h2><span class="badge bg-yellow-lt ms-auto">${run.enabled?'测试运行中':'测试已暂停'}</span></div><div class="card-body"><p>覆盖 ${Number(run.ruleCount)} 类,当前可用 ${Number(run.readyCount)} 类。正式投产须重新检查并发布。</p><dl><dt>固定收件箱</dt><dd class="text-break">${esc(run.recipient)}</dd><dt>桌面归档目录</dt><dd class="text-break">${esc(run.archiveRoot)}</dd><dt>测试接收基线</dt><dd>${esc(formatDate(run.since))}</dd></dl><p class="small text-secondary">仅处理基线后的真实通知;暂停保留测试模式,不切换为正式发送。收件箱、目录与发件通道已固定。</p>${run.uncovered?.length?`<p class="text-warning small">${run.uncovered.length} 个流程尚无可用字段版本,继续阻塞。</p>`:''}<div role="alert"></div></div>${admin?`<div class="card-footer"><button type="button" class="btn ${run.enabled?'btn-outline-warning':'btn-primary'}">${run.enabled?'暂停测试':'恢复测试'}</button></div>`:''}`;
card.innerHTML=`<div class="card-header"><h2 class="card-title">受限稳定性测试</h2><span class="badge bg-yellow-lt ms-auto">${run.enabled?'测试运行中':'测试已暂停'}</span></div><div class="card-body"><p>覆盖 ${Number(run.ruleCount)} 类,当前可用 ${Number(run.readyCount)} 类。正式投产须重新检查并发布。</p><dl><dt>固定收件箱</dt><dd class="text-break">${esc(run.recipient)}</dd><dt>桌面归档目录</dt><dd class="text-break">${esc(run.archiveRoot)}</dd><dt>测试接收基线</dt><dd>${esc(formatDate(run.since))}</dd></dl><p class="small text-secondary">仅处理基线后的真实通知;暂停保留测试模式,不切换为正式发送。收件箱、目录与发件通道已固定。</p>${run.uncovered?.length?`<p class="text-warning small">${run.uncovered.length} 个流程尚无可用字段版本,继续阻塞。</p><ul class="small text-warning">${run.uncovered.map(item=>`<li><span>${esc(item.processName)}</span>${item.categoryId?` <span class="text-secondary">(分类:${esc(item.categoryId)})</span>`:''}</li>`).join('')}</ul>`:''}<div role="alert"></div></div>${admin?`<div class="card-footer"><button type="button" class="btn ${run.enabled?'btn-outline-warning':'btn-primary'}">${run.enabled?'暂停测试':'恢复测试'}</button></div>`:''}`;
const button=card.querySelector('button');if(button)button.onclick=async()=>{if(button.disabled)return;button.disabled=true;try{const saved=await api('/order-rules/restricted-test',{version:run.version,enabled:!run.enabled});if(isActive()&&card.isConnected){run=saved;drawTest();}}catch(error){if(isActive()&&card.isConnected)card.querySelector('[role=alert]').textContent=error.message;}finally{if(button.isConnected)button.disabled=false;}};
}
drawTest();
+1 -1
View File
@@ -25,7 +25,7 @@
let sources=sourcesFor(rule);
const recognition=(data.catalogError?`<div class="alert alert-warning">订单读取失败:${esc(data.catalogError)}。请刷新重试,或到<a href="#notification-orders">订单执行</a>检查 BPM 连接。</div>`:'')+window.OrderRulePreview.panel(sources,{esc,operator});
panel.innerHTML=`<div class="rule-workbench-grid"><aside class="card rule-category-directory"><div class="card-header"><div><h3 class="card-title">Excel 分类 · ${data.rules.length}</h3><div class="small text-secondary mt-1">${data.restrictedTest?Number(data.restrictedTest.readyCount)+' 类受限测试 · ':''}${data.rules.filter(r=>r.status==='enabled').length} 类正式启用 · ${data.rules.filter(r=>r.status!=='enabled').length} 类未正式启用</div></div></div><div class="card-body"><label class="visually-hidden" for="rule-category-search">搜索分类</label><input type="search" class="form-control mb-2" id="rule-category-search" placeholder="搜索分类" value="${esc(query)}"><label class="visually-hidden" for="rule-category-filter">分类状态</label><select class="form-select" id="rule-category-filter"><option value="all">全部分类</option><option value="needs">待完善</option><option value="draft">有草稿</option><option value="published">已启用</option><option value="paused">已暂停</option></select></div><div id="rule-category-list" class="rule-category-list"></div><div class="card-footer small text-secondary">开关控制已发布版本。<br>正式自动发信由通知配置单独控制。</div></aside><main class="rule-editor-column"><div class="rule-version-bar"><div><div class="small text-secondary mb-1">分类规则</div><h2 class="h3 mb-1">${esc(rule.name)}</h2><div class="small text-secondary" id="rule-version-state">草稿 v${esc(rule.version)} · 已发布 ${esc(rule.publishedVersion?'v'+rule.publishedVersion:'无')} · Excel 行 ${esc(rule.sourceRow??'—')}</div></div></div>${window.OrderRuleEditor.render(rule,data.adapters,{esc,admin,resources:data.resources,recognition})}</main></div>`;
if(data.restrictedTest)panel.insertAdjacentHTML('afterbegin','<div class="alert alert-warning">'+(restrictedActive?'受限稳定性测试:'+Number(data.restrictedTest.readyCount)+' / '+Number(data.restrictedTest.ruleCount)+' 类可用。保存后点击“应用到测试”,新任务使用新规则;旧订单和批次保持原快照。':'受限稳定性测试已暂停。可继续维护、验证和发布草稿;这些操作不会恢复测试发送。')+(data.restrictedTest.uncovered?.length?'另有 '+Number(data.restrictedTest.uncovered.length)+' 个流程缺少字段适配,对应订单不会自动归档或发送。':'')+'<a href="#notification-settings">查看测试设置</a></div>');
if(data.restrictedTest)panel.insertAdjacentHTML('afterbegin','<div class="alert alert-warning">'+(restrictedActive?'受限稳定性测试:'+Number(data.restrictedTest.readyCount)+' / '+Number(data.restrictedTest.ruleCount)+' 类可用。保存后点击“应用到测试”,新任务使用新规则;旧订单和批次保持原快照。':'受限稳定性测试已暂停。可继续维护、验证和发布草稿;这些操作不会恢复测试发送。')+(data.restrictedTest.uncovered?.length?'另有 '+Number(data.restrictedTest.uncovered.length)+' 个流程缺少字段适配,对应订单不会自动归档或发送。<ul class="small mb-2">'+data.restrictedTest.uncovered.map(item=>'<li><span>'+esc(item.processName)+'</span>'+(item.categoryId?' <span class="text-secondary">(分类:'+esc(item.categoryId)+')</span>':'')+'</li>').join('')+'</ul>':'')+'<a href="#notification-settings">查看测试设置</a></div>');
if(admin&&rule.publishedVersion&&!restrictedActive){
const migration=document.createElement('section');migration.className='card mt-3';
migration.innerHTML='<div class="card-body"><h3 class="h4">将未冻结订单迁移到已发布版本</h3><p class="small text-secondary">仅当前已发布版本。冻结、发送及结果不确定订单不改写;输出变化会要求新代归档。</p><label class="form-label">迁移依据<textarea class="form-control" minlength="5" maxlength="2000" required></textarea></label><button class="btn" data-migration-preview type="button">预览迁移</button><div data-migration-result class="mt-3"></div></div>';