gm-printer 10.37.2 → 11.0.1

package/package.json

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

package/src/common/editor_title.js

@@ -72,15 +72,13 @@ class EditorTitle extends React.Component {
   }
 
   handleTestPrint = () => {
-    // 新增结款单每页合计标识，测试打印时原样透传到打印入口
-    const { mockData, editStore, isSomeSubtotalTr } = this.props
+    const { mockData, editStore } = this.props
     doPrint(
       {
         config: toJS(editStore.config),
         data: mockData
       },
-      true,
-      isSomeSubtotalTr
+      true
     )
   }
 
@@ -142,14 +140,10 @@ class EditorTitle extends React.Component {
 EditorTitle.propTypes = {
   onSave: PropTypes.func.isRequired,
   isPurchase: PropTypes.bool,
-  editStore: PropTypes.object,
-  // 标识是否为结款单每页合计场景
-  isSomeSubtotalTr: PropTypes.bool
+  editStore: PropTypes.object
 }
 EditorTitle.defaultProps = {
-  isPurchase: false,
-  // 默认按非结款单每页合计场景处理
-  isSomeSubtotalTr: false
+  isPurchase: false
 }
 
 EditorTitle.wrappedComponent.propTypes = {

package/src/editor/index.js

@@ -1,6 +1,4 @@
 import withShadowDom from '../common/hoc_with_shadow_dom'
 import Editor from './editor'
-import Editor22 from './editor2'
 
 export default withShadowDom(Editor)
-export const Editor2 = withShadowDom(Editor22)

package/src/editor_settle/editor.js

@@ -42,8 +42,7 @@ class Editor extends React.Component {
 
         {showEditor && (
           <div className='gm-printer-edit-zone'>
-            {/* 透传结款单每页合计标识给标题区，用于测试打印时走对应逻辑 */}
-            <EditorTitle onSave={onSave} isSomeSubtotalTr={isSomeSubtotalTr} />
+            <EditorTitle onSave={onSave} />
             <Gap height='10px' />
             <EditorSelect />
             <Gap height='5px' />

package/src/index.js

@@ -1,7 +1,6 @@
 // ‼️优先初始化语言设置(必须先初始化语言)
 import '../locales'
-import Editor, { Editor2 } from './editor'
-
+import Editor from './editor'
 import EditorPurchase from './editor_purchase'
 import EditorStockIn from './editor_stockin'
 import EditorStockOut from './editor_stockout'
@@ -28,7 +27,6 @@ export { setLocale } from '../locales'
 
 export {
   Editor,
-  Editor2,
   EditorStockIn,
   EditorStockOut,
   EditorPurchase,

package/src/printer/page_summary.js

@@ -1,6 +1,11 @@
 import React from 'react'
 import _ from 'lodash'
-import { getDataKey, isMultiTable } from '../util'
+import {
+  getDataKey,
+  isMultiTable,
+  formatSumWithPrecision,
+  getHighPrecisionField
+} from '../util'
 import Big from 'big.js'
 import { observer } from 'mobx-react'
 import { get } from 'mobx'
@@ -16,17 +21,27 @@ const regExp = text => {
  * @param key
  * @param dataList
  * @param summaryFieldsResultToNumber 需要转换为数字的汇总字段
+ * @param formatter 精度格式化函数，由 stationv2 传入 AmountPrecisionUtil(precision_control)
+ * @param highPrecisionMapping 高精度字段映射，优先用高精度字段求和
  * @returns {*|string}
  */
-const sumCol = (key, dataList, summaryFieldsResultToNumber = []) => {
+const sumCol = (
+  key,
+  dataList,
+  summaryFieldsResultToNumber = [],
+  formatter,
+  highPrecisionMapping
+) => {
   let result
   try {
-    result = dataList
-      .reduce((acc, item) => {
-        acc = acc.plus(item[key] || 0)
-        return acc
-      }, Big(0))
-      .toFixed(2)
+    // 优先使用高精度字段求和
+    const sumKey = getHighPrecisionField(key, highPrecisionMapping)
+    const sum = dataList.reduce((acc, item) => {
+      const val = item[sumKey] ?? item._origin?.[sumKey] ?? 0
+      acc = acc.plus(val)
+      return acc
+    }, Big(0))
+    result = formatSumWithPrecision(sum, formatter)
 
     if (summaryFieldsResultToNumber.includes(key)) {
       result = Number(result)
@@ -66,6 +81,8 @@ const PageSummary = props => {
         regExp(item)
       )
     }
+    const formatter = printerStore.config?.payAmountFormatter
+    const highPrecisionMapping = printerStore.config?.highPrecisionFieldMapping
     return (
       <tr>
         {_.map(columns, (col, index) => {
@@ -79,7 +96,13 @@ const PageSummary = props => {
               summaryConfig.summaryColumns
                 .map(text => regExp(text))
                 .includes(key) && key
-                ? sumCol(key, currentPageTableData, summaryFieldsResultToNumber)
+                ? sumCol(
+                    key,
+                    currentPageTableData,
+                    summaryFieldsResultToNumber,
+                    formatter,
+                    highPrecisionMapping
+                  )
                 : ' '
           }
 

package/src/printer/store.js

@@ -1,5 +1,5 @@
 import i18next from '../../locales'
-import { action, observable, computed } from 'mobx'
+import { action, observable, computed, toJS } from 'mobx'
 import {
   getSumTrHeight,
   isMultiTable,
@@ -530,7 +530,7 @@ class PrinterStore {
       })({
         ...this.data.common,
         [i18next.t('当前页码')]: pageIndex + 1,
-        [i18next.t('页码总数')]: Math.max(1, this.pages.length),
+        [i18next.t('页码总数')]: this.pages.length,
         price: price
       })
     } catch (err) {
@@ -604,7 +604,7 @@ class PrinterStore {
 
         [i18next.t('列')]: list[index],
         [i18next.t('当前页码')]: pageIndex + 1,
-        [i18next.t('页码总数')]: Math.max(1, this.pages.length),
+        [i18next.t('页码总数')]: this.pages.length,
         price: price // 提供一个价格处理函数
       })
     } catch (err) {
@@ -626,7 +626,7 @@ class PrinterStore {
         ...this.data.common,
         [i18next.t('列')]: list[index],
         [i18next.t('当前页码')]: pageIndex + 1,
-        [i18next.t('页码总数')]: Math.max(1, this.pages.length),
+        [i18next.t('页码总数')]: this.pages.length,
         price: price // 提供一个价格处理函数
       })
       res =

package/src/printer/table_diy_overallOrder_tr.js

@@ -2,7 +2,11 @@ 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,
+  formatSumWithPrecision
+} from '../util'
 import { observer } from 'mobx-react'
 import classNames from 'classnames'
 import Big from 'big.js'
@@ -15,20 +19,30 @@ const DiyOverallOrder = props => {
   } = props
   const tableData = printerStore.data._table[getDataKey(dataKey)] || []
 
+  const formatter = printerStore.config?.payAmountFormatter
+  const highPrecisionMapping = printerStore.config?.highPrecisionFieldMapping
+
   // 计算合计
   const sumData = field => {
-    return _.reduce(
+    // 查找高精度字段，有则直接从原始数据取值，避免 templateTable 的精度损失
+    const hpField = highPrecisionMapping?.[field]
+    const sum = _.reduce(
       tableData,
       (a, b, i) => {
         let result = a
-        const bRes = printerStore
-          .templateTable(field, dataKey, i, pageIndex)
-          .replace(/\(\)/g, '')
-        result = a.plus(+bRes || 0)
+        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)
-    ).toFixed(2)
+    )
+    return formatSumWithPrecision(sum, formatter)
   }
 
   if (!diyOverallOrder?.show || !printerStore?.ready) {

package/src/printer/table_diy_summary_tr.js

@@ -1,7 +1,12 @@
 import React from 'react'
 import PropTypes from 'prop-types'
 import _ from 'lodash'
-import { coverDigit2Uppercase, getDataKey, isMultiTable } from '../util'
+import {
+  coverDigit2Uppercase,
+  getDataKey,
+  isMultiTable,
+  formatSumWithPrecision
+} from '../util'
 import { MULTI_SUFFIX, MULTI_SUFFIX3 } from '../config'
 import { observer } from 'mobx-react'
 import classNames from 'classnames'
@@ -43,14 +48,20 @@ const DiySummary = props => {
   // 判断是否是多栏表格
   const isMulti = isMultiTable(dataKey)
 
+  const formatter = printerStore.config?.payAmountFormatter
+  const highPrecisionMapping = printerStore.config?.highPrecisionFieldMapping
+
   // 计算合计
   const sumData = field => {
+    // 查找高精度字段，有则直接从原始数据取值，避免 templateTable 的精度损失
+    const hpField = highPrecisionMapping?.[field]
+
     if (isMulti) {
-      return _.reduce(
+      // 多栏表格暂不使用高精度字段，保持原有 templateTable 逻辑
+      const sum = _.reduce(
         tableData,
         (a, b, i) => {
           let result = a
-          // 先通过 templateTable 获取原始字段的值
           const bRes = getRes(field, i)
           result = a.plus(+bRes || 0)
 
@@ -65,10 +76,24 @@ const DiySummary = props => {
           return result
         },
         Big(0)
-      ).toFixed(2)
+      )
+      return formatSumWithPrecision(sum, formatter)
+    }
+
+    // 单栏：有高精度字段则直接从原始数据取值
+    if (hpField) {
+      const sum = _.reduce(
+        tableData,
+        (a, b, i) => {
+          return a.plus(b._origin?.[hpField] ?? b[hpField] ?? 0)
+        },
+        Big(0)
+      )
+      return formatSumWithPrecision(sum, formatter)
     }
 
-    return _.reduce(
+    // 兜底：无高精度字段，使用 templateTable
+    const sum = _.reduce(
       tableData,
       (a, b, i) => {
         let result = a
@@ -77,7 +102,8 @@ const DiySummary = props => {
         return result
       },
       Big(0)
-    ).toFixed(2)
+    )
+    return formatSumWithPrecision(sum, formatter)
 
     function getRes(field, i) {
       return printerStore

package/src/printer/table_subtotal_tr.js

@@ -4,7 +4,11 @@ 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,
+  formatSumWithPrecision
+} from '../util'
 import { observer } from 'mobx-react'
 import { get } from 'mobx'
 import classNames from 'classnames'
@@ -45,58 +49,47 @@ const SubtotalTr = props => {
     isSomeSubtotalTr
   } = props
   const tableData = printerStore.data._table[getDataKey(dataKey, arrange)] || []
-  // 计算合计
-  const sumData = (list, field) => {
-    return _.reduce(
-      list,
-      (a, b) => {
-        let result = a
-
-        const _origin = b._origin || {}
-        const _origin2 = b['_origin' + MULTI_SUFFIX] || {}
-        const _origin3 = b['_origin' + MULTI_SUFFIX3] || {}
-
-        result = a.plus(_origin[field] || 0)
-        if (_origin2[field]) {
-          result = result.plus(_origin2[field])
-        }
-        if (_origin3[field]) {
-          result = result.plus(_origin3[field])
-        }
-        return result
-      },
-      Big(0)
-    ).toFixed(2)
-  }
 
   // 计算合计
-  const sumData2 = (list, field) => {
+  const sumData2 = (list, field, formatter, highPrecisionMapping) => {
+    // 在字段名转换前，查找是否有高精度字段
+    const hpField = highPrecisionMapping?.[field]
+
     // 兼容之前
     if (field === 'total_item_price') field = '下单金额'
     if (field === 'real_item_price') field = '出库金额'
     if (field === 'settle_money2') field = '结算金额'
     if (field === 'total_money2') field = '金额'
-    return _.reduce(
+
+    const sum = _.reduce(
       list,
       (a, b) => {
         let result = a
-        result = a.plus(b[field] || 0)
-        if (b?.[field + MULTI_SUFFIX]) {
+        // 优先使用高精度字段（从 _origin 中取原始数据）
+        if (hpField) {
+          result = a.plus(b._origin?.[hpField] ?? b[hpField] ?? 0)
+        } else {
+          result = a.plus(b[field] || 0)
+        }
+        if (!hpField && b?.[field + MULTI_SUFFIX]) {
           result = result.plus(b?.[field + MULTI_SUFFIX])
         }
-        if (b?.[field + MULTI_SUFFIX3]) {
+        if (!hpField && b?.[field + MULTI_SUFFIX3]) {
           result = result.plus(b?.[field + MULTI_SUFFIX3])
         }
         return result
       },
       Big(0)
-    ).toFixed(2)
+    )
+    return formatSumWithPrecision(sum, formatter)
   }
 
   const getData = field => {
     const data = printerStore.data.common
     return data?.[field] ?? ''
   }
+  const formatter = printerStore.config?.payAmountFormatter
+  const highPrecisionMapping = printerStore.config?.highPrecisionFieldMapping
   // 每页小计
   // show 是否展示小计，fields<Array> 合计的字段和展现的name，displayName 是否显示名字
   if (show && printerStore.ready) {
@@ -107,7 +100,12 @@ const SubtotalTr = props => {
       const sum = {}
 
       _.each(fields, v => {
-        sum[v.name] = sumData2(list, v.valueField)
+        sum[v.name] = sumData2(
+          list,
+          v.valueField,
+          formatter,
+          highPrecisionMapping
+        )
       })
       let subtotalStr = ''
       for (const name in sum) {
@@ -165,9 +163,14 @@ const SubtotalTr = props => {
                       {item.type === 'useSummarize'
                         ? getData(item.valueField)
                         : index === 0
-                        ? sumData2(list, item.valueField)
+                        ? sumData2(
+                            list,
+                            item.valueField,
+                            formatter,
+                            highPrecisionMapping
+                          )
                         : ''}
-                      {/* {index === 0 ? sumData(list, item.valueField) : ''} */}
+                      {/* {index === 0 ? sumData(list, item.valueField, formatter) : ''} */}
                     </span>
                     {subtotal?.needUpperCase && ( // 是否需要大写金额
                       <span>
@@ -177,7 +180,12 @@ const SubtotalTr = props => {
                           : index === 0
                           ? '大写：' +
                             coverDigit2Uppercase(
-                              sumData2(list, item.valueField)
+                              sumData2(
+                                list,
+                                item.valueField,
+                                formatter,
+                                highPrecisionMapping
+                              )
                             )
                           : ''}
                       </span>

package/src/util.js

@@ -353,6 +353,27 @@ const collectGroups = (tableData, range, key = '_collect') => {
   }
 }
 
+/**
+ * 使用精度格式化函数格式化 Big.js 求和结果，无格式化函数时兜底 toFixed(2)
+ * @param {Big} sum - Big.js 实例
+ * @param {Function} [formatter] - 可选的精度格式化函数
+ * @returns {string}
+ */
+const formatSumWithPrecision = (sum, formatter) => {
+  return formatter ? formatter(sum).toFixed() : sum.toFixed(2)
+}
+
+/**
+ * 根据高精度字段映射，获取求和时应使用的字段名
+ * 如果字段有对应的高精度版本，返回高精度字段名，否则返回原字段名
+ * @param {string} field - 原始字段名
+ * @param {Object} mapping - 高精度字段映射，格式：{ normalField: 'high_precision_field' }
+ * @returns {string}
+ */
+const getHighPrecisionField = (field, mapping) => {
+  return mapping?.[field] || field
+}
+
 export {
   collectGroups,
   getHeight,
@@ -373,5 +394,7 @@ export {
   caclSingleDetailsPageHeight,
   getArrayMid,
   getColSpanLength,
-  getOverallOrderTrHeight
+  getOverallOrderTrHeight,
+  formatSumWithPrecision,
+  getHighPrecisionField
 }