gm-printer 10.40.0 → 10.41.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gm-printer",
-  "version": "10.40.0",
+  "version": "10.41.1",
   "description": "diy printer",
   "main": "src/index.js",
   "scripts": {

package/src/common/editor_edit_field.js

@@ -19,7 +19,7 @@ import {
 } from '../common/component'
 import { get, toJS } from 'mobx'
 import PropTypes from 'prop-types'
-import { subtotalRadioList, overallOrderRadioList } from './util'
+import { subtotalRadioList } from './util'
 import { LONG_PRINT } from '../config'
 import _ from 'lodash'
 
@@ -529,7 +529,7 @@ class EditorField extends React.Component {
         {!isSomeSubtotalTr && (
           <div>
             <Flex>{i18next.t('合计栏打印金额')}：</Flex>
-            <Flex style={{ marginLeft: 57 }} wrap>
+            <Flex style={{ marginLeft: 57 }}>
               {subtotalRadioList.map(fields => {
                 // 兼容
                 let subtotalFields = subtotal?.fields?.[0].valueField
@@ -627,14 +627,8 @@ class EditorField extends React.Component {
             onChange={this.handleOverallOrderStyleChange}
           />
         </Flex>
-        <EditorSubtotalCheck
-          subtotalCheckDisabled
-          subtotalChecked={overallOrder?.showEachPage !== false}
-          subtotalCheckOnChange={editStore.setOverallOrderShowEachPage}
-          subtotalCheckText='每页展示'
-        />
-        <Flex style={{ marginLeft: 57 }} wrap>
-          {overallOrderRadioList.map((fields, i) => {
+        <Flex style={{ marginLeft: 57 }}>
+          {subtotalRadioList.map((fields, i) => {
             return (
               <Radio
                 style={{ marginLeft: 5 }}

package/src/common/editor_store.js

@@ -773,10 +773,6 @@ class EditorStore {
       set(table.overallOrder, {
         show: !table.overallOrder.show
       })
-      // 老模板补默认：每页展示默认勾选
-      if (table.overallOrder.showEachPage === undefined) {
-        set(table.overallOrder, { showEachPage: true })
-      }
       table.overallOrder.fields[0].colSpan =
         colSpanLength - (table.overallOrder.fields?.[1]?.colSpan ?? 0)
     } else {
@@ -784,7 +780,6 @@ class EditorStore {
       set(table, {
         overallOrder: {
           show: true,
-          showEachPage: true,
           fields: [
             {
               name: '整单合计：',
@@ -801,19 +796,6 @@ class EditorStore {
     this.config = toJS(this.config)
   }
 
-  // 整单合计「每页展示」
-  @action.bound
-  setOverallOrderShowEachPage() {
-    if (!this.selectedRegion) return
-    const arr = this.selectedRegion.split('.')
-    const table = this.config.contents[arr[2]]
-    if (!table?.overallOrder) return
-    this.overallOrderShow = !this.overallOrderShow
-    const next = !(table.overallOrder.showEachPage !== false)
-    set(table.overallOrder, { showEachPage: next })
-    this.config = toJS(this.config)
-  }
-
   @action
   setDiyOverallOrderShow(name) {
     const arr = name.split('.')
@@ -1837,7 +1819,6 @@ class EditorStore {
         set(table, {
           overallOrder: {
             show: true,
-            showEachPage: true,
             fields: [
               {
                 name: '整单合计：',

package/src/common/util.js

@@ -1,9 +1,10 @@
 import i18next from '../../locales'
 
 /**
- * 每页合计金额单选
- * id 与 data_to_key 中文 key 对齐，用于对本页行求和，不要轻易改 id
+ * 每页合计设置单选按钮
+ * id的值是用来计算每页的金额总数，不要轻易随便改
  */
+// 整单合计和每页合计栏都使用的这个
 const subtotalRadioList = [
   {
     value: i18next.t('下单金额'),
@@ -16,61 +17,6 @@ const subtotalRadioList = [
   {
     value: i18next.t('实际金额'),
     id: '实际金额'
-  },
-  {
-    value: i18next.t('变化前金额'),
-    id: '变化前金额'
-  },
-  {
-    value: i18next.t('下单金额（不含税）'),
-    id: '下单金额_不含税'
-  },
-  {
-    value: i18next.t('实收金额'),
-    id: '实收金额'
-  },
-  {
-    value: i18next.t('实收金额（不含税）'),
-    id: '实收金额_不含税'
-  }
-]
-
-/**
- * 整单合计金额单选（比每页合计多「出库金额（不含税）」）
- * id 与 data.common 中文 key 对齐，取订单已算金额，不重算
- */
-const overallOrderRadioList = [
-  {
-    value: i18next.t('下单金额'),
-    id: '下单金额'
-  },
-  {
-    value: i18next.t('出库金额'),
-    id: '出库金额'
-  },
-  {
-    value: i18next.t('实际金额'),
-    id: '实际金额'
-  },
-  {
-    value: i18next.t('变化前金额'),
-    id: '变化前金额'
-  },
-  {
-    value: i18next.t('下单金额（不含税）'),
-    id: '下单金额_不含税'
-  },
-  {
-    value: i18next.t('出库金额（不含税）'),
-    id: '出库金额_不含税'
-  },
-  {
-    value: i18next.t('实收金额'),
-    id: '实收金额'
-  },
-  {
-    value: i18next.t('实收金额（不含税）'),
-    id: '实收金额_不含税'
   }
 ]
 
@@ -80,4 +26,4 @@ const accountRadioList = {
   实际金额: i18next.t('实际金额')
 }
 
-export { subtotalRadioList, overallOrderRadioList, accountRadioList }
+export { subtotalRadioList, accountRadioList }

package/src/editor_purchase/editor_special_table.js

@@ -113,7 +113,7 @@ class TableDetailEditor extends React.Component {
 
   render() {
     const {
-      addFields: { detailFields, specialTableConfig = {} },
+      addFields: { detailFields },
       editStore
     } = this.props
     const {
@@ -123,26 +123,18 @@ class TableDetailEditor extends React.Component {
       specialConfig: { template_text, style }
     } = this.props.config
 
-    const title = specialTableConfig.title || i18next.t('设置采购明细')
-    const label = specialTableConfig.label || i18next.t('采购明细')
-    const hideDataKeys = specialTableConfig.hideDataKeys || []
-    const visibleDataKeyList = _.filter(
-      dataKeyList,
-      v => !hideDataKeys.includes(v.value)
-    )
-
     return (
       <div>
-        <Title title={title} />
+        <Title title={i18next.t('设置采购明细')} />
         <Gap />
         <Flex alignCenter className='gm-padding-top-5'>
-          <div>{label}：</div>
+          <div>{i18next.t('采购明细')}：</div>
           <Select
             className='gm-printer-edit-select'
             value={editStore.computedDataKey}
             onChange={this.handleDataKeyChange}
           >
-            {_.map(visibleDataKeyList, v => (
+            {_.map(dataKeyList, v => (
               <Option key={v.value} value={v.value}>
                 {v.text}
               </Option>

package/src/printer/long_print_table/index.js

@@ -111,8 +111,7 @@ class Table extends React.Component {
       range,
       pageIndex,
       printerStore,
-      isSomeSubtotalTr,
-      isLastTablePage
+      isSomeSubtotalTr
     } = this.props
     // 数据
     dataKey = getDataKey(dataKey, arrange)
@@ -228,7 +227,6 @@ class Table extends React.Component {
           range={range}
           config={config}
           printerStore={printerStore}
-          isLastTablePage={isLastTablePage}
         />
         <DiyOverallOrder
           range={range}
@@ -329,7 +327,6 @@ class Table extends React.Component {
             range={range}
             config={config}
             printerStore={printerStore}
-            isLastTablePage={isLastTablePage}
           />
           <DiyOverallOrder
             range={range}
@@ -388,12 +385,7 @@ Table.propTypes = {
   pageIndex: PropTypes.number.isRequired,
   placeholder: PropTypes.string,
   printerStore: PropTypes.object,
-  isSomeSubtotalTr: PropTypes.bool,
-  isLastTablePage: PropTypes.bool
-}
-
-Table.defaultProps = {
-  isLastTablePage: true
+  isSomeSubtotalTr: PropTypes.bool
 }
 
 export default Table

package/src/printer/printer.js

@@ -13,20 +13,6 @@ import MergePage from './merge_page'
 import { LONG_PRINT } from '../config'
 import Big from 'big.js'
 
-/** 当前 panel 是否为该表格 content 在全部分页中的最后一次出现 */
-const isLastTablePanel = (pages, pageIndex, panelIndexInPage, tableIndex) => {
-  for (let pi = pages.length - 1; pi >= 0; pi--) {
-    const page = pages[pi] || []
-    for (let pji = page.length - 1; pji >= 0; pji--) {
-      const p = page[pji]
-      if (p?.type === 'table' && p.index === tableIndex) {
-        return pi === pageIndex && pji === panelIndexInPage
-      }
-    }
-  }
-  return true
-}
-
 // Header Sign Footer 相对特殊，要单独处理
 const Header = props => (
   <Panel {...props} name='header' placeholder={i18next.t('页眉')} />
@@ -117,9 +103,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 +115,10 @@ class Printer extends React.Component {
         )
         printerStore.changeTableData()
       }
-      // 开始计算，获取各种数据
-      // 如果是自适应要先计算高度，在算出行数 不是自适应就先计算行数 在计算高度
       // 获取剩余空白高度，传到editor
       getremainpageHeight && getremainpageHeight(printerStore.remainPageHeight)
     }
+    printerStore.setReady(true)
 
     // Printer 不是立马就呈现出最终样式，有个过程。这个过程需要时间，什么 ready，不太清楚，估借 setState 来获取过程结束时刻
     this.setState({}, () => {
@@ -289,12 +272,6 @@ class Printer extends React.Component {
                         placeholder={`${i18next.t('区域')} ${panel.index}`}
                         pageIndex={i}
                         isSomeSubtotalTr={isSomeSubtotalTr}
-                        isLastTablePage={isLastTablePanel(
-                          printerStore.pages,
-                          i,
-                          ii,
-                          panel.index
-                        )}
                       />
                     )
 

package/src/printer/store.js

@@ -12,6 +12,18 @@ 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 +274,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 +306,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 +355,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 +378,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 +420,7 @@ class PrinterStore {
                   currentRemainTableHeight
                 )
 
-                // 拆分明细后，同时也要更新body.heights 不能影响后续计算
+                // 拆分明细后，同时也要更新 heights 不能影响后续计算
                 if (detailsPageHeight.length > 0) {
                   // 比较剩余高度和minHeight的大小，取最大（防止剩余一条明细时，第二页撑开的高度远大于一条明细的高度）
                   detailsPageHeight[1] = Math.max(
@@ -395,7 +435,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 +444,7 @@ class PrinterStore {
                 )
                 break
               }
-              // 修复 OOM：某行高度本身超过单页可容纳的表格高度时，end 无法推进会导致 while 死循环
+              // 行无法拆分（普通长文本列）或拆分失败时，强制推进 end 防止死循环
               if (end === begin) {
                 end = end + 1
               }
@@ -416,27 +457,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 +485,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 +523,7 @@ class PrinterStore {
           index++
         } else {
           // 此页空间不足，此页完成任务
-          this.pages.push(page)
+          pages.push(page)
 
           // 为下一页做准备
           page = []
@@ -482,8 +531,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

package/src/printer/table.js

@@ -169,8 +169,7 @@ class Table extends React.Component {
       range,
       pageIndex,
       printerStore,
-      isSomeSubtotalTr,
-      isLastTablePage
+      isSomeSubtotalTr
     } = this.props
     // 数据
     dataKey = getDataKey(dataKey, arrange)
@@ -446,7 +445,6 @@ class Table extends React.Component {
             range={range}
             config={config}
             printerStore={printerStore}
-            isLastTablePage={isLastTablePage}
           />
           <DiyOverallOrder
             range={range}
@@ -505,12 +503,7 @@ Table.propTypes = {
   pageIndex: PropTypes.number.isRequired,
   placeholder: PropTypes.string,
   printerStore: PropTypes.object,
-  isSomeSubtotalTr: PropTypes.bool,
-  isLastTablePage: PropTypes.bool
-}
-
-Table.defaultProps = {
-  isLastTablePage: true
+  isSomeSubtotalTr: PropTypes.bool
 }
 
 export default Table