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

package/package.json

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

package/src/common/editor_store.js

@@ -94,45 +94,13 @@ class EditorStore {
 
   @action
   setSubtotalFieldsCol(arr) {
+    // this.overallOrderShow = !this.overallOrderShow
+    // 重新计算每页合计的单元格
     const table = this.config.contents[arr[2]]
-    if (!table?.subtotal?.show) return
-
-    const colSpanLength = getColSpanLength(table)
-    if (!table.subtotal.fields?.length) {
-      set(table.subtotal, {
-        fields: [
-          {
-            name: '每页合计：',
-            valueField: 'real_item_price',
-            colSpan: colSpanLength
-          }
-        ]
-      })
-      return
-    }
-
     const subtotalLength = table.subtotal.fields.length
     table.subtotal.fields[subtotalLength - 1].colSpan += 1
   }
 
-  @action
-  updateSelectedRegionAfterContentInsert(insertIndex) {
-    const updateNameIndex = name => {
-      if (!name) return name
-      const parts = name.split('.')
-      if (parts[0] !== 'contents') return name
-      const regionIndex = ~~parts[2]
-      if (regionIndex >= insertIndex) {
-        parts[2] = String(regionIndex + 1)
-        return parts.join('.')
-      }
-      return name
-    }
-
-    this.selectedRegion = updateNameIndex(this.selectedRegion)
-    this.selected = updateNameIndex(this.selected)
-  }
-
   @action
   setMultiDigitDecimal(bool) {
     this.isMultiDigitDecimal = bool
@@ -298,7 +266,6 @@ class EditorStore {
       { batchPrintConfig: 1, isFixLastFooter: true },
       config
     )
-    this.defaultTableDataKey = config.defaultTableDataKey || 'orders'
     this.originConfig = config
     this.selected = null
     this.selectedRegion = null
@@ -1238,8 +1205,6 @@ class EditorStore {
             }
           })
         }
-        this.updateSelectedRegionAfterContentInsert(index)
-        this.config = toJS(this.config)
       }
     }
   }

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 EditorMenuConfig from './editor_menu_config'
 
 export default withShadowDom(Editor)
-export const Editor2 = withShadowDom(EditorMenuConfig)

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,9 +1,7 @@
 // ‼️优先初始化语言设置(必须先初始化语言)
 import '../locales'
-import Editor, { Editor2 } from './editor'
-
+import Editor from './editor'
 import EditorPurchase from './editor_purchase'
-import EditorExaminingReport from './examining_report_editor'
 import EditorStockIn from './editor_stockin'
 import EditorStockOut from './editor_stockout'
 import EditorSettle from './editor_settle'
