wwt-certificate-tool 1.2.53 → 1.2.55

package/dist/app.html

@@ -3,7 +3,7 @@
 <head>
 <meta charset="UTF-8">
 <meta name="viewport" content="width=device-width,initial-scale=1">
-<title>WWT 金蝶凭证工具 · 纯前端版 P1.2.53</title>
+<title>WWT 金蝶凭证工具 · 纯前端版 P1.2.55</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}
@@ -320,7 +320,7 @@ input[data-f="field"][list^="dlGe_"]::placeholder{color:#a8861f;font-style:itali
   <div class="brand">
     <span class="logo">WWT</span>
     <div>
-      <h1>金蝶凭证工具 <span class="ver">P1.2.53</span></h1>
+      <h1>金蝶凭证工具 <span class="ver">P1.2.55</span></h1>
       <div class="sub">纯前端离线版 · 双击即用 · 数据只存在本机，不上传任何服务器</div>
     </div>
   </div>
@@ -332,6 +332,7 @@ input[data-f="field"][list^="dlGe_"]::placeholder{color:#a8861f;font-style:itali
     <button class="btn ghost" onclick="UI.exportCfg()">📤 导出配置</button>
     <button class="btn ghost" onclick="UI.importCfg()">📥 导入配置</button>
     <button class="btn danger ghost" onclick="UI.clearAll()">⚠ 清空全部</button>
+    <button class="btn ghost" onclick="UI.clearBiz()" title="只清空本月业务数据表，保留基础数据、规则、映射和配置">🧹 清空业务数据</button>
     <button class="btn ghost" onclick="UI.checkUpdate()">🔄 检查更新</button>
     <button class="btn ghost" onclick="UI.setUpdateUrl()">⚙ 更新设置</button>
   </div>
@@ -1611,6 +1612,14 @@ window.WWT_ENGINE = (function () {
     return raw.split(/[+,,]/).map(s => s.trim()).filter(Boolean);
   }
 
+  // 【P1.2.54】分录级拆分字段：每条分录可单独指定 lineSplitBy；空表示跟随规则级 lineSplitBy
+  function splitFieldsOfLine(line, rule) {
+    const raw = clean(line && line.lineSplitBy);
+    if (raw === "-") return [];   // 显式写 "-" 表示本行强制不拆分（覆盖规则级）
+    if (!raw) return splitFieldsOf(rule);
+    return raw.split(/[+,,]/).map(s => s.trim()).filter(Boolean);
+  }
+
   /* ---------------- 分支选取 ---------------- */
   function resolveEffectiveLines(rule, row, curSrc, idx) {
     const branches = rule.branches || [];
@@ -1767,14 +1776,14 @@ window.WWT_ENGINE = (function () {
 
         // Step B：sub_bucket = group_key值 × 分支lines
         // 【P1.2.40】全部汇总且按非单位名称字段拆证时，取消子桶按单位名称细分，实现真正的按该字段汇总
-        // 【P1.2.46】若规则配置了「拆分字段」，子桶按拆分字段拆分，不再按单位名称细分（实现 1 证内按供应商等字段分录）
+        // 【P1.2.54】sub_bucket 不再按拆分字段细分；拆分粒度下沉到每条分录行的 groups 阶段，
+        // 这样同一张凭证内可以「借方按单号拆、贷方汇总」等混合拆分需求。
         const groupKeyField = (genMode === "一对一" || splitFs.length > 0) ? null :
                               (genMode === "全部汇总" && gb && gb !== "单位名称") ? null : "单位名称";
         const subMap = new Map();
         for (const it of bucket) {
           const gv = groupKeyField ? (clean(it.row[groupKeyField]) || "(空)") : "";
-          const splitT = splitFs.map(f => clean(it.row[f]));
-          const k = JSON.stringify([gv, splitT, linesKey(it._lines)]);
+          const k = JSON.stringify([gv, linesKey(it._lines)]);
           if (!subMap.has(k)) subMap.set(k, { gv: gv, lines: it._lines, items: [], acct: {} });
           subMap.get(k).items.push(it);
         }
@@ -1803,10 +1812,12 @@ window.WWT_ENGINE = (function () {
             const line = sub.lines[li];
             if (isAutoDiff(line)) continue;
             const groups = new Map();
+            // 【P1.2.54】本行拆分字段优先于规则级；空表示跟随规则级（兼容旧规则）
+            const lineSplitFs = splitFieldsOfLine(line, rule);
             for (const it of sub.items) {
               const dv = calcDimValues(line, it.row, curSrc, idx, sub);
               const subj = leafSubject(line.subject, it.row, dv, curSrc, idx);
-              const splitT = splitFs.map(f => clean(it.row[f]));
+              const splitT = lineSplitFs.map(f => clean(it.row[f]));
               const dimKey = Object.keys(dv).sort().map(d => [d, dv[d].name]);
               const gkey = JSON.stringify([subj, dimKey, splitT]);
               if (!groups.has(gkey)) {
@@ -1814,7 +1825,7 @@ window.WWT_ENGINE = (function () {
               }
               const g = groups.get(gkey);
               g.sgn += sumAmtExpr(it.row, line.amountField);
-              splitFs.forEach((f, fi) => {
+              lineSplitFs.forEach((f, fi) => {
                 const v = splitT[fi];
                 if (v) { if (!g.vals[f]) g.vals[f] = []; if (g.vals[f].indexOf(v) < 0) g.vals[f].push(v); }
               });
@@ -2157,16 +2168,18 @@ window.WWT_ENGINE = (function () {
               const line = sub.lines[li];
               if (isAutoDiff(line)) continue;
               const groups = new Map();
+              // 【P1.2.54】本行拆分字段优先于规则级；空表示跟随规则级（兼容旧规则）
+              const lineSplitFs = splitFieldsOfLine(line, r);
               for (const it of sub.items) {
                 const dv = calcDimValues(line, it.row, curSrc, idx, sub);
                 const subj = leafSubject(line.subject, it.row, dv, curSrc, idx);
-                const splitT = splitFs.map(f => clean(it.row[f]));
+                const splitT = lineSplitFs.map(f => clean(it.row[f]));
                 const dimKey = Object.keys(dv).sort().map(d => [d, dv[d].name]);
                 const gkey = JSON.stringify([subj, dimKey, splitT]);
                 if (!groups.has(gkey)) groups.set(gkey, { subj: subj, dv: dv, sgn: 0, vals: {}, first: it });
                 const g = groups.get(gkey);
                 g.sgn += sumAmtExpr(it.row, line.amountField);
-                splitFs.forEach((f, fi) => {
+                lineSplitFs.forEach((f, fi) => {
                   const v = splitT[fi];
                   if (v) { if (!g.vals[f]) g.vals[f] = []; if (g.vals[f].indexOf(v) < 0) g.vals[f].push(v); }
                 });
@@ -2528,7 +2541,7 @@ const S = window.__STATE__ = {
 };
 
 /* ---------------- 版本 & 框架自动更新（只更新程序本身，本地数据/规则不动） ---------------- */
-const WWT_VER=(function(){const raw='P1.2.53';return raw.indexOf('__WVER__')>=0?'P1.2.10':raw;})();
+const WWT_VER=(function(){const raw='P1.2.55';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';
@@ -4139,6 +4152,7 @@ function lineHTML(bi,li,l){
     '<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="实收金额+折扣费 / -折扣费 / 金额*0.13 / 金额/数量" list="dlAmountFields" title="支持四则运算与括号：字段名/数字常量；可下拉选「__AUTO_DIFF__」自动补差额；例：实收金额+折扣费、-折扣费、金额*0.13">'+
+    '<span class="w70" style="margin-left:8px">本行拆分</span><input class="w120" data-lf="lineSplitBy" value="'+esc(l.lineSplitBy||'')+'" placeholder="空=跟随规则" title="空=使用规则级拆分字段；填字段名=本行单独按该字段拆分；填 - = 本行强制不拆分">'+
     '<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>'+
@@ -4195,6 +4209,7 @@ function collectLines(rows){
     }).filter(a=>a.dim);
     return {side:g('side').value,subject:g('subject').value.trim(),
             amountField:g('amountField').value.trim(),summary:g('summary').value.trim(),
+            lineSplitBy:g('lineSplitBy')?g('lineSplitBy').value.trim():'',
             auxiliaries:auxs};
   });
 }
@@ -6110,7 +6125,7 @@ window.UI={
   restoreUpgradeBackup:restoreUpgradeBackup, dismissUpgradeBackup:dismissUpgradeBackup,
   showUpgradeHelp:showUpgradeHelp, checkPendingUpgradeBackup:checkPendingUpgradeBackup,
   renderPersistHint:renderPersistHint,
-  clearAll:clearAll, switchTab:switchTab,
+  clearAll:clearAll, clearBiz:clearBiz, switchTab:switchTab,
 };
 
 if(document.readyState==='loading')document.addEventListener('DOMContentLoaded',init);

package/dist/version.json

@@ -1,8 +1,8 @@
 {
-  "ver": "P1.2.53",
-  "npm": "1.2.53",
-  "url": "https://cdn.jsdelivr.net/npm/wwt-certificate-tool@1.2.53/dist/app.html",
-  "url_unpkg": "https://unpkg.com/wwt-certificate-tool@1.2.53/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.53.html",
-  "note": "① 内置默认基础表/规则/映射：新安装或分享打开即自带当前这套标准配置。② 生成凭证后实际生成了凭证的规则自动变绿并显示「已生成」徽章，状态持久化。③ 新增「清空已生成」按钮。④ 凭证起始号放到「④ 生成凭证」页生成栏。⑤ 对碰检测跳过未结算单据，缺失清单增加「单号」列。⑥ 【P1.2.53】对碰清单增加「付款方式/结算方式」列；凭证审核表「核算维度」列移到「科目名称」后。"
+  "ver": "P1.2.55",
+  "npm": "1.2.55",
+  "url": "https://cdn.jsdelivr.net/npm/wwt-certificate-tool@1.2.55/dist/app.html",
+  "url_unpkg": "https://unpkg.com/wwt-certificate-tool@1.2.55/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.55.html",
+  "note": "① 内置默认基础表/规则/映射：新安装或分享打开即自带当前这套标准配置。② 生成凭证后实际生成了凭证的规则自动变绿并显示「已生成」徽章，状态持久化。③ 新增「清空已生成」按钮。④ 凭证起始号放到「④ 生成凭证」页生成栏。⑤ 对碰检测跳过未结算单据，缺失清单增加「单号」与「付款方式/结算方式」列。⑥ 凭证审核表「核算维度」列移到「科目名称」后。⑦ 分录级拆分字段：每条分录可单独设置拆分字段，实现一张凭证内借方按单号拆、贷方汇总等混合拆分。⑧ 【P1.2.55】顶部工具栏增加「清空业务数据」按钮，只清本月业务数据表，保留基础数据、规则、映射和配置。"
 }

package/package.json

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