gm-printer 10.38.8-beta.2 → 10.38.8

package/package.json

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

package/src/common/editor_edit_field.js

@@ -22,7 +22,6 @@ import PropTypes from 'prop-types'
 import { subtotalRadioList } from './util'
 import { LONG_PRINT } from '../config'
 import _ from 'lodash'
-import EditorPageBorder from './editor_page_border'
 
 @inject('editStore')
 @observer
@@ -972,12 +971,7 @@ class EditorField extends React.Component {
     const { editStore } = this.props
 
     let content = null
-    if (
-      editStore.enablePageBorder &&
-      editStore.selectedRegion === 'border'
-    ) {
-      content = <EditorPageBorder />
-    } else if (editStore.computedIsSelectBlock) {
+    if (editStore.computedIsSelectBlock) {
       content = this.renderBlocks()
     } else if (editStore.computedIsSelectTable) {
       content = this.renderTable()

package/src/common/editor_store.js

@@ -6,12 +6,6 @@ import { dispatchMsg, getBlockName, exchange, getColSpanLength } from '../util'
 import { accountRadioList } from './util'
 import React from 'react'
 import { createDiySummaryStoreMethods } from './diy_summary_helper'
-import {
-  filterPageBorderTypes,
-  isPageBorderCompatible,
-  resolvePageGapForBorder,
-  getPageBorderGap
-} from './page_border'
 
 class EditorStore {
   @observable
@@ -53,9 +47,6 @@ class EditorStore {
   @observable
   selectedRegion = null
 
-  @observable
-  enablePageBorder = false
-
   @observable
   insertPanel = 'header'
 
@@ -308,7 +299,7 @@ class EditorStore {
   }
 
   @action
-  init(config, data, options = {}) {
+  init(config, data) {
     // batchPrintConfig: 1 不连续打印（一张采购单不出现多供应商）2 连续打印（一张采购单可能出现多个供应商）
     this.config = Object.assign(
       { batchPrintConfig: 1, isFixLastFooter: true },
@@ -326,7 +317,6 @@ class EditorStore {
 
     this.taxFreeProductRateDisplay =
       config?.specialControlConfig?.taxFreeProductRateDisplay || ''
-    this.enablePageBorder = !!options.enablePageBorder
   }
 
   @action
@@ -375,50 +365,18 @@ class EditorStore {
     const contentRegions = this.config.contents.map((v, i) => {
       if (v.type === 'table') {
         return { value: `contents.table.${i}`, text: i18next.t('区域') + i }
+      } else {
+        return { value: `contents.panel.${i}`, text: i18next.t('区域') + i }
       }
-      return { value: `contents.panel.${i}`, text: i18next.t('区域') + i }
     })
 
-    const list = [
+    return [
       { value: 'all', text: i18next.t('请选择区域') },
       { value: 'header', text: i18next.t('页眉') },
       ...contentRegions,
       { value: 'sign', text: i18next.t('签名') },
       { value: 'footer', text: i18next.t('页脚') }
     ]
-    if (this.enablePageBorder) {
-      list.push({ value: 'border', text: i18next.t('边框') })
-    }
-    return list
-  }
-
-  @computed
-  get computedAvailablePageBorders() {
-    const types = this.config?.pageBorderTypes
-    const pageType = this.config?.page?.type
-    return filterPageBorderTypes(types, pageType)
-  }
-
-  @action
-  setEnablePageBorder(enable) {
-    this.enablePageBorder = !!enable
-  }
-
-  @action
-  setPageBorderId(borderId) {
-    if (!this.config?.page) return
-    const nextBorderId = borderId || null
-    const nextGap = resolvePageGapForBorder({
-      pageBorderTypes: this.config.pageBorderTypes,
-      borderId: nextBorderId,
-      pageType: this.config.page.type,
-      currentGap: this.config.page.gap
-    })
-    const patch = { borderId: nextBorderId }
-    if (nextGap) {
-      patch.gap = nextGap
-    }
-    set(this.config.page, patch)
   }
 
   @action
@@ -480,23 +438,6 @@ class EditorStore {
       gap,
       name
     }
-
-    const borderId = this.config.page.borderId
-    if (
-      borderId &&
-      !isPageBorderCompatible(this.config.pageBorderTypes, borderId, type)
-    ) {
-      set(this.config.page, { borderId: null })
-    } else if (borderId) {
-      // 纸张切换后仍匹配：仅当边框配置了 gap 时覆盖
-      const borderGap = getPageBorderGap(
-        this.config.pageBorderTypes,
-        borderId
-      )
-      if (borderGap) {
-        set(this.config.page, { gap: borderGap })
-      }
-    }
   }
 
   @action
@@ -508,9 +449,6 @@ class EditorStore {
   @computed
   get computedSelectedRegionTip() {
     if (!this.selectedRegion) return ''
-    if (this.selectedRegion === 'border') {
-      return i18next.t('说明：边框铺满整页，内容区仍保留页边距')
-    }
     return /(contents)|(sign)/g.test(this.selectedRegion) ? (
       <>
         <div>{i18next.t('说明：所选区域的内容仅打印一次')}</div>

package/src/common/hoc_with_store.js

@@ -7,15 +7,7 @@ const withStore = store => WrapComponent =>
     constructor(props) {
       super(props)
       this.store = store
-      this.store.init(props.config, props.mockData, {
-        enablePageBorder: props.enablePageBorder
-      })
-    }
-
-    componentDidUpdate(prevProps) {
-      if (prevProps.enablePageBorder !== this.props.enablePageBorder) {
-        this.store.setEnablePageBorder(this.props.enablePageBorder)
-      }
+      this.store.init(props.config, props.mockData)
     }
 
     componentDidMount() {

package/src/editor/context_menu.js

@@ -292,7 +292,6 @@ class ContextMenu extends React.Component {
           key={editStore.computedPrinterKey}
           selected={editStore.selected}
           selectedRegion={editStore.selectedRegion}
-          enablePageBorder={editStore.enablePageBorder}
           isAutoFilling={editStore.isAutoFilling}
           fillIndex={editStore.fillIndex}
           lineheight={editStore.computedTableCustomerRowHeight}

package/src/editor/context_menu_config.js

@@ -311,7 +311,6 @@ class ContextMenu extends React.Component {
           key={editStore.computedPrinterKey}
           selected={editStore.selected}
           selectedRegion={editStore.selectedRegion}
-          enablePageBorder={editStore.enablePageBorder}
           isAutoFilling={editStore.isAutoFilling}
           fillIndex={editStore.fillIndex}
           lineheight={editStore.computedTableCustomerRowHeight}

package/src/editor/editor.js

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

package/src/editor/editor_menu_config.js

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

package/src/editor_account/context_menu.js

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

package/src/editor_account/editor.js

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

package/src/editor_account_statement/context_menu.js

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

package/src/editor_box_label/context_menu.js

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

package/src/editor_purchase/context_menu.js

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

package/src/editor_salemenus/context_menu.js

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

package/src/editor_settle/context_menu.js

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

package/src/editor_statement/context_menu.js

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

package/src/editor_stockin/context_menu.js

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

package/src/editor_stockout/context_menu.js

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

package/src/examining_report_editor/context_menu.js

@@ -74,7 +74,6 @@ 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,7 +67,6 @@ class Editor extends React.Component {
 }
 
 Editor.propTypes = {
-  enablePageBorder: PropTypes.bool,
   config: PropTypes.object.isRequired,
   onSave: PropTypes.func,
   showEditor: PropTypes.bool,
@@ -80,7 +79,6 @@ 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, options = {}) {
-    super.init(config, data, options)
+  init(config, data) {
+    super.init(config, data)
     this.defaultTableDataKey = 'examiningDetail'
   }
 

package/src/printer/merge_page.js

@@ -1,10 +1,6 @@
 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
@@ -20,18 +16,10 @@ 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,10 +4,6 @@ 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
@@ -39,12 +35,6 @@ 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}
@@ -52,7 +42,7 @@ class Page extends React.Component {
           'gm-printer-page-fontFamily': isFontFamily
         })}
         style={{
-          ...mergedPageStyle,
+          ...pageStyle,
           boxSizing: 'content-box',
           width: `calc(${width} - ${paddingLeft} - ${paddingRight})`,
           padding: `${paddingTop} ${paddingRight} ${paddingBottom} ${paddingLeft}`,

package/src/printer/printer.js

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

package/src/printer/store.js

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