easy3wui 1.6.0 → 2.0.0

package/lib/Easy3wUploadB/index.js

@@ -78,23 +78,33 @@ 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 _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 +156,10 @@ var BigFileUpload = function (_Component) {
       }
     }
   };
+  // 预览
+
+  // url处理
+
 
   BigFileUpload.prototype.render = function render() {
     var _this2 = this;
@@ -165,7 +179,8 @@ var BigFileUpload = function (_Component) {
         wrapperCol = _props.wrapperCol,
         showUploadList = _props.showUploadList,
         urlDownloadFile = _props.urlDownloadFile,
-        initialValue = _props.initialValue;
+        initialValue = _props.initialValue,
+        propsAFlag = _props.propsAFlag;
     var _state = this.state,
         preUploading = _state.preUploading,
         uploadPercent = _state.uploadPercent,
@@ -240,20 +255,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({
@@ -306,8 +311,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,
@@ -322,7 +330,8 @@ var BigFileUpload = function (_Component) {
         pdfViewFlag: true,
         imgVisible: true,
         urlDownloadFile: urlDownloadFile,
-        downloadArr: initialValue
+        downloadArr: initialValue,
+        propsAFlag: propsAFlag
       }))
     ) : _react2['default'].createElement(
       _form2['default'].Item,
@@ -344,7 +353,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',
@@ -457,6 +466,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;
 
@@ -468,25 +493,13 @@ 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;
 
     var iniVal = initialValue.map(function (obj) {
       var uid = obj.uid,
           name = obj.name;
+      // const url = `${urlDownloadFile}${uid}`;
 
       var url = _this3.urlDeal(urlDownloadFile, uid);
       var status = 'done';
@@ -498,12 +511,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,
@@ -698,11 +706,7 @@ var _initialiseProps = function _initialiseProps() {
         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, startSize: start, chunkMD5: chunkMD5 });
         formData.append('chunk', blob);
@@ -887,6 +891,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();

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,9 +101,25 @@ 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 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);
@@ -135,7 +156,8 @@ var Easy3wUploadM = function (_Component) {
         extendBack = _props.extendBack,
         uploadDoneCallback = _props.uploadDoneCallback,
         removeCallback = _props.removeCallback,
-        downloadAllFlag = _props.downloadAllFlag;
+        downloadAllFlag = _props.downloadAllFlag,
+        propsAFlag = _props.propsAFlag;
     var warnMessage = this.props.warnMessage;
 
     var iniVal = [];
@@ -143,7 +165,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 +174,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 +211,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) {
       // 限制上传大小
@@ -375,7 +401,8 @@ var Easy3wUploadM = function (_Component) {
         pdfViewFlag: true,
         imgVisible: true,
         urlDownloadFile: urlDownloadFile,
-        downloadArr: initialValue
+        downloadArr: initialValue,
+        propsAFlag: propsAFlag
       })),
       extendBackShowFlag ? extendBack : ''
     ) : _react2['default'].createElement(
@@ -402,7 +429,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.6.0",
+  "version": "2.0.0",
   "description": "easy3wui components for react",
   "keywords": [
     "react",
@@ -103,6 +103,7 @@
   "dependencies": {
     "@hanyk/rc-viewer": "^0.0.3",
     "antd": "3.24.2",
+    "antd-mobile": "^5.15.0",
     "braft-editor": "^2.3.8",
     "lodash": "4.17.11",
     "react-images": "^1.0.0",