easy3wui 1.5.11 → 1.5.14

package/lib/Easy3wUploadB/index.js

@@ -78,23 +78,29 @@ require('antd/lib/modal/style');
 
 var _comonConfig = require('comonConfigPath/comonConfig');
 
-var _Easy3wGetCookie = require('./../Easy3wGetCookie');
-
-var _Easy3wGetCookie2 = _interopRequireDefault(_Easy3wGetCookie);
-
-var _Easy3wDownLoad = require('./../Easy3wDownLoad');
+var _Easy3wDownLoad = require('../Easy3wDownLoad');
 
 var _Easy3wDownLoad2 = _interopRequireDefault(_Easy3wDownLoad);
 
-var _Easy3wAESEncrypt = require('./../Easy3wAESEncrypt');
-
-var _Easy3wAESEncrypt2 = _interopRequireDefault(_Easy3wAESEncrypt);
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
 
+var _ref = _comonConfig.objPreviewFile || {},
+    previewFileUrl = _ref.previewFileUrl,
+    previewFileFlag = _ref.previewFileFlag,
+    previewFileType = _ref.previewFileType;
+
 var formItemStyle = {
   marginBottom: 6
 };
+function Easy3wGetCookie(name) {
+  var arr = void 0;
+  var reg = new RegExp('(^| )' + name + '=([^;]*)(;|$)');
+  if (arr = document.cookie.match(reg)) {
+    return unescape(arr[2]);
+  } else {
+    return null;
+  }
+}
 
 var BigFileUpload = function (_Component) {
   (0, _inherits3['default'])(BigFileUpload, _Component);
@@ -146,6 +152,8 @@ var BigFileUpload = function (_Component) {
       }
     }
   };
