easy3wui 1.5.16 → 1.5.19

package/lib/Easy3wDownLoad/index.js

@@ -81,9 +81,51 @@ var Easy3wDownLoad = function (_Component) {
 
     var _this = (0, _possibleConstructorReturn3['default'])(this, _Component.call(this, props));
 
+    _this.onPreview = function (file, url) {
+      var uid = file.uid,
+          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);
+        var aEle = document.createElement('a');
+        aEle.setAttribute('href', url);
+        aEle.setAttribute('target', '_blank');
+        aEle.setAttribute('id', 'downReportFile');
+        document.body.appendChild(aEle);
+        if (!document.getElementById('downReportFile')) {
+          document.body.appendChild(aEle);
+        }
+        aEle.click();
+      }
+    };
+
+    _this.touchDownload = function (file, url) {
+      var uid = file.uid,
+          name = file.name;
+      // const src = this.urlDeal(previewFileUrl, uid);
+      // window.open(url);
+
+      var aEle = document.createElement('a');
+      aEle.setAttribute('href', url);
+      aEle.setAttribute('target', '_blank');
+      aEle.setAttribute('id', 'downReportFile');
+      document.body.appendChild(aEle);
+      if (!document.getElementById('downReportFile')) {
+        document.body.appendChild(aEle);
+      }
+      aEle.click();
+    };
+
     _this.urlDeal = function (urlDownloadFile, uid) {
+      var propsAFlag = _this.props.propsAFlag; // propsAFlag 加密标识 从引用组件处传入 '1':加密 '0':不加密
+
       var retUrl = '';
-      if (uid !== '' && _comonConfig.aFlag && (_comonConfig.aFlag === '1' || _comonConfig.aFlag === '2')) {
+      if (uid !== '' && propsAFlag === '1' || uid !== '' && propsAFlag === '0' && (_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);
@@ -125,46 +167,6 @@ var Easy3wDownLoad = function (_Component) {
       _this.setState({ imageViewURL: '' });
     };
 
-    _this.onPreview = function (file, url) {
-      var uid = file.uid,
-          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);
-        var _a = document.createElement('a');
-        _a.setAttribute('href', url);
-        _a.setAttribute('target', '_blank');
-        _a.setAttribute('id', 'downReportFile');
-        document.body.appendChild(_a);
-        if (!document.getElementById('downReportFile')) {
-          document.body.appendChild(_a);
-        }
-        _a.click();
-      }
-    };
-
-    _this.touchDownload = function (file, url) {
-      var uid = file.uid,
-          name = file.name;
-      // const src = this.urlDeal(previewFileUrl, uid);
-      // window.open(url);
-
-      var a = document.createElement('a');
-      a.setAttribute('href', url);
-      a.setAttribute('target', '_blank');
-      a.setAttribute('id', 'downReportFile');
-      document.body.appendChild(a);
-      if (!document.getElementById('downReportFile')) {
-        document.body.appendChild(a);
-      }
-      a.click();
-    };
-
     _this.state = {
       pdfViewFlag: false, // pdf预览
       fileViewFlag: false, // xls、xlsx、doc、docx等office文件预览
@@ -205,7 +207,7 @@ var Easy3wDownLoad = function (_Component) {
           // 预览
           return _react2['default'].createElement(
             'div',
-            { style: { width: '100%', display: 'flex', alignItems: 'center', justifyContent: 'space-between' } },
+            { style: { width: '100%', display: 'flex', alignItems: 'center' } },
             _react2['default'].createElement(
               _tooltip2['default'],
               { placement: 'topLeft', title: name, style: { whiteSpace: 'pre-wrap', wordWrap: 'break-word' } },
@@ -213,7 +215,7 @@ var Easy3wDownLoad = function (_Component) {
                 'a',
                 { onClick: function onClick() {
                     return _this2.onPreview(obj, url);
-                  }, style: { overflow: 'hidden', whiteSpace: 'nowrap', textOverflow: 'ellipsis' } },
+                  }, style: { overflow: 'hidden', whiteSpace: 'nowrap', textOverflow: 'ellipsis', paddingRight: '12px' } },
                 name
               )
             ),

package/lib/Easy3wUpload/index.js

@@ -114,8 +114,10 @@ var Easy3wUpload = function (_Component) {
         window.open(url);
       }
     }, _this.urlDeal = function (urlDownloadFile, uid) {
+      var propsAFlag = _this.props.propsAFlag; // propsAFlag 加密标识 从引用组件处传入 '1':加密 '0':不加密
+
       var retUrl = '';
-      if (uid !== '' && _comonConfig.aFlag && (_comonConfig.aFlag === '1' || _comonConfig.aFlag === '2')) {
+      if (uid !== '' && propsAFlag === '1' || uid !== '' && propsAFlag === '0' && (_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);

package/lib/Easy3wUploadB/index.js

@@ -82,6 +82,10 @@ 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 || {},
@@ -154,6 +158,8 @@ var BigFileUpload = function (_Component) {
   };
   // 预览
 
+  // url处理
+
 
   BigFileUpload.prototype.render = function render() {
     var _this2 = this;
@@ -458,6 +464,22 @@ BigFileUpload.defaultProps = {
 var _initialiseProps = function _initialiseProps() {
   var _this3 = this;
 
+  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) {
+      // const src = previewFileUrl + uid;
+      var src = _this3.urlDeal(previewFileUrl, uid);
+      window.open(src, '_blank');
+    } else {
+      window.open(url);
+    }
+  };
+
   this.setUploadValue = function (v) {
     var _setFieldsValue;
 
@@ -475,8 +497,9 @@ var _initialiseProps = function _initialiseProps() {
     var iniVal = initialValue.map(function (obj) {
       var uid = obj.uid,
           name = obj.name;
+      // const url = `${urlDownloadFile}${uid}`;
 
-      var url = '' + urlDownloadFile + uid;
+      var url = _this3.urlDeal(urlDownloadFile, uid);
       var status = 'done';
       return { uid: uid, name: name, url: url, status: status };
     });
@@ -866,6 +889,21 @@ var _initialiseProps = function _initialiseProps() {
     }
   };
 
+  this.urlDeal = function (urlDownloadFile, uid) {
+    var propsAFlag = _this3.props.propsAFlag; // propsAFlag 加密标识 从引用组件处传入 '1':加密 '0':不加密
+
+    var retUrl = '';
+    if (uid !== '' && propsAFlag === '1' || uid !== '' && propsAFlag === '0' && (_comonConfig.aFlag === '1' || _comonConfig.aFlag === '2')) {
+      var authToken = Easy3wGetCookie('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.readFile = function (file) {
     try {
       var chunkReader = new FileReader();
@@ -993,21 +1031,6 @@ 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

@@ -116,8 +116,10 @@ var Easy3wUploadM = function (_Component) {
         window.open(url);
       }
     }, _this.urlDeal = function (urlDownloadFile, uid) {
+      var propsAFlag = _this.props.propsAFlag; // propsAFlag 加密标识 从引用组件处传入 '1':加密 '0':不加密
+
       var retUrl = '';
-      if (uid !== '' && _comonConfig.aFlag && (_comonConfig.aFlag === '1' || _comonConfig.aFlag === '2')) {
+      if (uid !== '' && propsAFlag === '1' || uid !== '' && propsAFlag === '0' && (_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);

package/package.json

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