gm-printer 10.15.2-alpha.2 → 10.15.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gm-printer",
-  "version": "10.15.2-alpha.2",
+  "version": "10.15.4",
   "description": "diy printer",
   "main": "src/index.js",
   "scripts": {

package/src/common/common_context_menu.js

@@ -245,7 +245,6 @@ class CommonContextMenu extends React.Component {
 
     const isProductLengthActive = _.includes(value, 'len')
     const isSubtotalActive = _.includes(value, 'subtotal')
-    const isRealWeight = _.includes(value, 'realWeight')
     return (
       <>
         <div
@@ -258,13 +257,7 @@ class CommonContextMenu extends React.Component {
           onClick={this.handleChangeCounterDataKey.bind(this, 'subtotal')}
           className={isSubtotalActive ? 'active' : ''}
         >
-          {i18next.t('金额小计')}
-        </div>
-        <div
-          onClick={this.handleChangeCounterDataKey.bind(this, 'realWeight')}
-          className={isRealWeight ? 'active' : ''}
-        >
-          {i18next.t('出库数小计')}
+          {i18next.t('小计')}
         </div>
         <Hr />
         <div onClick={this.handleRemoveContent}>{i18next.t('移除区域')}</div>

package/src/common/component.js

@@ -643,16 +643,26 @@ Gap.propTypes = {
   height: PropTypes.oneOfType([PropTypes.string, PropTypes.number])
 }
 
-const FieldBtn = ({ name, onClick }) => (
-  <Flex alignCenter style={{ width: '50%', margin: '3px 0' }}>
-    <span className='gm-printer-edit-plus-btn' onClick={onClick}>
-      +
-    </span>
-    <span className='gm-padding-left-5'>{name}</span>
-  </Flex>
+const FieldBtn = ({ name, remark, onClick }) => (
+  <>
+    <Flex alignCenter={!remark} style={{ width: '50%', margin: '3px 0' }}>
+      <span className='gm-printer-edit-plus-btn' onClick={onClick}>
+        +
+      </span>
+      <Flex column>
+        <span className='gm-padding-left-5'>{name}</span>
+        {remark && (
+          <span style={{ transform: 'scale(0.8) translateX(-20px)' }}>
+            {remark}
+          </span>
+        )}
+      </Flex>
+    </Flex>
+  </>
 )
 FieldBtn.propTypes = {
   name: PropTypes.string,
+  remark: PropTypes.string,
   onClick: PropTypes.func
 }
 

package/src/common/editor_add_field.js

@@ -22,6 +22,7 @@ class FieldList extends React.Component {
                   <FieldBtn
                     key={o.key}
                     name={o.key}
+                    remark={o.remark}
                     onClick={handleAddField.bind(this, o)}
                   />
                 ))}

package/src/common/editor_edit_field.js

@@ -20,6 +20,7 @@ import {
 import { get, toJS } from 'mobx'
 import PropTypes from 'prop-types'
 import { subtotalRadioList } from './util'
+import _ from 'lodash'
 
 @inject('editStore')
 @observer
@@ -226,6 +227,13 @@ class EditorField extends React.Component {
       (editStore.computedTableSpecialConfig?.subtotal &&
         get(subtotal, 'isCustomCells')) ||
       false
+
+    // 打印账户总计金额
+    const printAccount =
+      (editStore.computedTableSpecialConfig?.subtotal &&
+        get(subtotal, 'isPrintAccount')) ||
+      false
+
     //  整单合计是否大写
     const overallOrderNeedUpperCase =
       (editStore.computedTableSpecialConfig?.overallOrder &&
@@ -433,7 +441,15 @@ class EditorField extends React.Component {
             </Flex>
           </div>
         )}
-
+        {/* 结款单不需要这个配置 */}
+        {!isSomeSubtotalTr && (
+          <EditorSubtotalCheck
+            subtotalCheckDisabled
+            subtotalChecked={printAccount}
+            subtotalCheckOnChange={editStore.setPrintAccount}
+            subtotalCheckText='打印账户总计金额'
+          />
+        )}
         <EditorSubtotalCheck
           subtotalCheckDisabled
           subtotalChecked={subtotalNeedUpperCase}
@@ -464,8 +480,12 @@ class EditorField extends React.Component {
               subtotalCheckText='开启自定义单元格'
             />
             <Text
+              // 只有自定义单元格的valueField值是空的，以后自每页合计，记得加type，之前没加，都无法区分
               value={
-                subtotal && subtotal?.fields?.[1] ? subtotal.fields[1].name : ''
+                subtotal && subtotal?.fields?.length > 1
+                  ? _.find(subtotal?.fields, item => !item.valueField)?.name ??
+                    ''
+                  : ''
               }
               onChange={editStore.setSubtotalFields}
               style={{ width: '65px', margin: '5px 0 5px 80px' }}

package/src/common/editor_store.js

@@ -3,6 +3,7 @@ import { action, computed, observable, set, toJS } from 'mobx'
 import { pageTypeMap } from '../config'
 import _ from 'lodash'
 import { dispatchMsg, getBlockName, exchange, getColSpanLength } from '../util'
+import { accountRadioList } from './util'
 import React from 'react'
 
 class EditorStore {
@@ -65,6 +66,15 @@ class EditorStore {
     this.isAutoFilling = bol
   }
 
+  @action
+  setSubtotalFieldsCol(arr) {
+    // this.overallOrderShow = !this.overallOrderShow
+    // 重新计算每页合计的单元格
+    const table = this.config.contents[arr[2]]
+    const subtotalLength = table.subtotal.fields.length
+    table.subtotal.fields[subtotalLength - 1].colSpan += 1
+  }
+
   @action
   setMultiDigitDecimal(bool) {
     this.isMultiDigitDecimal = bool
@@ -97,6 +107,15 @@ class EditorStore {
     colSpan: 6 // 产品说3个,开启自定义单元格,客户不满意，改成6个
   }
 
+  // 每页合计打印账户总计金额
+  @observable
+  subtotalAccountConfigFields = {
+    name: '总计金额：',
+    valueField: '下单金额',
+    colSpan: 3,
+    type: 'useSummarize'
+  }
+
   @computed
   get computedPrinterKey() {
     return _.map(this.config, (v, k) => {
@@ -575,8 +594,11 @@ class EditorStore {
         ]
       })
     } else {
+      // 重新计算下单元格的格数
       table.subtotal.fields[0].colSpan =
-        colSpanLength - (table.subtotal.fields?.[1]?.colSpan ?? 0)
+        colSpanLength -
+        (table.subtotal.fields?.[1]?.colSpan ?? 0) -
+        (table.subtotal.fields?.[2]?.colSpan ?? 0)
     }
   }
 
@@ -586,6 +608,14 @@ class EditorStore {
       this.overallOrderShow = !this.overallOrderShow
       const arr = this.selectedRegion.split('.')
       this.config.contents[arr[2]].subtotal.fields[0].valueField = fields.id
+
+      const fieldList = this.config.contents[arr[2]].subtotal.fields
+      // 打印账户总计金额的valueField也要修改
+      if (_.find(fieldList, item => item.type === 'useSummarize')) {
+        // 打印账户总计金额 固定是数组的第二个
+        this.config.contents[arr[2]].subtotal.fields[1].valueField =
+          accountRadioList[fields.id]
+      }
     }
   }
 
@@ -651,7 +681,6 @@ class EditorStore {
     }
 
     newDataKey = _.sortBy(newDataKey, [
-      o => o === 'realWeight',
       o => o === 'multi3',
       o => o === 'multi',
       o => o === 'category',
@@ -761,10 +790,11 @@ class EditorStore {
    * @param value
    */
   @action.bound
-  addFieldToTable({ key, value, type }) {
+  addFieldToTable({ key, value }) {
     if (this.computedRegionIsTable) {
       const arr = this.selectedRegion.split('.')
       const { columns, dataKey } = this.config.contents[arr[2]]
+
       columns.push({
         head: key,
         headStyle: {
@@ -773,12 +803,12 @@ class EditorStore {
         text: value,
         style: {
           textAlign: 'center'
-        },
-        type
+        }
       })
 
       this.clearExtraTableData(dataKey)
       this.setAutoFillingConfig(false)
+      this.setSubtotalFieldsCol(arr)
     }
   }
 
@@ -1098,6 +1128,86 @@ class EditorStore {
     }
   }
 
+  // 每页合计打印账户总计金额
+  // 写的很垃圾，因为每页合计这里改了4、5次，各种兼容，我人麻了
+  // 每页合计这一行单元格，要计算每个要占几列，就很烦
+  @action.bound
+  setPrintAccount() {
+    if (this.selectedRegion) {
+      // 作用：触发组件的更新
+      this.overallOrderShow = !this.overallOrderShow
+      const arr = this.selectedRegion.split('.')
+      const table = this.config.contents[arr[2]]
+      const subtotalConfig = table?.subtotal
+      // 没有显示每页合计的时候不可以设置
+      if (!subtotalConfig?.show) return
+      // 多栏表格情况，计算colSpan总列数
+      const colSpanLength = getColSpanLength(table)
+      const oldPrintAccount = subtotalConfig?.isPrintAccount
+
+      set(subtotalConfig, {
+        isPrintAccount: !oldPrintAccount
+      })
+      // 兼容已经存在后端的模板，每页合计直接是显示的，导致每页合计配置没有fields,isCustomCells，手动添加上
+      if (oldPrintAccount === undefined && !subtotalConfig.fields) {
+        set(subtotalConfig, {
+          fields: [
+            {
+              name: '每页合计：',
+              valueField: 'real_item_price',
+              colSpan: colSpanLength
+            }
+          ]
+        })
+      }
+      // 开启打印账户总计金额
+      if (subtotalConfig?.isPrintAccount) {
+        // 同时还开启了自定义单元格选项
+        if (subtotalConfig?.fields?.length === 2) {
+          // fields添加自定义单元格
+          subtotalConfig.fields = [
+            subtotalConfig.fields[0],
+            this.subtotalAccountConfigFields,
+            subtotalConfig.fields[1]
+          ]
+          // 重新计算合并单元格的个数
+          subtotalConfig.fields[0].colSpan = Math.floor(colSpanLength / 3)
+          subtotalConfig.fields[1].colSpan = Math.floor(colSpanLength / 3)
+          subtotalConfig.fields[2].colSpan =
+            colSpanLength -
+            subtotalConfig.fields[0].colSpan -
+            subtotalConfig.fields[1].colSpan
+        } else {
+          // fields添加自定义单元格
+          subtotalConfig.fields = [
+            subtotalConfig.fields[0],
+            this.subtotalAccountConfigFields
+          ]
+          // 重新计算合并单元格的个数
+          subtotalConfig.fields[0].colSpan =
+            colSpanLength - subtotalConfig.fields[1].colSpan
+        }
+      } else {
+        // 关闭打印账户总计金额
+        // 存在自定义单元格
+        if (subtotalConfig?.fields?.length === 3) {
+          subtotalConfig.fields = [
+            subtotalConfig.fields[0],
+            this.subtotalConfigFields
+          ]
+          // 重新计算合并单元格的个数
+          subtotalConfig.fields[0].colSpan =
+            colSpanLength - subtotalConfig.fields[1].colSpan
+        } else {
+          // 关闭，fields只有一个
+          subtotalConfig.fields = [subtotalConfig.fields[0]]
+          // 重新计算合并单元格的个数
+          subtotalConfig.fields[0].colSpan = colSpanLength
+        }
+      }
+    }
+  }
+
   // 每页合计开启自定义单元格
   @action.bound
   setSubtotalCustomCells() {
@@ -1130,21 +1240,48 @@ class EditorStore {
       }
       // 开启自定义单元格
       if (subtotalConfig?.isCustomCells) {
-        // fields添加自定义单元格
-        subtotalConfig.fields = [
-          subtotalConfig.fields[0],
-          {
-            ...this.subtotalConfigFields
-          }
-        ]
-        // 重新计算合并单元格的个数
-        subtotalConfig.fields[0].colSpan =
-          colSpanLength - subtotalConfig.fields[1].colSpan
+        // 同时还开启了自定义单元格选项
+        if (subtotalConfig?.fields?.length === 2) {
+          // fields添加自定义单元格
+          subtotalConfig.fields = [
+            subtotalConfig.fields[0],
+            this.subtotalAccountConfigFields,
+            this.subtotalConfigFields
+          ]
+          // 重新计算合并单元格的个数
+          subtotalConfig.fields[0].colSpan = Math.floor(colSpanLength / 3)
+          subtotalConfig.fields[1].colSpan = Math.floor(colSpanLength / 3)
+          subtotalConfig.fields[2].colSpan =
+            colSpanLength -
+            subtotalConfig.fields[0].colSpan -
+            subtotalConfig.fields[1].colSpan
+        } else {
+          // fields添加自定义单元格
+          subtotalConfig.fields = [
+            subtotalConfig.fields[0],
+            this.subtotalConfigFields
+          ]
+          // 重新计算合并单元格的个数
+          subtotalConfig.fields[0].colSpan =
+            colSpanLength - subtotalConfig.fields[1].colSpan
+        }
       } else {
-        // 关闭自定义单元格，fields只有一个
-        subtotalConfig.fields = [subtotalConfig.fields[0]]
-        // 重新计算合并单元格的个数
-        subtotalConfig.fields[0].colSpan = colSpanLength
+        // 关闭自定义单元格
+        // 存在打印账户总计金额
+        if (subtotalConfig?.fields?.length === 3) {
+          subtotalConfig.fields = [
+            subtotalConfig.fields[0],
+            this.subtotalAccountConfigFields
+          ]
+          // 重新计算合并单元格的个数
+          subtotalConfig.fields[0].colSpan =
+            colSpanLength - subtotalConfig.fields[1].colSpan
+        } else {
+          // 关闭，fields只有一个
+          subtotalConfig.fields = [subtotalConfig.fields[0]]
+          // 重新计算合并单元格的个数
+          subtotalConfig.fields[0].colSpan = colSpanLength
+        }
       }
     }
   }
@@ -1159,7 +1296,9 @@ class EditorStore {
 
       if (subtotalConfig.isCustomCells) {
         const subtotalConfig = table?.subtotal.fields
-        subtotalConfig[1].name = value
+        subtotalConfig.length === 3
+          ? (subtotalConfig[2].name = value)
+          : (subtotalConfig[1].name = value)
       }
     }
   }

package/src/common/util.js

@@ -16,4 +16,9 @@ const subtotalRadioList = [
   }
 ]
 
-export { subtotalRadioList }
+const accountRadioList = {
+  total_item_price: i18next.t('下单金额'),
+  real_item_price: i18next.t('出库金额')
+}
+
+export { subtotalRadioList, accountRadioList }

package/src/editor/context_menu.js

@@ -103,7 +103,6 @@ class ContextMenu extends React.Component {
     const isMultiActive = keyArr.includes('multi')
     const isThreeActive = keyArr.includes('multi3')
     const isCategoryActive = keyArr.includes('category')
-    const isRealWeight = keyArr.includes('realWeight')
     const isSubtotalActive = subtotal.show
     const isOverallOrder = overallOrder?.show
 
@@ -128,13 +127,7 @@ class ContextMenu extends React.Component {
           onClick={this.handleChangeTableDataKey.bind(this, 'category', name)}
           className={isCategoryActive ? 'active' : ''}
         >
-          {i18next.t('商品分类（金额小计）')}
-        </div>
-        <div
-          onClick={this.handleChangeTableDataKey.bind(this, 'realWeight', name)}
-          className={isRealWeight ? 'active' : ''}
-        >
-          {i18next.t('商品分类（出库数小计）')}
+          {i18next.t('商品分类')}
         </div>
         <div
           onClick={this.handleSubtotal.bind(this, name)}

package/src/editor/editor.js

@@ -50,16 +50,16 @@ class Editor extends React.Component {
             text={
               <span className='gm-text-desc gm-padding-left-5'>
                 {i18next.t(
-                  '说明：选中内容进行编辑，可拖动字段移动位置，右键使用更多功能，更多详情点击'
+                  '说明：选中内容进行编辑，可拖动字段移动位置，右键使用更多功能'
                 )}
-                <a
+                {/* <a
                   href='https://v.qq.com/x/page/t08044292dd.html'
                   target='_blank'
                   className='btn-link'
                   rel='noopener noreferrer'
                 >
                   {i18next.t('查看视频教程')}
-                </a>
+                </a> */}
               </span>
             }
           />

package/src/editor_account/editor.js

@@ -28,16 +28,16 @@ class Editor extends React.Component {
             text={
               <span className='gm-text-desc gm-padding-left-5'>
                 {i18next.t(
-                  '说明：选中内容进行编辑，可拖动字段移动位置，右键使用更多功能，更多详情点击'
+                  '说明：选中内容进行编辑，可拖动字段移动位置，右键使用更多功能'
                 )}
-                <a
+                {/* <a
                   href='https://v.qq.com/x/page/t08044292dd.html'
                   target='_blank'
                   className='btn-link'
                   rel='noopener noreferrer'
                 >
                   {i18next.t('查看视频教程')}
-                </a>
+                </a> */}
               </span>
             }
           />

package/src/editor_salemenus/editor.js

@@ -50,16 +50,16 @@ class Editor extends React.Component {
             text={
               <span className='gm-text-desc gm-padding-left-5'>
                 {i18next.t(
-                  '说明：选中内容进行编辑，可拖动字段移动位置，右键使用更多功能，更多详情点击'
+                  '说明：选中内容进行编辑，可拖动字段移动位置，右键使用更多功能'
                 )}
-                <a
+                {/* <a
                   href='https://v.qq.com/x/page/t08044292dd.html'
                   target='_blank'
                   className='btn-link'
                   rel='noopener noreferrer'
                 >
                   {i18next.t('查看视频教程')}
-                </a>
+                </a> */}
               </span>
             }
           />

package/src/printer/counter.js

@@ -26,15 +26,6 @@ const configs = [
     value: item => (
       <div className='gm-printer-counter-item-1'>{item.quantity}</div>
     )
-  },
-  {
-    id: 'realWeight',
-    name: (
-      <div className='gm-printer-counter-item-1'>{i18next.t('出库数小计')}</div>
-    ),
-    value: item => (
-      <div className='gm-printer-counter-item-1'>{item.realWeight}</div>
-    )
   }
 ]
 

package/src/printer/table.js

@@ -17,7 +17,7 @@ import SpecialTr from './table_special_tr'
 import SubtotalTr from './table_subtotal_tr'
 import PageSummary from './page_summary'
 import OverallOrder from './table_overallOrder_tr'
-import BarCodeTd from './barcodeTd'
+
 @inject('printerStore')
 @observer
 class Table extends React.Component {
@@ -29,120 +29,6 @@ class Table extends React.Component {
     }
   }
 
-  // 渲染不同的td
-  renderTdMap = {
-    barcode: this.renderBarCodeTd,
-    default: this.renderTd
-  }
-
-  /**
-   * 获取单元格的样式
-   * @param {*} index columns的index
-   * @param {*} style col.style
-   * @returns 处理后的样式
-   */
-  getTdStyle = (index, style = {}) => {
-    const { name, printerStore } = this.props
-    // 列宽固定(避免跳页bug)
-    const thWidths = printerStore.tablesInfo[name]?.head.widths || []
-    const width = thWidths[index]
-    const { fontSize } = style
-    let tdStyle = {}
-    let minWidth = 24
-
-    if (!width) return tdStyle
-    if (fontSize) minWidth = _.parseInt(fontSize) * 2
-    if (width >= 150) {
-      tdStyle = {
-        minWidth: width
-      }
-    } else {
-      tdStyle = {
-        minWidth,
-        width
-      }
-    }
-    return tdStyle
-  }
-
-  /**
-   * 渲染带有条形码的单元格
-   * @param {*} col 单个columns
-   * @param {*} j columns的index
-   * @param {*} i 数据的index
-   * @returns <td>
-   */
-  renderBarCodeTd(col, j, i) {
-    const {
-      config: { dataKey, customerRowHeight = 23 },
-      name,
-      pageIndex,
-      printerStore
-    } = this.props
-    return (
-      <td
-        key={j}
-        data-name={getTableColumnName(name, col.index)}
-        style={{
-          ...this.getTdStyle(j, col.style),
-          ...col.style
-        }}
-        className={classNames({
-          active: getTableColumnName(name, col.index) === printerStore.selected
-        })}
-      >
-        <BarCodeTd
-          value={
-            printerStore
-              .templateTable(col.text, dataKey, i, pageIndex)
-              .replace(/\(\)/g, '') ?? ''
-          }
-          height={`${(customerRowHeight || 40) - 18}px`} // 高度
-          fontSize={12} // 设置文本的字体
-          margin={1} // 设置条形码周围的空白边距
-          textMargin={0} // 设置条形码和文本之间的间距
-          width={1}
-        />
-      </td>
-    )
-  }
-
-  /**
-   * 渲染普通单元格
-   * @param {*} col 单个columns
-   * @param {*} j columns的index
-   * @param {*} i 数据的index
-   * @returns <td>
-   */
-  renderTd(col, j, i) {
-    const {
-      config: { dataKey },
-      name,
-      pageIndex,
-      printerStore
-    } = this.props
-    return (
-      <td
-        key={j}
-        data-name={getTableColumnName(name, col.index)}
-        style={{
-          ...this.getTdStyle(j, col.style),
-          ...col.style
-        }}
-        className={classNames({
-          active: getTableColumnName(name, col.index) === printerStore.selected
-        })}
-        dangerouslySetInnerHTML={{
-          __html: col.isSpecialColumn
-            ? printerStore.templateSpecialDetails(col, dataKey, i)
-            : printerStore
-                .templateTable(col.text, dataKey, i, pageIndex)
-                .replace(/\(\)/g, '')
-        }}
-      />
-    )
-  }
-
   componentDidMount() {
     const { name, printerStore } = this.props
 
@@ -267,6 +153,7 @@ class Table extends React.Component {
       config: { dataKey, arrange, customerRowHeight = 23 },
       name,
       range,
+      pageIndex,
       printerStore,
       isSomeSubtotalTr
     } = this.props
@@ -277,7 +164,8 @@ class Table extends React.Component {
 
     // 列
     const columns = this.getColumns()
-
+    // 列宽固定(避免跳页bug)
+    const thWidths = printerStore.tablesInfo[name]?.head.widths || []
     // 每页合计在前
     const subtotalTrPageSummary = () => {
       return (
@@ -306,6 +194,26 @@ class Table extends React.Component {
         </>
       )
     }
+    const getTdStyle = (index, style = {}) => {
+      const width = thWidths[index]
+      const { fontSize } = style
+      let tdStyle = {}
+      let minWidth = 24
+
+      if (!width) return tdStyle
+      if (fontSize) minWidth = _.parseInt(fontSize) * 2
+      if (width >= 150) {
+        tdStyle = {
+          minWidth: width
+        }
+      } else {
+        tdStyle = {
+          minWidth,
+          width
+        }
+      }
+      return tdStyle
+    }
 
     return (
       <table
@@ -324,7 +232,7 @@ class Table extends React.Component {
                 data-name={getTableColumnName(name, col.index)}
                 draggable
                 style={{
-                  ...this.getTdStyle(i, col.headStyle),
+                  ...getTdStyle(i, col.headStyle),
                   ...col.headStyle
                 }}
                 className={classNames({
@@ -356,11 +264,31 @@ class Table extends React.Component {
                   <td colSpan='99' />
                 ) : (
                   _.map(columns, (col, j) => {
-                    return this.renderTdMap[col.type ?? 'default']?.call(
-                      this,
-                      col,
-                      j,
-                      i
+                    return (
+                      <td
+                        key={j}
+                        data-name={getTableColumnName(name, col.index)}
+                        style={{
+                          ...getTdStyle(j, col.style),
+                          ...col.style
+                        }}
+                        className={classNames({
+                          active:
+                            getTableColumnName(name, col.index) ===
+                            printerStore.selected
+                        })}
+                        dangerouslySetInnerHTML={{
+                          __html: col.isSpecialColumn
+                            ? printerStore.templateSpecialDetails(
+                                col,
+                                dataKey,
+                                i
+                              )
+                            : printerStore
+                                .templateTable(col.text, dataKey, i, pageIndex)
+                                .replace(/\(\)/g, '')
+                        }}
+                      />
                     )
                   })
                 )}

package/src/printer/table_subtotal_tr.js

@@ -68,6 +68,10 @@ const SubtotalTr = props => {
     ).toFixed(2)
   }
 
+  const getData = field => {
+    const data = printerStore.data.common
+    return data?.[field] ?? ''
+  }
   // 每页小计
   // show 是否展示小计，fields<Array> 合计的字段和展现的name，displayName 是否显示名字
   if (show && printerStore.ready) {
@@ -113,7 +117,7 @@ const SubtotalTr = props => {
                 <div
                   style={{
                     fontWeight: 'bold',
-                    'justify-content': flexStyle[subtotal.style?.textAlign], // flex布局中textAlign不生效，改使用justify-content
+                    justifyContent: flexStyle[subtotal.style?.textAlign], // flex布局中textAlign不生效，改使用justify-content
                     ...subtotal.style
                   }}
                   className='gm-flex-page'
@@ -133,11 +137,19 @@ const SubtotalTr = props => {
                       }
                     >
                       {/* 这样写是为了支持自定义单元，index = 1时是自定义单元格 */}
-                      {index === 0 ? sumData(list, item.valueField) : ''}
+                      {item.type === 'useSummarize'
+                        ? getData(item.valueField)
+                        : index === 0
+                        ? sumData(list, item.valueField)
+                        : ''}
+                      {/* {index === 0 ? sumData(list, item.valueField) : ''} */}
                     </span>
                     {subtotal?.needUpperCase && ( // 是否需要大写金额
                       <span>
-                        {index === 0
+                        {item.type === 'useSummarize'
+                          ? '大写：' +
+                            coverDigit2Uppercase(getData(item.valueField))
+                          : index === 0
                           ? '大写：' +
                             coverDigit2Uppercase(sumData(list, item.valueField))
                           : ''}

package/.eslintcache

@@ -1 +0,0 @@
-[{"/Users/min/Documents/GMFE/gm-util/gm-printer/src/util.js":"1","/Users/min/Documents/GMFE/gm-util/gm-printer/src/printer/get_css.js":"2","/Users/min/Documents/GMFE/gm-util/gm-printer/src/printer/barcode.js":"3","/Users/min/Documents/GMFE/gm-util/gm-printer/src/index.js":"4","/Users/min/Documents/GMFE/gm-util/gm-printer/src/editor_stockout/context_menu.js":"5","/Users/min/Documents/GMFE/gm-util/gm-printer/src/editor_stockin/context_menu.js":"6","/Users/min/Documents/GMFE/gm-util/gm-printer/src/editor_statement/context_menu.js":"7","/Users/min/Documents/GMFE/gm-util/gm-printer/src/editor_settle/context_menu.js":"8","/Users/min/Documents/GMFE/gm-util/gm-printer/src/editor_salemenus/context_menu.js":"9","/Users/min/Documents/GMFE/gm-util/gm-printer/src/editor_purchase/editor_special_table.js":"10","/Users/min/Documents/GMFE/gm-util/gm-printer/src/editor_purchase/context_menu.js":"11","/Users/min/Documents/GMFE/gm-util/gm-printer/src/editor_account/context_menu.js":"12","/Users/min/Documents/GMFE/gm-util/gm-printer/src/editor/context_menu.js":"13","/Users/min/Documents/GMFE/gm-util/gm-printer/src/config.js":"14","/Users/min/Documents/GMFE/gm-util/gm-printer/src/common/hoc_with_store.js":"15","/Users/min/Documents/GMFE/gm-util/gm-printer/src/common/hoc_with_shadow_dom.js":"16","/Users/min/Documents/GMFE/gm-util/gm-printer/src/common/get_editor_css.js":"17","/Users/min/Documents/GMFE/gm-util/gm-printer/src/common/editor_title.js":"18","/Users/min/Documents/GMFE/gm-util/gm-printer/src/common/editor_store.js":"19","/Users/min/Documents/GMFE/gm-util/gm-printer/src/common/editor_select.js":"20","/Users/min/Documents/GMFE/gm-util/gm-printer/src/common/editor_edit_field.js":"21","/Users/min/Documents/GMFE/gm-util/gm-printer/src/common/component.js":"22","/Users/min/Documents/GMFE/gm-util/gm-printer/src/editor_stockout/editor.js":"23","/Users/min/Documents/GMFE/gm-util/gm-printer/src/editor_stockin/editor.js":"24","/Users/min/Documents/GMFE/gm-util/gm-printer/src/editor_statement/editor.js":"25","/Users/min/Documents/GMFE/gm-util/gm-printer/src/editor_settle/editor.js":"26","/Users/min/Documents/GMFE/gm-util/gm-printer/src/editor_salemenus/editor.js":"27","/Users/min/Documents/GMFE/gm-util/gm-printer/src/editor_purchase/editor.js":"28","/Users/min/Documents/GMFE/gm-util/gm-printer/src/editor_account_statement/editor.js":"29","/Users/min/Documents/GMFE/gm-util/gm-printer/src/editor_account/editor.js":"30","/Users/min/Documents/GMFE/gm-util/gm-printer/src/editor/editor.js":"31","/Users/min/Documents/GMFE/gm-util/gm-printer/src/components/tooltip/index.js":"32","/Users/min/Documents/GMFE/gm-util/gm-printer/src/common/editor_special_field.js":"33","/Users/min/Documents/GMFE/gm-util/gm-printer/src/printer/store.js":"34","/Users/min/Documents/GMFE/gm-util/gm-printer/src/printer/index.js":"35","/Users/min/Documents/GMFE/gm-util/gm-printer/src/printer/do_print.js":"36","/Users/min/Documents/GMFE/gm-util/gm-printer/src/finance_voucher/finance_printer.js":"37","/Users/min/Documents/GMFE/gm-util/gm-printer/src/finance_voucher/components/table_subtotal_tr.js":"38","/Users/min/Documents/GMFE/gm-util/gm-printer/src/finance_voucher/components/table.js":"39","/Users/min/Documents/GMFE/gm-util/gm-printer/src/finance_voucher/components/finance_batch_printer.js":"40","/Users/min/Documents/GMFE/gm-util/gm-printer/src/printer/page.js":"41","/Users/min/Documents/GMFE/gm-util/gm-printer/src/printer/table_subtotal_tr.js":"42","/Users/min/Documents/GMFE/gm-util/gm-printer/src/printer/table.js":"43","/Users/min/Documents/GMFE/gm-util/gm-printer/src/printer/printer.js":"44","/Users/min/Documents/GMFE/gm-util/gm-printer/src/components/flex/index.js":"45","/Users/min/Documents/GMFE/gm-util/gm-printer/src/printer/table_overallOrder_tr.js":"46","/Users/min/Documents/GMFE/gm-util/gm-printer/src/common/util.js":"47","/Users/min/Documents/GMFE/gm-util/gm-printer/src/common/editor_add_field.js":"48","/Users/min/Documents/GMFE/gm-util/gm-printer/src/printer/counter.js":"49","/Users/min/Documents/GMFE/gm-util/gm-printer/src/printer/barcodeTd.js":"50","/Users/min/Documents/GMFE/gm-util/gm-printer/src/common/common_context_menu.js":"51"},{"size":7813,"mtime":1648799098282,"results":"52","hashOfConfig":"53"},{"size":291,"mtime":1638935573926,"results":"54","hashOfConfig":"55"},{"size":523,"mtime":1638935549030,"results":"56","hashOfConfig":"55"},{"size":1139,"mtime":1644572548725,"results":"57","hashOfConfig":"58"},{"size":2293,"mtime":1638948548042,"results":"59","hashOfConfig":"55"},{"size":2292,"mtime":1638948522492,"results":"60","hashOfConfig":"55"},{"size":1078,"mtime":1638948543271,"results":"61","hashOfConfig":"55"},{"size":2067,"mtime":1648466228565,"results":"62","hashOfConfig":"53"},{"size":2991,"mtime":1638948535719,"results":"63","hashOfConfig":"55"},{"size":4379,"mtime":1638935458586,"results":"64","hashOfConfig":"55"},{"size":2428,"mtime":1648466380496,"results":"65","hashOfConfig":"53"},{"size":2955,"mtime":1647850650993,"results":"66","hashOfConfig":"58"},{"size":5462,"mtime":1659343100368,"results":"67","hashOfConfig":"68"},{"size":2833,"mtime":1638861837310,"results":"69","hashOfConfig":"55"},{"size":4212,"mtime":1638935746667,"results":"70","hashOfConfig":"55"},{"size":861,"mtime":1638931446915,"results":"71","hashOfConfig":"55"},{"size":178,"mtime":1638931439249,"results":"72","hashOfConfig":"55"},{"size":3272,"mtime":1648713847909,"results":"73","hashOfConfig":"53"},{"size":36859,"mtime":1659343100367,"results":"74","hashOfConfig":"68"},{"size":4898,"mtime":1639992402586,"results":"75","hashOfConfig":"55"},{"size":18730,"mtime":1657507507231,"results":"76","hashOfConfig":"68"},{"size":15155,"mtime":1657626470824,"results":"77","hashOfConfig":"68"},{"size":2165,"mtime":1638949854481,"results":"78","hashOfConfig":"55"},{"size":2165,"mtime":1638949840121,"results":"79","hashOfConfig":"55"},{"size":2223,"mtime":1638949823846,"results":"80","hashOfConfig":"55"},{"size":2356,"mtime":1650083974574,"results":"81","hashOfConfig":"53"},{"size":3367,"mtime":1638949855771,"results":"82","hashOfConfig":"55"},{"size":2305,"mtime":1638949843817,"results":"83","hashOfConfig":"55"},{"size":3294,"mtime":1638949855131,"results":"84","hashOfConfig":"55"},{"size":2850,"mtime":1638949842017,"results":"85","hashOfConfig":"55"},{"size":4157,"mtime":1638949853726,"results":"86","hashOfConfig":"55"},{"size":605,"mtime":1638949882777,"results":"87","hashOfConfig":"55"},{"size":1175,"mtime":1638949720500,"results":"88","hashOfConfig":"55"},{"size":18012,"mtime":1654600080184,"results":"89","hashOfConfig":"53"},{"size":332,"mtime":1644573509040,"results":"90","hashOfConfig":"58"},{"size":4080,"mtime":1648536160221,"results":"91","hashOfConfig":"53"},{"size":8842,"mtime":1646363892377,"results":"92","hashOfConfig":"58"},{"size":4317,"mtime":1646376602197,"results":"93","hashOfConfig":"58"},{"size":9440,"mtime":1644993553716,"results":"94","hashOfConfig":"58"},{"size":724,"mtime":1644808940649,"results":"95","hashOfConfig":"58"},{"size":1717,"mtime":1648466368772,"results":"96","hashOfConfig":"53"},{"size":5563,"mtime":1658392065200,"results":"97","hashOfConfig":"68"},{"size":11556,"mtime":1659499018321,"results":"98","hashOfConfig":"68"},{"size":9001,"mtime":1648713828033,"results":"99","hashOfConfig":"53"},{"size":3152,"mtime":1648713745966},{"size":1901,"mtime":1650082399244,"results":"100","hashOfConfig":"53"},{"size":600,"mtime":1657507507231,"results":"101","hashOfConfig":"68"},{"size":1945,"mtime":1657624830918,"results":"102","hashOfConfig":"68"},{"size":2009,"mtime":1659343100368,"results":"103","hashOfConfig":"68"},{"size":644,"mtime":1659407263574,"results":"104","hashOfConfig":"68"},{"size":9861,"mtime":1659343100367,"results":"105","hashOfConfig":"68"},{"filePath":"106","messages":"107","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"1h9xfdh",{"filePath":"108","messages":"109","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"jpc0be",{"filePath":"110","messages":"111","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"112","messages":"113","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"1qaimc",{"filePath":"114","messages":"115","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"116","messages":"117","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"118","messages":"119","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"120","messages":"121","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"122","messages":"123","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"124","messages":"125","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"126","messages":"127","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"128","messages":"129","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"130","messages":"131","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"su5mnm",{"filePath":"132","messages":"133","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"134","messages":"135","errorCount":2,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"source":null},{"filePath":"136","messages":"137","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"138","messages":"139","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"140","messages":"141","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"142","messages":"143","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"144","messages":"145","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"146","messages":"147","errorCount":1,"warningCount":4,"fixableErrorCount":0,"fixableWarningCount":0,"source":null},{"filePath":"148","messages":"149","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"150","messages":"151","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"152","messages":"153","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"154","messages":"155","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"156","messages":"157","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"158","messages":"159","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"160","messages":"161","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"162","messages":"163","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"164","messages":"165","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"166","messages":"167","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"168","messages":"169","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"170","messages":"171","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"172","messages":"173","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"174","messages":"175","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"176","messages":"177","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"178","messages":"179","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"180","messages":"181","errorCount":1,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"source":null},{"filePath":"182","messages":"183","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"184","messages":"185","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"186","messages":"187","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"188","messages":"189","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"190","messages":"191","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"192","messages":"193","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"194","messages":"195","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"196","messages":"197","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"198","messages":"199","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"200","messages":"201","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"202","messages":"203","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"204","messages":"205","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"/Users/min/Documents/GMFE/gm-util/gm-printer/src/util.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/printer/get_css.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/printer/barcode.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/index.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/editor_stockout/context_menu.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/editor_stockin/context_menu.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/editor_statement/context_menu.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/editor_settle/context_menu.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/editor_salemenus/context_menu.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/editor_purchase/editor_special_table.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/editor_purchase/context_menu.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/editor_account/context_menu.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/editor/context_menu.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/config.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/common/hoc_with_store.js",["206","207"],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/common/hoc_with_shadow_dom.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/common/get_editor_css.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/common/editor_title.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/common/editor_store.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/common/editor_select.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/common/editor_edit_field.js",["208","209","210","211","212"],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/common/component.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/editor_stockout/editor.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/editor_stockin/editor.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/editor_statement/editor.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/editor_settle/editor.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/editor_salemenus/editor.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/editor_purchase/editor.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/editor_account_statement/editor.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/editor_account/editor.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/editor/editor.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/components/tooltip/index.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/common/editor_special_field.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/printer/store.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/printer/index.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/printer/do_print.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/finance_voucher/finance_printer.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/finance_voucher/components/table_subtotal_tr.js",["213"],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/finance_voucher/components/table.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/finance_voucher/components/finance_batch_printer.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/printer/page.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/printer/table_subtotal_tr.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/printer/table.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/printer/printer.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/printer/table_overallOrder_tr.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/common/util.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/common/editor_add_field.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/printer/counter.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/printer/barcodeTd.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/common/common_context_menu.js",[],{"ruleId":"214","severity":2,"message":"215","line":10,"column":29,"nodeType":"216","endLine":10,"endColumn":35},{"ruleId":"214","severity":2,"message":"217","line":145,"column":63,"nodeType":"216","endLine":145,"endColumn":71},{"ruleId":"218","severity":1,"message":"219","line":315,"column":13,"nodeType":"220","endLine":315,"endColumn":49},{"ruleId":"218","severity":1,"message":"219","line":333,"column":13,"nodeType":"220","endLine":333,"endColumn":56},{"ruleId":"218","severity":1,"message":"219","line":490,"column":15,"nodeType":"220","endLine":490,"endColumn":53},{"ruleId":"218","severity":1,"message":"219","line":539,"column":11,"nodeType":"220","endLine":539,"endColumn":53},{"ruleId":"221","severity":2,"message":"222","line":588,"column":22,"nodeType":"223","messageId":"224","endLine":588,"endColumn":31},{"ruleId":"221","severity":2,"message":"222","line":120,"column":14,"nodeType":"223","messageId":"224","endLine":120,"endColumn":23},"react/prop-types","'config' is missing in props validation","Identifier","'mockData' is missing in props validation","react/jsx-handler-names","Handler function for onChange prop key must begin with 'handle'","JSXAttribute","gmfe/i18n-check","t函数的key只能为字符串常量(Literal)，请使用单引号或双引号包裹","MemberExpression","isVariable"]

package/src/printer/barcodeTd.js

@@ -1,30 +0,0 @@
-import React from 'react'
-import jsBarcode from 'jsbarcode'
-import PropTypes from 'prop-types'
-
-class BarCodeTd extends React.Component {
-  barcode = React.createRef()
-
-  componentDidMount() {
-    const { value, ...rest } = this.props
-    if (!value) return
-    jsBarcode(this.barcode.current, value, {
-      ...rest
-    })
-  }
-
-  render() {
-    const { dataName, value, height } = this.props
-    return !value ? null : (
-      <svg data-name={dataName} ref={this.barcode} style={{ height }} />
-    )
-  }
-}
-
-BarCodeTd.propTypes = {
-  value: PropTypes.string,
-  dataName: PropTypes.string,
-  height: PropTypes.string
-}
-
-export default BarCodeTd