gm-printer 10.14.1-alpha.1 → 10.14.1-alpha.2

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","/Users/yancheng/gm/gm-open-source/gm-printer/src/editor_purchase/context_menu.js":"19","/Users/yancheng/gm/gm-open-source/gm-printer/src/common/editor_customize_config.js":"20"},{"size":9379,"mtime":1643448762149,"results":"21","hashOfConfig":"22"},{"size":13614,"mtime":1646818931827,"results":"23","hashOfConfig":"22"},{"size":4244,"mtime":1635494969691,"results":"24","hashOfConfig":"22"},{"size":4144,"mtime":1646815943026,"results":"25","hashOfConfig":"22"},{"size":616,"mtime":1621235314060,"results":"26","hashOfConfig":"27"},{"size":9693,"mtime":1621242097206,"results":"28","hashOfConfig":"27"},{"size":7258,"mtime":1639037857730,"results":"29","hashOfConfig":"22"},{"size":9567,"mtime":1646818922036,"results":"30","hashOfConfig":"22"},{"size":3119,"mtime":1634191808754,"results":"31","hashOfConfig":"22"},{"size":1113,"mtime":1635407660514,"results":"32","hashOfConfig":"22"},{"size":4349,"mtime":1646815933499,"results":"33","hashOfConfig":"22"},{"size":861,"mtime":1635246075403,"results":"34","hashOfConfig":"22"},{"size":3260,"mtime":1635334661529,"results":"35","hashOfConfig":"22"},{"size":25789,"mtime":1646816593551,"results":"36","hashOfConfig":"22"},{"size":1907,"mtime":1635492860490,"results":"37","hashOfConfig":"22"},{"size":3548,"mtime":1635409410379,"results":"38","hashOfConfig":"22"},{"size":2989,"mtime":1635495718901,"results":"39","hashOfConfig":"22"},{"size":3399,"mtime":1646816404368,"results":"40","hashOfConfig":"22"},{"size":2456,"mtime":1646721857196,"results":"41","hashOfConfig":"22"},{"size":1215,"mtime":1646815645520,"results":"42","hashOfConfig":"22"},{"filePath":"43","messages":"44","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"1j0d8vf",{"filePath":"45","messages":"46","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"47","messages":"48","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"49","messages":"50","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"51","messages":"52","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"175njjo",{"filePath":"53","messages":"54","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"55","messages":"56","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"57","messages":"58","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"59","messages":"60","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"61","messages":"62","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"63","messages":"64","errorCount":3,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"source":null},{"filePath":"65","messages":"66","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"67","messages":"68","errorCount":13,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"source":null},{"filePath":"69","messages":"70","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"71","messages":"72","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"73","messages":"74","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"75","messages":"76","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"77","messages":"78","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"79","messages":"80","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"81","messages":"82","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"/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_store.js",["83","84","85"],"/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",["86","87","88","89","90","91","92","93","94","95","96","97","98"],"/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",[],"/Users/yancheng/gm/gm-open-source/gm-printer/src/editor_purchase/context_menu.js",[],"/Users/yancheng/gm/gm-open-source/gm-printer/src/common/editor_customize_config.js",[],{"ruleId":"99","severity":2,"message":"100","line":10,"column":29,"nodeType":"101","endLine":10,"endColumn":35},{"ruleId":"99","severity":2,"message":"102","line":10,"column":43,"nodeType":"101","endLine":10,"endColumn":51},{"ruleId":"99","severity":2,"message":"102","line":147,"column":63,"nodeType":"101","endLine":147,"endColumn":71},{"ruleId":"99","severity":2,"message":"103","line":47,"column":13,"nodeType":"104","messageId":"105","endLine":47,"endColumn":22},{"ruleId":"99","severity":2,"message":"106","line":48,"column":30,"nodeType":"101","messageId":"105","endLine":48,"endColumn":36},{"ruleId":"99","severity":2,"message":"107","line":49,"column":31,"nodeType":"101","messageId":"105","endLine":49,"endColumn":47},{"ruleId":"99","severity":2,"message":"107","line":50,"column":21,"nodeType":"101","messageId":"105","endLine":50,"endColumn":37},{"ruleId":"99","severity":2,"message":"103","line":56,"column":13,"nodeType":"104","messageId":"105","endLine":56,"endColumn":22},{"ruleId":"99","severity":2,"message":"108","line":59,"column":20,"nodeType":"101","messageId":"105","endLine":59,"endColumn":32},{"ruleId":"99","severity":2,"message":"106","line":61,"column":23,"nodeType":"101","messageId":"105","endLine":61,"endColumn":29},{"ruleId":"99","severity":2,"message":"109","line":61,"column":30,"nodeType":"101","messageId":"105","endLine":61,"endColumn":34},{"ruleId":"99","severity":2,"message":"110","line":63,"column":15,"nodeType":"101","messageId":"105","endLine":63,"endColumn":19},{"ruleId":"99","severity":2,"message":"103","line":67,"column":23,"nodeType":"104","messageId":"105","endLine":67,"endColumn":32},{"ruleId":"99","severity":2,"message":"106","line":70,"column":32,"nodeType":"101","messageId":"105","endLine":70,"endColumn":38},{"ruleId":"99","severity":2,"message":"103","line":78,"column":13,"nodeType":"104","messageId":"105","endLine":78,"endColumn":22},{"ruleId":"99","severity":2,"message":"106","line":84,"column":42,"nodeType":"101","messageId":"105","endLine":84,"endColumn":48},"react/prop-types","'config' is missing in props validation","Identifier","'mockData' is missing in props validation","'editStore' is missing in props validation","Property","missingPropType","'editStore.config' is missing in props validation","'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"]
+[{"/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","/Users/yancheng/gm/gm-open-source/gm-printer/src/editor_purchase/context_menu.js":"19","/Users/yancheng/gm/gm-open-source/gm-printer/src/common/editor_customize_config.js":"20","/Users/yancheng/gm/gm-open-source/gm-printer/src/common/editor_edit_field.js":"21","/Users/yancheng/gm/gm-open-source/gm-printer/src/common/component.js":"22"},{"size":9379,"mtime":1643448762149,"results":"23","hashOfConfig":"24"},{"size":13982,"mtime":1646901703877,"results":"25","hashOfConfig":"24"},{"size":4244,"mtime":1635494969691,"results":"26","hashOfConfig":"24"},{"size":4208,"mtime":1646901683615,"results":"27","hashOfConfig":"24"},{"size":616,"mtime":1621235314060,"results":"28","hashOfConfig":"29"},{"size":9693,"mtime":1621242097206,"results":"30","hashOfConfig":"29"},{"size":7258,"mtime":1639037857730,"results":"31","hashOfConfig":"24"},{"size":9854,"mtime":1646901455835,"results":"32","hashOfConfig":"24"},{"size":3119,"mtime":1634191808754,"results":"33","hashOfConfig":"24"},{"size":1113,"mtime":1635407660514,"results":"34","hashOfConfig":"24"},{"size":4349,"mtime":1646815933499,"results":"35","hashOfConfig":"24"},{"size":861,"mtime":1635246075403,"results":"36","hashOfConfig":"24"},{"size":3260,"mtime":1635334661529,"results":"37","hashOfConfig":"24"},{"size":26134,"mtime":1646901675308,"results":"38","hashOfConfig":"24"},{"size":1907,"mtime":1635492860490,"results":"39","hashOfConfig":"24"},{"size":3548,"mtime":1635409410379,"results":"40","hashOfConfig":"24"},{"size":2989,"mtime":1635495718901,"results":"41","hashOfConfig":"24"},{"size":3399,"mtime":1646816404368,"results":"42","hashOfConfig":"24"},{"size":2456,"mtime":1646721857196,"results":"43","hashOfConfig":"24"},{"size":1408,"mtime":1646884084630,"results":"44","hashOfConfig":"24"},{"size":13280,"mtime":1646901618757,"results":"45","hashOfConfig":"24"},{"size":14804,"mtime":1646895235712,"results":"46","hashOfConfig":"24"},{"filePath":"47","messages":"48","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"1j0d8vf",{"filePath":"49","messages":"50","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"51","messages":"52","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"53","messages":"54","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"55","messages":"56","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"175njjo",{"filePath":"57","messages":"58","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"59","messages":"60","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"61","messages":"62","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"63","messages":"64","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"65","messages":"66","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"67","messages":"68","errorCount":3,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"source":null},{"filePath":"69","messages":"70","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"71","messages":"72","errorCount":13,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"source":null},{"filePath":"73","messages":"74","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"75","messages":"76","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"77","messages":"78","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"79","messages":"80","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"81","messages":"82","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"83","messages":"84","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"85","messages":"86","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"87","messages":"88","errorCount":1,"warningCount":2,"fixableErrorCount":0,"fixableWarningCount":0,"source":null},{"filePath":"89","messages":"90","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"/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_store.js",["91","92","93"],"/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",["94","95","96","97","98","99","100","101","102","103","104","105","106"],"/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",[],"/Users/yancheng/gm/gm-open-source/gm-printer/src/editor_purchase/context_menu.js",[],"/Users/yancheng/gm/gm-open-source/gm-printer/src/common/editor_customize_config.js",[],"/Users/yancheng/gm/gm-open-source/gm-printer/src/common/editor_edit_field.js",["107","108","109"],"/Users/yancheng/gm/gm-open-source/gm-printer/src/common/component.js",[],{"ruleId":"110","severity":2,"message":"111","line":10,"column":29,"nodeType":"112","endLine":10,"endColumn":35},{"ruleId":"110","severity":2,"message":"113","line":10,"column":43,"nodeType":"112","endLine":10,"endColumn":51},{"ruleId":"110","severity":2,"message":"113","line":147,"column":63,"nodeType":"112","endLine":147,"endColumn":71},{"ruleId":"110","severity":2,"message":"114","line":47,"column":13,"nodeType":"115","messageId":"116","endLine":47,"endColumn":22},{"ruleId":"110","severity":2,"message":"117","line":48,"column":30,"nodeType":"112","messageId":"116","endLine":48,"endColumn":36},{"ruleId":"110","severity":2,"message":"118","line":49,"column":31,"nodeType":"112","messageId":"116","endLine":49,"endColumn":47},{"ruleId":"110","severity":2,"message":"118","line":50,"column":21,"nodeType":"112","messageId":"116","endLine":50,"endColumn":37},{"ruleId":"110","severity":2,"message":"114","line":56,"column":13,"nodeType":"115","messageId":"116","endLine":56,"endColumn":22},{"ruleId":"110","severity":2,"message":"119","line":59,"column":20,"nodeType":"112","messageId":"116","endLine":59,"endColumn":32},{"ruleId":"110","severity":2,"message":"117","line":61,"column":23,"nodeType":"112","messageId":"116","endLine":61,"endColumn":29},{"ruleId":"110","severity":2,"message":"120","line":61,"column":30,"nodeType":"112","messageId":"116","endLine":61,"endColumn":34},{"ruleId":"110","severity":2,"message":"121","line":63,"column":15,"nodeType":"112","messageId":"116","endLine":63,"endColumn":19},{"ruleId":"110","severity":2,"message":"114","line":67,"column":23,"nodeType":"115","messageId":"116","endLine":67,"endColumn":32},{"ruleId":"110","severity":2,"message":"117","line":70,"column":32,"nodeType":"112","messageId":"116","endLine":70,"endColumn":38},{"ruleId":"110","severity":2,"message":"114","line":78,"column":13,"nodeType":"115","messageId":"116","endLine":78,"endColumn":22},{"ruleId":"110","severity":2,"message":"117","line":84,"column":42,"nodeType":"112","messageId":"116","endLine":84,"endColumn":48},{"ruleId":"122","severity":1,"message":"123","line":265,"column":13,"nodeType":"124","endLine":265,"endColumn":49},{"ruleId":"122","severity":1,"message":"123","line":283,"column":13,"nodeType":"124","endLine":283,"endColumn":56},{"ruleId":"125","severity":2,"message":"126","line":436,"column":22,"nodeType":"127","messageId":"128","endLine":436,"endColumn":31},"react/prop-types","'config' is missing in props validation","Identifier","'mockData' is missing in props validation","'editStore' is missing in props validation","Property","missingPropType","'editStore.config' is missing in props validation","'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","react/jsx-handler-names","Handler function for onChange prop key must begin with 'handle'","JSXAttribute","gmfe/i18n-check","t函数的key只能为字符串常量(Literal)，请使用单引号或双引号包裹","MemberExpression","isVariable"]

package/package.json

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

package/src/common/component.js

@@ -151,7 +151,7 @@ class TextPX extends React.Component {
     return (
       <Text
         value={nValue}
-        onChange={this.handleChange}
+        onChange={_.throttle(this.handleChange, 500)}
         style={{ width: '35px' }}
       />
     )

package/src/common/editor_customize_config.js

@@ -18,14 +18,19 @@ class EditorCutomizedConfig extends React.Component {
       editStore,
       editStore: { isAutoFilling }
     } = this.props
-    const { specialConfig } = editStore.computedTableSpecialConfig
+    const { dataKey } = editStore.computedTableSpecialConfig
     // 是table且具有specialConfig的附属table
-    if (editStore.computedRegionIsTable && !specialConfig) {
+    if (editStore.computedRegionIsTable && dataKey === 'orders_category') {
       return (
-        <Flex alignCenter className='gm-padding-top-5'>
-          <div>{i18next.t('行数是否自动填充')}：</div>
-          <Switch checked={isAutoFilling} onChange={this.handleAutoFilling} />
-        </Flex>
+        <>
+          <Flex alignCenter className='gm-padding-top-5'>
+            <div>{i18next.t('行数是否自动填充')}：</div>
+            <Switch checked={isAutoFilling} onChange={this.handleAutoFilling} />
+          </Flex>
+          <Flex className='gm-padding-top-5 gm-text-red' column>
+            {i18next.t('注意：填充仅支持单栏数据使用')}
+          </Flex>
+        </>
       )
     } else {
       return null

package/src/common/editor_edit_field.js

@@ -15,7 +15,7 @@ import {
   Title,
   TipInfo
 } from '../common/component'
-import { get } from 'mobx'
+import { get, toJS } from 'mobx'
 import PropTypes from 'prop-types'
 
 @inject('editStore')
@@ -184,7 +184,7 @@ class EditorField extends React.Component {
     const { specialConfig, subtotal } = editStore.computedTableSpecialConfig
     // 小计样式,specialConfig可能是undefined
     const specialStyle =
-      editStore.computedTableSpecialConfig?.specialConfig?.style || {}
+      toJS(editStore.computedTableSpecialConfig)?.specialConfig?.style || {}
     // 小计是否大写
     const specialTrNeedUpperCase =
       (specialConfig && specialConfig.needUpperCase) || false

package/src/common/editor_store.js

@@ -5,8 +5,6 @@ import _ from 'lodash'
 import { dispatchMsg, getBlockName, exchange } from '../util'
 import React from 'react'
 
-/** 默认填充的tr高度为23px */
-const TR_HEIGHT = 23
 class EditorStore {
   @observable
   tableCustomStyle = 'default'
@@ -111,7 +109,10 @@ class EditorStore {
   @action
   getFilledTableData(tableData) {
     if (!this.selectedRegion) return []
-    const tr_count = Math.floor(this.remainPageHeihgt / TR_HEIGHT)
+    const tr_count = Math.floor(
+      this.remainPageHeihgt / this.computedTableCustomerRowHeight
+    )
+
     const filledData = {
       _isEmptyData: true // 表示是填充的空白数据
     }
@@ -127,14 +128,13 @@ class EditorStore {
     const { dataKey } = this.computedTableSpecialConfig
     const table = this.mockData._table[dataKey]
     this.setAutoFillingConfig(isAutoFilling)
+
     if (isAutoFilling) {
       table.push(...this.getFilledTableData(table))
     } else {
       this.clearExtraTableData(dataKey)
-      this.setAutoFillRemainPage({ isAutoFilling: isAutoFilling })
       return
     }
-    this.setAutoFillRemainPage({ isAutoFilling: isAutoFilling })
     this.mockData._table[dataKey] = table
   }
 
@@ -645,7 +645,7 @@ class EditorStore {
   addFieldToTable({ key, value }) {
     if (this.computedRegionIsTable) {
       const arr = this.selectedRegion.split('.')
-      const { columns } = this.config.contents[arr[2]]
+      const { columns, dataKey } = this.config.contents[arr[2]]
 
       columns.push({
         head: key,
@@ -657,6 +657,9 @@ class EditorStore {
           textAlign: 'center'
         }
       })
+
+      this.clearExtraTableData(dataKey)
+      this.setAutoFillingConfig(false)
     }
   }
 
@@ -751,6 +754,7 @@ class EditorStore {
       table.dataKey = dataKey
       // 改变dataKey后做副作用action
       this.setTableDataKeyEffect(table, dataKey)
+      this.clearAllTableEmptyData()
     }
   }
 
@@ -786,6 +790,9 @@ class EditorStore {
           ...this.config.contents[arr[2]],
           customerRowHeight: val
         }
+        // // 用于触发printer更新最新的剩余高度
+        // this.setLineHeight(val)
+        this.setAutoFillingConfig(false)
       }
     }
   }
@@ -977,20 +984,20 @@ class EditorStore {
   }
 
   // 设置是否自动填充空白
-  @action.bound
-  setAutoFillRemainPage(modify) {
-    if (this.computedRegionIsTable) {
-      const tableConfig = this.computedTableSpecialConfig
-      const extraSpecialConfig = tableConfig.extraSpecialConfig
-      if (extraSpecialConfig) {
-        set(extraSpecialConfig, modify)
-      } else {
-        set(tableConfig, { extraSpecialConfig: { ...modify } })
-      }
-    }
-    // 这么写才会触发子组件的更新
-    this.config = Object.assign({}, this.config)
-  }
+  // @action.bound
+  // setAutoFillRemainPage(modify) {
+  //   if (this.computedRegionIsTable) {
+  //     const tableConfig = this.computedTableSpecialConfig
+  //     const extraSpecialConfig = tableConfig.extraSpecialConfig
+  //     if (extraSpecialConfig) {
+  //       set(extraSpecialConfig, modify)
+  //     } else {
+  //       set(tableConfig, { extraSpecialConfig: { ...modify } })
+  //     }
+  //   }
+  //   // 这么写才会触发子组件的更新
+  //   this.config = Object.assign({}, this.config)
+  // }
 
   @action.bound
   setSummaryConfig(modify) {
@@ -1009,15 +1016,17 @@ class EditorStore {
         }
         set(config, { summaryConfig: { ...init, ...modify } })
       }
-
       if ('pageSummaryShow' in modify || 'totalSummaryShow' in modify) {
         // 切换的时候，要把对应table的多余空数据清掉
         this.clearExtraTableData(config.dataKey)
       }
-
       this.config = toJS(this.config)
     }
-    this.setAutoFillingConfig(false)
+
+    // 如果只是勾选要展示的合计类目的选项，则不需要执行以下操作， 否则会重复清空数据
+    if (!('summaryColumns' in modify && 'style' in modify)) {
+      this.setAutoFillingConfig(false)
+    }
   }
 }
 

package/src/editor/context_menu.js

@@ -127,9 +127,10 @@ class ContextMenu extends React.Component {
           selected={editStore.selected}
           selectedRegion={editStore.selectedRegion}
           isAutoFilling={editStore.isAutoFilling}
+          lineheight={editStore.computedTableCustomerRowHeight}
           config={editStore.config}
           data={editStore.mockData}
-          getremainpageheight={editStore.setRemainPageHeight}
+          getremainpageHeight={editStore.setRemainPageHeight}
         />
       </CommonContextMenu>
     )

package/src/printer/printer.js

@@ -76,10 +76,15 @@ class Printer extends React.Component {
       await this.props.printerStore.setReady(true)
       await this.props.printerStore.computedPages()
     }
+    if (nextProps.lineheight !== this.props.lineheight) {
+      await this.props.getremainpageHeight(
+        this.props.printerStore.remainPageHeight
+      )
+    }
   }
 
   componentDidMount() {
-    const { printerStore, config, getremainpageheight } = this.props
+    const { printerStore, config, getremainpageHeight } = this.props
     const batchPrintConfig = config.batchPrintConfig
     // 连续打印不需要计算
     if (batchPrintConfig !== 2) {
@@ -90,7 +95,7 @@ class Printer extends React.Component {
       printerStore.computedPages()
 
       // 获取剩余空白高度，传到editor
-      getremainpageheight && getremainpageheight(printerStore.remainPageHeight)
+      getremainpageHeight && getremainpageHeight(printerStore.remainPageHeight)
     }
     // Printer 不是立马就呈现出最终样式，有个过程。这个过程需要时间，什么 ready，不太清楚，估借 setState 来获取过程结束时刻
     this.setState({}, () => {
@@ -300,10 +305,11 @@ Printer.propTypes = {
   selected: PropTypes.string,
   selectedRegion: PropTypes.string,
   isAutoFilling: PropTypes.bool,
+  lineheight: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
   data: PropTypes.object.isRequired,
   config: PropTypes.object.isRequired,
   onReady: PropTypes.func,
-  getremainpageheight: PropTypes.func
+  getremainpageHeight: PropTypes.func
 }
 
 Printer.defaultProps = {
@@ -317,6 +323,7 @@ class WithStorePrinter extends React.Component {
   }
 
   render() {
+    console.log('this.props', { ...this.props })
     return (
       <Provider printerStore={this.printerStore}>
         <Printer {...this.props} />

package/src/printer/store.js

@@ -90,11 +90,16 @@ class PrinterStore {
     this.ready = ready
   }
 
-  get tableData() {
-    if (!this.selectedRegion) return []
+  get tableConfig() {
+    if (!this.selectedRegion) return {}
     const arr = this.selectedRegion.split('.')
     const tableConfig = this.config.contents[arr[2]]
-    const { dataKey } = tableConfig
+    return tableConfig
+  }
+
+  get tableData() {
+    if (!this.selectedRegion) return []
+    const { dataKey } = this.tableConfig
 
     /** 当前数据 */
     return this.data._table[dataKey] || []
@@ -116,14 +121,20 @@ class PrinterStore {
     this.selectedRegion = selected || null
   }
 
-  getNormalTableBodyHeights(heights) {
+  getNormalTableBodyHeights(heights, dataKey = 'orders_category') {
     const hasEmptyData = this.tableData.some(x => x._isEmptyData)
-    if (hasEmptyData && !this.isAutoFilling) {
+    const isOrderCategroy = dataKey === 'orders_category'
+    const { customerRowHeight = TR_BASE_HEIGHT } = this.tableConfig
+
+    if (hasEmptyData && !this.isAutoFilling && isOrderCategroy) {
       // 如果tableData有填充的空数据， 则去掉
       return heights.slice(0, -this.filledTableLen)
-    } else if (this.isAutoFilling) {
+    } else if (this.isAutoFilling && isOrderCategroy) {
       // 如果没有空数据，且isAutofilling是true,即选择了要填充数据
-      return [...heights, ...Array(this.filledTableLen).fill(TR_BASE_HEIGHT)]
+      return [
+        ...heights,
+        ...Array(this.filledTableLen).fill(_.toNumber(customerRowHeight))
+      ]
     } else {
       // 正常情况
       return heights
@@ -220,7 +231,11 @@ class PrinterStore {
           .minus(currentPageHeight)
           .toFixed(2)
 
-        const heights = this.getNormalTableBodyHeights(table.body.heights)
+        const heights = this.getNormalTableBodyHeights(
+          table.body.heights,
+          dataKey
+        )
+
         // 表格行的索引,用于table.slice(begin, end), 分割到不同页面中
         let begin = 0
         let end = 0