easy3wui 1.5.53-beta1 → 1.5.53-beta3

package/lib/Easy3wUpload/index.js

@@ -372,7 +372,7 @@ var Easy3wUpload = function (_Component) {
         for (var i = 0; i < value.length; i += 1) {
           var status = value[i].status;
 
-          if (status !== 'done') {
+          if (status === 'uploading') {
             str = ' ';
             break;
           }

package/lib/Easy3wUploadB/index.js

@@ -1037,7 +1037,7 @@ var _initialiseProps = function _initialiseProps() {
       for (var i = 0; i < value.length; i += 1) {
         var status = value[i].status;
 
-        if (status !== 'done') {
+        if (status === 'uploading') {
           str = ' ';
           break;
         }

package/lib/Easy3wUploadM/index.js

@@ -74,6 +74,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'd
 
 // const { previewFileUrl, previewFileFlag, previewFileType } = objPreviewFile || {};
 
+/* eslint-disable react/sort-comp */
 var formItemStyle = {
   marginBottom: 6
 };
@@ -115,6 +116,18 @@ var Easy3wUploadM = function (_Component) {
     };
     return _this;
   }
+
+  Easy3wUploadM.prototype.componentDidUpdate = function componentDidUpdate(prevProps) {
+    var initialValue = prevProps.initialValue;
+
+    if (!this.touchCompareList(this.props.initialValue, initialValue)) {
+      this.updateFileList(this.props.initialValue);
+    }
+  };
+  // 对比传入文件列表 返回值 false 不等则更新 true 相等则不更新
+
+  // 更新文件列表
+
   // 预览
 
   // 文件地址处理
@@ -132,8 +145,6 @@ var Easy3wUploadM = function (_Component) {
     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,
@@ -310,6 +321,51 @@ Easy3wUploadM.defaultProps = {
 var _initialiseProps = function _initialiseProps() {
   var _this2 = this;
 
+  this.touchCompareList = function (arrFileList, arrFileListNew) {
+    if (!arrFileList || !arrFileListNew || arrFileList.length !== arrFileListNew.length) {
+      return false;
+    }
+    for (var i = 0; i < arrFileList.length; i += 1) {
+      var uid = arrFileList[i].uid;
+      var uidNew = arrFileListNew[i].uid;
+
+      if (uid !== uidNew) {
+        return false;
+      }
+    }
+    return true;
+  };
+
+  this.updateFileList = function (initialValue) {
+    var urlDownloadFile = _this2.props.urlDownloadFile;
+
+    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 = _this2.urlDeal(urlDownloadFile, uid);
+        return { uid: uid, name: name, url: url, status: status || 'done' };
+      });
+    }
+    // return {
+    //   fileList, // 文件列表
+    //   fileIds, // 文件ID
+    // };
+    _this2.setState({
+      fileList: fileList, // 文件列表
+      fileIds: fileIds // 文件ID
+    });
+  };
+
   this.onPreview = function (file) {
     var objPreviewFileNew = (0, _extends3['default'])({}, _comonConfig.objPreviewFile, _this2.props.objPreviewFile);
     var previewFileUrl = objPreviewFileNew.previewFileUrl,
@@ -360,7 +416,7 @@ var _initialiseProps = function _initialiseProps() {
       for (var i = 0; i < value.length; i += 1) {
         var status = value[i].status;
 
-        if (status !== 'done') {
+        if (status === 'uploading') {
           str = ' ';
           break;
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "easy3wui",
-  "version": "1.5.53-beta1",
+  "version": "1.5.53-beta3",
   "description": "easy3wui components for react",
   "keywords": [
     "react",