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

package/src/printer/table_overallOrder_tr.js

@@ -12,54 +12,66 @@ const OverallOrder = props => {
     printerStore,
     printerStore: {
       data: { common }
-    }
+    },
+    isLastTablePage
   } = props
 
-  return (
+  // showEachPage 默认 true（老模板缺省视为每页展示）；false 时仅表格最后一页渲染
+  const showEachPage = overallOrder?.showEachPage !== false
+  const shouldShow =
     overallOrder?.show &&
-    printerStore?.ready && (
-      <tr>
-        {_.map(overallOrder.fields, (item, index) => {
-          return (
-            <td colSpan={item.colSpan} key={index}>
-              <div style={{ ...item.style }} className='gm-flex-page'>
-                {item.name}
-                <div
-                  className={classNames('gm-flex-page', {
-                    'gm-flex-justify-between-page':
-                      overallOrder?.isUpperLowerCaseSeparate,
-                    'gm-flex-grow-page': overallOrder?.isUpperLowerCaseSeparate
-                  })}
+    printerStore?.ready &&
+    (showEachPage || isLastTablePage)
+
+  if (!shouldShow) return null
+
+  return (
+    <tr>
+      {_.map(overallOrder.fields, (item, index) => {
+        return (
+          <td colSpan={item.colSpan} key={index}>
+            <div style={{ ...item.style }} className='gm-flex-page'>
+              {item.name}
+              <div
+                className={classNames('gm-flex-page', {
+                  'gm-flex-justify-between-page':
+                    overallOrder?.isUpperLowerCaseSeparate,
+                  'gm-flex-grow-page': overallOrder?.isUpperLowerCaseSeparate
+                })}
+              >
+                <span
+                  className={
+                    overallOrder?.isUpperCaseBefore
+                      ? 'gm-printer-subtotal-isUpperCaseBefore-inter'
+                      : ''
+                  }
                 >
-                  <span
-                    className={
-                      overallOrder?.isUpperCaseBefore
-                        ? 'gm-printer-subtotal-isUpperCaseBefore-inter'
-                        : ''
-                    }
-                  >
-                    {common?.[item.valueField] ?? ''}
+                  {common?.[item.valueField] ?? ''}
+                </span>
+                {overallOrder?.needUpperCase && (
+                  <span>
+                    {common?.[item.valueField]
+                      ? coverDigit2Uppercase(common[item.valueField])
+                      : ''}
                   </span>
-                  {overallOrder?.needUpperCase && (
-                    <span>
-                      {common?.[item.valueField]
-                        ? coverDigit2Uppercase(common[item.valueField])
-                        : ''}
-                    </span>
-                  )}
-                </div>
+                )}
               </div>
-            </td>
-          )
-        })}
-      </tr>
-    )
+            </div>
+          </td>
+        )
+      })}
+    </tr>
   )
 }
 OverallOrder.propTypes = {
   config: PropTypes.object.isRequired,
   range: PropTypes.object.isRequired,
-  printerStore: PropTypes.object
+  printerStore: PropTypes.object,
+  isLastTablePage: PropTypes.bool
+}
+
+OverallOrder.defaultProps = {
+  isLastTablePage: true
 }
 
 export default observer(OverallOrder)

package/src/printer/table_special_tr.js

@@ -25,6 +25,21 @@ const SpecialTr = ({ data, config }) => {
   } = specialConfig
   const { list, type, fixedSize } = data
 
