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

package/.eslintcache

@@ -1 +1 @@
-[{"/Users/joke/Desktop/gm-printer/src/printer/printer.js":"1","/Users/joke/Desktop/gm-printer/src/printer/page.js":"2","/Users/joke/Desktop/gm-printer/src/printer/long_print_table/index.js":"3","/Users/joke/Desktop/gm-printer/src/editor/context_menu.js":"4","/Users/joke/Desktop/gm-printer/src/config.js":"5","/Users/joke/Desktop/gm-printer/src/common/editor_select.js":"6","/Users/joke/Desktop/gm-printer/src/common/editor_edit_field.js":"7","/Users/joke/Desktop/gm-printer/src/common/common_context_menu.js":"8"},{"size":12305,"mtime":1728981026281},{"size":1899,"mtime":1728981006613},{"size":11905,"mtime":1728980840768,"results":"9","hashOfConfig":"10"},{"size":6329,"mtime":1728980977665},{"size":3185,"mtime":1728980903446},{"size":6042,"mtime":1728980953458,"results":"11","hashOfConfig":"10"},{"size":24316,"mtime":1728980939561},{"size":9821,"mtime":1728980917598,"results":"12","hashOfConfig":"10"},{"filePath":"13","messages":"14","errorCount":4,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"source":null},"1ho4xzn",{"filePath":"15","messages":"16","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"17","messages":"18","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"/Users/joke/Desktop/gm-printer/src/printer/long_print_table/index.js",["19","20","21","22"],"/Users/joke/Desktop/gm-printer/src/common/editor_select.js",[],"/Users/joke/Desktop/gm-printer/src/common/common_context_menu.js",[],{"ruleId":"23","severity":2,"message":"24","line":100,"column":26,"nodeType":"25","endLine":100,"endColumn":33},{"ruleId":"26","severity":2,"message":"27","line":240,"column":5,"nodeType":"28","endLine":339,"endColumn":6},{"ruleId":"29","severity":2,"message":"30","line":257,"column":22,"nodeType":"25","messageId":"31","endLine":257,"endColumn":32},{"ruleId":"29","severity":2,"message":"30","line":297,"column":30,"nodeType":"25","messageId":"31","endLine":297,"endColumn":40},"no-unused-vars","'dataKey' is assigned a value but never used.","Identifier","no-unreachable","Unreachable code.","ReturnStatement","no-undef","'getTdStyle' is not defined.","undef"]
+[{"/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.2",
+  "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, 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'
@@ -221,6 +225,22 @@ class CommonContextMenu extends React.Component {
           </>
         )}
 
+        {isLongPrint && (
+          <>
+            {' '}
+            {_.map(longPrintTableClassNameList, 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

@@ -380,6 +380,23 @@ class EditorField extends React.Component {
           </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>
+        )}
+
         <Gap height='5px' />
 
         <Flex>

package/src/config.js

@@ -125,7 +125,16 @@ export const borderStyleList = [
 export const tableClassNameList = [
   { value: '', text: i18next.t('默认样式') },
   { value: 'className0', text: i18next.t('浅实线样式') },
-  { value: 'className1', 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('样式四') }
 ]
 
 export const tableDataKeyList = [

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

@@ -164,7 +164,7 @@ class Printer extends React.Component {
   }
 
   renderLongPage() {
-    const { printerStore } = this.props
+    const { printerStore, isSomeSubtotalTr } = this.props
     const { config } = printerStore
     return (
       <Page>
@@ -174,17 +174,34 @@ class Printer extends React.Component {
             case 'table':
               // eslint-disable-next-line no-case-declarations
               const list = printerStore.data._table[content.dataKey]
-              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}`}
-                />
-              )
-
+              // 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