gm-printer 11.0.1 → 11.0.2-beta.2

package/src/examining_report_editor/editor.js

@@ -0,0 +1,85 @@
+import React from 'react'
+import PropTypes from 'prop-types'
+import _ from 'lodash'
+import { Flex } from '../components'
+import { Gap, Title } from '../common/component'
+import editStore from './store'
+import { observer, inject } from 'mobx-react'
+import EditorTitle from '../common/editor_title'
+import EditorSelect from '../common/editor_select'
+import EditorField from '../common/editor_edit_field'
+import EditorAddField from '../common/editor_add_field'
+import ContextMenu from './context_menu'
+import i18next from '../../locales'
+import withStore from '../common/hoc_with_store'
+
+const tableDataKeyList = [
+  {
+    value: 'examiningDetail',
+    text: i18next.t('检测明细'),
+    hasSubtotalBtn: true
+  }
+]
+
+@withStore(editStore)
+@inject('editStore')
+@observer
+class Editor extends React.Component {
+  render() {
+    const { onSave, showEditor, addFields, menuConfig } = this.props
+
+    return (
+      <div className='gm-printer-edit'>
+        <Flex className='gm-printer-edit-title-fixed'>
+          <Title
+            title={i18next.t('模板预览')}
+            text={
+              <span className='gm-text-desc gm-padding-left-5'>
+                {i18next.t(
+                  '说明：选中内容进行编辑，可拖动字段移动位置，右键使用更多功能'
+                )}
+              </span>
+            }
+          />
+        </Flex>
+
+        {showEditor && (
+          <div className='gm-printer-edit-zone'>
+            <EditorTitle onSave={onSave} />
+            <Gap height='10px' />
+            <EditorSelect />
+            <Gap height='5px' />
+            <EditorField tableDataKeyList={tableDataKeyList} />
+            <Gap height='5px' />
+            <EditorAddField addFields={addFields} />
+
+            <div id='gm-printer-tip' />
+            <div id='gm-printer-modal' />
+          </div>
+        )}
+
+        <div className='gm-printer-edit-wrap'>
+          <ContextMenu menuConfig={menuConfig} />
+        </div>
+      </div>
+    )
+  }
+}
+
+Editor.propTypes = {
+  config: PropTypes.object.isRequired,
+  onSave: PropTypes.func,
+  showEditor: PropTypes.bool,
+  mockData: PropTypes.object.isRequired,
+  addFields: PropTypes.object.isRequired,
+  menuConfig: PropTypes.oneOfType([
+    PropTypes.arrayOf(PropTypes.string),
+    PropTypes.object
+  ])
+}
+
+Editor.defaultProps = {
+  onSave: _.noop
+}
+
+export default Editor

package/src/examining_report_editor/index.js

@@ -0,0 +1,4 @@
+import withShadowDom from '../common/hoc_with_shadow_dom'
+import Editor from './editor'
+
+export default withShadowDom(Editor)

package/src/examining_report_editor/store.js

@@ -0,0 +1,78 @@
+import EditorStore from '../common/editor_store'
+import { action, toJS } from 'mobx'
+import i18next from '../../locales'
+
+const DEFAULT_TABLE_COLUMNS = [
+  {
+    head: i18next.t('序号'),
+    text: i18next.t('{{列.序号}}'),
+    style: { textAlign: 'center' },
+    headStyle: { textAlign: 'center' }
+  },
+  {
+    head: i18next.t('样品名称'),
+    text: i18next.t('{{列.样品名称}}'),
+    style: { textAlign: 'center' },
+    headStyle: { textAlign: 'center' }
+  },
+  {
+    head: i18next.t('样品编码'),
+    text: i18next.t('{{列.样品编码}}'),
+    style: { textAlign: 'center' },
+    headStyle: { textAlign: 'center' }
+  },
+  {
+    head: i18next.t('检测结果'),
+    text: i18next.t('{{列.检测结果}}'),
+    style: { textAlign: 'center' },
+    headStyle: { textAlign: 'center' }
+  }
+]
+
+class Store extends EditorStore {
+  constructor({ defaultTableDataKey }) {
+    super()
+    this.defaultTableDataKey = defaultTableDataKey
+  }
+
+  getDefaultTableConfig() {
+    return {
+      dataKey: this.defaultTableDataKey,
+      subtotal: { show: false },
+      columns: [
+        {
+          head: i18next.t('表头'),
+          text: i18next.t('{{列.表头}}'),
+          style: { textAlign: 'center' },
+          headStyle: { textAlign: 'center' }
+        }
+      ]
+    }
+  }
+
+  @action
+  init(config, data) {
+    super.init(config, data)
+    this.defaultTableDataKey = 'examiningDetail'
+  }
+
+  @action.bound
+  addContent(name, index, type, tableConfig = null) {
+    super.addContent(name, index, type, tableConfig)
+    this.config = toJS(this.config)
+  }
+
+  @action
+  changeTableDataKey(name, key, options = {}) {
+    super.changeTableDataKey(name, key, options)
+    this.config = toJS(this.config)
+  }
+
+  @action
+  removeContent(name) {
+    super.removeContent(name)
+    this.config = toJS(this.config)
+  }
+}
+
+export default new Store({ defaultTableDataKey: 'examiningDetail' })

