easy3wui 4.0.34 → 4.0.35

package/lib/Easy3wDownLoad/index.js

@@ -68,7 +68,8 @@ var Easy3wDownLoad = function (_Component) {
 
     var _this = (0, _possibleConstructorReturn3['default'])(this, _Component.call(this, props));
 
-    _this.onPreview = function (file, url) {
+    _this.onPreview = function (e, file, url) {
+      e.preventDefault();
       var objPreviewFileNew = (0, _extends3['default'])({}, _comonConfig.objPreviewFile, _this.props.objPreviewFile);
       var previewFileUrl = objPreviewFileNew.previewFileUrl,
           previewFileType = objPreviewFileNew.previewFileType;
@@ -115,7 +116,8 @@ var Easy3wDownLoad = function (_Component) {
       }
     };
 
-    _this.showFileView = function (uid, name, apiKey, fileViewURL, fileCallURL) {
+    _this.showFileView = function (e, uid, name, apiKey, fileViewURL, fileCallURL) {
+      e.preventDefault();
       var callURl = fileCallURL + '?fileId=' + uid;
       var crypto = require('crypto');
       var hmac = crypto.createHmac('md5', apiKey);
@@ -126,6 +128,11 @@ var Easy3wDownLoad = function (_Component) {
       _this.setState({ fileId: uid, fileName: name, fileViewFlag: true, viewFileUrl: viewFileUrl });
     };
 
+    _this.showPdfView = function (e, uid, url, name) {
+      e.preventDefault();
+      _this.setState({ pdfViewFlag: true, fileId: uid, fileURL: url, fileName: name });
+    };
+
     _this.hidePDFModal = function () {
       _this.setState({ fileId: '', fileURL: '', fileName: '', pdfViewFlag: false });
     };
@@ -138,7 +145,8 @@ var Easy3wDownLoad = function (_Component) {
       _this.setState({ fileId: '', fileURL: '', fileName: '' });
     };
 
-    _this.showImageView = function (url) {
+    _this.showImageView = function (e, url) {
+      e.preventDefault();
       _this.setState({ imageViewURL: url });
     };
 
@@ -158,6 +166,12 @@ var Easy3wDownLoad = function (_Component) {
 
   // url处理
 
+  // 显示文件预览
+
+  // 显示pdf预览
+
+  // 图片预览
+
 
   Easy3wDownLoad.prototype.render = function render() {
     var _this2 = this;
@@ -173,7 +187,8 @@ var Easy3wDownLoad = function (_Component) {
 
     var objPreviewFileNew = (0, _extends3['default'])({}, _comonConfig.objPreviewFile, this.props.objPreviewFile);
     var previewFileFlag = objPreviewFileNew.previewFileFlag,
-        downloadFileFlag = objPreviewFileNew.downloadFileFlag,
+        _objPreviewFileNew$do = objPreviewFileNew.downloadFileFlag,
+        downloadFileFlag = _objPreviewFileNew$do === undefined ? '' : _objPreviewFileNew$do,
         previewFileType = objPreviewFileNew.previewFileType;
 
     var retObj = '';
@@ -196,8 +211,8 @@ var Easy3wDownLoad = function (_Component) {
               { placement: 'topLeft', title: name, style: { whiteSpace: 'pre-wrap', wordWrap: 'break-word' } },
               _react2['default'].createElement(
                 'a',
-                { onClick: function onClick() {
-                    return _this2.onPreview(obj, url);
+                { href: url, onClick: function onClick(e) {
+                    return _this2.onPreview(e, obj, url);
                   }, style: { overflow: 'hidden', whiteSpace: 'nowrap', textOverflow: 'ellipsis', paddingRight: '12px' } },
                 name
               )
@@ -214,8 +229,8 @@ var Easy3wDownLoad = function (_Component) {
             null,
             _react2['default'].createElement(
               'a',
-              { onClick: function onClick() {
-                  return _this2.setState({ pdfViewFlag: true, fileId: uid, fileURL: url, fileName: name });
+              { href: url, onClick: function onClick(e) {
+                  return _this2.showPdfView(e, uid, url, name);
                 } },
               name
             )
@@ -226,8 +241,8 @@ var Easy3wDownLoad = function (_Component) {
             null,
             _react2['default'].createElement(
               'a',
-              { onClick: function onClick() {
-                  return _this2.showFileView(uid, name, apiKey, fileViewURL, fileCallURL);
+              { href: url, onClick: function onClick(e) {
+                  return _this2.showFileView(e, uid, name, apiKey, fileViewURL, fileCallURL);
                 } },
               name
             )
@@ -238,8 +253,8 @@ var Easy3wDownLoad = function (_Component) {
             { style: { width: '100%', display: 'flex', alignItems: 'center' } },
             _react2['default'].createElement(
               'a',
-              { onClick: function onClick() {
-                  return _this2.showImageView(url);
+              { href: url, onClick: function onClick(e) {
+                  return _this2.showImageView(e, url);
                 }, style: { overflow: 'hidden', whiteSpace: 'nowrap', textOverflow: 'ellipsis', paddingRight: '12px' } },
               name
             ),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "easy3wui",
-  "version": "4.0.34",
+  "version": "4.0.35",
   "description": "easy3wui components for react",
   "keywords": [
     "react",