easy3wui 1.5.59 → 1.5.61
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.
|
@@ -166,7 +166,7 @@ var Easy3wUpload = function (_Component) {
|
|
|
166
166
|
fileViewFlag = _props.fileViewFlag;
|
|
167
167
|
var limitSize = this.props.limitSize;
|
|
168
168
|
|
|
169
|
-
limitSize = limitSize || maxSize;
|
|
169
|
+
limitSize = limitSize || maxSize || 200;
|
|
170
170
|
var warnMessage = this.props.warnMessage;
|
|
171
171
|
|
|
172
172
|
var iniVal = [];
|
|
@@ -210,7 +210,7 @@ var Easy3wUpload = function (_Component) {
|
|
|
210
210
|
authToken: authToken,
|
|
211
211
|
ENCFlag: ENCFlag,
|
|
212
212
|
sign: '2959f1aea8db0f7fbba61f0f8474d0ef',
|
|
213
|
-
data: JSON.stringify(sendData),
|
|
213
|
+
data: JSON.stringify(sendData || {}),
|
|
214
214
|
easy3wRootOrg: _comonConfig.easy3wRootOrg || ''
|
|
215
215
|
}
|
|
216
216
|
};
|
|
@@ -471,7 +471,7 @@ Easy3wUpload.propTypes = {
|
|
|
471
471
|
urlDownloadFile: _propTypes2['default'].string,
|
|
472
472
|
required: _propTypes2['default'].bool, // 是否必须
|
|
473
473
|
help: _propTypes2['default'].string, // 后台附件服务地址
|
|
474
|
-
limitSize:
|
|
474
|
+
// limitSize: PropTypes.number, // 文件大小限制
|
|
475
475
|
listType: _propTypes2['default'].string, // 附件类型
|
|
476
476
|
accept: _propTypes2['default'].string, // 接受类型
|
|
477
477
|
buttonName: _propTypes2['default'].string, // 上传名称
|
|
@@ -489,7 +489,7 @@ Easy3wUpload.defaultProps = {
|
|
|
489
489
|
initialValue: [],
|
|
490
490
|
listType: 'file',
|
|
491
491
|
accept: '',
|
|
492
|
-
|
|
492
|
+
// limitSizeDefault: 200,
|
|
493
493
|
urlUpFileService: '',
|
|
494
494
|
urlDownloadFile: '',
|
|
495
495
|
buttonName: '上传',
|
|
@@ -538,11 +538,12 @@ var _initialiseProps = function _initialiseProps() {
|
|
|
538
538
|
urlDownloadFile = _props3.urlDownloadFile,
|
|
539
539
|
uploadDoneCallback = _props3.uploadDoneCallback;
|
|
540
540
|
|
|
541
|
+
var sendDataNew = sendData || {};
|
|
541
542
|
formData.append('sendTime', new Date().getTime());
|
|
542
543
|
formData.append('appType', '01');
|
|
543
544
|
formData.append('authToken', authToken);
|
|
544
545
|
formData.append('devId', '');
|
|
545
|
-
formData.append('data', JSON.stringify((0, _extends3['default'])({ uploadParams: uploadParams },
|
|
546
|
+
formData.append('data', JSON.stringify((0, _extends3['default'])({ uploadParams: uploadParams }, sendDataNew)));
|
|
546
547
|
formData.append('sign', '2959f1aea8db0f7fbba61f0f8474d0ef');
|
|
547
548
|
formData.append('easy3wRootOrg', _comonConfig.easy3wRootOrg || '');
|
|
548
549
|
|
|
@@ -684,6 +685,7 @@ var _initialiseProps = function _initialiseProps() {
|
|
|
684
685
|
urlUpBigFileGeneral = _props4.urlUpBigFileGeneral,
|
|
685
686
|
urlDownloadFile = _props4.urlDownloadFile;
|
|
686
687
|
|
|
688
|
+
var sendDataNew = sendData || {};
|
|
687
689
|
var chunkSize = 0;
|
|
688
690
|
if (typeof limitChunkSize === 'string') {
|
|
689
691
|
if (limitChunkSize.toLowerCase().indexOf('k') !== -1) {
|
|
@@ -730,7 +732,7 @@ var _initialiseProps = function _initialiseProps() {
|
|
|
730
732
|
var formData = new FormData();
|
|
731
733
|
var authToken = Easy3wGetCookie('userToken') || '40572da23bee5fd59cc5b6c8d8bfb36d';
|
|
732
734
|
var blob = new Blob([e.target.result], { type: 'application/octet-stream' });
|
|
733
|
-
var postParam = (0, _extends3['default'])({ fileInfo: file },
|
|
735
|
+
var postParam = (0, _extends3['default'])({ fileInfo: file }, sendDataNew, { currentSize: end, startSize: start, chunkMD5: chunkMD5 });
|
|
734
736
|
formData.append('chunk', blob);
|
|
735
737
|
formData.append('sendTime', new Date().getTime());
|
|
736
738
|
formData.append('appType', '01');
|
|
@@ -165,7 +165,7 @@ var Easy3wUploadM = function (_Component) {
|
|
|
165
165
|
fileViewFlag = _props.fileViewFlag;
|
|
166
166
|
var limitSize = this.props.limitSize;
|
|
167
167
|
|
|
168
|
-
limitSize = limitSize || maxSize;
|
|
168
|
+
limitSize = limitSize || maxSize || 200;
|
|
169
169
|
var warnMessage = this.props.warnMessage;
|
|
170
170
|
|
|
171
171
|
var iniVal = [];
|
|
@@ -215,7 +215,7 @@ var Easy3wUploadM = function (_Component) {
|
|
|
215
215
|
authToken: authToken,
|
|
216
216
|
ENCFlag: ENCFlag,
|
|
217
217
|
sign: '2959f1aea8db0f7fbba61f0f8474d0ef',
|
|
218
|
-
data: JSON.stringify(sendData),
|
|
218
|
+
data: JSON.stringify(sendData || {}),
|
|
219
219
|
easy3wRootOrg: _comonConfig.easy3wRootOrg || ''
|
|
220
220
|
}
|
|
221
221
|
};
|
|
@@ -477,7 +477,7 @@ Easy3wUploadM.propTypes = {
|
|
|
477
477
|
urlDownloadFile: _propTypes2['default'].string,
|
|
478
478
|
required: _propTypes2['default'].bool, // 是否必须
|
|
479
479
|
help: _propTypes2['default'].string, // 后台附件服务地址
|
|
480
|
-
limitSize:
|
|
480
|
+
// limitSize: PropTypes.number, // 文件大小限制
|
|
481
481
|
listType: _propTypes2['default'].string, // 附件类型
|
|
482
482
|
accept: _propTypes2['default'].string, // 接受类型
|
|
483
483
|
buttonName: _propTypes2['default'].string, // 上传名称
|
|
@@ -492,7 +492,7 @@ Easy3wUploadM.defaultProps = {
|
|
|
492
492
|
initialValue: [],
|
|
493
493
|
listType: 'file',
|
|
494
494
|
accept: '',
|
|
495
|
-
limitSize: 200,
|
|
495
|
+
// limitSize: 200,
|
|
496
496
|
urlUpFileService: '',
|
|
497
497
|
urlDownloadFile: '',
|
|
498
498
|
buttonName: '上传',
|