gm-printer 10.37.3-beta.1 → 10.38.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gm-printer",
-  "version": "10.37.3-beta.1",
+  "version": "10.38.0",
   "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/examining_report_editor/store.js

@@ -36,18 +36,10 @@ class Store extends EditorStore {
   }
 
   getDefaultTableConfig() {
-    console.log('getDefaultTableConfig--->')
     return {
       dataKey: this.defaultTableDataKey,
       subtotal: { show: false },
-      columns: [
-        {
-          head: i18next.t('表头'),
-          text: i18next.t('{{列.表头}}'),
-          style: { textAlign: 'center' },
-          headStyle: { textAlign: 'center' }
-        }
-      ]
+      columns: DEFAULT_TABLE_COLUMNS
     }
   }
 
@@ -59,6 +51,9 @@ class Store extends EditorStore {
 
   @action.bound
   addContent(name, index, type, tableConfig = null) {
+    if (type === 'table' && !tableConfig) {
+      tableConfig = this.getDefaultTableConfig()
+    }
     super.addContent(name, index, type, tableConfig)
     this.config = toJS(this.config)
   }

package/src/index.js

@@ -3,7 +3,7 @@ import '../locales'
 import Editor, { Editor2 } from './editor'
 
 import EditorPurchase from './editor_purchase'
-import EditorExaminingReport from './examining_report_editor'
+import examiningReportEditor from './examining_report_editor'
 import EditorStockIn from './editor_stockin'
 import EditorStockOut from './editor_stockout'
 import EditorSettle from './editor_settle'
@@ -33,7 +33,7 @@ export {
   EditorStockIn,
   EditorStockOut,
   EditorPurchase,
-  EditorExaminingReport,
+  examiningReportEditor,
   EditorSettle,
   EditorStatement,
   EditorAccoutStatement,

package/src/printer/batch_printer.js

@@ -20,7 +20,13 @@ class BatchPrinter extends React.Component {
     const { list } = this.props
 
     return _.map(list, ({ config, data }, i) => (
-      <Printer key={i} data={data} config={config} onReady={this.handleReady} />
+      <Printer
+        key={i}
+        data={data}
+        config={config}
+        onReady={this.handleReady}
+        isLast={i === list.length - 1}
+      />
     ))
   }
 }

package/src/printer/printer.js

@@ -374,6 +374,7 @@ class Printer extends React.Component {
       onReady,
       selectedRegion,
       printerStore,
+      isLast,
       ...rest
     } = this.props
     const {
@@ -390,7 +391,8 @@ class Printer extends React.Component {
         className={classNames('gm-printer', className)}
         style={Object.assign({}, style, {
           width,
-          breakAfter: batchPrintConfig === 2 ? 'auto' : 'always'
+          breakAfter: batchPrintConfig === 2 || isLast ? 'auto' : 'always',
+          pageBreakAfter: batchPrintConfig === 2 || isLast ? 'auto' : 'always'
         })}
       >
         {this.doRender()}