优化:整理指标目标并支持中文字段公式编辑

黑片和亮片按结果展示完整公式,在同一窗口维护条件与未匹配取值。支持中文字段选择、运算符和求和,并保留原计算语义及特殊策略。

移除重复账号入口与配置说明,统一紧凑表格。保留仓库既有权限判断,不包含此前未同步的角色迁移、预览快照或运行数据。

验证:前端构建及68项相关检查通过。
This commit is contained in:
2026-11-03 16:31:23 +08:00
parent 1aeccddd4d
commit 54813accaa
19 changed files with 992 additions and 103 deletions
+73
View File
@@ -0,0 +1,73 @@
import test from 'node:test';
import assert from 'node:assert/strict';
import { stageResultFormulas, describeResultFormula, replaceResultFormula, planResultMove, newResultIssue } from '../src/resultFormulas.ts';
const row=(stage,target,formula,when)=>({stage,target,formula,...(when?{when}:{}),nullPolicy:'PROPAGATE',zeroDenominatorPolicy:'ONE',nullResultPolicy:'NULL'});
const condition=value=>({field:'issueLocation',operator:'CONTAINS',value});
const schema={sourceFields:{black:{goodWeight:'合格重量',externalScrap:'外废重量',inspectionNote:'检验备注',issueLocation:'发料地点'},bright:{goodWeight:'合格重量',scrapWeight:'检包入废品库重量',applicability:'是否电镀来料/二等品库来料'}},componentLabels:{good:'黑片合格重量',scrap:'黑片报废重量',external:'黑片外废',reuse:'利用料报废扣减',reuseGood:'利用料合格扣减',total:'黑片总重量',brightGood:'亮片合格重量',brightScrap:'亮片报废重量'},rowTargets:{black:['good','external','scrap','reuse','reuseGood','total'],bright:['brightGood','brightScrap']},conditionOperators:['EQ','CONTAINS','IS_BLANK'],metricCodes:[]};
const base={schemaVersion:'v1',sourceFields:{black:{externalScrap:'外废重量'}},rowRules:[
row('black','good','goodWeight'),row('black','external','externalScrap'),row('black','external','0',{field:'inspectionNote',operator:'CONTAINS',value:'过账'}),row('black','scrap','external'),
row('black','reuse','0'),row('black','reuseGood','0'),row('black','reuse','scrap',condition('利用料')),row('black','reuseGood','good',condition('利用料')),row('black','reuse','scrap',condition('废品')),row('black','reuseGood','good',condition('废品')),
row('black','total','good + scrap - reuse - reuseGood'),row('bright','brightGood','0'),row('bright','brightGood','goodWeight',{field:'applicability',operator:'EQ',value:'是'}),row('bright','brightScrap','0'),row('bright','brightScrap','scrapWeight',{field:'applicability',operator:'EQ',value:'是'})
],metricRules:{}};
const result=(def,stage,target)=>stageResultFormulas(def,stage).find(row=>row.target===target);
test('one result per row retains every noncontiguous original step without mutation',()=>{
const before=JSON.stringify(base),black=stageResultFormulas(base,'black'),bright=stageResultFormulas(base,'bright');
assert.equal(black.length,6);assert.equal(bright.length,2);assert.deepEqual(result(base,'black','reuse').indexes,[4,6,8]);
const all=[...black,...bright].flatMap(r=>r.rules.map((rule,i)=>({rule,index:r.indexes[i]}))).sort((a,b)=>a.index-b.index);
assert.deepEqual(all.map(r=>r.rule),base.rowRules);assert.equal(JSON.stringify(base),before);
});
test('opening and applying every result is byte-identical, including omitted policies and metadata',()=>{
const def=structuredClone(base);delete def.rowRules[0].nullPolicy;def.rowRules[0].custom='preserve';def.rowRules[2].when.custom='condition metadata';
const text=JSON.stringify(def);let current=def;
for(const stage of ['black','bright'])for(const item of stageResultFormulas(def,stage))current=replaceResultFormula(current,item,structuredClone(item.rules));
assert.equal(current,def);assert.equal(JSON.stringify(current),text);
});
test('full formula includes default and conditional values for black and bright',()=>{
assert.equal(describeResultFormula(result(base,'black','external'),schema),'若检验备注包含“过账”,取0;否则取外废重量');
assert.equal(describeResultFormula(result(base,'black','reuse'),schema),'若发料地点包含“废品” 或 发料地点包含“利用料”,取黑片报废重量;否则取0');
assert.equal(describeResultFormula(result(base,'bright','brightScrap'),schema),'若是否电镀来料/二等品库来料等于“是”,取检包入废品库重量;否则取0');
});
test('different overlapping branches preserve later-write priority and explicit otherwise formulas',()=>{
const item=result(base,'black','reuse');item.rules=structuredClone(item.rules);item.rules[2].formula='2';
assert.equal(describeResultFormula(item,schema),'若发料地点包含“废品”,取2;否则(若发料地点包含“利用料”,取黑片报废重量;否则取0)');
item.rules[2].otherwiseFormula='3';assert.equal(describeResultFormula(item,schema),'若发料地点包含“废品”,取2;否则取3');
});
test('conditions with differing special policies are never coalesced',()=>{
const item=structuredClone(result(base,'black','reuse'));item.rules[2].nullResultPolicy='ERROR';
assert.match(describeResultFormula(item,schema),/否则(若/);assert.doesNotMatch(describeResultFormula(item,schema),/ 或 /);
});
test('self references retain the previous value in the combined expression',()=>{
const item={stage:'black',target:'reuse',indexes:[0,1],rules:[row('black','reuse','4'),row('black','reuse','reuse + 1',condition('利用料'))]};
assert.equal(describeResultFormula(item,schema),'若发料地点包含“利用料”,取(4) + 1;否则取4');
});
test('editing one branch preserves every other rule and field, including interleaved results',()=>{
const item=result(base,'black','reuse'),rules=structuredClone(item.rules);rules[2].formula='scrap + 1';const next=replaceResultFormula(base,item,rules);
assert.equal(next.rowRules[8].formula,'scrap + 1');for(let i=0;i<base.rowRules.length;i++)if(i!==8)assert.deepEqual(next.rowRules[i],base.rowRules[i]);
assert.equal(base.rowRules[8].formula,'scrap');assert.equal(next.metricRules,base.metricRules);assert.equal(next.sourceFields,base.sourceFields);
});
test('adding or removing conditions keeps other results and their relative order intact',()=>{
const item=result(base,'black','reuse'),rules=[...item.rules,row('black','reuse','1',condition('新条件'))];const added=replaceResultFormula(base,item,rules);
assert.equal(result(added,'black','reuse').rules.length,4);assert.deepEqual(added.rowRules.filter(r=>r.target!=='reuse'),base.rowRules.filter(r=>r.target!=='reuse'));
const removed=replaceResultFormula(added,item,rules.slice(0,1));assert.equal(result(removed,'black','reuse').rules.length,1);assert.deepEqual(removed.rowRules.filter(r=>r.target!=='reuse'),base.rowRules.filter(r=>r.target!=='reuse'));
});
test('conditional-only legacy formulas retain their original fallback rather than acquiring a zero default',()=>{
const item={stage:'black',target:'reuse',indexes:[0],rules:[row('black','reuse','2',condition('利用料'))]};
assert.equal(describeResultFormula(item,schema),'若发料地点包含“利用料”,取2;否则取原计算结果');
assert.equal(replaceResultFormula({rowRules:item.rules},item,item.rules).rowRules.length,1);
});
test('whole-result moves retain all branches and reject totals ahead of dependencies',()=>{
const moved=planResultMove(base,'black','good',1,schema);assert.ok(moved.definition);assert.equal(stageResultFormulas(moved.definition,'black')[0].target,'external');
assert.deepEqual(result(moved.definition,'black','external').rules,result(base,'black','external').rules);
assert.deepEqual(planResultMove(moved.definition,'black','good',-1,schema).definition,base);
assert.match(planResultMove(base,'black','total',-1,schema).reason,/后面还会修改/);
assert.equal(planResultMove(base,'bright','brightGood',-1,schema).definition,undefined);
});
test('new results stay in their stage and mismatched branches cannot be merged',()=>{
const next=replaceResultFormula(base,{stage:'black',target:'added'},[row('black','added','0')]);
assert.equal(next.rowRules[11].target,'added');assert.equal(next.rowRules[12].stage,'bright');
assert.throws(()=>replaceResultFormula(base,{stage:'black',target:'reuse'},[row('bright','reuse','0')]),/同一个/);
});
test('invalid branch variables remain blocked by the existing rule checker',()=>{
const item=result(base,'bright','brightScrap'),rules=structuredClone(item.rules);rules[1].formula='missingWeight';const next=replaceResultFormula(base,item,rules);
assert.match(newResultIssue(base,next,schema),/不可用的公式变量/);assert.equal(result(base,'bright','brightScrap').rules[1].formula,'scrapWeight');
});