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

wwt-certificate-tool 1.2.34 → 1.2.35

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.34</title>
+<title>WWT 金蝶凭证工具 · 纯前端版 P1.2.35</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}
@@ -52,6 +52,8 @@ main{padding:14px 18px 60px}
 .btn.danger{color:#c1121f}
 .btn.danger:hover{background:#fdf0f0;border-color:#e5a3a3}
 .btn.ghost{background:#fafbfc}
+.btn.warn{background:#fa8c16;color:#fff;border-color:#fa8c16}
+.btn.warn:hover{background:#d97a14;border-color:#d97a14}
 .btn.big{padding:9px 22px;font-size:14px}
 .rowacts{display:flex;gap:8px;align-items:center;flex-wrap:wrap;margin:10px 0}
 .tip{font-size:11.5px;color:#8b949e}
@@ -305,7 +307,7 @@ tr.bad:hover td{background:#fbe9e9}
   <div class="brand">
     <span class="logo">WWT</span>
     <div>
-      <h1>金蝶凭证工具 <span class="ver">P1.2.34</span></h1>
+      <h1>金蝶凭证工具 <span class="ver">P1.2.35</span></h1>
       <div class="sub">纯前端离线版 · 双击即用 · 数据只存在本机，不上传任何服务器</div>
     </div>
   </div>
@@ -372,9 +374,10 @@ tr.bad:hover td{background:#fbe9e9}
     <div class="rowacts">
       <button class="btn" onclick="UI.newRule()">✚ 新增规则</button>
       <button class="btn" onclick="UI.saveCfg()">💾 保存所有规则</button>
+      <button class="btn warn" onclick="UI.openGlobalExcludes()">🚫 全局排除（总开关）</button>
       <button class="btn ghost" onclick="UI.exportRules()">📤 导出规则</button>
       <button class="btn ghost" onclick="UI.importRules()">📥 导入规则</button>
-      <span class="tip">规则改动要点「保存所有规则」才会生效</span>
+      <span class="tip">规则改动要点「保存所有规则」才会生效；全局排除在弹窗里保存后即生效（也写入本地存档）</span>
     </div>
     <div id="ruleTabs" class="src-tabs"></div>
     <div id="ruleList"></div>
@@ -2653,6 +2656,16 @@ window.WWT_ENGINE = (function () {
     if (!ex || !ex.length) return false;
     return evalConditions(row, ex, rule.excludeLogic || "AND", curSrc, idx);
   }
+  // 【P1.2.35】全局排除（按业务源分组的总开关）：在所有针对该业务源的规则之前
+  // 先过一道粗过滤——命中则不进任何针对该业务源的规则 rowsIn，且不计入 audit。
+  // 与规则级 excludeWhen 行为一致；但作用范围是"该业务源下所有规则"，用于
+  // 「厂牌=资产工具库」「维修工单不挂凭证」这类横扫整张表的统一排除。
+  function isExcludedByGlobals(row, curSrc, idx, globalExcludes) {
+    if (!globalExcludes || typeof globalExcludes !== "object") return false;
+    const cfg = globalExcludes[curSrc];
+    if (!cfg || !cfg.conditions || !cfg.conditions.length) return false;
+    return evalConditions(row, cfg.conditions, cfg.logic || "AND", curSrc, idx);
+  }
   function linesKey(lines) {
     return JSON.stringify(lines, (k, v) => (k === "_uid" ? undefined : v));
   }
@@ -2687,12 +2700,14 @@ window.WWT_ENGINE = (function () {
   /* ============================================================
    * 主生成：业务行 → 凭证草稿
-   * opts: {rules, biz, monthly, maps, base, selectedIds, modeOverride, groupByOverride, voucherDate, syncBizDate}
+   * opts: {rules, biz, monthly, maps, base, selectedIds, modeOverride, groupByOverride, voucherDate, syncBizDate, globalExcludes}
+   *   globalExcludes（【P1.2.35】）= { [srcKey]: { logic, conditions:[...] } }，按业务源分组的总开关
    * ============================================================ */
   function generate(opts) {
     const idx = buildIndex(opts.base);
     const monthly = opts.monthly || {};
     const sel = opts.selectedIds;              // Set 或 null（null=全跑）
+    const globalExcludes = opts.globalExcludes || {};   // 【P1.2.35】
     let vno = parseInt(monthly.vstart, 10); if (!isFinite(vno)) vno = 1;
     let billHead = parseInt(monthly.bstart, 10); if (!isFinite(billHead)) billHead = 1;
     const acctDate = clean(opts.voucherDate) || clean(monthly.date);
@@ -2700,6 +2715,7 @@ window.WWT_ENGINE = (function () {
     const out = [];
     const missing = [];
     const usedRows = {};        // src -> Set(index)
+    const globalExcludedUsed = {};  // 【P1.2.35】src -> Set(index)，全局排除行不进任何规则 rowsIn
     const stats = { rules: 0, rows: 0, vouchers: 0, entries: 0, skipped: [] };
     for (const rule of (opts.rules || [])) {
@@ -2709,12 +2725,18 @@ window.WWT_ENGINE = (function () {
       const rowsAll = (opts.biz && opts.biz[curSrc]) || [];
       if (!rowsAll.length) { stats.skipped.push({ rule: rule.name, why: "无业务数据" }); continue; }
       if (!usedRows[curSrc]) usedRows[curSrc] = new Set();
+      if (!globalExcludedUsed[curSrc]) globalExcludedUsed[curSrc] = new Set();
       // 命中行（同一行只归属第一条命中的规则）
       const rowsIn = [];
       for (let i = 0; i < rowsAll.length; i++) {
         if (usedRows[curSrc].has(i)) continue;
         const row = rowsAll[i];
+        // 【P1.2.35】全局排除（按业务源分组的总开关）：命中行不进任何针对该业务源的规则
+        if (isExcludedByGlobals(row, curSrc, idx, globalExcludes)) {
+          globalExcludedUsed[curSrc].add(i);
+          continue;
+        }
         // 【P1.2.34】规则级排除：满足 excludeWhen 的行整条跳过，不进 rowsIn、不进 audit
         if (isExcludedByRule(row, rule, curSrc, idx)) continue;
         if (evalConditions(row, rule.conditions || [], rule.logic || "AND", curSrc, idx)) {
@@ -2975,6 +2997,7 @@ window.WWT_ENGINE = (function () {
     const monthly = opts.monthly || {};
     const acctDate = clean(opts.voucherDate) || clean(monthly.date);
     const usedRows = new Set();   // 本规则命中的业务行索引集合（Step 2 标记，Step 3 覆盖率审计复用）
+    const globalExcludes = opts.globalExcludes || {};   // 【P1.2.35】
     /* ---- Step 1：找出源表"应当处理的行"（candidate）：抽 rule 里的「=」条件当候选过滤器。
        只在 conditions 顶层 AND 段时按 = 条件过滤；OR 段不参与（避免把 OR 多值都当 AND 求交集）。 */
@@ -3027,6 +3050,8 @@ window.WWT_ENGINE = (function () {
       for (let i = 0; i < rowsAll.length; i++) {
         if (usedRows.has(i)) continue;
         const row = rowsAll[i];
+        // 【P1.2.35】全局排除（按业务源分组的总开关）：命中行不进任何 audit 统计
+        if (isExcludedByGlobals(row, curSrc, idx, globalExcludes)) continue;
         // 【P1.2.34】规则级排除：跳过 excludeWhen 命中的行
         if (isExcludedByRule(row, r, curSrc, idx)) continue;
         if (evalConditions(row, r.conditions || [], r.logic || "AND", curSrc, idx)) {
@@ -3182,9 +3207,16 @@ window.WWT_ENGINE = (function () {
      *   neverMatchedRows = candidatesMissed（兼容旧字段名） */
     const candidatesMissed = [], excludedRows = [];
     let ruleExcludedCount = 0, ruleExcludedAmount = 0;
+    let globalExcludedCount = 0, globalExcludedAmount = 0;   // 【P1.2.35】
     for (let i = 0; i < rowsAll.length; i++) {
       if (matchedIdxs.has(i)) continue;
       const row = rowsAll[i];
+      // 【P1.2.35】全局排除：命中行不进任何 audit 统计
+      if (isExcludedByGlobals(row, curSrc, idx, globalExcludes)) {
+        globalExcludedCount++;
+        if (amountCol) globalExcludedAmount += num(row[amountCol]);
+        continue;
+      }
       // 【P1.2.34】规则级排除：满足 excludeWhen 的行不进任何 audit 统计
       if (isExcludedByRule(row, rule, curSrc, idx)) {
         ruleExcludedCount++;
@@ -3243,6 +3275,9 @@ window.WWT_ENGINE = (function () {
         // 【P1.2.34】规则级排除：满足 excludeWhen 的行彻底从 audit 视野消失（业务上合法跳过）
         rule_excluded: ruleExcludedCount,
         rule_excluded_amount: round2(ruleExcludedAmount),
+        // 【P1.2.35】全局排除（按业务源分组的总开关）：扫表即跳，连候选都不进
+        global_excluded: globalExcludedCount,
+        global_excluded_amount: round2(globalExcludedAmount),
         // 兼容旧字段（仍叫 never_matched，但其内容仅含真正应处理子集漏命中的行）
         never_matched: candidatesMissed.length,
         unmatched_amount: round2(unmatchedAmt),
@@ -3418,7 +3453,7 @@ window.WWT_ENGINE = (function () {
     buildIndex, getField, compare, evalConditions, applyTransform,
     parseAmtExpr, sumAmtExpr, evalAmtExpr, isAutoDiff, splitFieldsOf,
     calcDimValues, leafSubject, resolveEffectiveLines, lookupTypeDim,
-    isExcludedByRule,
+    isExcludedByRule, isExcludedByGlobals,
     generate, balanceCheck, buildKingdee, detect, auditRule,
     lookupMap, lookupTypeMap,
   };
@@ -3437,13 +3472,13 @@ const nz = v => (v === null || v === undefined || v === "" ? "" : v);
 /* 全局状态 */
 const S = window.__STATE__ = {
-  monthly:{}, maps:{}, rules:[],
+  monthly:{}, maps:{}, rules:[], globalExcludes:{},   // 【P1.2.35】按业务源分组的全局排除（总开关）
   base:{}, biz:{}, draft:[], missing:[], balance:null,
   selRules:new Set(), cvOut:null, checkRows:null,
 };
 /* ---------------- 版本 & 框架自动更新（只更新程序本身，本地数据/规则不动） ---------------- */
-const WWT_VER=(function(){const raw='P1.2.34';return raw.indexOf('__WVER__')>=0?'P1.2.10':raw;})();
+const WWT_VER=(function(){const raw='P1.2.35';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';
@@ -3773,7 +3808,7 @@ function uid(){return 'VR'+Date.now().toString(36)+Math.random().toString(36).sl
 /* ---------------- 配置（localStorage） ---------------- */
 const LS='wwt_fe_cfg_v1';
 function saveCfg(){
-  localStorage.setItem(LS,JSON.stringify({monthly:S.monthly,maps:S.maps,rules:S.rules}));
+  localStorage.setItem(LS,JSON.stringify({monthly:S.monthly,maps:S.maps,rules:S.rules,globalExcludes:S.globalExcludes||{}}));
   toast('配置已保存到本机');
 }
 function loadCfg(){
@@ -3785,12 +3820,15 @@ function loadCfg(){
       S.monthly=Object.assign({},P.monthly,o.monthly||{});
       S.maps=Object.assign({},P.maps,o.maps||{});
       S.rules=(o.rules&&o.rules.length)?o.rules:deepCopy(P.rules||[]);
+      // 【P1.2.35】全局排除（按业务源分组的总开关）：老存档没这字段 → 给空对象
+      S.globalExcludes=(o.globalExcludes&&typeof o.globalExcludes==='object')?o.globalExcludes:{};
       return;
     }catch(e){}
   }
   S.monthly=deepCopy(P.monthly||{});
   S.maps=deepCopy(P.maps||{});
   S.rules=deepCopy(P.rules||[]);
+  S.globalExcludes={};
 }
 /* ---------------- Excel 读取（SheetJS，失败自动走兜底） ---------------- */
@@ -5141,6 +5179,7 @@ function doGenerate(){
       selectedIds:sel, modeOverride:$('genMode').value||'',
       groupByOverride:$('genGroupBy').value.trim()||'',
       voucherDate:date, syncBizDate:$('genSyncBiz').checked,
+      globalExcludes:S.globalExcludes||{},   // 【P1.2.35】
     });
   }catch(e){ $('genBanner').innerHTML='<div class="banner err"><b>生成出错：</b>'+esc(e.message)+'</div>'; toast('生成失败：'+e.message); return; }
   S.draft=res.rows; S.missing=res.missing;
@@ -5275,6 +5314,7 @@ function previewRule(ruleId){
     res=E.auditRule({
       rule:r, biz:S.biz, base:S.base, maps:S.maps, monthly:S.monthly,
       voucherDate:date, syncBizDate:$('genSyncBiz')&&$('genSyncBiz').checked,
+      globalExcludes:S.globalExcludes||{},   // 【P1.2.35】
     });
   }catch(e){
     $('modal').innerHTML='<div class="modalbox"><div class="modalhd"><h3>规则预览失败</h3><button class="mini" onclick="UI.closeModal()">✕ 关闭</button></div>'+
@@ -5289,6 +5329,7 @@ function previewRule(ruleId){
     gen=E.generate({
       rules:[Object.assign({},r,{enabled:true})], biz:S.biz, base:S.base, maps:S.maps,
       monthly:S.monthly, voucherDate:date, syncBizDate:$('genSyncBiz')&&$('genSyncBiz').checked,
+      globalExcludes:S.globalExcludes||{},   // 【P1.2.35】
     });
   }catch(e){ gen=null; }
   _previewCache={rule:r, res:res, gen:gen, date:date};
@@ -6714,6 +6755,88 @@ window.UI={
   toggleRuleBody:i=>{const b=$('rb'+i);if(b)b.classList.toggle('on');},
   toggleRuleSel:cb=>{cb.checked?S.selRules.add(cb.dataset.rid):S.selRules['delete'](cb.dataset.rid);},
   selAllRules:v=>{S.selRules.clear();if(v)S.rules.forEach(r=>S.selRules.add(r.id));renderRuleChecks();},
+  // 【P1.2.35】全局排除弹窗：按业务源分组的总开关（在外面，不嵌在每条规则里）
+  openGlobalExcludes:()=>{
+    const ge = S.globalExcludes || (S.globalExcludes = {});
+    // 从 WWT_CONST.BIZ_SLOTS 拿业务源 key 与显示名
+    const slots = (window.WWT_CONST && window.WWT_CONST.BIZ_SLOTS) || [];
+    let html = '<div class="modalbox" style="max-width:780px;max-height:88vh;display:flex;flex-direction:column">'+
+      '<div class="modalhd"><h3>🚫 全局排除条件（按业务源分组的总开关）</h3>'+
+      '<button class="mini" onclick="UI.closeModal()">✕ 关闭</button></div>'+
+      '<div class="modalbd" style="overflow:auto;flex:1;min-height:0">'+
+      '<div class="banner" style="margin-bottom:10px">'+
+      '<b>用法：</b>按业务源分组配置「命中即跳」的排除条件。<b>满足条件的行不进任何针对该业务源的规则</b>，'+
+      '且不计入覆盖率审计统计（不会被误标成"遗漏"）。'+
+      '<br>典型场景：「销售已确认」里厂牌 = <code>资产工具库</code> 的行由其他流程处理，整张表一刀切掉。'+
+      '<br><span style="color:#a40e26">⚠ 全局排除是「粗过滤」，会作用于该业务源下<b>所有规则</b>；想只排除某一条规则请在「编辑规则 → 排除条件」单独配。</span>'+
+      '</div>';
+    // 每个业务源一个折叠 details
+    for (const s of slots) {
+      const cfg = ge[s.key] || (ge[s.key] = { logic: 'AND', conditions: [] });
+      const condHTML = (cfg.conditions || []).map((c, i) => condRowHTML(i, c)).join('');
+      const condsId = 'ge_conds_' + s.key;
+      html += '<details open style="border:1px solid #dde2e8;border-radius:6px;margin:6px 0;background:#fff">'+
+        '<summary style="padding:8px 12px;cursor:pointer;font-weight:600">'+
+        '<span style="display:inline-block;width:160px">'+esc(s.label)+'</span>'+
+        '<span style="color:#a40e26;font-size:12px">['+((cfg.conditions||[]).length)+' 个条件]</span>'+
+        '</summary>'+
+        '<div style="padding:4px 12px 12px">'+
+        '<div class="row" style="margin-bottom:6px">'+
+        '<span class="w80">逻辑</span>'+
+        '<select class="w80" data-ge="logic" data-src="'+esc(s.key)+'">'+
+        '<option value="AND"'+((cfg.logic||'AND')==='AND'?' selected':'')+'>AND（全部满足）</option>'+
+        '<option value="OR"'+(cfg.logic==='OR'?' selected':'')+'>OR（任一满足）</option>'+
+        '</select>'+
+        '<span style="margin-left:12px;font-size:11.5px;color:#888">满足 = 该行被排除（不参与任何规则、不进 audit）</span>'+
+        '</div>'+
+        '<div class="condrows" id="'+condsId+'" data-src="'+esc(s.key)+'">'+condHTML+'</div>'+
+        '<button class="mini" onclick="UI.addGlobalExcludeCond(\''+s.key+'\')">+ 加条件</button>'+
+        '</div></details>';
+    }
+    html += '</div>'+
+      '<div class="modalft">'+
+      '<button class="btn ghost" onclick="UI.closeModal()">取消</button>'+
+      '<button class="btn primary" onclick="UI.saveGlobalExcludes()">💾 保存全局排除</button>'+
+      '</div></div>';
+    const m = $('modal'); m.innerHTML = html; m.style.display = 'flex';
+  },
+  // 在某个业务源分组下加一行条件
+  addGlobalExcludeCond:(srcKey)=>{
+    const ge = S.globalExcludes || (S.globalExcludes = {});
+    if (!ge[srcKey]) ge[srcKey] = { logic: 'AND', conditions: [] };
+    ge[srcKey].conditions.push({ field: '', op: '=', value: '', logic: '' });
+    UI.openGlobalExcludes();   // 直接重渲染（简单实现；数据在 S.globalExcludes 里有真实存储）
+  },
+  // 收集弹窗里的输入，写回 S.globalExcludes 并 saveCfg
+  saveGlobalExcludes:()=>{
+    const ge = S.globalExcludes || (S.globalExcludes = {});
+    // 收集每个业务源的 logic + conditions
+    document.querySelectorAll('[data-ge="logic"][data-src]').forEach(sel=>{
+      const src = sel.getAttribute('data-src');
+      if (!ge[src]) ge[src] = { logic: 'AND', conditions: [] };
+      ge[src].logic = sel.value || 'AND';
+    });
+    document.querySelectorAll('.condrows[data-src]').forEach(box=>{
+      const src = box.getAttribute('data-src');
+      if (!ge[src]) ge[src] = { logic: 'AND', conditions: [] };
+      const rows = [...box.querySelectorAll(':scope > .condrow')].map(row => {
+        const f = (row.querySelector('[data-f="field"]') || {}).value || '';
+        const op = (row.querySelector('[data-f="op"]')    || {}).value || '=';
+        const v  = (row.querySelector('[data-f="value"]') || {}).value || '';
+        const lg  = (row.querySelector('[data-f="logic"]')|| {}).value || '';
+        return { field: f, op: op, value: v, logic: lg };
+      }).filter(c => c.field && c.op);   // 空条件过滤掉
+      ge[src].conditions = rows;
+      // 没有任何有效条件 → 整个 srcKey 配置删掉（保持 cfg 干净）
+      if (!rows.length) delete ge[src];
+    });
+    saveCfg();
+    UI.closeModal();
+    const totalSrc = Object.keys(ge).filter(k => (ge[k].conditions||[]).length).length;
+    const totalCond = Object.values(ge).reduce((s, x) => s + ((x && x.conditions) ? x.conditions.length : 0), 0);
+    toast('已保存全局排除：'+totalSrc+' 个业务源 / '+totalCond+' 条条件');
+  },
   // 规则编辑器
   closeModal:()=>{$('modal').style.display='none';editing=null;editingIdx=-1;renderRules();},
   saveRuleForm:()=>{

package/dist/version.json CHANGED Viewed

@@ -1,8 +1,8 @@
 {
-  "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 展示）。例：「厂牌 = 资产工具库」时整条不处理、不计入审计。"
+  "ver": "P1.2.35",
+  "npm": "1.2.35",
+  "url": "https://cdn.jsdelivr.net/npm/wwt-certificate-tool@1.2.35/dist/app.html",
+  "url_unpkg": "https://unpkg.com/wwt-certificate-tool@1.2.35/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.35.html",
+  "note": "①「全局排除」机制升级：把排除条件从每条规则里挪出来，做成外面工具栏的「🚫 全局排除（总开关）」按钮，按业务源分组配置（折叠面板）。命中行不进任何针对该业务源的规则，且不计入审计统计。典型场景：「销售已确认」里厂牌=资产工具库 的行整张表一刀切掉。② cfg 新增 globalExcludes 字段（saveCfg/loadCfg 自动读写）；引擎新增 isExcludedByGlobals()，generate/auditRule 三处接入。③ by_source 返回值新增 global_excluded/global_excluded_amount 字段（与 P1.2.34 的 rule_excluded 并列）。④ 单规则的 rule.excludeWhen 保留作为兜底细粒度配置。⑤ 工具栏新增橙底按钮 + 新增 .btn.warn 样式；弹窗复用 condRowHTML 条件行模板。回归 202/202 全通过。"
 }

package/package.json CHANGED Viewed

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