gm-printer 10.37.0-beta.0 → 10.37.2

package/package.json

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

package/src/common/editor_title.js

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

package/src/editor_settle/editor.js

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

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 =