package/src/index.js

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

package/src/printer/page_summary.js

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

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

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

package/src/printer/table_diy_overallOrder_tr.js

@@ -2,11 +2,7 @@ import React from 'react'
 import PropTypes from 'prop-types'
 import _ from 'lodash'
 // import Big from 'big.js'
-import {
-  coverDigit2Uppercase,
-  getDataKey,
-  formatSumWithPrecision
-} from '../util'
+import { coverDigit2Uppercase, getDataKey } from '../util'
 import { observer } from 'mobx-react'
 import classNames from 'classnames'
 import Big from 'big.js'
@@ -19,30 +15,20 @@ const DiyOverallOrder = props => {
   } = 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(
+    return _.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)
-        }
+        const bRes = printerStore
+          .templateTable(field, dataKey, i, pageIndex)
+          .replace(/\(\)/g, '')
+        result = a.plus(+bRes || 0)
         return result
       },
       Big(0)
-    )
-    return formatSumWithPrecision(sum, formatter)
+    ).toFixed(2)
   }
 
   if (!diyOverallOrder?.show || !printerStore?.ready) {

package/src/printer/table_diy_summary_tr.js

@@ -1,12 +1,7 @@
 import React from 'react'
 import PropTypes from 'prop-types'
 import _ from 'lodash'
-import {
-  coverDigit2Uppercase,
-  getDataKey,
-  isMultiTable,
-  formatSumWithPrecision
-} from '../util'
+import { coverDigit2Uppercase, getDataKey, isMultiTable } from '../util'
 import { MULTI_SUFFIX, MULTI_SUFFIX3 } from '../config'
 import { observer } from 'mobx-react'
 import classNames from 'classnames'
@@ -48,20 +43,14 @@ 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) {
-      // 多栏表格暂不使用高精度字段，保持原有 templateTable 逻辑
-      const sum = _.reduce(
+      return _.reduce(
         tableData,
         (a, b, i) => {
           let result = a
+          // 先通过 templateTable 获取原始字段的值
           const bRes = getRes(field, i)
           result = a.plus(+bRes || 0)
 
@@ -76,24 +65,10 @@ const DiySummary = props => {
           return result
         },
         Big(0)
-      )
-      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)
+      ).toFixed(2)
     }
 
-    // 兜底：无高精度字段，使用 templateTable
-    const sum = _.reduce(
+    return _.reduce(
       tableData,
       (a, b, i) => {
         let result = a
@@ -102,8 +77,7 @@ const DiySummary = props => {
         return result
       },
       Big(0)
-    )
-    return formatSumWithPrecision(sum, formatter)
+    ).toFixed(2)
 
     function getRes(field, i) {
       return printerStore

package/src/printer/table_subtotal_tr.js

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

package/src/util.js

@@ -353,27 +353,6 @@ 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,
@@ -394,7 +373,5 @@ export {
   caclSingleDetailsPageHeight,
   getArrayMid,
   getColSpanLength,
-  getOverallOrderTrHeight,
-  formatSumWithPrecision,
-  getHighPrecisionField
+  getOverallOrderTrHeight
 }