fix: ignore verified obsolete BPM display fields
This commit is contained in:
1 parent
5bae83922c
commit
f2e6dfeac3
9 files changed
+105
-14
No files matched your search
@@ -6,9 +6,12 @@
|
||||
- 后端字段读取成功而静态 PDF 失败时保存独立字段证据 captureEvidenceId,不写入成功 sampleId,不作为 PDF/归档凭据。保存结构原因、表名、行数与字段路径;授权详情弹窗可查看字段值及接口/表/列/行来源,列表不返回字段值。
|
||||
- 确定性结构、身份及权限错误暂停自动重试;暂时连接错误指数退避(1分钟起,上限30分钟)。只有新鲜完整待办扫描成功才把已离开待办的失败采集任务转为待历史核验;失败扫描与旧发现线索不能推导任务离开。已归档、发送中、已发送、unknown、冲突及替代任务保持保护。
|
||||
- 原任务重新出现且人工核验后重试,必须重新采集完整 PDF;独立字段证据不得代替成功快照。成功后清理当前“已离开”标记,保留历史证据,重复扫描不重复归档。
|
||||
- 待历史核验任务提供显式“核验当前任务并重试”入口,要求确认原任务及填写依据;执行前仍重新读取当前待办验证身份与节点,任务仍不在时只保留阻断,不能拿历史实例替代。
|
||||
- 监听器交付的完整列表也可用于离开判定,但必须与持久完整对账回执逐项一致、为最新且五分钟内的非未来回执,并且早于该次扫描的失败任务才参与;旧线索不能覆盖更新的任务状态。避免后台持续收到列表而不走直接查询时,失败任务永远留在旧状态。
|
||||
- 两个真实海外更改单的历史表单只读证据证明:V7 / 列表1.9 的隐藏列误判已解决,但 HTML 仍包含后端 Columns 与行数据都不存在的 SubsidiaryDelivery1、SubsidiaryDelivery2、SoftRequireImage_Remark。当前继续阻断,不猜测字段别名;是否在 PDF 明确标注未提供后继续,已向业务负责人询问,尚待答复。
|
||||
- 当前历史列表只提供实例与开始/完成时间,不能恢复原通知节点到达身份;禁止把历史开始时间当通知到达时间、构造任务或自动补发。零售国内返工订单更改评审在两个已核验历史来源均无样本,继续标明未覆盖,不能声称15类实单闭环完成。
|
||||
- 分类与测试设置现在列出未覆盖流程的具体名称。隔离回归仍使用临时文件/本机 SMTP;真实资料只保存在忽略的 output,未办理 BPM 或手动发送业务邮件。本机更新与最终测试结果以本轮回执为准。
|
||||
- 验证:当前业务集72项通过,表单/执行/弹窗专项79项通过,另补成功恢复与完整对账证明相关回归。未重跑旧千项全量。首次集成运行发现“未匹配记录仍可见”的过时断言,按现行业务边界修正;下拉候选断言补上实际渲染等待,避免读取尚未显示的候选。已备份并更新原本机测试副本,原账号、模板、规则、订单、批次和邮件配置/记录在更新时核对一致。自动处理、定时发送及隔离模式保持原开启设置;运行期间正常发现的错过时段任务仍人工核验,不自动补发。
|
||||
|
||||
## 2026-10-26 订单中心与发送前收集批次
|
||||
|
||||
|
||||
@@ -12,7 +12,8 @@ function resolveFormIdentity(identity,{processName,listProcessVersion}){
|
||||
const process=candidates.filter(contract=>contract.processName===processName);
|
||||
if(!process.length)fail('列表流程与已核验的完整表单路径不一致。');
|
||||
if(!listProcessVersion||!process.some(contract=>contract.listVersion===String(listProcessVersion)))fail('列表流程版本与已核验的表单契约不一致。');
|
||||
return {processName,processVersion:formVersion||'list:'+listProcessVersion+'|form:'+path,formName,formVersion,formPath:path,formMatchSource:'verified-form-contract'};
|
||||
const contract=process.find(contract=>contract.listVersion===String(listProcessVersion));
|
||||
return {processName,processVersion:formVersion||'list:'+listProcessVersion+'|form:'+path,formName,formVersion,formPath:path,formMatchSource:'verified-form-contract',...(contract.ignoredDisplayFields?{ignoredDisplayFields:[...contract.ignoredDisplayFields]}:{})};
|
||||
}
|
||||
// Preserve the original strict same-name, explicitly versioned contract.
|
||||
// Aliases and forms without a V-number always require a verified full path.
|
||||
|
||||
@@ -24,7 +24,8 @@
|
||||
{
|
||||
"processName": "海外运营订单更改评审",
|
||||
"listVersion": "1.9",
|
||||
"path": "/YZSoft/Forms/XForm/2012订单评审系列/海外运营订单评审/海外运营订单更改评审V7.aspx"
|
||||
"path": "/YZSoft/Forms/XForm/2012订单评审系列/海外运营订单评审/海外运营订单更改评审V7.aspx",
|
||||
"ignoredDisplayFields": ["OFR_WY_BInfo.SubsidiaryDelivery1", "OFR_WY_BInfo.SubsidiaryDelivery2", "OFR_WY_BInfo.SoftRequireImage_Remark"]
|
||||
},
|
||||
{
|
||||
"processName": "海外IPC订单评审",
|
||||
|
||||
@@ -59,10 +59,10 @@ function flattenTables(tables){
|
||||
|
||||
// This function runs in a script-disabled document. Backend rows are assigned to
|
||||
// repeated DOM rows only when a complete, one-to-one row schema proves the order.
|
||||
function hydrateReadonlyDocument({tables,fieldsOnly=false}){
|
||||
function hydrateReadonlyDocument({tables,fieldsOnly=false,ignoredDisplayFields=[]}){
|
||||
const form=document.querySelector('form');if(!form)return {blocker:'BPM 静态表单不存在。'};
|
||||
const hiddenPredicates=new Map();
|
||||
const visible=element=>{for(let node=element;node;node=node.parentElement){const predicate=hiddenPredicates.get(node.getAttribute('hiddenexpress')||''),style=getComputedStyle(node);if(predicate?.known&&predicate.value||node.hidden||['hidden','password','file'].includes(node.type)||style.display==='none'||['hidden','collapse'].includes(style.visibility))return false;}return true;};
|
||||
const hiddenPredicates=new Map(),ignoredControls=new Set(),displayWarnings=[];
|
||||
const visible=element=>{for(let node=element;node;node=node.parentElement){const predicate=hiddenPredicates.get(node.getAttribute('hiddenexpress')||''),style=getComputedStyle(node);if(ignoredControls.has(node)||predicate?.known&&predicate.value||node.hidden||['hidden','password','file'].includes(node.type)||style.display==='none'||['hidden','collapse'].includes(style.visibility))return false;}return true;};
|
||||
const binding=element=>element.getAttribute('xdatabind')||element.getAttribute('data-xdatabind')||element.getAttribute('data-bind');
|
||||
let bindings=[...form.querySelectorAll('[xdatabind],[data-xdatabind],[data-bind]')];const values=new Map(),resolved=new Map(),detailTables=new Set();
|
||||
const processSteps=[];for(const table of document.querySelectorAll('table')){const rows=[...table.rows],header=rows.find(row=>[...row.cells].some(cell=>/^(节点|环节|步骤|活动名称|节点名称)$/.test(cell.textContent.trim()))&&[...row.cells].some(cell=>/^(状态|处理状态)$/.test(cell.textContent.trim())));if(!header)continue;const labels=[...header.cells].map(cell=>cell.textContent.trim()),ni=labels.findIndex(label=>/^(节点|环节|步骤|活动名称|节点名称)$/.test(label)),si=labels.findIndex(label=>/^(状态|处理状态)$/.test(label));for(const row of rows.slice(rows.indexOf(header)+1)){const name=row.cells[ni]?.textContent.trim(),status=row.cells[si]?.textContent.trim();if(name&&status)processSteps.push({name,status});}}
|
||||
@@ -88,6 +88,16 @@ function hydrateReadonlyDocument({tables,fieldsOnly=false}){
|
||||
}catch{return {known: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});}
|
||||
// Only approved, version-scoped legacy display controls absent from both the
|
||||
// declared backend schema and every returned row may be omitted. This does
|
||||
// not add a value to field evidence or relax required business-field mapping.
|
||||
for(const path of ignoredDisplayFields){
|
||||
const key=path.toLowerCase(),matches=tables.filter(table=>key.startsWith(((table.DataSource?table.DataSource+':':'')+table.TableName).toLowerCase()+'.'));
|
||||
if(matches.length!==1)continue;const table=matches[0],prefix=((table.DataSource?table.DataSource+':':'')+table.TableName).toLowerCase(),column=key.slice(prefix.length+1);
|
||||
if(!Array.isArray(table.Columns)||!table.Columns.length||table.Columns.some(item=>typeof item?.ColumnName!=='string')||table.Columns.some(item=>item.ColumnName.toLowerCase()===column)||table.Rows.some(row=>Object.keys(row).some(name=>name.toLowerCase()===column)))continue;
|
||||
const controls=bindings.filter(element=>binding(element)?.toLowerCase()===key);if(!controls.length)continue;
|
||||
controls.forEach(element=>ignoredControls.add(element));displayWarnings.push('已忽略后端未声明的旧展示字段:'+path);
|
||||
}
|
||||
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=(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=>{
|
||||
@@ -175,7 +185,7 @@ function hydrateReadonlyDocument({tables,fieldsOnly=false}){
|
||||
copy.querySelectorAll('#taskCommentForm,#TaskCommentCount').forEach(node=>node.remove());
|
||||
const styles=[];for(const sheet of document.styleSheets)try{styles.push([...sheet.cssRules].map(rule=>rule.cssText).join('\n'));}catch{}
|
||||
const warnings=[...document.querySelectorAll('[hiddenexpress]')].some(element=>visible(element)&&uncertainVisibility(element))?['部分 hiddenexpress 不能静态确认,相关内容保持可见,未执行表达式代码。']:[];
|
||||
return {processSteps,snapshot:{html:copy.outerHTML,styles,width:1264,images:[],warnings}};
|
||||
return {processSteps,snapshot:{html:copy.outerHTML,styles,width:1264,images:[],warnings:[...warnings,...displayWarnings]}};
|
||||
}
|
||||
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}){
|
||||
@@ -189,7 +199,7 @@ async function captureReadonlyForm({storageState,detailUrl,processName,nodeName,
|
||||
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.snapshot)hydrated.snapshot.images=images;
|
||||
const hydrated=await page.evaluate(hydrateReadonlyDocument,{tables,fieldsOnly,ignoredDisplayFields:identity.ignoredDisplayFields||[]});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;
|
||||
const captured={...identity,detail,snapshot:hydrated.snapshot||null,capturedAt,evidenceHash,detailUrl:loaded.url.href,fieldsOnly,blockedRequests:[]};
|
||||
|
||||
@@ -74,11 +74,21 @@ class OrderExecutionCoordinator{
|
||||
}
|
||||
}
|
||||
resetCaptureRetry(task){delete task.retryPolicy;delete task.retryCount;delete task.nextRetryAt;delete task.errorCode;delete task.captureDiagnostics;delete task.captureEvidenceError;}
|
||||
markUnavailableCaptures(rows,connection){
|
||||
verifiedCurrentDiscovery(connection,{rows,runId,startedAt,finishedAt}){
|
||||
const start=Date.parse(startedAt),finish=Date.parse(finishedAt),now=+this.clock();
|
||||
if(!runId||!Array.isArray(rows)||!Number.isFinite(start)||!Number.isFinite(finish)||start>finish||finish>now||now-start>300000)return null;
|
||||
const saved=this.store.get('execution-discovery-runs',hash([connection.id,runId]));
|
||||
const latest=this.store.get('execution-discoveries',connection.id);
|
||||
if(!saved||!latest||latest.runId!==runId||latest.startedAt!==startedAt||latest.finishedAt!==finishedAt)return null;
|
||||
if(saved.connectionId!==connection.id||saved.runId!==runId||saved.startedAt!==startedAt||saved.finishedAt!==finishedAt||hash(saved.rows)!==hash(rows))return null;
|
||||
return startedAt;
|
||||
}
|
||||
markUnavailableCaptures(rows,connection,{notAfter}={}){
|
||||
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;
|
||||
if(notAfter&&(!Number.isFinite(Date.parse(task.updatedAt))||Date.parse(task.updatedAt)>Date.parse(notAfter)))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;
|
||||
@@ -194,7 +204,7 @@ class OrderExecutionCoordinator{
|
||||
window:task.missedWindow,error:task.error,orderIds:task.orderId?[task.orderId]:[],
|
||||
});
|
||||
}
|
||||
scan(input,principal,{rows:trustedRows,runId,startedAt}={}){
|
||||
scan(input,principal,{rows:trustedRows,runId,startedAt,finishedAt}={}){
|
||||
// Reserve the shared boundary synchronously, including work queued behind a retry.
|
||||
this.store.activeDiscoveries++;
|
||||
return this.serialize(async()=>{
|
||||
@@ -296,9 +306,10 @@ 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);
|
||||
// Durable hints can replay old lists. Absence requires a fresh direct scan
|
||||
// or exact persisted latest proof, and cannot invalidate newer task work.
|
||||
const proof=trustedRows===undefined?null:this.verifiedCurrentDiscovery(connection,{rows,runId,startedAt,finishedAt});
|
||||
if(trustedRows===undefined||proof)for(const task of this.markUnavailableCaptures(rows,connection,{notAfter:proof}))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{
|
||||
|
||||
@@ -0,0 +1,29 @@
|
||||
'use strict';
|
||||
const test=require('node:test'),assert=require('node:assert/strict');
|
||||
const {captureReadonlyForm}=require('../src/bpm-readonly-form.cjs');
|
||||
const path='/YZSoft/Forms/XForm/2012订单评审系列/海外运营订单评审/海外运营订单更改评审V7.aspx';
|
||||
const ignored=['SubsidiaryDelivery1','SubsidiaryDelivery2','SoftRequireImage_Remark'];
|
||||
const baseTables=()=>[{TableName:'OFR_WY_Applicant',FormTable:true,Columns:[{ColumnName:'OrderNum'},{ColumnName:'TaskID'}],Rows:[{OrderNum:'000123',TaskID:100}]},{TableName:'OFR_WY_BInfo',FormTable:true,Columns:[{ColumnName:'SalesAmount'}],Rows:[{SalesAmount:12}]}];
|
||||
const html='<form><h1>隔离更改单</h1><input xdatabind="OFR_WY_Applicant.OrderNum"><input xdatabind="OFR_WY_BInfo.SalesAmount">'+ignored.map(name=>'<textarea xdatabind="OFR_WY_BInfo.'+name+'">UNTRUSTED-DOM-VALUE</textarea>').join('')+'</form>';
|
||||
async function capture({tables=baseTables(),form=html,formPath=path,listVersion='1.9'}={}){
|
||||
const url='https://bpm.skyworthdigital.com'+formPath+'?tid=100&pid=200';
|
||||
return captureReadonlyForm({storageState:{cookies:[],origins:[]},detailUrl:url,processName:'海外运营订单更改评审',nodeName:'订单专员(订单通知书)',listProcessVersion:listVersion,requestFactory:async()=>({get:async()=>({status:()=>200,body:async()=>Buffer.from(form)}),post:async()=>({status:()=>200,body:async()=>Buffer.from(JSON.stringify({success:true,Tables:tables}))}),dispose:async()=>{}})});
|
||||
}
|
||||
test('verified V7 ignores only approved obsolete display controls and records warnings without invented values',{timeout:30000},async()=>{
|
||||
const result=await capture();assert.match(result.snapshot.html,/>000123</);assert.doesNotMatch(result.snapshot.html,/UNTRUSTED-DOM-VALUE/);
|
||||
assert.equal(result.snapshot.warnings.length,3);for(const name of ignored){assert.ok(result.snapshot.warnings.some(w=>w.includes(name)));assert.equal(Object.hasOwn(result.detail.fields,'OFR_WY_BInfo.'+name),false);}
|
||||
});
|
||||
test('an ignored display field returning in backend is displayed from backend rather than ignored',{timeout:30000},async()=>{
|
||||
const tables=baseTables();tables[1].Columns.push({ColumnName:'SoftRequireImage_Remark'});tables[1].Rows[0].SoftRequireImage_Remark='ACTUAL-BACKEND-REMARK';
|
||||
const result=await capture({tables});assert.match(result.snapshot.html,/ACTUAL-BACKEND-REMARK/);assert.equal(result.snapshot.warnings.length,2);assert.equal(result.detail.fields['OFR_WY_BInfo.SoftRequireImage_Remark'],'ACTUAL-BACKEND-REMARK');
|
||||
});
|
||||
test('missing required fields, missing declared data and unverified schema remain blocked',{timeout:30000},async()=>{
|
||||
const cases=[];let tables=baseTables();delete tables[0].Rows[0].OrderNum;cases.push(tables);
|
||||
tables=baseTables();tables[1].Columns.push({ColumnName:'SubsidiaryDelivery1'});cases.push(tables);
|
||||
tables=baseTables();delete tables[1].Columns;cases.push(tables);
|
||||
for(const tables of cases)await assert.rejects(()=>capture({tables}),error=>error.code==='FORM_STRUCTURE_UNSUPPORTED');
|
||||
});
|
||||
test('the display exception cannot apply to another form version or unverified list version',{timeout:30000},async()=>{
|
||||
await assert.rejects(()=>capture({formPath:path.replace('V7','V8')}),error=>error.code==='FORM_STRUCTURE_UNSUPPORTED');
|
||||
await assert.rejects(()=>capture({listVersion:'2.0'}),/版本/);
|
||||
});
|
||||
@@ -55,6 +55,26 @@ test('failed and trusted historical scans do not declare retained tasks absent',
|
||||
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('fresh persisted complete discovery proof can mark older failed capture absent without provider fallback',async t=>{
|
||||
const f=fixture(t);await f.scan(true);f.execution.systemPrincipal=principal;
|
||||
const payload={connectionId:'c1',runId:'fresh-proof',rows:[],startedAt:f.execution.now(),finishedAt:f.execution.now()};
|
||||
f.execution.notifyDiscovery(payload);const hint=f.store.all('execution-discovery-runs').find(item=>item.runId===payload.runId);
|
||||
f.provider.scan=async()=>{throw Error('must not query again');};
|
||||
await f.execution.consumeDiscovery(hint,f.execution.workspace.getConnection('c1'));
|
||||
assert.equal(f.task().errorCode,'BPM_TASK_NOT_CURRENT');assert.equal(f.task().recovery.status,'requires-history-verification');
|
||||
});
|
||||
for(const invalid of ['unpersisted','mismatched-rows','old','future','older-than-latest','task-newer'])test(`discovery absence requires valid current proof (${invalid})`,async t=>{
|
||||
const f=fixture(t);await f.scan(true);
|
||||
const payload={connectionId:'c1',runId:'proof-'+invalid,rows:[],startedAt:f.execution.now(),finishedAt:f.execution.now()};
|
||||
if(invalid==='old'){payload.startedAt='2026-10-19T01:50:00.000Z';payload.finishedAt=payload.startedAt;}
|
||||
if(invalid==='future'){payload.startedAt='2026-10-19T02:01:00.000Z';payload.finishedAt=payload.startedAt;}
|
||||
if(invalid!=='unpersisted')f.execution.notifyDiscovery(payload);
|
||||
if(invalid==='mismatched-rows')payload.rows=[{...f.row,taskId:'different-task',nodeName:'different-node'}];
|
||||
if(invalid==='older-than-latest'){f.advance(1000);f.execution.notifyDiscovery({...payload,runId:'newer-proof',startedAt:f.execution.now(),finishedAt:f.execution.now()});}
|
||||
if(invalid==='task-newer'){f.advance(1000);const task=f.task();task.updatedAt=f.execution.now();f.store.put('execution-tasks',task);}
|
||||
const before=f.task();await f.execution.scan({connectionId:'c1',idempotencyKey:'check-'+invalid,automatic:true},principal,payload);
|
||||
assert.deepEqual(f.task(),before);
|
||||
});
|
||||
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'}];
|
||||
|
||||
@@ -1,6 +1,22 @@
|
||||
'use strict';
|
||||
const test=require('node:test'),assert=require('node:assert/strict');
|
||||
const {orderDrivenUI}=require('../fixtures/order-driven-ui.cjs');
|
||||
test('authorized users can explicitly revalidate only the original departed task while viewers cannot',{timeout:90000},async t=>{
|
||||
const {page,runtime,sample,browser,base}=await orderDrivenUI(t,'#notification-orders');
|
||||
for(const role of ['operator','viewer'])runtime.store.addUser({username:role,password:'Test-password-123',role},'admin');
|
||||
const admin=runtime.store.users()[0],connection=runtime.workspace.createConnection({name:'重核连接',owner:'operator'},admin,runtime.store.users());
|
||||
runtime.orderRules.put('execution-tasks',{id:'departed',version:1,connectionId:connection.id,categoryIds:['bs-change'],row:{...sample,connectionId:connection.id,taskId:'original-task'},status:'blocked',step:'capture',errorCode:'BPM_TASK_NOT_CURRENT',retryPolicy:'manual',error:'任务已离开通知节点'});
|
||||
let writes=0;
|
||||
for(const role of ['admin','operator','viewer']){
|
||||
const context=role==='admin'?null:await browser.newContext(),member=context?await context.newPage():page;member.setDefaultTimeout(7000);
|
||||
await member.route('**/api/order-execution/tasks/*/retry',route=>{writes++;return route.fulfill({json:{ok:true}});});
|
||||
if(context){await member.goto(base+'/#notification-orders');await member.getByLabel('账号',{exact:true}).fill(role);await member.getByLabel('密码',{exact:true}).fill('Test-password-123');await member.getByRole('button',{name:'登录',exact:true}).click();}else await member.getByRole('button',{name:'刷新数据',exact:true}).click();
|
||||
if(role==='viewer'){await member.getByRole('heading',{name:'订单中心',exact:true}).first().waitFor();assert.equal(await member.getByRole('button',{name:'查看详情',exact:true}).count(),0);}
|
||||
else{await member.getByRole('button',{name:'查看详情',exact:true}).click();const dialog=member.getByRole('dialog',{name:'业务详情',exact:true});await dialog.getByRole('button',{name:'核验当前任务并重试',exact:true}).waitFor();const check=dialog.getByLabel('确认仅核验原通知任务;不使用历史实例替代',{exact:true});assert.equal(await check.getAttribute('required'),'');assert.equal(await dialog.getByLabel('操作依据',{exact:true}).getAttribute('required'),'');assert.match(await dialog.innerText(),/仍不存在.*保持受阻/);await dialog.getByRole('button',{name:'关闭详情',exact:true}).click();}
|
||||
await context?.close();
|
||||
}
|
||||
assert.equal(writes,0);
|
||||
});
|
||||
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});});
|
||||
|
||||
@@ -15,13 +15,13 @@ window.BusinessRecordDetail=(()=>{
|
||||
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)?'临时故障,等待退避后重试;等待期间无需重复提交。':'';
|
||||
const reason=taskLeftNode(task)?'任务已离开当前通知节点,请先核验原通知任务的历史证据。可手动核验当前同一任务;若仍不存在,将保持受阻,不生成 PDF、不归档、不发信,也不使用历史实例替代。':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>${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>':''):''}`;
|
||||
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)?form('retry',taskLeftNode(t)?'核验当前任务并重试':t.retryPolicy==='manual'?'核验后重试采集':'重试失败任务',taskLeftNode(t)?'<label class="form-check mb-2"><input class="form-check-input" type="checkbox" required><span class="form-check-label">确认仅核验原通知任务;不使用历史实例替代</span></label>':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){
|
||||
|
||||
Reference in new issue
Block a user