ztxkui 4.2.22 → 4.2.23-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.
|
@@ -518,7 +518,7 @@ function EnhanceSelect(_a) {
|
|
|
518
518
|
var catchData = enhanceSelectCatchObj[url];
|
|
519
519
|
var catchDataKey = params ? JSON.stringify(params) : 'single';
|
|
520
520
|
// 发送接口请求，并设置缓存数据
|
|
521
|
-
getDataHandle(request, { url: url, params: params, method: method, timeout: timeout }, {
|
|
521
|
+
getDataHandle(request, { url: url, params: params, method: method, timeout: timeout, isForceRequest: true }, {
|
|
522
522
|
appointObj: {
|
|
523
523
|
obj: catchData,
|
|
524
524
|
key: catchDataKey,
|
|
@@ -532,6 +532,7 @@ function EnhanceSelect(_a) {
|
|
|
532
532
|
params: params,
|
|
533
533
|
method: method,
|
|
534
534
|
timeout: timeout,
|
|
535
|
+
isForceRequest: true,
|
|
535
536
|
});
|
|
536
537
|
}
|
|
537
538
|
};
|
|
@@ -581,25 +581,109 @@ var PrintContainer = function (_a) {
|
|
|
581
581
|
LODOP.PREVIEW();
|
|
582
582
|
}
|
|
583
583
|
// 生成pdf
|
|
584
|
+
var onPdfHandleFn = function (_a) {
|
|
585
|
+
var pdfOptions = _a.pdfOptions, imgPositionX = _a.imgPositionX;
|
|
586
|
+
setSpinning(true);
|
|
587
|
+
htmlToPdf({
|
|
588
|
+
dom: containerRef.current,
|
|
589
|
+
pdfName: pdfName,
|
|
590
|
+
isShowPage: isAddExportPage,
|
|
591
|
+
pdfOptions: __assign({}, (pdfOptions || {})),
|
|
592
|
+
imgPositionX: imgPositionX,
|
|
593
|
+
})
|
|
594
|
+
.then(function () {
|
|
595
|
+
setSpinning(false);
|
|
596
|
+
})
|
|
597
|
+
.catch(function () {
|
|
598
|
+
setSpinning(false);
|
|
599
|
+
});
|
|
600
|
+
};
|
|
584
601
|
var onPdfHandle = function (_a) {
|
|
585
602
|
var pdfOptions = _a.pdfOptions, imgPositionX = _a.imgPositionX;
|
|
586
603
|
return __awaiter(void 0, void 0, void 0, function () {
|
|
604
|
+
var result, err_3, isOkSure_3;
|
|
587
605
|
return __generator(this, function (_b) {
|
|
588
|
-
|
|
589
|
-
|
|
590
|
-
|
|
591
|
-
|
|
592
|
-
|
|
593
|
-
|
|
594
|
-
|
|
595
|
-
|
|
596
|
-
|
|
597
|
-
|
|
598
|
-
|
|
599
|
-
|
|
600
|
-
|
|
601
|
-
|
|
602
|
-
|
|
606
|
+
switch (_b.label) {
|
|
607
|
+
case 0:
|
|
608
|
+
result = true;
|
|
609
|
+
if (!onPrintBeforeCallback) return [3 /*break*/, 4];
|
|
610
|
+
_b.label = 1;
|
|
611
|
+
case 1:
|
|
612
|
+
_b.trys.push([1, 3, , 4]);
|
|
613
|
+
return [4 /*yield*/, onPrintBeforeCallback()];
|
|
614
|
+
case 2:
|
|
615
|
+
result = _b.sent();
|
|
616
|
+
return [3 /*break*/, 4];
|
|
617
|
+
case 3:
|
|
618
|
+
err_3 = _b.sent();
|
|
619
|
+
result = null;
|
|
620
|
+
return [3 /*break*/, 4];
|
|
621
|
+
case 4:
|
|
622
|
+
if (!result) {
|
|
623
|
+
return [2 /*return*/];
|
|
624
|
+
}
|
|
625
|
+
if (showPrintMessage) {
|
|
626
|
+
isOkSure_3 = false;
|
|
627
|
+
Modal.confirm({
|
|
628
|
+
title: '打印提示',
|
|
629
|
+
content: '点击确认按钮后，将作为一次成功的打印，并记录到系统！你确认要打印吗？',
|
|
630
|
+
okText: '确认',
|
|
631
|
+
onOk: function () {
|
|
632
|
+
if (onPrintCallback) {
|
|
633
|
+
var result_3 = onPrintCallback();
|
|
634
|
+
if (result_3 instanceof Promise) {
|
|
635
|
+
var startTime_3 = Date.now();
|
|
636
|
+
result_3.then(function (res) {
|
|
637
|
+
if (res) {
|
|
638
|
+
if (Date.now() - startTime_3 > 1000) {
|
|
639
|
+
// 关闭打印页面
|
|
640
|
+
setTimeout(function () {
|
|
641
|
+
onPdfHandleFn({
|
|
642
|
+
pdfOptions: pdfOptions,
|
|
643
|
+
imgPositionX: imgPositionX,
|
|
644
|
+
});
|
|
645
|
+
});
|
|
646
|
+
}
|
|
647
|
+
else {
|
|
648
|
+
setTimeout(function () {
|
|
649
|
+
onPdfHandleFn({
|
|
650
|
+
pdfOptions: pdfOptions,
|
|
651
|
+
imgPositionX: imgPositionX,
|
|
652
|
+
});
|
|
653
|
+
}, 1000);
|
|
654
|
+
}
|
|
655
|
+
}
|
|
656
|
+
});
|
|
657
|
+
}
|
|
658
|
+
else {
|
|
659
|
+
isOkSure_3 = true;
|
|
660
|
+
}
|
|
661
|
+
}
|
|
662
|
+
else {
|
|
663
|
+
isOkSure_3 = true;
|
|
664
|
+
}
|
|
665
|
+
},
|
|
666
|
+
afterClose: function () {
|
|
667
|
+
if (isOkSure_3) {
|
|
668
|
+
setTimeout(function () {
|
|
669
|
+
onPdfHandleFn({
|
|
670
|
+
pdfOptions: pdfOptions,
|
|
671
|
+
imgPositionX: imgPositionX,
|
|
672
|
+
});
|
|
673
|
+
});
|
|
674
|
+
}
|
|
675
|
+
},
|
|
676
|
+
});
|
|
677
|
+
}
|
|
678
|
+
else {
|
|
679
|
+
onPrintCallback && onPrintCallback();
|
|
680
|
+
onPdfHandleFn({
|
|
681
|
+
pdfOptions: pdfOptions,
|
|
682
|
+
imgPositionX: imgPositionX,
|
|
683
|
+
});
|
|
684
|
+
}
|
|
685
|
+
return [2 /*return*/];
|
|
686
|
+
}
|
|
603
687
|
});
|
|
604
688
|
});
|
|
605
689
|
};
|
|
@@ -938,11 +1022,7 @@ var PrintContainer = function (_a) {
|
|
|
938
1022
|
});
|
|
939
1023
|
});
|
|
940
1024
|
};
|
|
941
|
-
var
|
|
942
|
-
if (!Array.isArray(autoSealList) || autoSealList.length === 0) {
|
|
943
|
-
message.info("\u5F53\u524D\u90E8\u95E8\u3001\u6D41\u7A0B\u4E0B\u672A\u914D\u7F6E\u81EA\u52A8\u76D6\u7AE0\u76F8\u5173\u5370\u7AE0\uFF0C\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458\u914D\u7F6E!");
|
|
944
|
-
return;
|
|
945
|
-
}
|
|
1025
|
+
var onExportSealFileHandleFn = function (options, isZip) {
|
|
946
1026
|
setSpinning(true);
|
|
947
1027
|
// 文件还在加载中
|
|
948
1028
|
if (!fontTTF.data) {
|
|
@@ -962,7 +1042,7 @@ var PrintContainer = function (_a) {
|
|
|
962
1042
|
fileId: fileId,
|
|
963
1043
|
request: request,
|
|
964
1044
|
});
|
|
965
|
-
|
|
1045
|
+
onExportSealFileHandleFn(options, isZip);
|
|
966
1046
|
}, 2000);
|
|
967
1047
|
}
|
|
968
1048
|
else {
|
|
@@ -978,6 +1058,84 @@ var PrintContainer = function (_a) {
|
|
|
978
1058
|
exportSealPdf(options, isZip);
|
|
979
1059
|
}
|
|
980
1060
|
};
|
|
1061
|
+
var onExportSealFileHandle = function (options, isZip) { return __awaiter(void 0, void 0, void 0, function () {
|
|
1062
|
+
var result, err_4, isOkSure_4;
|
|
1063
|
+
return __generator(this, function (_a) {
|
|
1064
|
+
switch (_a.label) {
|
|
1065
|
+
case 0:
|
|
1066
|
+
if (!Array.isArray(autoSealList) || autoSealList.length === 0) {
|
|
1067
|
+
message.info("\u5F53\u524D\u90E8\u95E8\u3001\u6D41\u7A0B\u4E0B\u672A\u914D\u7F6E\u81EA\u52A8\u76D6\u7AE0\u76F8\u5173\u5370\u7AE0\uFF0C\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458\u914D\u7F6E!");
|
|
1068
|
+
return [2 /*return*/];
|
|
1069
|
+
}
|
|
1070
|
+
result = true;
|
|
1071
|
+
if (!onPrintBeforeCallback) return [3 /*break*/, 4];
|
|
1072
|
+
_a.label = 1;
|
|
1073
|
+
case 1:
|
|
1074
|
+
_a.trys.push([1, 3, , 4]);
|
|
1075
|
+
return [4 /*yield*/, onPrintBeforeCallback()];
|
|
1076
|
+
case 2:
|
|
1077
|
+
result = _a.sent();
|
|
1078
|
+
return [3 /*break*/, 4];
|
|
1079
|
+
case 3:
|
|
1080
|
+
err_4 = _a.sent();
|
|
1081
|
+
result = null;
|
|
1082
|
+
return [3 /*break*/, 4];
|
|
1083
|
+
case 4:
|
|
1084
|
+
if (!result) {
|
|
1085
|
+
return [2 /*return*/];
|
|
1086
|
+
}
|
|
1087
|
+
if (showPrintMessage) {
|
|
1088
|
+
isOkSure_4 = false;
|
|
1089
|
+
Modal.confirm({
|
|
1090
|
+
title: '打印提示',
|
|
1091
|
+
content: '点击确认按钮后，将作为一次成功的打印，并记录到系统！你确认要打印吗？',
|
|
1092
|
+
okText: '确认',
|
|
1093
|
+
onOk: function () {
|
|
1094
|
+
if (onPrintCallback) {
|
|
1095
|
+
var result_4 = onPrintCallback();
|
|
1096
|
+
if (result_4 instanceof Promise) {
|
|
1097
|
+
var startTime_4 = Date.now();
|
|
1098
|
+
result_4.then(function (res) {
|
|
1099
|
+
if (res) {
|
|
1100
|
+
if (Date.now() - startTime_4 > 1000) {
|
|
1101
|
+
// 关闭打印页面
|
|
1102
|
+
setTimeout(function () {
|
|
1103
|
+
onExportSealFileHandleFn(options, isZip);
|
|
1104
|
+
});
|
|
1105
|
+
}
|
|
1106
|
+
else {
|
|
1107
|
+
setTimeout(function () {
|
|
1108
|
+
onExportSealFileHandleFn(options, isZip);
|
|
1109
|
+
}, 1000);
|
|
1110
|
+
}
|
|
1111
|
+
}
|
|
1112
|
+
});
|
|
1113
|
+
}
|
|
1114
|
+
else {
|
|
1115
|
+
isOkSure_4 = true;
|
|
1116
|
+
}
|
|
1117
|
+
}
|
|
1118
|
+
else {
|
|
1119
|
+
isOkSure_4 = true;
|
|
1120
|
+
}
|
|
1121
|
+
},
|
|
1122
|
+
afterClose: function () {
|
|
1123
|
+
if (isOkSure_4) {
|
|
1124
|
+
setTimeout(function () {
|
|
1125
|
+
onExportSealFileHandleFn(options, isZip);
|
|
1126
|
+
});
|
|
1127
|
+
}
|
|
1128
|
+
},
|
|
1129
|
+
});
|
|
1130
|
+
}
|
|
1131
|
+
else {
|
|
1132
|
+
onPrintCallback && onPrintCallback();
|
|
1133
|
+
onExportSealFileHandleFn(options, isZip);
|
|
1134
|
+
}
|
|
1135
|
+
return [2 /*return*/];
|
|
1136
|
+
}
|
|
1137
|
+
});
|
|
1138
|
+
}); };
|
|
981
1139
|
var onExportSealFileHandlePhoto = function (options, isZip) {
|
|
982
1140
|
if (!Array.isArray(autoSealList) || autoSealList.length === 0) {
|
|
983
1141
|
message.info("\u5F53\u524D\u90E8\u95E8\u3001\u6D41\u7A0B\u4E0B\u672A\u914D\u7F6E\u81EA\u52A8\u76D6\u7AE0\u76F8\u5173\u5370\u7AE0\uFF0C\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458\u914D\u7F6E!");
|
|
@@ -1201,10 +1359,8 @@ var PrintContainer = function (_a) {
|
|
|
1201
1359
|
}, false);
|
|
1202
1360
|
}
|
|
1203
1361
|
} },
|
|
1204
|
-
React.createElement(Menu.Item, { key: "zip
|
|
1205
|
-
React.createElement(Menu.Item, { key: "nozip
|
|
1206
|
-
React.createElement(Menu.Item, { key: "zip" }, "\u538B\u7F29"),
|
|
1207
|
-
React.createElement(Menu.Item, { key: "nozip" }, "\u4E0D\u538B\u7F29"))); }, placement: "bottomLeft" },
|
|
1362
|
+
React.createElement(Menu.Item, { key: "zip" }, "\u538B\u7F29\u7248"),
|
|
1363
|
+
React.createElement(Menu.Item, { key: "nozip" }, "\u4E0D\u538B\u7F29\u7248"))); }, placement: "bottomLeft" },
|
|
1208
1364
|
React.createElement(Button, { type: "primary" }, "\u5BFC\u51FA\u76D6\u7AE0\u4EF6"))
|
|
1209
1365
|
// <Button type="primary" onClick={onAutoSealHandle}>
|
|
1210
1366
|
// 自动盖章
|
|
@@ -331,7 +331,10 @@ function useColumns(props) {
|
|
|
331
331
|
width: 52,
|
|
332
332
|
fixed: 'left',
|
|
333
333
|
align: 'center',
|
|
334
|
-
render: function (text, render, index) { return (React.createElement(TableAddDelColumn, { onAddAndDelHandle: function (type) {
|
|
334
|
+
render: function (text, render, index) { return (React.createElement(TableAddDelColumn, { onAddAndDelHandle: function (type) {
|
|
335
|
+
var innerIndex = getInnerIndex(currentPage, index);
|
|
336
|
+
onAddAndDelHandle(type, innerIndex);
|
|
337
|
+
}, hideAddIcon: hideAddIcon, addIconText: addIconText, hideDelIcon: hideDelIcon, delIconText: delIconText })); },
|
|
335
338
|
};
|
|
336
339
|
_newColumns.unshift(newColumn);
|
|
337
340
|
}
|
package/dist/constants.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
export declare const token = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.
|
|
1
|
+
export declare const token = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ0ZW5hbnRfaWQiOiIwMDAwMDAiLCJtZW1iZXJfdHlwZSI6MSwiaGFuZGxlX2hyX3Bob25lIjpudWxsLCJyZXN1bWVfZGF0ZSI6bnVsbCwidXNlcl9uYW1lIjoiY2hlbnl4IiwiZW1wX25hbWUiOm51bGwsImVtcF9udW1iZXIiOm51bGwsImltdF9pZCI6IiIsInJlYWxfbmFtZSI6IumZiOS6mumbhCIsImNsaWVudF90eXBlIjoid2ViIiwiZGF0YV9yb2xlX2lkIjoiMTM0NTk3ODUwNTMwMjA1Njk2MiwxNDEyNjE1OTQyNjUyMjY0NDQ5LDE0NDgxMjEwODY1MDQzMDA1NDYsMTQ2ODAzNTM1MTYyNTI4NTYzNCwxNTQyMDc2MzA4NTc4MDI1NDc0LDcxMjEwMDcwNTQ2NjcxNjk4MjQiLCJjbGllbnRfaWQiOiJzd29yZCIsInVzZXJfdHlwZSI6IndlYiIsInJvbGVfaWQiOiIxNDA1MDU3MjE4NTMwMjE3OTg2LDE0MzgzMjI1NDMyOTU5MjYyNzQsMTQ0NjgxOTQ2MzY5Mzg0NDQ4MiwxNDY4MDM0NDM3MTU3OTYxNzI5LDE0ODA4MjkzMzc5MzkxMzI0MTcsNzEyMTAwNzA1NDY2NzE2OTgwOCIsInBvc3RfbmFtZSI6bnVsbCwic2NvcGUiOlsiYWxsIl0sImludGVydmlld19pZCI6IiIsImV4cCI6MTY3NjM2MDM2NSwib3JnX25hbWUiOm51bGwsImp0aSI6IjA4NGUyZTgyLTJjYWMtNDVjZS05YTA3LTZiYmY0NTVhOWFmNiIsIm1lbWJlcl9pZCI6IjEiLCJjb21wYW55X2lkIjoiIiwic3lzdGVtX2lkIjpudWxsLCJkZXB0X25hbWUiOm51bGwsImF2YXRhciI6IiIsImRhdGFfcm9sZV9uYW1lIjoiYWRtaW4sYWRtaW4sYWRtaW4sYWRtaW4sYWRtaW4sdXNlciIsImF1dGhvcml0aWVzIjpbImFkbWluIiwiYWRtaW5pc3RyYXRvciJdLCJyb2xlX25hbWUiOiJhZG1pbixhZG1pbmlzdHJhdG9yLGFkbWluaXN0cmF0b3IsYWRtaW4sYWRtaW4sYWRtaW4iLCJyZXN1bWVfdGVtcGxhdGUiOm51bGwsImxpY2Vuc2UiOiJwb3dlcmVkIGJ5IHptZG1zIiwicG9zdF9pZCI6IiIsInVzZXJfaWQiOiIxNDEyOTUzODA0MzMzNTU1NzE0Iiwib3JnX2lkIjoiIiwibmlja19uYW1lIjoi6ZmI5Lqa6ZuEIiwiY29tcGFueV9uYW1lIjpudWxsLCJkZXB0X2lkIjoiIiwiaGFuZGxlX2hyX25hbWUiOm51bGwsImFjY291bnQiOiJjaGVueXgiLCJyZXN1bWVfaWQiOiIifQ.tzfljnZ7sBAfIjOUpBMAamC5RZL1AX8JuLV1ij3OLbE";
|
package/dist/constants.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
export var token = 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.
|
|
1
|
+
export var token = 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ0ZW5hbnRfaWQiOiIwMDAwMDAiLCJtZW1iZXJfdHlwZSI6MSwiaGFuZGxlX2hyX3Bob25lIjpudWxsLCJyZXN1bWVfZGF0ZSI6bnVsbCwidXNlcl9uYW1lIjoiY2hlbnl4IiwiZW1wX25hbWUiOm51bGwsImVtcF9udW1iZXIiOm51bGwsImltdF9pZCI6IiIsInJlYWxfbmFtZSI6IumZiOS6mumbhCIsImNsaWVudF90eXBlIjoid2ViIiwiZGF0YV9yb2xlX2lkIjoiMTM0NTk3ODUwNTMwMjA1Njk2MiwxNDEyNjE1OTQyNjUyMjY0NDQ5LDE0NDgxMjEwODY1MDQzMDA1NDYsMTQ2ODAzNTM1MTYyNTI4NTYzNCwxNTQyMDc2MzA4NTc4MDI1NDc0LDcxMjEwMDcwNTQ2NjcxNjk4MjQiLCJjbGllbnRfaWQiOiJzd29yZCIsInVzZXJfdHlwZSI6IndlYiIsInJvbGVfaWQiOiIxNDA1MDU3MjE4NTMwMjE3OTg2LDE0MzgzMjI1NDMyOTU5MjYyNzQsMTQ0NjgxOTQ2MzY5Mzg0NDQ4MiwxNDY4MDM0NDM3MTU3OTYxNzI5LDE0ODA4MjkzMzc5MzkxMzI0MTcsNzEyMTAwNzA1NDY2NzE2OTgwOCIsInBvc3RfbmFtZSI6bnVsbCwic2NvcGUiOlsiYWxsIl0sImludGVydmlld19pZCI6IiIsImV4cCI6MTY3NjM2MDM2NSwib3JnX25hbWUiOm51bGwsImp0aSI6IjA4NGUyZTgyLTJjYWMtNDVjZS05YTA3LTZiYmY0NTVhOWFmNiIsIm1lbWJlcl9pZCI6IjEiLCJjb21wYW55X2lkIjoiIiwic3lzdGVtX2lkIjpudWxsLCJkZXB0X25hbWUiOm51bGwsImF2YXRhciI6IiIsImRhdGFfcm9sZV9uYW1lIjoiYWRtaW4sYWRtaW4sYWRtaW4sYWRtaW4sYWRtaW4sdXNlciIsImF1dGhvcml0aWVzIjpbImFkbWluIiwiYWRtaW5pc3RyYXRvciJdLCJyb2xlX25hbWUiOiJhZG1pbixhZG1pbmlzdHJhdG9yLGFkbWluaXN0cmF0b3IsYWRtaW4sYWRtaW4sYWRtaW4iLCJyZXN1bWVfdGVtcGxhdGUiOm51bGwsImxpY2Vuc2UiOiJwb3dlcmVkIGJ5IHptZG1zIiwicG9zdF9pZCI6IiIsInVzZXJfaWQiOiIxNDEyOTUzODA0MzMzNTU1NzE0Iiwib3JnX2lkIjoiIiwibmlja19uYW1lIjoi6ZmI5Lqa6ZuEIiwiY29tcGFueV9uYW1lIjpudWxsLCJkZXB0X2lkIjoiIiwiaGFuZGxlX2hyX25hbWUiOm51bGwsImFjY291bnQiOiJjaGVueXgiLCJyZXN1bWVfaWQiOiIifQ.tzfljnZ7sBAfIjOUpBMAamC5RZL1AX8JuLV1ij3OLbE';
|