gm-printer 10.28.0-beta.6 → 10.28.1

package/.eslintcache

@@ -1 +1 @@
-[{"/Users/joke/Desktop/gm-printer/src/printer/printer.js":"1","/Users/joke/Desktop/gm-printer/src/config.js":"2","/Users/joke/Desktop/gm-printer/src/common/editor_edit_field.js":"3","/Users/joke/Desktop/gm-printer/src/common/common_context_menu.js":"4","/Users/joke/Desktop/gm-printer/src/printer/page.js":"5","/Users/joke/Desktop/gm-printer/src/printer/index.js":"6","/Users/joke/Desktop/gm-printer/src/printer/do_print.js":"7","/Users/joke/Desktop/gm-printer/src/index.js":"8"},{"size":12947,"mtime":1730112542854},{"size":3569,"mtime":1730112081043,"results":"9","hashOfConfig":"10"},{"size":25058,"mtime":1730112453858},{"size":10273,"mtime":1730112252986},{"size":2063,"mtime":1730179887329,"results":"11","hashOfConfig":"10"},{"size":366,"mtime":1730177042822,"results":"12","hashOfConfig":"10"},{"size":4420,"mtime":1730179896410,"results":"13","hashOfConfig":"10"},{"size":1173,"mtime":1730177052800,"results":"14","hashOfConfig":"10"},{"filePath":"15","messages":"16","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"1ho4xzn",{"filePath":"17","messages":"18","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"19","messages":"20","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"21","messages":"22","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"23","messages":"24","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"/Users/joke/Desktop/gm-printer/src/config.js",[],"/Users/joke/Desktop/gm-printer/src/printer/page.js",[],"/Users/joke/Desktop/gm-printer/src/printer/index.js",[],"/Users/joke/Desktop/gm-printer/src/printer/do_print.js",[],"/Users/joke/Desktop/gm-printer/src/index.js",[]]
+[{"/Users/joke/Desktop/gm-printer/src/printer/printer.js":"1","/Users/joke/Desktop/gm-printer/src/config.js":"2","/Users/joke/Desktop/gm-printer/src/common/editor_edit_field.js":"3","/Users/joke/Desktop/gm-printer/src/common/common_context_menu.js":"4","/Users/joke/Desktop/gm-printer/src/printer/page.js":"5","/Users/joke/Desktop/gm-printer/src/printer/index.js":"6","/Users/joke/Desktop/gm-printer/src/printer/do_print.js":"7","/Users/joke/Desktop/gm-printer/src/index.js":"8"},{"size":12947,"mtime":1730112542854},{"size":3569,"mtime":1730112081043,"results":"9","hashOfConfig":"10"},{"size":25058,"mtime":1730112453858},{"size":10273,"mtime":1730112252986},{"size":1907,"mtime":1730181054714,"results":"11","hashOfConfig":"10"},{"size":366,"mtime":1730177042822,"results":"12","hashOfConfig":"10"},{"size":4420,"mtime":1730179896410,"results":"13","hashOfConfig":"10"},{"size":1173,"mtime":1730177052800,"results":"14","hashOfConfig":"10"},{"filePath":"15","messages":"16","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"1ho4xzn",{"filePath":"17","messages":"18","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"19","messages":"20","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"21","messages":"22","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"23","messages":"24","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"/Users/joke/Desktop/gm-printer/src/config.js",[],"/Users/joke/Desktop/gm-printer/src/printer/page.js",[],"/Users/joke/Desktop/gm-printer/src/printer/index.js",[],"/Users/joke/Desktop/gm-printer/src/printer/do_print.js",[],"/Users/joke/Desktop/gm-printer/src/index.js",[]]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gm-printer",
-  "version": "10.28.0-beta.6",
+  "version": "10.28.1",
   "description": "diy printer",
   "main": "src/index.js",
   "scripts": {
@@ -114,4 +114,4 @@
   "dependencies": {
     "qrcode.react": "^0.9.2"
   }
-}
+}

package/src/common/common_context_menu.js

@@ -1,11 +1,7 @@
 import i18next from '../../locales'
 import React, { useEffect } from 'react'
 import PropTypes from 'prop-types'
-import {
-  tableClassNameList,
-  longPrintTableClassNameList,
-  LONG_PRINT
-} from '../config'
+import { tableClassNameList } from '../config'
 import _ from 'lodash'
 import { Hr, ImageUploader } from '../common/component'
 import { observer, inject } from 'mobx-react'
@@ -195,8 +191,7 @@ class CommonContextMenu extends React.Component {
     const arr = name.split('.')
     const { className } = editStore.config.contents[arr[2]]
     const isActive = c => className === c
-    const { config } = editStore
-    const isLongPrint = config?.page?.type === LONG_PRINT
+
     return (
       <>
         {renderTableAction && (
@@ -209,38 +204,17 @@ class CommonContextMenu extends React.Component {
         <div onClick={this.handleRemove}>{i18next.t('移除列')}</div>
         <Hr />
 
-        {!isLongPrint && (
-          <>
-            {' '}
-            {_.map(tableClassNameList, o => (
-              <div
-                onClick={this.handleSetTableConfig.bind(this, o.value)}
-                key={o.value}
-                className={isActive(o.value) ? 'active' : ''}
-              >
-                {o.text}
-              </div>
-            ))}{' '}
-            <Hr />
-          </>
-        )}
-
-        {isLongPrint && (
-          <>
-            {' '}
-            {_.map(longPrintTableClassNameList, o => (
-              <div
-                onClick={this.handleSetTableConfig.bind(this, o.value)}
-                key={o.value}
-                className={isActive(o.value) ? 'active' : ''}
-              >
-                {o.text}
-              </div>
-            ))}{' '}
-            <Hr />
-          </>
-        )}
+        {_.map(tableClassNameList, o => (
+          <div
+            onClick={this.handleSetTableConfig.bind(this, o.value)}
+            key={o.value}
+            className={isActive(o.value) ? 'active' : ''}
+          >
+            {o.text}
+          </div>
+        ))}
 
+        <Hr />
         <div onClick={this.handleAddContent.bind(this, 0, '')}>
           {i18next.t('向上插入区域块')}
         </div>

package/src/common/editor_edit_field.js

@@ -20,7 +20,6 @@ import {
 import { get, toJS } from 'mobx'
 import PropTypes from 'prop-types'
 import { subtotalRadioList } from './util'
-import { LONG_PRINT } from '../config'
 import _ from 'lodash'
 
 @inject('editStore')
@@ -200,8 +199,7 @@ class EditorField extends React.Component {
   renderTable() {
     const { tableDataKeyList, editStore, isSomeSubtotalTr } = this.props
     const { head, headStyle, text, style } = editStore.computedSelectedInfo
-    const { config } = editStore
-    const isLongPrint = config?.page?.type === LONG_PRINT
+
     const {
       specialConfig,
       subtotal,
@@ -364,38 +362,19 @@ class EditorField extends React.Component {
 
         <Gap height='5px' />
 
-        {!isLongPrint && (
-          <Flex alignCenter>
-            <Flex alignCenter>{i18next.t('表格样式')}：</Flex>
-            <Select
-              className='gm-printer-edit-select'
-              value={editStore.tableCustomStyle}
-              onChange={editStore.changeTableCustomStyle}
-            >
-              <Option value='default'>{i18next.t('默认样式')}</Option>
-              <Option value='className0'>{i18next.t('样式一')}</Option>
-              <Option value='className1'>{i18next.t('样式二')}</Option>
-              <Option value='className2'>{i18next.t('样式三')}</Option>
-            </Select>
-          </Flex>
-        )}
-
-        {isLongPrint && (
-          <Flex alignCenter>
-            <Flex alignCenter>{i18next.t('表格样式')}：</Flex>
-            <Select
-              className='gm-printer-edit-select'
-              value={editStore.tableCustomStyle}
-              onChange={editStore.changeTableCustomStyle}
-            >
-              <Option value='default'>{i18next.t('默认样式')}</Option>
-              <Option value='className0'>{i18next.t('样式一')}</Option>
-              <Option value='className1'>{i18next.t('样式二')}</Option>
-              <Option value='className2'>{i18next.t('样式三')}</Option>
-              <Option value='specialTable'>{i18next.t('样式四')}</Option>
-            </Select>
-          </Flex>
-        )}
+        <Flex alignCenter>
+          <Flex alignCenter>{i18next.t('表格样式')}：</Flex>
+          <Select
+            className='gm-printer-edit-select'
+            value={editStore.tableCustomStyle}
+            onChange={editStore.changeTableCustomStyle}
+          >
+            <Option value='default'>{i18next.t('默认样式')}</Option>
+            <Option value='className0'>{i18next.t('样式一')}</Option>
+            <Option value='className1'>{i18next.t('样式二')}</Option>
+            <Option value='className2'>{i18next.t('样式三')}</Option>
+          </Select>
+        </Flex>
 
         <Gap height='5px' />
 

package/src/common/editor_select.js

@@ -2,9 +2,12 @@ import i18next from '../../locales'
 import React from 'react'
 import { observer, inject } from 'mobx-react'
 import { Flex, Option, Select } from '../components'
-import { RadioGroup, Radio } from '@gmfe/react'
+import {
+  RadioGroup,
+  Radio,
+} from '@gmfe/react'
 import { InputWithUnit } from '../common/component'
-import { pageTypeMap, printDirectionList, LONG_PRINT } from '../config'
+import { pageTypeMap, printDirectionList } from '../config'
 import _ from 'lodash'
 import { dispatchMsg } from '../util'
 import PropTypes from 'prop-types'
@@ -16,7 +19,7 @@ class EditorSelector extends React.Component {
     this.props.editStore.setConfigName(e.target.value)
   }
 
-  handleConfigIsFixLastFooter = _val => {
+  handleConfigIsFixLastFooter = (_val) => {
     this.props.editStore.setConfigIsFixLastFooter(_val)
   }
 
@@ -42,19 +45,13 @@ class EditorSelector extends React.Component {
 
   render() {
     const {
-      config: {
-        name,
-        page,
-        batchPrintConfig,
-        isFixLastFooter,
-        showDiyOverAllOrder
-      },
+      config: { name, page, batchPrintConfig, isFixLastFooter, showDiyOverAllOrder },
       computedRegionList,
       computedSelectedRegionTip,
       selectedRegion
     } = this.props.editStore
     const isDIY = page.type === 'DIY'
-    const isLongPrint = page.type === LONG_PRINT
+    
     return (
       <div>
         <Flex alignCenter>
@@ -82,7 +79,7 @@ class EditorSelector extends React.Component {
           </Select>
         </Flex>
 
-        {(isDIY || isLongPrint) && (
+        {isDIY && (
           <Flex alignCenter className='gm-padding-top-5'>
             <div>{i18next.t('纸张宽度')}：</div>
             <InputWithUnit
@@ -105,22 +102,21 @@ class EditorSelector extends React.Component {
             />
           </Flex>
         )}
-        {!isLongPrint && (
-          <Flex alignCenter className='gm-padding-top-5'>
-            <div>{i18next.t('打印布局')}：</div>
-            <Select
-              className='gm-printer-edit-select'
-              value={page.printDirection}
-              onChange={this.handlePrintDirection}
-            >
-              {_.map(printDirectionList, v => (
-                <Option key={v.value} value={v.value}>
-                  {v.text}
-                </Option>
-              ))}
-            </Select>
-          </Flex>
-        )}
+
+        <Flex alignCenter className='gm-padding-top-5'>
+          <div>{i18next.t('打印布局')}：</div>
+          <Select
+            className='gm-printer-edit-select'
+            value={page.printDirection}
+            onChange={this.handlePrintDirection}
+          >
+            {_.map(printDirectionList, v => (
+              <Option key={v.value} value={v.value}>
+                {v.text}
+              </Option>
+            ))}
+          </Select>
+        </Flex>
 
         <Flex alignCenter className='gm-padding-top-5'>
           <div>{i18next.t('选择区域')}：</div>
@@ -161,25 +157,21 @@ class EditorSelector extends React.Component {
           </>
         )}
 
-        {showDiyOverAllOrder !== undefined && (
-          <Flex alignCenter className='gm-padding-top-5'>
-            <label htmlFor={1}>是否固定末页签名和页脚区域：</label>
-            <RadioGroup
-              name='isFixFooter'
-              value={isFixLastFooter}
-              inline
-              onChange={this.handleConfigIsFixLastFooter}
-              className='gm-flex'
-            >
-              <Radio value style={{ display: 'flex', marginRight: 10 }}>
-                <span style={{ marginLeft: 5 }}>是</span>
-              </Radio>
-              <Radio value={false} style={{ display: 'flex' }}>
-                <span style={{ marginLeft: 5 }}>否</span>
-              </Radio>
-            </RadioGroup>
-          </Flex>
-        )}
+        {
+          showDiyOverAllOrder !== undefined && <Flex alignCenter className='gm-padding-top-5'>
+          <label htmlFor={1}>{'是否固定末页签名和页脚区域：'}</label>
+          <RadioGroup
+            name='isFixFooter'
+            value={isFixLastFooter}
+            inline
+            onChange={this.handleConfigIsFixLastFooter}
+            className="gm-flex"
+          >
+            <Radio value={true} style={{ display: 'flex', marginRight: 10}}><span style={{ marginLeft: 5}}>是</span></Radio>
+            <Radio value={false} style={{ display: 'flex'}}><span style={{ marginLeft: 5}}>否</span></Radio>
+          </RadioGroup>
+        </Flex>
+        }
 
         <Flex className='gm-padding-top-5 gm-text-red' column>
           {computedSelectedRegionTip}

package/src/common/style.lesss

@@ -25,7 +25,7 @@
   background: whitesmoke;
   font-size: 12px;
   margin: 0;
-  // line-height: 1.5; /* 1 */
+  line-height: 1.5; /* 1 */
   -webkit-text-size-adjust: 100%; /* 2 */
   position: relative;
   overflow: hidden;
@@ -263,13 +263,6 @@
         top: calc(50% - 0.5em);
       }
 
-      .long_print_table_row{
-        cursor: move;
-        &.active{
-          outline: 1px solid rgb(82, 146, 247);
-        }
-      } 
-
       table {
         // 不被 before 遮挡
         position: relative;

package/src/config.js

@@ -1,7 +1,4 @@
 import i18next from '../locales'
-
-export const LONG_PRINT = 'longPrint'
-
 export const pageTypeMap = {
   A4: {
     name: 'A4',
@@ -81,21 +78,6 @@ export const pageTypeMap = {
       paddingLeft: '16mm'
     }
   },
-  // 新增长条打印配置选项
-  [LONG_PRINT]: {
-    name: i18next.t('长条打印'),
-    size: {
-      width: '80mm',
-      height: '100mm'
-    },
-    printDirection: 'vertical',
-    gap: {
-      paddingTop: '2mm',
-      paddingRight: '2mm',
-      paddingBottom: '2mm',
-      paddingLeft: '2mm'
-    }
-  },
   DIY: {
     name: i18next.t('自定义纸张'),
     size: {
@@ -125,16 +107,7 @@ export const borderStyleList = [
 export const tableClassNameList = [
   { value: '', text: i18next.t('默认样式') },
   { value: 'className0', text: i18next.t('浅实线样式') },
-  { value: 'className1', text: i18next.t('无实线样式') },
-  { value: 'className2', text: i18next.t('样式三') }
-]
-
-export const longPrintTableClassNameList = [
-  { value: '', text: i18next.t('默认样式') },
-  { value: 'className0', text: i18next.t('样式一') },
-  { value: 'className1', text: i18next.t('样式二') },
-  { value: 'className2', text: i18next.t('样式三') },
-  { value: 'specialTable', text: i18next.t('样式四') }
+  { value: 'className1', text: i18next.t('无实线样式') }
 ]
 
 export const tableDataKeyList = [

package/src/editor/context_menu.js

@@ -6,7 +6,6 @@ import { inject, observer } from 'mobx-react'
 import _ from 'lodash'
 import { Printer } from '../printer'
 import { isMultiTable } from '../util'
-import { LONG_PRINT } from '../config'
 
 const blockTypeList = [
   { value: '', text: i18next.t('插入文本') },
@@ -123,21 +122,17 @@ class ContextMenu extends React.Component {
     const isSubtotalActive = subtotal.show
     const isOverallOrder = overallOrder?.show
     const isDiyOverallOrder = diyOverallOrder?.show
-    // 长条打印
-    const isLongPrint = type === LONG_PRINT
 
     return (
       <>
-        {!isLongPrint && (
-          <div
-            onClick={this.handleChangeTableDataKey.bind(this, 'multi', name)}
-            className={isMultiActive ? 'active' : ''}
-          >
-            {i18next.t('双栏商品')}
-          </div>
-        )}
+        <div
+          onClick={this.handleChangeTableDataKey.bind(this, 'multi', name)}
+          className={isMultiActive ? 'active' : ''}
+        >
+          {i18next.t('双栏商品')}
+        </div>
         {/* 三分纸高度太小，做不了三栏，会死循环 */}
-        {type !== 'A4/3' && !isLongPrint && (
+        {type !== 'A4/3' && (
           <div
             onClick={this.handleChangeTableDataKey.bind(this, 'multi3', name)}
             className={isThreeActive ? 'active' : ''}

package/src/index.js

@@ -17,8 +17,7 @@ import {
   Printer,
   getCSS,
   getPrintContainerHTML,
-  doBatchFinancePrint,
-  setPrintStyle
+  doBatchFinancePrint
 } from './printer'
 import { MULTI_SUFFIX, MULTI_SUFFIX3 } from './config'
 
@@ -44,6 +43,5 @@ export {
   MULTI_SUFFIX,
   MULTI_SUFFIX3,
   getPrintContainerHTML,
-  doBatchFinancePrint,
-  setPrintStyle
+  doBatchFinancePrint
 }

package/src/printer/do_print.js

@@ -4,6 +4,7 @@ import Printer from './printer'
 import getCSS from './get_css'
 import BatchPrinter from './batch_printer'
 import BatchFinancePrinter from '../finance_voucher/components/finance_batch_printer'
+import { isZoom } from 'gm-util'
 import { afterImgAndSvgLoaded } from '../util'
 
 const printerId = '_gm-printer_' + Math.random()
@@ -76,18 +77,14 @@ function toDoPrint({ data, config }, isSomeSubtotalTr) {
 function toDoPrintBatch(list, isPrint = true) {
   return new window.Promise(resolve => {
     const $app = $printer.contentWindow.document.getElementById('appContainer')
-    // 获取模版类型
-    const templateType = list?.[0]?.config?.page?.type
-    // 初始化
+
     ReactDOM.unmountComponentAtNode($app)
     ReactDOM.render(
       <BatchPrinter
         list={list}
         onReady={() => {
           afterImgAndSvgLoaded(() => {
-            isPrint &&
-              templateType !== 'longPrint' &&
-              $printer.contentWindow.print()
+            isPrint && $printer.contentWindow.print()
             resolve()
           }, $app)
         }}
@@ -148,17 +145,4 @@ function getPrintContainerHTML() {
   return $printer.contentWindow.document.getElementsByTagName('html')[0]
     .innerHTML
 }
-
-function setPrintStyle() {
-  const doc = document
-  const style = doc.createElement('style')
-  style.appendChild(doc.createTextNode(getCSS()))
-  doc.head.appendChild(style)
-}
-export {
-  doPrint,
-  doBatchPrint,
-  getPrintContainerHTML,
-  doBatchFinancePrint,
-  setPrintStyle
-}
+export { doPrint, doBatchPrint, getPrintContainerHTML, doBatchFinancePrint }

package/src/printer/index.js

@@ -4,8 +4,7 @@ import {
   doPrint,
   doBatchPrint,
   getPrintContainerHTML,
-  doBatchFinancePrint,
-  setPrintStyle
+  doBatchFinancePrint
 } from './do_print'
 import getCSS from './get_css'
 
@@ -16,6 +15,5 @@ export {
   BatchPrinter,
   getCSS,
   getPrintContainerHTML,
-  doBatchFinancePrint,
-  setPrintStyle
+  doBatchFinancePrint
 }

package/src/printer/page.js

@@ -3,7 +3,6 @@ import PropTypes from 'prop-types'
 import { inject, observer } from 'mobx-react'
 import { getHeight } from '../util'
 import classNames from 'classnames'
-import { LONG_PRINT } from '../config'
 
 @inject('printerStore')
 @observer
@@ -30,9 +29,9 @@ class Page extends React.Component {
 
     const {
       size: { width, height },
-      pageStyle,
-      type
+      pageStyle
     } = printerStore.config.page
+
     // 统一减2毫米,防止计算误差溢出
     const x = '- 2mm'
     return (
@@ -45,21 +44,15 @@ class Page extends React.Component {
           ...pageStyle,
           boxSizing: 'content-box',
           width: `calc(${width} - ${paddingLeft} - ${paddingRight})`,
-          padding: `${paddingTop} ${paddingRight} ${paddingBottom} ${paddingLeft}`,
-          height:
-            type === LONG_PRINT
-              ? ``
-              : `calc(${height} - ${paddingTop} - ${paddingBottom} ${x})`
+          height: `calc(${height} - ${paddingTop} - ${paddingBottom} ${x})`,
+          padding: `${paddingTop} ${paddingRight} ${paddingBottom} ${paddingLeft}`
         }}
       >
         <div
           className='gm-printer-page-inner'
           style={{
             width: `calc(${width} - ${paddingLeft} - ${paddingRight})`,
-            height:
-              type === LONG_PRINT
-                ? ``
-                : `calc(${height} - ${paddingTop} - ${paddingBottom} ${x})`
+            height: `calc(${height} - ${paddingTop} - ${paddingBottom} ${x})`
           }}
         >
           {children}

package/src/printer/printer.js

@@ -3,14 +3,12 @@ import React from 'react'
 import classNames from 'classnames'
 import { inject, observer, Provider } from 'mobx-react'
 import PropTypes from 'prop-types'
-import PrinterStore from './store'
+import PrinterStore, { TR_BASE_HEIGHT } from './store'
 import Page from './page'
 import _ from 'lodash'
 import Panel from './panel'
 import Table from './table'
-import LongPrintTable from './long_print_table'
 import MergePage from './merge_page'
-import { LONG_PRINT } from '../config'
 
 // Header Sign Footer 相对特殊，要单独处理
 const Header = props => (
@@ -163,61 +161,6 @@ class Printer extends React.Component {
     )
   }
 
-  renderLongPage() {
-    const { printerStore, isSomeSubtotalTr } = this.props
-    const { config } = printerStore
-    return (
-      <Page>
-        <Header config={config.header} pageIndex={0} />
-        {_.map(config.contents, (content, index) => {
-          switch (content.type) {
-            case 'table':
-              // eslint-disable-next-line no-case-declarations
-              const list = printerStore.data._table[content.dataKey]
-              // console.log(content, "content");
-              if (content.className === 'specialTable') {
-                return (
-                  <LongPrintTable
-                    key={`contents.table.${index}`}
-                    name={`contents.table.${index}`}
-                    config={content}
-                    range={{ begin: 0, end: list?.length || 0 }}
-                    pageIndex={0}
-                    placeholder={`${i18next.t('区域')} ${index}`}
-                  />
-                )
-              } else {
-                return (
-                  <Table
-                    key={`contents.table.${index}`}
-                    name={`contents.table.${index}`}
-                    config={content}
-                    range={{
-                      begin: 0,
-                      end: list?.length || 0
-                    }}
-                    placeholder={`${i18next.t('区域')} ${index}`}
-                    pageIndex={0}
-                    isSomeSubtotalTr={isSomeSubtotalTr}
-                  />
-                )
-              }
-            default:
-              return (
-                <Panel
-                  key={`contents.panel.${index}`}
-                  name={`contents.panel.${index}`}
-                  config={content}
-                  pageIndex={0}
-                  placeholder={`${i18next.t('区域')} ${index}`}
-                />
-              )
-          }
-        })}
-      </Page>
-    )
-  }
-
   renderPage() {
     const { printerStore, isSomeSubtotalTr } = this.props
     const { config, remainPageHeight, isAutoFilling } = printerStore
@@ -340,9 +283,6 @@ class Printer extends React.Component {
     const { printerStore, config } = this.props
     // batchPrintConfig: 1 不连续打印（纸张会间断）2 连续打印（纸张连续打，不间断）
     const batchPrintConfig = config.batchPrintConfig
-    if (config.page.type === LONG_PRINT) {
-      return !printerStore.ready ? this.renderBefore() : this.renderLongPage()
-    }
     if (batchPrintConfig === 2) {
       return this.renderMerge()
     } else {

package/src/printer/style.lesss

@@ -7,7 +7,7 @@
   font-weight: 400;
   -webkit-font-smoothing: antialiased;
   -webkit-overflow-scrolling: touch;
-   // line-height: 2.5;
+  line-height: 1.5;
 
   background: white;
   page-break-after: always;

package/src/printer/long_print_table/index.js

@@ -1,391 +0,0 @@
-import React from 'react'
-import PropTypes from 'prop-types'
-import _ from 'lodash'
-import {
-  dispatchMsg,
-  getDataKey,
-  getHeight,
-  getTableColumnName,
-  getWidth
-} from '../../util'
-import { inject, observer } from 'mobx-react'
-import classNames from 'classnames'
-import SpecialTr from '../table_special_tr'
-import CategoryTr from '../table_category_tr'
-import SubtotalTr from '../table_subtotal_tr'
-import PageSummary from '../page_summary'
-import OverallOrder from '../table_overallOrder_tr'
-import DiyOverallOrder from '../table_diy_overallOrder_tr'
-
-@inject('printerStore')
-@observer
-class Table extends React.Component {
-  constructor(props) {
-    super(props)
-    this.ref = React.createRef()
-    this.state = {
-      index: null
-    }
-  }
-
-  componentDidMount() {
-    const { name, printerStore } = this.props
-
-    if (!printerStore.ready) {
-      const $table = this.ref.current.querySelector('table')
-      const tHead = $table.querySelector('thead')
-      const ths = tHead.querySelectorAll('th') || []
-      const trs = $table.querySelectorAll('tbody tr') || []
-      const detailsDiv = $table.querySelectorAll('tr td .b-table-details')
-
-      printerStore.setHeight(name, getHeight($table))
-
-      printerStore.setTable(name, {
-        head: {
-          height: getHeight(tHead),
-          widths: _.map(ths, th => getWidth(th))
-        },
-        body: {
-          heights: _.map(trs, tr => getHeight(tr)),
-          children: _.map(detailsDiv, div => getHeight(div))
-        }
-      })
-    }
-  }
-
-  handleClick = e => {
-    const { name } = this.props
-    const { index } = e.target.dataset
-    dispatchMsg('gm-printer-select', {
-      selected: getTableColumnName(name, index)
-    })
-  }
-
-  handleDragStart = e => {
-    const { name } = this.props
-    const { index } = e.target.dataset
-
-    this.setState({
-      index
-    })
-
-    dispatchMsg('gm-printer-select', {
-      selected: getTableColumnName(name, index)
-    })
-  }
-
-  handleSelectedRegion = () => {
-    const { name } = this.props
-
-    dispatchMsg('gm-printer-select-region', { selected: name })
-  }
-
-  handleDrop = e => {
-    const { index } = e.target.dataset
-    console.log(this.state.index, index)
-    if (this.state.index !== index) {
-      dispatchMsg('gm-printer-table-drag', {
-        source: this.state.index,
-        target: index
-      })
-    }
-  }
-
-  handleDragOver = e => {
-    e.preventDefault()
-  }
-
-  getColumns = () => {
-    const {
-      config: { columns, dataKey }
-    } = this.props
-    const columns1 = columns.map((val, index) => ({ ...val, index }))
-    return columns1
-  }
-
-  renderDefault() {
-    let {
-      config,
-      config: { dataKey, arrange, customerRowHeight = 23 },
-      name,
-      range,
-      pageIndex,
-      printerStore,
-      isSomeSubtotalTr
-    } = this.props
-    // 数据
-    dataKey = getDataKey(dataKey, arrange)
-    const tableData = printerStore.data._table[dataKey] || []
-
-    // 列
-    const columns = this.getColumns()
-    // 每页合计在前
-    const subtotalTrPageSummary = () => {
-      return (
-        <>
-          <SubtotalTr
-            range={range}
-            config={config}
-            printerStore={printerStore}
-            isSomeSubtotalTr={isSomeSubtotalTr}
-          />
-          <PageSummary {...this.props} />
-        </>
-      )
-    }
-    // 合计在前
-    const PageSummarySubtotalTr = () => {
-      return (
-        <>
-          <PageSummary {...this.props} />
-          <SubtotalTr
-            range={range}
-            config={config}
-            printerStore={printerStore}
-            isSomeSubtotalTr={isSomeSubtotalTr}
-          />
-        </>
-      )
-    }
-
-    return (
-      <div style={{ tableLayout: 'inherit', wordBreak: 'break-all' }}>
-        {_.map(_.range(range.begin, range.end), i => {
-          const _special = tableData[i] && tableData[i]._special
-          const _specialText = tableData[i] && tableData[i]._specialText
-          if (_specialText)
-            return <CategoryTr key={i} config={config} data={_specialText} />
-          if (_special)
-            return <SpecialTr key={i} config={config} data={_special} />
-          // 如果项为空对象展现一个占满一行的td
-          const isItemNone = !_.keys(tableData[i]).length
-          console.log(columns, 'columns')
-          return (
-            <div key={i} style={{ borderTop: '1px dashed black' }}>
-              {isItemNone
-                ? null
-                : _.map(columns, (col, j) => {
-                    return (
-                      <div
-                        key={j}
-                        data-name={getTableColumnName(name, col.index)}
-                        data-index={col.index}
-                        onClick={this.handleClick}
-                        draggable
-                        onDragStart={this.handleDragStart}
-                        onDrop={this.handleDrop}
-                        onDragOver={this.handleDragOver}
-                        style={{ padding: '2px 0' }}
-                        className={classNames('long_print_table_row', {
-                          active:
-                            getTableColumnName(name, col.index) ===
-                            printerStore.selected
-                        })}
-                      >
-                        <span
-                          data-name={getTableColumnName(name, col.index)}
-                          data-index={col.index}
-                          onClick={this.handleClick}
-                          style={{ ...col.headStyle }}
-                        >
-                          {col.head}：
-                        </span>
-                        <span
-                          style={{
-                            ...col.style
-                          }}
-                          data-name={getTableColumnName(name, col.index)}
-                          data-index={col.index}
-                          onClick={this.handleClick}
-                          dangerouslySetInnerHTML={{
-                            __html: col.isSpecialColumn
-                              ? printerStore.templateSpecialDetails(
-                                  col,
-                                  dataKey,
-                                  i
-                                )
-                              : printerStore
-                                  .templateTable(
-                                    col.text,
-                                    dataKey,
-                                    i,
-                                    pageIndex
-                                  )
-                                  .replace(/\(\)/g, '')
-                          }}
-                        />
-                      </div>
-                    )
-                  })}
-            </div>
-          )
-        })}
-        {this.props.config.subtotal.isCommutationPlace
-          ? PageSummarySubtotalTr()
-          : subtotalTrPageSummary()}
-        <OverallOrder
-          range={range}
-          config={config}
-          printerStore={printerStore}
-        />
-        <DiyOverallOrder
-          range={range}
-          config={config}
-          printerStore={printerStore}
-          pageIndex={pageIndex}
-        />
-      </div>
-    )
-
-    return (
-      <table
-        style={{
-          // td会撑开table的宽度
-          tableLayout: 'inherit',
-          wordBreak: 'break-all'
-        }}
-      >
-        <thead>
-          <tr style={{ height: `${customerRowHeight}px` }}>
-            {_.map(columns, (col, i) => (
-              <th
-                key={i}
-                data-index={col.index}
-                data-name={getTableColumnName(name, col.index)}
-                draggable
-                style={{
-                  ...getTdStyle(i, col.headStyle),
-                  ...col.headStyle
-                }}
-                className={classNames({
-                  active:
-                    getTableColumnName(name, col.index) ===
-                    printerStore.selected
-                })}
-                onClick={this.handleClick}
-                onDragStart={this.handleDragStart}
-                onDrop={this.handleDrop}
-                onDragOver={this.handleDragOver}
-              >
-                {col.head}
-              </th>
-            ))}
-          </tr>
-        </thead>
-        <tbody>
-          {_.map(_.range(range.begin, range.end), i => {
-            const _special = tableData[i] && tableData[i]._special
-            const _specialText = tableData[i] && tableData[i]._specialText
-            if (_specialText)
-              return <CategoryTr key={i} config={config} data={_specialText} />
-            if (_special)
-              return <SpecialTr key={i} config={config} data={_special} />
-            // 如果项为空对象展现一个占满一行的td
-            const isItemNone = !_.keys(tableData[i]).length
-
-            return (
-              <tr style={{ height: `${customerRowHeight}px` }} key={i}>
-                {isItemNone ? (
-                  <td colSpan='99' />
-                ) : (
-                  _.map(columns, (col, j) => {
-                    return (
-                      <td
-                        key={j}
-                        data-name={getTableColumnName(name, col.index)}
-                        style={{
-                          ...getTdStyle(j, col.style),
-                          ...col.style
-                        }}
-                        className={classNames({
-                          active:
-                            getTableColumnName(name, col.index) ===
-                            printerStore.selected
-                        })}
-                        dangerouslySetInnerHTML={{
-                          __html: col.isSpecialColumn
-                            ? printerStore.templateSpecialDetails(
-                                col,
-                                dataKey,
-                                i
-                              )
-                            : printerStore
-                                .templateTable(col.text, dataKey, i, pageIndex)
-                                .replace(/\(\)/g, '')
-                        }}
-                      />
-                    )
-                  })
-                )}
-              </tr>
-            )
-          })}
-          {this.props.config.subtotal.isCommutationPlace
-            ? PageSummarySubtotalTr()
-            : subtotalTrPageSummary()}
-          <OverallOrder
-            range={range}
-            config={config}
-            printerStore={printerStore}
-          />
-          <DiyOverallOrder
-            range={range}
-            config={config}
-            printerStore={printerStore}
-            pageIndex={pageIndex}
-          />
-        </tbody>
-      </table>
-    )
-  }
-
-  renderEmptyTable() {
-    return (
-      <table>
-        <thead />
-        <tbody>
-          <tr />
-        </tbody>
-      </table>
-    )
-  }
-
-  render() {
-    let {
-      config: { className, dataKey, arrange },
-      name,
-      placeholder,
-      printerStore
-    } = this.props
-    dataKey = getDataKey(dataKey, arrange)
-    const tableData = printerStore.data._table[dataKey] || []
-    const active = printerStore.selectedRegion === name
-    return (
-      <div
-        ref={this.ref}
-        className={classNames(
-          'gm-printer-table',
-          'gm-printer-table-classname-' + (className || 'default'),
-          { active }
-        )}
-        data-name={name}
-        data-placeholder={placeholder}
-        onClick={this.handleSelectedRegion}
-      >
-        {tableData.length ? this.renderDefault() : this.renderEmptyTable()}
-      </div>
-    )
-  }
-}
-
-Table.propTypes = {
-  config: PropTypes.object.isRequired,
-  name: PropTypes.string.isRequired,
-  range: PropTypes.object.isRequired,
-  pageIndex: PropTypes.number.isRequired,
-  placeholder: PropTypes.string,
-  printerStore: PropTypes.object,
-  isSomeSubtotalTr: PropTypes.bool
-}
-
-export default Table