gm-printer 10.42.3-beta.0 → 10.42.3

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,8 +7,7 @@ import {
   getDataKey,
   caclSingleDetailsPageHeight,
   getArrayMid,
-  getOverallOrderTrHeight,
-  isMaskedValue
+  getOverallOrderTrHeight
 } from '../util'
 import {
   isDetailOneRowSelectKey,
@@ -47,8 +46,6 @@ 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)
 }
@@ -398,7 +395,7 @@ class PrinterStore {
         const currentPageMinimumHeight =
           allPagesHaveThisHeight + allTableHaveThisHeight
         // 最后一项是表格时，末页仍要渲染签名：装行可用高度预留签名，避免空行顶进签名区
-        const isLastContent = index === contentsLength - 1
+        const isLastContent = index === this.config.contents.length - 1
         const signReserve = isLastContent ? this.getSignHeight() : 0
         /** 当前page可容纳的table高度 */
         let pageAccomodateTableHeight = roundHeight(
@@ -490,7 +487,7 @@ class PrinterStore {
                 )
                 break
               }
-              // 行无法拆分（普通长文本列）或拆分失败时，强制推进 end 防止死循环
+              // 行无法拆分（普通长文本列）或拆分失败
               if (end === begin) {
                 // 新一页可容纳的 table 高度（页高 - 页眉页脚）
                 const fullPageAccomodateTableHeight = roundHeight(
@@ -609,8 +606,9 @@ class PrinterStore {
       currentPageHeight += this.getSignHeight()
     }
 
-    this.remainPageHeight = Math.round(
-      Math.max(0, pageHeight - currentPageHeight)
+    this.remainPageHeight = Math.max(
+      0,
+      Math.round(pageHeight - currentPageHeight)
     )
     this.isSave = false
     this.config.isSave = false

package/src/printer/table_diy_overallOrder_tr.js

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

package/src/printer/table_diy_summary_tr.js

@@ -1,15 +1,11 @@
 import React from 'react'
 import PropTypes from 'prop-types'
 import _ from 'lodash'
-import {
-  coverDigit2Uppercase,
-  getDataKey,
-  isMultiTable,
-  maskedSum
-} from '../util'
+import { coverDigit2Uppercase, getDataKey, isMultiTable } 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 是 "{{列.下单数}}"，提取出 "下单数"
@@ -49,18 +45,39 @@ const DiySummary = props => {
 
   // 计算合计
   const sumData = field => {
-    // 收集本列渲染结果(含多栏后缀列),任一脱敏 '***' 则合计显 '***'
-    // 注意:基于渲染后字符串判定,假设模板整格就是脱敏值;带前后缀的模板(如 '{{列.金额}}元')无法识别
-    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)
+    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)
 
     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, 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
 }