gm-printer 10.39.4-beta.2 → 10.39.4-beta.21

package/src/printer/store.js

@@ -7,8 +7,10 @@ import {
   getDataKey,
   caclSingleDetailsPageHeight,
   getArrayMid,
-  getOverallOrderTrHeight
+  getOverallOrderTrHeight,
+  isMaskedValue
 } from '../util'
+import { isIndependentRolDataKey } from '../common/data_key_util'
 import _ from 'lodash'
 import Big from 'big.js'
 import { Tip } from '../components'
@@ -28,7 +30,21 @@ import {
 } from './multi_column'
 
 export const TR_BASE_HEIGHT = 23
+
+/** 分页高度运算：像素精度足够，避免热路径中 Big.js 开销 */
+const roundHeight = n => Math.round(n * 100) / 100
+
+/** 判断行是否含可拆分的采购明细（普通长文本列不可拆分） */
+const canSplitRowDetails = (dataKey, row) => {
+  if (!row || dataKey.includes('noLineBreak')) return false
+  const details = row.__details
+  const detailsMulti = row.__details_MULTI_SUFFIX
+  return !!(details?.length || detailsMulti?.length)
+}
+
 const price = (n, f = 2) => {
+  // 脱敏值 '***' 原样返回(不能走 isNaN 判空,空单元格仍需显空)
+  if (isMaskedValue(n)) return n
   if (isNaN(n)) return null
   return Big(n || 0).toFixed(f)
 }
@@ -250,10 +266,10 @@ class PrinterStore {
       count = details.length + detailsMulti.length + count
     })
 
-    /** 明细data */
-    const detailsData = tableData[end]?.__details
-    // 双栏明细data
-    const detailsDataMulti = tableData[end]?.__details_MULTI_SUFFIX
+    /** 明细data（左栏），兜底空数组避免另一侧缺省时切片报错 */
+    const detailsData = tableData[end]?.__details || []
+    // 双栏明细data（右栏）
+    const detailsDataMulti = tableData[end]?.__details_MULTI_SUFFIX || []
     // 采购单如果使用双栏，取明细最多的那个数据
     const data =
       detailsData?.length > (detailsDataMulti?.length || 0)
