easy3wui 4.0.39-beta.1 → 4.0.39

package/lib/Easy3wGridPage/index.js

@@ -105,6 +105,13 @@ var Easy3wGridPage = function (_Component) {
     }
   };
 
+  Easy3wGridPage.prototype.componentDidUpdate = function componentDidUpdate(prevProps) {
+    var that = this;
+    if (this.props.totalResult && this.props.totalResult !== prevProps.totalResult) {
+      that.setState({ pagination: { offset: 1, limit: 10 } });
+    }
+  };
+
   Easy3wGridPage.prototype.render = function render() {
     var _this2 = this;
 

package/lib/Easy3wNewUpload/index.js

@@ -172,14 +172,12 @@ var Easy3wNewUpload = function (_Component) {
         data: sendData
       }
     };
-    var objPreviewFileNew = (0, _extends3['default'])({}, _comonConfig.objPreviewFile, this.props.objPreviewFile);
-    var previewFileFlag = objPreviewFileNew.previewFileFlag,
-        _objPreviewFileNew$do = objPreviewFileNew.downloadFileFlag,
-        downloadFileFlag = _objPreviewFileNew$do === undefined ? '1' : _objPreviewFileNew$do;
-
     if (isRead) {
-      upProps = (0, _extends3['default'])({}, upProps, { showUploadList: { showDownloadIcon: downloadFileFlag === '1', showPreviewIcon: true, showRemoveIcon: false } });
+      upProps = (0, _extends3['default'])({}, upProps, { showUploadList: { showPreviewIcon: true, showRemoveIcon: false } });
     }
+    var objPreviewFileNew = (0, _extends3['default'])({}, _comonConfig.objPreviewFile, this.props.objPreviewFile);
+    var previewFileFlag = objPreviewFileNew.previewFileFlag;
+
     if (previewFileFlag && fileViewFlag !== false) {
       upProps.onPreview = this.onPreview;
     }

package/lib/Easy3wNewUploadB/index.js

@@ -174,7 +174,7 @@ var NewBigFileUpload = function (_Component) {
         uploadRequest = _state.uploadRequest,
         uploading = _state.uploading;
 
-    var upProps = {
+    var uploadProp = {
       // name,
       listType: listType,
       showUploadList: showUploadList,
@@ -296,15 +296,10 @@ var NewBigFileUpload = function (_Component) {
       fileList: this.state.fileList
     };
     var objPreviewFileNew = (0, _extends3['default'])({}, _comonConfig.objPreviewFile, this.props.objPreviewFile);
-    var previewFileFlag = objPreviewFileNew.previewFileFlag,
-        _objPreviewFileNew$do = objPreviewFileNew.downloadFileFlag,
-        downloadFileFlag = _objPreviewFileNew$do === undefined ? '1' : _objPreviewFileNew$do;
+    var previewFileFlag = objPreviewFileNew.previewFileFlag;
 
-    if (isRead) {
-      upProps = (0, _extends3['default'])({}, upProps, { showUploadList: { showDownloadIcon: downloadFileFlag === '1', showPreviewIcon: true, showRemoveIcon: false } });
-    }
     if (previewFileFlag && fileViewFlag !== false) {
-      upProps.onPreview = this.onPreview;
+      uploadProp.onPreview = this.onPreview;
     }
     return _react2['default'].createElement(
       'div',
@@ -322,7 +317,7 @@ var NewBigFileUpload = function (_Component) {
         },
         _react2['default'].createElement(
           _upload2['default'],
-          (0, _extends3['default'])({}, upProps, {
+          (0, _extends3['default'])({}, uploadProp, {
             disabled: this.state.loading
           }),
           isRead ? null : _react2['default'].createElement(

package/lib/Easy3wNewUploadM/index.js

@@ -195,14 +195,12 @@ var Easy3wNewUploadM = function (_Component) {
         data: sendData
       }
     };
-    var objPreviewFileNew = (0, _extends3['default'])({}, _comonConfig.objPreviewFile, this.props.objPreviewFile);
-    var previewFileFlag = objPreviewFileNew.previewFileFlag,
-        _objPreviewFileNew$do = objPreviewFileNew.downloadFileFlag,
-        downloadFileFlag = _objPreviewFileNew$do === undefined ? '1' : _objPreviewFileNew$do;
-
     if (isRead) {
-      upProps = (0, _extends3['default'])({}, upProps, { showUploadList: { showDownloadIcon: downloadFileFlag === '1', showPreviewIcon: true, showRemoveIcon: false } });
+      upProps = (0, _extends3['default'])({}, upProps, { showUploadList: { showPreviewIcon: true, showRemoveIcon: false } });
     }
+    var objPreviewFileNew = (0, _extends3['default'])({}, _comonConfig.objPreviewFile, this.props.objPreviewFile);
+    var previewFileFlag = objPreviewFileNew.previewFileFlag;
+
     if (previewFileFlag && fileViewFlag !== false) {
       upProps.onPreview = this.onPreview;
     }

package/lib/Easy3wTabs/index.js

@@ -73,11 +73,11 @@ var Easy3wTabs = function (_PureComponent) {
         this.props,
         children
       ) : children && children.length > 0 ? children.map(function (item) {
-        return _react2['default'].createElement(
+        return item ? _react2['default'].createElement(
           _Easy3wCard2['default'],
           { label: item.props && item.props.tab ? item.props.tab : '' },
           item.props && item.props.children ? item.props.children : ''
-        );
+        ) : '';
       }) : ''
     );
   };