easy3wui 1.6.0 → 1.6.1

package/lib/Easy3wUploadB/index.js

@@ -93,7 +93,8 @@ var _Easy3wAESEncrypt2 = _interopRequireDefault(_Easy3wAESEncrypt);
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
 
 var formItemStyle = {
-  marginBottom: 6
+  // marginBottom: 0,
+  margin: 3
 };
 
 var BigFileUpload = function (_Component) {
@@ -248,7 +249,7 @@ var BigFileUpload = function (_Component) {
           });
           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';
+        var acceptDefault = '.msg,.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;
         }
@@ -274,9 +275,6 @@ var BigFileUpload = function (_Component) {
             fileList = _state3.fileList,
             iniSetedFlag = _state3.iniSetedFlag;
 
-        if (!iniSetedFlag) {
-          iniSetedFlag = true;
-        }
         if (!multiple) {
           fileList = [file];
         } else {
@@ -499,7 +497,6 @@ var _initialiseProps = function _initialiseProps() {
     _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);
@@ -612,7 +609,7 @@ var _initialiseProps = function _initialiseProps() {
         var _index2 = _fileList2.indexOf(_currentFile);
         if (_index2 >= 0) {
           _fileList2.splice(_index2, 1);
-          _this3.setState((0, _extends3['default'])({}, _this3.state, { fileList: _fileList2, loading: false }), function () {
+          _this3.setState((0, _extends3['default'])({}, _this3.state, { loading: false, fileList: _fileList2 }), function () {
             _this3.setUploadValue(_fileList2);
           });
         }
@@ -620,7 +617,7 @@ var _initialiseProps = function _initialiseProps() {
     });
   };
 
-  this.handlePartUpload = function (sIndex, eIndex) {
+  this.handlePartUpload = function () {
     try {
       var _state6 = _this3.state,
           currentFile = _state6.currentFile,
@@ -682,18 +679,10 @@ 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;
 
@@ -704,7 +693,7 @@ var _initialiseProps = function _initialiseProps() {
         //   authToken = Easy3wAESEncrypt(`${authToken}@#${timeStr}`, AESKey, AESIV);
         // }
         var blob = new Blob([e.target.result], { type: 'application/octet-stream' });
-        var postParam = (0, _extends3['default'])({ fileInfo: file }, sendData, { currentSize: end, startSize: start, chunkMD5: chunkMD5 });
+        var postParam = (0, _extends3['default'])({ fileInfo: file }, sendData, { currentSize: end });
         formData.append('chunk', blob);
         formData.append('sendTime', new Date().getTime());
         formData.append('appType', '01');
@@ -744,26 +733,16 @@ 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,
-                startIndex = _res$body$data2.startIndex,
-                endIndex = _res$body$data2.endIndex;
+                uploadedSize = _res$body$data2.uploadedSize;
 
-            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') {
@@ -849,10 +828,10 @@ var _initialiseProps = function _initialiseProps() {
                 setImmediate(_this3.handlePartUpload);
               });
             }
-          } else {
+          } else if (res && res.body.rspMsg) {
             _modal2['default'].error({
               style: { top: '38%' },
-              content: res && res.body.rspMsg ? res.body.rspMsg : '上传失败'
+              content: res.body.rspMsg
             });
             var _fileList4 = _this3.state.fileList;
 
@@ -863,11 +842,25 @@ 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}`, `已上传大小${start}`, `结束值${end}`, `切片大小${speed}`);
-      uploadFileReader.readAsArrayBuffer(blobSlice.call(currentFile, start, end));
+      // console.log('读取文件', `文件大小：${currentFile.size}`, `已上传大小${CUSize}`, `结束值${end}`, `切片大小${speed}`);
+      uploadFileReader.readAsArrayBuffer(blobSlice.call(currentFile, CUSize, end));
     } catch (error) {
       _modal2['default'].error({
         style: { top: '38%' },
@@ -947,8 +940,7 @@ 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();

package/lib/Easy3wUploadM/index.js

@@ -79,7 +79,8 @@ var _Easy3wAESEncrypt2 = _interopRequireDefault(_Easy3wAESEncrypt);
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
 
 var formItemStyle = {
-  marginBottom: 6
+  // marginBottom: 0,
+  margin: 3
 };
 
 var Easy3wUploadM = function (_Component) {
@@ -199,7 +200,7 @@ var Easy3wUploadM = function (_Component) {
 
       var fileNameArr = name.toLowerCase().split('.');
       var fileType = fileNameArr[fileNameArr.length - 1];
-      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';
+      var acceptDefault = '.msg,.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 (name.length > 100) {
         _modal2['default'].info({
           style: { top: '38%' },
@@ -256,7 +257,7 @@ var Easy3wUploadM = function (_Component) {
           var correctTypeFlag = true;
           var fileNameArr = name.toLowerCase().split('.');
           var fileType = fileNameArr[fileNameArr.length - 1];
-          var acceptDefault = '.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';
+          var acceptDefault = '.msg,.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 (name.length > 100) {
             return false;
           }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "easy3wui",
-  "version": "1.6.0",
+  "version": "1.6.1",
   "description": "easy3wui components for react",
   "keywords": [
     "react",
@@ -105,6 +105,7 @@
     "antd": "3.24.2",
     "braft-editor": "^2.3.8",
     "lodash": "4.17.11",
+    "node-red": "^2.1.4",
     "react-images": "^1.0.0",
     "react-number-format": "^4.3.1",
     "react-number-input": "^15.5.1",