ztxkui 3.3.4 → 3.3.7
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/dist/App.js +4 -4
- package/dist/assets/img/water.png +0 -0
- package/dist/components/PrintContainer/print-container.js +1 -1
- package/dist/components/Table/utils/getSummaryData.d.ts +1 -1
- package/dist/components/Table/utils/getSummaryData.js +32 -22
- package/dist/index.css +2 -2
- package/package.json +4 -2
package/dist/App.js
CHANGED
|
@@ -603,8 +603,8 @@ var summaryConfig = [
|
|
|
603
603
|
fields: [
|
|
604
604
|
{
|
|
605
605
|
key: 'invoiceAmount',
|
|
606
|
-
|
|
607
|
-
toFixedNum: 2,
|
|
606
|
+
showKey: ['invoiceAmount', 'invoiceTax'],
|
|
607
|
+
toFixedNum: [2, 3],
|
|
608
608
|
lastFn: function (data) {
|
|
609
609
|
var _a;
|
|
610
610
|
if (Array.isArray(data)) {
|
|
@@ -642,8 +642,8 @@ var summaryConfig = [
|
|
|
642
642
|
},
|
|
643
643
|
{
|
|
644
644
|
key: 'invoiceAmount',
|
|
645
|
-
toFixedNum: 2,
|
|
646
|
-
value: 260417,
|
|
645
|
+
toFixedNum: [2, 3],
|
|
646
|
+
value: [260417, 260417],
|
|
647
647
|
fn: toThousand,
|
|
648
648
|
lastFn: function (data) {
|
|
649
649
|
var _a;
|
|
Binary file
|
|
@@ -54,7 +54,7 @@ import { Button, Spin, message } from '../../index';
|
|
|
54
54
|
import { printCurrentDom, htmlToPdfNoCanvas, htmlToPdf, } from 'ztxkutils/dist/print';
|
|
55
55
|
import { createDownloadUrlNoBase } from 'ztxkutils/dist/fileOperation';
|
|
56
56
|
import { dataURLtoFile, image2Base64 } from './handle';
|
|
57
|
-
import bgWater from '
|
|
57
|
+
import bgWater from '../../assets/img/water.png';
|
|
58
58
|
var fontTTF = {
|
|
59
59
|
data: '',
|
|
60
60
|
};
|
|
@@ -114,15 +114,18 @@ function getSubtotalObj(fields, pageData) {
|
|
|
114
114
|
if (value) {
|
|
115
115
|
// 如果value是数组 那么也要输出数组
|
|
116
116
|
if (Array.isArray(value)) {
|
|
117
|
-
summaryTotalObj[key] =
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
117
|
+
summaryTotalObj[key] = value.map(function (v, index) {
|
|
118
|
+
// 如果传入两个键值 需要小计，那么取对应的值
|
|
119
|
+
var _toFixedNum = Array.isArray(toFixedNum_1)
|
|
120
|
+
? toFixedNum_1[index]
|
|
121
|
+
: toFixedNum_1;
|
|
122
|
+
if (typeof Number(v) === 'number' &&
|
|
123
|
+
!isNaN(Number(v)) &&
|
|
124
|
+
typeof _toFixedNum === 'number') {
|
|
125
|
+
return round(v, _toFixedNum).toFixed(_toFixedNum);
|
|
126
|
+
}
|
|
127
|
+
return v;
|
|
128
|
+
});
|
|
126
129
|
}
|
|
127
130
|
else {
|
|
128
131
|
summaryTotalObj[key] =
|
|
@@ -159,15 +162,19 @@ function getSubtotalObj(fields, pageData) {
|
|
|
159
162
|
var pageItem = typeof _pageItem === 'number' && !isNaN(_pageItem)
|
|
160
163
|
? _pageItem
|
|
161
164
|
: 0;
|
|
165
|
+
// 如果传入两个键值 需要小计，那么取对应的值
|
|
166
|
+
var _toFixedNum = Array.isArray(toFixedNum_1)
|
|
167
|
+
? toFixedNum_1[index]
|
|
168
|
+
: toFixedNum_1;
|
|
162
169
|
if (summaryItem_1) {
|
|
163
170
|
var _summaryItem = summaryItem_1[index];
|
|
164
|
-
return typeof
|
|
165
|
-
? round(plus(_summaryItem, pageItem),
|
|
171
|
+
return typeof _toFixedNum === 'number'
|
|
172
|
+
? round(plus(_summaryItem, pageItem), _toFixedNum).toFixed(_toFixedNum)
|
|
166
173
|
: plus(_summaryItem, pageItem);
|
|
167
174
|
}
|
|
168
175
|
else {
|
|
169
|
-
return typeof
|
|
170
|
-
? round(pageItem,
|
|
176
|
+
return typeof _toFixedNum === 'number'
|
|
177
|
+
? round(pageItem, _toFixedNum).toFixed(_toFixedNum)
|
|
171
178
|
: pageItem;
|
|
172
179
|
}
|
|
173
180
|
});
|
|
@@ -215,15 +222,18 @@ function getTotalObj(fields) {
|
|
|
215
222
|
if (value != null) {
|
|
216
223
|
// 如果value是数组 那么也要输出数组
|
|
217
224
|
if (Array.isArray(value)) {
|
|
218
|
-
summaryTotalObj[key] =
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
|
|
225
|
+
summaryTotalObj[key] = value.map(function (v, index) {
|
|
226
|
+
// 如果传入两个键值 需要小计，那么取对应的值
|
|
227
|
+
var _toFixedNum = Array.isArray(toFixedNum_2)
|
|
228
|
+
? toFixedNum_2[index]
|
|
229
|
+
: toFixedNum_2;
|
|
230
|
+
if (typeof Number(v) === 'number' &&
|
|
231
|
+
!isNaN(Number(v)) &&
|
|
232
|
+
typeof _toFixedNum === 'number') {
|
|
233
|
+
return round(v, _toFixedNum).toFixed(_toFixedNum);
|
|
234
|
+
}
|
|
235
|
+
return v;
|
|
236
|
+
});
|
|
227
237
|
}
|
|
228
238
|
else {
|
|
229
239
|
summaryTotalObj[key] =
|
package/dist/index.css
CHANGED
|
@@ -1884,7 +1884,7 @@ template {
|
|
|
1884
1884
|
}
|
|
1885
1885
|
|
|
1886
1886
|
.bg-water {
|
|
1887
|
-
background: url("
|
|
1887
|
+
background: url("../../assets/img/water.png");
|
|
1888
1888
|
background-repeat: repeat;
|
|
1889
1889
|
background-clip: content-box;
|
|
1890
1890
|
background-size: 50%;
|
|
@@ -1897,7 +1897,7 @@ template {
|
|
|
1897
1897
|
}
|
|
1898
1898
|
|
|
1899
1899
|
.bg-water {
|
|
1900
|
-
background: url("
|
|
1900
|
+
background: url("../../assets/img/water.png");
|
|
1901
1901
|
background-repeat: repeat;
|
|
1902
1902
|
background-clip: content-box;
|
|
1903
1903
|
background-size: 50%;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "ztxkui",
|
|
3
|
-
"version": "3.3.
|
|
3
|
+
"version": "3.3.7",
|
|
4
4
|
"private": false,
|
|
5
5
|
"description": "React components library",
|
|
6
6
|
"author": "zt-front-end",
|
|
@@ -31,11 +31,12 @@
|
|
|
31
31
|
"clean": "rimraf ./dist",
|
|
32
32
|
"start": "react-scripts start",
|
|
33
33
|
"build": "react-scripts build",
|
|
34
|
-
"build-lib": "npm run clean & npm run build-ts & npm run build-css",
|
|
34
|
+
"build-lib": "npm run clean & npm run build-ts & npm run build-css & npm run copy-files",
|
|
35
35
|
"test": "react-scripts test",
|
|
36
36
|
"eject": "react-scripts eject",
|
|
37
37
|
"build-ts": "tsc -p tsconfig.build.json",
|
|
38
38
|
"build-css": "sass ./src/styles/index.scss ./dist/index.css",
|
|
39
|
+
"copy-files": "copyfiles -u 1 src/assets/**/* dist/",
|
|
39
40
|
"storybook": "start-storybook -p 6006 -s public",
|
|
40
41
|
"build-storybook": "build-storybook -s public",
|
|
41
42
|
"prepublish": "npm run build-lib"
|
|
@@ -69,6 +70,7 @@
|
|
|
69
70
|
"@types/react": "^17.0.0",
|
|
70
71
|
"@types/react-dom": "^17.0.0",
|
|
71
72
|
"@types/react-router-dom": "^5.1.8",
|
|
73
|
+
"copyfiles": "^2.4.1",
|
|
72
74
|
"cross-env": "^7.0.3",
|
|
73
75
|
"eslint-config-prettier": "^8.0.0",
|
|
74
76
|
"eslint-plugin-prettier": "^3.3.1",
|