gm-printer 10.42.2 → 10.42.3-beta.0

package/src/printer/multi_column.js

@@ -5,6 +5,7 @@ export const INDEX_KEY = '序号'
 
 const SPECIAL_ROW_KEYS = [
   '_special',
+  '_specialText', // 分类标题行（三级分类/商品分类的品类名行），漏掉会在多栏重排时被当普通行丢弃
   '_diyCategorySubtotal',
   '_diyTagSubtotal',
   '_customTr'
@@ -345,6 +346,58 @@ export const ensureRowSerialKeys = (
   return next
 }
 
+/**
+ * 统一收敛多栏序号，修复「半行续号」与「空行起始序号」两处独立计算导致的序号重复
+ * （如 5 条数据双栏：第三行第二列续号为 6，第四行空行起始又编出 6）。
+ * - 先给最后一个实数据行的右侧空格续号并写回（渲染侧 ensureRowSerialKeys 不再另行补号）
+ * - 空行序号以「全表已用最大序号 + 1」连续重编，与半行续号同源
+ * 幂等，重复执行结果不变；仅 fillIndex 开启时生效
+ */
+export const normalizeMultiSerials = (rows, colNumber, fillIndex) => {
+  if (!fillIndex || !rows?.length || colNumber < 1) return rows
+  const keys = getSerialKeys(colNumber)
+  const isFill = row => row && !row._isEmptyData && !isSpecialTableRow(row)
+
+  const result = rows.slice()
+
+  // 实数据行已用最大序号
+  let max = 0
+  result.forEach(row => {
+    if (!isFill(row)) return
+    keys.forEach(key => {
+      const n = toSerialNumber(row?.[key])
+      if (n != null && n > max) max = n
+    })
+  })
+
+  // 1. 最后一个实数据行的空格续号（写回数据，保证序号只有一处来源）
+  for (let i = result.length - 1; i >= 0; i--) {
+    if (!isFill(result[i])) continue
+    const next = { ...result[i] }
+    keys.forEach(key => {
+      if (!isFilledIndexValue(next[key])) {
+        max += 1
+        next[key] = max
+      }
+    })
+    result[i] = next
+    break
+  }
+
+  // 2. 空行从 max+1 连续重编，不会与实数据序号/半行续号撞号
+  result.forEach((row, i) => {
+    if (!row?._isEmptyData || isSpecialTableRow(row)) return
+    const next = { ...row }
+    keys.forEach(key => {
+      max += 1
+      next[key] = max
+    })
+    result[i] = next
+  })
+
+  return result
+}
+
 /** 最后一行右侧空单元格续编序号 */
 export const fillPartialLastRow = (rows, colNumber, fillIndex) => {
   if (!fillIndex || !rows?.length || colNumber <= 1) return rows

package/src/printer/page_summary.js

@@ -1,6 +1,6 @@
 import React from 'react'
 import _ from 'lodash'
-import { getDataKey, isMultiTable } from '../util'
+import { getDataKey, isMultiTable, isMaskedValue, MASKED_VALUE } from '../util'
 import Big from 'big.js'
 import { observer } from 'mobx-react'
 import { get } from 'mobx'
@@ -19,6 +19,8 @@ const regExp = text => {
  * @returns {*|string}
  */
 const sumCol = (key, dataList, summaryFieldsResultToNumber = []) => {
+  // 任一值脱敏 '***' 则合计显 '***'(原逻辑 Big('***') 抛异常被 catch,合计显空串)
+  if (dataList.some(item => isMaskedValue(item[key]))) return MASKED_VALUE
   let result
   try {
     result = dataList

package/src/printer/printer.js

@@ -132,7 +132,7 @@ class Printer extends React.Component {
         printerStore.changeTableData()
         printerStore.computedPages()
       }
-      // 获取剩余空白高度，传到editor
+      // 获取剩余空白高度，传到 editor
       getremainpageHeight && getremainpageHeight(printerStore.remainPageHeight)
     }
     printerStore.setReady(true)

package/src/printer/store.js

@@ -7,7 +7,8 @@ import {
   getDataKey,
   caclSingleDetailsPageHeight,
   getArrayMid,
-  getOverallOrderTrHeight
+  getOverallOrderTrHeight,
+  isMaskedValue
 } from '../util'
 import {
   isDetailOneRowSelectKey,
@@ -23,6 +24,7 @@ import {
   detectColNumber,
   ensureRowSerialKeys,
   flattenHorizontalPackedRows,
+  normalizeMultiSerials,
   repackVerticalTableByPageRanges,
   packVerticalNewspaper,
   packHorizontalRowMajor,
@@ -45,6 +47,8 @@ const canSplitRowDetails = (dataKey, row) => {
 }
 
 const price = (n, f = 2) => {
+  // 脱敏值 '***' 原样返回(不能走 isNaN 判空,空单元格仍需显空)
+  if (isMaskedValue(n)) return n
   if (isNaN(n)) return null
   return Big(n || 0).toFixed(f)
 }
@@ -394,7 +398,7 @@ class PrinterStore {
         const currentPageMinimumHeight =
           allPagesHaveThisHeight + allTableHaveThisHeight
         // 最后一项是表格时，末页仍要渲染签名：装行可用高度预留签名，避免空行顶进签名区
-        const isLastContent = index === this.config.contents.length - 1
+        const isLastContent = index === contentsLength - 1
         const signReserve = isLastContent ? this.getSignHeight() : 0
         /** 当前page可容纳的table高度 */
         let pageAccomodateTableHeight = roundHeight(
@@ -486,7 +490,7 @@ class PrinterStore {
                 )
                 break
               }
-              // 行无法拆分（普通长文本列）或拆分失败
+              // 行无法拆分（普通长文本列）或拆分失败时，强制推进 end 防止死循环
               if (end === begin) {
                 // 新一页可容纳的 table 高度（页高 - 页眉页脚）
                 const fullPageAccomodateTableHeight = roundHeight(
@@ -605,9 +609,8 @@ class PrinterStore {
       currentPageHeight += this.getSignHeight()
     }
 
-    this.remainPageHeight = Math.max(
-      0,
-      Math.round(pageHeight - currentPageHeight)
+    this.remainPageHeight = Math.round(
+      Math.max(0, pageHeight - currentPageHeight)
     )
     this.isSave = false
     this.config.isSave = false
@@ -1045,7 +1048,12 @@ class PrinterStore {
       )
     )
     withPartial.push(...fillList)
-    this.data._table[dataKey] = withPartial
+    // 半行续号与空行起始序号统一收敛，防止两处各自计算造成序号重复（如双栏 5 条出现两个 6）
+    this.data._table[dataKey] = normalizeMultiSerials(
+      withPartial,
+      colNumber,
+      this.fillIndex
+    )
   }
 
   @action.bound

package/src/printer/table_diy_overallOrder_tr.js

@@ -2,10 +2,9 @@ import React from 'react'
 import PropTypes from 'prop-types'
 import _ from 'lodash'
 // import Big from 'big.js'
-import { coverDigit2Uppercase, getDataKey } from '../util'
+import { coverDigit2Uppercase, getDataKey, maskedSum } from '../util'
 import { observer } from 'mobx-react'
 import classNames from 'classnames'
-import Big from 'big.js'
 
 const DiyOverallOrder = props => {
   const {
@@ -15,20 +14,14 @@ const DiyOverallOrder = props => {
   } = props
   const tableData = printerStore.data._table[getDataKey(dataKey)] || []
 
-  // 计算合计
+  // 计算合计:任一渲染结果脱敏 '***' 则合计显 '***'(整格判定假设同 table_diy_summary_tr)
   const sumData = field => {
-    return _.reduce(
-      tableData,
-      (a, b, i) => {
-        let result = a
-        const bRes = printerStore
-          .templateTable(field, dataKey, i, pageIndex)
-          .replace(/\(\)/g, '')
-        result = a.plus(+bRes || 0)
-        return result
-      },
-      Big(0)
-    ).toFixed(2)
+    const values = _.map(tableData, (b, i) =>
+      printerStore
+        .templateTable(field, dataKey, i, pageIndex)
+        .replace(/\(\)/g, '')
+    )
+    return maskedSum(values)
   }
 
   if (!diyOverallOrder?.show || !printerStore?.ready) {

package/src/printer/table_diy_summary_tr.js

@@ -1,11 +1,15 @@
 import React from 'react'
 import PropTypes from 'prop-types'
 import _ from 'lodash'
-import { coverDigit2Uppercase, getDataKey, isMultiTable } from '../util'
+import {
+  coverDigit2Uppercase,
+  getDataKey,
+  isMultiTable,
+  maskedSum
+} from '../util'
 import { MULTI_SUFFIX, MULTI_SUFFIX3 } from '../config'
 import { observer } from 'mobx-react'
 import classNames from 'classnames'
-import Big from 'big.js'
 
 function buildTemplateField(fieldStr, suffix) {
   // 如果 field 是 "{{列.下单数}}"，提取出 "下单数"
@@ -45,39 +49,18 @@ const DiySummary = props => {
 
   // 计算合计
   const sumData = field => {
-    if (isMulti) {
-      return _.reduce(
-        tableData,
-        (a, b, i) => {
-          let result = a
-          // 先通过 templateTable 获取原始字段的值
-          const bRes = getRes(field, i)
-          result = a.plus(+bRes || 0)
-
-          // 双栏
-          const multiField = buildTemplateField(field, MULTI_SUFFIX)
-          result = result.plus(+getRes(multiField, i) || 0)
-
-          // 三栏
-          const multiField3 = buildTemplateField(field, MULTI_SUFFIX3)
-          result = result.plus(+getRes(multiField3, i) || 0)
-
-          return result
-        },
-        Big(0)
-      ).toFixed(2)
-    }
-
-    return _.reduce(
-      tableData,
-      (a, b, i) => {
-        let result = a
-        const bRes = getRes(field, i)
-        result = a.plus(+bRes || 0)
-        return result
-      },
-      Big(0)
-    ).toFixed(2)
+    // 收集本列渲染结果(含多栏后缀列),任一脱敏 '***' 则合计显 '***'
+    // 注意:基于渲染后字符串判定,假设模板整格就是脱敏值;带前后缀的模板(如 '{{列.金额}}元')无法识别
+    const values = []
+    _.each(tableData, (b, i) => {
+      values.push(getRes(field, i))
+      if (isMulti) {
+        // 双栏/三栏取后缀字段
+        values.push(getRes(buildTemplateField(field, MULTI_SUFFIX), i))
+        values.push(getRes(buildTemplateField(field, MULTI_SUFFIX3), i))
+      }
+    })
+    return maskedSum(values)
 
     function getRes(field, i) {
       return printerStore

package/src/printer/table_subtotal_tr.js

@@ -4,7 +4,7 @@ import PropTypes from 'prop-types'
 import _ from 'lodash'
 import { MULTI_SUFFIX, MULTI_SUFFIX3 } from '../config'
 import Big from 'big.js'
-import { coverDigit2Uppercase, getDataKey } from '../util'
+import { coverDigit2Uppercase, getDataKey, maskedSum } from '../util'
 import { observer } from 'mobx-react'
 import { get } from 'mobx'
 import classNames from 'classnames'
@@ -76,21 +76,18 @@ const SubtotalTr = props => {
     if (field === 'real_item_price') field = '出库金额'
     if (field === 'settle_money2') field = '结算金额'
     if (field === 'total_money2') field = '金额'
-    return _.reduce(
-      list,
-      (a, b) => {
-        let result = a
-        result = a.plus(b[field] || 0)
-        if (b?.[field + MULTI_SUFFIX]) {
-          result = result.plus(b?.[field + MULTI_SUFFIX])
-        }
-        if (b?.[field + MULTI_SUFFIX3]) {
-          result = result.plus(b?.[field + MULTI_SUFFIX3])
-        }
-        return result
-      },
-      Big(0)
-    ).toFixed(2)
+    // 收集本列所有值(含多栏后缀列),任一脱敏 '***' 则合计显 '***',否则 Big('***') 会崩溃
+    const values = []
+    _.each(list, b => {
+      values.push(b[field])
+      if (b?.[field + MULTI_SUFFIX]) {
+        values.push(b[field + MULTI_SUFFIX])
+      }
+      if (b?.[field + MULTI_SUFFIX3]) {
+        values.push(b[field + MULTI_SUFFIX3])
+      }
+    })
+    return maskedSum(values)
   }
 
   const getData = field => {

package/src/util.js

@@ -120,7 +120,23 @@ function getOverallOrderTrHeight(overallOrder) {
 }
 
 // eslint-disable-next-line
+// 成本权限脱敏值:后端对无成本权限用户的金额字段返回 '***'(商品维度混合脱敏)
+const MASKED_VALUE = '***'
+const isMaskedValue = v => v === MASKED_VALUE
+
+/**
+ * 脱敏感知求和:任一值为 '***' 则整体返回 '***'(口径:合计不能暴露脱敏行的贡献)
+ * 非数字值按 0 容错,同时兼容原始数值字段与渲染后字符串
+ * @param {Array} values 参与求和的值
+ */
+const maskedSum = values => {
+  if (values.some(isMaskedValue)) return MASKED_VALUE
+  return values.reduce((a, b) => a.plus(+b || 0), Big(0)).toFixed(2)
+}
+
 const coverDigit2Uppercase = n => {
+  // 脱敏值直接透传:否则 Math.abs('***') 得 NaN,Big(NaN) 会抛异常
+  if (isMaskedValue(n)) return MASKED_VALUE
   if (_.isNil(n) || _.isNaN(n)) {
     return '-'
   }
@@ -384,5 +400,8 @@ export {
   caclSingleDetailsPageHeight,
   getArrayMid,
   getColSpanLength,
-  getOverallOrderTrHeight
+  getOverallOrderTrHeight,
+  MASKED_VALUE,
+  isMaskedValue,
+  maskedSum
 }