ztxkui 3.8.13 → 3.8.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/dist/DemoCom/PrintContainerDemo.js +2 -1
- package/dist/TableDemo/EditableTable.js +6 -9
- package/dist/components/Table/table.js +4 -1
- package/dist/components/Table/utils/getSummaryData.d.ts +4 -1
- package/dist/components/Table/utils/getSummaryData.js +13 -8
- package/dist/constants.d.ts +1 -0
- package/dist/constants.js +1 -0
- package/package.json +1 -1
|
@@ -26,11 +26,12 @@ import axios from 'axios';
|
|
|
26
26
|
import water from '../assets/img/water.png';
|
|
27
27
|
import { createDownloadUrl } from 'ztxkutils/dist/fileOperation';
|
|
28
28
|
import './print.scss';
|
|
29
|
+
import { token } from '../constants';
|
|
29
30
|
function request(options) {
|
|
30
31
|
return axios({
|
|
31
32
|
baseURL: options.baseURL ? options.baseURL : 'http://192.168.0.83:8000',
|
|
32
33
|
url: options.url,
|
|
33
|
-
headers: __assign({ 'Zmdms-Auth':
|
|
34
|
+
headers: __assign({ 'Zmdms-Auth': "bearer " + token }, options.headers),
|
|
34
35
|
method: options.method,
|
|
35
36
|
data: options.data,
|
|
36
37
|
params: options.params,
|
|
@@ -351,15 +351,12 @@ var EditableTable = function () {
|
|
|
351
351
|
// tableValidate
|
|
352
352
|
tableHandleRef: tableHandleRef, tableName: "\u6211\u662F\u4E00\u4E2A\u8868\u683C",
|
|
353
353
|
// 显隐配置
|
|
354
|
-
configInfo: tableConfig, showColumnDynamic: true, showColumnDynamicKey: "test-o-0011",
|
|
355
|
-
|
|
356
|
-
|
|
357
|
-
|
|
358
|
-
|
|
359
|
-
|
|
360
|
-
// type: 'checkbox',
|
|
361
|
-
// }}
|
|
362
|
-
summaryConfig: [
|
|
354
|
+
configInfo: tableConfig, showColumnDynamic: true, showColumnDynamicKey: "test-o-0011", expandable: {
|
|
355
|
+
expandedRowRender: function (record) { return React.createElement("p", { style: { margin: 0 } }, "111"); },
|
|
356
|
+
rowExpandable: function (record) { return true; },
|
|
357
|
+
}, rowSelection: {
|
|
358
|
+
type: 'checkbox',
|
|
359
|
+
}, summaryConfig: [
|
|
363
360
|
{
|
|
364
361
|
type: 'subtotal',
|
|
365
362
|
fields: [
|
|
@@ -414,7 +414,10 @@ function Table(props) {
|
|
|
414
414
|
}
|
|
415
415
|
: undefined, summary: summaryConfig
|
|
416
416
|
? function (pageData) {
|
|
417
|
-
var summaryData = getSummaryData(summaryConfig, pageData, newColumns,
|
|
417
|
+
var summaryData = getSummaryData(summaryConfig, pageData, newColumns, {
|
|
418
|
+
hasRowSelection: props.rowSelection ? true : false,
|
|
419
|
+
hasExpandable: props.expandable ? true : false,
|
|
420
|
+
});
|
|
418
421
|
return (React.createElement(AntTable.Summary, { fixed: summaryFixed }, summaryData.map(function (summary) {
|
|
419
422
|
var title = summary.title, key = summary.key, titleIndex = summary.titleIndex, list = summary.list, columnList = summary.columnList, onClickHandle = summary.onClickHandle;
|
|
420
423
|
return (React.createElement(AntTable.Summary.Row, { key: key }, Array.isArray(list) &&
|
|
@@ -22,5 +22,8 @@ export interface ISummaryConfig {
|
|
|
22
22
|
* @param hasRowSelection 是否有选择列
|
|
23
23
|
* @returns any[]
|
|
24
24
|
*/
|
|
25
|
-
declare function getSummaryData(summaryConfig: ISummaryConfig[] | undefined, pageData: any, columns: any, hasRowSelection
|
|
25
|
+
declare function getSummaryData(summaryConfig: ISummaryConfig[] | undefined, pageData: any, columns: any, { hasRowSelection, hasExpandable, }: {
|
|
26
|
+
hasRowSelection: boolean;
|
|
27
|
+
hasExpandable: boolean;
|
|
28
|
+
}): ISummaryData[];
|
|
26
29
|
export default getSummaryData;
|
|
@@ -12,8 +12,8 @@ import { plus, round } from 'number-precision';
|
|
|
12
12
|
* @param hasRowSelection 是否有选择列
|
|
13
13
|
* @returns any[]
|
|
14
14
|
*/
|
|
15
|
-
function getSummaryData(summaryConfig, pageData, columns,
|
|
16
|
-
|
|
15
|
+
function getSummaryData(summaryConfig, pageData, columns, _a) {
|
|
16
|
+
var hasRowSelection = _a.hasRowSelection, hasExpandable = _a.hasExpandable;
|
|
17
17
|
var _summaryData = [];
|
|
18
18
|
if (Array.isArray(summaryConfig)) {
|
|
19
19
|
summaryConfig.forEach(function (summary) {
|
|
@@ -76,11 +76,13 @@ function getSummaryData(summaryConfig, pageData, columns, hasRowSelection) {
|
|
|
76
76
|
});
|
|
77
77
|
_summaryData.push({
|
|
78
78
|
title: title || '小计',
|
|
79
|
-
titleIndex: 0 + (hasRowSelection ? 1 : 0),
|
|
79
|
+
titleIndex: 0 + (hasRowSelection ? 1 : 0) + (hasExpandable ? 1 : 0),
|
|
80
80
|
key: 'subtotal',
|
|
81
|
-
list: hasRowSelection
|
|
81
|
+
list: hasRowSelection && hasExpandable
|
|
82
|
+
? __spreadArray([undefined, undefined], subtotalResult_1) : hasRowSelection || hasExpandable
|
|
82
83
|
? __spreadArray([undefined], subtotalResult_1) : subtotalResult_1,
|
|
83
|
-
columnList: hasRowSelection
|
|
84
|
+
columnList: hasRowSelection && hasExpandable
|
|
85
|
+
? __spreadArray([undefined, undefined], columnResult_1) : hasRowSelection || hasExpandable
|
|
84
86
|
? __spreadArray([undefined], columnResult_1) : columnResult_1,
|
|
85
87
|
onClickHandle: onClickHandle,
|
|
86
88
|
});
|
|
@@ -142,10 +144,13 @@ function getSummaryData(summaryConfig, pageData, columns, hasRowSelection) {
|
|
|
142
144
|
});
|
|
143
145
|
_summaryData.push({
|
|
144
146
|
title: title || '总计',
|
|
145
|
-
titleIndex: 0 + (hasRowSelection ? 1 : 0),
|
|
147
|
+
titleIndex: 0 + (hasRowSelection ? 1 : 0) + (hasExpandable ? 1 : 0),
|
|
146
148
|
key: 'total',
|
|
147
|
-
list: hasRowSelection
|
|
148
|
-
|
|
149
|
+
list: hasRowSelection && hasExpandable
|
|
150
|
+
? __spreadArray([undefined, undefined], totalResult_1) : hasRowSelection || hasExpandable
|
|
151
|
+
? __spreadArray([undefined], totalResult_1) : totalResult_1,
|
|
152
|
+
columnList: hasRowSelection && hasExpandable
|
|
153
|
+
? __spreadArray([undefined, undefined], columnResult_2) : hasRowSelection || hasExpandable
|
|
149
154
|
? __spreadArray([undefined], columnResult_2) : columnResult_2,
|
|
150
155
|
onClickHandle: onClickHandle,
|
|
151
156
|
});
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export declare const token = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ0ZW5hbnRfaWQiOiIwMDAwMDAiLCJtZW1iZXJfdHlwZSI6MSwiaGFuZGxlX2hyX3Bob25lIjpudWxsLCJyZXN1bWVfZGF0ZSI6bnVsbCwidXNlcl9uYW1lIjoi546L5aWVIiwiZW1wX25hbWUiOm51bGwsImVtcF9udW1iZXIiOm51bGwsImltdF9pZCI6IiIsInJlYWxfbmFtZSI6IueOi-WllSIsImNsaWVudF90eXBlIjoid2ViIiwiZGF0YV9yb2xlX2lkIjoiMTM0MzQ5MDY4NjI2MDIyODA5NyIsImNsaWVudF9pZCI6InN3b3JkIiwidXNlcl90eXBlIjoid2ViIiwicm9sZV9pZCI6IjExMjM1OTg4MTY3Mzg2NzUyMDEsMTM0MzQ5MDQyNTAwMTIyNjI0MiIsInBvc3RfbmFtZSI6bnVsbCwic2NvcGUiOlsiYWxsIl0sImludGVydmlld19pZCI6IiIsImV4cCI6MTY2NjE1NTMyNiwib3JnX25hbWUiOm51bGwsImp0aSI6Ijg0ZTAxOTFmLWMwNzMtNDA4ZS04NDBjLWQ0MzJkMDE5N2RiYyIsIm1lbWJlcl9pZCI6IjEiLCJjb21wYW55X2lkIjoiIiwic3lzdGVtX2lkIjpudWxsLCJkZXB0X25hbWUiOm51bGwsImF2YXRhciI6IiIsImRhdGFfcm9sZV9uYW1lIjoibnVsbCIsImF1dGhvcml0aWVzIjpbIuWGheWLpCIsImFkbWluaXN0cmF0b3IiXSwicm9sZV9uYW1lIjoiYWRtaW5pc3RyYXRvcizlhoXli6QiLCJyZXN1bWVfdGVtcGxhdGUiOm51bGwsImxpY2Vuc2UiOiJwb3dlcmVkIGJ5IHptZG1zIiwicG9zdF9pZCI6IiIsInVzZXJfaWQiOiIxMzQ0MDk5MjA2MzI4MzU2ODY1Iiwib3JnX2lkIjoiIiwibmlja19uYW1lIjoi546L5aWVIiwiY29tcGFueV9uYW1lIjpudWxsLCJkZXB0X2lkIjoiIiwiaGFuZGxlX2hyX25hbWUiOm51bGwsImFjY291bnQiOiLnjovlpZUiLCJyZXN1bWVfaWQiOiIifQ.uxCdkgq4Pc68b0lgjw49-fSAKxet4fGoE82ZlB-NtyI";
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export var token = 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ0ZW5hbnRfaWQiOiIwMDAwMDAiLCJtZW1iZXJfdHlwZSI6MSwiaGFuZGxlX2hyX3Bob25lIjpudWxsLCJyZXN1bWVfZGF0ZSI6bnVsbCwidXNlcl9uYW1lIjoi546L5aWVIiwiZW1wX25hbWUiOm51bGwsImVtcF9udW1iZXIiOm51bGwsImltdF9pZCI6IiIsInJlYWxfbmFtZSI6IueOi-WllSIsImNsaWVudF90eXBlIjoid2ViIiwiZGF0YV9yb2xlX2lkIjoiMTM0MzQ5MDY4NjI2MDIyODA5NyIsImNsaWVudF9pZCI6InN3b3JkIiwidXNlcl90eXBlIjoid2ViIiwicm9sZV9pZCI6IjExMjM1OTg4MTY3Mzg2NzUyMDEsMTM0MzQ5MDQyNTAwMTIyNjI0MiIsInBvc3RfbmFtZSI6bnVsbCwic2NvcGUiOlsiYWxsIl0sImludGVydmlld19pZCI6IiIsImV4cCI6MTY2NjE1NTMyNiwib3JnX25hbWUiOm51bGwsImp0aSI6Ijg0ZTAxOTFmLWMwNzMtNDA4ZS04NDBjLWQ0MzJkMDE5N2RiYyIsIm1lbWJlcl9pZCI6IjEiLCJjb21wYW55X2lkIjoiIiwic3lzdGVtX2lkIjpudWxsLCJkZXB0X25hbWUiOm51bGwsImF2YXRhciI6IiIsImRhdGFfcm9sZV9uYW1lIjoibnVsbCIsImF1dGhvcml0aWVzIjpbIuWGheWLpCIsImFkbWluaXN0cmF0b3IiXSwicm9sZV9uYW1lIjoiYWRtaW5pc3RyYXRvcizlhoXli6QiLCJyZXN1bWVfdGVtcGxhdGUiOm51bGwsImxpY2Vuc2UiOiJwb3dlcmVkIGJ5IHptZG1zIiwicG9zdF9pZCI6IiIsInVzZXJfaWQiOiIxMzQ0MDk5MjA2MzI4MzU2ODY1Iiwib3JnX2lkIjoiIiwibmlja19uYW1lIjoi546L5aWVIiwiY29tcGFueV9uYW1lIjpudWxsLCJkZXB0X2lkIjoiIiwiaGFuZGxlX2hyX25hbWUiOm51bGwsImFjY291bnQiOiLnjovlpZUiLCJyZXN1bWVfaWQiOiIifQ.uxCdkgq4Pc68b0lgjw49-fSAKxet4fGoE82ZlB-NtyI';
|