+  // 预览
+
 
   BigFileUpload.prototype.render = function render() {
     var _this2 = this;
@@ -240,20 +248,10 @@ var BigFileUpload = function (_Component) {
         var fileTypePass = true;
         var fileNameArr = file.name.toLowerCase().split('.');
         var fileType = fileNameArr[fileNameArr.length - 1];
-        if (file.name.length > 100) {
-          _modal2['default'].info({
-            style: { top: '38%' },
-            content: '文件名称至多100个字符',
-            okText: '知道了'
-          });
-          return false;
-        }
-        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';
         if (accept && accept.length > 0) {
-          acceptDefault = accept;
-        }
-        if (acceptDefault.indexOf(fileType) < 0) {
-          fileTypePass = false;
+          if (accept.indexOf(fileType) < 0) {
+            fileTypePass = false;
+          }
         }
         if (!fileTypePass) {
           _modal2['default'].error({
@@ -274,6 +272,9 @@ var BigFileUpload = function (_Component) {
             fileList = _state3.fileList,
             iniSetedFlag = _state3.iniSetedFlag;
 
+        if (!iniSetedFlag) {
+          iniSetedFlag = true;
+        }
         if (!multiple) {
           fileList = [file];
         } else {
@@ -303,8 +304,11 @@ var BigFileUpload = function (_Component) {
       },
       fileList: this.state.fileList
     };
+    if (previewFileFlag) {
+      uploadProp.onPreview = this.onPreview;
+    }
     if (isRead) {
-      uploadProp = (0, _extends3['default'])({}, uploadProp, { showUploadList: { showPreviewIcon: true, showRemoveIcon: false } });
+      uploadProp.children = true;
     }
     return isRead ? _react2['default'].createElement(
       _form2['default'].Item,
@@ -341,7 +345,7 @@ var BigFileUpload = function (_Component) {
           (0, _extends3['default'])({}, uploadProp, {
             disabled: this.state.loading
           }),
-          isRead ? null : _react2['default'].createElement(
+          _react2['default'].createElement(
             _popover2['default'],
             {
               placement: 'right',
@@ -465,19 +469,6 @@ var _initialiseProps = function _initialiseProps() {
     setFieldsValue((_setFieldsValue = {}, _setFieldsValue[name] = v, _setFieldsValue));
   };
 
-  this.urlDeal = function (urlDownloadFile, uid) {
-    var retUrl = '';
-    if (uid !== '' && _comonConfig.aFlag && (_comonConfig.aFlag === '1' || _comonConfig.aFlag === '2')) {
-      var authToken = (0, _Easy3wGetCookie2['default'])('userToken') || 'E3WSAFEAPPQWEFGHYI7I483S';
-      var nowStr = _.now();
-      var encUrl = (0, _Easy3wAESEncrypt2['default'])(uid + '@#' + nowStr + '@#' + authToken, _comonConfig.a, _comonConfig.b);
-      return '' + urlDownloadFile + encUrl;
-    } else {
-      retUrl = '' + urlDownloadFile + uid;
-      return retUrl;
-    }
-  };
-
   this.iniValDeal = function (initialValue) {
     var urlDownloadFile = _this3.props.urlDownloadFile;
 
@@ -485,7 +476,7 @@ var _initialiseProps = function _initialiseProps() {
       var uid = obj.uid,
           name = obj.name;
 
-      var url = _this3.urlDeal(urlDownloadFile, uid);
+      var url = '' + urlDownloadFile + uid;
       var status = 'done';
       return { uid: uid, name: name, url: url, status: status };
     });
@@ -495,11 +486,7 @@ var _initialiseProps = function _initialiseProps() {
   this.checkFile = function (uploadParams) {
     _this3.setState({ uploadRequest: true });
     var formData = new FormData();
-    var authToken = (0, _Easy3wGetCookie2['default'])('userToken') || 'E3WSAFEAPPQWEFGHYI7I483S';
-    // const timeStr = new Date().getTime();
-    // if (AESFlag && AESFlag === '1') {
-    //   authToken = Easy3wAESEncrypt(`${authToken}@#${timeStr}`, AESKey, AESIV);
-    // }
+    var authToken = Easy3wGetCookie('userToken') || '40572da23bee5fd59cc5b6c8d8bfb36d';
     var _props3 = _this3.props,
         name = _props3.name,
         urlCheckProgress = _props3.urlCheckProgress,
@@ -608,7 +595,7 @@ var _initialiseProps = function _initialiseProps() {
         var _index2 = _fileList2.indexOf(_currentFile);
         if (_index2 >= 0) {
           _fileList2.splice(_index2, 1);
-          _this3.setState((0, _extends3['default'])({}, _this3.state, { loading: false, fileList: _fileList2 }), function () {
+          _this3.setState((0, _extends3['default'])({}, _this3.state, { fileList: _fileList2, loading: false }), function () {
             _this3.setUploadValue(_fileList2);
           });
         }
@@ -616,7 +603,7 @@ var _initialiseProps = function _initialiseProps() {
     });
   };
 
-  this.handlePartUpload = function () {
+  this.handlePartUpload = function (sIndex, eIndex) {
     try {
       var _state6 = _this3.state,
           currentFile = _state6.currentFile,
@@ -678,21 +665,25 @@ var _initialiseProps = function _initialiseProps() {
       } else {
         end = fileSize;
       }
+      var start = CUSize;
+      if (sIndex && sIndex > 0 && eIndex && eIndex > 0) {
+        end = eIndex;
+        start = sIndex;
+      }
       uploadFileReader.onload = function (e) {
         if (chunkCheckErr) {
           return;
         }
+        var mainFileSpark = new _sparkMd2['default'].ArrayBuffer(); // 对arrayBuffer数据进行md5加密，产生一个md5字符串 主文件
+        mainFileSpark.append(e.target.result);
+        var chunkMD5 = mainFileSpark.end();
         // 上传附件
         var file = uploadData.file;
 
         var formData = new FormData();
-        var authToken = (0, _Easy3wGetCookie2['default'])('userToken') || 'E3WSAFEAPPQWEFGHYI7I483S';
-        // const timeStr = new Date().getTime();
-        // if (AESFlag && AESFlag === '1') {
-        //   authToken = Easy3wAESEncrypt(`${authToken}@#${timeStr}`, AESKey, AESIV);
-        // }
+        var authToken = Easy3wGetCookie('userToken') || '40572da23bee5fd59cc5b6c8d8bfb36d';
         var blob = new Blob([e.target.result], { type: 'application/octet-stream' });
-        var postParam = (0, _extends3['default'])({ fileInfo: file }, sendData, { currentSize: end });
+        var postParam = (0, _extends3['default'])({ fileInfo: file }, sendData, { currentSize: end, startSize: start, chunkMD5: chunkMD5 });
         formData.append('chunk', blob);
         formData.append('sendTime', new Date().getTime());
         formData.append('appType', '01');
@@ -732,16 +723,26 @@ var _initialiseProps = function _initialiseProps() {
           blob = null;
           formData = null;
           if (res && res.body.rspCode === '0000') {
-            var useTime = (new Date().getTime() - startTime) / 1000; // 用时秒
-            // 1秒传输速率
-            var curSpeed = Math.floor(1 / useTime * size);
             var _res$body$data2 = res.body.data,
                 uploadStatus = _res$body$data2.uploadStatus,
                 fileId = _res$body$data2.fileId,
                 checkStatus = _res$body$data2.checkStatus,
-                uploadedSize = _res$body$data2.uploadedSize;
+                uploadedSize = _res$body$data2.uploadedSize,
+                startIndex = _res$body$data2.startIndex,
+                endIndex = _res$body$data2.endIndex;
 
+            var useTime = (new Date().getTime() - startTime) / 1000; // 用时秒
             var upSize = Number(uploadedSize);
+            // 1秒传输速率
+            var curSpeed = Math.floor(1 / useTime * size);
+            if (checkStatus && checkStatus === 'RETRY') {
+              _this3.setState((0, _extends3['default'])({}, _this3.state, {
+                speed: curSpeed
+              }), function () {
+                setImmediate(_this3.handlePartUpload, startIndex, endIndex);
+              });
+              return;
+            }
             // 计算上传进度
             uploadPercent = Math.floor(upSize / fileSize * 100 * 10) / 10;
             if (checkStatus === '0') {
@@ -827,10 +828,10 @@ var _initialiseProps = function _initialiseProps() {
                 setImmediate(_this3.handlePartUpload);
               });
             }
-          } else if (res && res.body.rspMsg) {
+          } else {
             _modal2['default'].error({
               style: { top: '38%' },
-              content: res.body.rspMsg
+              content: res && res.body.rspMsg ? res.body.rspMsg : '上传失败'
             });
             var _fileList4 = _this3.state.fileList;
 
@@ -841,25 +842,11 @@ var _initialiseProps = function _initialiseProps() {
                 _this3.setUploadValue(_fileList4);
               });
             }
-          } else {
-            _modal2['default'].error({
-              style: { top: '38%' },
-              content: '上传失败'
-            });
-            var _fileList5 = _this3.state.fileList;
-
-            var _index5 = _fileList5.indexOf(currentFile);
-            if (_index5 >= 0) {
-              _fileList5.splice(_index5, 1);
-              _this3.setState((0, _extends3['default'])({}, _this3.state, { loading: false, fileList: _fileList5 }), function () {
-                _this3.setUploadValue(_fileList5);
-              });
-            }
           }
         });
       };
-      // console.log('读取文件', `文件大小：${currentFile.size}`, `已上传大小${CUSize}`, `结束值${end}`, `切片大小${speed}`);
-      uploadFileReader.readAsArrayBuffer(blobSlice.call(currentFile, CUSize, end));
+      // console.log('读取文件', `文件大小：${currentFile.size}`, `已上传大小${start}`, `结束值${end}`, `切片大小${speed}`);
+      uploadFileReader.readAsArrayBuffer(blobSlice.call(currentFile, start, end));
     } catch (error) {
       _modal2['default'].error({
         style: { top: '38%' },
@@ -939,7 +926,8 @@ var _initialiseProps = function _initialiseProps() {
         if (sliceIndex < sliceCount) {
           _this3.setState((0, _extends3['default'])({}, _this3.state, {
             preUploading: true,
-            preUploadPercent: Number((sliceIndex / sliceCount * 100).toFixed(1)) }));
+            preUploadPercent: Number((sliceIndex / sliceCount * 100).toFixed(1))
+          }));
           setImmediate(_loadNext, sliceIndex, tempreadFileSize);
         } else {
           var mainFileMD5 = mainFileSpark.end();
@@ -1005,6 +993,21 @@ var _initialiseProps = function _initialiseProps() {
     }
     callback();
   };
+
+  this.onPreview = function (file) {
+    var uid = file.uid,
+        url = file.url,
+        name = file.name;
+
+    var fileNameArr = name.toLowerCase().split('.');
+    var fileType = fileNameArr[fileNameArr.length - 1];
+    if (previewFileType.indexOf(fileType) >= 0) {
+      var src = previewFileUrl + uid;
+      window.open(src, '_blank');
+    } else {
+      window.open(url);
+    }
+  };
 };
 
 exports['default'] = BigFileUpload;

package/lib/Easy3wUploadM/index.js

@@ -64,20 +64,25 @@ require('antd/lib/modal/style');
 
 var _comonConfig = require('comonConfigPath/comonConfig');
 
-var _Easy3wGetCookie = require('./../Easy3wGetCookie');
+var _Easy3wGetCookie = require('../Easy3wGetCookie');
 
 var _Easy3wGetCookie2 = _interopRequireDefault(_Easy3wGetCookie);
 
-var _Easy3wDownLoad = require('./../Easy3wDownLoad');
+var _Easy3wDownLoad = require('../Easy3wDownLoad');
 
 var _Easy3wDownLoad2 = _interopRequireDefault(_Easy3wDownLoad);
 
-var _Easy3wAESEncrypt = require('./../Easy3wAESEncrypt');
+var _Easy3wAESEncrypt = require('../Easy3wAESEncrypt');
 
 var _Easy3wAESEncrypt2 = _interopRequireDefault(_Easy3wAESEncrypt);
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
 
+var _ref = _comonConfig.objPreviewFile || {},
+    previewFileUrl = _ref.previewFileUrl,
+    previewFileFlag = _ref.previewFileFlag,
+    previewFileType = _ref.previewFileType;
+
 var formItemStyle = {
   marginBottom: 6
 };
@@ -96,6 +101,20 @@ var Easy3wUploadM = function (_Component) {
 
     return _ret = (_temp = (_this = (0, _possibleConstructorReturn3['default'])(this, _Component.call.apply(_Component, [this].concat(args))), _this), _this.state = {
       fileList: [{}]
+      // 预览
+    }, _this.onPreview = function (file) {
+      var uid = file.uid,
+          url = file.url,
+          name = file.name;
+
+      var fileNameArr = name.toLowerCase().split('.');
+      var fileType = fileNameArr[fileNameArr.length - 1];
+      if (previewFileType.indexOf(fileType) >= 0) {
+        var src = _this.urlDeal(previewFileUrl, uid);
+        window.open(src, '_blank');
+      } else {
+        window.open(url);
+      }
     }, _this.urlDeal = function (urlDownloadFile, uid) {
       var retUrl = '';
       if (uid !== '' && _comonConfig.aFlag && (_comonConfig.aFlag === '1' || _comonConfig.aFlag === '2')) {
@@ -143,7 +162,8 @@ var Easy3wUploadM = function (_Component) {
     if (initialValue) {
       iniVal = initialValue.map(function (obj) {
         var uid = obj.uid,
-            name = obj.name;
+            name = obj.name,
+            status = obj.status;
 
         if (allivaule === '') {
           allivaule = uid;
@@ -151,7 +171,7 @@ var Easy3wUploadM = function (_Component) {
           allivaule = allivaule + ',' + uid;
         }
         var url = _this2.urlDeal(urlDownloadFile, uid);
-        return { uid: uid, name: name, url: url };
+        return { uid: uid, name: name, url: url, status: status || 'done' };
       });
     }
     if (!warnMessage) {
@@ -188,7 +208,10 @@ var Easy3wUploadM = function (_Component) {
       }
     };
     if (isRead) {
-      upProps = (0, _extends3['default'])({}, upProps, { showUploadList: { showPreviewIcon: true, showRemoveIcon: false } });
+      upProps = (0, _extends3['default'])({}, upProps, { children: true, showUploadList: { showPreviewIcon: false, showRemoveIcon: false } });
+    }
+    if (previewFileFlag) {
+      upProps.onPreview = this.onPreview;
     }
     var beforeUpload = function beforeUpload(file) {
       // 限制上传大小
@@ -402,7 +425,7 @@ var Easy3wUploadM = function (_Component) {
           onRemove: handleRemove,
           multiple: true
         }),
-        _react2['default'].createElement(
+        isRead ? '' : _react2['default'].createElement(
           _popover2['default'],
           {
             placement: 'top',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "easy3wui",
-  "version": "1.5.11",
+  "version": "1.5.14",
   "description": "easy3wui components for react",
   "keywords": [
     "react",