gm-printer 10.38.0 → 10.38.4

package/package.json

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

package/src/printer/batch_printer.js

@@ -20,13 +20,7 @@ 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}
-        isLast={i === list.length - 1}
-      />
+      <Printer key={i} data={data} config={config} onReady={this.handleReady} />
     ))
   }
 }

package/src/printer/printer.js

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