gm-printer-label 3.0.8 → 3.0.9-alpha.0

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.
package/.eslintcache CHANGED
@@ -1 +1 @@
1
- [{"/Users/min/Documents/GMFE/gm-util/gm-printer-label/src/util.js":"1","/Users/min/Documents/GMFE/gm-util/gm-printer-label/src/common/editor_compoents/edit_select.js":"2","/Users/min/Documents/GMFE/gm-util/gm-printer-label/src/common/editor_compoents/edit.js":"3","/Users/min/Documents/GMFE/gm-util/gm-printer-label/src/common/editor_compoents/component.js":"4"},{"size":1365,"mtime":1635154061961,"results":"5","hashOfConfig":"6"},{"size":5505,"mtime":1635767717933,"results":"7","hashOfConfig":"6"},{"size":2694,"mtime":1635767728834,"results":"8","hashOfConfig":"6"},{"size":11621,"mtime":1635767876018,"results":"9","hashOfConfig":"6"},{"filePath":"10","messages":"11","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"18d3ysg",{"filePath":"12","messages":"13","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"14","messages":"15","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"16","messages":"17","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"/Users/min/Documents/GMFE/gm-util/gm-printer-label/src/util.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer-label/src/common/editor_compoents/edit_select.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer-label/src/common/editor_compoents/edit.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer-label/src/common/editor_compoents/component.js",[]]
1
+ [{"/Users/min/Documents/GMFE/gm-util/gm-printer-label/src/util.js":"1","/Users/min/Documents/GMFE/gm-util/gm-printer-label/src/common/editor_compoents/edit_select.js":"2","/Users/min/Documents/GMFE/gm-util/gm-printer-label/src/common/editor_compoents/edit.js":"3","/Users/min/Documents/GMFE/gm-util/gm-printer-label/src/common/editor_compoents/component.js":"4","/Users/min/Documents/GMFE/gm-util/gm-printer-label/src/printer/qrcode.js":"5","/Users/min/Documents/GMFE/gm-util/gm-printer-label/src/printer/printer.js":"6","/Users/min/Documents/GMFE/gm-util/gm-printer-label/src/printer/index.js":"7","/Users/min/Documents/GMFE/gm-util/gm-printer-label/src/printer/block.js":"8","/Users/min/Documents/GMFE/gm-util/gm-printer-label/src/printer/batch_printer.js":"9","/Users/min/Documents/GMFE/gm-util/gm-printer-label/src/printer/barcode.js":"10"},{"size":1934,"mtime":1642494468444,"results":"11","hashOfConfig":"12"},{"size":5505,"mtime":1635767717933,"results":"13","hashOfConfig":"12"},{"size":2694,"mtime":1635767728834,"results":"14","hashOfConfig":"12"},{"size":11621,"mtime":1635767876018,"results":"15","hashOfConfig":"12"},{"size":394,"mtime":1642488443965},{"size":1594,"mtime":1642499397285},{"size":3064,"mtime":1642499124287},{"size":9350,"mtime":1642499166536},{"size":825,"mtime":1642499158040},{"size":525,"mtime":1642488487262},{"filePath":"16","messages":"17","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"18d3ysg",{"filePath":"18","messages":"19","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"20","messages":"21","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"22","messages":"23","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"/Users/min/Documents/GMFE/gm-util/gm-printer-label/src/util.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer-label/src/common/editor_compoents/edit_select.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer-label/src/common/editor_compoents/edit.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer-label/src/common/editor_compoents/component.js",[]]
package/.prettierrc.js ADDED
@@ -0,0 +1,5 @@
1
+ module.exports = {
2
+ semi: false,
3
+ singleQuote: true,
4
+ jsxSingleQuote: true,
5
+ };
package/package.json CHANGED
@@ -1,11 +1,14 @@
1
1
  {
2
2
  "name": "gm-printer-label",
3
- "version": "3.0.8",
3
+ "version": "3.0.9-alpha.0",
4
4
  "description": "",
5
5
  "main": "src/index.js",
6
6
  "scripts": {
7
7
  "precommit": "lint-staged",
8
- "start": "webpack-dev-server"
8
+ "start": "webpack-dev-server",
9
+ "publish-latest": "npm publish --force-publish --registry https://registry.npmjs.org/",
10
+ "publish-beta": "npm publish --force-publish --dist-tag beta --preid beta --registry https://registry.npmjs.org/",
11
+ "publish-alpha": "npm publish --force-publish --dist-tag alpha --preid alpha --registry https://registry.npmjs.org/"
9
12
  },
10
13
  "lint-staged": {
11
14
  "./src/**/*.js": [
@@ -29,7 +32,8 @@
29
32
  "lodash": "^4.17.10",
30
33
  "moment": "^2.22.2",
31
34
  "react": "^16.8.5",
32
- "react-dom": "^16.8.5"
35
+ "react-dom": "^16.8.5",
36
+ "qrcode.react": "^0.9.2"
33
37
  },
34
38
  "dependencies": {
35
39
  "clipboard": "^2.0.1",
@@ -37,7 +41,8 @@
37
41
  "gm-util": "^5.10.4",
38
42
  "mobx": "^4.3.0",
39
43
  "mobx-react": "^6.1.1",
40
- "precss": "^4.0.0"
44
+ "precss": "^4.0.0",
45
+ "qrcode.react": "^0.9.2"
41
46
  },
42
47
  "devDependencies": {
43
48
  "@babel/cli": "^7.6.0",
@@ -86,6 +91,7 @@
86
91
  "url-loader": "^1.0.1",
87
92
  "webpack": "^4.10.1",
88
93
  "webpack-cli": "^3.3.0",
89
- "webpack-dev-server": "^3.1.4"
94
+ "webpack-dev-server": "^3.1.4",
95
+ "jsbarcode": "^3.11.0"
90
96
  }
91
97
  }
@@ -0,0 +1,26 @@
1
+ import React from 'react'
2
+ import jsBarcode from 'jsbarcode'
3
+ import PropTypes from 'prop-types'
4
+
5
+ class BarCode extends React.Component {
6
+ barcode = React.createRef()
7
+
8
+ componentDidMount () {
9
+ const { value, ...rest } = this.props
10
+ jsBarcode(this.barcode.current, value, {
11
+ ...rest
12
+ })
13
+ }
14
+
15
+ render () {
16
+ const { dataName } = this.props
17
+ return <svg data-name={dataName} ref={this.barcode}/>
18
+ }
19
+ }
20
+
21
+ BarCode.propTypes = {
22
+ value: PropTypes.string,
23
+ dataName: PropTypes.string
24
+ }
25
+
26
+ export default BarCode
@@ -0,0 +1,43 @@
1
+ import React from 'react'
2
+ import Printer from './printer'
3
+ import _ from 'lodash'
4
+ import PropTypes from 'prop-types'
5
+
6
+ class BatchPrinter extends React.Component {
7
+ constructor (props) {
8
+ super(props)
9
+ this.ready = 0
10
+ }
11
+
12
+ handleReady = () => {
13
+ this.ready++
14
+ if (this.ready === this.props.list.length) {
15
+ this.props.onReady()
16
+ }
17
+ }
18
+
19
+ render () {
20
+ const { list, isStation } = this.props
21
+ return _.map(list, ({ config, data }, i) => (
22
+ <Printer
23
+ key={i}
24
+ data={data}
25
+ config={config}
26
+ onReady={this.handleReady}
27
+ isStation={isStation}
28
+ />
29
+ ))
30
+ }
31
+ }
32
+
33
+ BatchPrinter.propTypes = {
34
+ list: PropTypes.array.isRequired,
35
+ onReady: PropTypes.func,
36
+ isStation: PropTypes.bool
37
+ }
38
+
39
+ BatchPrinter.defaultProps = {
40
+ onReady: _.noop
41
+ }
42
+
43
+ export default BatchPrinter
@@ -2,8 +2,10 @@ import React from 'react'
2
2
  import PropTypes from 'prop-types'
3
3
  import classNames from 'classnames'
4
4
  import { observer } from 'mobx-react'
5
- import { getStyleWithDiff, dispatchMsg, template } from '../util'
5
+ import { getStyleWithDiff, dispatchMsg, template, miniAppLink } from '../util'
6
6
  import TableType from './components/table_type'
7
+ import BarCode from './barcode'
8
+ import QrCode from './qrcode'
7
9
 
8
10
  @observer
9
11
  class Block extends React.Component {
@@ -31,7 +33,7 @@ class Block extends React.Component {
31
33
  }
32
34
  })
33
35
  )
34
- };
36
+ }
35
37
 
