gm-printer-label 3.0.11 → 3.0.14
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
|
-
[{"/Volumes/gm-project/gm-printer-label/src/index.js":"1","/Volumes/gm-project/gm-printer-label/src/common/editor_compoents/edit_modify_filed.js":"2","/Volumes/gm-project/gm-printer-label/src/common/config.js":"3"},{"size":180,"mtime":1658462117054,"results":"
|
|
1
|
+
[{"/Volumes/gm-project/gm-printer-label/src/index.js":"1","/Volumes/gm-project/gm-printer-label/src/common/editor_compoents/edit_modify_filed.js":"2","/Volumes/gm-project/gm-printer-label/src/common/config.js":"3","/Volumes/gm-project/gm-printer-label/src/common/editor_compoents/store.js":"4","/Volumes/gm-project/gm-printer-label/src/util.js":"5","/Volumes/gm-project/gm-printer-label/src/printer/printer.js":"6","/Volumes/gm-project/gm-printer-label/src/printer/page.js":"7","/Volumes/gm-project/gm-printer-label/src/printer/block.js":"8","/Volumes/gm-project/gm-printer-label/src/common/editor_compoents/edit.js":"9"},{"size":180,"mtime":1658462117054,"results":"10","hashOfConfig":"11"},{"size":4629,"mtime":1658462013375},{"size":1699,"mtime":1658461960259},{"size":7194,"mtime":1658890412916,"results":"12","hashOfConfig":"11"},{"size":1937,"mtime":1661225223156,"results":"13","hashOfConfig":"11"},{"size":1859,"mtime":1661225223156,"results":"14","hashOfConfig":"11"},{"size":411,"mtime":1660567552793},{"size":10456,"mtime":1661225238153},{"size":2958,"mtime":1660567552792},{"filePath":"15","messages":"16","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"17s6x9q",{"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},"/Volumes/gm-project/gm-printer-label/src/index.js",[],"/Volumes/gm-project/gm-printer-label/src/common/editor_compoents/store.js",[],"/Volumes/gm-project/gm-printer-label/src/util.js",[],"/Volumes/gm-project/gm-printer-label/src/printer/printer.js",[]]
|
package/package.json
CHANGED
|
@@ -84,7 +84,8 @@ class EditModifyFiled extends React.Component {
|
|
|
84
84
|
{(type === 'qrcode' ||
|
|
85
85
|
type === 'order_qrcode' ||
|
|
86
86
|
type === 'package_id_qrcode' ||
|
|
87
|
-
type === 'image'
|
|
87
|
+
type === 'image' ||
|
|
88
|
+
type === 'merchandise_trace_qrcode') && (
|
|
88
89
|
<div>
|
|
89
90
|
<Size
|
|
90
91
|
style={style}
|
|
@@ -4,18 +4,18 @@ import i18next from '../../../locales'
|
|
|
4
4
|
|
|
5
5
|
class EditStore {
|
|
6
6
|
@observable
|
|
7
|
-
config = null
|
|
7
|
+
config = null
|
|
8
8
|
|
|
9
9
|
@observable
|
|
10
|
-
selected = null
|
|
10
|
+
selected = null
|
|
11
11
|
|
|
12
12
|
@observable
|
|
13
13
|
// 载入模板下拉框选中的值
|
|
14
|
-
tempKey = null
|
|
14
|
+
tempKey = null
|
|
15
15
|
|
|
16
16
|
@observable
|
|
17
17
|
// 初始模板
|
|
18
|
-
originConfig = null
|
|
18
|
+
originConfig = null
|
|
19
19
|
|
|
20
20
|
@action.bound
|
|
21
21
|
init (config, initDefaultTemp) {
|
|
@@ -114,8 +114,8 @@ class EditStore {
|
|
|
114
114
|
position: 'absolute',
|
|
115
115
|
left: '0px',
|
|
116
116
|
top: '0px',
|
|
117
|
-
width: '
|
|
118
|
-
height: '
|
|
117
|
+
width: '50px',
|
|
118
|
+
height: '50px'
|
|
119
119
|
}
|
|
120
120
|
})
|
|
121
121
|
break
|
|
@@ -277,7 +277,7 @@ class EditStore {
|
|
|
277
277
|
const block = this.config.blocks[this.selected]
|
|
278
278
|
if (
|
|
279
279
|
(!block.type || block.type === 'text') &&
|
|
280
|
-
_.includes(block.text, '时间')
|
|
280
|
+
(_.includes(block.text, '时间') || _.includes(block.text, '日期'))
|
|
281
281
|
) {
|
|
282
282
|
return true
|
|
283
283
|
}
|