正文
'}));return drafts;} test('switching a template immediately retires its old editable form while the next detail loads',{timeout:45000},async t=>{ @@ -24,17 +24,17 @@ test('rerendering rule saves lock editable fields until the saved response has r test('invalid readback payload is rejected even when HTTP succeeds',{timeout:45000},async t=>{const {page}=await fixture(t);await page.locator('#schedule-form').waitFor();await page.route('**/api/settings',route=>route.request().method()==='POST'?route.abort('timedout'):route.fulfill({json:{schedule:'not a schedule'}}));await page.locator('#time-first').fill('10:03');await page.getByRole('button',{name:'保存发送计划',exact:true}).click();await page.waitForFunction(()=>document.querySelector('#operation-uncertain')?.textContent.includes('查询失败'));assert.doesNotMatch(await page.locator('#operation-uncertain').innerText(),/已查询最新状态/);}); test('uncertain calendar write reads its workspace calendar rather than overview',{timeout:45000},async t=>{const {page}=await fixture(t,'calendar');await page.locator('#day-note').waitFor();let reads=0;await page.route('**/api/calendar',route=>route.abort('timedout'));await page.route('**/api/workspace',route=>{reads++;return route.fulfill({json:{calendar:{version:8,overrides:[]}}});});await page.locator('#day-note').fill('隔离测试日历安排');await page.getByRole('button',{name:'应用到此日期',exact:true}).click();await page.getByRole('button',{name:'保存日历',exact:true}).click();await page.waitForFunction(()=>document.querySelector('#operation-uncertain')?.textContent.includes('配置版本 8'));assert.equal(reads,1);}); -test('rule durable save survives refresh failure, retains version and permits Save and Continue',{timeout:45000},async t=>{const {page}=await fixture(t,'order-rules');await openRuleRoute(page,'order-rules');let failRead=false;const versions=[];await page.route('**/api/order-rules?view=summary',route=>failRead?route.fulfill({status:503,json:{error:'refresh unavailable'}}):route.continue());await page.route('**/api/order-rules/rules',async route=>{versions.push(route.request().postDataJSON().version);const response=await route.fetch();failRead=true;return route.fulfill({response});});await page.getByLabel('规则名称',{exact:true}).fill('首次持久保存');await page.getByRole('button',{name:'保存草稿',exact:true}).click();await page.getByText(/已保存.*刷新失败/).waitFor();assert.equal(await page.evaluate(()=>PageLifecycle.dirty()),false);await page.getByLabel('规则名称',{exact:true}).fill('再次持久保存');await page.locator('a[href="#system-settings"]').first().click();await page.getByRole('button',{name:'保存并继续',exact:true}).click();await page.getByRole('heading',{name:'BPM 连接',exact:true}).first().waitFor();assert.deepEqual(versions,[1,2]);}); +test('rule durable save retains returned version and permits Save and Continue without a refresh',{timeout:45000},async t=>{const {page}=await fixture(t,'order-rules');await openRuleRoute(page,'order-rules');let failRead=false;const versions=[];await page.route('**/api/order-rules?view=summary',route=>failRead?route.fulfill({status:503,json:{error:'refresh unavailable'}}):route.continue());await page.route('**/api/order-rules/rules',async route=>{versions.push(route.request().postDataJSON().version);const response=await route.fetch();failRead=true;return route.fulfill({response});});await page.getByLabel('规则名称',{exact:true}).fill('首次持久保存');await page.getByRole('button',{name:'保存草稿',exact:true}).click();await page.getByText('规则草稿已保存。',{exact:true}).waitFor();assert.equal(await page.evaluate(()=>PageLifecycle.dirty()),false);await page.getByLabel('规则名称',{exact:true}).fill('再次持久保存');await page.locator('a[href="#system-settings"]').first().click();await page.getByRole('button',{name:'保存并继续',exact:true}).click();await page.getByRole('heading',{name:'BPM 连接',exact:true}).first().waitFor();assert.deepEqual(versions,[1,2]);}); test('field mapping save retains returned version after followup GET fails',{timeout:45000},async t=>{ const {page}=await fixture(t,'order-rules');let saved=false;const versions=[]; await page.route('**/api/order-rules/fields*',route=>saved?route.fulfill({status:503,json:{error:'fields unavailable'}}):route.fulfill({json:{samples:[{id:'s1',processName:'测试流程',processVersion:'1',sample:{title:'订单号:A1'},fields:[{path:'order',label:'订单号',value:'A1'},{path:'brief',label:'摘要',value:'摘要'}]}],adapters:[]}})); await page.route('**/api/order-rules/field-mappings/draft',route=>{const input=route.request().postDataJSON();versions.push(input.version);saved=true;return route.fulfill({json:{...input,id:'a1',version:versions.length,sources:{...input.sources,receivedAt:{type:'metadata',key:'receivedAt'}}}});}); await openRuleRoute(page,'rule-fields');await page.locator('#fm-manual').evaluate(e=>e.open=true);await page.locator('#fm-orderNo').selectOption('order');await page.getByRole('button',{name:'保存草稿',exact:true}).click();await page.getByText(/已保存.*刷新失败/).waitFor();assert.equal(await page.evaluate(()=>PageLifecycle.dirty()),false); - await page.getByText(/可选业务信息 ·/).evaluate(e=>e.parentElement.open=true);await page.locator('#fm-customer').selectOption('brief');await page.locator('a[href="#overview"]').first().click();await page.getByRole('button',{name:'保存并继续',exact:true}).click();await page.getByRole('heading',{name:'连续业务窗口',exact:true}).waitFor();assert.deepEqual(versions,[0,1]); + await page.getByText(/可选业务信息 ·/).evaluate(e=>e.parentElement.open=true);await page.locator('#fm-customer').selectOption('brief');await page.locator('a[href="#overview"]').first().click();await page.getByRole('button',{name:'保存并继续',exact:true}).click();await page.locator('[data-business-home]').waitFor();assert.deepEqual(versions,[0,1]); }); -test('template usage read failure never enables an alternate binding writer',{timeout:45000},async t=>{const {page}=await fixture(t);await mailFixture(page);await page.route('**/api/order-rules?view=summary',route=>route.fulfill({status:503,json:{error:'使用情况读取失败'}}));await page.getByRole('link',{name:'邮件模板',exact:true}).click();await page.locator('#content').getByText('使用情况读取失败',{exact:true}).waitFor();assert.equal(await page.getByRole('button',{name:'保存关联'}).count(),0);assert.equal(await page.getByRole('button',{name:'预览并确认',exact:true}).count(),2);await page.locator('[data-template=t1]').click();await page.getByLabel('发信标题',{exact:true}).waitFor();assert.equal(await page.getByLabel('发信标题',{exact:true}).inputValue(),'模板1');}); +test('template usage read failure never enables an alternate binding writer',{timeout:45000},async t=>{const {page}=await fixture(t);await mailFixture(page);await page.route('**/api/order-rules/catalog',route=>route.fulfill({status:503,json:{error:'使用情况读取失败'}}));await page.getByRole('link',{name:'邮件模板',exact:true}).click();await page.locator('#content').getByText('使用情况读取失败',{exact:true}).waitFor();assert.equal(await page.getByRole('button',{name:'保存关联'}).count(),0);assert.equal(await page.getByRole('button',{name:'预览并确认',exact:true}).count(),2);await page.locator('[data-template=t1]').click();await page.getByLabel('发信标题',{exact:true}).waitFor();assert.equal(await page.getByLabel('发信标题',{exact:true}).inputValue(),'模板1');}); test('unknown and conflicted task details cannot offer ordinary retry',{timeout:45000},async t=>{const {page,runtime}=await fixture(t,'order-rules');runtime.orderRules.put('execution-tasks',{id:'unknown',connectionId:'c1',status:'unknown',version:1,row:{orderNo:'UNKNOWN'}});await openRuleRoute(page,'notification-execution');await page.getByRole('button',{name:'查看详情'}).click();await page.getByRole('heading',{name:'处理进度'}).waitFor();assert.equal(await page.getByRole('button',{name:'重试失败任务',exact:true}).count(),0);}); diff --git a/tests/assistant/configuration-ui.test.cjs b/tests/assistant/configuration-ui.test.cjs index c0ce056..fa9e362 100644 --- a/tests/assistant/configuration-ui.test.cjs +++ b/tests/assistant/configuration-ui.test.cjs @@ -48,6 +48,7 @@ test( await input.fill(' '); assert.equal(await send.isDisabled(), true); await input.fill('调整发送计划'); + await page.waitForFunction(() => !document.querySelector('#assistant-send').disabled); assert.equal(await send.isEnabled(), true); assert.ok(await send.locator('svg').count()); await send.click(); diff --git a/tests/assistant/diagnostic-workspace-ui.test.cjs b/tests/assistant/diagnostic-workspace-ui.test.cjs index 71fe568..981de8f 100644 --- a/tests/assistant/diagnostic-workspace-ui.test.cjs +++ b/tests/assistant/diagnostic-workspace-ui.test.cjs @@ -48,6 +48,7 @@ async function fixture(t) { await page.getByLabel('账号', { exact: true }).fill('admin'); await page.getByLabel('密码', { exact: true }).fill('Test-password-123'); await page.getByRole('button', { name: '登录', exact: true }).click(); + await page.locator('.assistant-workspace').waitFor(); return { page, store, assistant, calls: () => calls }; } test( diff --git a/tests/assistant/main-integration.test.cjs b/tests/assistant/main-integration.test.cjs new file mode 100644 index 0000000..dc679c0 --- /dev/null +++ b/tests/assistant/main-integration.test.cjs @@ -0,0 +1,135 @@ +'use strict'; + +const { test } = require('node:test'); +const assert = require('node:assert/strict'); +const fs = require('node:fs'); +const path = require('node:path'); +const os = require('node:os'); +const crypto = require('node:crypto'); +const { managementFixture } = require('./management-fixture.cjs'); +const { readRevisions } = require('../../src/shared/refresh-revisions.cjs'); +const { NativeSchedules } = require('../../src/modules/assistant/native-schedules.cjs'); +const { OperationJournal } = require('../../src/modules/assistant/operation-journal.cjs'); + +test('main refresh revisions follow DSH providers, extra quota calls and private native tasks', async (t) => { + require('../fixtures/isolated-vault-key.cjs')(t); + const f = await managementFixture(t); + const user = f.users.users().find((u) => u.username === 'admin'); + const viewer = f.users.users().find((u) => u.username === 'viewer'); + const ownerScope = 'owner:' + user.id; + const day = f.store.usage().today; + const scopes = [ownerScope, 'config', 'usage:' + day]; + const read = () => readRevisions(f.store.db, scopes); + + let before = read(); + f.store.create(viewer.id); + assert.equal(read()[ownerScope], before[ownerScope]); + const conversation = f.store.create(user.id); + assert.ok(read()[ownerScope] > before[ownerScope]); + + before = read(); + const provider = f.store.providers.read('deepseek'); + f.store.providers.save({ ...provider, name: 'Changed provider' }); + assert.ok(read().config > before.config); + + const turn = f.store.beginTurn(conversation.id, user.id, 'Quota fixture'); + before = read(); + f.store.reserveModelCall(turn.id, 1); + assert.ok(read()['usage:' + day] > before['usage:' + day]); + f.store.updateTurn(turn.id, 'success', { reply: 'Done' }); + + const journalFile = path.join(os.tmpdir(), 'dsh-refresh-' + crypto.randomUUID() + '.sqlite'); + f.assistant.journal = new OperationJournal({ file: journalFile }); + t.after(() => { + f.assistant.journal.close(); + fs.rmSync(journalFile, { force: true }); + }); + await NativeSchedules.create({ assistant: f.assistant }); + before = read(); + const task = await f.assistant.schedules.createTask( + conversation.id, + { user, sessionId: 'integration-session' }, + { confirm: true, request: { title: 'Native task', prompt: 'Read only', after_seconds: 3600 } }, + ); + assert.ok(read()[ownerScope] > before[ownerScope]); + assert.equal( + (await f.assistant.schedules.catalog({ user: viewer, sessionId: 'viewer' })).tasks.length, + 0, + ); + await f.assistant.schedules.deleteTask( + conversation.id, + task.id, + { user, sessionId: 'integration-session' }, + { confirm: true }, + ); +}); + +test('main lazy assistant bundle includes schedules, attachments and approval dependencies', () => { + const manifest = JSON.parse( + fs.readFileSync( + path.resolve(__dirname, '../../web/modules/navigation/module-manifest.json'), + 'utf8', + ), + ); + assert.deepEqual(manifest.assistant, ['$assistant']); + assert.deepEqual(manifest['assistant-settings'], ['$assistant']); + const files = manifest.$assistant; + for (const dependency of [ + 'assistant-schedules.js', + 'assistant-schedule-manager.js', + 'assistant-attachments.js', + 'assistant-settings-review.js', + ]) { + assert.ok(files.includes(dependency), dependency); + assert.ok(files.indexOf(dependency) < files.indexOf('assistant.js')); + } + assert.ok(files.indexOf('assistant-schedules.js') < files.indexOf('assistant-context-panel.js')); +}); + +test('main manual refresh updates DSH permissions, quota and model catalogue without losing drafts', async (t) => { + require('../fixtures/isolated-vault-key.cjs')(t); + const f = await managementFixture(t, { browser: true }); + f.store.saveSettings({ + ...f.store.settings(), + runtimePath: process.execPath, + apiKey: 'TEST_REFRESH_KEY', + allowActions: false, + }); + const user = f.users.users().find((u) => u.username === 'admin'); + const c = f.store.create(user.id); + const turn = f.store.beginTurn(c.id, user.id, 'Refresh fixture'); + f.store.updateTurn(turn.id, 'success', { + reply: 'Existing answer', + actions: [ + { + id: 'refresh-action', + kind: 'check_storage', + targetId: 'server', + label: '检查存储连接', + status: 'proposed', + }, + ], + }); + await f.open(); + await f.page.getByRole('button', { name: '查看操作(1)', exact: true }).click(); + const action = f.page.getByRole('button', { name: '执行:检查存储连接', exact: true }); + assert.equal(await action.isDisabled(), true); + await f.page.getByLabel('发送给 DSH', { exact: true }).fill('Keep my draft'); + f.store.saveSettings({ version: f.store.settings().version, allowActions: true, dailyLimit: 50 }); + f.store.providers.save({ + ...f.store.providers.read('deepseek'), + models: [ + { id: 'deepseek-flash', name: 'Original model' }, + { id: 'new-model', name: 'Fresh model' }, + ], + }); + await f.page.evaluate(() => PageLifecycle.refreshRegions('assistant')); + assert.equal(await action.isEnabled(), true); + assert.match(await f.page.locator('.aw-usage').innerText(), /50/); + assert.equal( + await f.page.getByLabel('发送给 DSH', { exact: true }).inputValue(), + 'Keep my draft', + ); + await f.page.locator('#assistant-model-picker').click(); + await f.page.getByRole('option', { name: 'Fresh model', exact: true }).waitFor(); +}); diff --git a/tests/assistant/management-fixture.cjs b/tests/assistant/management-fixture.cjs index cfb1f7c..559fc30 100644 --- a/tests/assistant/management-fixture.cjs +++ b/tests/assistant/management-fixture.cjs @@ -68,6 +68,7 @@ async function managementFixture(t, { browser = false } = {}) { await page.getByLabel('密码', { exact: true }).fill('Test-password-123'); await page.getByRole('button', { name: '登录', exact: true }).click(); } + if (route === '#assistant') await page.locator('.assistant-workspace').waitFor(); } return { base, diff --git a/tests/assistant/repair-runner.test.cjs b/tests/assistant/repair-runner.test.cjs index 2c0459b..80de757 100644 --- a/tests/assistant/repair-runner.test.cjs +++ b/tests/assistant/repair-runner.test.cjs @@ -31,7 +31,7 @@ function fixture(t, code = 'process.exit(0)') { repoRoot: repo, repairRoot: repairs, journal, - validator: { command: process.execPath, args: ['-e', code], timeoutMs: 1000 }, + validator: { command: process.execPath, args: ['-e', code], timeoutMs: 5000 }, }); t.after(() => { journal.close(); diff --git a/tests/bpm/bpm-ui.test.cjs b/tests/bpm/bpm-ui.test.cjs index 60e78ee..d4addf8 100644 --- a/tests/bpm/bpm-ui.test.cjs +++ b/tests/bpm/bpm-ui.test.cjs @@ -48,10 +48,11 @@ async function fixture(t,{user={username:'alice',role:'operator'},connections,ac }); await page.goto(base); await page.addStyleTag({path:path.join(__dirname,'../../web/app.css')}); + await page.addScriptTag({path:path.join(__dirname,'../../web/modules/navigation/lifecycle.js')}); if(fs.existsSync(source))await page.addScriptTag({path:source}); assert.equal(await page.evaluate(()=>typeof window.BpmLogin?.mount),'function','BPM page exposes a working mount function'); await page.evaluate(async user=>{ - const api=async(route,body)=>{const r=await fetch('/api'+route,{method:body===undefined?'GET':'POST',headers:{'Content-Type':'application/json'},body:body===undefined?undefined:JSON.stringify(body)});return r.json();}; + const api=async(route,body,{signal}={})=>{const r=await fetch('/api'+route,{signal,method:body===undefined?'GET':'POST',headers:{'Content-Type':'application/json'},body:body===undefined?undefined:JSON.stringify(body)});return r.json();}; await window.BpmLogin.mount(document.querySelector('#root'),{api,esc:v=>String(v??'').replaceAll('<','<'),formatDate:v=>v||'—',notify:()=>{},user,isActive:()=>true}); },user); return {page,calls,releaseOpen,releaseInput,releaseFrame,releaseSave,releaseAccount,releaseFill,releaseAccountSave,maxFrames:()=>maxFrames}; @@ -264,12 +265,12 @@ test('narrow screens keep the frame inside the page and native typing forwards t test('refresh and logout release BPM control before rendering or dropping authentication',async()=>{ const vm=require('node:vm'),events=[],elements=new Map(); const element=id=>{if(!elements.has(id))elements.set(id,{innerHTML:'',textContent:'',classList:{remove(){}},querySelector(){return {disabled:false};}});return elements.get(id);}; - const context=vm.createContext({Intl,setTimeout,clearInterval,location:{hash:'#overview'},history:{replaceState(){}},document:{querySelector:element,querySelectorAll:()=>[],addEventListener(){}},window:{addEventListener(){},PageLifecycle:{guard:fn=>fn(),dispose:async()=>{},attach(){},bind(){}},AppNavigation:{primary:[],resolve:id=>id,sectionFor:()=>null,renderTabs(){},isConfiguration:()=>false},BpmLogin:{dispose:async()=>events.push('release')},OrderNotificationViews:{render:async()=>events.push('render')}}}); + const context=vm.createContext({Intl,setTimeout,clearInterval,location:{hash:'#overview'},history:{replaceState(){}},document:{querySelector:element,querySelectorAll:()=>[],addEventListener(){}},window:{addEventListener(){},PageLifecycle:{guard:fn=>fn(),dispose:async()=>{},attach(){},bind(){}},AppModules:{load:async()=>{currentUser={username:'alice',role:'admin'};events.push('load')}},AppNavigation:{primary:[],resolve:id=>id,sectionFor:()=>null,renderTabs(){},isConfiguration:()=>false},BpmLogin:{dispose:async()=>events.push('release')},OrderNotificationViews:{render:async()=>events.push('render')}}}); const source=fs.readFileSync(path.join(__dirname,'../../web/app.js'),'utf8').replace(/boot\(\)\.catch[\s\S]*$/,''); vm.runInContext(fs.readFileSync(path.join(__dirname,'../../web/modules/records/state.js'),'utf8'),context); vm.runInContext(source,context); await vm.runInContext("currentUser={username:'alice',role:'admin'};renderView()",context); - assert.deepEqual(events,['release','render']);events.length=0; + assert.deepEqual(events.slice(0,2),['release','load']);events.length=0; vm.runInContext("shell();api=async route=>events.push(route);boot=async()=>{}",Object.assign(context,{events})); await element('#logout').onclick();assert.deepEqual(events,['release','/logout']); }); @@ -286,8 +287,9 @@ for(const pendingAction of ['open','save'])test(`document unload sends authentic const appSource=fs.readFileSync(path.join(__dirname,'../../web/app.js'),'utf8').replace(/boot\(\)\.catch[\s\S]*$/,''); const fixtureServer=http.createServer(async(req,res)=>{ const requestPath=new URL(req.url,'http://localhost').pathname; + if(requestPath==='/lifecycle.js'){res.setHeader('Content-Type','application/javascript; charset=utf-8');return res.end(fs.readFileSync(path.join(__dirname,'../../web/modules/navigation/lifecycle.js')));} if(requestPath==='/bpm.js'||requestPath==='/app.js'){res.setHeader('Content-Type','application/javascript; charset=utf-8');return res.end(requestPath==='/bpm.js'?fs.readFileSync(source):appSource);} - if(!requestPath.startsWith('/api/')){res.setHeader('Content-Type','text/html; charset=utf-8');return res.end('');} + if(!requestPath.startsWith('/api/')){res.setHeader('Content-Type','text/html; charset=utf-8');return res.end('');} let body='';for await(const chunk of req)body+=chunk; calls.push({path:requestPath,body,cookie:req.headers.cookie,origin:req.headers.origin}); res.setHeader('Content-Type','application/json'); @@ -364,3 +366,5 @@ test('UI renders backend conclusions without reinterpreting raw connection flags assert.equal(await f.page.locator('[data-sync-status] .bpm-status-yellow').count(),1); await f.page.getByText('后端已核实会话',{exact:true}).waitFor(); }); + +test('remote login frames pause hidden and resume a single frame without replacing the session',async t=>{const f=await fixture(t);await f.page.getByRole('button',{name:'远程登录',exact:true}).click();await f.page.locator('[data-bpm-frame]').waitFor();await f.page.clock.install();const frames=()=>f.calls.filter(c=>c.path.endsWith('/frame')).length,before=frames();await f.page.evaluate(()=>{Object.defineProperty(document,'hidden',{value:true,configurable:true});document.dispatchEvent(new Event('visibilitychange'));});await f.page.clock.fastForward(10001);await delay(100);assert.equal(frames(),before);const response=f.page.waitForResponse(r=>r.url().endsWith('/login/frame'));await f.page.evaluate(()=>{Object.defineProperty(document,'hidden',{value:false,configurable:true});document.dispatchEvent(new Event('visibilitychange'));});await response;assert.equal(frames(),before+1);assert.equal(f.calls.filter(c=>c.path.endsWith('/open')).length,1);assert.equal(f.calls.filter(c=>c.path.endsWith('/close')).length,0);}); diff --git a/tests/bpm/windows-directory.test.cjs b/tests/bpm/windows-directory.test.cjs new file mode 100644 index 0000000..88e9db2 --- /dev/null +++ b/tests/bpm/windows-directory.test.cjs @@ -0,0 +1,49 @@ +'use strict'; +const test=require('node:test'),assert=require('node:assert/strict'),cp=require('node:child_process'); +const fs=require('node:fs'),os=require('node:os'),path=require('node:path'); + +test('native ACL policy accepts only the current owner and one protected inheritable full-control allow rule',{skip:process.platform!=='win32'},()=>{ + const {privateDirectoryAcl}=require('../../src/platform/security/windows-directory.cjs'); + const cases=` + $sid=[System.Security.Principal.WindowsIdentity]::GetCurrent().User + function Make-Acl($protected,$owner,$rights,$inherit,$propagation,$type,$identity) { + $acl=New-Object System.Security.AccessControl.DirectorySecurity + $acl.SetOwner($owner);$acl.SetAccessRuleProtection($protected,$false) + $rule=New-Object System.Security.AccessControl.FileSystemAccessRule($identity,$rights,$inherit,$propagation,$type) + $acl.AddAccessRule($rule);return $acl + } + $other=New-Object System.Security.Principal.SecurityIdentifier('S-1-1-0') + $rows=@( + (Test-PrivateDirectoryAcl (Make-Acl $true $sid 'FullControl' 'ContainerInherit,ObjectInherit' 'None' 'Allow' $sid) $sid), + (Test-PrivateDirectoryAcl (Make-Acl $false $sid 'FullControl' 'ContainerInherit,ObjectInherit' 'None' 'Allow' $sid) $sid), + (Test-PrivateDirectoryAcl (Make-Acl $true $other 'FullControl' 'ContainerInherit,ObjectInherit' 'None' 'Allow' $sid) $sid), + (Test-PrivateDirectoryAcl (Make-Acl $true $sid 'Read' 'ContainerInherit,ObjectInherit' 'None' 'Allow' $sid) $sid), + (Test-PrivateDirectoryAcl (Make-Acl $true $sid 'FullControl' 'None' 'None' 'Allow' $sid) $sid), + (Test-PrivateDirectoryAcl (Make-Acl $true $sid 'FullControl' 'ContainerInherit,ObjectInherit' 'InheritOnly' 'Allow' $sid) $sid), + (Test-PrivateDirectoryAcl (Make-Acl $true $sid 'FullControl' 'ContainerInherit,ObjectInherit' 'None' 'Deny' $sid) $sid), + (Test-PrivateDirectoryAcl (Make-Acl $true $sid 'FullControl' 'ContainerInherit,ObjectInherit' 'None' 'Allow' $other) $sid) + ) + $extra=Make-Acl $true $sid 'FullControl' 'ContainerInherit,ObjectInherit' 'None' 'Allow' $sid + $extra.AddAccessRule((New-Object System.Security.AccessControl.FileSystemAccessRule($other,'Read','ContainerInherit,ObjectInherit','None','Allow'))) + $rows+=(Test-PrivateDirectoryAcl $extra $sid) + $hidden=New-Object System.Security.AccessControl.DirectorySecurity + $hidden.SetSecurityDescriptorSddlForm('O:'+$sid.Value+'D:P(A;OICI;FA;;;'+$sid.Value+')(OA;OICI;FA;00000000-0000-0000-0000-000000000001;;WD)') + $rows+=(Test-PrivateDirectoryAcl $hidden $sid) + ConvertTo-Json -Compress -InputObject $rows + `; + const output=cp.execFileSync('powershell.exe',['-NoLogo','-NoProfile','-NonInteractive','-Command','$ErrorActionPreference="Stop";'+privateDirectoryAcl+cases],{encoding:'utf8',windowsHide:true,timeout:15000}); + assert.deepEqual(JSON.parse(output),[true,false,false,false,false,false,false,false,false,false]); +}); + +test('a compliant real directory is not rewritten and an unprotected directory is repaired',{skip:process.platform!=='win32'},t=>{ + const {privateDirectoryAcl,secureDirectoryScript}=require('../../src/platform/security/windows-directory.cjs'),parent=path.resolve(os.tmpdir()),dir=fs.mkdtempSync(path.join(parent,'acl-policy-')); + assert.equal(path.dirname(dir),parent);t.after(()=>fs.rmSync(dir,{recursive:true,force:true})); + const run=script=>cp.execFileSync('powershell.exe',['-NoLogo','-NoProfile','-NonInteractive','-Command','$ErrorActionPreference="Stop";'+script],{input:dir,encoding:'utf8',windowsHide:true,timeout:15000}).trim(); + run(secureDirectoryScript);const protectedAt=fs.statSync(dir,{bigint:true}).ctimeNs;run(secureDirectoryScript);assert.equal(fs.statSync(dir,{bigint:true}).ctimeNs,protectedAt,'read verification must not rewrite the DACL'); + run('$p=[Console]::In.ReadToEnd();$acl=[IO.Directory]::GetAccessControl($p);$acl.SetAccessRuleProtection($false,$true);[IO.Directory]::SetAccessControl($p,$acl)'); + run(secureDirectoryScript); + const verified=run(privateDirectoryAcl+';$p=[Console]::In.ReadToEnd();Test-PrivateDirectoryAcl ([IO.Directory]::GetAccessControl($p)) ([System.Security.Principal.WindowsIdentity]::GetCurrent().User)');assert.equal(verified,'True'); + run('$p=[Console]::In.ReadToEnd();$sid=[System.Security.Principal.WindowsIdentity]::GetCurrent().User;$acl=New-Object System.Security.AccessControl.DirectorySecurity;$acl.SetSecurityDescriptorSddlForm("O:"+$sid.Value+"D:P(A;OICI;FA;;;"+$sid.Value+")(OA;OICI;FA;00000000-0000-0000-0000-000000000001;;WD)",[System.Security.AccessControl.AccessControlSections]"Access,Owner");[IO.Directory]::SetAccessControl($p,$acl)'); + assert.equal(run(privateDirectoryAcl+';$p=[Console]::In.ReadToEnd();Test-PrivateDirectoryAcl ([IO.Directory]::GetAccessControl($p)) ([System.Security.Principal.WindowsIdentity]::GetCurrent().User)'),'False'); + run(secureDirectoryScript);assert.equal(run(privateDirectoryAcl+';$p=[Console]::In.ReadToEnd();Test-PrivateDirectoryAcl ([IO.Directory]::GetAccessControl($p)) ([System.Security.Principal.WindowsIdentity]::GetCurrent().User)'),'True'); +}); diff --git a/tests/fixtures/dashboard-runtime.cjs b/tests/fixtures/dashboard-runtime.cjs index a16e657..f7abaf3 100644 --- a/tests/fixtures/dashboard-runtime.cjs +++ b/tests/fixtures/dashboard-runtime.cjs @@ -18,5 +18,5 @@ async function startTestDashboard({stateDir,mailHistory=false,executionFactory}) await new Promise((resolve,reject)=>{server.once('error',reject);server.listen(0,'127.0.0.1',resolve);}); return {server,store,workspace,orderRules,mail,orderExecution,async close(){await orderExecution?.stop();await mail?.stop();server.closeAllConnections();await new Promise(r=>server.close(r));workspace.close();orderRules.close();mailStore?.close();}}; } -async function login(page){await page.getByLabel('账号',{exact:true}).fill('admin');await page.getByLabel('密码',{exact:true}).fill('Test-password-123');await page.getByRole('button',{name:'登录',exact:true}).click();} +async function login(page){await page.getByLabel('账号',{exact:true}).fill('admin');await page.getByLabel('密码',{exact:true}).fill('Test-password-123');await Promise.all([page.waitForResponse(response=>response.url().endsWith('/api/login')&&response.request().method()==='POST'),page.getByRole('button',{name:'登录',exact:true}).click()]);await page.locator('#logout').waitFor();} module.exports={startTestDashboard,login}; diff --git a/tests/fixtures/query-performance.cjs b/tests/fixtures/query-performance.cjs new file mode 100644 index 0000000..75a66fa --- /dev/null +++ b/tests/fixtures/query-performance.cjs @@ -0,0 +1,24 @@ +'use strict'; +const crypto=require('node:crypto'); +const {DatabaseSync}=require('node:sqlite'); +const {RuleStore}=require('../../src/modules/order-rules/store.cjs'); +const {BpmVault}=require('../../src/platform/security/vault.cjs'); +function fixture(n,{status='pending',huizhou=false}={}){ + const db=new DatabaseSync(':memory:');db.exec('CREATE TABLE records(kind TEXT,id TEXT,payload BLOB,PRIMARY KEY(kind,id))'); + const vault=Object.assign(Object.create(BpmVault.prototype),{key:crypto.randomBytes(32)}),counts={all:{},get:{},decode:0};let now=new Date('2026-10-26T01:00:00Z'); + const store=Object.assign(Object.create(RuleStore.prototype),{db,vault,clock:()=>new Date(now),schedule:()=>({times:['11:00','17:00'],weekends:false}),calendar:()=>[],capabilities:{}}); + store.put('settings',{id:'main',version:1,enabled:false,processingEnabled:false,channelId:'',maxMessageBytes:20971520}); + for(const draft of require('../../src/modules/order-rules/catalog.cjs').seedRules())store.put('rules',{id:draft.id,draft,published:null}); + const rule={id:'bs-change',categoryId:'bs-change',name:'Synthetic',version:1,processNames:['Synthetic'],nodeNames:['Node'],scopes:[{processName:'Synthetic',nodeName:'Node'}],huizhouEnabled:huizhou,to:['fixture@example.invalid']}; + for(let i=0;i当前版本 v${esc(updateState.currentVersion)}
${esc(message)}
${!loading&&release?`发布时间(北京时间):${esc(formatDate(release.publishedAt))}
`:''}${esc(release.notes||'此版本未填写更新说明。')}${release.url?`前往发行页面`:''}由部署管理员根据发行说明安排更新。
`:''}`; + if(!dialog.open)dialog.showModal(); +} +async function checkSystemUpdate(isActive=()=>!!currentUser,{manual=false}={}){ + const user=currentUser,request=++updateRevision,button=document.querySelector('#check-updates'),ownsResponse=()=>currentUser===user&&!!user&&button?.isConnected&&isActive();if(button)button.disabled=true; + const status=document.querySelector('#update-status');if(status&&manual)status.textContent='正在检查更新…'; + if(manual)showUpdateDetails(true); + try{const result=await api('/update',undefined,{ownerCheck:ownsResponse});if(!ownsResponse()||request!==updateRevision)return;renderUpdateStatus(result);if(manual&&document.querySelector('#system-update-dialog')?.open)showUpdateDetails();} + catch(error){if(ownsResponse()&&request===updateRevision){updateState={...updateState,status:'unavailable',latest:null};renderUpdateStatus(updateState);if(manual&&document.querySelector('#system-update-dialog')?.open)showUpdateDetails();}} + finally{if(button&&request===updateRevision)button.disabled=false;} +} function shell() { - root.innerHTML=``; - document.querySelector('#logout').onclick=()=>window.PageLifecycle.guard(async()=>{++viewGeneration;await window.BpmLogin?.dispose();await api('/logout',{});window.RecordState.clear();currentUser=null;clearInterval(refreshTimer);await window.PageLifecycle.dispose();await boot();}); - document.querySelector('#refresh').onclick=()=>window.PageLifecycle.guard(()=>{const generation=viewGeneration;void updateAutomationStatus(()=>generation===viewGeneration&&!!currentUser);return window.RecordTable?.active?window.RecordTable.active.refresh():renderView();}).catch(error=>notify(error.message,'danger')); + root.innerHTML=``; + renderUpdateStatus(updateState); + document.querySelector('#logout').onclick=()=>window.PageLifecycle.guard(async()=>{++viewGeneration;await window.BpmLogin?.dispose();await api('/logout',{});window.RecordState.clear();currentUser=null;refreshTimer?.dispose();await window.PageLifecycle.dispose();await boot();}); + document.querySelector('#check-updates').onclick=()=>checkSystemUpdate(()=>!!currentUser,{manual:true}); + document.querySelector('#refresh').onclick=()=>window.PageLifecycle.guard(async()=>{void refreshTimer?.refresh().catch(()=>{});const region=({overview:'home','order-notifications':'home',health:'health',bpm:'bpm',assistant:'assistant',records:'records','records-pdf':'records','notification-orders':'records','notification-batches':'records','notification-execution':'records','notification-history':'records'})[currentView];if(region&&await window.PageLifecycle.refreshRegions(region))return;return window.RecordTable?.active?window.RecordTable.active.refresh():renderView();}).catch(error=>notify(error.message,'danger')); document.querySelectorAll('[data-view]').forEach(link=>link.onclick=()=>{const menu=document.querySelector('#sidebar-menu');menu.classList.remove('show');if(menu.classList.contains('collapsing'))menu.addEventListener('shown.bs.collapse',()=>menu.classList.remove('show'),{once:true});document.querySelector('.navbar-toggler').setAttribute('aria-expanded','false');}); } function empty(title,text){return `${text}
| 时间(北京时间) | 操作人 | 操作 | 详情 |
|---|---|---|---|
| ${formatDate(item.at)} | ${esc(item.actor)} | ${esc(window.WorkspaceViews.activityText(item.action))} | ${esc(item.detail)} |
| 流水号/流程 | 节点/类型 | 标题摘要 | 来源 | 到达时间 | 详情 |
|---|---|---|---|---|---|
| '+esc(row.serialNum||'—')+' '+esc(row.processName)+' '+esc(row.origin.name)+(row.origin.status==='archived'?' · 历史归档':row.origin.enabled?'':' · 已停用')+' '+esc(formatDate(row.arrivedAt))+' '+esc(row.subject||'—')+' | '+esc(row.activityName==='sysInform'?'知会':row.activityName||'—')+' '+(row.kind==='todo'?'待办到达':'待阅到达')+' | '+esc(row.subject||'—')+' | '+esc(row.origin.name)+' '+(row.origin.status==='archived'?'历史归档':row.origin.enabled?'现有连接':'已停用')+' | '+esc(formatDate(row.arrivedAt))+' |
暂无匹配的到达记录
可调整日期、业务范围或查看历史归档。
默认永久保留;会话归档及异常退役保留原证据。
状态数据 '+(d.state.bytes/1048576).toFixed(2)+' MiB · PDF '+d.pdf.files+' 份 / '+(d.pdf.bytes/1048576).toFixed(2)+' MiB · 导出台账 '+d.jobs.total+' 条
导出 PDF 历史备份与恢复按停服操作指南执行;只恢复到新空目录。
';}catch(e){if(live())container.querySelector('#capacity-content').textContent=e.message;}finally{if(live())b.disabled=false;}};container.querySelector('#capacity-refresh').onclick=load;void load();} - button.onclick=refresh;await refresh(); + const failed=error=>{if(!live())return;const access=container.querySelector('#health-access');if(access){access.className='badge bg-red-lt ms-auto';access.textContent='连接中断';}notice.className='card-footer small text-danger';notice.textContent='状态读取失败:'+error.message+';保留上次状态,请刷新重试。';}; + let initial,initialError;try{initial=await window.PageLifecycle.validateRegion('health');}catch(error){initialError=error;} + await refresh(new AbortController().signal).catch(failed); + const polling=window.PageLifecycle.regionPoll('health',{refresh,onError:failed},10000,{isActive:live,initial});button.onclick=()=>polling.refresh().catch(()=>{});if(initialError)failed(initialError);await polling.run().catch(()=>{}); } window.HealthViews={configure:options=>({api,esc,formatDate,user}=options),render}; })(); diff --git a/web/modules/navigation/lifecycle.js b/web/modules/navigation/lifecycle.js index 49b4bdd..eb19bbc 100644 --- a/web/modules/navigation/lifecycle.js +++ b/web/modules/navigation/lifecycle.js @@ -33,6 +33,53 @@ window.PageLifecycle=(()=>{ window.addEventListener('beforeunload',event=>{if(dirty()){event.preventDefault();event.returnValue='';}}); // Existing editor cancellation and selection changes pass through the same guard. document.addEventListener('click',event=>{const button=event.target.closest('button');if(!button||button.id==='storage-operation-cancel'||button.dataset.lifecycleApproved||!host?.contains(button))return;if(!/cancel|close|reset$/.test(button.id)&&!button.matches('[data-account-cancel],[data-account-manage],[data-edit],[data-storage-edit],[data-exception],#exception-new,#mail-add'))return;if(!dirty())return;event.preventDefault();event.stopImmediatePropagation();guard(()=>{button.dataset.lifecycleApproved='1';button.click();delete button.dataset.lifecycleApproved;});},true); + // Visibility changes check freshness without rebuilding editors or starting overlapping reads. + function poll(work,interval,{isActive=()=>true,owned=true}={}){ + let disposed=false,timer,running=null,controller,resume=false; + const live=()=>!disposed&&isActive(); + function schedule(delay=interval){clearTimeout(timer);if(live()&&!document.hidden&&!running)timer=setTimeout(()=>void run().catch(()=>{}),delay);} + async function run(){ + clearTimeout(timer);if(!live()||document.hidden)return;if(running)return running; + controller=new AbortController();running=Promise.resolve().then(()=>work(controller.signal)); + try{return await running;}finally{running=null;if(resume){resume=false;schedule(0);}else schedule();} + } + function visibility(){clearTimeout(timer);if(document.hidden)controller?.abort();else if(live()){if(running)resume=true;else void run().catch(()=>{});}} + async function cancel(){controller?.abort();if(running)try{await running;}catch{}} + const handle={run,schedule,cancel,async refresh(){await cancel();return run();},dispose(){if(disposed)return;disposed=true;clearTimeout(timer);controller?.abort();document.removeEventListener('visibilitychange',visibility);}}; + document.addEventListener('visibilitychange',visibility);if(owned)onDispose(()=>handle.dispose());schedule();return handle; + } + // Revisions identify server state, never response bodies. Each mounted consumer owns + // its applied token so one view cannot acknowledge another view's unfinished read. + let regionSettings={read:null,user:()=>null},regionConfiguration=0; + const regionEpochs=new Map(),regionHandles=new Set(); + function configureRegions(options){regionSettings=options;regionConfiguration++;regionEpochs.clear();} + function invalidateRegion(...regions){for(const region of regions.flat())regionEpochs.set(region,(regionEpochs.get(region)||0)+1);} + async function validateRegion(region,{signal,validate=regionSettings.read}={}){ + if(typeof validate!=='function')throw Error('刷新状态读取未配置,请刷新页面重试。'); + const user=regionSettings.user?.(),configuration=regionConfiguration,epoch=regionEpochs.get(region)||0; + const response=await validate(signal,region),token=response?.regions?.[region]; + if(signal?.aborted)throw signal.reason||new DOMException('Aborted','AbortError'); + if(typeof token!=='string'||!/^[0-9a-f]{64}$/i.test(token))throw Error('刷新状态响应缺少有效区域版本,请重试。'); + return {token,error:typeof response?.errors?.[region]==='string'?response.errors[region]:'',user,configuration,epoch}; + } + function regionPoll(region,{refresh,validate,onError=()=>{}},interval,options={}){ + let applied=options.initial,appliedAt=Date.now(); + const current=state=>state&&state.configuration===regionConfiguration&&state.user===regionSettings.user?.()&&state.epoch===(regionEpochs.get(region)||0); + const handle=poll(async signal=>{ + try{ + if(options.enabled&&!options.enabled())return; + const next=await validateRegion(region,{signal,validate}); + if(!current(next))return; + if(current(applied)&&applied.token===next.token&&(!options.forceAfter||Date.now()-appliedAt到达截止 '+time(w?.collectionEnd||w?.end)+' 北京时间
到达收集时段,按北京时间计算
本轮暂无待汇总订单
符合规则的订单处理完成后会出现在这里。依据最近一次实际检查
受阻原因与需要人工核验的结果
'+esc(describe(rule))+'
检查不会归档、发信或办理 BPM。发送时段在通知配置维护。
')+ + card('04','验证与发布','用一份真实通知检查分类、邮件与归档计划。',recognition+''+esc(describe(rule))+'
检查不会归档、发信或办理 BPM。发送时段在通知配置维护。
')+ (admin?'':'')+''; } function read(form,rule,adapters=[]){const result={...rule};for(const name of ['name','archiveDirectory','subjectPrefix','intro','filenameDate'])result[name]=form.elements.namedItem(name).value.trim();result.scopes=window.OrderRuleScopes.read(form);result.processNames=[...new Set(result.scopes.map(r=>r.processName).filter(Boolean))];result.nodeNames=[...new Set(result.scopes.map(r=>r.nodeName).filter(Boolean))];result.adapterIds=adaptersFor(result,adapters);const productLine=form.elements.namedItem('productLine')?.value.trim();if(productLine||Object.hasOwn(rule,'productLine'))result.productLine=productLine;const template=form.elements.namedItem('bodyTemplateId').value;if(template==='__legacy__')delete result.bodyTemplateId;else result.bodyTemplateId=template;result.huizhouEnabled=form.elements.namedItem('huizhouEnabled').checked;result.huizhouTemplateId=form.elements.namedItem('huizhouTemplateId').value;for(const name of ['to','cc'])result[name]=list(form.elements.namedItem(name).value);result.attachPdf=false;return result;} diff --git a/web/modules/order-rules/preview.js b/web/modules/order-rules/preview.js index ed89a4f..9a0bf91 100644 --- a/web/modules/order-rules/preview.js +++ b/web/modules/order-rules/preview.js @@ -3,8 +3,8 @@ const labels={orderNo:'订单号',appDate:'申请日期',customer:'客户',productLine:'产品线',quantity:'数量',changeReason:'更改原因',changeContent:'更改内容',totalAmount:'总金额',brief:'订单摘要'}; const value=v=>v===undefined||v===null?'未取得':typeof v==='object'?JSON.stringify(v):String(v); const plain=text=>String(text).replace(/connectionId/g,'BPM连接').replace(/instanceId/g,'流程编号').replace(/taskId/g,'待办编号').replace(/revision/g,'订单版本').replace(/processVersion/g,'表单版本').replace(/processName/g,'流程名称').replace(/nodeName/g,'节点名称').replace(/receivedAt/g,'接收时间').replace(/serialNum/g,'流水编号').replace(/orderNo/g,'订单号').replace(/quantity/g,'数量').replace(/source 必须为 todo(待办)/g,'订单必须来自 BPM 待办').replace(/字段适配器?/g,'订单识别配置').replace(/brief/g,'订单摘要'); - function panel(sources,{esc,operator}){ - return `先在订单执行中采集 BPM 待办,再回到这里刷新。Excel 导入的是分类规则,不代替真实订单检查。
${lazy&&!loaded?'点击“读取已采集订单”选择本类别的真实通知,再检查识别结果。':'先在订单执行中采集 BPM 待办,再回到这里刷新。Excel 导入的是分类规则,不代替真实订单检查。'}
仅当前已发布版本。冻结、发送及结果不确定订单不改写;输出变化会要求新代归档。
配置已变化,请重新检查。
'; - const publish=panel.querySelector('#order-rule-publish');if(publish)publish.disabled=dirty||saving;coverage();refreshSources(); + const publish=panel.querySelector('#order-rule-publish');if(publish)publish.disabled=dirty||saving;coverage(value);refreshSources(value); } const catalog=data.scopeCatalog; if(data.scopeError)panel.querySelector('#rule-scopes').insertAdjacentHTML('afterbegin','草稿已保存,请重新检查当前版本。
';await window.PageLifecycle.afterSave(reload,'规则草稿已保存。',feedback,isActive);return true;}catch(error){if(owned())feedback(error.message,'danger');return false;}}); + return mutate(async()=>{try{const result=await api('/order-rules/rules',value);if(!owned())return true;applyReceipt(result,{normalize:true});baseline=JSON.stringify(read());dirty=false;++trialRevision;panel.querySelector('#order-rule-dirty').textContent='';panel.querySelector('#order-rule-explanation-title').textContent='查看已保存规则的处理说明';panel.querySelector('#order-rule-explanation').textContent=window.OrderRuleEditor.describe(read());panel.querySelector('#order-rule-preview-result').innerHTML='草稿已保存,请重新检查当前版本。
';feedback('规则草稿已保存。');return true;}catch(error){if(owned())feedback(error.message,'danger');return false;}}); } unregister=window.PageLifecycle.register({dirty:()=>owned()&&dirty,save:admin?save:null}); if(admin){ - form.onkeydown=event=>{if(event.key==='Enter'&&!event.isComposing&&event.target.tagName==='INPUT'&&event.target.closest('#rule-scopes'))event.preventDefault();};form.oninput=form.onchange=event=>{if(!event.target.matches('.ts-control input')&&!['order-rule-sample-source','rule-storage-server','rule-storage-folder'].includes(event.target.id))changed();};form.onsubmit=event=>{event.preventDefault();return save();}; - panel.querySelector('#order-rule-publish').onclick=event=>action(event.currentTarget,async()=>{if(dirty||saving)throw Error('请先保存当前修改,再应用或发布。');return mutate(async()=>{if(restrictedActive)await api('/order-rules/restricted-test/apply',{version:data.restrictedTest.version,rules:[{id:rule.id,version:rule.version}]});else await api('/order-rules/rules/'+encodeURIComponent(rule.id)+'/publish',{version:rule.version});if(!owned())return;await window.PageLifecycle.afterSave(reload,restrictedActive?'规则已应用到测试,新任务使用当前规则;旧订单和批次保持不变。':'规则版本已发布。自动执行仍由全局设置与接入状态控制。',feedback,isActive);});}); + form.onkeydown=event=>{if(event.key==='Enter'&&!event.isComposing&&event.target.tagName==='INPUT'&&event.target.closest('#rule-scopes'))event.preventDefault();};form.oninput=form.onchange=event=>{if(!event.target.matches('.ts-control input,[data-scope-process],[data-scope-node]')&&!['order-rule-sample-source','rule-storage-server','rule-storage-folder'].includes(event.target.id))changed();};form.onsubmit=event=>{event.preventDefault();return save();}; + panel.querySelector('#order-rule-publish').onclick=event=>action(event.currentTarget,async()=>{if(dirty||saving)throw Error('请先保存当前修改,再应用或发布。');return mutate(async()=>{const testing=data.restrictedTest?.enabled===true,result=await api(testing?'/order-rules/restricted-test/apply':'/order-rules/rules/'+encodeURIComponent(rule.id)+'/publish',testing?{version:data.restrictedTest.version,rules:[{id:rule.id,version:rule.version}]}:{version:rule.version});if(!owned())return;if(testing){if(!Array.isArray(result.rules))throw Error('应用已返回,请刷新核对测试状态。');data.restrictedTest=result.restrictedTest??Object.fromEntries(Object.entries(result).filter(([key])=>key!=='rules'));for(const row of result.rules)applyReceipt(row);updateVersion();}else applyReceipt(result);baseline=JSON.stringify(read());feedback(testing?'规则已应用到测试,新任务使用当前规则;旧订单和批次保持不变。':'规则版本已发布。自动执行仍由全局设置与接入状态控制。');});}); } if(operator)panel.querySelector('#order-rule-preview').onclick=event=>action(event.currentTarget,async()=>{ if(saving||!form.reportValidity())return;const request=++trialRevision,evidence=sources.find(a=>a.id===source.value);if(!evidence)throw Error('请选择已采集的真实 BPM 订单。'); @@ -87,7 +114,7 @@ const filtered=data.rules.filter(r=>(r.name+' '+r.categoryId).toLocaleLowerCase().includes(query.toLocaleLowerCase())&&(filter==='all'||filter==='needs'&&r.validationIssues?.length||filter==='draft'&&r.hasDraft||filter==='published'&&r.status==='enabled'||filter==='paused'&&r.status==='paused')); panel.querySelector('#rule-category-list').innerHTML=filtered.map(r=>`没有符合条件的类别,请调整搜索或筛选。
'; panel.querySelectorAll('[data-rule-id]').forEach(button=>button.onclick=()=>{if(button.dataset.ruleId===selectedId||saving)return;window.PageLifecycle.guard(()=>{dirty=false;selectedId=button.dataset.ruleId;draw();});}); - switchCurrent=async id=>{const current=data.rules.find(r=>r.id===id);if(!current.publishedVersion){dirty=false;selectedId=id;draw();feedback('此分类尚未发布。请先保存草稿,在第04步检查真实订单,再发布启用。','warning');return;}await mutate(async()=>{try{const op=current.status==='enabled'?'pause':'resume';await api('/order-rules/rules/'+encodeURIComponent(id)+'/'+op,{version:current.version,publishedVersion:current.publishedVersion,activationVersion:current.activationVersion||0});if(!isActive())return;await window.PageLifecycle.afterSave(reload,op==='pause'?'此规则已暂停。':'已启用已发布版本,未发布草稿保持不变。',feedback,isActive);}catch(error){if(isActive())feedback(error.message,'danger');}});}; + switchCurrent=async id=>{if(dirty){dirty=false;draw();return switchCurrent(id);}const current=data.rules.find(r=>r.id===id);if(!current.publishedVersion){dirty=false;selectedId=id;draw();feedback('此分类尚未发布。请先保存草稿,在第04步检查真实订单,再发布启用。','warning');return;}await mutate(async()=>{try{const op=current.status==='enabled'?'pause':'resume',result=await api('/order-rules/rules/'+encodeURIComponent(id)+'/'+op,{version:current.version,publishedVersion:current.publishedVersion,activationVersion:current.activationVersion||0});if(!owned())return;applyReceipt(result);baseline=JSON.stringify(read());feedback(op==='pause'?'此规则已暂停。':'已启用已发布版本,未发布草稿保持不变。');}catch(error){if(owned())feedback(error.message,'danger');}});}; panel.querySelectorAll('[data-rule-toggle]').forEach(toggle=>toggle.onchange=()=>{const id=toggle.dataset.ruleToggle;toggle.checked=data.rules.find(r=>r.id===id).status==='enabled';if(!admin||saving)return;window.PageLifecycle.guard(()=>switchCurrent(id));}); } const search=panel.querySelector('#rule-category-search'),state=panel.querySelector('#rule-category-filter');state.value=filter;search.oninput=()=>{query=search.value;drawList();};state.onchange=()=>{filter=state.value;drawList();};drawList(); @@ -95,7 +122,7 @@ } if(admin&&tab==='rules')importController=window.OrderRuleImport.bind(container,{api,esc,active:isActive,reload,feedback,guard:work=>window.PageLifecycle.guard(work),mutate:work=>mutationCurrent(work)}); container.querySelector('#order-rule-refresh').onclick=event=>window.PageLifecycle.guard(()=>action(event.currentTarget,()=>refreshCurrent())); - window.PageLifecycle.onDispose(()=>{revision++;trialRevision++;controller?.dispose?.();resourceController?.dispose();importController?.dispose();scopeController?.dispose();unregister?.();});await reload(); + window.PageLifecycle.onDispose(()=>{revision++;trialRevision++;sampleRequest++;sampleController?.abort();controller?.dispose?.();resourceController?.dispose();importController?.dispose();scopeController?.dispose();unregister?.();});await reload(); } window.OrderRuleViews={configure:helpers=>({api,esc,formatDate,notify,user}=helpers),render}; })(); diff --git a/web/modules/records/controller.js b/web/modules/records/controller.js index ae6a3a0..6a937bc 100644 --- a/web/modules/records/controller.js +++ b/web/modules/records/controller.js @@ -1,7 +1,7 @@ 'use strict'; window.RecordTable=(()=>{ function mount({view,container,isActive,api,readDraft,writeDraft,render,onCommit=()=>{},endpoint=null}){ - let disposed=false,busy=false,requestId=0,controller,pollController,timer,scrollTimer,applied=window.RecordState.read(view),data=null,signature='',retry=null; + let disposed=false,busy=false,requestId=0,controller,pollController,scrollTimer,applied=window.RecordState.read(view),data=null,signature='',retry=null; const live=()=>!disposed&&isActive(),get=selector=>container.querySelector(selector),list=get('[data-arrival-list],[data-pdf-list]'),error=get('[data-record-error]'); const notice=document.createElement('div');notice.className='alert alert-info mt-2';notice.hidden=true;notice.innerHTML='记录有更新。 ';list.before(notice); const loading=document.createElement('div');loading.className='small text-secondary px-3 py-2';loading.setAttribute('role','status');loading.hidden=true;loading.textContent='正在加载记录…';list.before(loading); @@ -12,19 +12,21 @@ window.RecordTable=(()=>{ function pager(){if(!data)return;window.RecordUi.pager(container,{...data,change:page=>{if(!busy)void load({...applied,page},{push:true,scroll:'top'});},resize:pageSize=>{if(!busy)void load({...applied,page:1,pageSize},{push:true,scroll:'top'});}});controls();} async function load(filters,options={}){ if(!live())return;const id=++requestId;controller?.abort();pollController?.abort();controller=new AbortController();if(data)window.RecordState.capture(view,applied);busy=true;retry=null;feedback('');controls();const next=window.RecordState.normalize(view,filters); - try{const result=await api((endpoint|| (view==='records'?'/arrivals':'/jobs'))+'?'+new URLSearchParams({...(!endpoint?{view:'ledger'}:{}),...next}),undefined,{signal:controller.signal});if(!live()||id!==requestId)return; - applied={...next,page:result.page,pageSize:result.pageSize};onCommit(applied);render(result);data=result;signature=snapshot(result);notice.hidden=true;window.RecordState.commit(view,applied,{push:!!options.push});if(options.draft)writeDraft(applied);busy=false;pager(); - await new Promise(resolve=>requestAnimationFrame(resolve));if(!live()||id!==requestId)return;if(options.scroll==='restore')window.scrollTo(0,options.y??window.RecordState.position(view));else if(options.scroll==='top')list.scrollIntoView({block:'start'});window.RecordState.capture(view,applied); - }catch(e){if(!live()||id!==requestId)return;busy=false;retry={filters:next,options};if(data&&options.draft)window.RecordState.commit(view,applied);feedback('读取失败:'+e.message+(data?';仍显示上次成功的记录。':''));pager();controls();} + try{const validation=options.validation||await window.PageLifecycle.validateRegion('records',{signal:controller.signal}).catch(()=>null);const result=await api((endpoint|| (view==='records'?'/arrivals':'/jobs'))+'?'+new URLSearchParams({...(!endpoint?{view:'ledger'}:{}),...next}),undefined,{signal:controller.signal});if(!live()||id!==requestId)return false; + applied={...next,page:result.page,pageSize:result.pageSize};onCommit(applied);render(result);data=result;signature=snapshot(result);polling.accept(validation);notice.hidden=true;window.RecordState.commit(view,applied,{push:!!options.push});if(options.draft)writeDraft(applied);busy=false;pager(); + await new Promise(resolve=>requestAnimationFrame(resolve));if(!live()||id!==requestId)return false;if(options.scroll==='restore')window.scrollTo(0,options.y??window.RecordState.position(view));else if(options.scroll==='top')list.scrollIntoView({block:'start'});window.RecordState.capture(view,applied);return true; + }catch(e){if(!live()||id!==requestId)return false;busy=false;retry={filters:next,options};if(data&&options.draft)window.RecordState.commit(view,applied);feedback('读取失败:'+e.message+(data?';仍显示上次成功的记录。':''));pager();controls();return false;} } function apply(){if(busy)return;void load({...applied,...readDraft(),page:1},{push:true,scroll:'top'});} container.querySelectorAll('[data-record-query]').forEach(button=>button.onclick=apply); const inputs=container.querySelectorAll('.record-filters input,.record-filters select,#record-search,#record-status');for(const input of inputs)input.addEventListener('keydown',event=>{if(event.key==='Enter'){event.preventDefault();apply();}}); - async function check(){if(!live())return;try{if(data&&!busy){pollController=new AbortController();const result=await api((endpoint|| (view==='records'?'/arrivals':'/jobs'))+'?'+new URLSearchParams({...(!endpoint?{view:'ledger'}:{}),...applied}),undefined,{signal:pollController.signal});if(live()&&!busy)notice.hidden=snapshot(result)===signature;}}catch{}finally{if(live())timer=setTimeout(check,10000);}} - refresh.onclick=notice.querySelector('button').onclick=()=>{if(!busy)void load(applied,{scroll:'keep'});}; + async function check(signal){if(!live()||busy||!data)return false;const id=requestId;pollController=new AbortController();const result=await api((endpoint|| (view==='records'?'/arrivals':'/jobs'))+'?'+new URLSearchParams({...(!endpoint?{view:'ledger'}:{}),...applied}),undefined,{signal:AbortSignal.any([signal,pollController.signal]),ownerCheck:live});if(signal.aborted||!live()||busy||id!==requestId)return false;notice.hidden=snapshot(result)===signature;} + const polling=window.PageLifecycle.regionPoll('records',{refresh:check,onError:error=>{if(live())feedback('状态读取失败:'+error.message+';保留上次记录,请刷新重试。');}},10000,{isActive:live,forceAfter:view==='records-pdf'?60000:0}); + const manualRefresh=()=>load(applied,{scroll:'keep'});polling.refreshRegion=manualRefresh; + refresh.onclick=notice.querySelector('button').onclick=()=>{if(!busy)void manualRefresh();}; const scroll=()=>{clearTimeout(scrollTimer);scrollTimer=setTimeout(()=>{if(live()&&data&&!busy)window.RecordState.capture(view,applied);},150);},pagehide=()=>{if(data)window.RecordState.capture(view,applied);};window.addEventListener('scroll',scroll,{passive:true});window.addEventListener('pagehide',pagehide); - const handle={view,refresh:()=>load(applied,{scroll:'keep'}),navigate(){return load(window.RecordState.read(view),{draft:true,scroll:'restore',y:window.RecordState.position(view)});},get busy(){return busy;},dispose(){if(disposed)return;disposed=true;controller?.abort();pollController?.abort();clearTimeout(timer);clearTimeout(scrollTimer);window.removeEventListener('scroll',scroll);window.removeEventListener('pagehide',pagehide);if(data)window.RecordState.capture(view,applied);if(window.RecordTable.active===handle)window.RecordTable.active=null;}}; - window.RecordTable.active=handle;window.PageLifecycle?.onDispose(()=>handle.dispose());handle.ready=load(applied,{scroll:'restore',y:initialScroll}).finally(()=>{if(live())timer=setTimeout(check,10000);});return handle; + const handle={view,refresh:manualRefresh,navigate(){return load(window.RecordState.read(view),{draft:true,scroll:'restore',y:window.RecordState.position(view)});},get busy(){return busy;},dispose(){if(disposed)return;disposed=true;controller?.abort();pollController?.abort();polling.dispose();clearTimeout(scrollTimer);window.removeEventListener('scroll',scroll);window.removeEventListener('pagehide',pagehide);if(data)window.RecordState.capture(view,applied);if(window.RecordTable.active===handle)window.RecordTable.active=null;}}; + window.RecordTable.active=handle;window.PageLifecycle?.onDispose(()=>handle.dispose());handle.ready=load(applied,{scroll:'restore',y:initialScroll}).finally(()=>{if(live())polling.schedule();});return handle; } return {mount,active:null}; })(); diff --git a/web/modules/storage/view.js b/web/modules/storage/view.js index cacc8c3..2b1a781 100644 --- a/web/modules/storage/view.js +++ b/web/modules/storage/view.js @@ -32,7 +32,7 @@ const submission=window.PageLifecycle?.submission,controller=new AbortController(),cancel=()=>controller.abort(signal.reason);let timedOut=false; if(signal?.aborted)cancel();else signal?.addEventListener('abort',cancel,{once:true}); const timer=setTimeout(()=>{timedOut=true;controller.abort();},timeout); - try{const response=await fetch('/api/storage/servers'+route,{method:'POST',credentials:'same-origin',headers:{'Content-Type':'application/json'},body:JSON.stringify(input),signal:controller.signal});const body=await response.json();if(!response.ok)throw new Error(body.error||'存储操作失败。');if(route==='')window.PageLifecycle?.succeeded(submission);return body;} + try{window.PageLifecycle?.invalidateRegion?.('storage','orderRules','records','health','home');const response=await fetch('/api/storage/servers'+route,{method:'POST',credentials:'same-origin',headers:{'Content-Type':'application/json'},body:JSON.stringify(input),signal:controller.signal});const body=await response.json();if(!response.ok)throw new Error(body.error||'存储操作失败。');window.PageLifecycle?.invalidateRegion?.('storage','orderRules','records','health','home');if(route==='')window.PageLifecycle?.succeeded(submission);return body;} catch(error){if(route===''){window.PageLifecycle?.failed(submission);if(timedOut||error instanceof TypeError){api('/storage').then(()=>{if(alive())status.textContent='结果待核实:已查询服务器列表,请核对保存结果;不会自动重试。';}).catch(()=>{});throw new Error('结果待核实:保存响应超时或连接中断,正在查询状态;不会自动重试。');}}if(timedOut)throw new Error('连接超时,请检查网络后重试。');throw error;} finally{clearTimeout(timer);signal?.removeEventListener('abort',cancel);} }