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

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>
                     )}

package/src/util.js

@@ -353,6 +353,103 @@ 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
+}
+
+/**
+ * 打印模板内置金额格式化（与 printerStore.template 注入的 price 一致）
+ * @param {*} n
+ * @param {number} [f=2]
+ * @returns {string|null}
+ */
+const price = (n, f = 2) => {
+  if (isNaN(n)) return null
+  return Big(n || 0).toFixed(f)
+}
+
+/**
+ * 从合计配置解析用于求和的字段名
+ * 支持：出库金额 / {{出库金额}} / {{列.出库金额}} / {{price(出库金额,1)}} / {{price(列.出库金额)}}
+ * @param {string} text
+ * @returns {string}
+ */
+const extractSumField = text => {
+  if (text == null || text === '') return text
+  if (typeof text !== 'string') return text
+  if (!text.includes('{{')) return text
+
+  const priceMatch = text.match(
+    /price\s*\(\s*(?:列\.)?\s*([^,)]+?)(?:\s*,|\s*\))/
+  )
+  if (priceMatch) return priceMatch[1].trim()
+
+  const colMatch = text.match(/\{\{\s*列\.([^}]+?)\s*\}\}/)
+  if (colMatch) return colMatch[1].trim()
+
+  const bareMatch = text.match(/\{\{\s*([^{}()]+?)\s*\}\}/)
+  if (bareMatch) return bareMatch[1].trim()
+
+  return text
+}
+
+/**
+ * 对合计结果做 lodash 模板渲染并注入内置 price；无模板语法时原样返回合计值
+ * 语法错误时与 printerStore.template 一致：返回原文
+ * @param {string} text - valueField 或列 text
+ * @param {string|number} sumValue - 已求得的合计值
+ * @param {string} [fieldKey] - 字段名，默认从 text 解析
+ * @returns {string|number}
+ */
+const templateSumResult = (text, sumValue, fieldKey) => {
+  if (text == null || text === '' || typeof text !== 'string') {
+    return sumValue
+  }
+  if (!text.includes('{{')) {
+    return sumValue
+  }
+
+  const key = fieldKey || extractSumField(text)
+  try {
+    return _.template(text, {
+      interpolate: /{{([\s\S]+?)}}/g
+    })({
+      price,
+      [key]: sumValue,
+      列: { [key]: sumValue }
+    })
+  } catch (err) {
+    return text
+  }
+}
+
+/**
+ * 将合计配置转为用于逐行取值的列模板（去掉 price，仅保留 {{列.字段}}）
+ * @param {string} text
+ * @returns {string}
+ */
+const toSumColTemplate = text => {
+  const key = extractSumField(text)
+  return `{{列.${key}}}`
+}
+
 export {
   collectGroups,
   getHeight,
@@ -373,5 +470,11 @@ export {
   caclSingleDetailsPageHeight,
   getArrayMid,
   getColSpanLength,
-  getOverallOrderTrHeight
+  getOverallOrderTrHeight,
+  formatSumWithPrecision,
+  getHighPrecisionField,
+  price,
+  extractSumField,
+  templateSumResult,
+  toSumColTemplate
 }

package/src/editor/context_menu_config.js

@@ -1,335 +0,0 @@
-import i18next from '../../locales'
-import React from 'react'
-import PropTypes from 'prop-types'
-import CommonContextMenu from '../common/common_context_menu'
-import { inject, observer } from 'mobx-react'
-import _ from 'lodash'
-import { Printer } from '../printer'
-import { isMultiTable } from '../util'
-import { LONG_PRINT } from '../config'
-
-const blockTypeList = [
-  { value: '', text: i18next.t('插入文本') },
-  { value: 'line', text: i18next.t('插入线条') },
-  { value: 'image', text: i18next.t('插入图片') },
-  { value: 'counter', text: i18next.t('插入分类汇总') },
-  { value: 'tag', text: i18next.t('插入标签汇总') },
-  { value: 'barcode', text: i18next.t('插入订单条形码') },
-  { value: 'qrcode', text: i18next.t('插入订单溯源二维码') },
-  {
-    value: 'uniform_social_credit_code',
-    text: i18next.t('插入苏州安全监管平台二维码')
-  }
-]
-
-@inject('editStore')
-@observer
-class ContextMenu extends React.Component {
-  componentDidMount() {
-    const {
-      editStore,
-      editStore: {
-        config: { autoFillConfig, specialControlConfig }
-      }
-    } = this.props
-
-    if (autoFillConfig?.checked) {
-      editStore.handleChangeTableData(
-        autoFillConfig?.checked,
-        autoFillConfig?.dataKey
-      )
-    }
-    /** 初始化特殊控制的配置 */
-    if (specialControlConfig?.multiDigitDecimal) {
-      // 多位小数
-      editStore.setMultiDigitDecimal(specialControlConfig?.multiDigitDecimal)
-    }
-    if (specialControlConfig?.taxFreeProductRateDisplay !== undefined) {
-      // 免税产品税率显示
-      editStore.setTaxFreeProductRateDisplay(
-        specialControlConfig?.taxFreeProductRateDisplay || ''
-      )
-    }
-  }
-
-  isMenuItemEnabled = key => {
-    const { menuConfig } = this.props
-    if (!menuConfig) return true
-    if (Array.isArray(menuConfig)) return menuConfig.includes(key)
-    if (typeof menuConfig === 'object') return !!menuConfig[key]
-    return true
-  }
-
-  /**
-   * 是否存在每页合计按钮,非异常明细才有按钮
-   * @param name => ContextMenu 的 this.state.name
-   * @return {boolean}
-   */
-  hasSubtotalBtn = name => {
-    if (!name) return false
-    const noSubtotalList = ['abnormal', 'abnormalDetails']
-    const arr = name.split('.')
-    if (_.includes(arr, 'table')) {
-      const dataKey = this.props.editStore.config.contents[arr[2]].dataKey
-      return !_.includes(noSubtotalList, dataKey)
-    }
-  }
-
-  handleChangeTableDataKey = (key, name) => {
-    const { editStore } = this.props
-
-    editStore.changeTableDataKey(name, key)
-  }
-
-  handleSubtotal = name => {
-    const { editStore } = this.props
-    editStore.setSubtotalShow(name)
-  }
-
-  handleCategoryConfig = (key, name) => {
-    const { editStore } = this.props
-    editStore.changeTableDataKey(name, key)
-
-    editStore.setCategoryConfigShow(name)
-  }
-
-  handleChangeTableData = isAutoFilling => {
-    const { editStore } = this.props
-    editStore.handleChangeTableData(isAutoFilling)
-  }
-
-  handleOverallOrder = name => {
-    const { editStore } = this.props
-    editStore.setOverallOrderShow(name)
-  }
-
-  handleDiyOverallOrder = name => {
-    const { editStore } = this.props
-    editStore.setDiyOverallOrderShow(name)
-  }
-
-  // 通用的自定义合计菜单项处理
-  handleDiySummary = (name, configKey) => {
-    const { editStore } = this.props
-    const methodName = configKey
-      .split(/(?=[A-Z])/)
-      .map(word => word.charAt(0).toUpperCase() + word.slice(1))
-      .join('')
-
-    const method = editStore[`set${methodName}Show`]
-
-    if (configKey === 'diyCategorySubtotal') {
-      const arr = name.split('.')
-      const dataKey = editStore.config.contents[arr[2]].dataKey
-      console.log('dataKey==> handleDiySummary', dataKey)
-
-      if (!dataKey.split('_').includes('category')) {
-        editStore.changeTableDataKey(name, 'category', {
-          type: 'diyCategorySubtotal'
-        })
-      }
-    }
-    if (configKey === 'diyTagSubtotal') {
-      const arr = name.split('.')
-      const dataKey = editStore.config.contents[arr[2]].dataKey
-      console.log('dataKey==> handleDiySummary', dataKey)
-
-      if (!dataKey.split('_').includes('tag')) {
-        editStore.changeTableDataKey(name, 'tag', {
-          type: 'diyTagSubtotal'
-        })
-      }
-    }
-    if (method) {
-      method(name)
-    }
-  }
-
-  renderOrderActionBtn = name => {
-    if (!this.hasSubtotalBtn(name)) {
-      return null
-    }
-
-    const {
-      editStore: {
-        config: {
-          page: { type },
-          showDiyOverAllOrder
-        },
-        isAutoFilling
-      }
-    } = this.props
-    const arr = name.split('.')
-    const {
-      dataKey,
-      subtotal,
-      overallOrder,
-      diySubtotal,
-      diyTagSubtotal,
-      diyOverallOrder,
-      diyCategorySubtotal
-    } = this.props.editStore.config.contents[arr[2]]
-    const keyArr = dataKey.split('_')
-
-    const isMultiActive = keyArr.includes('multi')
-    const isThreeActive = keyArr.includes('multi3')
-    const isCategoryActive = keyArr.includes('category')
-    const isTagActive = keyArr.includes('tag')
-    const isNewCategoryActive = keyArr.includes('newCategory')
-    const isSubtotalActive = subtotal.show
-    const isOverallOrder = overallOrder?.show
-    const isDiyOverallOrder = diyOverallOrder?.show
-    const isDiySubtotal = diySubtotal?.show
-    const isDiyTagSubtotal = diyTagSubtotal?.show
-    const isDiyCategorySubtotal = diyCategorySubtotal?.show
-
-    // 长条打印
-    const isLongPrint = type === LONG_PRINT
-
-    return (
-      <>
-        {this.isMenuItemEnabled('multi') && !isLongPrint && (
-          <div
-            onClick={this.handleChangeTableDataKey.bind(this, 'multi', name)}
-            className={isMultiActive ? 'active' : ''}
-          >
-            {i18next.t('双栏商品')}
-          </div>
-        )}
-        {this.isMenuItemEnabled('multi3') && type !== 'A4/3' && !isLongPrint && (
-          <div
-            onClick={this.handleChangeTableDataKey.bind(this, 'multi3', name)}
-            className={isThreeActive ? 'active' : ''}
-          >
-            {i18next.t('三栏商品')}
-          </div>
-        )}
-        {this.isMenuItemEnabled('category') && (
-          <div
-            onClick={this.handleChangeTableDataKey.bind(
-              this,
-              'category',
-              name,
-              isCategoryActive
-            )}
-            className={isCategoryActive ? 'active' : ''}
-          >
-            {i18next.t('分类小计')}
-          </div>
-        )}
-        {this.isMenuItemEnabled('categoryDiy') && (
-          <div
-            onClick={this.handleChangeTableDataKey.bind(
-              this,
-              'categoryDiy',
-              name
-            )}
-            className={isDiyCategorySubtotal ? 'active' : ''}
-          >
-            {i18next.t('自定义分类小计')}
-          </div>
-        )}
-        {this.isMenuItemEnabled('tag') && (
-          <div
-            onClick={this.handleChangeTableDataKey.bind(this, 'tag', name)}
-            className={isTagActive ? 'active' : ''}
-          >
-            {i18next.t('标签小计')}
-          </div>
-        )}
-        {this.isMenuItemEnabled('tagDiy') && (
-          <div
-            onClick={this.handleChangeTableDataKey.bind(this, 'tagDiy', name)}
-            className={isDiyTagSubtotal ? 'active' : ''}
-          >
-            {i18next.t('自定义标签小计')}
-          </div>
-        )}
-        {this.isMenuItemEnabled('newCategory') && (
-          <div
-            onClick={this.handleCategoryConfig.bind(this, 'newCategory', name)}
-            className={isNewCategoryActive ? 'active' : ''}
-          >
-            {i18next.t('商品分类')}
-          </div>
-        )}
-        {this.isMenuItemEnabled('subtotal') && (
-          <div
-            onClick={this.handleSubtotal.bind(this, name)}
-            className={isSubtotalActive ? 'active' : ''}
-          >
-            {i18next.t('每页合计')}
-          </div>
-        )}
-        {this.isMenuItemEnabled('diySubtotal') && (
-          <div
-            onClick={() => this.handleDiySummary(name, 'diySubtotal')}
-            className={isDiySubtotal ? 'active' : ''}
-          >
-            {i18next.t('自定义每页合计')}
-          </div>
-        )}
-        {this.isMenuItemEnabled('autoFill') && (
-          <div
-            onClick={this.handleChangeTableData.bind(this, !isAutoFilling)}
-            className={isAutoFilling ? 'active' : ''}
-          >
-            {i18next.t('行数填充')}
-          </div>
-        )}
-        {this.isMenuItemEnabled('overallOrder') && (
-          <div
-            onClick={this.handleOverallOrder.bind(this, name)}
-            className={isOverallOrder ? 'active' : ''}
-          >
-            {i18next.t('整单合计')}
-          </div>
-        )}
-        {this.isMenuItemEnabled('diyOverallOrder') &&
-          !isMultiTable(dataKey) &&
-          showDiyOverAllOrder && (
-            <div
-              onClick={this.handleDiyOverallOrder.bind(this, name)}
-              className={isDiyOverallOrder ? 'active' : ''}
-            >
-              {i18next.t('自定义整单合计')}
-            </div>
-          )}
-      </>
-    )
-  }
-
-  render() {
-    const { editStore, customTableConfigs } = this.props
-    return (
-      <CommonContextMenu
-        renderTableAction={this.renderOrderActionBtn}
-        insertBlockList={blockTypeList}
-        customTableConfigs={customTableConfigs}
-      >
-        <Printer
-          key={editStore.computedPrinterKey}
-          selected={editStore.selected}
-          selectedRegion={editStore.selectedRegion}
-          isAutoFilling={editStore.isAutoFilling}
-          fillIndex={editStore.fillIndex}
-          lineheight={editStore.computedTableCustomerRowHeight}
-          config={editStore.config}
-          data={editStore.mockData}
-          getremainpageHeight={editStore.setRemainPageHeight}
-          overallorder={editStore.overallOrderShow}
-        />
-      </CommonContextMenu>
-    )
-  }
-}
-ContextMenu.propTypes = {
-  editStore: PropTypes.object,
-  mockData: PropTypes.object,
-  customTableConfigs: PropTypes.array,
-  menuConfig: PropTypes.oneOfType([
-    PropTypes.arrayOf(PropTypes.string),
-    PropTypes.object
-  ])
-}
-export default ContextMenu