36
38
  handleDragEnd = ({ clientX, clientY }) => {
37
39
  const { config } = this.props
@@ -43,7 +45,7 @@ class Block extends React.Component {
43
45
  dispatchMsg('gm-printer-label-block-style-set', {
44
46
  style
45
47
  })
46
- };
48
+ }
47
49
 
48
50
  handleClick = () => {
49
51
  const { index } = this.props
@@ -51,7 +53,7 @@ class Block extends React.Component {
51
53
  dispatchMsg('gm-printer-label-select', {
52
54
  selected: index
53
55
  })
54
- };
56
+ }
55
57
 
56
58
  handleDoubleClick = () => {
57
59
  const {
@@ -67,19 +69,19 @@ class Block extends React.Component {
67
69
  }
68
70
  )
69
71
  }
70
- };
72
+ }
71
73
 
72
74
  handleEditBlur = () => {
73
75
  this.setState({
74
76
  isEdit: false
75
77
  })
76
- };
78
+ }
77
79
 
78
80
  handleText = (e) => {
79
81
  dispatchMsg('gm-printer-label-block-text-set', {
80
82
  text: e.target.value
81
83
  })
82
- };
84
+ }
83
85
 
84
86
  render () {
85
87
  const {
@@ -102,6 +104,7 @@ class Block extends React.Component {
102
104
  },
103
105
  data,
104
106
  className,
107
+ isStation,
105
108
  ...rest
106
109
  } = this.props
107
110
  const { isEdit } = this.state
@@ -122,9 +125,11 @@ class Block extends React.Component {
122
125
  } else if (type === 'line') {
123
126
  content = null
124
127
  } else if (type === 'qrcode') {
125
- content = (
128
+ content = isStation ? (
129
+ <QrCode value={template(qrcode, data)} size={parseInt(style.height)}/>
130
+ ) : (
126
131
  <div
127
- data-qrcode={template(qrcode, data)}
132
+ data-qrcode={miniAppLink + template(qrcode, data)}
128
133
  data-width={style.width}
129
134
  data-height={style.height}
130
135
  data-name={index}
@@ -133,7 +138,12 @@ class Block extends React.Component {
133
138
  />
134
139
  )
135
140
  } else if (type === 'order_qrcode') {
136
- content = (
141
+ content = isStation ? (
142
+ <QrCode
143
+ value={miniAppLink + template(order_qrcode, data)}
144
+ size={parseInt(style.height)}
145
+ />
146
+ ) : (
137
147
  <div
138
148
  data-orderQrcode={template(order_qrcode, data)}
139
149
  data-width={style.width}
@@ -144,7 +154,18 @@ class Block extends React.Component {
144
154
  />
145
155
  )
146
156
  } else if (type === 'barcode') {
147
- content = (
157
+ content = isStation ? (
158
+ <BarCode
159
+ value={template(barcode, data)}
160
+ textMargin={0}
161
+ margin={0}
162
+ height={parseInt(style.height) - 14}
163
+ width={2}
164
+ displayValue={false}
165
+ dataName={barcode}
166
+ background='transparent'
167
+ />
168
+ ) : (
148
169
  <div
149
170
  data-packagecode='验货条形码'
150
171
  data-name={index}
@@ -161,7 +182,18 @@ class Block extends React.Component {
161
182
  </div>
162
183
  )
163
184
  } else if (type === 'in_stock_barcode') {
164
- content = (
185
+ content = isStation ? (
186
+ <BarCode
187
+ value={template(in_stock_barcode, data)}
188
+ textMargin={0}
189
+ margin={0}
190
+ height={parseInt(style.height) - 14}
191
+ width={2}
192
+ displayValue={false}
193
+ dataName={in_stock_barcode}
194
+ background='transparent'
195
+ />
196
+ ) : (
165
197
  <div
166
198
  data-instockcode='入库条码'
167
199
  data-name={index}
@@ -178,7 +210,18 @@ class Block extends React.Component {
178
210
  </div>
179
211
  )
180
212
  } else if (type === 'production_barcode') {
181
- content = (
213
+ content = isStation ? (
214
+ <BarCode
215
+ value={template(production_barcode, data)}
216
+ textMargin={0}
217
+ margin={0}
218
+ height={parseInt(style.height) - 14}
219
+ width={2}
220
+ displayValue={false}
221
+ dataName={production_barcode}
222
+ background='transparent'
223
+ />
224
+ ) : (
182
225
  <div
183
226
  data-productionbarcode='商品条码'
184
227
  data-name={index}
@@ -195,7 +238,12 @@ class Block extends React.Component {
195
238
  </div>
196
239
  )
197
240
  } else if (type === 'package_id_qrcode') {
198
- content = (
241
+ content = isStation ? (
242
+ <QrCode
243
+ value={template(package_id_qrcode, data)}
244
+ size={parseInt(style.height)}
245
+ />
246
+ ) : (
199
247
  <div
200
248
  data-packageqrcode={template(package_id_qrcode, data)}
201
249
  data-width={style.width}
@@ -206,7 +254,18 @@ class Block extends React.Component {
206
254
  />
207
255
  )
208
256
  } else if (type === 'diycode') {
209
- content = (
257
+ content = isStation ? (
258
+ <BarCode
259
+ value={template(diycode, data)}
260
+ textMargin={0}
261
+ margin={0}
262
+ height={35}
263
+ width={2}
264
+ displayValue={false}
265
+ dataName={'diycode'}
266
+ background='transparent'
267
+ />
268
+ ) : (
210
269
  <div
211
270
  data-diycode='自定义编码条形码'
212
271
  data-name={index}
@@ -223,7 +282,9 @@ class Block extends React.Component {
223
282
  </div>
224
283
  )
225
284
  } else if (type === 'diyqrcode') {
226
- content = (
285
+ content = isStation ? (
286
+ <QrCode value={template(text, data)} size={parseInt(style.height)}/>
287
+ ) : (
227
288
  <div
228
289
  data-diyqrcode={template(text, data)}
229
290
  data-width={style.width}
@@ -284,7 +345,8 @@ Block.propTypes = {
284
345
  index: PropTypes.number.isRequired,
285
346
  config: PropTypes.object.isRequired,
286
347
  data: PropTypes.object.isRequired,
287
- selected: PropTypes.number
348
+ selected: PropTypes.number,
349
+ isStation: PropTypes.bool
288
350
  }
289
351
 
290
352
  export default Block
@@ -2,11 +2,15 @@ import React from 'react'
2
2
  import ReactDOMServer from 'react-dom/server'
3
3
  import Printer from './printer'
4
4
  import _ from 'lodash'
5
+ import { isZoom } from 'gm-util'
6
+ import ReactDOM from 'react-dom'
7
+ import BatchPrinter from './batch_printer'
5
8
 
6
9
  // eslint-disable-next-line
7
- import normalizeCSS from "css-loader!./normalize.csss";
10
+ import normalizeCSS from 'css-loader!./normalize.csss'
8
11
  // eslint-disable-next-line
9
- import printerCSS from "css-loader!postcss-loader!less-loader!./style.lesss";
12
+ import printerCSS from 'css-loader!postcss-loader!less-loader!./style.lesss'
13
+ import { afterImgAndSvgLoaded } from '../util'
10
14
 
11
15
  function getHtml (props) {
12
16
  return ReactDOMServer.renderToString(<Printer {...props}/>)
@@ -26,4 +30,82 @@ function getCSS () {
26
30
  return normalizeCSS.toString() + printerCSS.toString()
27
31
  }
28
32
 
29
- export { getHtml, getBatchHtml, getCSS, Printer }
33
+ const printerId = '_gm-printer_' + Math.random()
34
+ let $printer = window.document.getElementById(printerId)
35
+
36
+ /**
37
+ * @param {boolean} isTest 是否test
38
+ * @param {boolean} isTipZoom zoom的时候是否提示
39
+ */
40
+ function init ({ isTest, isTipZoom = true } = {}) {
41
+ isTipZoom &&
42
+ isZoom() &&
43
+ window.alert(
44
+ '检测您的浏览器使用了缩放,为了避免影响打印布局,请重置缩放到100%后再进行打印'
45
+ )
46
+ if (!$printer) {
47
+ $printer = window.document.createElement('iframe')
48
+ $printer.id = printerId
49
+ $printer.style.position = 'fixed'
50
+ $printer.style.top = '0'
51
+ $printer.style.width = '100%' // 使移动端可滚动
52
+ if (isTest) {
53
+ // 模板编辑[测试打印],隐藏起来
54
+ // $printer.style.left = '-2000px'
55
+ } else {
56
+ $printer.style.left = '0px'
57
+ $printer.style.height = '100vh'
58
+ }
59
+ window.document.body.appendChild($printer)
60
+
61
+ const idocument = $printer.contentDocument
62
+ idocument.open()
63
+ idocument.write('<!DOCTYPE html><html><head></head><body></body></html>')
64
+ idocument.close()
65
+
66
+ const doc = $printer.contentWindow.document
67
+
68
+ const style = doc.createElement('style')
69
+ style.type = 'text/css'
70
+ style.appendChild(doc.createTextNode(getCSS()))
71
+ doc.head.appendChild(style)
72
+
73
+ const div = doc.createElement('div')
74
+ div.id = 'appContainer'
75
+
76
+ doc.body.appendChild(div)
77
+ }
78
+ }
79
+
80
+ function doBatchPrint (
81
+ list,
82
+ isTest,
83
+ extraCofnig = { isPrint: true, isTipZoom: true },
84
+ isStation = false
85
+ ) {
86
+ init({ isTest, isTipZoom: extraCofnig.isTipZoom })
87
+
88
+ return toDoPrintBatch(list, extraCofnig.isPrint, isStation)
89
+ }
90
+
91
+ function toDoPrintBatch (list, isPrint = true, isStation = false) {
92
+ return new window.Promise((resolve) => {
93
+ const $app = $printer.contentWindow.document.getElementById('appContainer')
94
+
95
+ ReactDOM.unmountComponentAtNode($app)
96
+ ReactDOM.render(
97
+ <BatchPrinter
98
+ list={list}
99
+ isStation={isStation}
100
+ onReady={() => {
101
+ afterImgAndSvgLoaded(() => {
102
+ isPrint && $printer.contentWindow.print()
103
+ resolve()
104
+ }, $app)
105
+ }}
106
+ />,
107
+ $app
108
+ )
109
+ })
110
+ }
111
+ export { getHtml, getBatchHtml, getCSS, Printer, doBatchPrint }
@@ -8,15 +8,27 @@ import { pageTypeMap } from '../common/config'
8
8
 
9
9
  @observer
10
10
  class Printer extends React.Component {
11
+ componentDidMount () {
12
+ // Printer 不是立马就呈现出最终样式,有个过程。这个过程需要时间,什么 ready,不太清楚,估借 setState 来获取过程结束时刻
13
+ this.setState({}, () => {
14
+ this.props.onReady && this.props.onReady()
15
+ })
16
+ }
17
+
11
18
  render () {
12
- const { config, selected, data } = this.props
19
+ const { config, selected, data, isStation } = this.props
13
20
  const { type, style, customizeWidth, customizeHeight } = config.page
14
21
  return (
15
- <div className='gm-printer-label' style={{
16
- ...style,
17
- width: type === '-1' ? customizeWidth + 'mm' : pageTypeMap[type].width,
18
- height: type === '-1' ? customizeHeight + 'mm' : pageTypeMap[type].height
19
- }}>
22
+ <div
23
+ className='gm-printer-label'
24
+ style={{
25
+ ...style,
26
+ width:
27
+ type === '-1' ? customizeWidth + 'mm' : pageTypeMap[type].width,
28
+ height:
29
+ type === '-1' ? customizeHeight + 'mm' : pageTypeMap[type].height
30
+ }}
31
+ >
20
32
  <Page config={config.page}>
21
33
  {_.map(config.blocks, (block, i) => (
22
34
  <Block
@@ -25,6 +37,7 @@ class Printer extends React.Component {
25
37
  selected={selected}
26
38
  config={block}
27
39
  data={data}
40
+ isStation={isStation}
28
41
  />
29
42
  ))}
30
43
  </Page>
@@ -36,7 +49,9 @@ class Printer extends React.Component {
36
49
  Printer.propTypes = {
37
50
  selected: PropTypes.number,
38
51
  config: PropTypes.object.isRequired,
39
- data: PropTypes.object.isRequired // 格式化后的数据
52
+ data: PropTypes.object.isRequired, // 格式化后的数据
53
+ onReady: PropTypes.func,
54
+ isStation: PropTypes.bool
40
55
  }
41
56
 
42
57
  export default Printer
@@ -0,0 +1,17 @@
1
+ import React from 'react'
2
+ import QRCode from 'qrcode.react'
3
+ import PropTypes from 'prop-types'
4
+ import _ from 'lodash'
5
+
6
+ const QrCode = props => {
7
+ const { value, size } = props
8
+ return (
9
+ <QRCode renderAs='svg' value={value} size={_.isFinite(size) ? size : 75}/>
10
+ )
11
+ }
12
+
13
+ QrCode.propTypes = {
14
+ value: PropTypes.string.isRequired,
15
+ size: PropTypes.number.isRequired
16
+ }
17
+ export default QrCode
package/src/util.js CHANGED
@@ -35,9 +35,11 @@ function insertCSS (cssString, target) {
35
35
  }
36
36
 
37
37
  function dispatchMsg (event, data) {
38
- window.document.dispatchEvent(new window.CustomEvent(event, {
39
- detail: data
40
- }))
38
+ window.document.dispatchEvent(
39
+ new window.CustomEvent(event, {
40
+ detail: data
41
+ })
42
+ )
41
43
  }
42
44
  function substring (target, start = 0, end) {
43
45
  return target.substring(start, end)
@@ -56,10 +58,30 @@ function template (text, data) {
56
58
  }
57
59
  }
58
60
 
61
+ let timer
62
+
63
+ function afterImgAndSvgLoaded (callback, $printer) {
64
+ const $imgList = $printer.querySelectorAll('img')
65
+ const $svgList = $printer.querySelectorAll('svg')
66
+
67
+ clearTimeout(timer)
68
+
69
+ const everyThingIsOk =
70
+ _.every($imgList, (img) => img.complete) &&
71
+ _.every($svgList, (svg) => svg.children.length)
72
+ if (everyThingIsOk) {
73
+ callback()
74
+ } else {
75
+ timer = setTimeout(afterImgAndSvgLoaded.bind(this, callback, $printer), 300)
76
+ }
77
+ }
78
+ const miniAppLink = 'https://miniapp.guanmai.cn/traceability/?id='
59
79
  export {
60
80
  pxAdd,
61
81
  getStyleWithDiff,
62
82
  insertCSS,
63
83
  dispatchMsg,
64
- template
84
+ template,
85
+ afterImgAndSvgLoaded,
86
+ miniAppLink
65
87
  }