@@ -29,11 +27,9 @@ export { setLocale } from '../locales'
 
 export {
   Editor,
-  Editor2,
   EditorStockIn,
   EditorStockOut,
   EditorPurchase,
-  EditorExaminingReport,
   EditorSettle,
   EditorStatement,
   EditorAccoutStatement,

package/src/printer/page_summary.js

@@ -1,32 +1,44 @@
 import React from 'react'
 import _ from 'lodash'
-import { getDataKey, isMultiTable } from '../util'
+import {
+  getDataKey,
+  isMultiTable,
+  formatSumWithPrecision,
+  getHighPrecisionField,
+  extractSumField,
+  templateSumResult
+} from '../util'
 import Big from 'big.js'
 import { observer } from 'mobx-react'
 import { get } from 'mobx'
 import i18next from '../../locales'
 
-const regExp = text => {
-  const match = /{{([^{}]+)}}/.exec(text)
-  const key = match ? match[1] : ''
-  return key ? key.split('.')[1] : ''
-}
 /**
  * 每列统计
  * @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)
@@ -63,9 +75,16 @@ const PageSummary = props => {
       printerStore.config?.summaryFieldsResultToNumber
     if (summaryFieldsResultToNumber) {
       summaryFieldsResultToNumber = summaryFieldsResultToNumber.map(item =>
-        regExp(item)
+        extractSumField(item)
       )
     }
+    const formatter = printerStore.config?.payAmountFormatter
+    const highPrecisionMapping = printerStore.config?.highPrecisionFieldMapping
+
+    const summaryKeys = summaryConfig.summaryColumns.map(text =>
+      extractSumField(text)
+    )
+
     return (
       <tr>
         {_.map(columns, (col, index) => {
@@ -74,13 +93,19 @@ const PageSummary = props => {
           if (index === 0) {
             html = i18next.t('合计')
           } else {
-            const key = regExp(col.text)
-            html =
-              summaryConfig.summaryColumns
-                .map(text => regExp(text))
-                .includes(key) && key
-                ? sumCol(key, currentPageTableData, summaryFieldsResultToNumber)
-                : ' '
+            const key = extractSumField(col.text)
+            if (key && summaryKeys.includes(key)) {
+              const sum = sumCol(
+                key,
+                currentPageTableData,
+                summaryFieldsResultToNumber,
+                formatter,
+                highPrecisionMapping
+              )
+              html = templateSumResult(col.text, sum, key)
+            } else {
+              html = ' '
+            }
           }
 
           return (

package/src/printer/printer.js

@@ -103,10 +103,10 @@ class Printer extends React.Component {
   componentDidMount() {
     const { printerStore, config, getremainpageHeight } = this.props
     const batchPrintConfig = config.batchPrintConfig
-    // didMount 代表第一次渲染完成
-    printerStore.setReady(true)
-    // 连续打印不需要分页计算
+    // 连续打印不需要计算
     if (batchPrintConfig !== 2) {
+      // didMount 代表第一次渲染完成
+      printerStore.setReady(true)
       printerStore.computedPages()
       if (config.autoFillConfig?.checked) {
         this.props.printerStore.setAutofillConfig(

package/src/printer/store.js

@@ -5,17 +5,14 @@ import {
   isMultiTable,
   caclSingleDetailsPageHeight,
   getArrayMid,
-  getOverallOrderTrHeight
+  getOverallOrderTrHeight,
+  price
 } from '../util'
 import _ from 'lodash'
 import Big from 'big.js'
 import { Tip } from '../components'
 
 export const TR_BASE_HEIGHT = 23
-const price = (n, f = 2) => {
-  if (isNaN(n)) return null
-  return Big(n || 0).toFixed(f)
-}
 class PrinterStore {
   @observable ready = false
 
@@ -530,7 +527,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 +601,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 +623,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,15 @@
 import React from 'react'
 import PropTypes from 'prop-types'
 import _ from 'lodash'
-import { coverDigit2Uppercase, getDataKey, isMultiTable } from '../util'
+import {
+  coverDigit2Uppercase,
+  getDataKey,
+  isMultiTable,
+  formatSumWithPrecision,
+  toSumColTemplate,
+  templateSumResult,
+  extractSumField
+} from '../util'
 import { MULTI_SUFFIX, MULTI_SUFFIX3 } from '../config'
 import { observer } from 'mobx-react'
 import classNames from 'classnames'
@@ -43,14 +51,23 @@ const DiySummary = props => {
   // 判断是否是多栏表格
   const isMulti = isMultiTable(dataKey)
 
-  // 计算合计
+  const formatter = printerStore.config?.payAmountFormatter
+  const highPrecisionMapping = printerStore.config?.highPrecisionFieldMapping
+
+  // 计算合计（逐行取原始列值，内置函数只作用在最终合计结果上）
   const sumData = field => {
+    // 查找高精度字段，有则直接从原始数据取值，避免 templateTable 的精度损失
+    // 兼容映射 key 为模板串或字段名两种写法
+    const fieldKey = extractSumField(field)
+    const hpField =
+      highPrecisionMapping?.[field] || highPrecisionMapping?.[fieldKey]
+
     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 +82,24 @@ const DiySummary = props => {
           return result
         },
         Big(0)
-      ).toFixed(2)
+      )
+      return formatSumWithPrecision(sum, formatter)
+    }
+
+    // 单栏：有高精度字段则直接从原始数据取值
+    if (hpField) {
+      const sum = _.reduce(
+        tableData,
+        (a, b) => {
+          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 +108,8 @@ const DiySummary = props => {
         return result
       },
       Big(0)
-    ).toFixed(2)
+    )
+    return formatSumWithPrecision(sum, formatter)
 
     function getRes(field, i) {
       return printerStore
@@ -99,8 +131,16 @@ const DiySummary = props => {
   const isUpperLowerCaseSeparate = diyConfig?.isUpperLowerCaseSeparate
   const isUpperCaseBefore = diyConfig?.isUpperCaseBefore
   const needUpperCase = diyConfig?.needUpperCase
-  const numericValue = sumData(leftField.valueField)
-  const upperCaseValue = needUpperCase ? coverDigit2Uppercase(numericValue) : ''
+  const fieldKey = extractSumField(leftField.valueField)
+  // 求和用去掉内置函数后的列模板，多栏/高精度逻辑保持不变
+  const numericValue = sumData(toSumColTemplate(leftField.valueField))
+  // 仅对合计结果做模板/内置函数渲染
+  const displayValue = templateSumResult(
+    leftField.valueField,
+    numericValue,
+    fieldKey
+  )
+  const upperCaseValue = needUpperCase ? coverDigit2Uppercase(displayValue) : ''
 
   const leftText = () => {
     if (isUpperLowerCaseSeparate) {
@@ -109,25 +149,25 @@ const DiySummary = props => {
         return upperCaseValue
       }
       // 小写金额在前
-      return numericValue
+      return displayValue
     }
 
     // 大写金额在前且需要大写金额
     if (isUpperCaseBefore) {
-      return `${upperCaseValue} ${numericValue}`
+      return `${upperCaseValue} ${displayValue}`
     }
 
     if (needUpperCase) {
-      return `${numericValue} ${upperCaseValue}`
+      return `${displayValue} ${upperCaseValue}`
     }
 
-    return numericValue
+    return displayValue
   }
 
   const rightText = () => {
     if (isUpperLowerCaseSeparate) {
       if (isUpperCaseBefore) {
-        return `${rightName} ${numericValue}`
+        return `${rightName} ${displayValue}`
       }
       return `${rightName} ${upperCaseValue}`
     }

package/src/printer/table_subtotal_tr.js

@@ -4,7 +4,13 @@ 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,
+  extractSumField,
+  templateSumResult
+} from '../util'
 import { observer } from 'mobx-react'
 import { get } from 'mobx'
 import classNames from 'classnames'
@@ -45,69 +51,65 @@ 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) {
     const list = tableData.slice(range.begin, range.end)
 
+    // 先按字段求和，再对结果做模板/内置函数渲染
+    const formatSumValue = valueField => {
+      const fieldKey = extractSumField(valueField)
+      const sum = sumData2(list, fieldKey, formatter, highPrecisionMapping)
+      return templateSumResult(valueField, sum, fieldKey)
+    }
+
     // 针对结款单的
     if (isSomeSubtotalTr) {
       const sum = {}
 
       _.each(fields, v => {
-        sum[v.name] = sumData2(list, v.valueField)
+        sum[v.name] = formatSumValue(v.valueField)
       })
       let subtotalStr = ''
       for (const name in sum) {
@@ -137,6 +139,18 @@ const SubtotalTr = props => {
       return (
         <tr>
           {_.map(fields, (item, index) => {
+            const fieldKey = extractSumField(item.valueField)
+            const sumDisplay =
+              item.type === 'useSummarize'
+                ? templateSumResult(
+                    item.valueField,
+                    getData(fieldKey),
+                    fieldKey
+                  )
+                : index === 0
+                ? formatSumValue(item.valueField)
+                : ''
+
             return (
               <td colSpan={item.colSpan ?? 99} key={index}>
                 <div
@@ -162,23 +176,12 @@ const SubtotalTr = props => {
                       }
                     >
                       {/* 这样写是为了支持自定义单元，index = 1时是自定义单元格 */}
-                      {item.type === 'useSummarize'
-                        ? getData(item.valueField)
-                        : index === 0
-                        ? sumData2(list, item.valueField)
-                        : ''}
-                      {/* {index === 0 ? sumData(list, item.valueField) : ''} */}
+                      {sumDisplay}
                     </span>
                     {subtotal?.needUpperCase && ( // 是否需要大写金额
                       <span>
-                        {item.type === 'useSummarize'
-                          ? '大写：' +
-                            coverDigit2Uppercase(getData(item.valueField))
-                          : index === 0
-                          ? '大写：' +
-                            coverDigit2Uppercase(
-                              sumData2(list, item.valueField)
-                            )
+                        {sumDisplay
+                          ? '大写：' + coverDigit2Uppercase(sumDisplay)
                           : ''}
                       </span>
                     )}