gm-printer 10.42.3-beta.4 → 10.42.4-beta.0

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, maskedSum } from '../util'
+import { coverDigit2Uppercase, getDataKey } from '../util'
 import { observer } from 'mobx-react'
 import { get } from 'mobx'
 import classNames from 'classnames'
@@ -76,18 +76,21 @@ const SubtotalTr = props => {
     if (field === 'real_item_price') field = '出库金额'
     if (field === 'settle_money2') field = '结算金额'
     if (field === 'total_money2') field = '金额'
-    // 收集本列所有值(含多栏后缀列),任一脱敏 '***' 则合计显 '***',否则 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)
+    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)
   }
 
   const getData = field => {

package/src/util.js

@@ -120,23 +120,7 @@ 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 '-'
   }
@@ -400,8 +384,5 @@ export {
   caclSingleDetailsPageHeight,
   getArrayMid,
   getColSpanLength,
-  getOverallOrderTrHeight,
-  MASKED_VALUE,
-  isMaskedValue,
-  maskedSum
+  getOverallOrderTrHeight
 }