+  // 「显示分类名称/小计文案修改」实时生效：数据行带 _prefix 原料时，按当前 specialConfig 重拼前缀
+  // 打印时配置与数据层拼前缀所用配置一致，重拼结果不变；编辑器预览改配置时实时刷新；导出（paint.js）不走本组件不受影响
+  const applySubtotalText = html => {
+    if (typeof html !== 'string' || data._prefix === undefined) {
+      return html
+    }
+    const showCategoryName = specialConfig?.showCategoryName ?? true
+    const subtotalText = specialConfig?.subtotalText ?? '小计'
+    const newPrefix = showCategoryName
+      ? `${data._categoryName ?? ''}${subtotalText}：`
+      : `${subtotalText}：`
+    // 前缀位于字符串头部，首次命中即替换；用函数替换避免 newPrefix 含 $ 序列时被特俗解释
+    return html.replace(data._prefix, () => newPrefix)
+  }
+
   let compiled
   try {
     compiled = _.template(template_text, { interpolate: /{{([\s\S]+?)}}/g })
@@ -119,7 +134,7 @@ const SpecialTr = ({ data, config }) => {
                 className='gm-flex-page gm-flex-justify-between-page'
                 style={{ 'justify-content': 'space-between' }}
                 dangerouslySetInnerHTML={{
-                  __html: htmlStr || data.text
+                  __html: applySubtotalText(htmlStr || data.text)
                 }}
               />
             </td>
@@ -145,7 +160,7 @@ const SpecialTr = ({ data, config }) => {
             colSpan={99}
             style={Object.assign({ fontWeight: 'bold' }, style)}
             dangerouslySetInnerHTML={{
-              __html: getHtml() || data.text
+              __html: applySubtotalText(getHtml() || data.text)
             }}
           />
         </tr>

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 } from '../util'
+import { coverDigit2Uppercase, getDataKey, maskedSum } from '../util'
 import { observer } from 'mobx-react'
 import { get } from 'mobx'
 import classNames from 'classnames'
@@ -76,21 +76,18 @@ const SubtotalTr = props => {
     if (field === 'real_item_price') field = '出库金额'
     if (field === 'settle_money2') field = '结算金额'
     if (field === 'total_money2') field = '金额'
-    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)
+    // 收集本列所有值(含多栏后缀列),任一脱敏 '***' 则合计显 '***',否则 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)
   }
 
   const getData = field => {
@@ -134,6 +131,93 @@ const SubtotalTr = props => {
         </tr>
       )
     } else {
+      // 单元格拆分展示：第一格（左侧文案+数值）拆分为两个单元格，对齐复用每页合计设置的 textAlign；
+      // 与打印账户总计金额支持共存（2026-09 交互确认）：拆分只作用于第一格，其余格按原 colSpan 渲染（与导出侧 paintSubtotal 行为一致）
+      if (get(subtotal, 'isSplitCells')) {
+        const item = fields[0]
+        // 第一格总 colSpan 拆一半给左侧文案，剩余给数值（colSpan 缺省 99 表示整行）；
+        // 宽度分配沿用原有逻辑：各格按 store 侧 fields[n].colSpan 照画，渲染端不调宽度
+        const totalColSpan = item.colSpan ?? 99
+        const leftColSpan = Math.floor(totalColSpan / 2)
+        const cellStyle = {
+          fontWeight: 'bold',
+          justifyContent: flexStyle[subtotal.style?.textAlign],
+          ...subtotal.style
+        }
+
+        return (
+          <tr>
+            <td colSpan={leftColSpan}>
+              <div style={cellStyle} className='gm-flex-page'>
+                {item.name}
+              </div>
+            </td>
+            <td colSpan={totalColSpan - leftColSpan}>
+              <div style={cellStyle} className='gm-flex-page'>
+                <div
+                  className={classNames('gm-flex-page', {
+                    'gm-flex-justify-between-page': isUpperLowerCaseSeparate,
+                    'gm-flex-grow-page': isUpperLowerCaseSeparate
+                  })}
+                >
+                  <span
+                    className={
+                      isUpperCaseBefore
+                        ? 'gm-printer-subtotal-isUpperCaseBefore-inter'
+                        : ''
+                    }
+                  >
+                    {item.type === 'useSummarize'
+                      ? getData(item.valueField)
+                      : sumData2(list, item.valueField)}
+                  </span>
+                  {subtotal?.needUpperCase && (
+                    <span>
+                      {item.type === 'useSummarize'
+                        ? '大写：' +
+                          coverDigit2Uppercase(getData(item.valueField))
+                        : '大写：' +
+                          coverDigit2Uppercase(sumData2(list, item.valueField))}
+                    </span>
+                  )}
+                </div>
+              </div>
+            </td>
+            {/* 拆分只拆第一格；其余格（打印账户总计金额等）沿用普通多格渲染语义 */}
+            {_.map(fields.slice(1), (extra, extraIndex) => (
+              <td
+                colSpan={extra.colSpan ?? 99}
+                key={`split_extra_${extraIndex}`}
+              >
+                <div style={cellStyle} className='gm-flex-page'>
+                  {extra.name}
+                  <div
+                    className={classNames('gm-flex-page', {
+                      'gm-flex-justify-between-page': isUpperLowerCaseSeparate,
+                      'gm-flex-grow-page': isUpperLowerCaseSeparate
+                    })}
+                  >
+                    <span>
+                      {/* 账户总计金额等固定取数字段走 useSummarize；拆分场景其余格不参与当页求和 */}
+                      {extra.type === 'useSummarize'
+                        ? getData(extra.valueField)
+                        : ''}
+                    </span>
+                    {subtotal?.needUpperCase &&
+                      extra.type === 'useSummarize' && (
+                        <span>
+                          {'大写：' +
+                            coverDigit2Uppercase(getData(extra.valueField))}
+                        </span>
+                      )}
+                  </div>
+                </div>
+              </td>
+            ))}
+          </tr>
+        )
+      }
+
       return (
         <tr>
           {_.map(fields, (item, index) => {

package/src/util.js

@@ -86,13 +86,12 @@ function exchange(arr, target, source) {
   return arr
 }
 
-let timer
-
 function afterImgAndSvgLoaded(callback, $printer) {
   const $imgList = $printer.querySelectorAll('img')
   const $svgList = $printer.querySelectorAll('svg')
 
-  clearTimeout(timer)
+  // timer 为函数内局部变量：computePages（导出测高）与 doPrint（打印）可能并发调用本函数，
+  // 若共享模块级 timer，后调用方会 clearTimeout 掉前一方的轮询，导致其 callback 永不执行
 
   const everyThingIsOk =
     _.every($imgList, img => img.complete) &&
@@ -100,7 +99,7 @@ function afterImgAndSvgLoaded(callback, $printer) {
   if (everyThingIsOk) {
     callback()
   } else {
-    timer = setTimeout(afterImgAndSvgLoaded.bind(this, callback, $printer), 300)
+    setTimeout(afterImgAndSvgLoaded.bind(this, callback, $printer), 300)
   }
 }
 
@@ -121,7 +120,23 @@ 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 '-'
   }
@@ -237,16 +252,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)
@@ -377,5 +400,8 @@ export {
   caclSingleDetailsPageHeight,
   getArrayMid,
   getColSpanLength,
-  getOverallOrderTrHeight
+  getOverallOrderTrHeight,
+  MASKED_VALUE,
+  isMaskedValue,
+  maskedSum
 }