gm-printer-label 3.0.9-alpha.1 → 3.0.9-alpha.2

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":9350,"mtime":1642499166536},{"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
+ [{"/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",[]]
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "gm-printer-label",
3
- "version": "3.0.9-alpha.1",
3
+ "version": "3.0.9-alpha.2",
4
4
  "description": "",
5
5
  "main": "src/index.js",
6
6
  "scripts": {
@@ -126,10 +126,13 @@ class Block extends React.Component {
126
126
  content = null
127
127
  } else if (type === 'qrcode') {
128
128
  content = isStation ? (
129
- <QrCode value={template(qrcode, data)} size={parseInt(style.height)}/>
129
+ <QrCode
130
+ value={miniAppLink + template(qrcode, data)}
131
+ size={parseInt(style.height)}
132
+ />
130
133
  ) : (
131
134
  <div
132
- data-qrcode={miniAppLink + template(qrcode, data)}
135
+ data-qrcode={template(qrcode, data)}
133
136
  data-width={style.width}
134
137
  data-height={style.height}
135
138
  data-name={index}
@@ -155,16 +158,19 @@ class Block extends React.Component {
155
158
  )
156
159
  } else if (type === 'barcode') {
157
160
  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
- />
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
+ </>
168
174
  ) : (
169
175
  <div
170
176
  data-packagecode='验货条形码'
@@ -255,16 +261,19 @@ class Block extends React.Component {
255
261
  )
256
262
  } else if (type === 'diycode') {
257
263
  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
- />
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
+ </>
268
277
  ) : (
269
278
  <div
270
279
  data-diycode='自定义编码条形码'