@@ -276,10 +292,12 @@ class PrinterStore {
       _.filter(ranges, i => i[0] !== i[1] || (!i[0] && !i[1])), // 过滤掉 {[0,3],[3,3]}这周情况
       range => {
         const _tableData = Object.assign({}, tableData[end])
-        _tableData.__details = data.slice(...range)
+        // 左右两栏各用各的明细切片（slice 超出长度自动截断，明细少的一侧在第一片即展示完），
+        // 修复：此前两栏都塞明细多的一侧数据，导致明细少的一侧（如双栏右栏）明细被替换、自身明细丢失
+        _tableData.__details = detailsData.slice(...range)
         // 双栏中的数据也要做处理
         if (isMultiTable(dataKey)) {
-          _tableData.__details_MULTI_SUFFIX = data.slice(...range)
+          _tableData.__details_MULTI_SUFFIX = detailsDataMulti.slice(...range)
         }
 
         return _tableData
@@ -293,17 +311,26 @@ class PrinterStore {
 
   @action
   computedPages() {
-    this.setIsSave(false)
-    // 每次先初始化置空
-    this.pages = []
+    // 快照 observable，避免热路径反复触发 MobX依赖追踪
+    const pageHeight = this.pageHeight
+    const heightMap = { ...this.height }
+    const contents = this.config.contents
+    const contentsLength = contents.length
+    const tablesInfo = this.tablesInfo
+    const tableDataMap = this.data._table
+
+    // 使用本地数组累积分页结果，避免循环中反复触发 observable 更新
+    const pages = []
     // 每页必有 页眉header, 页脚footer , 签名
-    const allPagesHaveThisHeight = this.height.header + this.height.footer
+    const allPagesHaveThisHeight = heightMap.header + heightMap.footer
     // 退出计算! 因为页眉 + 页脚 > currentPageHeight,页面装不下其他东西
-    if (allPagesHaveThisHeight > this.pageHeight) {
+    if (allPagesHaveThisHeight > pageHeight) {
+      this.pages = []
+      this.isSave = true
+      this.config.isSave = true
       Tip.warning(
         i18next.t('检测到当前页面高度不足，无法完整渲染，请重新设置页面高度！')
       )
-      this.setIsSave(true)
       return
     }
 
@@ -316,15 +343,19 @@ class PrinterStore {
     /** 处理配送单有多个表格的情况 */
     let tableCount = 0
     /* --- 遍历 contents,将内容动态分配到page --- */
-    while (index < this.config.contents.length) {
-      const content = this.config.contents[index]
+    while (index < contentsLength) {
+      const content = contents[index]
 
       /* 表格内容处理 */
       if (content.type === 'table') {
         // 是表格就++
         tableCount++
         // 表格原始的高度和宽度信息
-        const table = this.tablesInfo[`contents.table.${index}`]
+        const table = tablesInfo[`contents.table.${index}`]
+        if (!table?.body?.heights) {
+          index++
+          continue
+        }
         const {
           subtotal,
           dataKey,
@@ -361,17 +392,17 @@ 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 = +new Big(this.pageHeight)
-          .minus(currentPageHeight)
-          .minus(signReserve)
-          .toFixed(2)
-        const heights = this.getNormalTableBodyHeights(
-          table.body.heights,
-          dataKey
+        let pageAccomodateTableHeight = roundHeight(
+          pageHeight - currentPageHeight - signReserve
         )
+        // 拷贝一份行高数组，避免 splice 触发 observable 副作用
+        const heights = [
+          ...this.getNormalTableBodyHeights(table.body.heights, dataKey)
+        ]
+        const tableData = tableDataMap[dataKey] || []
         // 表格行的索引,用于table.slice(begin, end), 分割到不同页面中
         let begin = 0
         let end = 0
@@ -387,27 +418,41 @@ class PrinterStore {
           let currentRemainTableHeight = 0
           /** 去最小的tr高度，用于下面的计算compare,(避免特殊情况：一般来说最小tr——height = 23, 比23还小的不考虑计算) */
           const minHeight = Math.max(getArrayMid(heights), 23)
+          // 安全阈值：防止极端情况下内层 while 迭代失控
+          const maxIterations = heights.length * 10 + 100
+          let loopCount = 0
           /* 遍历表格每一行，填充表格内容 */
           while (end < heights.length) {
-            currentTableHeight += heights[end]
+            if (++loopCount > maxIterations) {
+              console.warn(
+                '[gm-printer] computedPages: iteration limit exceeded, force break'
+              )
+              break
+            }
+
+            const rowHeight = heights[end]
+            currentTableHeight += rowHeight
             // 用于计算最后一页有footer情况的高度
-            currentPageHeight += heights[end]
+            currentPageHeight += rowHeight
             // 当前页没有多余空间
             if (currentTableHeight > pageAccomodateTableHeight) {
-              currentRemainTableHeight = +Big(pageAccomodateTableHeight)
-                .minus(currentTableHeight)
-                .plus(heights[end])
+              currentRemainTableHeight = roundHeight(
+                pageAccomodateTableHeight - currentTableHeight + rowHeight
+              )
+
+              const row = tableData[end]
+              const isRowOversized = rowHeight > pageAccomodateTableHeight
+              const shouldTrySplitDetails =
+                canSplitRowDetails(dataKey, row) &&
+                ((currentRemainTableHeight / minHeight > 1.5 &&
+                  rowHeight / currentRemainTableHeight > 1) ||
+                  isRowOversized)
 
               /**
-               * 说明： 1. currentRemainTableHeight至少要是minHeight的 2倍，不然每次到这都进入if，同时留下一点空白距离
-               * 2. heights[end]至少要是currentRemainTableHeight的 1倍，怕出现打印时最后一行文字显示一半的情况
-               * 3. heights[end] 高度超过了 pageAccomodateTableHeight
+               * 仅对含 __details 的采购明细行尝试拆分；
+               * 普通长文本列（如规格）超高时直接整行换页，避免无效 computedData 调用
                */
-              if (
-                (currentRemainTableHeight / minHeight > 1.5 &&
-                  heights[end] / currentRemainTableHeight > 1) ||
-                heights[end] > pageAccomodateTableHeight
-              ) {
+              if (shouldTrySplitDetails) {
                 const detailsPageHeight = this.computedData(
                   dataKey,
                   table,
@@ -415,7 +460,7 @@ class PrinterStore {
                   currentRemainTableHeight
                 )
 
-                // 拆分明细后，同时也要更新body.heights 不能影响后续计算
+                // 拆分明细后，同时也要更新 heights 不能影响后续计算
                 if (detailsPageHeight.length > 0) {
                   // 比较剩余高度和minHeight的大小，取最大（防止剩余一条明细时，第二页撑开的高度远大于一条明细的高度）
                   detailsPageHeight[1] = Math.max(
@@ -430,7 +475,8 @@ class PrinterStore {
               if (begin === 0 && end === 0 && index === 0) {
                 index++
                 this.pages = []
-                this.setIsSave(true)
+                this.isSave = true
+                this.config.isSave = true
                 Tip.warning(
                   i18next.t(
                     '检测到当前页面高度不足，无法完整渲染，请重新设置页面高度！'
@@ -438,7 +484,7 @@ class PrinterStore {
                 )
                 break
               }
-              // 修复 OOM：某行高度本身超过单页可容纳的表格高度时，end 无法推进会导致 while 死循环
+              // 行无法拆分（普通长文本列）或拆分失败时，强制推进 end 防止死循环
               if (end === begin) {
                 end = end + 1
               }
@@ -451,28 +497,27 @@ class PrinterStore {
                   end
                 })
                 // 此页完成任务
-                this.pages.push(page)
+                pages.push(page)
                 page = []
               }
               // 页面有多个表格时，当同一页的第二个表格的第一行高度加上第一个表格的高度大于页面的高度，需要生成新的一页
               // 因为是第二个表格，重新走了遍历，end重置0，没有进入到上面的判断（end !== 0），不会生成新的一页
               if (tableCount > 1 && end === 0) {
-                this.pages.push(page)
+                pages.push(page)
                 page = []
               }
 
               begin = end
               // 开启新一页,重置页面高度（末项表格仍预留签名）
-              pageAccomodateTableHeight = +new Big(this.pageHeight)
-                .minus(allPagesHaveThisHeight)
-                .minus(signReserve)
-                .toFixed(2)
+              pageAccomodateTableHeight = roundHeight(
+                pageHeight - allPagesHaveThisHeight - signReserve
+              )
               currentTableHeight = allTableHaveThisHeight
               currentPageHeight = currentPageMinimumHeight
             } else {
               // 有空间，继续做下行
               end++
-              // 最后一行，把信息加入 page，并轮下一个contents
+              // 最后一行，把信息加入 page
               if (end === heights.length) {
                 page.push({
                   type: 'table',
@@ -480,27 +525,35 @@ class PrinterStore {
                   begin,
                   end
                 })
-                index++
               }
             }
           }
+          // 最后一行换页时走 if 分支，内层不会 index++，此处统一推进
+          if (end >= heights.length) {
+            index++
+          } else {
+            console.warn(
+              '[gm-printer] computedPages: table pagination incomplete, force advance'
+            )
+            index++
+          }
         }
         /* 非表格内容处理 */
       } else {
-        const panelHeight = this.height[`contents.panel.${index}`]
+        const panelHeight = heightMap[`contents.panel.${index}`]
         currentPageHeight += panelHeight
 
         // 当 panel + allPagesHaveThisHeight > 页高度, 停止. 避免死循环
-        if (panelHeight + allPagesHaveThisHeight > this.pageHeight) {
+        if (panelHeight + allPagesHaveThisHeight > pageHeight) {
           break
         }
 
         // 如果是最后一页，必须要加上sign的高度，否则会重叠
-        if (index === this.config.contents.length - 1) {
+        if (index === contentsLength - 1) {
           currentPageHeight += this.getSignHeight()
         }
 
-        if (currentPageHeight <= this.pageHeight) {
+        if (currentPageHeight <= pageHeight) {
           // 空间充足，把信息加入 page，并轮下一个contents
           page.push({
             type: 'panel',
@@ -510,7 +563,7 @@ class PrinterStore {
           index++
         } else {
           // 此页空间不足，此页完成任务
-          this.pages.push(page)
+          pages.push(page)
 
           // 为下一页做准备
           page = []
@@ -518,19 +571,21 @@ class PrinterStore {
         }
       }
     }
-    this.pages.push(page)
+    pages.push(page)
+    this.pages = pages
 
     // 末页签名：panel 分支会在「最后一项是 panel」时扣 sign；
     // 最后一项是 table 时上面不会扣，导致 remain 偏大、空行多填溢页
-    // 打印 iframe 内 height.sign 可能为 0，必须用 getSignHeight（含配置兜底）
-    const lastContent = this.config.contents[this.config.contents.length - 1]
+    const lastContent = contents[contentsLength - 1]
     if (lastContent?.type === 'table') {
       currentPageHeight += this.getSignHeight()
     }
 
-    this.remainPageHeight = +Big(
-      Math.max(0, this.pageHeight - currentPageHeight)
-    ).toFixed(0)
+    this.remainPageHeight = Math.round(
+      Math.max(0, pageHeight - currentPageHeight)
+    )
+    this.isSave = false
+    this.config.isSave = false
     this.repackVerticalMultiByPages()
   }
 
@@ -579,8 +634,8 @@ class PrinterStore {
       const sourceColNumber = isMultiTable(singleKey)
         ? getMultiNumber(singleKey)
         : isMultiTable(sourceKey)
-          ? colNumber
-          : 1
+        ? colNumber
+        : 1
       const sourceItems = flattenHorizontalPackedRows(
         sourceRows,
         sourceColNumber
@@ -666,13 +721,14 @@ class PrinterStore {
    */
   templateTableRowSpan(text, dataKey, index, begin) {
     try {
-      if (
-        dataKey !== 'purchase_detail_one_row' &&
-        dataKey !== 'purchase_independent_rol_sku' &&
-        dataKey !== 'purchase_independent_rol_address' &&
-        dataKey !== 'taxRateSales' &&
-        dataKey !== 'ordinary'
-      ) {
+      // 采购 / 分拣「按明细单行」展开后才做合并单元格（后缀 independent_rol_*）
+      const canMerge =
+        isIndependentRolDataKey(dataKey) ||
+        dataKey === 'taxRateSales' ||
+        dataKey === 'ordinary' ||
+        dataKey === 'purchase_detail_one_row' ||
+        dataKey === 'sorting_detail_detail_one_row'
+      if (!canMerge) {
         return null
       }
       const list = this.data._table[dataKey] || this.data._table.orders
@@ -729,13 +785,8 @@ class PrinterStore {
         row = list[index]
       }
       row =
-        ensureRowSerialKeys(
-          list,
-          index,
-          colNumber,
-          this.fillIndex,
-          dataKey
-        ) || row
+        ensureRowSerialKeys(list, index, colNumber, this.fillIndex, dataKey) ||
+        row
 
       return _.template(text, {
         interpolate: /{{([\s\S]+?)}}/g
@@ -779,12 +830,15 @@ class PrinterStore {
     }
   }
 
-  templateSpecialDetails(col, dataKey, index) {
-    // 做好保护，出错就返回 text
+  templateSpecialDetails(col, dataKey, index, fallbackText = '') {
     const { specialDetailsKey, text, detailLastColType, separator } = col
+    const templateText = text || fallbackText
+    if (!templateText) return ''
     try {
       const row = this.data._table[dataKey][index]
-      const compiled = _.template(text, { interpolate: /{{([\s\S]+?)}}/g })
+      const compiled = _.template(templateText, {
+        interpolate: /{{([\s\S]+?)}}/g
+      })
       let detailsList = row[specialDetailsKey] || []
 
       /** 简单处理下数据 */
@@ -807,7 +861,7 @@ class PrinterStore {
 
       return detailsList
     } catch (err) {
-      return text
+      return templateText
     }
   }
 
@@ -841,8 +895,7 @@ class PrinterStore {
       const info = this.tablesInfo[name]
       if (!info?.body?.heights) return
 
-      const rows =
-        this.data._table[resolved] || this.data._table[dataKey] || []
+      const rows = this.data._table[resolved] || this.data._table[dataKey] || []
       const realCount = rows.filter(row => row && !row._isEmptyData).length
       if (info.body.heights.length > realCount) {
         info.body.heights = info.body.heights.slice(0, realCount)
@@ -877,18 +930,15 @@ class PrinterStore {
       return []
     }
 
-    const sourceItems = flattenHorizontalPackedRows(
-      sourceRows,
-      sourceColNumber
-    )
+    const sourceItems = flattenHorizontalPackedRows(sourceRows, sourceColNumber)
     const baseRowCount = sourceItems.length
       ? Math.max(1, Math.ceil(sourceItems.length / colNumber))
       : 0
     const packed = !baseRowCount
       ? []
       : isVertical
-        ? packVerticalNewspaper(sourceItems, colNumber, baseRowCount, false)
-        : packHorizontalRowMajor(sourceItems, colNumber)
+      ? packVerticalNewspaper(sourceItems, colNumber, baseRowCount, false)
+      : packHorizontalRowMajor(sourceItems, colNumber)
     this.data._table[dataKey] = packed
     return packed
   }
@@ -920,8 +970,8 @@ class PrinterStore {
       const sourceColNumber = isMultiTable(singleKey)
         ? getMultiNumber(singleKey)
         : isMultiTable(sourceKey)
-          ? colNumber
-          : 1
+        ? colNumber
+        : 1
       const sourceItems = flattenHorizontalPackedRows(
         sourceRows,
         sourceColNumber
@@ -952,8 +1002,8 @@ class PrinterStore {
       emptyCount === 0
         ? []
         : emptyTable.length > 0
-          ? emptyTable
-          : this.getFilledTableData(table)
+        ? emptyTable
+        : this.getFilledTableData(table)
     const withPartial = fillPartialLastRow(table, colNumber, this.fillIndex)
     const lastKey = getMaxSerial(withPartial, colNumber) + 1
     const sample = table[0]

package/src/printer/table.js

@@ -169,7 +169,8 @@ class Table extends React.Component {
       range,
       pageIndex,
       printerStore,
-      isSomeSubtotalTr
+      isSomeSubtotalTr,
+      isLastTablePage
     } = this.props
     // 数据
     dataKey = getDataKey(dataKey, arrange)
@@ -407,7 +408,8 @@ class Table extends React.Component {
                             ? printerStore.templateSpecialDetails(
                                 col,
                                 dataKey,
-                                i
+                                i,
+                                config.specialConfig?.template_text
                               )
                             : printerStore
                                 .templateTable(col.text, dataKey, i, pageIndex)
@@ -441,6 +443,7 @@ class Table extends React.Component {
             range={range}
             config={config}
             printerStore={printerStore}
+            isLastTablePage={isLastTablePage}
           />
           <DiyOverallOrder
             range={range}
@@ -499,7 +502,12 @@ Table.propTypes = {
   pageIndex: PropTypes.number.isRequired,
   placeholder: PropTypes.string,
   printerStore: PropTypes.object,
-  isSomeSubtotalTr: PropTypes.bool
+  isSomeSubtotalTr: PropTypes.bool,
+  isLastTablePage: PropTypes.bool
+}
+
+Table.defaultProps = {
+  isLastTablePage: true
 }
 
 export default Table

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