gm-printer 10.13.8 → 10.13.11

package/.eslintcache

@@ -1 +1 @@
-[{"/Users/yancheng/gm/gm-open-source/gm-printer/src/printer/table.js":"1","/Users/yancheng/gm/gm-open-source/gm-printer/src/printer/store.js":"2","/Users/yancheng/gm/gm-open-source/gm-printer/src/editor/editor.js":"3","/Users/yancheng/gm/gm-open-source/gm-printer/src/editor/context_menu.js":"4","/Users/yancheng/gm/gm-open-source/gm-printer/src/components/tooltip/index.js":"5","/Users/yancheng/gm/gm-open-source/gm-printer/src/common/common_context_menu.js":"6","/Users/yancheng/gm/gm-open-source/gm-printer/src/util.js":"7","/Users/yancheng/gm/gm-open-source/gm-printer/src/printer/printer.js":"8","/Users/yancheng/gm/gm-open-source/gm-printer/src/printer/do_print.js":"9","/Users/yancheng/gm/gm-open-source/gm-printer/src/common/editor_special_field.js":"10","/Users/yancheng/gm/gm-open-source/gm-printer/src/common/hoc_with_store.js":"11","/Users/yancheng/gm/gm-open-source/gm-printer/src/common/hoc_with_shadow_dom.js":"12","/Users/yancheng/gm/gm-open-source/gm-printer/src/common/editor_title.js":"13","/Users/yancheng/gm/gm-open-source/gm-printer/src/common/editor_store.js":"14","/Users/yancheng/gm/gm-open-source/gm-printer/src/common/editor_add_field.js":"15","/Users/yancheng/gm/gm-open-source/gm-printer/src/common/editor_page_summary.js":"16","/Users/yancheng/gm/gm-open-source/gm-printer/src/editor_account/editor.js":"17","/Users/yancheng/gm/gm-open-source/gm-printer/src/editor_account/context_menu.js":"18"},{"size":9238,"mtime":1637656903443,"results":"19","hashOfConfig":"20"},{"size":12882,"mtime":1638178010006,"results":"21","hashOfConfig":"20"},{"size":4244,"mtime":1635494969691,"results":"22","hashOfConfig":"20"},{"size":3683,"mtime":1635851060224,"results":"23","hashOfConfig":"20"},{"size":616,"mtime":1621235314060,"results":"24","hashOfConfig":"25"},{"size":9693,"mtime":1621242097206,"results":"26","hashOfConfig":"25"},{"size":7162,"mtime":1639020313922,"results":"27","hashOfConfig":"20"},{"size":8733,"mtime":1635931829112,"results":"28","hashOfConfig":"20"},{"size":3119,"mtime":1634191808754,"results":"29","hashOfConfig":"20"},{"size":1113,"mtime":1635407660514,"results":"30","hashOfConfig":"20"},{"size":3905,"mtime":1635304242763},{"size":861,"mtime":1635246075403,"results":"31","hashOfConfig":"20"},{"size":3260,"mtime":1635334661529,"results":"32","hashOfConfig":"20"},{"size":24504,"mtime":1635908548975,"results":"33","hashOfConfig":"20"},{"size":1907,"mtime":1635492860490,"results":"34","hashOfConfig":"20"},{"size":3548,"mtime":1635409410379,"results":"35","hashOfConfig":"20"},{"size":2989,"mtime":1635495718901,"results":"36","hashOfConfig":"20"},{"size":3465,"mtime":1635495798948,"results":"37","hashOfConfig":"20"},{"filePath":"38","messages":"39","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"1j0d8vf",{"filePath":"40","messages":"41","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"42","messages":"43","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"44","messages":"45","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"46","messages":"47","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"175njjo",{"filePath":"48","messages":"49","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"50","messages":"51","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"52","messages":"53","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"54","messages":"55","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"56","messages":"57","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"58","messages":"59","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"60","messages":"61","errorCount":13,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"source":null},{"filePath":"62","messages":"63","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"64","messages":"65","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"66","messages":"67","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"68","messages":"69","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"70","messages":"71","errorCount":2,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"source":null},"/Users/yancheng/gm/gm-open-source/gm-printer/src/printer/table.js",[],"/Users/yancheng/gm/gm-open-source/gm-printer/src/printer/store.js",[],"/Users/yancheng/gm/gm-open-source/gm-printer/src/editor/editor.js",[],"/Users/yancheng/gm/gm-open-source/gm-printer/src/editor/context_menu.js",[],"/Users/yancheng/gm/gm-open-source/gm-printer/src/components/tooltip/index.js",[],"/Users/yancheng/gm/gm-open-source/gm-printer/src/common/common_context_menu.js",[],"/Users/yancheng/gm/gm-open-source/gm-printer/src/util.js",[],"/Users/yancheng/gm/gm-open-source/gm-printer/src/printer/printer.js",[],"/Users/yancheng/gm/gm-open-source/gm-printer/src/printer/do_print.js",[],"/Users/yancheng/gm/gm-open-source/gm-printer/src/common/editor_special_field.js",[],"/Users/yancheng/gm/gm-open-source/gm-printer/src/common/hoc_with_shadow_dom.js",[],"/Users/yancheng/gm/gm-open-source/gm-printer/src/common/editor_title.js",["72","73","74","75","76","77","78","79","80","81","82","83","84"],"/Users/yancheng/gm/gm-open-source/gm-printer/src/common/editor_store.js",[],"/Users/yancheng/gm/gm-open-source/gm-printer/src/common/editor_add_field.js",[],"/Users/yancheng/gm/gm-open-source/gm-printer/src/common/editor_page_summary.js",[],"/Users/yancheng/gm/gm-open-source/gm-printer/src/editor_account/editor.js",[],"/Users/yancheng/gm/gm-open-source/gm-printer/src/editor_account/context_menu.js",["85","86"],{"ruleId":"87","severity":2,"message":"88","line":47,"column":13,"nodeType":"89","messageId":"90","endLine":47,"endColumn":22},{"ruleId":"87","severity":2,"message":"91","line":48,"column":30,"nodeType":"92","messageId":"90","endLine":48,"endColumn":36},{"ruleId":"87","severity":2,"message":"93","line":49,"column":31,"nodeType":"92","messageId":"90","endLine":49,"endColumn":47},{"ruleId":"87","severity":2,"message":"93","line":50,"column":21,"nodeType":"92","messageId":"90","endLine":50,"endColumn":37},{"ruleId":"87","severity":2,"message":"88","line":56,"column":13,"nodeType":"89","messageId":"90","endLine":56,"endColumn":22},{"ruleId":"87","severity":2,"message":"94","line":59,"column":20,"nodeType":"92","messageId":"90","endLine":59,"endColumn":32},{"ruleId":"87","severity":2,"message":"91","line":61,"column":23,"nodeType":"92","messageId":"90","endLine":61,"endColumn":29},{"ruleId":"87","severity":2,"message":"95","line":61,"column":30,"nodeType":"92","messageId":"90","endLine":61,"endColumn":34},{"ruleId":"87","severity":2,"message":"96","line":63,"column":15,"nodeType":"92","messageId":"90","endLine":63,"endColumn":19},{"ruleId":"87","severity":2,"message":"88","line":67,"column":23,"nodeType":"89","messageId":"90","endLine":67,"endColumn":32},{"ruleId":"87","severity":2,"message":"91","line":70,"column":32,"nodeType":"92","messageId":"90","endLine":70,"endColumn":38},{"ruleId":"87","severity":2,"message":"88","line":78,"column":13,"nodeType":"89","messageId":"90","endLine":78,"endColumn":22},{"ruleId":"87","severity":2,"message":"91","line":84,"column":42,"nodeType":"92","messageId":"90","endLine":84,"endColumn":48},{"ruleId":"97","severity":2,"message":"98","line":64,"column":11,"nodeType":"92","endLine":64,"endColumn":17},{"ruleId":"97","severity":2,"message":"99","line":102,"column":24,"nodeType":"92","endLine":102,"endColumn":32},"react/prop-types","'editStore' is missing in props validation","Property","missingPropType","'editStore.config' is missing in props validation","Identifier","'editStore.config.batchPrintConfig' is missing in props validation","'editStore.originConfig' is missing in props validation","'editStore.config.name' is missing in props validation","'editStore.init' is missing in props validation","no-unused-vars","'keyArr' is assigned a value but never used.","'mockData' is assigned a value but never used."]
+[{"/Users/yancheng/gm/gm-open-source/gm-printer/src/printer/table.js":"1","/Users/yancheng/gm/gm-open-source/gm-printer/src/printer/store.js":"2","/Users/yancheng/gm/gm-open-source/gm-printer/src/editor/editor.js":"3","/Users/yancheng/gm/gm-open-source/gm-printer/src/editor/context_menu.js":"4","/Users/yancheng/gm/gm-open-source/gm-printer/src/components/tooltip/index.js":"5","/Users/yancheng/gm/gm-open-source/gm-printer/src/common/common_context_menu.js":"6","/Users/yancheng/gm/gm-open-source/gm-printer/src/util.js":"7","/Users/yancheng/gm/gm-open-source/gm-printer/src/printer/printer.js":"8","/Users/yancheng/gm/gm-open-source/gm-printer/src/printer/do_print.js":"9","/Users/yancheng/gm/gm-open-source/gm-printer/src/common/editor_special_field.js":"10","/Users/yancheng/gm/gm-open-source/gm-printer/src/common/hoc_with_store.js":"11","/Users/yancheng/gm/gm-open-source/gm-printer/src/common/hoc_with_shadow_dom.js":"12","/Users/yancheng/gm/gm-open-source/gm-printer/src/common/editor_title.js":"13","/Users/yancheng/gm/gm-open-source/gm-printer/src/common/editor_store.js":"14","/Users/yancheng/gm/gm-open-source/gm-printer/src/common/editor_add_field.js":"15","/Users/yancheng/gm/gm-open-source/gm-printer/src/common/editor_page_summary.js":"16","/Users/yancheng/gm/gm-open-source/gm-printer/src/editor_account/editor.js":"17","/Users/yancheng/gm/gm-open-source/gm-printer/src/editor_account/context_menu.js":"18"},{"size":9379,"mtime":1643448762149,"results":"19","hashOfConfig":"20"},{"size":12882,"mtime":1638178010006,"results":"21","hashOfConfig":"20"},{"size":4244,"mtime":1635494969691,"results":"22","hashOfConfig":"20"},{"size":3683,"mtime":1635851060224,"results":"23","hashOfConfig":"20"},{"size":616,"mtime":1621235314060,"results":"24","hashOfConfig":"25"},{"size":9693,"mtime":1621242097206,"results":"26","hashOfConfig":"25"},{"size":7258,"mtime":1639037857730,"results":"27","hashOfConfig":"20"},{"size":8733,"mtime":1635931829112,"results":"28","hashOfConfig":"20"},{"size":3119,"mtime":1634191808754,"results":"29","hashOfConfig":"20"},{"size":1113,"mtime":1635407660514,"results":"30","hashOfConfig":"20"},{"size":3905,"mtime":1635304242763},{"size":861,"mtime":1635246075403,"results":"31","hashOfConfig":"20"},{"size":3260,"mtime":1635334661529,"results":"32","hashOfConfig":"20"},{"size":24504,"mtime":1635908548975,"results":"33","hashOfConfig":"20"},{"size":1907,"mtime":1635492860490,"results":"34","hashOfConfig":"20"},{"size":3548,"mtime":1635409410379,"results":"35","hashOfConfig":"20"},{"size":2989,"mtime":1635495718901,"results":"36","hashOfConfig":"20"},{"size":3465,"mtime":1635495798948,"results":"37","hashOfConfig":"20"},{"filePath":"38","messages":"39","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"1j0d8vf",{"filePath":"40","messages":"41","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"42","messages":"43","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"44","messages":"45","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"46","messages":"47","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"175njjo",{"filePath":"48","messages":"49","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"50","messages":"51","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"52","messages":"53","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"54","messages":"55","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"56","messages":"57","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"58","messages":"59","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"60","messages":"61","errorCount":13,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"source":null},{"filePath":"62","messages":"63","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"64","messages":"65","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"66","messages":"67","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"68","messages":"69","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"70","messages":"71","errorCount":2,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"source":null},"/Users/yancheng/gm/gm-open-source/gm-printer/src/printer/table.js",[],"/Users/yancheng/gm/gm-open-source/gm-printer/src/printer/store.js",[],"/Users/yancheng/gm/gm-open-source/gm-printer/src/editor/editor.js",[],"/Users/yancheng/gm/gm-open-source/gm-printer/src/editor/context_menu.js",[],"/Users/yancheng/gm/gm-open-source/gm-printer/src/components/tooltip/index.js",[],"/Users/yancheng/gm/gm-open-source/gm-printer/src/common/common_context_menu.js",[],"/Users/yancheng/gm/gm-open-source/gm-printer/src/util.js",[],"/Users/yancheng/gm/gm-open-source/gm-printer/src/printer/printer.js",[],"/Users/yancheng/gm/gm-open-source/gm-printer/src/printer/do_print.js",[],"/Users/yancheng/gm/gm-open-source/gm-printer/src/common/editor_special_field.js",[],"/Users/yancheng/gm/gm-open-source/gm-printer/src/common/hoc_with_shadow_dom.js",[],"/Users/yancheng/gm/gm-open-source/gm-printer/src/common/editor_title.js",["72","73","74","75","76","77","78","79","80","81","82","83","84"],"/Users/yancheng/gm/gm-open-source/gm-printer/src/common/editor_store.js",[],"/Users/yancheng/gm/gm-open-source/gm-printer/src/common/editor_add_field.js",[],"/Users/yancheng/gm/gm-open-source/gm-printer/src/common/editor_page_summary.js",[],"/Users/yancheng/gm/gm-open-source/gm-printer/src/editor_account/editor.js",[],"/Users/yancheng/gm/gm-open-source/gm-printer/src/editor_account/context_menu.js",["85","86"],{"ruleId":"87","severity":2,"message":"88","line":47,"column":13,"nodeType":"89","messageId":"90","endLine":47,"endColumn":22},{"ruleId":"87","severity":2,"message":"91","line":48,"column":30,"nodeType":"92","messageId":"90","endLine":48,"endColumn":36},{"ruleId":"87","severity":2,"message":"93","line":49,"column":31,"nodeType":"92","messageId":"90","endLine":49,"endColumn":47},{"ruleId":"87","severity":2,"message":"93","line":50,"column":21,"nodeType":"92","messageId":"90","endLine":50,"endColumn":37},{"ruleId":"87","severity":2,"message":"88","line":56,"column":13,"nodeType":"89","messageId":"90","endLine":56,"endColumn":22},{"ruleId":"87","severity":2,"message":"94","line":59,"column":20,"nodeType":"92","messageId":"90","endLine":59,"endColumn":32},{"ruleId":"87","severity":2,"message":"91","line":61,"column":23,"nodeType":"92","messageId":"90","endLine":61,"endColumn":29},{"ruleId":"87","severity":2,"message":"95","line":61,"column":30,"nodeType":"92","messageId":"90","endLine":61,"endColumn":34},{"ruleId":"87","severity":2,"message":"96","line":63,"column":15,"nodeType":"92","messageId":"90","endLine":63,"endColumn":19},{"ruleId":"87","severity":2,"message":"88","line":67,"column":23,"nodeType":"89","messageId":"90","endLine":67,"endColumn":32},{"ruleId":"87","severity":2,"message":"91","line":70,"column":32,"nodeType":"92","messageId":"90","endLine":70,"endColumn":38},{"ruleId":"87","severity":2,"message":"88","line":78,"column":13,"nodeType":"89","messageId":"90","endLine":78,"endColumn":22},{"ruleId":"87","severity":2,"message":"91","line":84,"column":42,"nodeType":"92","messageId":"90","endLine":84,"endColumn":48},{"ruleId":"97","severity":2,"message":"98","line":64,"column":11,"nodeType":"92","endLine":64,"endColumn":17},{"ruleId":"97","severity":2,"message":"99","line":102,"column":24,"nodeType":"92","endLine":102,"endColumn":32},"react/prop-types","'editStore' is missing in props validation","Property","missingPropType","'editStore.config' is missing in props validation","Identifier","'editStore.config.batchPrintConfig' is missing in props validation","'editStore.originConfig' is missing in props validation","'editStore.config.name' is missing in props validation","'editStore.init' is missing in props validation","no-unused-vars","'keyArr' is assigned a value but never used.","'mockData' is assigned a value but never used."]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gm-printer",
-  "version": "10.13.8",
+  "version": "10.13.11",
   "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.string
+  checked: PropTypes.bool
 }
 
 const RadioGap = ({ width = '100%', height = '15px' }) => (

package/src/common/editor_edit_field.js

@@ -205,12 +205,6 @@ 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('编辑字段')} />
@@ -276,7 +270,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' />
@@ -376,16 +370,6 @@ 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,10 +146,10 @@ class EditorSelector extends React.Component {
                 连续打印（一张采购单可能出现多个供应商）
               </p>
             </div>
-          </React.Fragment>
+          </>
         )}
 
-        <Flex alignCenter className='gm-padding-top-5 gm-text-red'>
+        <Flex className='gm-padding-top-5 gm-text-red' column>
           {computedSelectedRegionTip}
         </Flex>
       </div>
@@ -158,9 +158,10 @@ class EditorSelector extends React.Component {
 }
 
 EditorSelector.propTypes = {
-  isPurchase: PropTypes.bool
+  isPurchase: PropTypes.bool,
+  editStore: PropTypes.object
 }
-EditorSelector.deaultProps = {
+EditorSelector.defaultProps = {
   isPurchase: false
 }
 

package/src/common/editor_special_field.js

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

package/src/common/editor_store.js

@@ -3,6 +3,7 @@ import { action, computed, observable, set, toJS } from 'mobx'
 import { pageTypeMap } from '../config'
 import _ from 'lodash'
 import { dispatchMsg, getBlockName, exchange } from '../util'
+import React from 'react'
 
 class EditorStore {
   @observable
@@ -183,6 +184,21 @@ class EditorStore {
   @action
   setSizePageType(type) {
     const { size, gap, name } = pageTypeMap[type]
+    const { contents } = this.config
+    // 判断表格是否是三栏表格
+    const tableIsMulti3 = _.find(
+      contents,
+      item => item?.dataKey && item?.dataKey.includes('multi3')
+    )
+    // 原本是三栏表格，切换到三分纸时，修改dataKey的值
+    if (tableIsMulti3 && type === 'A4/3') {
+      this.config.contents = _.map(contents, item => {
+        if (item?.dataKey && item?.dataKey.includes('multi3')) {
+          return { ...item, dataKey: 'orders' }
+        }
+        return item
+      })
+    }
 
     this.config.page = {
       ...this.config.page,
@@ -202,9 +218,17 @@ class EditorStore {
   @computed
   get computedSelectedRegionTip() {
     if (!this.selectedRegion) return ''
-    return /(contents)|(sign)/g.test(this.selectedRegion)
-      ? i18next.t('说明：所选区域的内容仅打印一次')
-      : i18next.t('说明：所选区域的内容每页均打印')
+    return /(contents)|(sign)/g.test(this.selectedRegion) ? (
+      <>
+        <div>{i18next.t('说明：所选区域的内容仅打印一次')}</div>
+        <div>
+          &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+          {i18next.t('开启[三栏商品]打印选项，打印内容可能超出纸张')}
+        </div>
+      </>
+    ) : (
+      i18next.t('说明：所选区域的内容每页均打印')
+    )
   }
 
   @computed
@@ -427,7 +451,14 @@ 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,9 +126,10 @@ class EditorTitle extends React.Component {
 
 EditorTitle.propTypes = {
   onSave: PropTypes.func.isRequired,
-  isPurchase: PropTypes.bool
+  isPurchase: PropTypes.bool,
+  editStore: PropTypes.object
 }
-EditorTitle.deaultProps = {
+EditorTitle.defaultProps = {
   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,29 +4,65 @@ 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)
     }
 
@@ -35,31 +71,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
       }
@@ -81,7 +117,11 @@ 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) {
@@ -100,13 +140,12 @@ 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,3 +125,5 @@ 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 { noSubtotalBtnTableDataKeySet } from './editor'
+import PropTypes from 'prop-types'
 
 const blockTypeList = [
   { value: '', text: i18next.t('插入文本') },
@@ -57,11 +57,19 @@ class ContextMenu extends React.Component {
       return null
     }
 
+    const {
+      editStore: {
+        config: {
+          page: { type }
+        }
+      }
+    } = this.props
     const arr = name.split('.')
     const { dataKey, subtotal } = this.props.editStore.config.contents[arr[2]]
     const keyArr = dataKey.split('_')
 
     const isMultiActive = keyArr.includes('multi')
+    const isThreeActive = keyArr.includes('multi3')
     const isCategoryActive = keyArr.includes('category')
     const isSubtotalActive = subtotal.show
 
@@ -73,6 +81,15 @@ class ContextMenu extends React.Component {
         >
           {i18next.t('双栏商品')}
         </div>
+        {/* 三分纸高度太小，做不了三栏，会死循环 */}
+        {type !== 'A4/3' && (
+          <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' : ''}
@@ -107,5 +124,8 @@ 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.deaultProps = {
+Editor.defaultProps = {
   onSave: _.noop,
   showNewDate: false
 }

package/src/editor_account/context_menu.js

@@ -4,6 +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'
 
 const blockTypeList = [
   { value: '', text: i18next.t('插入文本') },
@@ -50,8 +51,8 @@ class ContextMenu extends React.Component {
     }
 
     const arr = name.split('.')
-    const { dataKey, subtotal } = this.props.editStore.config.contents[arr[2]]
-    const keyArr = dataKey.split('_')
+    const { subtotal } = this.props.editStore.config.contents[arr[2]]
+    // const keyArr = dataKey.split('_')
 
     // const isMultiActive = keyArr.includes('multi')
     // const isCategoryActive = keyArr.includes('category')
@@ -99,5 +100,8 @@ 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.deaultProps = {
+Editor.defaultProps = {
   onSave: _.noop,
   showNewDate: false
 }

package/src/editor_account_statement/editor.js

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

package/src/editor_purchase/context_menu.js

@@ -3,6 +3,7 @@ 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 = [
@@ -84,4 +85,8 @@ 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.deaultProps = {
+Editor.defaultProps = {
   onSave: _.noop,
   isPurchase: false
 }

package/src/editor_purchase/editor_special_table.js

@@ -119,6 +119,12 @@ 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 {
@@ -144,7 +150,8 @@ class EditorSpecialTable extends React.Component {
 }
 
 EditorSpecialTable.propTypes = {
-  addFields: PropTypes.object.isRequired
+  addFields: PropTypes.object.isRequired,
+  editStore: PropTypes.object
 }
 
 export default EditorSpecialTable

package/src/editor_salemenus/context_menu.js

@@ -4,6 +4,7 @@ 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 = [
@@ -101,5 +102,8 @@ 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.deaultProps = {
+Editor.defaultProps = {
   onSave: _.noop,
   showNewDate: false
 }

package/src/editor_settle/context_menu.js

@@ -4,6 +4,7 @@ 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('插入文本') },
@@ -17,13 +18,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('.')
@@ -34,7 +35,7 @@ class ContextMenu extends React.Component {
     }
   }
 
-  renderOrderActionBtn = (name) => {
+  renderOrderActionBtn = name => {
     if (!this.hasSubtotalBtn(name)) {
       return null
     }
@@ -45,18 +46,24 @@ class ContextMenu extends React.Component {
     const isSubtotalActive = subtotal.show
 
     return (
-      <React.Fragment>
-        <div onClick={this.handleSubtotal.bind(this, name)}
-          className={isSubtotalActive ? 'active' : ''}>{i18next.t('每页合计')}
+      <>
+        <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}
@@ -69,4 +76,8 @@ 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.deaultProps = {
+Editor.defaultProps = {
   onSave: _.noop
 }
 

package/src/editor_statement/context_menu.js

@@ -3,6 +3,7 @@ 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('插入文本') },
@@ -16,7 +17,7 @@ const blockTypeList = [
 }))
 @observer
 class ContextMenu extends React.Component {
-  render () {
+  render() {
     const { editStore, mockData } = this.props
     return (
       <CommonContextMenu insertBlockList={blockTypeList}>
@@ -31,5 +32,8 @@ 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.deaultProps = {
+Editor.defaultProps = {
   onSave: _.noop
 }
 

package/src/editor_stockin/context_menu.js

@@ -3,6 +3,7 @@ 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('插入文本') },
@@ -32,7 +33,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' : ''}
@@ -51,7 +52,7 @@ class ContextMenu extends React.Component {
         >
           {i18next.t('入库金额小计')}
         </div>
-      </React.Fragment>
+      </>
     )
   }
 
@@ -73,5 +74,8 @@ 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.deaultProps = {
+Editor.defaultProps = {
   onSave: _.noop
 }
 

package/src/editor_stockout/context_menu.js

@@ -3,6 +3,7 @@ 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('插入文本') },
@@ -73,5 +74,8 @@ class ContextMenu extends React.Component {
     )
   }
 }
-
+ContextMenu.propTypes = {
+  editStore: PropTypes.object,
+  mockData: PropTypes.object
+}
 export default ContextMenu

package/src/editor_stockout/editor.js

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

package/src/index.js

@@ -18,7 +18,7 @@ import {
   getCSS,
   getPrintContainerHTML
 } from './printer'
-import { MULTI_SUFFIX } from './config'
+import { MULTI_SUFFIX, MULTI_SUFFIX3 } from './config'
 
 export * from './util'
 export { setLocale } from '../locales'
@@ -40,5 +40,6 @@ export {
   doBatchPrint,
   getCSS,
   MULTI_SUFFIX,
+  MULTI_SUFFIX3,
   getPrintContainerHTML
 }

package/src/printer/barcode.js

@@ -1,5 +1,6 @@
 import React from 'react'
 import jsBarcode from 'jsbarcode'
+import PropTypes from 'prop-types'
 
 class BarCode extends React.Component {
   barcode = React.createRef()
@@ -17,4 +18,9 @@ class BarCode extends React.Component {
   }
 }
 
+BarCode.propTypes = {
+  value: PropTypes.string,
+  dataName: PropTypes.string
+}
+
 export default BarCode

package/src/printer/get_css.js

@@ -3,7 +3,7 @@ import normalizeCSS from 'css-loader!./normalize.csss'
 // eslint-disable-next-line
 import printerCSS from 'css-loader!postcss-loader!less-loader!./style.lesss'
 
-function getCSS () {
+function getCSS() {
   return normalizeCSS.toString() + printerCSS.toString()
 }
 

package/src/printer/table.js

@@ -205,7 +205,13 @@ class Table extends React.Component {
     }
 
     return (
-      <table>
+      <table
+        style={{
+          // td会撑开table的宽度
+          tableLayout: 'inherit',
+          wordBreak: 'break-all'
+        }}
+      >
         <thead>
           <tr style={{ height: `${customerRowHeight}px` }}>
             {_.map(columns, (col, i) => (

package/src/util.js

@@ -15,13 +15,14 @@ function getHeight(el) {
 
 function getWidth(el) {
   const styles = window.getComputedStyle(el)
-  // clientWidth 仅包含 padding + content, 不用涉及border计算
-  const width = el.clientWidth
-  // const borderLeftWidth = parseFloat(styles.borderLeftWidth)
+  // 取width保留小数点用 getBoundClientRect
+  const style = el.getBoundingClientRect()
+  const width = Math.round(style.width * 100) / 100 // 保留两位小数并四舍五入
+  const borderLeftWidth = parseFloat(styles.borderLeftWidth)
   // const borderRightWidth = parseFloat(styles.borderRightWidth)
   const paddingLeft = parseFloat(styles.paddingLeft)
   const paddingRight = parseFloat(styles.paddingRight)
-  return width - paddingLeft - paddingRight
+  return width - borderLeftWidth - paddingLeft - paddingRight
 }
 
 function pxAdd(origin = '0px', add) {
@@ -163,7 +164,7 @@ const coverDigit2Uppercase = n => {
   )
 }
 
-// 是不是双栏table
+// 是不是多栏table
 const isMultiTable = dataKey => dataKey.includes('multi')
 
 // 获取table有多少栏,最少是双栏