gm-printer-label 3.0.9-alpha.2 → 3.0.9-beta.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","/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":9620,"mtime":1643263820878},{"size":825,"mtime":1642499158040},{"size":548,"mtime":1643102755561},{"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",[]]
1
+ [{"/Volumes/GM/gm-printer-label/src/printer/printer.js":"1","/Volumes/GM/gm-printer-label/src/common/config.js":"2"},{"size":1229,"mtime":1644819297912},{"size":1109,"mtime":1644819243904}]
package/package.json CHANGED
@@ -1,14 +1,11 @@
1
1
  {
2
2
  "name": "gm-printer-label",
3
- "version": "3.0.9-alpha.2",
3
+ "version": "3.0.9-beta.0",
4
4
  "description": "",
5
5
  "main": "src/index.js",
6
6
  "scripts": {
7
7
  "precommit": "lint-staged",
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/"
8
+ "start": "webpack-dev-server"
12
9
  },
13
10
  "lint-staged": {
14
11
  "./src/**/*.js": [
@@ -32,8 +29,7 @@
32
29
  "lodash": "^4.17.10",
33
30
  "moment": "^2.22.2",
34
31
  "react": "^16.8.5",
35
- "react-dom": "^16.8.5",
36
- "qrcode.react": "^0.9.2"
32
+ "react-dom": "^16.8.5"
37
33
  },
38
34
  "dependencies": {
39
35
  "clipboard": "^2.0.1",
@@ -41,8 +37,7 @@
41
37
  "gm-util": "^5.10.4",
42
38
  "mobx": "^4.3.0",
43
39
  "mobx-react": "^6.1.1",
44
- "precss": "^4.0.0",
45
- "qrcode.react": "^0.9.2"
40
+ "precss": "^4.0.0"
46
41
  },
47
42
  "devDependencies": {
48
43
  "@babel/cli": "^7.6.0",
@@ -91,7 +86,6 @@
91
86
  "url-loader": "^1.0.1",
92
87
  "webpack": "^4.10.1",
93
88
  "webpack-cli": "^3.3.0",
94
- "webpack-dev-server": "^3.1.4",
95
- "jsbarcode": "^3.11.0"
89
+ "webpack-dev-server": "^3.1.4"
96
90
  }
97
91
  }
@@ -32,6 +32,31 @@ const pageTypeMap = {
32
32
  '40X30': {
33
33
  width: '40mm',
34
34
  height: '28mm'
35
+ },
36
+ // 箱签
37
+ A4: {
38
+ width: '210mm',
39
+ height: '297mm'
40
+ },
41
+ A5: {
42
+ width: '148mm',
43
+ height: '210mm'
44
+ },
45
+ 'A4/2': {
46
+ width: '210mm',
47
+ height: '140mm'
48
+ },
49
+ 'A4/3': {
50
+ width: '210mm',
51
+ height: '93mm'
52
+ },
53
+ '241x280': {
54
+ width: '241mm',
55
+ height: '280mm'
56
+ },
57
+ '241x140': {
58
+ width: '241mm',
59
+ height: '140mm'
35
60
  }
36
61
  }
37
62
 
@@ -41,7 +66,4 @@ const borderStyleList = [
41
66
  { value: 'dotted', text: i18next.t('圆点') }
42
67
  ]
43
68
 
44
- export {
45
- borderStyleList,
46
- pageTypeMap
47
- }
69
+ export { borderStyleList, pageTypeMap }
@@ -2,10 +2,8 @@ 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, miniAppLink } from '../util'
5
+ import { getStyleWithDiff, dispatchMsg, template } from '../util'
6
6
  import TableType from './components/table_type'
7
- import BarCode from './barcode'
8
- import QrCode from './qrcode'
9
7
 
10
8
  @observer
11
9
  class Block extends React.Component {
@@ -33,7 +31,7 @@ class Block extends React.Component {
33
31
  }
34
32
  })
35
33
  )
36
- }
34
+ };
37
35
 
38
36
  handleDragEnd = ({ clientX, clientY }) => {
39
37
  const { config } = this.props
@@ -45,7 +43,7 @@ class Block extends React.Component {
45
43
  dispatchMsg('gm-printer-label-block-style-set', {
46
44
  style
47
45
  })
48
- }
46
+ };
49
47
 
50
48
  handleClick = () => {
51
49
  const { index } = this.props
@@ -53,7 +51,7 @@ class Block extends React.Component {
53
51
  dispatchMsg('gm-printer-label-select', {
54
52
  selected: index
55
53
  })
56
- }
54
+ };
57
55
 
58
56
  handleDoubleClick = () => {
59
57
  const {
@@ -69,19 +67,19 @@ class Block extends React.Component {
69
67
  }
70
68
  )
71
69
  }
72
- }
70
+ };
73
71
 
74
72
  handleEditBlur = () => {
75
73
  this.setState({
76
74
  isEdit: false
77
75
  })
78
- }
76
+ };
79
77
 
