gm-printer 10.37.3-beta.2 → 10.38.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gm-printer",
-  "version": "10.37.3-beta.2",
+  "version": "10.38.0",
   "description": "diy printer",
   "main": "src/index.js",
   "scripts": {

package/src/examining_report_editor/store.js

@@ -39,14 +39,7 @@ class Store extends EditorStore {
     return {
       dataKey: this.defaultTableDataKey,
       subtotal: { show: false },
-      columns: [
-        {
-          head: i18next.t('表头'),
-          text: i18next.t('{{列.表头}}'),
-          style: { textAlign: 'center' },
-          headStyle: { textAlign: 'center' }
-        }
-      ]
+      columns: DEFAULT_TABLE_COLUMNS
     }
   }
 
@@ -58,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()}

package/src/printer/store.js

@@ -552,8 +552,7 @@ class PrinterStore {
         dataKey !== 'purchase_detail_one_row' &&
         dataKey !== 'purchase_independent_rol_sku' &&
         dataKey !== 'purchase_independent_rol_address' &&
-        dataKey !== 'taxRateSales' &&
-        dataKey !== 'ordinary'
+        dataKey !== 'taxRateSales'
       ) {
         return null
       }