gm-printer 10.42.2 → 10.42.3-beta.1

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
 }