gm-printer 10.28.0-beta.3 → 10.28.0-beta.4

package/.eslintcache

@@ -0,0 +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"},{"size":12947,"mtime":1730112542854},{"size":3569,"mtime":1730112081043,"results":"5","hashOfConfig":"6"},{"size":25058,"mtime":1730112453858},{"size":10273,"mtime":1730112252986},{"filePath":"7","messages":"8","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"1ho4xzn","/Users/joke/Desktop/gm-printer/src/config.js",[]]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gm-printer",
-  "version": "10.28.0-beta.3",
+  "version": "10.28.0-beta.4",
   "description": "diy printer",
   "main": "src/index.js",
   "scripts": {

package/src/common/common_context_menu.js

@@ -1,7 +1,11 @@
 import i18next from '../../locales'
 import React, { useEffect } from 'react'
 import PropTypes from 'prop-types'
-import { tableClassNameList, longPrintTableClassNameList, LONG_PRINT } from '../config'
+import {
+  tableClassNameList,
+  longPrintTableClassNameList,
+  LONG_PRINT
+} from '../config'
 import _ from 'lodash'
 import { Hr, ImageUploader } from '../common/component'
 import { observer, inject } from 'mobx-react'
@@ -234,8 +238,8 @@ class CommonContextMenu extends React.Component {
               </div>
             ))}{' '}
             <Hr />
-          </>)
-        }
+          </>
+        )}
 
         <div onClick={this.handleAddContent.bind(this, 0, '')}>
           {i18next.t('向上插入区域块')}

package/src/common/editor_edit_field.js

@@ -564,7 +564,7 @@ class EditorField extends React.Component {
               value={
                 subtotal && subtotal?.fields?.length > 1
                   ? _.find(subtotal?.fields, item => !item.valueField)?.name ??
-                  ''
+                    ''
                   : ''
               }
               onChange={editStore.setSubtotalFields}

package/src/index.js

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

package/src/printer/do_print.js

@@ -77,14 +77,16 @@ 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 && $printer.contentWindow.print()
+            isPrint && templateType !== "longPrint" && $printer.contentWindow.print()
             resolve()
           }, $app)
         }}
@@ -145,4 +147,11 @@ function getPrintContainerHTML() {
   return $printer.contentWindow.document.getElementsByTagName('html')[0]
     .innerHTML
 }
-export { doPrint, doBatchPrint, getPrintContainerHTML, doBatchFinancePrint }
+
+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 }

package/src/printer/index.js

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

package/src/printer/page.js

@@ -44,20 +44,16 @@ class Page extends React.Component {
         style={{
           ...pageStyle,
           boxSizing: 'content-box',
-          width: `calc(${width} - ${paddingLeft} - ${paddingRight})`,
-          [type === LONG_PRINT
-            ? 'minHeight'
-            : 'height']: `calc(${height} - ${paddingTop} - ${paddingBottom} ${x})`,
-          padding: `${paddingTop} ${paddingRight} ${paddingBottom} ${paddingLeft}`
+          width: type === LONG_PRINT ? `${width}` : `calc(${width} - ${paddingLeft} - ${paddingRight})`,
+          padding: `${paddingTop} ${paddingRight} ${paddingBottom} ${paddingLeft}`,
+          height: type === LONG_PRINT ? `` : `calc(${height} - ${paddingTop} - ${paddingBottom} ${x})`,
         }}
       >
         <div
           className='gm-printer-page-inner'
           style={{
-            width: `calc(${width} - ${paddingLeft} - ${paddingRight})`,
-            [type === LONG_PRINT
-              ? 'minHeight'
-              : 'height']: `calc(${height} - ${paddingTop} - ${paddingBottom} ${x})`
+            width: type === LONG_PRINT ? `${width}` : `calc(${width} - ${paddingLeft} - ${paddingRight})`,
+            height: type === LONG_PRINT ? `` : `calc(${height} - ${paddingTop} - ${paddingBottom} ${x})`
           }}
         >
           {children}

package/src/printer/printer.js

@@ -175,7 +175,7 @@ class Printer extends React.Component {
               // eslint-disable-next-line no-case-declarations
               const list = printerStore.data._table[content.dataKey]
               // console.log(content, "content");
-              if (content.className === "specialTable") {
+              if (content.className === 'specialTable') {
                 return (
                   <LongPrintTable
                     key={`contents.table.${index}`}
@@ -187,18 +187,20 @@ class Printer extends React.Component {
                   />
                 )
               } 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}
-                />
+                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 (
@@ -239,10 +241,10 @@ class Printer extends React.Component {
 
                 const end = isAutofillConfig
                   ? panel.end +
-                  Math.floor(
-                    remainPageHeight /
-                    printerStore.computedTableCustomerRowHeight
-                  )
+                    Math.floor(
+                      remainPageHeight /
+                        printerStore.computedTableCustomerRowHeight
+                    )
                   : panel.end
                 switch (panel.type) {
                   case 'table':