gm-printer 10.41.0 → 10.41.2

package/src/editor_purchase/editor_sum_table.js

@@ -16,10 +16,14 @@ class TableDetailEditor extends Component {
   }
 
   render() {
-    const { editStore } = this.props
     const {
       addFields: { sumTableConfig }
     } = this.props
+    // 业务侧可传 sumTableConfig.hide=true 隐藏「汇总表」开关；默认展示
+    if (sumTableConfig?.hide) {
+      return null
+    }
+    const { editStore } = this.props
     if (editStore.computedRegionIsTable) {
       const arr = editStore.selectedRegion.split('.')
       const tableConfig = editStore.config.contents[arr[2]]

package/src/editor_purchase/store.js

@@ -1,58 +1,71 @@
 import EditorStore from '../common/editor_store'
 import { action, observable } from 'mobx'
 import i18next from '../../locales'
+import { getDataKeySuffix, isLastColDataKey } from '../common/data_key_util'
+
+const getPurchaseDefaultDetailText = () =>
+  i18next.t('{{采购数量_采购单位}}{{采购单位}}*{{商户名}}*{{商品备注}}')
+
+/** 创建/切换「单列-最后一列」时，明细列 text 应与 template_text 一致 */
+const resolveDetailTemplateText = (tableConfig, specialTableConfig) => {
+  const existing = tableConfig.specialConfig?.template_text
+  if (existing) return existing
+  if (specialTableConfig && specialTableConfig.defaultDetailText !== undefined) {
+    return specialTableConfig.defaultDetailText
+  }
+  return getPurchaseDefaultDetailText()
+}
+
+const syncLastColColumnText = (tableConfig) => {
+  if (!isLastColDataKey(tableConfig.dataKey)) return
+  const templateText = tableConfig.specialConfig?.template_text
+  if (!templateText) return
+  const specialCol = tableConfig.columns?.find((o) => o.isSpecialColumn)
+  if (specialCol) specialCol.text = templateText
+}
 
 class Store extends EditorStore {
   constructor({ defaultTableDataKey }) {
     super()
-    this.defaultTableDataKey = defaultTableDataKey // 修改默认dataKey
+    this.defaultTableDataKey = defaultTableDataKey
   }
 
   @observable
   customerTag = false
 
-  /* start---------设置采购明细相关--------- */
+  @action.bound
+  init(config, data) {
+    super.init(config, data)
+    config?.contents?.forEach((tableConfig) => {
+      if (tableConfig?.type === 'table') syncLastColColumnText(tableConfig)
+    })
+  }
+
   @action.bound
   setPurchaseTableKey(dataKey, specialTableConfig) {
-    // 先移除选中项,安全第一
     this.selected = null
     this.setTableDataKey(dataKey)
 
     const arr = this.selectedRegion.split('.')
     const tableConfig = this.config.contents[arr[2]]
 
-    // 先去掉所有明细列
-    const newCols = tableConfig.columns.filter(o => !o.isSpecialColumn)
+    const newCols = tableConfig.columns.filter((o) => !o.isSpecialColumn)
     tableConfig.columns.replace(newCols)
 
-    // 单列-总表最后一列,在columns上修改
-    if (
-      dataKey === 'purchase_last_col' ||
-      dataKey === 'purchase_last_col_noLineBreak'
-    ) {
+    if (isLastColDataKey(dataKey)) {
+      const templateText = resolveDetailTemplateText(tableConfig, specialTableConfig)
       tableConfig.columns.push({
         head: i18next.t('明细'),
         headStyle: { textAlign: 'center' },
         style: { textAlign: 'left' },
         isSpecialColumn: true,
         separator: '+',
-        // detailsType: 'purchase_last_col',
         specialDetailsKey: '__details',
-        text:
-          specialTableConfig && specialTableConfig.defaultDetailText !== undefined
-            ? specialTableConfig.defaultDetailText
-            : i18next.t(
-                '{{采购数量_采购单位}}{{采购单位}}*{{商户名}}*{{商品备注}}'
-              )
+        text: templateText,
       })
-      // 通过detailsType属性区分单列-总表最后一列的数据是否换行展示
-      dataKey === 'purchase_last_col'
-        ? (tableConfig.columns[
-            tableConfig.columns.length - 1
-          ].detailLastColType = 'purchase_last_col')
-        : (tableConfig.columns[
-            tableConfig.columns.length - 1
-          ].detailLastColType = 'purchase_last_col_noLineBreak')
+      const suffix = getDataKeySuffix(dataKey)
+      tableConfig.columns[tableConfig.columns.length - 1].detailLastColType =
+        suffix === 'last_col' ? 'purchase_last_col' : 'purchase_last_col_noLineBreak'
     }
   }
 
@@ -62,13 +75,9 @@ class Store extends EditorStore {
     const tableConfig = this.config.contents[arr[2]]
 
     tableConfig.specialConfig.template_text = value
-    // 单列-总表最后一列,在columns上修改
-    if (
-      tableConfig.dataKey === 'purchase_last_col' ||
-      tableConfig.dataKey === 'purchase_last_col_noLineBreak'
-    ) {
-      const specialCol = tableConfig.columns.find(o => o.isSpecialColumn)
-      specialCol.text = value
+    if (isLastColDataKey(tableConfig.dataKey)) {
+      const specialCol = tableConfig.columns.find((o) => o.isSpecialColumn)
+      if (specialCol) specialCol.text = value
     }
   }
 
@@ -78,13 +87,9 @@ class Store extends EditorStore {
     const tableConfig = this.config.contents[arr[2]]
 
     tableConfig.specialConfig.style = value
-    // 单列-总表最后一列,在columns上修改
-    if (
-      tableConfig.dataKey === 'purchase_last_col' ||
-      tableConfig.dataKey === 'purchase_last_col_noLineBreak'
-    ) {
-      const specialCol = tableConfig.columns.find(o => o.isSpecialColumn)
-      specialCol.style = value
+    if (isLastColDataKey(tableConfig.dataKey)) {
+      const specialCol = tableConfig.columns.find((o) => o.isSpecialColumn)
+      if (specialCol) specialCol.style = value
     }
   }
 
@@ -94,17 +99,12 @@ class Store extends EditorStore {
     const tableConfig = this.config.contents[arr[2]]
 
     tableConfig.specialConfig.template_text += fieldText
-    // 单列-总表最后一列,在columns上修改
-    if (
-      tableConfig.dataKey === 'purchase_last_col' ||
-      tableConfig.dataKey === 'purchase_last_col_noLineBreak'
-    ) {
-      const specialCol = tableConfig.columns.find(o => o.isSpecialColumn)
-      specialCol.text += fieldText
+    if (isLastColDataKey(tableConfig.dataKey)) {
+      const specialCol = tableConfig.columns.find((o) => o.isSpecialColumn)
+      if (specialCol) specialCol.text += fieldText
     }
   }
 
-  /* end---------设置采购明细相关--------- */
   @action.bound
   switchCustomerTag(val) {
     const arr = this.selectedRegion.split('.')

package/src/printer/long_print_table/index.js

@@ -203,7 +203,8 @@ class Table extends React.Component {
                               ? printerStore.templateSpecialDetails(
                                   col,
                                   dataKey,
-                                  i
+                                  i,
+                                  config.specialConfig?.template_text
                                 )
                               : printerStore
                                   .templateTable(
@@ -309,7 +310,8 @@ class Table extends React.Component {
                             ? printerStore.templateSpecialDetails(
                                 col,
                                 dataKey,
-                                i
+                                i,
+                                config.specialConfig?.template_text
                               )
                             : printerStore
                                 .templateTable(col.text, dataKey, i, pageIndex)

package/src/printer/printer.js

@@ -117,9 +117,7 @@ class Printer extends React.Component {
   componentDidMount() {
     const { printerStore, config, getremainpageHeight } = this.props
     const batchPrintConfig = config.batchPrintConfig
-    // didMount 代表第一次渲染完成
-    printerStore.setReady(true)
-    // 连续打印不需要分页计算
+    // didMount 代表第一次渲染完成，先分页再 ready，避免空 pages 触发 renderPage
     if (batchPrintConfig !== 2) {
       printerStore.computedPages()
       if (config.autoFillConfig?.checked) {
@@ -131,11 +129,10 @@ class Printer extends React.Component {
         )
         printerStore.changeTableData()
       }
-      // 开始计算，获取各种数据
-      // 如果是自适应要先计算高度，在算出行数 不是自适应就先计算行数 在计算高度
       // 获取剩余空白高度，传到editor
       getremainpageHeight && getremainpageHeight(printerStore.remainPageHeight)
     }
+    printerStore.setReady(true)
 
     // Printer 不是立马就呈现出最终样式，有个过程。这个过程需要时间，什么 ready，不太清楚，估借 setState 来获取过程结束时刻
     this.setState({}, () => {

package/src/printer/store.js

@@ -7,11 +7,24 @@ import {
   getArrayMid,
   getOverallOrderTrHeight
 } from '../util'
+import { isIndependentRolDataKey } from '../common/data_key_util'
 import _ from 'lodash'
 import Big from 'big.js'
 import { Tip } from '../components'
 
 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) => {
   if (isNaN(n)) return null
   return Big(n || 0).toFixed(f)
@@ -262,17 +275,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
     }
 
@@ -285,15 +307,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,
@@ -330,13 +356,14 @@ class PrinterStore {
         const currentPageMinimumHeight =
           allPagesHaveThisHeight + allTableHaveThisHeight
         /** 当前page可容纳的table高度 */
-        let pageAccomodateTableHeight = +new Big(this.pageHeight)
-          .minus(currentPageHeight)
-          .toFixed(2)
-        const heights = this.getNormalTableBodyHeights(
-          table.body.heights,
-          dataKey
+        let pageAccomodateTableHeight = roundHeight(
+          pageHeight - currentPageHeight
         )
+        // 拷贝一份行高数组，避免 splice 触发 observable 副作用
+        const heights = [
+          ...this.getNormalTableBodyHeights(table.body.heights, dataKey)
+        ]
+        const tableData = tableDataMap[dataKey] || []
         // 表格行的索引,用于table.slice(begin, end), 分割到不同页面中
         let begin = 0
         let end = 0
@@ -352,27 +379,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,
@@ -380,7 +421,7 @@ class PrinterStore {
                   currentRemainTableHeight
                 )
 
-                // 拆分明细后，同时也要更新body.heights 不能影响后续计算
+                // 拆分明细后，同时也要更新 heights 不能影响后续计算
                 if (detailsPageHeight.length > 0) {
                   // 比较剩余高度和minHeight的大小，取最大（防止剩余一条明细时，第二页撑开的高度远大于一条明细的高度）
                   detailsPageHeight[1] = Math.max(
@@ -395,7 +436,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(
                     '检测到当前页面高度不足，无法完整渲染，请重新设置页面高度！'
@@ -403,7 +445,7 @@ class PrinterStore {
                 )
                 break
               }
-              // 修复 OOM：某行高度本身超过单页可容纳的表格高度时，end 无法推进会导致 while 死循环
+              // 行无法拆分（普通长文本列）或拆分失败时，强制推进 end 防止死循环
               if (end === begin) {
                 end = end + 1
               }
@@ -416,27 +458,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
+              pageAccomodateTableHeight = roundHeight(
+                pageHeight - allPagesHaveThisHeight
               )
               currentTableHeight = allTableHaveThisHeight
               currentPageHeight = currentPageMinimumHeight
             } else {
               // 有空间，继续做下行
               end++
-              // 最后一行，把信息加入 page，并轮下一个contents
+              // 最后一行，把信息加入 page
               if (end === heights.length) {
                 page.push({
                   type: 'table',
@@ -444,27 +486,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) {
-          currentPageHeight += this.height?.sign
+        if (index === contentsLength - 1) {
+          currentPageHeight += heightMap?.sign || 0
         }
 
-        if (currentPageHeight <= this.pageHeight) {
+        if (currentPageHeight <= pageHeight) {
           // 空间充足，把信息加入 page，并轮下一个contents
           page.push({
             type: 'panel',
@@ -474,7 +524,7 @@ class PrinterStore {
           index++
         } else {
           // 此页空间不足，此页完成任务
-          this.pages.push(page)
+          pages.push(page)
 
           // 为下一页做准备
           page = []
@@ -482,8 +532,11 @@ class PrinterStore {
         }
       }
     }
-    this.pages.push(page)
-    this.remainPageHeight = +Big(this.pageHeight - currentPageHeight).toFixed(0)
+    pages.push(page)
+    this.pages = pages
+    this.remainPageHeight = Math.round(pageHeight - currentPageHeight)
+    this.isSave = false
+    this.config.isSave = false
   }
 
   @action
@@ -552,13 +605,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
@@ -644,12 +698,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] || []
 
       /** 简单处理下数据 */
@@ -672,7 +729,7 @@ class PrinterStore {
 
       return detailsList
     } catch (err) {
-      return text
+      return templateText
     }
   }
 

package/src/printer/table.js

@@ -412,7 +412,8 @@ class Table extends React.Component {
                             ? printerStore.templateSpecialDetails(
                                 col,
                                 dataKey,
-                                i
+                                i,
+                                config.specialConfig?.template_text
                               )
                             : printerStore
                                 .templateTable(col.text, dataKey, i, pageIndex)

package/src/util.js

@@ -233,16 +233,24 @@ const caclSingleDetailsPageHeight = (detailsHeights, curRemainPageHeight) => {
  * @param {*} arr
  */
 const getArrayMid = arr => {
+  let majority = 23
+
+  if (arr.length === 0) return majority
+
+  // 行数少时直接取最小行高，跳过多轮 Map 统计
+  if (arr.length <= 30) {
+    const min = Math.min(...arr)
+    if (min / 23 > 10) return 23
+    return min
+  }
+
   /** 数组元素出现次数的集合 */
   const mapArr = []
   const map = new Map()
-  let majority = 23
   /** 次数相同的元素集合 */
   const majorityArr = []
   const min = Math.min(...arr)
 
-  if (arr.length === 0) return majority
-
   _.forEach(arr, (val, key) => {
     if (map.has(val)) {
       map.set(val, map.get(val) + 1)