easy3wui 1.5.75 → 1.5.76-beta.2

package/lib/Easy3wDownLoad/index.js

@@ -86,8 +86,7 @@ var Easy3wDownLoad = function (_Component) {
 
     var _this = (0, _possibleConstructorReturn3['default'])(this, _Component.call(this, props));
 
-    _this.onPreview = function (e, file, url) {
-      e.preventDefault();
+    _this.onPreview = function (file, url) {
       var objPreviewFileNew = (0, _extends3['default'])({}, objPreviewFileDefault, _comonConfig.objPreviewFile, _this.props.objPreviewFile);
       var previewFileUrl = objPreviewFileNew.previewFileUrl,
           previewFileType = objPreviewFileNew.previewFileType;
@@ -145,8 +144,7 @@ var Easy3wDownLoad = function (_Component) {
       }
     };
 
-    _this.showFileView = function (e, uid, name, apiKey, fileViewURL, fileCallURL) {
-      e.preventDefault();
+    _this.showFileView = function (uid, name, apiKey, fileViewURL, fileCallURL) {
       var callURl = fileCallURL + '?fileId=' + uid;
       var crypto = require('crypto');
       var hmac = crypto.createHmac('md5', apiKey);
@@ -161,8 +159,7 @@ var Easy3wDownLoad = function (_Component) {
       _this.setState({ fileId: '', fileURL: '', fileName: '', fileViewFlag: false });
     };
 
-    _this.showPdfView = function (e, uid, url, name) {
-      e.preventDefault();
+    _this.showPdfView = function (uid, url, name) {
       _this.setState({ pdfViewFlag: true, fileId: uid, fileURL: url, fileName: name });
     };
 
@@ -170,8 +167,7 @@ var Easy3wDownLoad = function (_Component) {
       _this.setState({ fileId: '', fileURL: '', fileName: '', pdfViewFlag: false });
     };
 
-    _this.showImageView = function (e, url) {
-      e.preventDefault();
+    _this.showImageView = function (url) {
       _this.setState({ imageViewURL: url });
     };
 
@@ -208,8 +204,7 @@ var Easy3wDownLoad = function (_Component) {
 
     var objPreviewFileNew = (0, _extends3['default'])({}, objPreviewFileDefault, _comonConfig.objPreviewFile, this.props.objPreviewFile);
     var previewFileFlag = objPreviewFileNew.previewFileFlag,
-        _objPreviewFileNew$do = objPreviewFileNew.downloadFileFlag,
-        downloadFileFlag = _objPreviewFileNew$do === undefined ? '1' : _objPreviewFileNew$do,
+        downloadFileFlag = objPreviewFileNew.downloadFileFlag,
         previewFileType = objPreviewFileNew.previewFileType;
 
     var retObj = '';
@@ -231,8 +226,8 @@ var Easy3wDownLoad = function (_Component) {
               { placement: 'topLeft', title: name, style: { whiteSpace: 'pre-wrap', wordWrap: 'break-word' } },
               _react2['default'].createElement(
                 'a',
-                { href: url, onClick: function onClick(e) {
-                    return _this2.onPreview(e, obj, url);
+                { onClick: function onClick() {
+                    return _this2.onPreview(obj, url);
                   }, style: { overflow: 'hidden', whiteSpace: 'nowrap', textOverflow: 'ellipsis', paddingRight: '12px' } },
                 name
               )
@@ -249,8 +244,8 @@ var Easy3wDownLoad = function (_Component) {
             null,
             _react2['default'].createElement(
               'a',
-              { href: url, onClick: function onClick(e) {
-                  return _this2.showPdfView(e, uid, url, name);
+              { onClick: function onClick() {
+                  return _this2.showPdfView(uid, url, name);
                 } },
               name
             )
@@ -261,8 +256,8 @@ var Easy3wDownLoad = function (_Component) {
             null,
             _react2['default'].createElement(
               'a',
-              { href: url, onClick: function onClick(e) {
-                  return _this2.showFileView(e, uid, name, apiKey, fileViewURL, fileCallURL);
+              { onClick: function onClick() {
+                  return _this2.showFileView(uid, name, apiKey, fileViewURL, fileCallURL);
                 } },
               name
             )
@@ -273,8 +268,8 @@ var Easy3wDownLoad = function (_Component) {
             { style: { width: '100%', display: 'flex', alignItems: 'center' } },
             _react2['default'].createElement(
               'a',
-              { href: url, onClick: function onClick(e) {
-                  return _this2.showImageView(e, url);
+              { onClick: function onClick() {
+                  return _this2.showImageView(url);
                 }, style: { overflow: 'hidden', whiteSpace: 'nowrap', textOverflow: 'ellipsis', paddingRight: '12px' } },
               name
             ),

package/lib/Easy3wGridPage/index.js

@@ -112,6 +112,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;