npm - wwt-certificate-tool - Versions diffs - 1.2.32 → 1.2.34 - Mend

wwt-certificate-tool 1.2.32 → 1.2.34

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (3) hide show

package/dist/app.html CHANGED Viewed

@@ -3,7 +3,7 @@
 <head>
 <meta charset="UTF-8">
 <meta name="viewport" content="width=device-width,initial-scale=1">
-<title>WWT 金蝶凭证工具 · 纯前端版 P1.2.32</title>
+<title>WWT 金蝶凭证工具 · 纯前端版 P1.2.34</title>
 <style>*{box-sizing:border-box;margin:0;padding:0}
 body{font-family:"Microsoft YaHei","PingFang SC",-apple-system,Segoe UI,sans-serif;font-size:13px;color:#1f2328;background:#f4f6f9;line-height:1.6}
 h1{font-size:17px;font-weight:600}
@@ -305,7 +305,7 @@ tr.bad:hover td{background:#fbe9e9}
   <div class="brand">
     <span class="logo">WWT</span>
     <div>
-      <h1>金蝶凭证工具 <span class="ver">P1.2.32</span></h1>
+      <h1>金蝶凭证工具 <span class="ver">P1.2.34</span></h1>
       <div class="sub">纯前端离线版 · 双击即用 · 数据只存在本机，不上传任何服务器</div>
     </div>
   </div>
@@ -2263,10 +2263,15 @@ window.WWT_ENGINE = (function () {
   /* ---------------- 金额表达式 ---------------- */
   function isAutoDiff(line) { return clean(line && line.amountField) === "__AUTO_DIFF__"; }
+  // 兼容旧接口：返回 { parts: [{fld, sign}], auto? }。新逻辑统一走 evalAmtExpr，
+  // 这里只为了不让外部旧调用点（如果有）报错。
   function parseAmtExpr(expr) {
     const e = clean(expr);
     if (!e || e === "-") return null;
     if (e === "__AUTO_DIFF__") return { auto: true };
+    // 含 * / ( ) 时视为新语法（按 evalAmtExpr 处理），parts 留空
+    if (/[*\/()]/.test(e)) return { parts: [], v2: true };
     const parts = [];
     for (let p of e.split("+")) {
       p = p.trim();
@@ -2277,12 +2282,103 @@ window.WWT_ENGINE = (function () {
     }
     return parts.length ? { parts } : null;
   }
+  // ============== 表达式解析器（支持 + - * / 括号 与 字段名/数字常量） ==============
+  // 语法：
+  //   expr  := term  ( ('+'|'-') term )*
+  //   term  := atom  ( ('*'|'/') atom )*
+  //   atom  := '-' atom   |   number   |   identifier   |   '(' expr ')'
+  //   identifier := 除空白与运算符之外的连续字符（即字段名）
+  //
+  // 设计目标：会计场景常见公式——`实收金额+折扣费` / `-折扣费` / `实收金额*0.13` / `金额/数量` / `(金额+税额)*0.13`
+  // tokenize 时跳过空白；遇到运算符边界时，前一段连续字符要么是字段名，要么是数字。
+  function tokenizeExpr(s) {
+    const toks = [];
+    let i = 0;
+    while (i < s.length) {
+      const c = s.charAt(i);
+      if (c === ' ' || c === '\t') { i++; continue; }
+      if (c === '+' || c === '*' || c === '/' || c === '(' || c === ')') { toks.push({ t: c }); i++; continue; }
+      if (c === '-') {
+        // 单目 vs 二元判断：若前一个 token 是操作符/左括号/开头，则是单目
+        const prev = toks[toks.length - 1];
+        const isUnary = !prev || (prev.t !== ')' && !/^\d/.test(prev.v || '') && prev.t !== 'num' && prev.t !== 'id');
+        toks.push({ t: isUnary ? 'unary-' : '-' });
+        i++; continue;
+      }
+      // 读一段连续字符
+      let j = i;
+      while (j < s.length) {
+        const cj = s.charAt(j);
+        if (cj === ' ' || cj === '\t') break;
+        if ('+*-/()'.indexOf(cj) >= 0) break;
+        j++;
+      }
+      const seg = s.slice(i, j);
+      i = j;
+      if (seg) {
+        // 判断是数字（允许可选前导 0/小数点）
+        if (/^-?\d+(\.\d+)?$/.test(seg) || /^\.\d+$/.test(seg)) toks.push({ t: 'num', v: parseFloat(seg) });
+        else toks.push({ t: 'id', v: seg });
+      }
+    }
+    return toks;
+  }
+  function evalAmtExpr(row, expr) {
+    const e = clean(expr);
+    if (!e || e === "-") return 0;
+    const toks = tokenizeExpr(e);
+    let pos = 0;
+    function peek() { return toks[pos]; }
+    function eat(t) { if (toks[pos] && toks[pos].t === t) { pos++; return true; } return false; }
+    function err(m) { throw new Error('金额表达式错误: ' + m + ' (pos=' + pos + ', expr=' + e + ')'); }
+    function parseExpr() {
+      let v = parseTerm();
+      while (true) {
+        const p = peek();
+        if (!p) break;
+        if (p.t === '+') { pos++; v = v + parseTerm(); }
+        else if (p.t === '-') { pos++; v = v - parseTerm(); }
+        else break;
+      }
+      return v;
+    }
+    function parseTerm() {
+      let v = parseAtom();
+      while (true) {
+        const p = peek();
+        if (!p) break;
+        if (p.t === '*') { pos++; v = v * parseAtom(); }
+        else if (p.t === '/') {
+          pos++;
+          const d = parseAtom();
+          if (d === 0) throw new Error('金额表达式除零 (expr=' + e + ')');
+          v = v / d;
+        }
+        else break;
+      }
+      return v;
+    }
+    function parseAtom() {
+      const p = peek();
+      if (!p) err('缺少操作数');
+      if (p.t === 'unary-') { pos++; return -parseAtom(); }
+      if (p.t === '(') { pos++; const v = parseExpr(); if (!eat(')')) err('缺少右括号'); return v; }
+      if (p.t === 'num') { pos++; return p.v; }
+      if (p.t === 'id') { pos++; return num(row[p.v]); }
+      err('非法 token: ' + JSON.stringify(p));
+    }
+    const v = parseExpr();
+    if (pos !== toks.length) err('未消费完: ' + toks.slice(pos).map(t => t.v || t.t).join(' '));
+    return v;
+  }
   function sumAmtExpr(row, expr) {
-    const pe = parseAmtExpr(expr);
-    if (!pe || pe.auto) return 0;
-    let s = 0;
-    for (const it of pe.parts) s += num(row[it.fld]) * it.sign;
-    return s;
+    if (isAutoDiff({ amountField: expr })) return 0;
+    try { return round2(evalAmtExpr(row, expr)); }
+    catch (e) { console.warn(e.message); return 0; }
   }
   /* ---------------- 映射查表 ---------------- */
@@ -2547,6 +2643,16 @@ window.WWT_ENGINE = (function () {
     }
     return (rule.lines || []).slice();
   }
+  // 【P1.2.34】规则级排除：当一行满足 rule.excludeWhen 全部条件时，
+  // 本规则不处理，且不计入「被本规则排除」/「应处理子集漏命中」任何审计统计——
+  // 业务上等同于这条行从未出现在本规则的视野里（用于「厂牌=资产工具库」这类
+  // 由其他专门流程处理的合法跳过场景，避免覆盖率审计误报警报）。
+  function isExcludedByRule(row, rule, curSrc, idx) {
+    const ex = rule && rule.excludeWhen;
+    if (!ex || !ex.length) return false;
+    return evalConditions(row, ex, rule.excludeLogic || "AND", curSrc, idx);
+  }
   function linesKey(lines) {
     return JSON.stringify(lines, (k, v) => (k === "_uid" ? undefined : v));
   }
@@ -2609,6 +2715,8 @@ window.WWT_ENGINE = (function () {
       for (let i = 0; i < rowsAll.length; i++) {
         if (usedRows[curSrc].has(i)) continue;
         const row = rowsAll[i];
+        // 【P1.2.34】规则级排除：满足 excludeWhen 的行整条跳过，不进 rowsIn、不进 audit
+        if (isExcludedByRule(row, rule, curSrc, idx)) continue;
         if (evalConditions(row, rule.conditions || [], rule.logic || "AND", curSrc, idx)) {
           rowsIn.push({ row: row, _i: i });
         }
@@ -2919,6 +3027,8 @@ window.WWT_ENGINE = (function () {
       for (let i = 0; i < rowsAll.length; i++) {
         if (usedRows.has(i)) continue;
         const row = rowsAll[i];
+        // 【P1.2.34】规则级排除：跳过 excludeWhen 命中的行
+        if (isExcludedByRule(row, r, curSrc, idx)) continue;
         if (evalConditions(row, r.conditions || [], r.logic || "AND", curSrc, idx)) {
           rowsIn.push({ row: row, _i: i });
         }
@@ -3071,9 +3181,16 @@ window.WWT_ENGINE = (function () {
      *   excludedRows     = 源表里不满足本规则的全部 = 条件 → 按规则就不该处理，不算遗漏
      *   neverMatchedRows = candidatesMissed（兼容旧字段名） */
     const candidatesMissed = [], excludedRows = [];
+    let ruleExcludedCount = 0, ruleExcludedAmount = 0;
     for (let i = 0; i < rowsAll.length; i++) {
       if (matchedIdxs.has(i)) continue;
       const row = rowsAll[i];
+      // 【P1.2.34】规则级排除：满足 excludeWhen 的行不进任何 audit 统计
+      if (isExcludedByRule(row, rule, curSrc, idx)) {
+        ruleExcludedCount++;
+        if (amountCol) ruleExcludedAmount += num(row[amountCol]);
+        continue;
+      }
       const rec = {
         原单号: clean(row[meta.no]) || clean(row["原单号"]),
         付款方式: clean(row["付款方式"]) || clean(row["支付方式"]),
@@ -3123,6 +3240,9 @@ window.WWT_ENGINE = (function () {
         candidate_missed_clipped: candidatesMissed.length >= 200,  // 是否被 200 上限截断
         excluded: excludedRows.length,                       // 被本规则排除（不算遗漏）
         excluded_clipped: excludedRows.length >= 200,
+        // 【P1.2.34】规则级排除：满足 excludeWhen 的行彻底从 audit 视野消失（业务上合法跳过）
+        rule_excluded: ruleExcludedCount,
+        rule_excluded_amount: round2(ruleExcludedAmount),
         // 兼容旧字段（仍叫 never_matched，但其内容仅含真正应处理子集漏命中的行）
         never_matched: candidatesMissed.length,
         unmatched_amount: round2(unmatchedAmt),
@@ -3296,8 +3416,9 @@ window.WWT_ENGINE = (function () {
   return {
     clean, num, round2, normPay, pad3,
     buildIndex, getField, compare, evalConditions, applyTransform,
-    parseAmtExpr, sumAmtExpr, isAutoDiff, splitFieldsOf,
+    parseAmtExpr, sumAmtExpr, evalAmtExpr, isAutoDiff, splitFieldsOf,
     calcDimValues, leafSubject, resolveEffectiveLines, lookupTypeDim,
+    isExcludedByRule,
     generate, balanceCheck, buildKingdee, detect, auditRule,
     lookupMap, lookupTypeMap,
   };
@@ -3322,7 +3443,7 @@ const S = window.__STATE__ = {
 };
 /* ---------------- 版本 & 框架自动更新（只更新程序本身，本地数据/规则不动） ---------------- */
-const WWT_VER=(function(){const raw='P1.2.32';return raw.indexOf('__WVER__')>=0?'P1.2.10':raw;})();
+const WWT_VER=(function(){const raw='P1.2.34';return raw.indexOf('__WVER__')>=0?'P1.2.10':raw;})();
 const UPD_URL_KEY='wwt_fe_updurl';
 // 默认更新源：Gitee 上本项目的 version.json（API 接口，浏览器可直接跨域读）
 const DEFAULT_UPD_URL='https://gitee.com/api/v5/repos/wwtmrhu/certificate-generation/contents/dist/version.json';
@@ -4607,6 +4728,10 @@ function renderRules(){
     const conds=(r.conditions||[]).map(c=>'<span class="cond"><b>'+esc(c.field)+'</b> '+esc(c.op)+' '+esc(c.value)+'</span>').join('');
     let body='<div class="rulebody" id="rb'+i+'">';
     body+='<div style="margin:6px 0"><b>命中条件</b>（'+(r.logic||'AND')+'）：'+(conds||'<span style="color:#8b949e">无条件（全表命中）</span>')+'</div>';
+    if((r.excludeWhen||[]).length){
+      const exc=r.excludeWhen.map(c=>'<span class="cond"><b>'+esc(c.field)+'</b> '+esc(c.op)+' '+esc(c.value)+'</span>').join('');
+      body+='<div style="background:#fff7e6;padding:6px 8px;border-radius:4px;margin:4px 0"><b style="color:#d46b08">排除条件</b>（'+(r.excludeLogic||'AND')+'）：'+exc+' <span style="color:#888;font-size:11px">→ 满足的行整条跳过，不进 audit</span></div>';
+    }
     if((r.branches||[]).length){
       body+='<div><b>分支</b>：'+r.branches.map((b,bi)=>
         '<div class="linechip"><span class="tag b">分支'+(bi+1)+' '+esc(b.name||'')+'</span>'+
@@ -4876,6 +5001,18 @@ function ruleFormHTML(){
     (r.conditions||[]).map((c,i)=>condRowHTML(i,c)).join('')+'</div>'+
     '<button class="mini" onclick="UI.addCond()">+ 加条件</button></div>';
+  // 【P1.2.34】规则级排除：满足条件的行整条规则不处理，且不计入覆盖率审计
+  h+='<div class="sec" style="background:#fff7e6;border-left:3px solid #fa8c16"><h4>排除条件（满足这些条件的行<b>整条不处理</b>，不计入审计·不显示在排除/漏命中里）</h4>'+
+    '<div style="font-size:11.5px;color:#888;margin:3px 0">典型场景：「厂牌 = 资产工具库」时由其他流程直接处理，本规则不参与。留空 = 不启用排除。</div>'+
+    '<div class="row"><span class="w60">逻辑</span>'+
+    '<select class="w80" id="rf_exclogic">'+
+      '<option value="AND"'+((r.excludeLogic||'AND')==='AND'?' selected':'')+'>AND（全部满足）</option>'+
+      '<option value="OR"'+(r.excludeLogic==='OR'?' selected':'')+'>OR（任一满足）</option>'+
+    '</select></div>'+
+    '<div id="rf_exconds">'+
+      (r.excludeWhen||[]).map((c,i)=>condRowHTML(i,c)).join('')+'</div>'+
+    '<button class="mini" onclick="UI.addExcludeCond()">+ 加排除条件</button></div>';
   h+='<div class="sec"><h4>分支（可选：按条件走不同分录；命中第一个分支就停）</h4><div id="rf_branches">'+
     (r.branches||[]).map((b,bi)=>branchHTML(bi,b)).join('')+'</div>'+
     '<button class="mini" onclick="UI.addBranch()">+ 加分支</button></div>';
@@ -4913,7 +5050,7 @@ function lineHTML(bi,li,l){
   return '<div class="sec linerow" data-bi="'+bi+'" data-li="'+li+'" style="background:#fff;margin:5px 0">'+
     '<div class="row"><select class="w60" data-lf="side">'+sideOpts+'</select>'+
     '<span class="w60">科目</span><input class="w140" data-lf="subject" value="'+esc(l.subject||'')+'" placeholder="如 1122 / 6002" list="dlSubjects" title="可下拉选会计科目表里的编码；也可手动输入">'+
-    '<span class="w60">金额</span><input class="w180" data-lf="amountField" value="'+esc(l.amountField||'')+'" placeholder="实收金额+折扣费 / -折扣费 / __AUTO_DIFF__" list="dlBizFields" title="多列用 + 连接；减用 - 前缀；__AUTO_DIFF__ 自动补差额">'+
+    '<span class="w60">金额</span><input class="w180" data-lf="amountField" value="'+esc(l.amountField||'')+'" placeholder="实收金额+折扣费 / -折扣费 / 金额*0.13 / 金额/数量" list="dlBizFields" title="支持四则运算与括号：字段名/数字常量；例：实收金额+折扣费、-折扣费、金额*0.13、金额/数量、(金额+税额)*0.13。特殊值：__AUTO_DIFF__ 自动补差额">'+
     '<button class="mini del" onclick="UI.delRow(this,\'linerow\')">删除分录</button></div>'+
     '<div class="row"><span class="w60">摘要</span><input class="grow" data-lf="summary" value="'+esc(l.summary||'')+'" placeholder="{单位名称}{收入板块}对帐S{原单号}"></div>'+
     '<div style="font-size:11.5px;color:#57606a;margin:3px 0">辅助核算维度：</div>'+
@@ -4943,6 +5080,14 @@ function syncFormToObj(){
     return {field:g('field').value.trim(),op:g('op').value,value:g('value').value.trim(),
             logic:g('logic').value||undefined};
   });
+  // 【P1.2.34】排除条件：满足时整条规则不处理、不进 audit
+  r.excludeLogic=$('rf_exclogic') ? $('rf_exclogic').value : 'AND';
+  const exConds=[...document.querySelectorAll('#rf_exconds > .condrow')].map(row=>{
+    const g=f=>row.querySelector('[data-f="'+f+'"]');
+    return {field:g('field').value.trim(),op:g('op').value,value:g('value').value.trim(),
+            logic:g('logic').value||undefined};
+  });
+  r.excludeWhen=exConds.length ? exConds : undefined;
   // 分支
   const bsecs=[...document.querySelectorAll('#rf_branches > [data-bi]')];
   r.branches=bsecs.map(sec=>{
@@ -6584,6 +6729,13 @@ window.UI={
     else editing.conditions.push({field:'',op:'=',value:'',logic:''});
     redrawRuleForm();
   },
+  // 【P1.2.34】加排除条件：写到 #rf_exconds
+  addExcludeCond:()=>{
+    syncFormToObj();
+    if(!editing.excludeWhen) editing.excludeWhen=[];
+    editing.excludeWhen.push({field:'',op:'=',value:'',logic:''});
+    redrawRuleForm();
+  },
   addBranch:()=>{
     syncFormToObj();
     editing.branches.push({name:'分支'+((editing.branches||[]).length+1),logic:'AND',conditions:[{field:'',op:'=',value:''}],lines:[]});

package/dist/version.json CHANGED Viewed

@@ -1,8 +1,8 @@
 {
-  "ver": "P1.2.32",
-  "npm": "1.2.32",
-  "url": "https://cdn.jsdelivr.net/npm/wwt-certificate-tool@1.2.32/dist/app.html",
-  "url_unpkg": "https://unpkg.com/wwt-certificate-tool@1.2.32/dist/app.html",
-  "url_gh": "https://api.github.com/repos/huweipei745839/certificate-generation/contents/dist/WWT%E5%87%AD%E8%AF%81%E5%B7%A5%E5%85%B7_P1.2.32.html",
-  "note": "界面变大适配列宽：① 上传页移除「🌲」树形入口和卡片旁按钮，只保留一个「📤 上传 Excel 数据」按钮 + 拖拽 + 点卡片（已上传→抽屉，未上传→上传弹窗），避免入口太多混淆；② 数据浏览抽屉填满窗口（dv-panel left:0/right:0 锁死，去掉之前 max-width:1100px 上限，1920px 屏幕不再留大块灰色空白）；③ 左列 240→260px 防止「收入类型确认（采购·已确认）」被截断；④ 抽屉表格列宽自适应（table-layout:auto + max-content，按付款方式/付款确认等长字段完整显示）。"
+  "ver": "P1.2.34",
+  "npm": "1.2.34",
+  "url": "https://cdn.jsdelivr.net/npm/wwt-certificate-tool@1.2.34/dist/app.html",
+  "url_unpkg": "https://unpkg.com/wwt-certificate-tool@1.2.34/dist/app.html",
+  "url_gh": "https://api.github.com/repos/huweipei745839/certificate-generation/contents/dist/WWT%E5%87%AD%E8%AF%81%E5%B7%A5%E5%85%B7_P1.2.34.html",
+  "note": "① 新增「规则级排除」机制：规则上加 excludeWhen 字段（结构同 conditions，含 excludeLogic），满足条件的行整条规则不处理，**且不进覆盖率审计**（不进 excluded_rows、不进 candidate_missed、不进任何 audit 统计）；用于「厂牌=资产工具库」等由其他流程直接处理的合法跳过场景。② UI：规则编辑面板增加「排除条件」独立配置区（橙底强调），规则列表同步显示摘要；「+ 加排除条件」按钮一键加。③ auditRule 返回值新增 rule_excluded/rule_excluded_amount 字段（供后续 UI 展示）。例：「厂牌 = 资产工具库」时整条不处理、不计入审计。"
 }

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "wwt-certificate-tool",
-  "version": "1.2.32",
+  "version": "1.2.34",
   "description": "WWT 金蝶凭证工具 · 纯前端版（离线单文件 HTML，双击即用）",
   "keywords": [
     "WWT",