gm-printer 10.38.7 → 10.38.8-beta.2

package/src/editor_account_statement/context_menu.js

@@ -25,6 +25,7 @@ class ContextMenu extends React.Component {
           key={editStore.computedPrinterKey}
           selected={editStore.selected}
           selectedRegion={editStore.selectedRegion}
+          enablePageBorder={editStore.enablePageBorder}
           config={editStore.config}
           data={mockData}
         />

package/src/editor_account_statement/editor.js

@@ -98,6 +98,7 @@ class Editor extends React.Component {
 }
 
 Editor.propTypes = {
+  enablePageBorder: PropTypes.bool,
   config: PropTypes.object.isRequired,
   onSave: PropTypes.func,
   showEditor: PropTypes.bool,
@@ -106,6 +107,7 @@ Editor.propTypes = {
 }
 
 Editor.defaultProps = {
+  enablePageBorder: false,
   onSave: _.noop
 }
 

package/src/editor_box_label/context_menu.js

@@ -55,6 +55,7 @@ class ContextMunu extends React.Component {
           data={mockData}
           selected={editStore.selected}
           selectedRegion={editStore.selectedRegion}
+          enablePageBorder={editStore.enablePageBorder}
           config={editStore.config}
         />
       </CommonContextMenu>

package/src/editor_box_label/editor.js

@@ -57,6 +57,7 @@ class Editor extends React.Component {
 }
 
 Editor.propTypes = {
+  enablePageBorder: PropTypes.bool,
   config: PropTypes.object.isRequired,
   showEditor: PropTypes.bool,
   onSave: PropTypes.func,
@@ -64,4 +65,8 @@ Editor.propTypes = {
   mockData: PropTypes.object.isRequired
 }
 
+Editor.defaultProps = {
+  enablePageBorder: false
+}
+
 export default Editor

package/src/editor_purchase/context_menu.js

@@ -75,6 +75,7 @@ class ContextMenu extends React.Component {
           key={editStore.computedPrinterKey}
           selected={editStore.selected}
           selectedRegion={editStore.selectedRegion}
+          enablePageBorder={editStore.enablePageBorder}
           config={editStore.config}
           data={mockData}
         />

package/src/editor_purchase/editor.js

@@ -65,6 +65,7 @@ class Editor extends React.Component {
 }
 
 Editor.propTypes = {
+  enablePageBorder: PropTypes.bool,
   config: PropTypes.object.isRequired,
   onSave: PropTypes.func,
   showEditor: PropTypes.bool,
@@ -74,6 +75,7 @@ Editor.propTypes = {
 }
 
 Editor.defaultProps = {
+  enablePageBorder: false,
   onSave: _.noop,
   isPurchase: false
 }

package/src/editor_salemenus/context_menu.js

@@ -95,6 +95,7 @@ class ContextMenu extends React.Component {
           key={editStore.computedPrinterKey}
           selected={editStore.selected}
           selectedRegion={editStore.selectedRegion}
+          enablePageBorder={editStore.enablePageBorder}
           config={editStore.config}
           data={mockData}
         />

package/src/editor_salemenus/editor.js

@@ -93,6 +93,7 @@ class Editor extends React.Component {
 }
 
 Editor.propTypes = {
+  enablePageBorder: PropTypes.bool,
   config: PropTypes.object.isRequired,
   onSave: PropTypes.func,
   showEditor: PropTypes.bool,
@@ -102,6 +103,7 @@ Editor.propTypes = {
 }
 
 Editor.defaultProps = {
+  enablePageBorder: false,
   onSave: _.noop,
   showNewDate: false
 }

package/src/editor_settle/context_menu.js

@@ -68,6 +68,7 @@ class ContextMenu extends React.Component {
           key={editStore.computedPrinterKey}
           selected={editStore.selected}
           selectedRegion={editStore.selectedRegion}
+          enablePageBorder={editStore.enablePageBorder}
           config={editStore.config}
           data={mockData}
           isSomeSubtotalTr

package/src/editor_settle/editor.js

@@ -69,6 +69,7 @@ class Editor extends React.Component {
 }
 
 Editor.propTypes = {
+  enablePageBorder: PropTypes.bool,
   config: PropTypes.object.isRequired,
   onSave: PropTypes.func,
   showEditor: PropTypes.bool,
@@ -78,6 +79,7 @@ Editor.propTypes = {
 }
 
 Editor.defaultProps = {
+  enablePageBorder: false,
   onSave: _.noop
 }
 

package/src/editor_statement/context_menu.js

@@ -25,6 +25,7 @@ class ContextMenu extends React.Component {
           key={editStore.computedPrinterKey}
           selected={editStore.selected}
           selectedRegion={editStore.selectedRegion}
+          enablePageBorder={editStore.enablePageBorder}
           config={editStore.config}
           data={mockData}
         />

package/src/editor_statement/editor.js

@@ -65,6 +65,7 @@ class Editor extends React.Component {
 }
 
 Editor.propTypes = {
+  enablePageBorder: PropTypes.bool,
   config: PropTypes.object.isRequired,
   onSave: PropTypes.func,
   showEditor: PropTypes.bool,
@@ -73,6 +74,7 @@ Editor.propTypes = {
 }
 
 Editor.defaultProps = {
+  enablePageBorder: false,
   onSave: _.noop
 }
 

package/src/editor_stockin/context_menu.js

@@ -67,6 +67,7 @@ class ContextMenu extends React.Component {
           key={editStore.computedPrinterKey}
           selected={editStore.selected}
           selectedRegion={editStore.selectedRegion}
+          enablePageBorder={editStore.enablePageBorder}
           config={editStore.config}
           data={mockData}
         />

package/src/editor_stockin/editor.js

@@ -62,6 +62,7 @@ class Editor extends React.Component {
 }
 
 Editor.propTypes = {
+  enablePageBorder: PropTypes.bool,
   config: PropTypes.object.isRequired,
   onSave: PropTypes.func,
   showEditor: PropTypes.bool,
@@ -70,6 +71,7 @@ Editor.propTypes = {
 }
 
 Editor.defaultProps = {
+  enablePageBorder: false,
   onSave: _.noop
 }
 

package/src/editor_stockout/context_menu.js

@@ -67,6 +67,7 @@ class ContextMenu extends React.Component {
           key={editStore.computedPrinterKey}
           selected={editStore.selected}
           selectedRegion={editStore.selectedRegion}
+          enablePageBorder={editStore.enablePageBorder}
           config={editStore.config}
           data={mockData}
         />

package/src/editor_stockout/editor.js

@@ -62,6 +62,7 @@ class Editor extends React.Component {
 }
 
 Editor.propTypes = {
+  enablePageBorder: PropTypes.bool,
   config: PropTypes.object.isRequired,
   onSave: PropTypes.func,
   showEditor: PropTypes.bool,
@@ -70,6 +71,7 @@ Editor.propTypes = {
 }
 
 Editor.defaultProps = {
+  enablePageBorder: false,
   onSave: _.noop
 }
 

package/src/examining_report_editor/context_menu.js

@@ -74,6 +74,7 @@ class ContextMenu extends React.Component {
           key={editStore.computedPrinterKey}
           selected={editStore.selected}
           selectedRegion={editStore.selectedRegion}
+          enablePageBorder={editStore.enablePageBorder}
           config={editStore.config}
           data={mockData}
         />

package/src/examining_report_editor/editor.js

@@ -67,6 +67,7 @@ class Editor extends React.Component {
 }
 
 Editor.propTypes = {
+  enablePageBorder: PropTypes.bool,
   config: PropTypes.object.isRequired,
   onSave: PropTypes.func,
   showEditor: PropTypes.bool,
@@ -79,6 +80,7 @@ Editor.propTypes = {
 }
 
 Editor.defaultProps = {
+  enablePageBorder: false,
   onSave: _.noop
 }
 

package/src/examining_report_editor/store.js

@@ -24,8 +24,8 @@ class Store extends EditorStore {
   }
 
   @action
-  init(config, data) {
-    super.init(config, data)
+  init(config, data, options = {}) {
+    super.init(config, data, options)
     this.defaultTableDataKey = 'examiningDetail'
   }
 

package/src/printer/merge_page.js

@@ -1,6 +1,10 @@
 import React from 'react'
 import PropTypes from 'prop-types'
 import { inject, observer } from 'mobx-react'
+import {
+  getPageBorderBackgroundStyle,
+  mergePageStyleWithBorder
+} from '../common/page_border'
 
 @inject('printerStore')
 @observer
@@ -16,10 +20,18 @@ class MergePage extends React.Component {
 
     const { width } = printerStore.config.page.size
 
+    const borderStyle = getPageBorderBackgroundStyle({
+      enablePageBorder: printerStore.enablePageBorder,
+      borderId: printerStore.config.page.borderId,
+      pageBorderTypes: printerStore.config.pageBorderTypes
+    })
+    const mergedPageStyle = mergePageStyleWithBorder(null, borderStyle)
+
     return (
       <div
         className='gm-printer-page'
         style={{
+          ...mergedPageStyle,
           boxSizing: 'content-box',
           width: `calc(${width} - ${paddingLeft} - ${paddingRight})`,
           padding: `${paddingTop} ${paddingRight} ${paddingBottom} ${paddingLeft}`,

package/src/printer/page.js

@@ -4,6 +4,10 @@ import { inject, observer } from 'mobx-react'
 import { getHeight } from '../util'
 import classNames from 'classnames'
 import { LONG_PRINT } from '../config'
+import {
+  getPageBorderBackgroundStyle,
+  mergePageStyleWithBorder
+} from '../common/page_border'
 
 @inject('printerStore')
 @observer
@@ -35,6 +39,12 @@ class Page extends React.Component {
     } = printerStore.config.page
     // 统一减2毫米,防止计算误差溢出
     const x = '- 2mm'
+    const borderStyle = getPageBorderBackgroundStyle({
+      enablePageBorder: printerStore.enablePageBorder,
+      borderId: printerStore.config.page.borderId,
+      pageBorderTypes: printerStore.config.pageBorderTypes
+    })
+    const mergedPageStyle = mergePageStyleWithBorder(pageStyle, borderStyle)
     return (
       <div
         ref={this.ref}
@@ -42,7 +52,7 @@ class Page extends React.Component {
           'gm-printer-page-fontFamily': isFontFamily
         })}
         style={{
-          ...pageStyle,
+          ...mergedPageStyle,
           boxSizing: 'content-box',
           width: `calc(${width} - ${paddingLeft} - ${paddingRight})`,
           padding: `${paddingTop} ${paddingRight} ${paddingBottom} ${paddingLeft}`,

package/src/printer/printer.js

@@ -73,6 +73,9 @@ class Printer extends React.Component {
     if (nextProps.selectedRegion !== this.props.selectedRegion) {
       this.props.printerStore.setSelectedRegion(nextProps.selectedRegion)
     }
+    if (nextProps.enablePageBorder !== this.props.enablePageBorder) {
+      this.props.printerStore.setEnablePageBorder(nextProps.enablePageBorder)
+    }
 
     if (
       nextProps.isAutoFilling !== this.props.isAutoFilling ||
@@ -130,10 +133,18 @@ class Printer extends React.Component {
   }
 
   init() {
-    const { printerStore, config, data, selected, selectedRegion } = this.props
+    const {
+      printerStore,
+      config,
+      data,
+      selected,
+      selectedRegion,
+      enablePageBorder
+    } = this.props
     printerStore.init(config, data)
     printerStore.setSelected(selected)
     printerStore.setSelectedRegion(selectedRegion)
+    printerStore.setEnablePageBorder(enablePageBorder)
   }
 
   renderBefore() {
@@ -416,11 +427,13 @@ Printer.propTypes = {
   onReady: PropTypes.func,
   isSomeSubtotalTr: PropTypes.bool,
   getremainpageHeight: PropTypes.func,
-  overallorder: PropTypes.bool
+  overallorder: PropTypes.bool,
+  enablePageBorder: PropTypes.bool
 }
 
 Printer.defaultProps = {
-  onReady: _.noop
+  onReady: _.noop,
+  enablePageBorder: false
 }
 
 class WithStorePrinter extends React.Component {

package/src/printer/store.js

@@ -58,6 +58,14 @@ class PrinterStore {
   @observable
   isMultiDigitDecimal = false
 
+  @observable
+  enablePageBorder = false
+
+  @action
+  setEnablePageBorder(enable) {
+    this.enablePageBorder = !!enable
+  }
+
   @action
   setMultiDigitDecimal(bool) {
     this.isMultiDigitDecimal = bool
@@ -79,6 +87,7 @@ class PrinterStore {
     this.pages = [] // [page, page, ...] page 为数组
     this.data = data
     this.selected = null
+    this.enablePageBorder = false
   }
 
   @action