easy3wui 1.5.52 → 1.5.53-beta1

package/lib/Easy3wUploadM/index.js

@@ -64,20 +64,14 @@ require('antd/lib/modal/style');
 
 var _comonConfig = require('comonConfigPath/comonConfig');
 
-var _Easy3wGetCookie = require('../Easy3wGetCookie');
-
-var _Easy3wGetCookie2 = _interopRequireDefault(_Easy3wGetCookie);
-
-var _Easy3wDownLoad = require('../Easy3wDownLoad');
-
-var _Easy3wDownLoad2 = _interopRequireDefault(_Easy3wDownLoad);
-
-var _Easy3wAESEncrypt = require('../Easy3wAESEncrypt');
-
-var _Easy3wAESEncrypt2 = _interopRequireDefault(_Easy3wAESEncrypt);
+var _easy3wui = require('easy3wui');
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
 
+// import Easy3wGetCookie from '../Easy3wGetCookie';
+// import Easy3wDownLoad from '../Easy3wDownLoad';
+// import Easy3wAESEncrypt from '../Easy3wAESEncrypt';
+
 // const { previewFileUrl, previewFileFlag, previewFileType } = objPreviewFile || {};
 
 var formItemStyle = {
@@ -87,53 +81,59 @@ var formItemStyle = {
 var Easy3wUploadM = function (_Component) {
   (0, _inherits3['default'])(Easy3wUploadM, _Component);
 
-  function Easy3wUploadM() {
-    var _temp, _this, _ret;
-
+  function Easy3wUploadM(props) {
     (0, _classCallCheck3['default'])(this, Easy3wUploadM);
 
-    for (var _len = arguments.length, args = Array(_len), _key = 0; _key < _len; _key++) {
-      args[_key] = arguments[_key];
-    }
+    var _this = (0, _possibleConstructorReturn3['default'])(this, _Component.call(this, props));
 
-    return _ret = (_temp = (_this = (0, _possibleConstructorReturn3['default'])(this, _Component.call.apply(_Component, [this].concat(args))), _this), _this.state = {
-      fileList: [{}]
-      // 预览
-    }, _this.onPreview = function (file) {
-      var objPreviewFileNew = (0, _extends3['default'])({}, _comonConfig.objPreviewFile, _this.props.objPreviewFile);
-      var previewFileUrl = objPreviewFileNew.previewFileUrl,
-          previewFileType = objPreviewFileNew.previewFileType;
-      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 !== '' && 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);
-        return '' + urlDownloadFile + encUrl;
-      } else {
-        retUrl = '' + urlDownloadFile + uid;
-        return retUrl;
-      }
-    }, _temp), (0, _possibleConstructorReturn3['default'])(_this, _ret);
+    _initialiseProps.call(_this);
+
+    var _this$props = _this.props,
+        urlDownloadFile = _this$props.urlDownloadFile,
+        initialValue = _this$props.initialValue;
+
+    var fileList = [];
+    var fileIds = '';
+    if (initialValue && initialValue.length > 0) {
+      fileList = initialValue.map(function (obj) {
+        var uid = obj.uid,
+            name = obj.name,
+            status = obj.status;
+
+        if (fileIds === '') {
+          fileIds = uid;
+        } else {
+          fileIds = fileIds + ',' + uid;
+        }
+        var url = _this.urlDeal(urlDownloadFile, uid);
+        return { uid: uid, name: name, url: url, status: status || 'done' };
+      });
+    }
+    _this.state = {
+      fileList: fileList, // 文件列表
+      fileIds: fileIds // 文件ID
+    };
+    return _this;
   }
+  // 预览
+
+  // 文件地址处理
+
+  // 文件删除
+
+  // 验证文件是否上传完成
+
+  // 文件上传前
+
+  // 表单值改变
+
 
   Easy3wUploadM.prototype.render = function render() {
-    var _this2 = this;
+    var _state = this.state,
+        fileList = _state.fileList,
+        fileIds = _state.fileIds;
 
+    console.log('renderfileList', fileList, fileIds);
     var _props = this.props,
         urlUpFileService = _props.urlUpFileService,
         urlDownloadFile = _props.urlDownloadFile,
@@ -141,7 +141,6 @@ var Easy3wUploadM = function (_Component) {
         sendData = _props.sendData,
         listType = _props.listType,
         accept = _props.accept,
-        limitSize = _props.limitSize,
         required = _props.required,
         initialValue = _props.initialValue,
         help = _props.help,
@@ -154,45 +153,14 @@ var Easy3wUploadM = function (_Component) {
         wrapperCol = _props.wrapperCol,
         extend = _props.extend,
         extendBack = _props.extendBack,
-        uploadDoneCallback = _props.uploadDoneCallback,
-        removeCallback = _props.removeCallback,
         downloadAllFlag = _props.downloadAllFlag,
         propsAFlag = _props.propsAFlag,
-        fileViewFlag = _props.fileViewFlag;
-    var warnMessage = this.props.warnMessage;
-
-    var iniVal = [];
-    var allivaule = '';
-    if (initialValue) {
-      iniVal = initialValue.map(function (obj) {
-        var uid = obj.uid,
-            name = obj.name,
-            status = obj.status;
-
-        if (allivaule === '') {
-          allivaule = uid;
-        } else {
-          allivaule = allivaule + ',' + uid;
-        }
-        var url = _this2.urlDeal(urlDownloadFile, uid);
-        return { uid: uid, name: name, url: url, status: status || 'done' };
-      });
-    }
-    if (!warnMessage) {
-      warnMessage = help;
-    }
+        fileViewFlag = _props.fileViewFlag,
+        warnMessage = _props.warnMessage;
     var getFieldDecorator = form.getFieldDecorator;
 
-    var extendShowFlag = false;
-    var extendBackShowFlag = false;
-    if (extend) {
-      extendShowFlag = true;
-    }
-    if (extendBack) {
-      extendBackShowFlag = true;
-    }
     var ENCFlag = '0';
-    var authToken = (0, _Easy3wGetCookie2['default'])('userToken') || 'E3WSAFEAPPQWEFGHYI7I483S';
+    var authToken = (0, _easy3wui.Easy3wGetCookie)('userToken') || 'E3WSAFEAPPQWEFGHYI7I483S';
     var upProps = {
       name: uploadName,
       action: urlUpFileService,
@@ -221,177 +189,6 @@ var Easy3wUploadM = function (_Component) {
     if (previewFileFlag && fileViewFlag !== false) {
       upProps.onPreview = this.onPreview;
     }
-    var beforeUpload = function beforeUpload(file) {
-      // 限制上传大小
-      var fileSize = file.size / 1024 / 1024;
-      var isLimitSize = fileSize < limitSize;
-      var fileTypePass = true;
-      var name = file.name;
-
-      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';
-      if (name.length > 100) {
-        _modal2['default'].info({
-          style: { top: '38%' },
-          okText: '知道了',
-          content: '文件名称至多100个字符'
-        });
-        return false;
-      }
-      if (accept && accept.length > 0) {
-        acceptDefault = accept;
-      }
-      if (acceptDefault.indexOf(fileType) < 0) {
-        fileTypePass = false;
-      }
-      if (!fileTypePass) {
-        _modal2['default'].error({
-          style: { top: '38%' },
-          content: '\u4E0D\u652F\u6301' + fileType + '\u7C7B\u578B\u7684\u6587\u4EF6!'
-        });
-        return false;
-      }
-      if (!isLimitSize) {
-        _modal2['default'].error({
-          style: { top: '38%' },
-          content: '\u9644\u4EF6\u5FC5\u987B\u5C0F\u4E8E' + limitSize + 'MB!'
-        });
-        return false;
-      } else if (fileSize === 0) {
-        _modal2['default'].error({
-          style: { top: '38%' },
-          content: '附件必须大于0MB!'
-        });
-        return false;
-      } else {
-        return true;
-      }
-    };
-    var handleRemove = function handleRemove(file) {
-      if (removeCallback) {
-        removeCallback(uploadName, file);
-      }
-      return true;
-    };
-    var handleFileChange = function handleFileChange(e) {
-      var fileList = e.fileList;
-      // 移除大小不符、类型不符的文件
-
-      fileList = fileList.filter(function (f1) {
-        var size = f1.size,
-            name = f1.name;
-
-        if (size >= 0) {
-          var correctSizeFlag = size > 0 && size / 1024 / 1024 < limitSize;
-          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';
-          if (name.length > 100) {
-            return false;
-          }
-          if (accept && accept.length > 0) {
-            acceptDefault = accept;
-          }
-          if (acceptDefault.indexOf(fileType) < 0) {
-            correctTypeFlag = false;
-          }
-          if (!correctSizeFlag || !correctTypeFlag) {
-            return false;
-          } else {
-            return true;
-          }
-        } else {
-          return true;
-        }
-      });
-      // 2. read from response and show file link
-      fileList = fileList.map(function (f2) {
-        var nFile = f2;
-        if (nFile.response && nFile.response.data) {
-          var id = nFile.response.data.fileId;
-          nFile.uid = id;
-          var url = _this2.urlDeal(urlDownloadFile, id);
-          nFile.url = url;
-        }
-        return nFile;
-      });
-      // 3. filter successfully uploaded files according to response from server
-      fileList = fileList.filter(function (file) {
-        var status = file.status,
-            name = file.name;
-
-        if (status === 'error') {
-          _modal2['default'].error({
-            style: { top: '38%' },
-            content: '\u9644\u4EF6' + name + '\u4E0A\u4F20\u5931\u8D25!'
-          });
-          return false; // 上传失败
-        }
-        if (file.response) {
-          if (file.response.rspCode === '0000') {
-            if (uploadDoneCallback) {
-              uploadDoneCallback(uploadName, fileList, file);
-            }
-            return true;
-          }
-          if (file.response.rspMsg) {
-            _modal2['default'].error({
-              style: { top: '38%' },
-              content: file.response.rspMsg
-            });
-          } else {
-            _modal2['default'].error({
-              style: { top: '38%' },
-              content: '\u9644\u4EF6' + name + '\u4E0A\u4F20\u5931\u8D25!'
-            });
-          }
-          return false;
-          // return file.response.rspCode === '0000';// 上传成功
-        }
-        return true;
-      });
-      allivaule = '';
-      iniVal = fileList.map(function (obj) {
-        var uid = obj.uid;
-
-        if (allivaule === '') {
-          allivaule = uid;
-        } else {
-          allivaule = allivaule + ',' + uid;
-        }
-      });
-      _this2.setState({ fileList: fileList });
-      return fileList;
-    };
-    var checkFile = function checkFile(rule, value, callback) {
-      if (required && (!value || value.length === 0)) {
-        callback();
-        return;
-      }
-      if (value) {
-        value = value.slice(-1);
-        value = value.filter(function (file) {
-          if (file.response && file.response.rspCode === '0000') {
-            callback();
-            return true;
-          }
-          if (file.status === 'uploading') {
-            callback('  ');
-            return false;
-          }
-          return true;
-        });
-
-        if (required && value.length > 0) {
-          callback();
-          return;
-        }
-      }
-      callback();
-    };
-    var showFlag = initialValue && initialValue.length > 1 || this.state.fileList.length > 1;
     return isRead ? _react2['default'].createElement(
       _form2['default'].Item,
       {
@@ -401,8 +198,8 @@ var Easy3wUploadM = function (_Component) {
         wrapperCol: wrapperCol,
         style: formItemStyle
       },
-      extendShowFlag ? extend : '',
-      getFieldDecorator('' + uploadName, {})(_react2['default'].createElement(_Easy3wDownLoad2['default'], {
+      extend || '',
+      getFieldDecorator('' + uploadName, {})(_react2['default'].createElement(_easy3wui.Easy3wDownLoad, {
         pdfViewFlag: true,
         imgVisible: true,
         urlDownloadFile: urlDownloadFile,
@@ -410,7 +207,7 @@ var Easy3wUploadM = function (_Component) {
         propsAFlag: propsAFlag,
         fileViewFlag: fileViewFlag
       })),
-      extendBackShowFlag ? extendBack : ''
+      extendBack || ''
     ) : _react2['default'].createElement(
       _form2['default'].Item,
       {
@@ -420,20 +217,21 @@ var Easy3wUploadM = function (_Component) {
         wrapperCol: wrapperCol,
         style: formItemStyle
       },
-      extendShowFlag ? extend : '',
+      extend || '',
       getFieldDecorator('' + uploadName, {
-        initialValue: iniVal || undefined,
-        getValueFromEvent: handleFileChange,
+        initialValue: fileList,
+        getValueFromEvent: this.handleFileChange,
         valuePropName: 'fileList',
-        rules: [{ validator: checkFile }, { required: required, message: warnMessage }]
+        rules: [{ validator: this.checkFile }, { required: required, message: warnMessage || help }]
       })(_react2['default'].createElement(
         _upload2['default'],
         (0, _extends3['default'])({
-          beforeUpload: beforeUpload
+          beforeUpload: this.beforeUpload
         }, upProps, {
-          fileList: this.state.fileList,
-          onRemove: handleRemove,
-          multiple: true
+          fileList: fileList,
+          onRemove: this.handleRemove
+          // onChange={this.handleFileChange}
+          , multiple: true
         }),
         isRead ? '' : _react2['default'].createElement(
           _popover2['default'],
@@ -460,12 +258,12 @@ var Easy3wUploadM = function (_Component) {
           )
         )
       )),
-      extendBackShowFlag ? extendBack : '',
-      showFlag ? downloadAllFlag && allivaule !== '' ? _react2['default'].createElement(
+      extendBack || '',
+      downloadAllFlag && fileIds !== '' ? _react2['default'].createElement(
         _button2['default'],
-        { icon: 'download', size: 'normal', target: '_blank', href: this.urlDeal(urlDownloadFile, allivaule) },
+        { icon: 'download', size: 'normal', target: '_blank', href: this.urlDeal(urlDownloadFile, fileIds) },
         '\u4E0B\u8F7D\u5168\u90E8\u9644\u4EF6'
-      ) : '' : ''
+      ) : ''
     );
   };
 
@@ -508,5 +306,186 @@ Easy3wUploadM.defaultProps = {
   labelCol: {},
   wrapperCol: {}
 };
+
+var _initialiseProps = function _initialiseProps() {
+  var _this2 = this;
+
+  this.onPreview = function (file) {
+    var objPreviewFileNew = (0, _extends3['default'])({}, _comonConfig.objPreviewFile, _this2.props.objPreviewFile);
+    var previewFileUrl = objPreviewFileNew.previewFileUrl,
+        previewFileType = objPreviewFileNew.previewFileType;
+    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 = _this2.urlDeal(previewFileUrl, uid);
+      window.open(src, '_blank');
+    } else {
+      window.open(url);
+    }
+  };
+
+  this.urlDeal = function (urlDownloadFile, uid) {
+    var propsAFlag = _this2.props.propsAFlag; // propsAFlag 加密标识 从引用组件处传入 '1':加密 '0':不加密
+
+    var retUrl = '';
+    if (uid !== '' && propsAFlag === '1' || uid !== '' && propsAFlag !== '0' && (_comonConfig.aFlag === '1' || _comonConfig.aFlag === '2')) {
+      var authToken = (0, _easy3wui.Easy3wGetCookie)('userToken') || 'E3WSAFEAPPQWEFGHYI7I483S';
+      var nowStr = _.now();
+      var encUrl = (0, _easy3wui.Easy3wAESEncrypt)(uid + '@#' + nowStr + '@#' + authToken, _comonConfig.a, _comonConfig.b);
+      return '' + urlDownloadFile + encUrl;
+    } else {
+      retUrl = '' + urlDownloadFile + uid;
+      return retUrl;
+    }
+  };
+
+  this.handleRemove = function (file) {
+    var _props2 = _this2.props,
+        removeCallback = _props2.removeCallback,
+        uploadName = _props2.uploadName;
+
+    if (removeCallback) {
+      removeCallback(uploadName, file);
+    }
+    return true;
+  };
+
+  this.checkFile = function (rule, value, callback) {
+    var str = void 0;
+    if (value && value instanceof Array) {
+      for (var i = 0; i < value.length; i += 1) {
+        var status = value[i].status;
+
+        if (status !== 'done') {
+          str = ' ';
+          break;
+        }
+      }
+    } else {
+      str = ' ';
+    }
+    callback(str);
+  };
+
+  this.beforeUpload = function (file) {
+    // 限制上传大小
+    var _props3 = _this2.props,
+        limitSize = _props3.limitSize,
+        accept = _props3.accept;
+    var name = file.name;
+
+    var fileNameArr = name.toLowerCase().split('.');
+    var fileType = fileNameArr[fileNameArr.length - 1];
+    if (name.length > 100) {
+      // 判断文件名称是否超过100个字符
+      _modal2['default'].info({
+        style: { top: '38%' },
+        okText: '知道了',
+        content: '文件名称至多100个字符'
+      });
+      return false;
+    }
+    var acceptDefault = accept || '.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 (acceptDefault.indexOf(fileType) < 0) {
+      // 判断文件类型是否符合
+      _modal2['default'].error({
+        style: { top: '38%' },
+        content: '\u4E0D\u652F\u6301' + fileType + '\u7C7B\u578B\u7684\u6587\u4EF6!'
+      });
+      return false;
+    }
+    var fileSize = file.size / 1024 / 1024; // 文件大小MB
+    if (fileSize >= limitSize) {
+      // 判断文件大小是否符合
+      _modal2['default'].error({
+        style: { top: '38%' },
+        content: '\u9644\u4EF6\u5FC5\u987B\u5C0F\u4E8E' + limitSize + 'MB!'
+      });
+      return false;
+    } else if (fileSize === 0) {
+      _modal2['default'].error({
+        style: { top: '38%' },
+        content: '附件必须大于0MB!'
+      });
+      return false;
+    } else {
+      return true;
+    }
+  };
+
+  this.handleFileChange = function (info) {
+    var _props4 = _this2.props,
+        urlDownloadFile = _props4.urlDownloadFile,
+        uploadDoneCallback = _props4.uploadDoneCallback,
+        uploadName = _props4.uploadName;
+
+    var fileListNew = [];
+    var fileIdsNew = '';
+    var fileList = info.fileList;
+
+    fileList.map(function (objFile) {
+      var fileNew = (0, _extends3['default'])({}, objFile);
+      var status = objFile.status,
+          response = objFile.response,
+          name = objFile.name;
+
+      if (response && response.data) {
+        var id = response.data.fileId;
+        fileNew.uid = id;
+        var url = _this2.urlDeal(urlDownloadFile, id);
+        fileNew.url = url;
+      }
+      var uid = fileNew.uid;
+
+      if (status === 'done') {
+        if (fileIdsNew === '') {
+          fileIdsNew = uid;
+        } else {
+          fileIdsNew = fileIdsNew + ',' + uid;
+        }
+      }
+      fileListNew.push(fileNew);
+      if (response && response.rspCode !== '0000') {
+        if (response.rspMsg) {
+          _modal2['default'].error({
+            style: { top: '38%' },
+            content: response.rspMsg
+          });
+          return false;
+        } else {
+          _modal2['default'].error({
+            style: { top: '38%' },
+            content: '\u9644\u4EF6' + name + '\u4E0A\u4F20\u5931\u8D25!'
+          });
+          return false;
+        }
+      }
+      if (status === 'done') {
+        if (response && response.rspCode === '0000') {
+          if (uploadDoneCallback && typeof uploadDoneCallback === 'function') {
+            uploadDoneCallback(uploadName, fileListNew);
+          }
+        }
+      } else if (status === 'error') {
+        _modal2['default'].error({
+          style: { top: '38%' },
+          content: '\u9644\u4EF6' + name + '\u4E0A\u4F20\u5931\u8D25!'
+        });
+        return false; // 上传失败
+      }
+      return true;
+    });
+    _this2.setState({
+      fileList: fileListNew,
+      fileIds: fileIdsNew
+    });
+    return fileListNew;
+  };
+};
+
 exports['default'] = Easy3wUploadM;
 module.exports = exports['default'];