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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. package/.eslintcache +1 -1
  2. package/package.json +1 -1
  3. package/src/printer/do_print.js +10 -3
  4. package/src/printer/page.js +10 -4
package/.eslintcache CHANGED
@@ -1 +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"},{"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",[]]
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",[]]
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "gm-printer",
3
- "version": "10.28.0-beta.4",
3
+ "version": "10.28.0-beta.6",
4
4
  "description": "diy printer",
5
5
  "main": "src/index.js",
6
6
  "scripts": {
package/src/printer/do_print.js CHANGED
@@ -4,7 +4,6 @@ import Printer from './printer'
4
4
  import getCSS from './get_css'
5
5
  import BatchPrinter from './batch_printer'
6
6
  import BatchFinancePrinter from '../finance_voucher/components/finance_batch_printer'
7
- import { isZoom } from 'gm-util'
8
7
  import { afterImgAndSvgLoaded } from '../util'
9
8
 
10
9
  const printerId = '_gm-printer_' + Math.random()
@@ -86,7 +85,9 @@ function toDoPrintBatch(list, isPrint = true) {
86
85
  list={list}
87
86
  onReady={() => {
88
87
  afterImgAndSvgLoaded(() => {
89
- isPrint && templateType !== "longPrint" && $printer.contentWindow.print()
88
+ isPrint &&
89
+ templateType !== 'longPrint' &&
90
+ $printer.contentWindow.print()
90
91
  resolve()
91
92
  }, $app)
92
93
  }}
@@ -154,4 +155,10 @@ function setPrintStyle() {
154
155
  style.appendChild(doc.createTextNode(getCSS()))
155
156
  doc.head.appendChild(style)
156
157
  }
157
- export { doPrint, doBatchPrint, getPrintContainerHTML, doBatchFinancePrint, setPrintStyle }
158
+ export {
159
+ doPrint,
160
+ doBatchPrint,
161
+ getPrintContainerHTML,
162
+ doBatchFinancePrint,
163
+ setPrintStyle
164
+ }
package/src/printer/page.js CHANGED
@@ -44,16 +44,22 @@ class Page extends React.Component {
44
44
  style={{
45
45
  ...pageStyle,
46
46
  boxSizing: 'content-box',
47
- width: type === LONG_PRINT ? `${width}` : `calc(${width} - ${paddingLeft} - ${paddingRight})`,
47
+ width: `calc(${width} - ${paddingLeft} - ${paddingRight})`,
48
48
  padding: `${paddingTop} ${paddingRight} ${paddingBottom} ${paddingLeft}`,
49
- height: type === LONG_PRINT ? `` : `calc(${height} - ${paddingTop} - ${paddingBottom} ${x})`,
49
+ height:
50
+ type === LONG_PRINT
51
+ ? ``
52
+ : `calc(${height} - ${paddingTop} - ${paddingBottom} ${x})`
50
53
  }}
51
54
  >
52
55
  <div
53
56
  className='gm-printer-page-inner'
54
57
  style={{
55
- width: type === LONG_PRINT ? `${width}` : `calc(${width} - ${paddingLeft} - ${paddingRight})`,
56
- height: type === LONG_PRINT ? `` : `calc(${height} - ${paddingTop} - ${paddingBottom} ${x})`
58
+ width: `calc(${width} - ${paddingLeft} - ${paddingRight})`,
59
+ height:
60
+ type === LONG_PRINT
61
+ ? ``
62
+ : `calc(${height} - ${paddingTop} - ${paddingBottom} ${x})`
57
63
  }}
58
64
  >
59
65
  {children}