gm-printer 10.41.1 → 10.41.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/build/demo.js +9 -9
- package/package.json +1 -1
- package/src/common/data_key_util.js +35 -0
- package/src/common/editor_edit_field.js +208 -164
- package/src/common/editor_store.js +35 -12
- package/src/common/util.js +58 -4
- package/src/editor_purchase/editor.js +2 -1
- package/src/editor_purchase/editor_special_table.js +39 -17
- package/src/editor_purchase/editor_sum_table.js +5 -1
- package/src/editor_purchase/store.js +48 -45
- package/src/printer/long_print_table/index.js +14 -4
- package/src/printer/printer.js +20 -0
- package/src/printer/store.js +16 -11
- package/src/printer/table.js +11 -3
- package/src/printer/table_overallOrder_tr.js +49 -37
|
@@ -12,54 +12,66 @@ const OverallOrder = props => {
|
|
|
12
12
|
printerStore,
|
|
13
13
|
printerStore: {
|
|
14
14
|
data: { common }
|
|
15
|
-
}
|
|
15
|
+
},
|
|
16
|
+
isLastTablePage
|
|
16
17
|
} = props
|
|
17
18
|
|
|
18
|
-
|
|
19
|
+
// showEachPage 默认 true（老模板缺省视为每页展示）；false 时仅表格最后一页渲染
|
|
20
|
+
const showEachPage = overallOrder?.showEachPage !== false
|
|
21
|
+
const shouldShow =
|
|
19
22
|
overallOrder?.show &&
|
|
20
|
-
printerStore?.ready &&
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
23
|
+
printerStore?.ready &&
|
|
24
|
+
(showEachPage || isLastTablePage)
|
|
25
|
+
|
|
26
|
+
if (!shouldShow) return null
|
|
27
|
+
|
|
28
|
+
return (
|
|
29
|
+
<tr>
|
|
30
|
+
{_.map(overallOrder.fields, (item, index) => {
|
|
31
|
+
return (
|
|
32
|
+
<td colSpan={item.colSpan} key={index}>
|
|
33
|
+
<div style={{ ...item.style }} className='gm-flex-page'>
|
|
34
|
+
{item.name}
|
|
35
|
+
<div
|
|
36
|
+
className={classNames('gm-flex-page', {
|
|
37
|
+
'gm-flex-justify-between-page':
|
|
38
|
+
overallOrder?.isUpperLowerCaseSeparate,
|
|
39
|
+
'gm-flex-grow-page': overallOrder?.isUpperLowerCaseSeparate
|
|
40
|
+
})}
|
|
41
|
+
>
|
|
42
|
+
<span
|
|
43
|
+
className={
|
|
44
|
+
overallOrder?.isUpperCaseBefore
|
|
45
|
+
? 'gm-printer-subtotal-isUpperCaseBefore-inter'
|
|
46
|
+
: ''
|
|
47
|
+
}
|
|
33
48
|
>
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
{common?.[item.valueField] ?? ''}
|
|
49
|
+
{common?.[item.valueField] ?? ''}
|
|
50
|
+
</span>
|
|
51
|
+
{overallOrder?.needUpperCase && (
|
|
52
|
+
<span>
|
|
53
|
+
{common?.[item.valueField]
|
|
54
|
+
? coverDigit2Uppercase(common[item.valueField])
|
|
55
|
+
: ''}
|
|
42
56
|
</span>
|
|
43
|
-
|
|
44
|
-
<span>
|
|
45
|
-
{common?.[item.valueField]
|
|
46
|
-
? coverDigit2Uppercase(common[item.valueField])
|
|
47
|
-
: ''}
|
|
48
|
-
</span>
|
|
49
|
-
)}
|
|
50
|
-
</div>
|
|
57
|
+
)}
|
|
51
58
|
</div>
|
|
52
|
-
</
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
59
|
+
</div>
|
|
60
|
+
</td>
|
|
61
|
+
)
|
|
62
|
+
})}
|
|
63
|
+
</tr>
|
|
57
64
|
)
|
|
58
65
|
}
|
|
59
66
|
OverallOrder.propTypes = {
|
|
60
67
|
config: PropTypes.object.isRequired,
|
|
61
68
|
range: PropTypes.object.isRequired,
|
|
62
|
-
printerStore: PropTypes.object
|
|
69
|
+
printerStore: PropTypes.object,
|
|
70
|
+
isLastTablePage: PropTypes.bool
|
|
71
|
+
}
|
|
72
|
+
|
|
73
|
+
OverallOrder.defaultProps = {
|
|
74
|
+
isLastTablePage: true
|
|
63
75
|
}
|
|
64
76
|
|
|
65
77
|
export default observer(OverallOrder)
|