zmdms-webui 1.9.8 → 1.9.9
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/es/applayoutheader/tabs/index.js +3 -2
- package/dist/es/button/buttonDownload.js +4 -4
- package/dist/es/button/buttonExport.js +7 -7
- package/dist/es/button/buttonPreview.js +2 -2
- package/dist/es/dynamicsetting/dynamicDrawer.js +4 -3
- package/dist/es/electronsignatures/dgcomponents/useDg.js +7 -7
- package/dist/es/electronsignatures/electroncomponents/electron-seal-batch-download.js +7 -6
- package/dist/es/electronsignatures/electroncomponents/useCheckedSealInfoList.js +3 -3
- package/dist/es/electronsignatures/electroncomponents/useFetchElectronData.js +3 -3
- package/dist/es/electronsignatures/electroncomponents/utils.js +9 -9
- package/dist/es/electronsignatures/filecomponents/file-upload.js +8 -7
- package/dist/es/electronsignatures/hooks/useParseElectronSetting.js +9 -9
- package/dist/es/electronsignatures/hooks/useParseQunjListData.js +4 -4
- package/dist/es/electronsignatures/index.js +20 -19
- package/dist/es/electronsignatures/qunjcomponents/code-modal.js +5 -5
- package/dist/es/electronsignatures/qunjcomponents/useFetchQunjData.js +4 -4
- package/dist/es/login/forget-password.js +10 -10
- package/dist/es/message/index.d.ts +5 -0
- package/dist/es/message/index.js +70 -0
- package/dist/es/modal/modal.js +4 -3
- package/dist/es/table/components/FilterDropdown.js +3 -2
- package/dist/es/table/components/table-header-operation/FillDown.js +3 -2
- package/dist/es/table/excel.js +53 -25
- package/dist/es/table/interface.d.ts +4 -0
- package/dist/es/table/table.js +6 -2
- package/dist/es/table/useDynamicListByColumns.js +6 -4
- package/dist/es/table/utils.js +5 -5
- package/dist/es/uploadlist/hooks.js +10 -10
- package/dist/es/uploadlist/uploadList.js +4 -3
- package/dist/es/uploadlist/uploadListDetail.js +3 -2
- package/dist/es/uploadlist/uploadTable.js +3 -2
- package/dist/es/uploadlist/utils.js +2 -2
- package/dist/index.build.d.ts +2 -1
- package/dist/index.dark.css +1 -1
- package/dist/index.default.css +1 -1
- package/dist/index.es.js +2 -1
- package/package.json +1 -1
- package/dist/es/microloading/index.css +0 -1
- package/dist/es/modal/index.css +0 -1
- package/dist/es/notauthpage/index.css +0 -0
- package/dist/es/notroutepage/index.css +0 -0
- package/dist/es/pagination/index.css +0 -1
- package/dist/es/placeholder/index.css +0 -1
- package/dist/es/print/index.css +0 -1
- package/dist/es/select/index.css +0 -1
- package/dist/es/table/index.css +0 -1
- package/dist/es/tabs/index.css +0 -1
- package/dist/es/tag/index.css +0 -1
- package/dist/es/title/index.css +0 -1
- package/dist/es/tree/index.css +0 -1
- package/dist/es/treeselect/index.css +0 -1
- package/dist/es/uploadlist/index.css +0 -1
- package/dist/es/watermark/index.css +0 -1
- package/dist/es/zttransfer/index.css +0 -1
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { __rest, __assign, __spreadArray, __awaiter, __generator } from '../_virtual/_tslib.js';
|
|
2
2
|
import { jsxs, Fragment, jsx } from 'react/jsx-runtime';
|
|
3
3
|
import { memo, useRef, useMemo, useState, useEffect, useImperativeHandle } from 'react';
|
|
4
|
-
import { Button, Table
|
|
4
|
+
import { Button, Table } from 'antd';
|
|
5
5
|
import '../config/ZtxkContext.js';
|
|
6
6
|
import useBaseContext from '../config/useBaseContext.js';
|
|
7
7
|
import ElectronSignaturesFragment from './electron-signatures-fragment.js';
|
|
@@ -23,6 +23,7 @@ import { DATA_TYPE_KEY } from './hooks/useParseRecords.js';
|
|
|
23
23
|
import useCheckedSealInfoList$1 from './electroncomponents/useGetDeptInfo.js';
|
|
24
24
|
import dayjs from 'dayjs';
|
|
25
25
|
import isEqual from 'lodash/isEqual';
|
|
26
|
+
import myMessage from '../message/index.js';
|
|
26
27
|
import ModalComponent from '../modal/modal.js';
|
|
27
28
|
|
|
28
29
|
/**
|
|
@@ -389,7 +390,7 @@ var ElectronSignatures = function (props) {
|
|
|
389
390
|
});
|
|
390
391
|
if (isValidateAttachTypeIndex !== -1) {
|
|
391
392
|
msg = "\u7B2C ".concat(isValidateAttachTypeIndex + 1, " \u884C\u6570\u636E\uFF0C\u9644\u4EF6\u7C7B\u578B\u4E3A\u5408\u540C\u672C\u8EAB\uFF0C\u9700\u8981\u6311\u9009\u6BD4\u5BF9\u6A21\u677F\uFF01");
|
|
392
|
-
|
|
393
|
+
myMessage.warning(msg);
|
|
393
394
|
return [2 /*return*/, Promise.reject(msg)];
|
|
394
395
|
}
|
|
395
396
|
isValidateDgIndex = fileList.findIndex(function (item) {
|
|
@@ -402,7 +403,7 @@ var ElectronSignatures = function (props) {
|
|
|
402
403
|
});
|
|
403
404
|
if (isValidateDgIndex !== -1) {
|
|
404
405
|
msg = "\u7B2C ".concat(isValidateDgIndex + 1, " \u884C\u6570\u636E\uFF0C\u6CA1\u6709\u751F\u6210\u4EFB\u52A1id\uFF0C\u8BF7\u70B9\u51FB\u5F00\u59CB\u6BD4\u5BF9\u6309\u94AE\uFF01");
|
|
405
|
-
|
|
406
|
+
myMessage.warning(msg);
|
|
406
407
|
return [2 /*return*/, Promise.reject(msg)];
|
|
407
408
|
}
|
|
408
409
|
isValidateAttachType = fileList.findIndex(function (item) {
|
|
@@ -411,7 +412,7 @@ var ElectronSignatures = function (props) {
|
|
|
411
412
|
if (resetProps.isAllowedPatchFileType &&
|
|
412
413
|
isValidateAttachType !== -1) {
|
|
413
414
|
msg = "\u7B2C ".concat(isValidateAttachType + 1, " \u884C\u6570\u636E\uFF0C\u6CA1\u6709\u9009\u62E9\u9644\u4EF6\u7C7B\u578B\uFF0C\u8BF7\u9009\u62E9\uFF01");
|
|
414
|
-
|
|
415
|
+
myMessage.warning(msg);
|
|
415
416
|
return [2 /*return*/, Promise.reject(msg)];
|
|
416
417
|
}
|
|
417
418
|
}
|
|
@@ -443,7 +444,7 @@ var ElectronSignatures = function (props) {
|
|
|
443
444
|
hasElectronicSeal &&
|
|
444
445
|
!isOnlyQj) {
|
|
445
446
|
msg = "请勾选加盖电子印章所需要的印章列表!";
|
|
446
|
-
|
|
447
|
+
myMessage.warning(msg);
|
|
447
448
|
return [2 /*return*/, Promise.reject(msg)];
|
|
448
449
|
}
|
|
449
450
|
// 2.1 一开始选了附件和印章,指定了盖章位置。得到了contractId和docAttachMap数据。
|
|
@@ -463,7 +464,7 @@ var ElectronSignatures = function (props) {
|
|
|
463
464
|
}
|
|
464
465
|
});
|
|
465
466
|
if (!isEqual(electronicSealFileList.sort(), electronicSealedFileList_1.sort())) {
|
|
466
|
-
|
|
467
|
+
myMessage.warning("附件盖章信息有变动,请重新确认盖章信息");
|
|
467
468
|
return [2 /*return*/, Promise.reject("附件盖章信息有变动,请重新确认盖章信息")];
|
|
468
469
|
}
|
|
469
470
|
}
|
|
@@ -486,7 +487,7 @@ var ElectronSignatures = function (props) {
|
|
|
486
487
|
});
|
|
487
488
|
if (isMoreQunjCountIndex !== -1) {
|
|
488
489
|
msg = "\u7B2C".concat(isMoreQunjCountIndex + 1, "\u884C\u6570\u636E\uFF0C\u60A8\u7684\u7FA4\u6770\u7AE0\u7528\u5370\u6B21\u6570\u8FDC\u8FDC\u8D85\u8FC7\u5408\u7406\u6B21\u6570\u8303\u56F4\uFF0C\u8BF7\u4FEE\u6539\u3002");
|
|
489
|
-
|
|
490
|
+
myMessage.warning(msg);
|
|
490
491
|
return [2 /*return*/, Promise.reject(msg)];
|
|
491
492
|
}
|
|
492
493
|
}
|
|
@@ -495,7 +496,7 @@ var ElectronSignatures = function (props) {
|
|
|
495
496
|
isMoreQunjCount = countIsValidate(qunjSeal, false);
|
|
496
497
|
if (!isMoreQunjCount) {
|
|
497
498
|
msg = "您的群杰章用印次数远远超过合理次数范围,请修改。";
|
|
498
|
-
|
|
499
|
+
myMessage.warning(msg);
|
|
499
500
|
return [2 /*return*/, Promise.reject(msg)];
|
|
500
501
|
}
|
|
501
502
|
}
|
|
@@ -526,13 +527,13 @@ var ElectronSignatures = function (props) {
|
|
|
526
527
|
});
|
|
527
528
|
if (isCheckTakeOutNoAddressIndex !== -1) {
|
|
528
529
|
msg = "\u7B2C".concat(isCheckTakeOutNoAddressIndex + 1, "\u884C\u6570\u636E\uFF0C\u60A8\u7684\u7FA4\u6770\u7AE0\u7528\u9009\u4E86\u5916\u90E8\u7528\u5370\uFF0C\u4F46\u662F\u6CA1\u6709\u9009\u62E9\u5916\u90E8\u7528\u5370\u7684\u5730\u5740\uFF01");
|
|
529
|
-
|
|
530
|
+
myMessage.warning(msg);
|
|
530
531
|
return [2 /*return*/, Promise.reject(msg)];
|
|
531
532
|
}
|
|
532
533
|
}
|
|
533
534
|
else if (isCheckTakeOutNoAddress(submitData)) {
|
|
534
535
|
msg = "您的群杰印章选了外部用印,但是没有选择外部用印的地址!";
|
|
535
|
-
|
|
536
|
+
myMessage.warning(msg);
|
|
536
537
|
return [2 /*return*/, Promise.reject(msg)];
|
|
537
538
|
}
|
|
538
539
|
}
|
|
@@ -543,7 +544,7 @@ var ElectronSignatures = function (props) {
|
|
|
543
544
|
!contractId &&
|
|
544
545
|
!isOnlyQj) {
|
|
545
546
|
msg = "请点击指定签署位置按钮,指定签署位置后方可提交!";
|
|
546
|
-
|
|
547
|
+
myMessage.warning(msg);
|
|
547
548
|
return [2 /*return*/, Promise.reject(msg)];
|
|
548
549
|
}
|
|
549
550
|
// 5. 合同份数验证
|
|
@@ -566,7 +567,7 @@ var ElectronSignatures = function (props) {
|
|
|
566
567
|
});
|
|
567
568
|
if (hasNoWritContranctNum !== -1) {
|
|
568
569
|
msg = "\u7B2C".concat(hasNoWritContranctNum + 1, "\u884C\u6570\u636E\uFF0C\u6CA1\u6709\u586B\u5199\u7FA4\u6770\u7AE0\u5408\u540C\u4EFD\u6570\u3002");
|
|
569
|
-
|
|
570
|
+
myMessage.warning(msg);
|
|
570
571
|
return [2 /*return*/, Promise.reject(msg)];
|
|
571
572
|
}
|
|
572
573
|
}
|
|
@@ -586,7 +587,7 @@ var ElectronSignatures = function (props) {
|
|
|
586
587
|
});
|
|
587
588
|
if (hasNoCheckedQjSeal !== -1) {
|
|
588
589
|
msg = "\u7B2C".concat(hasNoCheckedQjSeal + 1, "\u884C\u6570\u636E\uFF0C\u52FE\u9009\u4E86\u76D6\u7FA4\u6770\u7AE0\uFF0C\u4F46\u662F\u6CA1\u6709\u9009\u62E9\u7FA4\u6770\u5370\u7AE0");
|
|
589
|
-
|
|
590
|
+
myMessage.warning(msg);
|
|
590
591
|
return [2 /*return*/, Promise.reject(msg)];
|
|
591
592
|
}
|
|
592
593
|
noNumSealName_1 = "";
|
|
@@ -610,7 +611,7 @@ var ElectronSignatures = function (props) {
|
|
|
610
611
|
});
|
|
611
612
|
if (hasNoNumCheckedQjSeal !== -1) {
|
|
612
613
|
msg = "\u7B2C".concat(hasNoNumCheckedQjSeal + 1, "\u884C\u6570\u636E\uFF0C\u8BF7\u68C0\u67E5\u662F\u5426\u9009\u4E86\u5370\u7AE0\uFF0C\u4F46\u662F\u6CA1\u586B\u7528\u5370\u6B21\u6570\u7684\u5370\u7AE0\u3002\u5982\uFF1A").concat(noNumSealName_1);
|
|
613
|
-
|
|
614
|
+
myMessage.warning(msg);
|
|
614
615
|
return [2 /*return*/, Promise.reject(msg)];
|
|
615
616
|
}
|
|
616
617
|
}
|
|
@@ -618,14 +619,14 @@ var ElectronSignatures = function (props) {
|
|
|
618
619
|
if (!isSingleQj && qunjChecked) {
|
|
619
620
|
// 合同份数为空
|
|
620
621
|
if (isContranctNum && !qunjSeal.contranctNum) {
|
|
621
|
-
|
|
622
|
+
myMessage.warning("请填写合同份数!");
|
|
622
623
|
return [2 /*return*/, Promise.reject("请填写合同份数!")];
|
|
623
624
|
}
|
|
624
625
|
// 勾选了群杰印章 没有填用印次数
|
|
625
626
|
if (((_h = qunjSeal === null || qunjSeal === void 0 ? void 0 : qunjSeal.details) === null || _h === void 0 ? void 0 : _h.length) > 0) {
|
|
626
627
|
qunjSeal.details.forEach(function (item) {
|
|
627
628
|
if (!item.sealCount) {
|
|
628
|
-
|
|
629
|
+
myMessage.warning("\u8BF7\u586B\u5199".concat(item.sealName, " \u7684\u7528\u5370\u6B21\u6570\uFF01"));
|
|
629
630
|
}
|
|
630
631
|
});
|
|
631
632
|
if (qunjSeal.details.filter(function (item) { return !item.sealCount; }).length >
|
|
@@ -635,7 +636,7 @@ var ElectronSignatures = function (props) {
|
|
|
635
636
|
}
|
|
636
637
|
else {
|
|
637
638
|
msg = "请选择群杰用印!";
|
|
638
|
-
|
|
639
|
+
myMessage.warning(msg);
|
|
639
640
|
return [2 /*return*/, Promise.reject(msg)];
|
|
640
641
|
}
|
|
641
642
|
}
|
|
@@ -755,7 +756,7 @@ var ElectronSignatures = function (props) {
|
|
|
755
756
|
function onBatchDeleteHandle() {
|
|
756
757
|
var _a;
|
|
757
758
|
if (!selectRows.current || selectRows.current.length === 0) {
|
|
758
|
-
|
|
759
|
+
myMessage.warning("请选择要删除的附件!");
|
|
759
760
|
return;
|
|
760
761
|
}
|
|
761
762
|
var deleteInfo = {};
|
|
@@ -764,7 +765,7 @@ var ElectronSignatures = function (props) {
|
|
|
764
765
|
var currentDataType = item === null || item === void 0 ? void 0 : item[DATA_TYPE_KEY];
|
|
765
766
|
var _c = allData[currentDataType] || {}, isEdit = _c.isEdit, records = _c.records, setRecords = _c.setRecords;
|
|
766
767
|
if (!isEdit) {
|
|
767
|
-
|
|
768
|
+
myMessage.warning("存在不能删除的附件!");
|
|
768
769
|
return;
|
|
769
770
|
}
|
|
770
771
|
if (deleteInfo[currentDataType]) {
|
|
@@ -4,7 +4,7 @@ import { memo, forwardRef, useState, useMemo, useImperativeHandle } from 'react'
|
|
|
4
4
|
import MemoForm from '../../form/form.js';
|
|
5
5
|
import MemoInput from '../../input/input.js';
|
|
6
6
|
import ModalComponent from '../../modal/modal.js';
|
|
7
|
-
import
|
|
7
|
+
import myMessage from '../../message/index.js';
|
|
8
8
|
|
|
9
9
|
var CodeModal = function (props, ref) {
|
|
10
10
|
var details = props.details, request = props.request;
|
|
@@ -75,23 +75,23 @@ var CodeModal = function (props, ref) {
|
|
|
75
75
|
var _a, _b;
|
|
76
76
|
if (res.status === 200 && res.data.code === 200) {
|
|
77
77
|
setCode((_a = res.data.data) === null || _a === void 0 ? void 0 : _a.vertifyCode);
|
|
78
|
-
|
|
78
|
+
myMessage.info("验证码已获取成功");
|
|
79
79
|
}
|
|
80
80
|
else {
|
|
81
|
-
|
|
81
|
+
myMessage.error(((_b = res === null || res === void 0 ? void 0 : res.data) === null || _b === void 0 ? void 0 : _b.msg) || "获取验证码失败");
|
|
82
82
|
}
|
|
83
83
|
})
|
|
84
84
|
.catch(function (err) {
|
|
85
85
|
var _a, _b;
|
|
86
86
|
console.log(err);
|
|
87
|
-
|
|
87
|
+
myMessage.error(((_b = (_a = err.response) === null || _a === void 0 ? void 0 : _a.data) === null || _b === void 0 ? void 0 : _b.msg) || "获取验证码失败");
|
|
88
88
|
});
|
|
89
89
|
}
|
|
90
90
|
return [3 /*break*/, 3];
|
|
91
91
|
case 2:
|
|
92
92
|
err_1 = _c.sent();
|
|
93
93
|
console.log(err_1);
|
|
94
|
-
|
|
94
|
+
myMessage.error((_b = (_a = err_1 === null || err_1 === void 0 ? void 0 : err_1.errorFields) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.errors[0]);
|
|
95
95
|
return [3 /*break*/, 3];
|
|
96
96
|
case 3: return [2 /*return*/];
|
|
97
97
|
}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { useState, useCallback, useEffect } from 'react';
|
|
2
|
-
import
|
|
2
|
+
import myMessage from '../../message/index.js';
|
|
3
3
|
|
|
4
4
|
/**
|
|
5
5
|
* 获取电子印章远程数据
|
|
@@ -27,11 +27,11 @@ function useFetchQunjData(options) {
|
|
|
27
27
|
}); })) || []);
|
|
28
28
|
}
|
|
29
29
|
else {
|
|
30
|
-
|
|
30
|
+
myMessage.error(res.data.msg || "出错了");
|
|
31
31
|
}
|
|
32
32
|
}).catch(function (error) {
|
|
33
33
|
var _a, _b;
|
|
34
|
-
|
|
34
|
+
myMessage.error(((_b = (_a = error === null || error === void 0 ? void 0 : error.response) === null || _a === void 0 ? void 0 : _a.data) === null || _b === void 0 ? void 0 : _b.msg) || "请求失败!");
|
|
35
35
|
return Promise.reject(error);
|
|
36
36
|
});
|
|
37
37
|
}, [request]);
|
|
@@ -42,7 +42,7 @@ function useFetchQunjData(options) {
|
|
|
42
42
|
return;
|
|
43
43
|
}
|
|
44
44
|
if (!flowId) {
|
|
45
|
-
|
|
45
|
+
myMessage.info("请传入流程ID");
|
|
46
46
|
return;
|
|
47
47
|
}
|
|
48
48
|
getQunjList(flowId, { companyTypes: companyTypes, deptId: deptId }).then(function (res) {
|
|
@@ -3,10 +3,10 @@ import { jsx, jsxs } from 'react/jsx-runtime';
|
|
|
3
3
|
import { memo, useCallback, useMemo, useState, useRef, useEffect } from 'react';
|
|
4
4
|
import { phoneValidate, validatePassword } from 'zmdms-utils';
|
|
5
5
|
import MemoForm from '../form/form.js';
|
|
6
|
+
import myMessage from '../message/index.js';
|
|
6
7
|
import MemoInput from '../input/input.js';
|
|
7
8
|
import ButtonCom from '../button/button.js';
|
|
8
9
|
import ModalComponent from '../modal/modal.js';
|
|
9
|
-
import { message } from 'antd';
|
|
10
10
|
|
|
11
11
|
var countDownMaxTime = 10;
|
|
12
12
|
var ForgetPassword = function (_a) {
|
|
@@ -18,15 +18,15 @@ var ForgetPassword = function (_a) {
|
|
|
18
18
|
var phone = form.getFieldValue("phone");
|
|
19
19
|
var account = form.getFieldValue("account");
|
|
20
20
|
if (!account) {
|
|
21
|
-
|
|
21
|
+
myMessage.error("请输入您的用户名");
|
|
22
22
|
return Promise.resolve(false);
|
|
23
23
|
}
|
|
24
24
|
if (!phone) {
|
|
25
|
-
|
|
25
|
+
myMessage.error("请输入您的手机号");
|
|
26
26
|
return Promise.resolve(false);
|
|
27
27
|
}
|
|
28
28
|
if (!phoneValidate.regex.test(phone)) {
|
|
29
|
-
|
|
29
|
+
myMessage.error(phoneValidate.message);
|
|
30
30
|
return Promise.resolve(false);
|
|
31
31
|
}
|
|
32
32
|
setTimeout(function () {
|
|
@@ -48,10 +48,10 @@ var ForgetPassword = function (_a) {
|
|
|
48
48
|
}, (countDown - 1) * 1000);
|
|
49
49
|
var _a = res.data, msg = _a.msg, success = _a.success;
|
|
50
50
|
if (success === "true") {
|
|
51
|
-
|
|
51
|
+
myMessage.success("验证码发送成功!");
|
|
52
52
|
}
|
|
53
53
|
else {
|
|
54
|
-
|
|
54
|
+
myMessage.warning(msg || "验证码发送失败!");
|
|
55
55
|
}
|
|
56
56
|
})
|
|
57
57
|
.catch(function (err) {
|
|
@@ -59,7 +59,7 @@ var ForgetPassword = function (_a) {
|
|
|
59
59
|
setTimeout(function () {
|
|
60
60
|
resolve(1);
|
|
61
61
|
}, (countDown - 1) * 1000);
|
|
62
|
-
|
|
62
|
+
myMessage.warning(((_b = (_a = err === null || err === void 0 ? void 0 : err.response) === null || _a === void 0 ? void 0 : _a.data) === null || _b === void 0 ? void 0 : _b.msg) || "验证码发送失败!");
|
|
63
63
|
});
|
|
64
64
|
});
|
|
65
65
|
});
|
|
@@ -177,16 +177,16 @@ var ForgetPassword = function (_a) {
|
|
|
177
177
|
.then(function (res) {
|
|
178
178
|
var _a = res.data, msg = _a.msg, code = _a.code;
|
|
179
179
|
if (code === 200) {
|
|
180
|
-
|
|
180
|
+
myMessage.success(msg || "密码修改成功!");
|
|
181
181
|
setOpen(false);
|
|
182
182
|
}
|
|
183
183
|
else {
|
|
184
|
-
|
|
184
|
+
myMessage.warning(msg || "密码修改失败!");
|
|
185
185
|
}
|
|
186
186
|
})
|
|
187
187
|
.catch(function (err) {
|
|
188
188
|
var _a, _b;
|
|
189
|
-
|
|
189
|
+
myMessage.warning(((_b = (_a = err === null || err === void 0 ? void 0 : err.response) === null || _a === void 0 ? void 0 : _a.data) === null || _b === void 0 ? void 0 : _b.msg) || "密码修改失败!");
|
|
190
190
|
});
|
|
191
191
|
}, open: open }, { children: jsx(MemoForm, { form: form, items: items, type: "list", directionColumn: true }) })));
|
|
192
192
|
};
|
|
@@ -0,0 +1,70 @@
|
|
|
1
|
+
import { message } from 'antd';
|
|
2
|
+
|
|
3
|
+
var messageKey = 1;
|
|
4
|
+
function getConfig(content, duration, onClose) {
|
|
5
|
+
var _onClick = content === null || content === void 0 ? void 0 : content.onClick;
|
|
6
|
+
var _onClose = (content === null || content === void 0 ? void 0 : content.onClose) || onClose;
|
|
7
|
+
var config = (content === null || content === void 0 ? void 0 : content.content)
|
|
8
|
+
? content
|
|
9
|
+
: {
|
|
10
|
+
duration: duration,
|
|
11
|
+
content: content,
|
|
12
|
+
onClose: onClose,
|
|
13
|
+
};
|
|
14
|
+
config.key = config.key ? config.key : messageKey;
|
|
15
|
+
messageKey++;
|
|
16
|
+
config.onClick = function () {
|
|
17
|
+
_onClick && (_onClick === null || _onClick === void 0 ? void 0 : _onClick());
|
|
18
|
+
_onClose && (_onClose === null || _onClose === void 0 ? void 0 : _onClose());
|
|
19
|
+
message.destroy(config.key);
|
|
20
|
+
};
|
|
21
|
+
return config;
|
|
22
|
+
}
|
|
23
|
+
var defaultDuration = 10;
|
|
24
|
+
var myMessage = {
|
|
25
|
+
info: function (content, duration, onClose) {
|
|
26
|
+
var config = getConfig(content, duration ? duration : defaultDuration, onClose);
|
|
27
|
+
message.info(config, duration, onClose);
|
|
28
|
+
return Promise.resolve();
|
|
29
|
+
},
|
|
30
|
+
success: function (content, duration, onClose) {
|
|
31
|
+
var config = getConfig(content, duration ? duration : defaultDuration, onClose);
|
|
32
|
+
message.success(config, duration, onClose);
|
|
33
|
+
return Promise.resolve();
|
|
34
|
+
},
|
|
35
|
+
error: function (content, duration, onClose) {
|
|
36
|
+
var config = getConfig(content, duration ? duration : defaultDuration, onClose);
|
|
37
|
+
message.error(config, duration, onClose);
|
|
38
|
+
return Promise.resolve();
|
|
39
|
+
},
|
|
40
|
+
warning: function (content, duration, onClose) {
|
|
41
|
+
var config = getConfig(content, duration ? duration : defaultDuration, onClose);
|
|
42
|
+
message.warning(config, duration, onClose);
|
|
43
|
+
return Promise.resolve();
|
|
44
|
+
},
|
|
45
|
+
loading: function (content, duration, onClose) {
|
|
46
|
+
var config = getConfig(content, duration ? duration : defaultDuration, onClose);
|
|
47
|
+
message.loading(config, duration, onClose);
|
|
48
|
+
return Promise.resolve();
|
|
49
|
+
},
|
|
50
|
+
open: function (args) {
|
|
51
|
+
message.open(args);
|
|
52
|
+
return Promise.resolve();
|
|
53
|
+
},
|
|
54
|
+
warn: function (content, duration, onClose) {
|
|
55
|
+
var config = getConfig(content, duration ? duration : defaultDuration, onClose);
|
|
56
|
+
message.warn(config, duration, onClose);
|
|
57
|
+
return Promise.resolve();
|
|
58
|
+
},
|
|
59
|
+
config: function (options) {
|
|
60
|
+
message.config(options);
|
|
61
|
+
},
|
|
62
|
+
destroy: function (messageKey) {
|
|
63
|
+
message.destroy(messageKey);
|
|
64
|
+
},
|
|
65
|
+
useMessage: function () {
|
|
66
|
+
return message.useMessage();
|
|
67
|
+
},
|
|
68
|
+
};
|
|
69
|
+
|
|
70
|
+
export { myMessage as default };
|
package/dist/es/modal/modal.js
CHANGED
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
import { __rest, __awaiter, __generator, __assign } from '../_virtual/_tslib.js';
|
|
2
2
|
import { jsx } from 'react/jsx-runtime';
|
|
3
3
|
import { forwardRef, useState, useCallback, useImperativeHandle } from 'react';
|
|
4
|
-
import { Modal as Modal$1
|
|
4
|
+
import { Modal as Modal$1 } from 'antd';
|
|
5
5
|
import classNames from '../node_modules/classnames/index.js';
|
|
6
6
|
import { setCancelBtnProps } from './utils.js';
|
|
7
|
+
import myMessage from '../message/index.js';
|
|
7
8
|
|
|
8
9
|
var Modal = function (_a, ref) {
|
|
9
10
|
var className = _a.className, defaultOpen = _a.defaultOpen, defaultTitle = _a.defaultTitle, defaultConfirmMsg = _a.defaultConfirmMsg, defaultConfirmOkText = _a.defaultConfirmOkText, defaultType = _a.defaultType, confirmPreHandle = _a.confirmPreHandle, confirmOnOk = _a.confirmOnOk, onOk = _a.onOk, footer = _a.footer, onOkValidate = _a.onOkValidate, resetProps = __rest(_a, ["className", "defaultOpen", "defaultTitle", "defaultConfirmMsg", "defaultConfirmOkText", "defaultType", "confirmPreHandle", "confirmOnOk", "onOk", "footer", "onOkValidate"]);
|
|
@@ -47,11 +48,11 @@ var Modal = function (_a, ref) {
|
|
|
47
48
|
errorFields = err_1.errorFields, errors = err_1.errors;
|
|
48
49
|
// 针对表单的验证
|
|
49
50
|
if (errorFields) {
|
|
50
|
-
|
|
51
|
+
myMessage.warning(errorFields[0].errors + "");
|
|
51
52
|
}
|
|
52
53
|
// 针对表格的验证
|
|
53
54
|
if (errors) {
|
|
54
|
-
|
|
55
|
+
myMessage.warning(errors);
|
|
55
56
|
}
|
|
56
57
|
return [3 /*break*/, 4];
|
|
57
58
|
case 4:
|
|
@@ -4,7 +4,8 @@ import { useMemo, useEffect, useState } from 'react';
|
|
|
4
4
|
import { useLatest } from 'ahooks';
|
|
5
5
|
import MemoInput from '../../input/input.js';
|
|
6
6
|
import ButtonCom from '../../button/button.js';
|
|
7
|
-
import
|
|
7
|
+
import myMessage from '../../message/index.js';
|
|
8
|
+
import { Checkbox, Tooltip } from 'antd';
|
|
8
9
|
import QuestionCircleOutlined from '../../node_modules/@ant-design/icons/es/icons/QuestionCircleOutlined.js';
|
|
9
10
|
|
|
10
11
|
/**
|
|
@@ -186,7 +187,7 @@ function filterHandle(value, record, key) {
|
|
|
186
187
|
console.log(err);
|
|
187
188
|
if (!isMessage) {
|
|
188
189
|
isMessage = true;
|
|
189
|
-
|
|
190
|
+
myMessage.info("不要使用赋值语句如:1+1=2 /n 应该使用:1+1==2", 3, function () {
|
|
190
191
|
isMessage = false;
|
|
191
192
|
});
|
|
192
193
|
}
|
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
import { __assign } from '../../../_virtual/_tslib.js';
|
|
2
2
|
import { jsx, jsxs } from 'react/jsx-runtime';
|
|
3
3
|
import { memo } from 'react';
|
|
4
|
+
import myMessage from '../../../message/index.js';
|
|
4
5
|
import VerticalAlignBottomOutlined from '../../../node_modules/@ant-design/icons/es/icons/VerticalAlignBottomOutlined.js';
|
|
5
|
-
import { Tooltip
|
|
6
|
+
import { Tooltip } from 'antd';
|
|
6
7
|
|
|
7
8
|
var FillDown = function (_a) {
|
|
8
9
|
var isFillDown = _a.isFillDown, dataSourceRef = _a.dataSourceRef, dataKey = _a.dataKey, onTableChange = _a.onTableChange;
|
|
@@ -10,7 +11,7 @@ var FillDown = function (_a) {
|
|
|
10
11
|
if (!Array.isArray(dataSourceRef === null || dataSourceRef === void 0 ? void 0 : dataSourceRef.current) ||
|
|
11
12
|
(dataSourceRef === null || dataSourceRef === void 0 ? void 0 : dataSourceRef.current.length) <= 1 ||
|
|
12
13
|
!isFillDown) {
|
|
13
|
-
|
|
14
|
+
myMessage.info("数据不需要填充!");
|
|
14
15
|
return;
|
|
15
16
|
}
|
|
16
17
|
var newDataSource = [];
|
package/dist/es/table/excel.js
CHANGED
|
@@ -381,37 +381,51 @@ function applyExcelStyles(worksheet, data, numKeys, columns, headerRowCount, has
|
|
|
381
381
|
if (headerRowCount === void 0) { headerRowCount = 1; }
|
|
382
382
|
if (hasTopDescription === void 0) { hasTopDescription = false; }
|
|
383
383
|
var headerStyle = {
|
|
384
|
-
font: {
|
|
384
|
+
font: {
|
|
385
|
+
bold: true,
|
|
386
|
+
color: { argb: "FFFFFFFF" },
|
|
387
|
+
size: 11,
|
|
388
|
+
name: "微软雅黑",
|
|
389
|
+
},
|
|
385
390
|
fill: {
|
|
386
391
|
type: "pattern",
|
|
387
392
|
pattern: "solid",
|
|
388
|
-
fgColor: { argb: "
|
|
393
|
+
fgColor: { argb: "FF2E5BBA" },
|
|
389
394
|
},
|
|
390
395
|
alignment: { horizontal: "center", vertical: "middle" },
|
|
391
396
|
border: {
|
|
392
|
-
top: { style: "thin", color: { argb: "
|
|
393
|
-
bottom: { style: "thin", color: { argb: "
|
|
394
|
-
left: { style: "thin", color: { argb: "
|
|
395
|
-
right: { style: "thin", color: { argb: "
|
|
397
|
+
top: { style: "thin", color: { argb: "FF1E3A8A" } },
|
|
398
|
+
bottom: { style: "thin", color: { argb: "FF1E3A8A" } },
|
|
399
|
+
left: { style: "thin", color: { argb: "FF1E3A8A" } },
|
|
400
|
+
right: { style: "thin", color: { argb: "FF1E3A8A" } },
|
|
396
401
|
},
|
|
397
402
|
};
|
|
398
403
|
var summaryStyle = {
|
|
399
|
-
font: {
|
|
404
|
+
font: {
|
|
405
|
+
bold: true,
|
|
406
|
+
color: { argb: "FF1E3A8A" },
|
|
407
|
+
size: 11,
|
|
408
|
+
name: "微软雅黑",
|
|
409
|
+
},
|
|
400
410
|
fill: {
|
|
401
411
|
type: "pattern",
|
|
402
412
|
pattern: "solid",
|
|
403
|
-
fgColor: { argb: "
|
|
413
|
+
fgColor: { argb: "FFE8F2FF" },
|
|
404
414
|
},
|
|
405
415
|
alignment: { horizontal: "left", vertical: "middle" },
|
|
406
416
|
border: {
|
|
407
|
-
top: { style: "thin", color: { argb: "
|
|
408
|
-
bottom: { style: "thin", color: { argb: "
|
|
409
|
-
left: { style: "thin", color: { argb: "
|
|
410
|
-
right: { style: "thin", color: { argb: "
|
|
417
|
+
top: { style: "thin", color: { argb: "FFD1D5DB" } },
|
|
418
|
+
bottom: { style: "thin", color: { argb: "FFD1D5DB" } },
|
|
419
|
+
left: { style: "thin", color: { argb: "FFD1D5DB" } },
|
|
420
|
+
right: { style: "thin", color: { argb: "FFD1D5DB" } },
|
|
411
421
|
},
|
|
412
422
|
};
|
|
413
423
|
var normalStyle = {
|
|
414
|
-
font: {
|
|
424
|
+
font: {
|
|
425
|
+
color: { argb: "FF374151" },
|
|
426
|
+
size: 10,
|
|
427
|
+
name: "微软雅黑",
|
|
428
|
+
},
|
|
415
429
|
fill: {
|
|
416
430
|
type: "pattern",
|
|
417
431
|
pattern: "solid",
|
|
@@ -419,22 +433,36 @@ function applyExcelStyles(worksheet, data, numKeys, columns, headerRowCount, has
|
|
|
419
433
|
},
|
|
420
434
|
alignment: { horizontal: "left", vertical: "middle" },
|
|
421
435
|
border: {
|
|
422
|
-
top: { style: "thin", color: { argb: "
|
|
423
|
-
bottom: { style: "thin", color: { argb: "
|
|
424
|
-
left: { style: "thin", color: { argb: "
|
|
425
|
-
right: { style: "thin", color: { argb: "
|
|
436
|
+
top: { style: "thin", color: { argb: "FFE5E7EB" } },
|
|
437
|
+
bottom: { style: "thin", color: { argb: "FFE5E7EB" } },
|
|
438
|
+
left: { style: "thin", color: { argb: "FFE5E7EB" } },
|
|
439
|
+
right: { style: "thin", color: { argb: "FFE5E7EB" } },
|
|
426
440
|
},
|
|
427
441
|
};
|
|
428
442
|
var descriptionStyle = {
|
|
429
|
-
font: {
|
|
430
|
-
|
|
443
|
+
font: {
|
|
444
|
+
bold: true,
|
|
445
|
+
size: 11,
|
|
446
|
+
color: { argb: "FF2E5BBA" },
|
|
447
|
+
name: "微软雅黑",
|
|
448
|
+
},
|
|
449
|
+
alignment: {
|
|
450
|
+
horizontal: "left",
|
|
451
|
+
vertical: "middle",
|
|
452
|
+
wrapText: true,
|
|
453
|
+
indent: 1,
|
|
454
|
+
},
|
|
431
455
|
border: {
|
|
432
|
-
top: { style: "thin", color: { argb: "
|
|
433
|
-
bottom: { style: "thin", color: { argb: "
|
|
434
|
-
left: { style: "thin", color: { argb: "
|
|
435
|
-
right: { style: "thin", color: { argb: "
|
|
456
|
+
top: { style: "thin", color: { argb: "FFE6E6E6" } },
|
|
457
|
+
bottom: { style: "thin", color: { argb: "FFE6E6E6" } },
|
|
458
|
+
left: { style: "thin", color: { argb: "FFE6E6E6" } },
|
|
459
|
+
right: { style: "thin", color: { argb: "FFE6E6E6" } },
|
|
460
|
+
},
|
|
461
|
+
fill: {
|
|
462
|
+
type: "pattern",
|
|
463
|
+
pattern: "solid",
|
|
464
|
+
fgColor: { argb: "FFF8F9FA" },
|
|
436
465
|
},
|
|
437
|
-
fill: undefined,
|
|
438
466
|
};
|
|
439
467
|
var totalCols = Math.max(1, (columns === null || columns === void 0 ? void 0 : columns.length) || 1);
|
|
440
468
|
for (var r = 1; r <= headerRowCount; r++) {
|
|
@@ -536,7 +564,7 @@ function useExcelExport(records, config) {
|
|
|
536
564
|
var mergeKeys = useMergeKeys(columns, isAutoMerge);
|
|
537
565
|
var numKeys = useNumKeys(columns);
|
|
538
566
|
var exportFunction = useMemoizedFn(function (fileName, _a) {
|
|
539
|
-
var topDescription = _a.topDescription,
|
|
567
|
+
var topDescription = _a.topDescription, topDescriptionRowHeight = _a.topDescriptionRowHeight, time = _a.time;
|
|
540
568
|
if (!fileName.includes(".xlsx")) {
|
|
541
569
|
fileName = fileName + ".xlsx";
|
|
542
570
|
}
|
|
@@ -328,6 +328,10 @@ interface ITableProps<RecordType> extends Omit<TableProps<RecordType>, "columns"
|
|
|
328
328
|
* 就按数字往上递增的规则就行 1 2 3 4 5这种
|
|
329
329
|
*/
|
|
330
330
|
dynamicVersion?: number;
|
|
331
|
+
/**
|
|
332
|
+
* 自定义动态列配置后的回调
|
|
333
|
+
*/
|
|
334
|
+
customDynamicListHandle?: (dynamicList: any) => void;
|
|
331
335
|
/**
|
|
332
336
|
* 增加了column的表头过滤功能;如果想要过滤功能持久化,可以配置这个属性
|
|
333
337
|
* 同时也需要配置dynamicKey配置。
|
package/dist/es/table/table.js
CHANGED
|
@@ -41,7 +41,7 @@ import { DndProvider } from '../node_modules/react-dnd/dist/core/DndProvider.js'
|
|
|
41
41
|
// completed: 实现从execl复制到表格中的功能
|
|
42
42
|
var Table = function (props) {
|
|
43
43
|
// console.log("表格渲染");
|
|
44
|
-
var className = props.className, _a = props.bordered, bordered = _a === void 0 ? true : _a, _b = props.pagination, pagination = _b === void 0 ? false : _b, isFlex = props.isFlex; props.tablePreferences; var dynamicKey = props.dynamicKey, dynamicVersion = props.dynamicVersion, isRemeberFilter = props.isRemeberFilter, _c = props.isOrderUpdateData, isOrderUpdateData = _c === void 0 ? true : _c, hiddenDynamicIcon = props.hiddenDynamicIcon, _columns = props.columns, dataSource = props.dataSource, onTableChange = props.onTableChange, isEdit = props.isEdit, isMove = props.isMove, isAdd = props.isAdd, hiddenAddBtnHandle = props.hiddenAddBtnHandle, _d = props.isTheadTitleAdd, isTheadTitleAdd = _d === void 0 ? true : _d, addMode = props.addMode, addCallback = props.addCallback, isDel = props.isDel, delPopTitle = props.delPopTitle, hiddenDelBtnHandle = props.hiddenDelBtnHandle, _e = props.isDelAll, isDelAll = _e === void 0 ? true : _e, isAddAndDelAuto = props.isAddAndDelAuto, summaryConfig = props.summaryConfig, _f = props.summaryFixed, summaryFixed = _f === void 0 ? true : _f, isInnerPagination = props.isInnerPagination, _g = props.innerPaginationPageSize, innerPaginationPageSize = _g === void 0 ? 30 : _g, _h = props.innerPaginationPosition, innerPaginationPosition = _h === void 0 ? INNER_TABLE_PAGINATION_POSITION : _h, _j = props.innerPaginationPageSizeOptions, innerPaginationPageSizeOptions = _j === void 0 ? INNER_TABLE_PAGINATION_PAGESIZEOPTIONS : _j, innerPaginationConfig = props.innerPaginationConfig, tableRefHandle = props.tableRefHandle, tableName = props.tableName, serviceOrder = props.serviceOrder, differences = props.differences, virtualKey = props.virtualKey, _k = props.isResizableColumn, isResizableColumn = _k === void 0 ? true : _k, _l = props.isResizableTitleEllipsis, isResizableTitleEllipsis = _l === void 0 ? true : _l, _m = props.isRealTimeValidate, isRealTimeValidate = _m === void 0 ? true : _m, isMarginTop = props.isMarginTop, isMarginBottom = props.isMarginBottom, scroll = props.scroll, addAndDelProps = props.addAndDelProps, _o = props.autoScrollYMarginBottom, autoScrollYMarginBottom = _o === void 0 ? 65 : _o, _p = props.isAutoScrollY, isAutoScrollY = _p === void 0 ? false : _p, tableId = props.tableId, extraOnRow = props.onRow, fixedRowsCount = props.fixedRowsCount, fixedRowsConfig = props.fixedRowsConfig, headerAlign = props.headerAlign, isDimensionDynamic = props.isDimensionDynamic, isAutoMerge = props.isAutoMerge, mode = props.mode, rowSelection = props.rowSelection, isContextMenu = props.isContextMenu, isFullscreenHandle = props.isFullscreenHandle, resetProps = __rest(props, ["className", "bordered", "pagination", "isFlex", "tablePreferences", "dynamicKey", "dynamicVersion", "isRemeberFilter", "isOrderUpdateData", "hiddenDynamicIcon", "columns", "dataSource", "onTableChange", "isEdit", "isMove", "isAdd", "hiddenAddBtnHandle", "isTheadTitleAdd", "addMode", "addCallback", "isDel", "delPopTitle", "hiddenDelBtnHandle", "isDelAll", "isAddAndDelAuto", "summaryConfig", "summaryFixed", "isInnerPagination", "innerPaginationPageSize", "innerPaginationPosition", "innerPaginationPageSizeOptions", "innerPaginationConfig", "tableRefHandle", "tableName", "serviceOrder", "differences", "virtualKey", "isResizableColumn", "isResizableTitleEllipsis", "isRealTimeValidate", "isMarginTop", "isMarginBottom", "scroll", "addAndDelProps", "autoScrollYMarginBottom", "isAutoScrollY", "tableId", "onRow", "fixedRowsCount", "fixedRowsConfig", "headerAlign", "isDimensionDynamic", "isAutoMerge", "mode", "rowSelection", "isContextMenu", "isFullscreenHandle"]);
|
|
44
|
+
var className = props.className, _a = props.bordered, bordered = _a === void 0 ? true : _a, _b = props.pagination, pagination = _b === void 0 ? false : _b, isFlex = props.isFlex; props.tablePreferences; var dynamicKey = props.dynamicKey, dynamicVersion = props.dynamicVersion, customDynamicListHandle = props.customDynamicListHandle, isRemeberFilter = props.isRemeberFilter, _c = props.isOrderUpdateData, isOrderUpdateData = _c === void 0 ? true : _c, hiddenDynamicIcon = props.hiddenDynamicIcon, _columns = props.columns, dataSource = props.dataSource, onTableChange = props.onTableChange, isEdit = props.isEdit, isMove = props.isMove, isAdd = props.isAdd, hiddenAddBtnHandle = props.hiddenAddBtnHandle, _d = props.isTheadTitleAdd, isTheadTitleAdd = _d === void 0 ? true : _d, addMode = props.addMode, addCallback = props.addCallback, isDel = props.isDel, delPopTitle = props.delPopTitle, hiddenDelBtnHandle = props.hiddenDelBtnHandle, _e = props.isDelAll, isDelAll = _e === void 0 ? true : _e, isAddAndDelAuto = props.isAddAndDelAuto, summaryConfig = props.summaryConfig, _f = props.summaryFixed, summaryFixed = _f === void 0 ? true : _f, isInnerPagination = props.isInnerPagination, _g = props.innerPaginationPageSize, innerPaginationPageSize = _g === void 0 ? 30 : _g, _h = props.innerPaginationPosition, innerPaginationPosition = _h === void 0 ? INNER_TABLE_PAGINATION_POSITION : _h, _j = props.innerPaginationPageSizeOptions, innerPaginationPageSizeOptions = _j === void 0 ? INNER_TABLE_PAGINATION_PAGESIZEOPTIONS : _j, innerPaginationConfig = props.innerPaginationConfig, tableRefHandle = props.tableRefHandle, tableName = props.tableName, serviceOrder = props.serviceOrder, differences = props.differences, virtualKey = props.virtualKey, _k = props.isResizableColumn, isResizableColumn = _k === void 0 ? true : _k, _l = props.isResizableTitleEllipsis, isResizableTitleEllipsis = _l === void 0 ? true : _l, _m = props.isRealTimeValidate, isRealTimeValidate = _m === void 0 ? true : _m, isMarginTop = props.isMarginTop, isMarginBottom = props.isMarginBottom, scroll = props.scroll, addAndDelProps = props.addAndDelProps, _o = props.autoScrollYMarginBottom, autoScrollYMarginBottom = _o === void 0 ? 65 : _o, _p = props.isAutoScrollY, isAutoScrollY = _p === void 0 ? false : _p, tableId = props.tableId, extraOnRow = props.onRow, fixedRowsCount = props.fixedRowsCount, fixedRowsConfig = props.fixedRowsConfig, headerAlign = props.headerAlign, isDimensionDynamic = props.isDimensionDynamic, isAutoMerge = props.isAutoMerge, mode = props.mode, rowSelection = props.rowSelection, isContextMenu = props.isContextMenu, isFullscreenHandle = props.isFullscreenHandle, resetProps = __rest(props, ["className", "bordered", "pagination", "isFlex", "tablePreferences", "dynamicKey", "dynamicVersion", "customDynamicListHandle", "isRemeberFilter", "isOrderUpdateData", "hiddenDynamicIcon", "columns", "dataSource", "onTableChange", "isEdit", "isMove", "isAdd", "hiddenAddBtnHandle", "isTheadTitleAdd", "addMode", "addCallback", "isDel", "delPopTitle", "hiddenDelBtnHandle", "isDelAll", "isAddAndDelAuto", "summaryConfig", "summaryFixed", "isInnerPagination", "innerPaginationPageSize", "innerPaginationPosition", "innerPaginationPageSizeOptions", "innerPaginationConfig", "tableRefHandle", "tableName", "serviceOrder", "differences", "virtualKey", "isResizableColumn", "isResizableTitleEllipsis", "isRealTimeValidate", "isMarginTop", "isMarginBottom", "scroll", "addAndDelProps", "autoScrollYMarginBottom", "isAutoScrollY", "tableId", "onRow", "fixedRowsCount", "fixedRowsConfig", "headerAlign", "isDimensionDynamic", "isAutoMerge", "mode", "rowSelection", "isContextMenu", "isFullscreenHandle"]);
|
|
45
45
|
var classes = classNames("ztxk-table", className, {
|
|
46
46
|
"ztxk-table--flex": isFlex,
|
|
47
47
|
});
|
|
@@ -58,7 +58,11 @@ var Table = function (props) {
|
|
|
58
58
|
// 比如过滤某些列 不做展示
|
|
59
59
|
var columns = useParseColumns(_columns);
|
|
60
60
|
// 得到动态列配置信息
|
|
61
|
-
var _r = useDynamicListByColumns(columns, {
|
|
61
|
+
var _r = useDynamicListByColumns(columns, {
|
|
62
|
+
dynamicKey: dynamicKey,
|
|
63
|
+
dynamicVersion: dynamicVersion,
|
|
64
|
+
customDynamicListHandle: customDynamicListHandle,
|
|
65
|
+
}), defaultDynamicList = _r.defaultDynamicList, onCurrentListChange = _r.onCurrentListChange, currentDynamicList = _r.currentDynamicList, dynamicSettingRef = _r.dynamicSettingRef;
|
|
62
66
|
// 因为内部分页需要知晓当前页面的数据展示,要不然数据排序就跟内部分页没关系了
|
|
63
67
|
// 自定义排序方法
|
|
64
68
|
var _s = useCustomSort(dataSource, onTableChange, {
|