80
78
  handleText = (e) => {
81
79
  dispatchMsg('gm-printer-label-block-text-set', {
82
80
  text: e.target.value
83
81
  })
84
- }
82
+ };
85
83
 
86
84
  render () {
87
85
  const {
@@ -104,7 +102,6 @@ class Block extends React.Component {
104
102
  },
105
103
  data,
106
104
  className,
107
- isStation,
108
105
  ...rest
109
106
  } = this.props
110
107
  const { isEdit } = this.state
@@ -125,12 +122,7 @@ class Block extends React.Component {
125
122
  } else if (type === 'line') {
126
123
  content = null
127
124
  } else if (type === 'qrcode') {
128
- content = isStation ? (
129
- <QrCode
130
- value={miniAppLink + template(qrcode, data)}
131
- size={parseInt(style.height)}
132
- />
133
- ) : (
125
+ content = (
134
126
  <div
135
127
  data-qrcode={template(qrcode, data)}
136
128
  data-width={style.width}
@@ -141,12 +133,7 @@ class Block extends React.Component {
141
133
  />
142
134
  )
143
135
  } else if (type === 'order_qrcode') {
144
- content = isStation ? (
145
- <QrCode
146
- value={miniAppLink + template(order_qrcode, data)}
147
- size={parseInt(style.height)}
148
- />
149
- ) : (
136
+ content = (
150
137
  <div
151
138
  data-orderQrcode={template(order_qrcode, data)}
152
139
  data-width={style.width}
@@ -157,21 +144,7 @@ class Block extends React.Component {
157
144
  />
158
145
  )
159
146
  } else if (type === 'barcode') {
160
- content = isStation ? (
161
- <>
162
- <BarCode
163
- value={template(barcode, data)}
164
- textMargin={0}
165
- margin={0}
166
- height={parseInt(style.height) - 14}
167
- width={2}
168
- displayValue={false}
169
- dataName={barcode}
170
- background='transparent'
171
- />
172
- <div style={{ marginLeft: '50px' }}>{template(barcode, data)}</div>
173
- </>
174
- ) : (
147
+ content = (
175
148
  <div
176
149
  data-packagecode='验货条形码'
177
150
  data-name={index}
@@ -188,18 +161,7 @@ class Block extends React.Component {
188
161
  </div>
189
162
  )
190
163
  } else if (type === 'in_stock_barcode') {
191
- content = isStation ? (
192
- <BarCode
193
- value={template(in_stock_barcode, data)}
194
- textMargin={0}
195
- margin={0}
196
- height={parseInt(style.height) - 14}
197
- width={2}
198
- displayValue={false}
199
- dataName={in_stock_barcode}
200
- background='transparent'
201
- />
202
- ) : (
164
+ content = (
203
165
  <div
204
166
  data-instockcode='入库条码'
205
167
  data-name={index}
@@ -216,18 +178,7 @@ class Block extends React.Component {
216
178
  </div>
217
179
  )
218
180
  } else if (type === 'production_barcode') {
219
- content = isStation ? (
220
- <BarCode
221
- value={template(production_barcode, data)}
222
- textMargin={0}
223
- margin={0}
224
- height={parseInt(style.height) - 14}
225
- width={2}
226
- displayValue={false}
227
- dataName={production_barcode}
228
- background='transparent'
229
- />
230
- ) : (
181
+ content = (
231
182
  <div
232
183
  data-productionbarcode='商品条码'
233
184
  data-name={index}
@@ -244,12 +195,7 @@ class Block extends React.Component {
244
195
  </div>
245
196
  )
246
197
  } else if (type === 'package_id_qrcode') {
247
- content = isStation ? (
248
- <QrCode
249
- value={template(package_id_qrcode, data)}
250
- size={parseInt(style.height)}
251
- />
252
- ) : (
198
+ content = (
253
199
  <div
254
200
  data-packageqrcode={template(package_id_qrcode, data)}
255
201
  data-width={style.width}
@@ -260,21 +206,7 @@ class Block extends React.Component {
260
206
  />
261
207
  )
262
208
  } else if (type === 'diycode') {
263
- content = isStation ? (
264
- <>
265
- <BarCode
266
- value={template(diycode, data)}
267
- textMargin={0}
268
- margin={0}
269
- height={35}
270
- width={2}
271
- displayValue={false}
272
- dataName={'diycode'}
273
- background='transparent'
274
- />
275
- <div style={{ marginLeft: '50px' }}>{template(diycode, data)}</div>
276
- </>
277
- ) : (
209
+ content = (
278
210
  <div
279
211
  data-diycode='自定义编码条形码'
280
212
  data-name={index}
@@ -291,9 +223,7 @@ class Block extends React.Component {
291
223
  </div>
292
224
  )
293
225
  } else if (type === 'diyqrcode') {
294
- content = isStation ? (
295
- <QrCode value={template(text, data)} size={parseInt(style.height)}/>
296
- ) : (
226
+ content = (
297
227
  <div
298
228
  data-diyqrcode={template(text, data)}
299
229
  data-width={style.width}
@@ -354,8 +284,7 @@ Block.propTypes = {
354
284
  index: PropTypes.number.isRequired,
355
285
  config: PropTypes.object.isRequired,
356
286
  data: PropTypes.object.isRequired,
357
- selected: PropTypes.number,
358
- isStation: PropTypes.bool
287
+ selected: PropTypes.number
359
288
  }
360
289
 
361
290
  export default Block
@@ -2,15 +2,11 @@ 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'
8
5
 
9
6
  // eslint-disable-next-line
10
- import normalizeCSS from 'css-loader!./normalize.csss'
7
+ import normalizeCSS from "css-loader!./normalize.csss";
11
8
  // eslint-disable-next-line
12
- import printerCSS from 'css-loader!postcss-loader!less-loader!./style.lesss'
13
- import { afterImgAndSvgLoaded } from '../util'
9
+ import printerCSS from "css-loader!postcss-loader!less-loader!./style.lesss";
14
10
 
15
11
  function getHtml (props) {
16
12
  return ReactDOMServer.renderToString(<Printer {...props}/>)
@@ -30,82 +26,4 @@ function getCSS () {
30
26
  return normalizeCSS.toString() + printerCSS.toString()
31
27
  }
32
28
 
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 }
29
+ export { getHtml, getBatchHtml, getCSS, Printer }
@@ -8,25 +8,17 @@ 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
-
18
11
  render () {
19
- const { config, selected, data, isStation } = this.props
12
+ const { config, selected, data } = this.props
20
13
  const { type, style, customizeWidth, customizeHeight } = config.page
14
+ const isDiy = type === '-1' || type === 'diy'
21
15
  return (
22
16
  <div
23
17
  className='gm-printer-label'
24
18
  style={{
25
19
  ...style,
26
- width:
27
- type === '-1' ? customizeWidth + 'mm' : pageTypeMap[type].width,
28
- height:
29
- type === '-1' ? customizeHeight + 'mm' : pageTypeMap[type].height
20
+ width: isDiy ? customizeWidth + 'mm' : pageTypeMap[type].width,
21
+ height: isDiy ? customizeHeight + 'mm' : pageTypeMap[type].height
30
22
  }}
31
23
  >
32
24
  <Page config={config.page}>
@@ -37,7 +29,6 @@ class Printer extends React.Component {
37
29
  selected={selected}
38
30
  config={block}
39
31
  data={data}
40
- isStation={isStation}
41
32
  />
42
33
  ))}
43
34
  </Page>
@@ -49,9 +40,7 @@ class Printer extends React.Component {
49
40
  Printer.propTypes = {
50
41
  selected: PropTypes.number,
51
42
  config: PropTypes.object.isRequired,
52
- data: PropTypes.object.isRequired, // 格式化后的数据
53
- onReady: PropTypes.func,
54
- isStation: PropTypes.bool
43
+ data: PropTypes.object.isRequired // 格式化后的数据
55
44
  }
56
45
 
57
46
  export default Printer
package/src/util.js CHANGED
@@ -35,11 +35,9 @@ function insertCSS (cssString, target) {
35
35
  }
36
36
 
37
37
  function dispatchMsg (event, data) {
38
- window.document.dispatchEvent(
39
- new window.CustomEvent(event, {
40
- detail: data
41
- })
42
- )
38
+ window.document.dispatchEvent(new window.CustomEvent(event, {
39
+ detail: data
40
+ }))
43
41
  }
44
42
  function substring (target, start = 0, end) {
45
43
  return target.substring(start, end)
@@ -58,30 +56,10 @@ function template (text, data) {
58
56
  }
59
57
  }
60
58
 
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='
79
59
  export {
80
60
  pxAdd,
81
61
  getStyleWithDiff,
82
62
  insertCSS,
83
63
  dispatchMsg,
84
- template,
85
- afterImgAndSvgLoaded,
86
- miniAppLink
64
+ template
87
65
  }
package/.prettierrc.js DELETED
@@ -1,5 +0,0 @@
1
- module.exports = {
2
- semi: false,
3
- singleQuote: true,
4
- jsxSingleQuote: true,
5
- };
@@ -1,27 +0,0 @@
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
- if (!value) return
11
- jsBarcode(this.barcode.current, value, {
12
- ...rest
13
- })
14
- }
15
-
16
- render () {
17
- const { dataName } = this.props
18
- return <svg data-name={dataName} ref={this.barcode}/>
19
- }
20
- }
21
-
22
- BarCode.propTypes = {
23
- value: PropTypes.string,
24
- dataName: PropTypes.string
25
- }
26
-
27
- export default BarCode
@@ -1,43 +0,0 @@
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
@@ -1,17 +0,0 @@
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