gm-printer 11.1.0-beta.0 → 11.1.0-beta.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gm-printer",
-  "version": "11.1.0-beta.0",
+  "version": "11.1.0-beta.2",
   "description": "diy printer",
   "main": "src/index.js",
   "scripts": {

package/src/printer/long_print_table/index.js

@@ -125,6 +125,7 @@ class Table extends React.Component {
         <>
           <SubtotalTr
             range={range}
+            pageIndex={pageIndex}
             config={config}
             printerStore={printerStore}
             isSomeSubtotalTr={isSomeSubtotalTr}
@@ -140,6 +141,7 @@ class Table extends React.Component {
           <PageSummary {...this.props} />
           <SubtotalTr
             range={range}
+            pageIndex={pageIndex}
             config={config}
             printerStore={printerStore}
             isSomeSubtotalTr={isSomeSubtotalTr}

package/src/printer/store.js

@@ -584,7 +584,7 @@ class PrinterStore {
     }
   }
 
-  templateTable(text, dataKey, index, pageIndex) {
+  templateTable(text, dataKey, index, pageIndex, options = {}) {
     // 做好保护，出错就返回 text
     try {
       let list = this.data._table[dataKey] || this.data._table.orders
@@ -594,15 +594,18 @@ class PrinterStore {
         list = _.uniqBy(list, '序号')
       }
 
+      const { rowTransform, priceFn = price } = options
+      const sourceRow = list[index]
+      const row = rowTransform ? rowTransform(sourceRow) : sourceRow
       return _.template(text, {
         interpolate: /{{([\s\S]+?)}}/g
       })({
         ...this.data.common,
 
-        [i18next.t('列')]: list[index],
+        [i18next.t('列')]: row,
         [i18next.t('当前页码')]: pageIndex + 1,
         [i18next.t('页码总数')]: this.pages.length,
-        price: price // 提供一个价格处理函数
+        price: priceFn // 提供一个价格处理函数
       })
     } catch (err) {
       return text

package/src/printer/table.js

@@ -185,6 +185,7 @@ class Table extends React.Component {
         <>
           <SubtotalTr
             range={range}
+            pageIndex={pageIndex}
             config={config}
             printerStore={printerStore}
             isSomeSubtotalTr={isSomeSubtotalTr}
@@ -200,6 +201,7 @@ class Table extends React.Component {
           <PageSummary {...this.props} />
           <SubtotalTr
             range={range}
+            pageIndex={pageIndex}
             config={config}
             printerStore={printerStore}
             isSomeSubtotalTr={isSomeSubtotalTr}

package/src/printer/table_diy_overallOrder_tr.js

@@ -1,168 +1,17 @@
 import React from 'react'
 import PropTypes from 'prop-types'
-import _ from 'lodash'
-// import Big from 'big.js'
-import {
-  coverDigit2Uppercase,
-  getDataKey,
-  formatSumWithPrecision
-} from '../util'
-import { observer } from 'mobx-react'
-import classNames from 'classnames'
-import Big from 'big.js'
+import DiySummary from './table_diy_summary_tr'
 
+// 自定义整单合计复用通用自定义合计组件
 const DiyOverallOrder = props => {
-  const {
-    config: { diyOverallOrder, dataKey },
-    printerStore,
-    pageIndex
-  } = props
-  const tableData = printerStore.data._table[getDataKey(dataKey)] || []
-
-  const formatter = printerStore.config?.payAmountFormatter
-  const highPrecisionMapping = printerStore.config?.highPrecisionFieldMapping
-
-  // 计算合计
-  const sumData = field => {
-    // 查找高精度字段，有则直接从原始数据取值，避免 templateTable 的精度损失
-    const hpField = highPrecisionMapping?.[field]
-    const sum = _.reduce(
-      tableData,
-      (a, b, i) => {
-        let result = a
-        if (hpField) {
-          result = a.plus(b._origin?.[hpField] ?? b[hpField] ?? 0)
-        } else {
-          const bRes = printerStore
-            .templateTable(field, dataKey, i, pageIndex)
-            .replace(/\(\)/g, '')
-          result = a.plus(+bRes || 0)
-        }
-        return result
-      },
-      Big(0)
-    )
-    return formatSumWithPrecision(sum, formatter)
-  }
-
-  if (!diyOverallOrder?.show || !printerStore?.ready) {
-    return null
-  }
-
-  const leftField = diyOverallOrder.fields?.[0]
-  if (!leftField) return null
-  const rightName = leftField.rightName || ''
-
-  // 左右显示分离
-  const isUpperLowerCaseSeparate = diyOverallOrder?.isUpperLowerCaseSeparate
-  // 大写金额在前
-  const isUpperCaseBefore = diyOverallOrder?.isUpperCaseBefore
-  // 大写金额
-  const needUpperCase = diyOverallOrder?.needUpperCase
-  // 小写金额
-  const numericValue = sumData(leftField.valueField)
-  // 大写金额
-  const upperCaseValue = needUpperCase ? coverDigit2Uppercase(numericValue) : ''
-
-  const leftText = () => {
-    if (isUpperLowerCaseSeparate) {
-      // 大写金额在前
-      if (isUpperCaseBefore) {
-        return upperCaseValue
-      }
-      // 小写金额在前
-      return numericValue
-    }
-
-    // 大写金额在前且需要大写金额
-    if (isUpperCaseBefore) {
-      return `${upperCaseValue} ${numericValue}`
-    }
-
-    if (needUpperCase) {
-      return `${numericValue} ${upperCaseValue}`
-    }
-
-    return numericValue
-  }
-
-  const rightText = () => {
-    if (isUpperLowerCaseSeparate) {
-      if (isUpperCaseBefore) {
-        return `${rightName} ${numericValue}`
-      }
-      return `${rightName} ${upperCaseValue}`
-    }
-
-    return ''
-  }
-  return (
-    <tr>
-      <td colSpan={99}>
-        <div style={{ ...leftField.style }} className='gm-flex-page'>
-          {leftField.name}
-          <div
-            className={classNames('gm-flex-page', {
-              'gm-flex-justify-between-page': isUpperLowerCaseSeparate,
-              'gm-flex-grow-page': isUpperLowerCaseSeparate
-            })}
-          >
-            {/* 左侧金额 */}
-            <span>{leftText()}</span>
-
-            <span>{rightText()}</span>
-          </div>
-        </div>
-      </td>
-    </tr>
-  )
-  // return (
-  //   diyOverallOrder?.show &&
-  //   printerStore?.ready && (
-  //     <tr>
-  //       {_.map(diyOverallOrder.fields, (item, index) => {
-  //         return (
-  //           <td colSpan={item.colSpan ?? 99} key={index}>
-  //             <div style={{ ...item.style }} className='gm-flex-page'>
-  //               {item.name}
-  //               <div
-  //                 className={classNames('gm-flex-page', {
-  //                   'gm-flex-justify-between-page':
-  //                     diyOverallOrder?.isUpperLowerCaseSeparate,
-  //                   'gm-flex-grow-page':
-  //                     diyOverallOrder?.isUpperLowerCaseSeparate
-  //                 })}
-  //               >
-  //                 <span
-  //                   className={
-  //                     diyOverallOrder?.isUpperCaseBefore
-  //                       ? 'gm-printer-subtotal-isUpperCaseBefore-inter'
-  //                       : ''
-  //                   }
-  //                 >
-  //                   {sumData(item.valueField)}
-  //                 </span>
-  //                 {diyOverallOrder?.needUpperCase && (
-  //                   <span>
-  //                     {coverDigit2Uppercase(sumData(item.valueField))
-  //                       ? coverDigit2Uppercase(sumData(item.valueField))
-  //                       : ''}
-  //                   </span>
-  //                 )}
-  //               </div>
-  //             </div>
-  //           </td>
-  //         )
-  //       })}
-  //     </tr>
-  //   )
-  // )
+  return <DiySummary {...props} configKey='diyOverallOrder' />
 }
+
 DiyOverallOrder.propTypes = {
   config: PropTypes.object.isRequired,
-  range: PropTypes.object.isRequired,
+  range: PropTypes.object,
   printerStore: PropTypes.object,
   pageIndex: PropTypes.number
 }
 
-export default observer(DiyOverallOrder)
+export default DiyOverallOrder

package/src/printer/table_diy_summary_tr.js

@@ -2,6 +2,7 @@ import React from 'react'
 import PropTypes from 'prop-types'
 import _ from 'lodash'
 import {
+  calculateDiySummary,
   coverDigit2Uppercase,
   getDataKey,
   isMultiTable,
@@ -53,67 +54,52 @@ const DiySummary = props => {
 
   const formatter = printerStore.config?.payAmountFormatter
   const highPrecisionMapping = printerStore.config?.highPrecisionFieldMapping
+  const isRoundFirst =
+    printerStore.data._origin?.precision_control?.is_round_first === true
 
-  // 计算合计（逐行取原始列值，内置函数只作用在最终合计结果上）
+  // 单栏使用统一计算器；多栏保留原有后缀字段累加逻辑
   const sumData = field => {
-    // 查找高精度字段，有则直接从原始数据取值，避免 templateTable 的精度损失
-    // 兼容映射 key 为模板串或字段名两种写法
-    const fieldKey = extractSumField(field)
-    const hpField =
-      highPrecisionMapping?.[field] || highPrecisionMapping?.[fieldKey]
-
-    if (isMulti) {
-      // 多栏表格暂不使用高精度字段，保持原有 templateTable 逻辑
-      const sum = _.reduce(
+    if (!isMulti) {
+      return calculateDiySummary({
         tableData,
-        (a, b, i) => {
-          let result = a
-          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)
-      )
-      return formatSumWithPrecision(sum, formatter)
+        valueField: field,
+        formatter,
+        highPrecisionMapping,
+        isRoundFirst,
+        renderTemplate: (template, index, options) =>
+          printerStore
+            .templateTable(
+              template,
+              dataKey,
+              range ? range.begin + index : index,
+              pageIndex,
+              options
+            )
+            .replace(/\(\)/g, '')
+      })
     }
 
-    // 单栏：有高精度字段则直接从原始数据取值
-    if (hpField) {
-      const sum = _.reduce(
-        tableData,
-        (a, b) => {
-          return a.plus(b._origin?.[hpField] ?? b[hpField] ?? 0)
-        },
-        Big(0)
-      )
-      return formatSumWithPrecision(sum, formatter)
-    }
-
-    // 兜底：无高精度字段，使用 templateTable
     const sum = _.reduce(
       tableData,
-      (a, b, i) => {
-        let result = a
-        const bRes = getRes(field, i)
-        result = a.plus(+bRes || 0)
-        return result
+      (total, row, index) => {
+        let result = total.plus(+getRes(field, index) || 0)
+        const multiField = buildTemplateField(field, MULTI_SUFFIX)
+        result = result.plus(+getRes(multiField, index) || 0)
+        const multiField3 = buildTemplateField(field, MULTI_SUFFIX3)
+        return result.plus(+getRes(multiField3, index) || 0)
       },
       Big(0)
     )
     return formatSumWithPrecision(sum, formatter)
 
-    function getRes(field, i) {
+    function getRes(template, index) {
       return printerStore
-        .templateTable(field, dataKey, range ? range.begin + i : i, pageIndex)
+        .templateTable(
+          template,
+          dataKey,
+          range ? range.begin + index : index,
+          pageIndex
+        )
         .replace(/\(\)/g, '')
     }
   }
@@ -131,15 +117,14 @@ const DiySummary = props => {
   const isUpperLowerCaseSeparate = diyConfig?.isUpperLowerCaseSeparate
   const isUpperCaseBefore = diyConfig?.isUpperCaseBefore
   const needUpperCase = diyConfig?.needUpperCase
-  const fieldKey = extractSumField(leftField.valueField)
-  // 求和用去掉内置函数后的列模板，多栏/高精度逻辑保持不变
-  const numericValue = sumData(toSumColTemplate(leftField.valueField))
-  // 仅对合计结果做模板/内置函数渲染
-  const displayValue = templateSumResult(
-    leftField.valueField,
-    numericValue,
-    fieldKey
-  )
+  // 单栏完整遵循统一舍入顺序；多栏保持原有求和后执行模板逻辑
+  const displayValue = isMulti
+    ? templateSumResult(
+        leftField.valueField,
+        sumData(toSumColTemplate(leftField.valueField)),
+        extractSumField(leftField.valueField)
+      )
+    : sumData(leftField.valueField)
   const upperCaseValue = needUpperCase ? coverDigit2Uppercase(displayValue) : ''
 
   const leftText = () => {

package/src/printer/table_overallOrder_tr.js

@@ -2,24 +2,56 @@ import React from 'react'
 import PropTypes from 'prop-types'
 import _ from 'lodash'
 // import Big from 'big.js'
-import { coverDigit2Uppercase } from '../util'
+import {
+  calculateDiySummary,
+  coverDigit2Uppercase,
+  extractSumField,
+  getDataKey,
+  hasDiySummaryExpression
+} from '../util'
 import { observer } from 'mobx-react'
 import classNames from 'classnames'
 
 const OverallOrder = props => {
   const {
-    config: { overallOrder },
+    config: { overallOrder, dataKey, arrange },
     printerStore,
     printerStore: {
       data: { common }
     }
   } = props
+  const tableDataKey = getDataKey(dataKey, arrange)
+  const tableData = printerStore.data._table[tableDataKey] || []
+  const formatter = printerStore.config?.payAmountFormatter
+  const highPrecisionMapping = printerStore.config?.highPrecisionFieldMapping
+  const isRoundFirst =
+    printerStore.data._origin?.precision_control?.is_round_first === true
+
+  // 普通字段沿用服务端整单值，表达式使用统一明细计算器
+  const getOverallValue = valueField => {
+    const fieldKey = extractSumField(valueField)
+    if (!hasDiySummaryExpression(valueField)) {
+      return common?.[fieldKey] ?? ''
+    }
+    return calculateDiySummary({
+      tableData,
+      valueField,
+      formatter,
+      highPrecisionMapping,
+      isRoundFirst,
+      renderTemplate: (template, index, options) =>
+        printerStore
+          .templateTable(template, tableDataKey, index, undefined, options)
+          .replace(/\(\)/g, '')
+    })
+  }
 
   return (
     overallOrder?.show &&
     printerStore?.ready && (
       <tr>
         {_.map(overallOrder.fields, (item, index) => {
+          const displayValue = getOverallValue(item.valueField)
           return (
             <td colSpan={item.colSpan} key={index}>
               <div style={{ ...item.style }} className='gm-flex-page'>
@@ -38,13 +70,11 @@ const OverallOrder = props => {
                         : ''
                     }
                   >
-                    {common?.[item.valueField] ?? ''}
+                    {displayValue}
                   </span>
                   {overallOrder?.needUpperCase && (
                     <span>
-                      {common?.[item.valueField]
-                        ? coverDigit2Uppercase(common[item.valueField])
-                        : ''}
+                      {displayValue ? coverDigit2Uppercase(displayValue) : ''}
                     </span>
                   )}
                 </div>

package/src/printer/table_subtotal_tr.js

@@ -5,10 +5,12 @@ import _ from 'lodash'
 import { MULTI_SUFFIX, MULTI_SUFFIX3 } from '../config'
 import Big from 'big.js'
 import {
+  calculateDiySummary,
   coverDigit2Uppercase,
   getDataKey,
   formatSumWithPrecision,
   extractSumField,
+  isMultiTable,
   templateSumResult
 } from '../util'
 import { observer } from 'mobx-react'
@@ -47,10 +49,14 @@ const SubtotalTr = props => {
       }
     },
     range,
+    pageIndex,
     printerStore,
     isSomeSubtotalTr
   } = props
   const tableData = printerStore.data._table[getDataKey(dataKey, arrange)] || []
+  const isMulti = isMultiTable(dataKey)
+  const isRoundFirst =
+    printerStore.data._origin?.precision_control?.is_round_first === true
 
   // 计算合计
   const sumData2 = (list, field, formatter, highPrecisionMapping) => {
@@ -97,8 +103,28 @@ const SubtotalTr = props => {
   if (show && printerStore.ready) {
     const list = tableData.slice(range.begin, range.end)
 
-    // 先按字段求和，再对结果做模板/内置函数渲染
+    // 单栏使用统一舍入逻辑，多栏保留原有后缀字段累加
     const formatSumValue = valueField => {
+      if (!isMulti) {
+        return calculateDiySummary({
+          tableData: list,
+          valueField,
+          formatter,
+          highPrecisionMapping,
+          isRoundFirst,
+          renderTemplate: (template, index, options) =>
+            printerStore
+              .templateTable(
+                template,
+                dataKey,
+                range.begin + index,
+                pageIndex,
+                options
+              )
+              .replace(/\(\)/g, '')
+        })
+      }
+
       const fieldKey = extractSumField(valueField)
       const sum = sumData2(list, fieldKey, formatter, highPrecisionMapping)
       return templateSumResult(valueField, sum, fieldKey)
@@ -201,7 +227,8 @@ const SubtotalTr = props => {
 SubtotalTr.propTypes = {
   config: PropTypes.object.isRequired,
   range: PropTypes.object.isRequired,
-  printStore: PropTypes.object
+  printStore: PropTypes.object,
+  pageIndex: PropTypes.number
 }
 
 export default observer(SubtotalTr)

package/src/util.js

@@ -450,6 +450,112 @@ const toSumColTemplate = text => {
   return `{{列.${key}}}`
 }
 
+/**
+ * 判断自定义合计配置是否包含函数或运算表达式
+ * @param {string} valueField
+ * @returns {boolean}
+ */
+const hasDiySummaryExpression = valueField => {
+  const expression =
+    typeof valueField === 'string'
+      ? valueField.match(/{{([\s\S]+?)}}/)?.[1]?.trim()
+      : ''
+  return expression ? !/^(?:列\.)?[\w㐀-鿿（）]+$/.test(expression) : false
+}
+
+/**
+ * 按字段/表达式和舍入顺序计算自定义合计
+ * @param {Object} options
+ * @returns {string}
+ */
+const calculateDiySummary = options => {
+  const {
+    tableData,
+    valueField,
+    formatter,
+    highPrecisionMapping,
+    isRoundFirst,
+    renderTemplate
+  } = options
+  const hasExpression = hasDiySummaryExpression(valueField)
+
+  // 用高精度字段构造公式上下文，不修改实际打印行
+  const getHighPrecisionRow = row => {
+    const formulaRow = { ...row }
+    _.forEach(highPrecisionMapping, (hpField, field) => {
+      const value = row._origin?.[hpField] ?? row[hpField]
+      if (value !== undefined && value !== null) {
+        formulaRow[field] = value
+      }
+    })
+    return formulaRow
+  }
+
+  if (!hasExpression) {
+    const fieldKey = extractSumField(valueField)
+    const mappedField = getHighPrecisionField(fieldKey, highPrecisionMapping)
+    const hpField = highPrecisionMapping?.[valueField] || mappedField
+    const hasHighPrecisionField = hpField !== fieldKey
+    const columnTemplate = valueField.includes('{{')
+      ? valueField
+      : toSumColTemplate(valueField)
+    const sum = _.reduce(
+      tableData,
+      (total, row, index) => {
+        const rawValue = hasHighPrecisionField
+          ? row._origin?.[hpField] ?? row[hpField] ?? 0
+          : renderTemplate(columnTemplate, index)
+        const value =
+          isRoundFirst && formatter ? formatter(rawValue).toFixed() : rawValue
+        const numericValue = value === '' || isNaN(Number(value)) ? 0 : value
+        return total.plus(numericValue)
+      },
+      Big(0)
+    )
+    return formatSumWithPrecision(sum, formatter)
+  }
+
+  // 表达式最多包含一个 price；后舍入模式下将 price 延迟到合计结果
+  const usesPrice = /\bprice\s*\(/.test(valueField)
+  let formulaPrecision = 2
+  let decimalPlaces = 0
+  const deferredPrice = (value, precision = 2) => {
+    formulaPrecision = precision
+    return value
+  }
+  const sum = _.reduce(
+    tableData,
+    (total, row, index) => {
+      const renderOptions = isRoundFirst
+        ? undefined
+        : {
+            rowTransform: getHighPrecisionRow,
+            priceFn: usesPrice ? deferredPrice : undefined
+          }
+      const result = String(
+        renderTemplate(valueField, index, renderOptions)
+      ).trim()
+      if (result === '' || isNaN(Number(result))) return total
+
+      const value =
+        isRoundFirst && !usesPrice && formatter
+          ? formatter(result).toFixed()
+          : result
+      const decimalPart = String(value).split('.')[1]
+      decimalPlaces = Math.max(decimalPlaces, decimalPart?.length || 0)
+      return total.plus(value)
+    },
+    Big(0)
+  )
+
+  if (!isRoundFirst && usesPrice) {
+    return price(sum, formulaPrecision)
+  }
+  return usesPrice
+    ? sum.toFixed(decimalPlaces)
+    : formatSumWithPrecision(sum, formatter)
+}
+
 export {
   collectGroups,
   getHeight,
@@ -476,5 +582,7 @@ export {
   price,
   extractSumField,
   templateSumResult,
-  toSumColTemplate
+  toSumColTemplate,
+  hasDiySummaryExpression,
+  calculateDiySummary
 }