easy3wui 1.5.8 → 1.5.10-beta1
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/README.md +5 -1
- package/assets/formPage.css +36 -4
- package/assets/gridPage.css +1 -2
- package/assets/index.css +37 -6
- package/lib/Easy3wButton/index.js +4 -2
- package/lib/Easy3wCaHandler/index.js +130 -24
- package/lib/Easy3wDownLoad/index.js +109 -12
- package/lib/Easy3wFlow/index.js +25 -23
- package/lib/Easy3wFormPage/index.js +338 -76
- package/lib/Easy3wGridInput/index.js +27 -5
- package/lib/Easy3wGridPage/index.js +13 -1
- package/lib/Easy3wGridSelect/index.js +3 -1
- package/lib/Easy3wGridTextArea/index.js +28 -6
- package/lib/Easy3wModal/index.js +1 -0
- package/lib/Easy3wUpload/index.js +44 -12
- package/lib/Easy3wUploadB/index copy 2.js +1011 -0
- package/lib/Easy3wUploadB/index.js +107 -73
- package/lib/Easy3wUploadM/index.js +43 -11
- package/package.json +2 -1
|
@@ -78,23 +78,30 @@ require('antd/lib/modal/style');
|
|
|
78
78
|
|
|
79
79
|
var _comonConfig = require('comonConfigPath/comonConfig');
|
|
80
80
|
|
|
81
|
-
var
|
|
82
|
-
|
|
83
|
-
var _Easy3wGetCookie2 = _interopRequireDefault(_Easy3wGetCookie);
|
|
84
|
-
|
|
85
|
-
var _Easy3wDownLoad = require('./../Easy3wDownLoad');
|
|
81
|
+
var _Easy3wDownLoad = require('../Easy3wDownLoad');
|
|
86
82
|
|
|
87
83
|
var _Easy3wDownLoad2 = _interopRequireDefault(_Easy3wDownLoad);
|
|
88
84
|
|
|
89
|
-
var _Easy3wAESEncrypt = require('
|
|
85
|
+
var _Easy3wAESEncrypt = require('../Easy3wAESEncrypt');
|
|
90
86
|
|
|
91
87
|
var _Easy3wAESEncrypt2 = _interopRequireDefault(_Easy3wAESEncrypt);
|
|
92
88
|
|
|
93
89
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
|
|
94
90
|
|
|
91
|
+
// const { previewFileUrl, previewFileFlag, previewFileType } = objPreviewFile || {};
|
|
92
|
+
|
|
95
93
|
var formItemStyle = {
|
|
96
94
|
marginBottom: 6
|
|
97
95
|
};
|
|
96
|
+
function Easy3wGetCookie(name) {
|
|
97
|
+
var arr = void 0;
|
|
98
|
+
var reg = new RegExp('(^| )' + name + '=([^;]*)(;|$)');
|
|
99
|
+
if (arr = document.cookie.match(reg)) {
|
|
100
|
+
return unescape(arr[2]);
|
|
101
|
+
} else {
|
|
102
|
+
return null;
|
|
103
|
+
}
|
|
104
|
+
}
|
|
98
105
|
|
|
99
106
|
var BigFileUpload = function (_Component) {
|
|
100
107
|
(0, _inherits3['default'])(BigFileUpload, _Component);
|
|
@@ -146,6 +153,10 @@ var BigFileUpload = function (_Component) {
|
|
|
146
153
|
}
|
|
147
154
|
}
|
|
148
155
|
};
|
|
156
|
+
// 预览
|
|
157
|
+
|
|
158
|
+
// url处理
|
|
159
|
+
|
|
149
160
|
|
|
150
161
|
BigFileUpload.prototype.render = function render() {
|
|
151
162
|
var _this2 = this;
|
|
@@ -165,7 +176,9 @@ var BigFileUpload = function (_Component) {
|
|
|
165
176
|
wrapperCol = _props.wrapperCol,
|
|
166
177
|
showUploadList = _props.showUploadList,
|
|
167
178
|
urlDownloadFile = _props.urlDownloadFile,
|
|
168
|
-
initialValue = _props.initialValue
|
|
179
|
+
initialValue = _props.initialValue,
|
|
180
|
+
propsAFlag = _props.propsAFlag,
|
|
181
|
+
fileViewFlag = _props.fileViewFlag;
|
|
169
182
|
var _state = this.state,
|
|
170
183
|
preUploading = _state.preUploading,
|
|
171
184
|
uploadPercent = _state.uploadPercent,
|
|
@@ -240,20 +253,10 @@ var BigFileUpload = function (_Component) {
|
|
|
240
253
|
var fileTypePass = true;
|
|
241
254
|
var fileNameArr = file.name.toLowerCase().split('.');
|
|
242
255
|
var fileType = fileNameArr[fileNameArr.length - 1];
|
|
243
|
-
if (file.name.length > 100) {
|
|
244
|
-
_modal2['default'].info({
|
|
245
|
-
style: { top: '38%' },
|
|
246
|
-
content: '文件名称至多100个字符',
|
|
247
|
-
okText: '知道了'
|
|
248
|
-
});
|
|
249
|
-
return false;
|
|
250
|
-
}
|
|
251
|
-
var acceptDefault = '.rplib,.xls,.doc,.jpg,.pdf,.png,.zip,.bmp,.rar,.txt,.docx,.ico,.bid,.xlsx,.jpeg,.json,.xml,.ebid,.dwg,.pptx,.xmind,.xps,.crx,.7z,.ppt,.svg,.pdm,.xlsm,.vsd,.gif,.tif,.docm,.csv,.ttf,.wps,.psd,.mp4,.tiff,.rtf,.tlb,.xlsb';
|
|
252
256
|
if (accept && accept.length > 0) {
|
|
253
|
-
|
|
254
|
-
|
|
255
|
-
|
|
256
|
-
fileTypePass = false;
|
|
257
|
+
if (accept.indexOf(fileType) < 0) {
|
|
258
|
+
fileTypePass = false;
|
|
259
|
+
}
|
|
257
260
|
}
|
|
258
261
|
if (!fileTypePass) {
|
|
259
262
|
_modal2['default'].error({
|
|
@@ -274,6 +277,9 @@ var BigFileUpload = function (_Component) {
|
|
|
274
277
|
fileList = _state3.fileList,
|
|
275
278
|
iniSetedFlag = _state3.iniSetedFlag;
|
|
276
279
|
|
|
280
|
+
if (!iniSetedFlag) {
|
|
281
|
+
iniSetedFlag = true;
|
|
282
|
+
}
|
|
277
283
|
if (!multiple) {
|
|
278
284
|
fileList = [file];
|
|
279
285
|
} else {
|
|
@@ -295,7 +301,8 @@ var BigFileUpload = function (_Component) {
|
|
|
295
301
|
cancelStatus: false, // 取消状态
|
|
296
302
|
CUSize: 0, // 当前附件上传大小
|
|
297
303
|
loading: true, // 禁用上传
|
|
298
|
-
iniSetedFlag: iniSetedFlag
|
|
304
|
+
iniSetedFlag: iniSetedFlag,
|
|
305
|
+
fileViewFlag: fileViewFlag
|
|
299
306
|
}), function () {
|
|
300
307
|
setImmediate(_this2.readFile, file);
|
|
301
308
|
});
|
|
@@ -303,8 +310,14 @@ var BigFileUpload = function (_Component) {
|
|
|
303
310
|
},
|
|
304
311
|
fileList: this.state.fileList
|
|
305
312
|
};
|
|
313
|
+
var objPreviewFileNew = (0, _extends3['default'])({}, _comonConfig.objPreviewFile, this.props.objPreviewFile);
|
|
314
|
+
var previewFileFlag = objPreviewFileNew.previewFileFlag;
|
|
315
|
+
|
|
316
|
+
if (previewFileFlag && fileViewFlag !== false) {
|
|
317
|
+
uploadProp.onPreview = this.onPreview;
|
|
318
|
+
}
|
|
306
319
|
if (isRead) {
|
|
307
|
-
uploadProp =
|
|
320
|
+
uploadProp.children = true;
|
|
308
321
|
}
|
|
309
322
|
return isRead ? _react2['default'].createElement(
|
|
310
323
|
_form2['default'].Item,
|
|
@@ -319,7 +332,9 @@ var BigFileUpload = function (_Component) {
|
|
|
319
332
|
pdfViewFlag: true,
|
|
320
333
|
imgVisible: true,
|
|
321
334
|
urlDownloadFile: urlDownloadFile,
|
|
322
|
-
downloadArr: initialValue
|
|
335
|
+
downloadArr: initialValue,
|
|
336
|
+
propsAFlag: propsAFlag,
|
|
337
|
+
fileViewFlag: fileViewFlag
|
|
323
338
|
}))
|
|
324
339
|
) : _react2['default'].createElement(
|
|
325
340
|
_form2['default'].Item,
|
|
@@ -341,7 +356,7 @@ var BigFileUpload = function (_Component) {
|
|
|
341
356
|
(0, _extends3['default'])({}, uploadProp, {
|
|
342
357
|
disabled: this.state.loading
|
|
343
358
|
}),
|
|
344
|
-
|
|
359
|
+
_react2['default'].createElement(
|
|
345
360
|
_popover2['default'],
|
|
346
361
|
{
|
|
347
362
|
placement: 'right',
|
|
@@ -454,6 +469,25 @@ BigFileUpload.defaultProps = {
|
|
|
454
469
|
var _initialiseProps = function _initialiseProps() {
|
|
455
470
|
var _this3 = this;
|
|
456
471
|
|
|
472
|
+
this.onPreview = function (file) {
|
|
473
|
+
var objPreviewFileNew = (0, _extends3['default'])({}, _comonConfig.objPreviewFile, _this3.props.objPreviewFile);
|
|
474
|
+
var previewFileUrl = objPreviewFileNew.previewFileUrl,
|
|
475
|
+
previewFileType = objPreviewFileNew.previewFileType;
|
|
476
|
+
var uid = file.uid,
|
|
477
|
+
url = file.url,
|
|
478
|
+
name = file.name;
|
|
479
|
+
|
|
480
|
+
var fileNameArr = name.toLowerCase().split('.');
|
|
481
|
+
var fileType = fileNameArr[fileNameArr.length - 1];
|
|
482
|
+
if (previewFileType.indexOf(fileType) >= 0) {
|
|
483
|
+
// const src = previewFileUrl + uid;
|
|
484
|
+
var src = _this3.urlDeal(previewFileUrl, uid);
|
|
485
|
+
window.open(src, '_blank');
|
|
486
|
+
} else {
|
|
487
|
+
window.open(url);
|
|
488
|
+
}
|
|
489
|
+
};
|
|
490
|
+
|
|
457
491
|
this.setUploadValue = function (v) {
|
|
458
492
|
var _setFieldsValue;
|
|
459
493
|
|
|
@@ -465,25 +499,13 @@ var _initialiseProps = function _initialiseProps() {
|
|
|
465
499
|
setFieldsValue((_setFieldsValue = {}, _setFieldsValue[name] = v, _setFieldsValue));
|
|
466
500
|
};
|
|
467
501
|
|
|
468
|
-
this.urlDeal = function (urlDownloadFile, uid) {
|
|
469
|
-
var retUrl = '';
|
|
470
|
-
if (uid !== '' && _comonConfig.aFlag && (_comonConfig.aFlag === '1' || _comonConfig.aFlag === '2')) {
|
|
471
|
-
var authToken = (0, _Easy3wGetCookie2['default'])('userToken') || 'E3WSAFEAPPQWEFGHYI7I483S';
|
|
472
|
-
var nowStr = _.now();
|
|
473
|
-
var encUrl = (0, _Easy3wAESEncrypt2['default'])(uid + '@#' + nowStr + '@#' + authToken, _comonConfig.a, _comonConfig.b);
|
|
474
|
-
return '' + urlDownloadFile + encUrl;
|
|
475
|
-
} else {
|
|
476
|
-
retUrl = '' + urlDownloadFile + uid;
|
|
477
|
-
return retUrl;
|
|
478
|
-
}
|
|
479
|
-
};
|
|
480
|
-
|
|
481
502
|
this.iniValDeal = function (initialValue) {
|
|
482
503
|
var urlDownloadFile = _this3.props.urlDownloadFile;
|
|
483
504
|
|
|
484
505
|
var iniVal = initialValue.map(function (obj) {
|
|
485
506
|
var uid = obj.uid,
|
|
486
507
|
name = obj.name;
|
|
508
|
+
// const url = `${urlDownloadFile}${uid}`;
|
|
487
509
|
|
|
488
510
|
var url = _this3.urlDeal(urlDownloadFile, uid);
|
|
489
511
|
var status = 'done';
|
|
@@ -495,11 +517,7 @@ var _initialiseProps = function _initialiseProps() {
|
|
|
495
517
|
this.checkFile = function (uploadParams) {
|
|
496
518
|
_this3.setState({ uploadRequest: true });
|
|
497
519
|
var formData = new FormData();
|
|
498
|
-
var authToken = (
|
|
499
|
-
// const timeStr = new Date().getTime();
|
|
500
|
-
// if (AESFlag && AESFlag === '1') {
|
|
501
|
-
// authToken = Easy3wAESEncrypt(`${authToken}@#${timeStr}`, AESKey, AESIV);
|
|
502
|
-
// }
|
|
520
|
+
var authToken = Easy3wGetCookie('userToken') || '40572da23bee5fd59cc5b6c8d8bfb36d';
|
|
503
521
|
var _props3 = _this3.props,
|
|
504
522
|
name = _props3.name,
|
|
505
523
|
urlCheckProgress = _props3.urlCheckProgress,
|
|
@@ -608,7 +626,7 @@ var _initialiseProps = function _initialiseProps() {
|
|
|
608
626
|
var _index2 = _fileList2.indexOf(_currentFile);
|
|
609
627
|
if (_index2 >= 0) {
|
|
610
628
|
_fileList2.splice(_index2, 1);
|
|
611
|
-
_this3.setState((0, _extends3['default'])({}, _this3.state, {
|
|
629
|
+
_this3.setState((0, _extends3['default'])({}, _this3.state, { fileList: _fileList2, loading: false }), function () {
|
|
612
630
|
_this3.setUploadValue(_fileList2);
|
|
613
631
|
});
|
|
614
632
|
}
|
|
@@ -616,7 +634,7 @@ var _initialiseProps = function _initialiseProps() {
|
|
|
616
634
|
});
|
|
617
635
|
};
|
|
618
636
|
|
|
619
|
-
this.handlePartUpload = function () {
|
|
637
|
+
this.handlePartUpload = function (sIndex, eIndex) {
|
|
620
638
|
try {
|
|
621
639
|
var _state6 = _this3.state,
|
|
622
640
|
currentFile = _state6.currentFile,
|
|
@@ -678,21 +696,25 @@ var _initialiseProps = function _initialiseProps() {
|
|
|
678
696
|
} else {
|
|
679
697
|
end = fileSize;
|
|
680
698
|
}
|
|
699
|
+
var start = CUSize;
|
|
700
|
+
if (sIndex && sIndex > 0 && eIndex && eIndex > 0) {
|
|
701
|
+
end = eIndex;
|
|
702
|
+
start = sIndex;
|
|
703
|
+
}
|
|
681
704
|
uploadFileReader.onload = function (e) {
|
|
682
705
|
if (chunkCheckErr) {
|
|
683
706
|
return;
|
|
684
707
|
}
|
|
708
|
+
var mainFileSpark = new _sparkMd2['default'].ArrayBuffer(); // 对arrayBuffer数据进行md5加密,产生一个md5字符串 主文件
|
|
709
|
+
mainFileSpark.append(e.target.result);
|
|
710
|
+
var chunkMD5 = mainFileSpark.end();
|
|
685
711
|
// 上传附件
|
|
686
712
|
var file = uploadData.file;
|
|
687
713
|
|
|
688
714
|
var formData = new FormData();
|
|
689
|
-
var authToken = (
|
|
690
|
-
// const timeStr = new Date().getTime();
|
|
691
|
-
// if (AESFlag && AESFlag === '1') {
|
|
692
|
-
// authToken = Easy3wAESEncrypt(`${authToken}@#${timeStr}`, AESKey, AESIV);
|
|
693
|
-
// }
|
|
715
|
+
var authToken = Easy3wGetCookie('userToken') || '40572da23bee5fd59cc5b6c8d8bfb36d';
|
|
694
716
|
var blob = new Blob([e.target.result], { type: 'application/octet-stream' });
|
|
695
|
-
var postParam = (0, _extends3['default'])({ fileInfo: file }, sendData, { currentSize: end });
|
|
717
|
+
var postParam = (0, _extends3['default'])({ fileInfo: file }, sendData, { currentSize: end, startSize: start, chunkMD5: chunkMD5 });
|
|
696
718
|
formData.append('chunk', blob);
|
|
697
719
|
formData.append('sendTime', new Date().getTime());
|
|
698
720
|
formData.append('appType', '01');
|
|
@@ -732,16 +754,26 @@ var _initialiseProps = function _initialiseProps() {
|
|
|
732
754
|
blob = null;
|
|
733
755
|
formData = null;
|
|
734
756
|
if (res && res.body.rspCode === '0000') {
|
|
735
|
-
var useTime = (new Date().getTime() - startTime) / 1000; // 用时秒
|
|
736
|
-
// 1秒传输速率
|
|
737
|
-
var curSpeed = Math.floor(1 / useTime * size);
|
|
738
757
|
var _res$body$data2 = res.body.data,
|
|
739
758
|
uploadStatus = _res$body$data2.uploadStatus,
|
|
740
759
|
fileId = _res$body$data2.fileId,
|
|
741
760
|
checkStatus = _res$body$data2.checkStatus,
|
|
742
|
-
uploadedSize = _res$body$data2.uploadedSize
|
|
761
|
+
uploadedSize = _res$body$data2.uploadedSize,
|
|
762
|
+
startIndex = _res$body$data2.startIndex,
|
|
763
|
+
endIndex = _res$body$data2.endIndex;
|
|
743
764
|
|
|
765
|
+
var useTime = (new Date().getTime() - startTime) / 1000; // 用时秒
|
|
744
766
|
var upSize = Number(uploadedSize);
|
|
767
|
+
// 1秒传输速率
|
|
768
|
+
var curSpeed = Math.floor(1 / useTime * size);
|
|
769
|
+
if (checkStatus && checkStatus === 'RETRY') {
|
|
770
|
+
_this3.setState((0, _extends3['default'])({}, _this3.state, {
|
|
771
|
+
speed: curSpeed
|
|
772
|
+
}), function () {
|
|
773
|
+
setImmediate(_this3.handlePartUpload, startIndex, endIndex);
|
|
774
|
+
});
|
|
775
|
+
return;
|
|
776
|
+
}
|
|
745
777
|
// 计算上传进度
|
|
746
778
|
uploadPercent = Math.floor(upSize / fileSize * 100 * 10) / 10;
|
|
747
779
|
if (checkStatus === '0') {
|
|
@@ -827,10 +859,10 @@ var _initialiseProps = function _initialiseProps() {
|
|
|
827
859
|
setImmediate(_this3.handlePartUpload);
|
|
828
860
|
});
|
|
829
861
|
}
|
|
830
|
-
} else
|
|
862
|
+
} else {
|
|
831
863
|
_modal2['default'].error({
|
|
832
864
|
style: { top: '38%' },
|
|
833
|
-
content: res.body.rspMsg
|
|
865
|
+
content: res && res.body.rspMsg ? res.body.rspMsg : '上传失败'
|
|
834
866
|
});
|
|
835
867
|
var _fileList4 = _this3.state.fileList;
|
|
836
868
|
|
|
@@ -841,25 +873,11 @@ var _initialiseProps = function _initialiseProps() {
|
|
|
841
873
|
_this3.setUploadValue(_fileList4);
|
|
842
874
|
});
|
|
843
875
|
}
|
|
844
|
-
} else {
|
|
845
|
-
_modal2['default'].error({
|
|
846
|
-
style: { top: '38%' },
|
|
847
|
-
content: '上传失败'
|
|
848
|
-
});
|
|
849
|
-
var _fileList5 = _this3.state.fileList;
|
|
850
|
-
|
|
851
|
-
var _index5 = _fileList5.indexOf(currentFile);
|
|
852
|
-
if (_index5 >= 0) {
|
|
853
|
-
_fileList5.splice(_index5, 1);
|
|
854
|
-
_this3.setState((0, _extends3['default'])({}, _this3.state, { loading: false, fileList: _fileList5 }), function () {
|
|
855
|
-
_this3.setUploadValue(_fileList5);
|
|
856
|
-
});
|
|
857
|
-
}
|
|
858
876
|
}
|
|
859
877
|
});
|
|
860
878
|
};
|
|
861
|
-
// console.log('读取文件', `文件大小:${currentFile.size}`, `已上传大小${
|
|
862
|
-
uploadFileReader.readAsArrayBuffer(blobSlice.call(currentFile,
|
|
879
|
+
// console.log('读取文件', `文件大小:${currentFile.size}`, `已上传大小${start}`, `结束值${end}`, `切片大小${speed}`);
|
|
880
|
+
uploadFileReader.readAsArrayBuffer(blobSlice.call(currentFile, start, end));
|
|
863
881
|
} catch (error) {
|
|
864
882
|
_modal2['default'].error({
|
|
865
883
|
style: { top: '38%' },
|
|
@@ -879,6 +897,21 @@ var _initialiseProps = function _initialiseProps() {
|
|
|
879
897
|
}
|
|
880
898
|
};
|
|
881
899
|
|
|
900
|
+
this.urlDeal = function (urlDownloadFile, uid) {
|
|
901
|
+
var propsAFlag = _this3.props.propsAFlag; // propsAFlag 加密标识 从引用组件处传入 '1':加密 '0':不加密
|
|
902
|
+
|
|
903
|
+
var retUrl = '';
|
|
904
|
+
if (uid !== '' && propsAFlag === '1' || uid !== '' && propsAFlag !== '0' && (_comonConfig.aFlag === '1' || _comonConfig.aFlag === '2')) {
|
|
905
|
+
var authToken = Easy3wGetCookie('userToken') || 'E3WSAFEAPPQWEFGHYI7I483S';
|
|
906
|
+
var nowStr = _.now();
|
|
907
|
+
var encUrl = (0, _Easy3wAESEncrypt2['default'])(uid + '@#' + nowStr + '@#' + authToken, _comonConfig.a, _comonConfig.b);
|
|
908
|
+
return '' + urlDownloadFile + encUrl;
|
|
909
|
+
} else {
|
|
910
|
+
retUrl = '' + urlDownloadFile + uid;
|
|
911
|
+
return retUrl;
|
|
912
|
+
}
|
|
913
|
+
};
|
|
914
|
+
|
|
882
915
|
this.readFile = function (file) {
|
|
883
916
|
try {
|
|
884
917
|
var chunkReader = new FileReader();
|
|
@@ -939,7 +972,8 @@ var _initialiseProps = function _initialiseProps() {
|
|
|
939
972
|
if (sliceIndex < sliceCount) {
|
|
940
973
|
_this3.setState((0, _extends3['default'])({}, _this3.state, {
|
|
941
974
|
preUploading: true,
|
|
942
|
-
preUploadPercent: Number((sliceIndex / sliceCount * 100).toFixed(1))
|
|
975
|
+
preUploadPercent: Number((sliceIndex / sliceCount * 100).toFixed(1))
|
|
976
|
+
}));
|
|
943
977
|
setImmediate(_loadNext, sliceIndex, tempreadFileSize);
|
|
944
978
|
} else {
|
|
945
979
|
var mainFileMD5 = mainFileSpark.end();
|
|
@@ -64,20 +64,22 @@ require('antd/lib/modal/style');
|
|
|
64
64
|
|
|
65
65
|
var _comonConfig = require('comonConfigPath/comonConfig');
|
|
66
66
|
|
|
67
|
-
var _Easy3wGetCookie = require('
|
|
67
|
+
var _Easy3wGetCookie = require('../Easy3wGetCookie');
|
|
68
68
|
|
|
69
69
|
var _Easy3wGetCookie2 = _interopRequireDefault(_Easy3wGetCookie);
|
|
70
70
|
|
|
71
|
-
var _Easy3wDownLoad = require('
|
|
71
|
+
var _Easy3wDownLoad = require('../Easy3wDownLoad');
|
|
72
72
|
|
|
73
73
|
var _Easy3wDownLoad2 = _interopRequireDefault(_Easy3wDownLoad);
|
|
74
74
|
|
|
75
|
-
var _Easy3wAESEncrypt = require('
|
|
75
|
+
var _Easy3wAESEncrypt = require('../Easy3wAESEncrypt');
|
|
76
76
|
|
|
77
77
|
var _Easy3wAESEncrypt2 = _interopRequireDefault(_Easy3wAESEncrypt);
|
|
78
78
|
|
|
79
79
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
|
|
80
80
|
|
|
81
|
+
// const { previewFileUrl, previewFileFlag, previewFileType } = objPreviewFile || {};
|
|
82
|
+
|
|
81
83
|
var formItemStyle = {
|
|
82
84
|
marginBottom: 6
|
|
83
85
|
};
|
|
@@ -96,9 +98,28 @@ var Easy3wUploadM = function (_Component) {
|
|
|
96
98
|
|
|
97
99
|
return _ret = (_temp = (_this = (0, _possibleConstructorReturn3['default'])(this, _Component.call.apply(_Component, [this].concat(args))), _this), _this.state = {
|
|
98
100
|
fileList: [{}]
|
|
101
|
+
// 预览
|
|
102
|
+
}, _this.onPreview = function (file) {
|
|
103
|
+
var objPreviewFileNew = (0, _extends3['default'])({}, _comonConfig.objPreviewFile, _this.props.objPreviewFile);
|
|
104
|
+
var previewFileUrl = objPreviewFileNew.previewFileUrl,
|
|
105
|
+
previewFileType = objPreviewFileNew.previewFileType;
|
|
106
|
+
var uid = file.uid,
|
|
107
|
+
url = file.url,
|
|
108
|
+
name = file.name;
|
|
109
|
+
|
|
110
|
+
var fileNameArr = name.toLowerCase().split('.');
|
|
111
|
+
var fileType = fileNameArr[fileNameArr.length - 1];
|
|
112
|
+
if (previewFileType.indexOf(fileType) >= 0) {
|
|
113
|
+
var src = _this.urlDeal(previewFileUrl, uid);
|
|
114
|
+
window.open(src, '_blank');
|
|
115
|
+
} else {
|
|
116
|
+
window.open(url);
|
|
117
|
+
}
|
|
99
118
|
}, _this.urlDeal = function (urlDownloadFile, uid) {
|
|
119
|
+
var propsAFlag = _this.props.propsAFlag; // propsAFlag 加密标识 从引用组件处传入 '1':加密 '0':不加密
|
|
120
|
+
|
|
100
121
|
var retUrl = '';
|
|
101
|
-
if (uid !== '' &&
|
|
122
|
+
if (uid !== '' && propsAFlag === '1' || uid !== '' && propsAFlag !== '0' && (_comonConfig.aFlag === '1' || _comonConfig.aFlag === '2')) {
|
|
102
123
|
var authToken = (0, _Easy3wGetCookie2['default'])('userToken') || 'E3WSAFEAPPQWEFGHYI7I483S';
|
|
103
124
|
var nowStr = _.now();
|
|
104
125
|
var encUrl = (0, _Easy3wAESEncrypt2['default'])(uid + '@#' + nowStr + '@#' + authToken, _comonConfig.a, _comonConfig.b);
|
|
@@ -135,7 +156,9 @@ var Easy3wUploadM = function (_Component) {
|
|
|
135
156
|
extendBack = _props.extendBack,
|
|
136
157
|
uploadDoneCallback = _props.uploadDoneCallback,
|
|
137
158
|
removeCallback = _props.removeCallback,
|
|
138
|
-
downloadAllFlag = _props.downloadAllFlag
|
|
159
|
+
downloadAllFlag = _props.downloadAllFlag,
|
|
160
|
+
propsAFlag = _props.propsAFlag,
|
|
161
|
+
fileViewFlag = _props.fileViewFlag;
|
|
139
162
|
var warnMessage = this.props.warnMessage;
|
|
140
163
|
|
|
141
164
|
var iniVal = [];
|
|
@@ -143,7 +166,8 @@ var Easy3wUploadM = function (_Component) {
|
|
|
143
166
|
if (initialValue) {
|
|
144
167
|
iniVal = initialValue.map(function (obj) {
|
|
145
168
|
var uid = obj.uid,
|
|
146
|
-
name = obj.name
|
|
169
|
+
name = obj.name,
|
|
170
|
+
status = obj.status;
|
|
147
171
|
|
|
148
172
|
if (allivaule === '') {
|
|
149
173
|
allivaule = uid;
|
|
@@ -151,7 +175,7 @@ var Easy3wUploadM = function (_Component) {
|
|
|
151
175
|
allivaule = allivaule + ',' + uid;
|
|
152
176
|
}
|
|
153
177
|
var url = _this2.urlDeal(urlDownloadFile, uid);
|
|
154
|
-
return { uid: uid, name: name, url: url };
|
|
178
|
+
return { uid: uid, name: name, url: url, status: status || 'done' };
|
|
155
179
|
});
|
|
156
180
|
}
|
|
157
181
|
if (!warnMessage) {
|
|
@@ -188,7 +212,13 @@ var Easy3wUploadM = function (_Component) {
|
|
|
188
212
|
}
|
|
189
213
|
};
|
|
190
214
|
if (isRead) {
|
|
191
|
-
upProps = (0, _extends3['default'])({}, upProps, { showUploadList: { showPreviewIcon:
|
|
215
|
+
upProps = (0, _extends3['default'])({}, upProps, { children: true, showUploadList: { showPreviewIcon: false, showRemoveIcon: false } });
|
|
216
|
+
}
|
|
217
|
+
var objPreviewFileNew = (0, _extends3['default'])({}, _comonConfig.objPreviewFile, this.props.objPreviewFile);
|
|
218
|
+
var previewFileFlag = objPreviewFileNew.previewFileFlag;
|
|
219
|
+
|
|
220
|
+
if (previewFileFlag && fileViewFlag !== false) {
|
|
221
|
+
upProps.onPreview = this.onPreview;
|
|
192
222
|
}
|
|
193
223
|
var beforeUpload = function beforeUpload(file) {
|
|
194
224
|
// 限制上传大小
|
|
@@ -322,7 +352,7 @@ var Easy3wUploadM = function (_Component) {
|
|
|
322
352
|
return true;
|
|
323
353
|
});
|
|
324
354
|
allivaule = '';
|
|
325
|
-
iniVal = fileList.map(function (obj
|
|
355
|
+
iniVal = fileList.map(function (obj) {
|
|
326
356
|
var uid = obj.uid;
|
|
327
357
|
|
|
328
358
|
if (allivaule === '') {
|
|
@@ -375,7 +405,9 @@ var Easy3wUploadM = function (_Component) {
|
|
|
375
405
|
pdfViewFlag: true,
|
|
376
406
|
imgVisible: true,
|
|
377
407
|
urlDownloadFile: urlDownloadFile,
|
|
378
|
-
downloadArr: initialValue
|
|
408
|
+
downloadArr: initialValue,
|
|
409
|
+
propsAFlag: propsAFlag,
|
|
410
|
+
fileViewFlag: fileViewFlag
|
|
379
411
|
})),
|
|
380
412
|
extendBackShowFlag ? extendBack : ''
|
|
381
413
|
) : _react2['default'].createElement(
|
|
@@ -402,7 +434,7 @@ var Easy3wUploadM = function (_Component) {
|
|
|
402
434
|
onRemove: handleRemove,
|
|
403
435
|
multiple: true
|
|
404
436
|
}),
|
|
405
|
-
_react2['default'].createElement(
|
|
437
|
+
isRead ? '' : _react2['default'].createElement(
|
|
406
438
|
_popover2['default'],
|
|
407
439
|
{
|
|
408
440
|
placement: 'top',
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "easy3wui",
|
|
3
|
-
"version": "1.5.
|
|
3
|
+
"version": "1.5.10-beta1",
|
|
4
4
|
"description": "easy3wui components for react",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"react",
|
|
@@ -104,6 +104,7 @@
|
|
|
104
104
|
"@hanyk/rc-viewer": "^0.0.3",
|
|
105
105
|
"antd": "3.24.2",
|
|
106
106
|
"braft-editor": "^2.3.8",
|
|
107
|
+
"braft-extensions": "^0.1.1",
|
|
107
108
|
"lodash": "4.17.11",
|
|
108
109
|
"react-images": "^1.0.0",
|
|
109
110
|
"react-number-format": "^4.3.1",
|