gm-printer 10.13.8-alpha.2 → 10.13.8

package/package.json

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

package/src/common/component.js

@@ -622,7 +622,7 @@ Radio.propTypes = {
   id: PropTypes.string,
   value: PropTypes.string,
   radioChecked: PropTypes.func,
-  checked: PropTypes.bool
+  checked: PropTypes.string
 }
 
 const RadioGap = ({ width = '100%', height = '15px' }) => (

package/src/common/editor_edit_field.js

@@ -205,6 +205,12 @@ class EditorField extends React.Component {
       (editStore.computedTableSpecialConfig.subtotal &&
         get(subtotal, 'isUpperLowerCaseSeparate')) ||
       false
+    // 位置交换
+    const subtotalCommutationPlace =
+      (editStore.computedTableSpecialConfig.subtotal &&
+        get(subtotal, 'isCommutationPlace')) ||
+      false
+
     return (
       <div>
         <Title title={i18next.t('编辑字段')} />
@@ -270,7 +276,7 @@ class EditorField extends React.Component {
         </Flex>
 
         <Flex alignCenter className='gm-padding-top-5 gm-text-desc'>
-          {i18next.t('商品排列仅适用于双栏、三栏商品设置')}
+          {i18next.t('商品排列仅适用于双栏商品设置')}
         </Flex>
 
         <Gap height='5px' />
@@ -370,6 +376,16 @@ class EditorField extends React.Component {
             onChange={this.handleSubtotalStyleChange}
           />
         </Flex>
+        {/* <Flex style={{ margin: '5px 0 5px 62px' }}>
+          <Flex alignCenter>
+            <input
+              type='checkbox'
+              checked={subtotalCommutationPlace}
+              onChange={editStore.setSubtotalCommutationPlace}
+            />
+          </Flex>
+          <Flex>&nbsp;{i18next.t('合计、每页合计交换位置')}</Flex>
+        </Flex> */}
         <EditorSubtotalCheck
           subtotalCheckDisabled
           subtotalChecked={subtotalNeedUpperCase}

package/src/common/editor_select.js

@@ -126,7 +126,7 @@ class EditorSelector extends React.Component {
         </Flex>
 
         {this.props.isPurchase && (
-          <>
+          <React.Fragment>
             <Flex alignCenter className='gm-padding-top-5'>
               <div>{i18next.t('批量打印设置')}：</div>
               <Select
@@ -146,7 +146,7 @@ class EditorSelector extends React.Component {
                 连续打印（一张采购单可能出现多个供应商）
               </p>
             </div>
-          </>
+          </React.Fragment>
         )}
 
         <Flex alignCenter className='gm-padding-top-5 gm-text-red'>
@@ -158,10 +158,9 @@ class EditorSelector extends React.Component {
 }
 
 EditorSelector.propTypes = {
-  isPurchase: PropTypes.bool,
-  editStore: PropTypes.object
+  isPurchase: PropTypes.bool
 }
-EditorSelector.defaultProps = {
+EditorSelector.deaultProps = {
   isPurchase: false
 }
 

package/src/common/editor_special_field.js

@@ -33,7 +33,7 @@ class SpecialField extends React.Component {
 }
 
 SpecialField.propTypes = {
-  fields: PropTypes.object,
+  fields: PropTypes.object.isRequired,
   handleAddField: PropTypes.func,
   addFields: PropTypes.object.isRequired,
   editStore: PropTypes.object,

package/src/common/editor_store.js

@@ -427,14 +427,7 @@ class EditorStore {
       newDataKey = _.concat(keyArr, key)
     }
 
-    if (newDataKey.includes('multi') && key === 'multi3') {
-      newDataKey = _.without(newDataKey, 'multi')
-    } else if (newDataKey.includes('multi3') && key === 'multi') {
-      newDataKey = _.without(newDataKey, 'multi3')
-    }
-
     newDataKey = _.sortBy(newDataKey, [
-      o => o === 'multi3',
       o => o === 'multi',
       o => o === 'category',
       o => o === 'orders'

package/src/common/editor_title.js

@@ -126,10 +126,9 @@ class EditorTitle extends React.Component {
 
 EditorTitle.propTypes = {
   onSave: PropTypes.func.isRequired,
-  isPurchase: PropTypes.bool,
-  editStore: PropTypes.object
+  isPurchase: PropTypes.bool
 }
-EditorTitle.defaultProps = {
+EditorTitle.deaultProps = {
   isPurchase: false
 }
 

package/src/common/get_editor_css.js

@@ -1,6 +1,6 @@
 // eslint-disable-next-line
 import editorCSS from 'css-loader!postcss-loader!less-loader!./style.lesss'
 
-export default function getEditorCSS() {
+export default function getEditorCSS () {
   return editorCSS.toString()
 }

package/src/common/hoc_with_shadow_dom.js

@@ -8,21 +8,21 @@ const withShadowDom = WrapCom => {
   return class extends React.Component {
     ref = React.createRef()
 
-    componentDidMount() {
+    componentDidMount () {
       const shadowRoot = this.ref.current.attachShadow({ mode: 'open' })
       // 在window下挂 shadow root
       window.shadowRoot = shadowRoot
-      ReactDOM.render(<WrapCom {...this.props} />, shadowRoot)
+      ReactDOM.render(<WrapCom {...this.props}/>, shadowRoot)
       insertCSS(getPrinterCSS() + getEditorCSS(), shadowRoot)
     }
 
-    componentWillUnmount() {
+    componentWillUnmount () {
       // 移除示例,不然很多意想不到的事情发生
       ReactDOM.unmountComponentAtNode(window.shadowRoot)
     }
 
-    render() {
-      return <div id='shadowroot' ref={this.ref} />
+    render () {
+      return <div id='shadowroot' ref={this.ref}/>
     }
   }
 }

package/src/common/hoc_with_store.js

@@ -4,65 +4,29 @@ import { getStyleWithDiff } from '../util'
 
 const withStore = store => WrapComponent =>
   class extends React.Component {
-    constructor(props) {
+    constructor (props) {
       super(props)
       this.store = store
       this.store.init(props.config)
     }
 
-    componentDidMount() {
-      window.document.addEventListener(
-        'gm-printer-select',
-        this.handlePrinterSelect
-      )
-      window.document.addEventListener(
-        'gm-printer-select-region',
-        this.handleSelectedRegion
-      )
-      window.document.addEventListener(
-        'gm-printer-panel-style-set',
-        this.handlePrinterPanelStyleSet
-      )
-      window.document.addEventListener(
-        'gm-printer-block-style-set',
-        this.handlePrinterBlockStyleSet
-      )
-      window.document.addEventListener(
-        'gm-printer-block-text-set',
-        this.handlePrinterBlockTextSet
-      )
-      window.document.addEventListener(
-        'gm-printer-table-drag',
-        this.handlePrinterTableDrag
-      )
+    componentDidMount () {
+      window.document.addEventListener('gm-printer-select', this.handlePrinterSelect)
+      window.document.addEventListener('gm-printer-select-region', this.handleSelectedRegion)
+      window.document.addEventListener('gm-printer-panel-style-set', this.handlePrinterPanelStyleSet)
+      window.document.addEventListener('gm-printer-block-style-set', this.handlePrinterBlockStyleSet)
+      window.document.addEventListener('gm-printer-block-text-set', this.handlePrinterBlockTextSet)
+      window.document.addEventListener('gm-printer-table-drag', this.handlePrinterTableDrag)
       window.document.addEventListener('keydown', this.handleKeyDown)
     }
 
-    componentWillUnmount() {
-      window.document.removeEventListener(
-        'gm-printer-select',
-        this.handlePrinterSelect
-      )
-      window.document.removeEventListener(
-        'gm-printer-select-region',
-        this.handleSelectedRegion
-      )
-      window.document.removeEventListener(
-        'gm-printer-panel-style-set',
-        this.handlePrinterPanelStyleSet
-      )
-      window.document.removeEventListener(
-        'gm-printer-block-style-set',
-        this.handlePrinterBlockStyleSet
-      )
-      window.document.removeEventListener(
-        'gm-printer-block-text-set',
-        this.handlePrinterBlockTextSet
-      )
-      window.document.removeEventListener(
-        'gm-printer-table-drag',
-        this.handlePrinterTableDrag
-      )
+    componentWillUnmount () {
+      window.document.removeEventListener('gm-printer-select', this.handlePrinterSelect)
+      window.document.removeEventListener('gm-printer-select-region', this.handleSelectedRegion)
+      window.document.removeEventListener('gm-printer-panel-style-set', this.handlePrinterPanelStyleSet)
+      window.document.removeEventListener('gm-printer-block-style-set', this.handlePrinterBlockStyleSet)
+      window.document.removeEventListener('gm-printer-block-text-set', this.handlePrinterBlockTextSet)
+      window.document.removeEventListener('gm-printer-table-drag', this.handlePrinterTableDrag)
       window.document.removeEventListener('keydown', this.handleKeyDown)
     }
 
@@ -71,31 +35,31 @@ const withStore = store => WrapComponent =>
       this.store.setSelectedRegion(selected)
     }
 
-    handlePrinterSelect = e => {
+    handlePrinterSelect = (e) => {
       const { selected } = e.detail
       this.store.setSelected(selected)
     }
 
-    handlePrinterPanelStyleSet = e => {
+    handlePrinterPanelStyleSet = (e) => {
       const { name, style } = e.detail
       this.store.setConfigPanelStyle(name, style)
     }
 
-    handlePrinterBlockStyleSet = e => {
+    handlePrinterBlockStyleSet = (e) => {
       const { style } = e.detail
       this.store.setConfigBlockBy('style', style)
     }
 
-    handlePrinterBlockTextSet = e => {
+    handlePrinterBlockTextSet = (e) => {
       const { text } = e.detail
       this.store.setConfigBlockBy('text', text)
     }
 
-    handlePrinterTableDrag = e => {
+    handlePrinterTableDrag = (e) => {
       this.store.exchangeTableColumn(e.detail.target, e.detail.source)
     }
 
-    handleKeyDown = e => {
+    handleKeyDown = (e) => {
       if (e.target !== window.document.body) {
         return
       }
@@ -117,11 +81,7 @@ const withStore = store => WrapComponent =>
             diffY += 1
           }
 
-          const newStyle = getStyleWithDiff(
-            this.store.computedSelectedInfo.style,
-            diffX,
-            diffY
-          )
+          const newStyle = getStyleWithDiff(this.store.computedSelectedInfo.style, diffX, diffY)
 
           this.store.setConfigBlockBy('style', newStyle)
         } else if (this.store.computedIsSelectTable) {
@@ -140,12 +100,13 @@ const withStore = store => WrapComponent =>
       }
     }
 
-    render() {
+    render () {
       return (
         <Provider editStore={this.store} mockData={this.props.mockData}>
-          <WrapComponent {...this.props} />
+          <WrapComponent {...this.props}/>
         </Provider>
       )
     }
   }
+
 export default withStore

package/src/components/tooltip/index.js

@@ -19,7 +19,7 @@ const ToolTip = ({ text }) => {
     </span>
   )
 }
-ToolTip.propTypes = {
+ToolTip.PropTypes = {
   text: PropTypes.string.isRequired
 }
 

package/src/config.js

@@ -125,5 +125,3 @@ export const blockTypeList = [
 ]
 
 export const MULTI_SUFFIX = '_MULTI_SUFFIX'
-
-export const MULTI_SUFFIX3 = '_MULTI_SUFFIX3'

package/src/editor/context_menu.js

@@ -4,7 +4,7 @@ import CommonContextMenu from '../common/common_context_menu'
 import { inject, observer } from 'mobx-react'
 import _ from 'lodash'
 import { Printer } from '../printer'
-import PropTypes from 'prop-types'
+import { noSubtotalBtnTableDataKeySet } from './editor'
 
 const blockTypeList = [
   { value: '', text: i18next.t('插入文本') },
@@ -62,7 +62,6 @@ class ContextMenu extends React.Component {
     const keyArr = dataKey.split('_')
 
     const isMultiActive = keyArr.includes('multi')
-    const isThreeActive = keyArr.includes('multi3')
     const isCategoryActive = keyArr.includes('category')
     const isSubtotalActive = subtotal.show
 
@@ -74,12 +73,6 @@ class ContextMenu extends React.Component {
         >
           {i18next.t('双栏商品')}
         </div>
-        <div
-          onClick={this.handleChangeTableDataKey.bind(this, 'multi3', name)}
-          className={isThreeActive ? 'active' : ''}
-        >
-          {i18next.t('三栏商品')}
-        </div>
         <div
           onClick={this.handleChangeTableDataKey.bind(this, 'category', name)}
           className={isCategoryActive ? 'active' : ''}
@@ -114,8 +107,5 @@ class ContextMenu extends React.Component {
     )
   }
 }
-ContextMenu.propTypes = {
-  editStore: PropTypes.object,
-  mockData: PropTypes.object
-}
+
 export default ContextMenu

package/src/editor/editor.js

@@ -110,7 +110,7 @@ Editor.propTypes = {
   showNewDate: PropTypes.bool
 }
 
-Editor.defaultProps = {
+Editor.deaultProps = {
   onSave: _.noop,
   showNewDate: false
 }

package/src/editor_account/context_menu.js

@@ -4,7 +4,6 @@ import CommonContextMenu from '../common/common_context_menu'
 import { inject, observer } from 'mobx-react'
 import _ from 'lodash'
 import { Printer } from '../printer'
-import PropTypes from 'prop-types'
 
 const blockTypeList = [
   { value: '', text: i18next.t('插入文本') },
@@ -51,8 +50,8 @@ class ContextMenu extends React.Component {
     }
 
     const arr = name.split('.')
-    const { subtotal } = this.props.editStore.config.contents[arr[2]]
-    // const keyArr = dataKey.split('_')
+    const { dataKey, subtotal } = this.props.editStore.config.contents[arr[2]]
+    const keyArr = dataKey.split('_')
 
     // const isMultiActive = keyArr.includes('multi')
     // const isCategoryActive = keyArr.includes('category')
@@ -100,8 +99,5 @@ class ContextMenu extends React.Component {
     )
   }
 }
-ContextMenu.propTypes = {
-  editStore: PropTypes.object,
-  mockData: PropTypes.object
-}
+
 export default ContextMenu

package/src/editor_account/editor.js

@@ -83,7 +83,7 @@ Editor.propTypes = {
   showNewDate: PropTypes.bool
 }
 
-Editor.defaultProps = {
+Editor.deaultProps = {
   onSave: _.noop,
   showNewDate: false
 }

package/src/editor_account_statement/editor.js

@@ -105,7 +105,7 @@ Editor.propTypes = {
   addFields: PropTypes.object.isRequired
 }
 
-Editor.defaultProps = {
+Editor.deaultProps = {
   onSave: _.noop
 }
 

package/src/editor_purchase/context_menu.js

@@ -3,7 +3,6 @@ import React from 'react'
 import CommonContextMenu from '../common/common_context_menu'
 import { inject, observer } from 'mobx-react'
 import { Printer } from '../printer'
-import PropTypes from 'prop-types'
 import _ from 'lodash'
 
 const blockTypeList = [
@@ -85,8 +84,4 @@ class ContextMenu extends React.Component {
   }
 }
 
-ContextMenu.propTypes = {
-  editStore: PropTypes.object,
-  mockData: PropTypes.object
-}
 export default ContextMenu

package/src/editor_purchase/editor.js

@@ -71,7 +71,7 @@ Editor.propTypes = {
   isPurchase: PropTypes.bool
 }
 
-Editor.defaultProps = {
+Editor.deaultProps = {
   onSave: _.noop,
   isPurchase: false
 }

package/src/editor_purchase/editor_special_table.js

@@ -119,12 +119,6 @@ class TableDetailEditor extends React.Component {
   }
 }
 
-TableDetailEditor.propTypes = {
-  addFields: PropTypes.object.isRequired,
-  editStore: PropTypes.object,
-  config: PropTypes.object
-}
-
 @inject('editStore')
 @observer
 class EditorSpecialTable extends React.Component {
@@ -150,8 +144,7 @@ class EditorSpecialTable extends React.Component {
 }
 
 EditorSpecialTable.propTypes = {
-  addFields: PropTypes.object.isRequired,
-  editStore: PropTypes.object
+  addFields: PropTypes.object.isRequired
 }
 
 export default EditorSpecialTable

package/src/editor_salemenus/context_menu.js

@@ -4,7 +4,6 @@ import _ from 'lodash'
 import CommonContextMenu from '../common/common_context_menu'
 import { inject, observer } from 'mobx-react'
 import { Printer } from '../printer'
-import PropTypes from 'prop-types'
 import { hasSubtotalBtnTableDataKeySet } from './editor'
 
 const blockTypeList = [
@@ -102,8 +101,5 @@ class ContextMenu extends React.Component {
     )
   }
 }
-ContextMenu.propTypes = {
-  editStore: PropTypes.object,
-  mockData: PropTypes.object
-}
+
 export default ContextMenu

package/src/editor_salemenus/editor.js

@@ -101,7 +101,7 @@ Editor.propTypes = {
   showNewDate: PropTypes.bool
 }
 
-Editor.defaultProps = {
+Editor.deaultProps = {
   onSave: _.noop,
   showNewDate: false
 }

package/src/editor_settle/context_menu.js

@@ -4,7 +4,6 @@ import CommonContextMenu from '../common/common_context_menu'
 import { inject, observer } from 'mobx-react'
 import { Printer } from '../printer'
 import _ from 'lodash'
-import PropTypes from 'prop-types'
 
 const blockTypeList = [
   { value: '', text: i18next.t('插入文本') },
@@ -18,13 +17,13 @@ const blockTypeList = [
 }))
 @observer
 class ContextMenu extends React.Component {
-  handleSubtotal = name => {
+  handleSubtotal = (name) => {
     const { editStore } = this.props
 
     editStore.setSubtotalShow(name)
   }
 
-  hasSubtotalBtn = name => {
+  hasSubtotalBtn = (name) => {
     if (!name) return false
 
     const arr = name.split('.')
@@ -35,7 +34,7 @@ class ContextMenu extends React.Component {
     }
   }
 
-  renderOrderActionBtn = name => {
+  renderOrderActionBtn = (name) => {
     if (!this.hasSubtotalBtn(name)) {
       return null
     }
@@ -46,24 +45,18 @@ class ContextMenu extends React.Component {
     const isSubtotalActive = subtotal.show
 
     return (
-      <>
-        <div
-          onClick={this.handleSubtotal.bind(this, name)}
-          className={isSubtotalActive ? 'active' : ''}
-        >
-          {i18next.t('每页合计')}
+      <React.Fragment>
+        <div onClick={this.handleSubtotal.bind(this, name)}
+          className={isSubtotalActive ? 'active' : ''}>{i18next.t('每页合计')}
         </div>
-      </>
+      </React.Fragment>
     )
   }
 
-  render() {
+  render () {
     const { editStore, mockData } = this.props
     return (
-      <CommonContextMenu
-        renderTableAction={this.renderOrderActionBtn}
-        insertBlockList={blockTypeList}
-      >
+      <CommonContextMenu renderTableAction={this.renderOrderActionBtn} insertBlockList={blockTypeList}>
         <Printer
           key={editStore.computedPrinterKey}
           selected={editStore.selected}
@@ -76,8 +69,4 @@ class ContextMenu extends React.Component {
   }
 }
 
-ContextMenu.propTypes = {
-  editStore: PropTypes.object,
-  mockData: PropTypes.object
-}
 export default ContextMenu

package/src/editor_settle/editor.js

@@ -72,7 +72,7 @@ Editor.propTypes = {
   addFields: PropTypes.object.isRequired
 }
 
-Editor.defaultProps = {
+Editor.deaultProps = {
   onSave: _.noop
 }
 

package/src/editor_statement/context_menu.js

@@ -3,7 +3,6 @@ import React from 'react'
 import CommonContextMenu from '../common/common_context_menu'
 import { inject, observer } from 'mobx-react'
 import { Printer } from '../printer'
-import PropTypes from 'prop-types'
 
 const blockTypeList = [
   { value: '', text: i18next.t('插入文本') },
@@ -17,7 +16,7 @@ const blockTypeList = [
 }))
 @observer
 class ContextMenu extends React.Component {
-  render() {
+  render () {
     const { editStore, mockData } = this.props
     return (
       <CommonContextMenu insertBlockList={blockTypeList}>
@@ -32,8 +31,5 @@ class ContextMenu extends React.Component {
     )
   }
 }
-ContextMenu.propTypes = {
-  editStore: PropTypes.object,
-  mockData: PropTypes.object
-}
+
 export default ContextMenu

package/src/editor_statement/editor.js

@@ -72,7 +72,7 @@ Editor.propTypes = {
   addFields: PropTypes.object.isRequired
 }
 
-Editor.defaultProps = {
+Editor.deaultProps = {
   onSave: _.noop
 }
 

package/src/editor_stockin/context_menu.js

@@ -3,7 +3,6 @@ import React from 'react'
 import CommonContextMenu from '../common/common_context_menu'
 import { inject, observer } from 'mobx-react'
 import { Printer } from '../printer'
-import PropTypes from 'prop-types'
 
 const blockTypeList = [
   { value: '', text: i18next.t('插入文本') },
@@ -33,7 +32,7 @@ class ContextMenu extends React.Component {
     const isMultiActive = keyArr.includes('multi')
 
     return (
-      <>
+      <React.Fragment>
         <div
           onClick={this.handleChangeTableDataKey.bind(this, 'multi', name)}
           className={isMultiActive ? 'active' : ''}
@@ -52,7 +51,7 @@ class ContextMenu extends React.Component {
         >
           {i18next.t('入库金额小计')}
         </div>
-      </>
+      </React.Fragment>
     )
   }
 
@@ -74,8 +73,5 @@ class ContextMenu extends React.Component {
     )
   }
 }
-ContextMenu.propTypes = {
-  editStore: PropTypes.object,
-  mockData: PropTypes.object
-}
+
 export default ContextMenu

package/src/editor_stockin/editor.js

@@ -69,7 +69,7 @@ Editor.propTypes = {
   addFields: PropTypes.object.isRequired
 }
 
-Editor.defaultProps = {
+Editor.deaultProps = {
   onSave: _.noop
 }