gm-printer 10.13.2-alpha.4 → 10.13.4

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":8813,"mtime":1635407151058,"results":"19","hashOfConfig":"20"},{"size":11331,"mtime":1635840914984,"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":5902,"mtime":1635841462986,"results":"27","hashOfConfig":"20"},{"size":9290,"mtime":1635495353385,"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":8813,"mtime":1635407151058,"results":"19","hashOfConfig":"20"},{"size":11655,"mtime":1636081549102,"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":5923,"mtime":1636025210364,"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.2-alpha.4",
+  "version": "10.13.4",
   "description": "diy printer",
   "main": "src/index.js",
   "scripts": {

package/src/common/editor_add_field.js

@@ -1,8 +1,8 @@
 import i18next from '../../locales'
 import React, { Fragment } from 'react'
 import PropTypes from 'prop-types'
-import { Gap, SubTitle, Title, FieldBtn } from '../common/component'
 import { Flex } from '../components'
+import { Gap, SubTitle, Title, FieldBtn } from '../common/component'
 import _ from 'lodash'
 import { observer, inject } from 'mobx-react'
 

package/src/common/editor_page_summary.js

@@ -25,7 +25,7 @@ class SummarySetting extends React.Component {
   handlePageSummaryColumns = e => {
     const { editStore } = this.props
     const { summaryConfig } = editStore.computedTableSpecialConfig
-    // 由于初始模板没有summary 这个object，为了UI响应数据，只能这么写了
+    // 由于初始末班没有summary 这个object，为了UI响应数据，只能这么写了
     const hasSummaryConfig = has(
       editStore.computedTableSpecialConfig,
       'summaryConfig'

package/src/common/editor_special_field.js

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

package/src/common/editor_store.js

@@ -4,54 +4,20 @@ import { pageTypeMap } from '../config'
 import _ from 'lodash'
 import { dispatchMsg, getBlockName, exchange } from '../util'
 
-/** 默认填充的tr高度为23px */
-const TR_HEIGHT = 23
 class EditorStore {
   @observable
   tableCustomStyle = 'default'
 
-  @observable
-  emptyTableData = []
-
-  @observable
-  config = null
-
-  @observable
-  mockData = []
-
-  @observable
-  remainPageHeihgt = 0
-
-  // 初始模板
-  originConfig = null
-
-  // 一个能唯一标识某个东西的字符串
-  // header
-  // header.block.1
-  // contents.panel.1.block.1
-  // contents.table.2.column.1
-  @observable
-  selected = null
-
-  /* 选择中区域, 区域唯一标识字符串
-     header
-     footer
-     sign
-     contents.panel.n
-     contents.table.n
-   */
-  @observable
-  selectedRegion = null
-
-  @observable
-  insertPanel = 'header'
-
-  defaultTableDataKey = 'orders'
-
-  // 默认table的dataKey
-  setTableDataKeyEffect() {} // 改变dataKey后,做的副作用操作
-
-  defaultTableSubtotal = { show: false }
+  @action.bound
+  changeTableCustomStyle(v) {
+    if (this.selectedRegion) {
+      const arr = this.selectedRegion.split('.')
+      if (arr.includes('table')) {
+        this.config.contents[arr[2]].className = v
+        this.tableCustomStyle = v
+      }
+    }
+  }
 
   @computed
   get computedPrinterKey() {
@@ -82,71 +48,48 @@ class EditorStore {
     }).join('_')
   }
 
-  @action.bound
-  changeTableCustomStyle(v) {
-    if (this.selectedRegion) {
-      const arr = this.selectedRegion.split('.')
-      if (arr.includes('table')) {
-        this.config.contents[arr[2]].className = v
-        this.tableCustomStyle = v
-      }
-    }
-  }
+  @observable
+  config = null
 
-  @action.bound
-  setRemainPageHeight(remainHeight) {
-    this.remainPageHeihgt = remainHeight
-  }
+  // 初始模板
+  originConfig = null
 
-  @action
-  getFilledTableData(tableData) {
-    if (!this.selectedRegion) return []
-    const tr_count = Math.floor(this.remainPageHeihgt / TR_HEIGHT)
-    const filledData = {}
-    _.map(tableData[0], (val, key) => {
-      filledData[key] = ''
-    })
-    return Array(tr_count).fill(filledData)
-  }
+  // 一个能唯一标识某个东西的字符串
+  // header
+  // header.block.1
+  // contents.panel.1.block.1
+  // contents.table.2.column.1
+  @observable
+  selected = null
 
-  @action.bound
-  handleChangeTableData(isAutoFilling = false) {
-    if (!this.selectedRegion) return
-    const { dataKey } = this.computedTableSpecialConfig
-    const table = this.mockData._table[dataKey]
-    // debugger
-    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
-    // this.mockData = Object.assign({}, this.mockData)
-  }
+  /* 选择中区域, 区域唯一标识字符串
+     header
+     footer
+     sign
+     contents.panel.n
+     contents.table.n
+   */
+  @observable
+  selectedRegion = null
 
-  @action
-  clearExtraTableData(dataKey) {
-    const { extraSpecialConfig } = this.computedTableSpecialConfig
-    if (extraSpecialConfig && !extraSpecialConfig?.isAutoFilling) return
-    const table = this.mockData._table[dataKey]
-    const len = this.getFilledTableData(table).length
-    if (len === 0) return
-    const newTable = this.mockData._table[dataKey].slice(0, -len)
-    this.mockData._table[dataKey] = newTable
-  }
+  @observable
+  insertPanel = 'header'
+
+  defaultTableDataKey = 'orders'
+
+  // 默认table的dataKey
+  setTableDataKeyEffect() {} // 改变dataKey后,做的副作用操作
+
+  defaultTableSubtotal = { show: false }
 
   @action
-  init(config, data) {
+  init(config) {
     // batchPrintConfig: 1 不连续打印（一张采购单不出现多供应商）2 连续打印（一张采购单可能出现多个供应商）
     this.config = Object.assign({ batchPrintConfig: 1 }, config)
     this.originConfig = config
     this.selected = null
     this.selectedRegion = null
     this.insertPanel = 'header'
-    this.mockData = data
   }
 
   @action
@@ -459,9 +402,6 @@ class EditorStore {
   setSubtotalShow(name) {
     const arr = name.split('.')
     const table = this.config.contents[arr[2]]
-
-    // 切换的时候，要把对应table的多余空数据清掉
-    this.clearExtraTableData(table.dataKey)
     table.subtotal.show = !table.subtotal.show
   }
 
@@ -492,8 +432,6 @@ class EditorStore {
       o => o === 'category',
       o => o === 'orders'
     ])
-    // 切换的时候，要把对应table的多余空数据清掉
-    this.clearExtraTableData(dataKey)
 
     this.config.contents[arr[2]].dataKey = newDataKey.join('_')
   }
@@ -928,22 +866,6 @@ 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
   setSummaryConfig(modify) {
     if (this.selectedRegion) {
@@ -961,12 +883,6 @@ class EditorStore {
         }
         set(config, { summaryConfig: { ...init, ...modify } })
       }
-
-      if ('pageSummaryShow' in modify || 'totalSummaryShow' in modify) {
-        // 切换的时候，要把对应table的多余空数据清掉
-        this.clearExtraTableData(config.dataKey)
-      }
-
       this.config = toJS(this.config)
     }
   }

package/src/common/editor_title.js

@@ -53,14 +53,14 @@ class EditorTitle extends React.Component {
   }
 
   handleReset = () => {
-    const { editStore, mockData } = this.props
+    const { editStore } = this.props
     // 重置模板配置,但是保留原来模板名字
     const config = {
       ...editStore.originConfig,
       __key__: Date.now(), // 时间戳的key,直接让页面重新渲染!
       name: editStore.config.name
     }
-    editStore.init(config, mockData)
+    editStore.init(config)
   }
 
   handleTestPrint = () => {

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, props.mockData)
+      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,10 +100,10 @@ const withStore = store => WrapComponent =>
       }
     }
 
-    render() {
+    render () {
       return (
         <Provider editStore={this.store} mockData={this.props.mockData}>
-          <WrapComponent {...this.props} />
+          <WrapComponent {...this.props}/>
         </Provider>
       )
     }

package/src/editor/context_menu.js

@@ -1,10 +1,10 @@
 import i18next from '../../locales'
 import React from 'react'
-import PropTypes from 'prop-types'
 import CommonContextMenu from '../common/common_context_menu'
 import { inject, observer } from 'mobx-react'
 import _ from 'lodash'
 import { Printer } from '../printer'
+import { noSubtotalBtnTableDataKeySet } from './editor'
 
 const blockTypeList = [
   { value: '', text: i18next.t('插入文本') },
@@ -19,7 +19,10 @@ const blockTypeList = [
   }
 ]
 
-@inject('editStore')
+@inject(stores => ({
+  editStore: stores.editStore,
+  mockData: stores.mockData
+}))
 @observer
 class ContextMenu extends React.Component {
   /**
@@ -49,28 +52,18 @@ class ContextMenu extends React.Component {
     editStore.setSubtotalShow(name)
   }
 
-  handleChangeTableData = isAutoFilling => {
-    const { editStore } = this.props
-    editStore.handleChangeTableData(isAutoFilling)
-  }
-
   renderOrderActionBtn = name => {
     if (!this.hasSubtotalBtn(name)) {
       return null
     }
 
     const arr = name.split('.')
-    const {
-      dataKey,
-      subtotal,
-      extraSpecialConfig
-    } = this.props.editStore.config.contents[arr[2]]
+    const { dataKey, subtotal } = this.props.editStore.config.contents[arr[2]]
     const keyArr = dataKey.split('_')
 
     const isMultiActive = keyArr.includes('multi')
     const isCategoryActive = keyArr.includes('category')
     const isSubtotalActive = subtotal.show
-    const isAutoFilling = extraSpecialConfig?.isAutoFilling
 
     return (
       <>
@@ -92,18 +85,12 @@ class ContextMenu extends React.Component {
         >
           {i18next.t('每页合计')}
         </div>
-        <div
-          onClick={this.handleChangeTableData.bind(this, !isAutoFilling)}
-          className={isAutoFilling ? 'active' : ''}
-        >
-          {i18next.t('行数填充')}
-        </div>
       </>
     )
   }
 
   render() {
-    const { editStore } = this.props
+    const { editStore, mockData } = this.props
     return (
       <CommonContextMenu
         renderTableAction={this.renderOrderActionBtn}
@@ -114,17 +101,11 @@ class ContextMenu extends React.Component {
           selected={editStore.selected}
           selectedRegion={editStore.selectedRegion}
           config={editStore.config}
-          data={editStore.mockData}
-          getremainpageheight={editStore.setRemainPageHeight}
+          data={mockData}
         />
       </CommonContextMenu>
     )
   }
 }
 
-ContextMenu.propTypes = {
-  editStore: PropTypes.object,
-  mockData: PropTypes.object
-}
-
 export default ContextMenu

package/src/editor/editor.js

@@ -11,7 +11,6 @@ import SpecialField from '../common/editor_special_field'
 import EditorField from '../common/editor_edit_field'
 import EditorAddField from '../common/editor_add_field'
 import EditorPageSummary from '../common/editor_page_summary'
-import EditorCutomizedConfig from '../common/editor_customize_config'
 import ContextMenu from './context_menu'
 import i18next from '../../locales'
 import withStore from '../common/hoc_with_store'
@@ -78,14 +77,13 @@ class Editor extends React.Component {
             <EditorSelect />
             <Gap height='5px' />
             <SpecialField addFields={addFields} mockData={mockData} />
-            <EditorCutomizedConfig />
             <Gap height='5px' />
             <EditorField
               tableDataKeyList={tableDataKeyList}
               showNewDate={showNewDate}
             />
             <Gap height='5px' />
-            <EditorAddField addFields={addFields} />
+            <EditorAddField addFields={addFields} mockData={mockData} />
             <Gap height='5px' />
             <EditorPageSummary summaryFields={addFields.summaryFields} />
 

package/src/editor_account/context_menu.js

@@ -1,6 +1,5 @@
 import i18next from '../../locales'
 import React from 'react'
-import PropTypes from 'prop-types'
 import CommonContextMenu from '../common/common_context_menu'
 import { inject, observer } from 'mobx-react'
 import _ from 'lodash'
@@ -45,28 +44,18 @@ class ContextMenu extends React.Component {
     editStore.setSubtotalShow(name)
   }
 
-  handleChangeTableData = isAutoFilling => {
-    const { editStore } = this.props
-    editStore.handleChangeTableData(isAutoFilling)
-  }
-
   renderOrderActionBtn = name => {
     if (!this.hasSubtotalBtn(name)) {
       return null
     }
 
     const arr = name.split('.')
-    const {
-      dataKey,
-      subtotal,
-      extraSpecialConfig
-    } = this.props.editStore.config.contents[arr[2]]
+    const { dataKey, subtotal } = this.props.editStore.config.contents[arr[2]]
     const keyArr = dataKey.split('_')
 
     // const isMultiActive = keyArr.includes('multi')
     // const isCategoryActive = keyArr.includes('category')
     const isSubtotalActive = subtotal.show
-    const isAutoFilling = extraSpecialConfig?.isAutoFilling
 
     return (
       <>
@@ -88,12 +77,6 @@ class ContextMenu extends React.Component {
         >
           {i18next.t('每页合计')}
         </div>
-        <div
-          onClick={this.handleChangeTableData.bind(this, !isAutoFilling)}
-          className={isAutoFilling ? 'active' : ''}
-        >
-          {i18next.t('行数填充')}
-        </div>
       </>
     )
   }
@@ -110,17 +93,11 @@ class ContextMenu extends React.Component {
           selected={editStore.selected}
           selectedRegion={editStore.selectedRegion}
           config={editStore.config}
-          data={editStore.mockData}
-          getremainpageheight={editStore.setRemainPageHeight}
+          data={mockData}
         />
       </CommonContextMenu>
     )
   }
 }
 
-ContextMenu.propTypes = {
-  editStore: PropTypes.object,
-  mockData: PropTypes.object
-}
-
 export default ContextMenu

package/src/editor_account/editor.js

@@ -9,7 +9,6 @@ import EditorTitle from '../common/editor_title'
 import EditorSelect from '../common/editor_select'
 import EditorField from '../common/editor_edit_field'
 import EditorAddField from '../common/editor_add_field'
-import EditorCutomizedConfig from '../common/editor_customize_config'
 import ContextMenu from './context_menu'
 import i18next from '../../locales'
 import withStore from '../common/hoc_with_store'
@@ -20,6 +19,7 @@ import withStore from '../common/hoc_with_store'
 class Editor extends React.Component {
   render() {
     const { onSave, showEditor, addFields, showNewDate } = this.props
+
     return (
       <div className='gm-printer-edit'>
         <Flex className='gm-printer-edit-title-fixed'>
@@ -55,8 +55,6 @@ class Editor extends React.Component {
             <Gap height='10px' />
             <EditorSelect />
             <Gap height='5px' />
-            <EditorCutomizedConfig />
-            <Gap height='5px' />
             <EditorField showNewDate={showNewDate} />
             <Gap height='5px' />
             <EditorAddField addFields={addFields} />

package/src/printer/do_print.js

@@ -97,7 +97,6 @@ function doPrint({ data, config }, isTest) {
 
   return toDoPrint({ data, config })
 }
-
 function doBatchPrint(
   list,
   isTest,

package/src/printer/printer.js

@@ -3,7 +3,7 @@ import React from 'react'
 import classNames from 'classnames'
 import { inject, observer, Provider } from 'mobx-react'
 import PropTypes from 'prop-types'
-import PrinterStore, { TR_BASE_HEIGHT } from './store'
+import PrinterStore from './store'
 import Page from './page'
 import _ from 'lodash'
 import Panel from './panel'
@@ -60,6 +60,7 @@ class Printer extends React.Component {
 
     // 无实际意义，辅助 onReady，见 didMount
     this.state = {}
+
     props.printerStore.init(props.config, props.data)
     props.printerStore.setSelected(props.selected)
     props.printerStore.setSelectedRegion(props.selectedRegion)
@@ -75,8 +76,9 @@ class Printer extends React.Component {
   }
 
   componentDidMount() {
-    const { printerStore, config, getremainpageheight } = this.props
+    const { printerStore, config } = this.props
     const batchPrintConfig = config.batchPrintConfig
+
     // 连续打印不需要计算
     if (batchPrintConfig !== 2) {
       // didMount 代表第一次渲染完成
@@ -84,12 +86,6 @@ class Printer extends React.Component {
 
       // 开始计算，获取各种数据
       printerStore.computedPages()
-
-      // 计算是否填充空白数据
-      printerStore.fillEmptyPage()
-
-      // 获取剩余空白高度，传到editor
-      getremainpageheight && getremainpageheight(printerStore.remainPageHeight)
     }
     // Printer 不是立马就呈现出最终样式，有个过程。这个过程需要时间，什么 ready，不太清楚，估借 setState 来获取过程结束时刻
     this.setState({}, () => {
@@ -140,7 +136,8 @@ class Printer extends React.Component {
 
   renderPage() {
     const { printerStore } = this.props
-    const { config, remainPageHeight } = printerStore
+    const { config } = printerStore
+
     return (
       <>
         {_.map(printerStore.pages, (page, i) => {
@@ -151,12 +148,6 @@ class Printer extends React.Component {
               <Header config={config.header} pageIndex={i} />
 
               {_.map(page, (panel, ii) => {
-                const { extraSpecialConfig } = config.contents[panel.index]
-                const end =
-                  isLastPage && extraSpecialConfig?.isAutoFilling
-                    ? panel.end + Math.floor(remainPageHeight / TR_BASE_HEIGHT)
-                    : panel.end
-
                 switch (panel.type) {
                   case 'table':
                     return (
@@ -166,7 +157,7 @@ class Printer extends React.Component {
                         config={config.contents[panel.index]}
                         range={{
                           begin: panel.begin,
-                          end: end
+                          end: panel.end
                         }}
                         placeholder={`${i18next.t('区域')} ${panel.index}`}
                         pageIndex={i}
@@ -257,6 +248,7 @@ class Printer extends React.Component {
   render() {
     const {
       selected,
+      data,
       config,
       onReady,
       selectedRegion,
@@ -294,8 +286,7 @@ Printer.propTypes = {
   selectedRegion: PropTypes.string,
   data: PropTypes.object.isRequired,
   config: PropTypes.object.isRequired,
-  onReady: PropTypes.func,
-  getremainpageheight: PropTypes.func
+  onReady: PropTypes.func
 }
 
 Printer.defaultProps = {

package/src/printer/store.js

@@ -8,7 +8,6 @@ import {
 import _ from 'lodash'
 import Big from 'big.js'
 
-export const TR_BASE_HEIGHT = 23
 const price = (n, f = 2) => Big(n || 0).toFixed(f)
 class PrinterStore {
   @observable ready = false
@@ -26,9 +25,6 @@ class PrinterStore {
 
   @observable pages = [] // [{type, index, begin, end}]
 
-  /** 当前页剩余空白高度 */
-  @observable remainPageHeight = 0
-
   data = {}
 
   // 选中某个东西，具体见 edit/store.js 定义
@@ -81,6 +77,32 @@ class PrinterStore {
     this.selectedRegion = selected || null
   }
 
+  @action
+  computedData(dataKey, table, end, currentRemainTableHeight) {
+    /** 当前数据 */
+    const tableData = this.data._table[dataKey] || []
+    /** 明细data */
+    const detailsData = tableData[end]?.__details || []
+    const { ranges, detailsPageHeight } = caclSingleDetailsPageHeight(
+      table,
+      detailsData,
+      currentRemainTableHeight
+    )
+
+    // 分局明细拆分后的数据
+    const splitTableData = _.map(ranges, range => {
+      const _tableData = Object.assign({}, tableData[end])
+      _tableData.__details = detailsData.slice(...range)
+      return _tableData
+    })
+
+    // 插入原table数据中
+    tableData.splice(end, 1, ...splitTableData)
+    this.data._table[dataKey] = tableData
+
+    return detailsPageHeight
+  }
+
   @action
   computedPages() {
     // 每页必有 页眉header, 页脚footer
@@ -90,15 +112,13 @@ class PrinterStore {
       return
     }
 
-    // 某一page的累计高度
+    /** 某一page的累积已填充的高度 */
     let currentPageHeight = allPagesHaveThisHeight
-    /** 区域1的高度 */
-    let firstPagePanel0Height = 0
     // 当前在处理 contents 的索引
     let index = 0
-    // 一页承载的内容. [object, object, ...]
+    /** 一页承载的内容. [object, object, ...] */
     let page = []
-    // 处理配送单有多个表格的情况
+    /** 处理配送单有多个表格的情况 */
     let tableCount = 0
     /* --- 遍历 contents,将内容动态分配到page --- */
     while (index < this.config.contents.length) {
@@ -122,12 +142,13 @@ class PrinterStore {
         // 每个表格都具有的高度
         const allTableHaveThisHeight =
           table.head.height + subtotalTrHeight + pageSummaryTrHeight
-        // 当前表格页面的最少高度
+        /** 当前page页面的最小高度 */
         const currentPageMinimumHeight =
           allPagesHaveThisHeight + allTableHaveThisHeight
-
-        // 当前数据
-        const tableData = this.data._table[dataKey] || []
+        /** 当前page可容纳的table高度 */
+        let pageAccomodateTableHeight = +new Big(this.pageHeight)
+          .minus(currentPageHeight)
+          .toFixed(2)
 
         // 表格行的索引,用于table.slice(begin, end), 分割到不同页面中
         let begin = 0
@@ -137,18 +158,47 @@ class PrinterStore {
         if (table.body.heights.length === 0) {
           index++
         } else {
+          /** 仅计算当前页table的累积高度 */
+          let currentTableHeight = allTableHaveThisHeight
           // 表格有数据,添加[每个表格都具有的高度]
           currentPageHeight += allTableHaveThisHeight
+          /** 当前table剩余的高度 */
+          let currentRemainTableHeight = 0
+          /** 去最小的tr高度，用于下面的计算compare */
+          const minHeight = Math.min(...table.body.heights)
 
-          /* 遍历表格每一行 */
+          /* 遍历表格每一行，填充表格内容 */
           while (end < table.body.heights.length) {
+            currentTableHeight += table.body.heights[end]
+            // 用于计算最后一页有footer情况的高度
             currentPageHeight += table.body.heights[end]
-
             // 当前页没有多余空间
-            if (currentPageHeight > this.pageHeight) {
-              // 第一条数据计算时，不能加上header的高度
-              const calcHeight = this.pageHeight - firstPagePanel0Height
-              // 第一条就极端会有问题
+            if (currentTableHeight > pageAccomodateTableHeight) {
+              currentRemainTableHeight = +Big(pageAccomodateTableHeight)
+                .minus(currentTableHeight)
+                .plus(table.body.heights[end])
+
+              /**
+               * 说明： 1. currentRemainTableHeight > minHeight 要比最小度高高，不然每次到这都进入if
+               * 2. table.body.heights[end]至少要是currentRemainTableHeight的 2倍，怕出现打印时最后一行文字显示一半的情况
+               * 3. table.body.heights[end] 高度超过了 pageAccomodateTableHeight
+               */
+              if (
+                (currentRemainTableHeight > minHeight &&
+                  table.body.heights[end] / minHeight > 2) ||
+                table.body.heights[end] > pageAccomodateTableHeight
+              ) {
+                const detailsPageHeight = this.computedData(
+                  dataKey,
+                  table,
+                  end,
+                  currentRemainTableHeight
+                )
+                // 拆分明细后，同时也要更新body.heights 不能影响后续计算
+                table.body.heights.splice(end, 1, ...detailsPageHeight)
+                end++
+              }
+              // 第一条极端会有问题
               if (end !== 0) {
                 page.push({
                   type: 'table',
@@ -167,55 +217,12 @@ class PrinterStore {
                 page = []
               }
 
-              // ‼️‼️‼️ 极端情况: 如果一行的高度 大于 页面高度, 那么就对明细进行分页
-              if (
-                table.body.heights[end] + currentPageMinimumHeight >
-                this.pageHeight
-              ) {
-                /** 明细data */
-                const detailsData = tableData[end]?.__details || []
-                const heightParams = {
-                  currentPageMinimumHeight: currentPageMinimumHeight,
-                  calcHeight: calcHeight,
-                  pageHeight: this.pageHeight
-                }
-                const {
-                  ranges,
-                  detailsPageHeight
-                } = caclSingleDetailsPageHeight(
-                  end,
-                  table,
-                  detailsData,
-                  heightParams
-                )
-                // 分局明细拆分后的数据
-                const splitTableData = _.map(ranges, range => {
-                  // 当前行的table数据
-                  const _tableData = Object.assign({}, tableData[end])
-                  _tableData.__details = detailsData.slice(...range)
-                  return _tableData
-                })
-                // 插入原table数据中
-                tableData.splice(end, 1, ...splitTableData)
-                // 更新
-                this.data._table[dataKey] = tableData
-
-                // 同时也要更新body.heights 不能影响后续计算
-                table.body.heights.splice(end, 1, ...detailsPageHeight)
-
-                page.push({
-                  type: 'table',
-                  index,
-                  begin: end,
-                  end: ++end
-                })
-                // 此页完成任务
-                this.pages.push(page)
-                page = []
-              }
-
               begin = end
               // 开启新一页,重置页面高度
+              pageAccomodateTableHeight = +new Big(this.pageHeight).minus(
+                currentPageMinimumHeight
+              )
+              currentTableHeight = allTableHaveThisHeight
               currentPageHeight = currentPageMinimumHeight
             } else {
               // 有空间，继续做下行
@@ -243,11 +250,6 @@ class PrinterStore {
           break
         }
 
-        if (index === 0) {
-          // 针对极端情况下，保存区域1的高度
-          firstPagePanel0Height = panelHeight
-        }
-
         if (currentPageHeight <= this.pageHeight) {
           // 空间充足，把信息加入 page，并轮下一个contents
           page.push({
@@ -267,44 +269,6 @@ class PrinterStore {
       }
     }
     this.pages.push(page)
-    this.remainPageHeight = +Big(this.pageHeight - currentPageHeight).toFixed(0)
-  }
-
-  // 计算初始化是否填充tableData
-  @action.bound
-  fillEmptyPage() {
-    const { contents } = this.config
-    // 或许存在多个table
-    const tableConfigs = _.find(contents, item => {
-      if (item.extraSpecialConfig) return item
-    })
-    // 兼容没有extraSpecialConfig配置的
-    if (!tableConfigs) return
-
-    const { extraSpecialConfig, dataKey } = tableConfigs
-    let table = this.data._table[dataKey]
-
-    if (tableConfigs?.extraSpecialConfig?.isAutoFilling) {
-      if (extraSpecialConfig.isAutoFilling) {
-        table.push(...this.getFilledTableData(table))
-      } else {
-        const len = this.getFilledTableData(table).length
-        const newTable = this.data._table[dataKey].slice(0, -len)
-        table = newTable
-      }
-    }
-    this.data._table[dataKey] = table
-    this.data = Object.assign({}, this.data)
-  }
-
-  @action.bound
-  getFilledTableData(tableData) {
-    const tr_count = Math.floor(this.remainPageHeight / TR_BASE_HEIGHT)
-    const filledData = {}
-    _.map(tableData[0], (val, key) => {
-      filledData[key] = ''
-    })
-    return Array(tr_count).fill(filledData)
   }
 
   template(text, pageIndex) {
@@ -366,6 +330,24 @@ class PrinterStore {
           ? filterList(detailsList)
           : filterList(detailsList, 'noLineBreak')
 
+      // 兼容之前已经添加上最后一列的模板
+      // if (!detailLastColType) {
+      //   detailsList = detailsList
+      //     ? detailsList.map(d => `<div> ${compiled(d)} </div>`).join('')
+      //     : []
+      // } else {
+      //   // 多栏商品时，同一行仅有一个商品，后面空余部分显示空白
+      //   if (detailsList) {
+      //     // detailLastColType ---> 区分采购明细单列——最后一列是否换行
+      //     detailsList =
+      //       detailLastColType === 'purchase_last_col'
+      //         ? detailsList.map(d => `<div> ${compiled(d)} </div>`).join('')
+      //         : detailsList.map(d => `${compiled(d)}`).join(separator)
+      //   } else {
+      //     detailsList = []
+      //   }
+      // }
+
       return detailsList
     } catch (err) {
       return text

package/src/printer/table.js

@@ -288,6 +288,7 @@ class Table extends React.Component {
     dataKey = getDataKey(dataKey, arrange)
     const tableData = printerStore.data._table[dataKey] || []
     const active = printerStore.selectedRegion === name
+
     return (
       <div
         ref={this.ref}

package/src/util.js

@@ -181,47 +181,37 @@ const getDataKey = (dataKey, arrange) =>
 /**
  * @param {*} table 当前单据的高度信息
  * @param {*} detailsData 当前所有tablelist
- * @param {*} currentPageMinimumHeight 当前page最小高度
- * @param {*} pageHeight page的高度
+ * @param {*} curRemainPageHeight 可容纳table的总高度
  * @returns {ranges, detailsPageHeight} detailsPageHeight 每页高度合集
  */
 const caclSingleDetailsPageHeight = (
-  indexEnd,
   table,
   detailsData,
-  heightParams
+  curRemainPageHeight
 ) => {
-  let end = 0
-  let begin = 0
-  let index = 0
-  let currentDetailsMiniHeight = 0
+  let [end, deadline] = [0, 0]
+  const begin = 0
+  /** 当前明细高度，默认为tr的border+padding的height */
+  let currentDetailsMiniHeight = 5
   const ranges = []
   const detailsPageHeight = []
-  const { calcHeight, pageHeight, currentPageMinimumHeight } = heightParams
+  /** 未进行计算的高度，留到下一次, 默认为tr的border+padding的height */
+  let remainDetailsHeight = 5
 
+  // 如果当前累计高度高于当前剩余高度，则跳出返回
   while (end < detailsData.length) {
-    currentDetailsMiniHeight += table.body.children[end]
-
-    const _calcHeight = !index && indexEnd === 0 ? calcHeight : pageHeight
-    // 如果当前明细高度综合大于页面高度，到此为止进行分页
-    if (currentDetailsMiniHeight + currentPageMinimumHeight > _calcHeight) {
-      detailsPageHeight.push(
-        currentDetailsMiniHeight - table.body.children[end]
-      )
-      ranges.push([begin, end])
-      end++
-      index++
-      begin = end
-      currentDetailsMiniHeight = 0
+    if (currentDetailsMiniHeight < curRemainPageHeight) {
+      currentDetailsMiniHeight += table.body.children[end]
+      deadline = end
     } else {
-      end++
-      if (end === detailsData.length) {
-        ranges.push([begin, end])
-        detailsPageHeight.push(currentDetailsMiniHeight)
-      }
+      remainDetailsHeight += table.body.children[end]
     }
+    end++
   }
 
+  ranges.push([begin, deadline], [deadline, end])
+  detailsPageHeight.push(currentDetailsMiniHeight, remainDetailsHeight)
+
   return {
     ranges,
     detailsPageHeight

package/src/common/editor_customize_config.js

@@ -1,47 +0,0 @@
-import i18next from '../../locales'
-import { inject, observer } from 'mobx-react'
-import PropTypes from 'prop-types'
-import React from 'react'
-import { Flex, Switch } from '../components'
-
-@inject('editStore')
-@observer
-class EditorCutomizedConfig extends React.Component {
-  handleAutoFilling = value => {
-    const { editStore } = this.props
-    editStore.handleChangeTableData(value)
-  }
-
-  render() {
-    /** ！！！注： 不要删除config, 否则会影响mobx的动态监听（PS： 感觉像是mobx的bug？） */
-    const {
-      editStore,
-      editStore: { config }
-    } = this.props
-    const {
-      extraSpecialConfig,
-      specialConfig
-    } = editStore.computedTableSpecialConfig
-    // 是table且具有specialConfig的附属table
-    if (editStore.computedRegionIsTable && !specialConfig) {
-      return (
-        <Flex alignCenter className='gm-padding-top-5'>
-          <div>{i18next.t('行数是否自动填充')}：</div>
-          <Switch
-            checked={extraSpecialConfig?.isAutoFilling}
-            onChange={this.handleAutoFilling}
-          />
-        </Flex>
-      )
-    } else {
-      return null
-    }
-  }
-}
-
-EditorCutomizedConfig.propTypes = {
-  editStore: PropTypes.object,
-  extraSpecialConfig: PropTypes.object
-}
-
-export default EditorCutomizedConfig