easy3wui 1.5.12 → 1.5.13

package/README.md

@@ -1,2 +1,6 @@
 # easy3wUI
-easy3w UI 组件
+easy3w UI 组件
+# 编译
+npm run compile
+# 发布
+npm publish

package/assets/formPage.css

@@ -4,6 +4,9 @@
 .ant-upload-list-item .ant-upload-list-item-info {
   width: auto;
 }
+.ant-upload-list-item .ant-upload-list-item-name {
+  padding-right: 24px;
+}
 .ant-upload-list-item .anticon-cross {
   right: -2px;
 }

package/assets/index.css

@@ -1385,6 +1385,9 @@ s {
 .ant-upload-list-item .ant-upload-list-item-info {
   width: auto;
 }
+.ant-upload-list-item .ant-upload-list-item-name {
+  padding-right: 24px;
+}
 .ant-upload-list-item .anticon-cross {
   right: -2px;
 }

package/lib/Easy3wDownLoad/index.js

@@ -2,6 +2,10 @@
 
 exports.__esModule = true;
 
+var _icon = require('antd/lib/icon');
+
+var _icon2 = _interopRequireDefault(_icon);
+
 var _classCallCheck2 = require('babel-runtime/helpers/classCallCheck');
 
 var _classCallCheck3 = _interopRequireDefault(_classCallCheck2);
@@ -14,6 +18,8 @@ var _inherits2 = require('babel-runtime/helpers/inherits');
 
 var _inherits3 = _interopRequireDefault(_inherits2);
 
+require('antd/lib/icon/style');
+
 var _react = require('react');
 
 var _react2 = _interopRequireDefault(_react);
@@ -32,6 +38,12 @@ var _reactImages = require('react-images');
 
 var _reactImages2 = _interopRequireDefault(_reactImages);
 
+var _classnames = require('classnames');
+
+var _classnames2 = _interopRequireDefault(_classnames);
+
+var _antd = require('antd');
+
 var _comonConfig = require('comonConfigPath/comonConfig');
 
 var _Easy3wPDFView = require('./Easy3wPDFView');
@@ -46,11 +58,11 @@ var _Easy3wRCView = require('./Easy3wRCView');
 
 var _Easy3wRCView2 = _interopRequireDefault(_Easy3wRCView);
 
-var _Easy3wGetCookie = require('./../Easy3wGetCookie');
+var _Easy3wGetCookie = require('../Easy3wGetCookie');
 
 var _Easy3wGetCookie2 = _interopRequireDefault(_Easy3wGetCookie);
 
-var _Easy3wAESEncrypt = require('./../Easy3wAESEncrypt');
+var _Easy3wAESEncrypt = require('../Easy3wAESEncrypt');
 
 var _Easy3wAESEncrypt2 = _interopRequireDefault(_Easy3wAESEncrypt);
 
@@ -88,14 +100,18 @@ var Easy3wDownLoad = function (_Component) {
       _this.setState({ fileId: uid, fileName: name, fileViewFlag: true, viewFileUrl: viewFileUrl });
     };
 
-    _this.hidePDFModal = function () {
-      _this.setState({ fileId: '', fileURL: '', fileName: '', pdfViewFlag: false });
-    };
-
     _this.hideFileModal = function () {
       _this.setState({ fileId: '', fileURL: '', fileName: '', fileViewFlag: false });
     };
 
+    _this.showPdfView = function (uid, url, name) {
+      _this.setState({ pdfViewFlag: true, fileId: uid, fileURL: url, fileName: name });
+    };
+
+    _this.hidePDFModal = function () {
+      _this.setState({ fileId: '', fileURL: '', fileName: '', pdfViewFlag: false });
+    };
+
     _this.showImageView = function (url) {
       _this.setState({ imageViewURL: url });
     };
@@ -104,6 +120,30 @@ var Easy3wDownLoad = function (_Component) {
       _this.setState({ imageViewURL: '' });
     };
 
+    _this.onPreview = function (file) {
+      var uid = file.uid,
+          url = file.url,
+          name = file.name;
+
+      var fileNameArr = name.toLowerCase().split('.');
+      var fileType = fileNameArr[fileNameArr.length - 1];
+      if (_comonConfig.previewFileType.indexOf(fileType) >= 0) {
+        var src = _this.urlDeal(_comonConfig.previewFileUrl, uid);
+        window.open(src, '_blank');
+      } else {
+        window.open(url);
+      }
+    };
+
+    _this.touchDownload = function (file) {
+      var uid = file.uid,
+          url = file.url,
+          name = file.name;
+      // const src = this.urlDeal(previewFileUrl, uid);
+
+      window.open(url);
+    };
+
     _this.state = {
       pdfViewFlag: false, // pdf预览
       fileViewFlag: false, // xls、xlsx、doc、docx等office文件预览
@@ -114,6 +154,10 @@ var Easy3wDownLoad = function (_Component) {
     };
     return _this;
   }
+  // 预览
+
+  // 下载
+
 
   Easy3wDownLoad.prototype.render = function render() {
     var _this2 = this;
@@ -136,14 +180,34 @@ var Easy3wDownLoad = function (_Component) {
         var url = _this2.urlDeal(urlDownloadFile, uid);
         var fileNameArr = name.toLowerCase().split('.');
         var fileType = fileNameArr[fileNameArr.length - 1];
-        if (previwPdfFlag && fileType.indexOf('pdf') >= 0) {
+        if (_comonConfig.previewFileFlag) {
+          // 预览
+          return _react2['default'].createElement(
+            'div',
+            { style: { width: '100%', display: 'flex', alignItems: 'center', justifyContent: 'space-between' } },
+            _react2['default'].createElement(
+              _tooltip2['default'],
+              { placement: 'topLeft', title: name, style: { whiteSpace: 'pre-wrap', wordWrap: 'break-word' } },
+              _react2['default'].createElement(
+                'a',
+                { onClick: function onClick() {
+                    return _this2.onPreview(obj);
+                  }, style: { overflow: 'hidden', whiteSpace: 'nowrap', textOverflow: 'ellipsis' } },
+                name
+              )
+            ),
+            _react2['default'].createElement(_icon2['default'], { type: 'download', onClick: function onClick() {
+                return _this2.touchDownload(obj);
+              }, style: { float: 'right', lineHeight: '100%' } })
+          );
+        } else if (previwPdfFlag && fileType.indexOf('pdf') >= 0) {
           return _react2['default'].createElement(
             'div',
             null,
             _react2['default'].createElement(
               'a',
               { onClick: function onClick() {
-                  return _this2.setState({ pdfViewFlag: true, fileId: uid, fileURL: url, fileName: name });
+                  return _this2.showPdfView(uid, url, name);
                 } },
               name
             )

package/lib/Easy3wUpload/index.js

@@ -64,15 +64,15 @@ require('antd/lib/modal/style');
 
 var _comonConfig = require('comonConfigPath/comonConfig');
 
-var _Easy3wGetCookie = require('./../Easy3wGetCookie');
+var _Easy3wGetCookie = require('../Easy3wGetCookie');
 
 var _Easy3wGetCookie2 = _interopRequireDefault(_Easy3wGetCookie);
 
-var _Easy3wDownLoad = require('./../Easy3wDownLoad');
+var _Easy3wDownLoad = require('../Easy3wDownLoad');
 
 var _Easy3wDownLoad2 = _interopRequireDefault(_Easy3wDownLoad);
 
-var _Easy3wAESEncrypt = require('./../Easy3wAESEncrypt');
+var _Easy3wAESEncrypt = require('../Easy3wAESEncrypt');
 
 var _Easy3wAESEncrypt2 = _interopRequireDefault(_Easy3wAESEncrypt);
 
@@ -95,7 +95,20 @@ var Easy3wUpload = function (_Component) {
       args[_key] = arguments[_key];
     }
 
-    return _ret = (_temp = (_this = (0, _possibleConstructorReturn3['default'])(this, _Component.call.apply(_Component, [this].concat(args))), _this), _this.urlDeal = function (urlDownloadFile, uid) {
+    return _ret = (_temp = (_this = (0, _possibleConstructorReturn3['default'])(this, _Component.call.apply(_Component, [this].concat(args))), _this), _this.onPreview = function (file) {
+      var uid = file.uid,
+          url = file.url,
+          name = file.name;
+
+      var fileNameArr = name.toLowerCase().split('.');
+      var fileType = fileNameArr[fileNameArr.length - 1];
+      if (_comonConfig.previewFileType.indexOf(fileType) >= 0) {
+        var src = _this.urlDeal(_comonConfig.previewFileUrl, uid);
+        window.open(src, '_blank');
+      } else {
+        window.open(url);
+      }
+    }, _this.urlDeal = function (urlDownloadFile, uid) {
       var retUrl = '';
       if (uid !== '' && _comonConfig.aFlag && (_comonConfig.aFlag === '1' || _comonConfig.aFlag === '2')) {
         var authToken = (0, _Easy3wGetCookie2['default'])('userToken') || 'E3WSAFEAPPQWEFGHYI7I483S';
@@ -108,6 +121,10 @@ var Easy3wUpload = function (_Component) {
       }
     }, _temp), (0, _possibleConstructorReturn3['default'])(_this, _ret);
   }
+  // 预览
+
+  // url处理
+
 
   Easy3wUpload.prototype.render = function render() {
     var _this2 = this;
@@ -141,10 +158,11 @@ var Easy3wUpload = function (_Component) {
     if (initialValue) {
       iniVal = initialValue.map(function (obj) {
         var uid = obj.uid,
-            name = obj.name;
+            name = obj.name,
+            status = obj.status;
 
         var url = _this2.urlDeal(urlDownloadFile, uid);
-        return { uid: uid, name: name, url: url };
+        return { uid: uid, name: name, url: url, status: status || 'done' };
       });
     }
     var getFieldDecorator = form.getFieldDecorator;
@@ -181,7 +199,10 @@ var Easy3wUpload = function (_Component) {
       }
     };
     if (isRead) {
-      upProps = (0, _extends3['default'])({}, upProps, { showUploadList: { showPreviewIcon: true, showRemoveIcon: false } });
+      upProps = (0, _extends3['default'])({}, upProps, { children: true, showUploadList: { showDownloadIcon: true, showPreviewIcon: true, showRemoveIcon: false } });
+    }
+    if (_comonConfig.previewFileFlag) {
+      upProps.onPreview = this.onPreview;
     }
     var beforeUpload = function beforeUpload(file) {
       // 限制上传大小
@@ -472,7 +493,6 @@ Easy3wUpload.defaultProps = {
   warnMessage: '',
   extend: undefined,
   extendBack: undefined,
-  hadUpdBtn: true
-};
+  hadUpdBtn: true };
 exports['default'] = Easy3wUpload;
 module.exports = exports['default'];

package/lib/Easy3wUploadB/index.js

@@ -76,6 +76,12 @@ var _modal2 = _interopRequireDefault(_modal);
 
 require('antd/lib/modal/style');
 
+var _comonConfig = require('comonConfigPath/comonConfig');
+
+var _Easy3wDownLoad = require('../Easy3wDownLoad');
+
+var _Easy3wDownLoad2 = _interopRequireDefault(_Easy3wDownLoad);
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
 
 var formItemStyle = {
@@ -141,6 +147,8 @@ var BigFileUpload = function (_Component) {
       }
     }
   };
+  // 预览
+
 
   BigFileUpload.prototype.render = function render() {
     var _this2 = this;
@@ -158,7 +166,9 @@ var BigFileUpload = function (_Component) {
         className = _props.className,
         labelCol = _props.labelCol,
         wrapperCol = _props.wrapperCol,
-        showUploadList = _props.showUploadList;
+        showUploadList = _props.showUploadList,
+        urlDownloadFile = _props.urlDownloadFile,
+        initialValue = _props.initialValue;
     var _state = this.state,
         preUploading = _state.preUploading,
         uploadPercent = _state.uploadPercent,
@@ -289,7 +299,28 @@ var BigFileUpload = function (_Component) {
       },
       fileList: this.state.fileList
     };
-    return _react2['default'].createElement(
+    if (_comonConfig.previewFileFlag) {
+      uploadProp.onPreview = this.onPreview;
+    }
+    if (isRead) {
+      uploadProp.children = true;
+    }
+    return isRead ? _react2['default'].createElement(
+      _form2['default'].Item,
+      {
+        label: label,
+        className: className,
+        labelCol: labelCol,
+        wrapperCol: wrapperCol,
+        style: formItemStyle
+      },
+      getFieldDecorator('' + name, {})(_react2['default'].createElement(_Easy3wDownLoad2['default'], {
+        pdfViewFlag: true,
+        imgVisible: true,
+        urlDownloadFile: urlDownloadFile,
+        downloadArr: initialValue
+      }))
+    ) : _react2['default'].createElement(
       _form2['default'].Item,
       {
         label: label,
@@ -309,7 +340,7 @@ var BigFileUpload = function (_Component) {
           (0, _extends3['default'])({}, uploadProp, {
             disabled: this.state.loading
           }),
-          isRead ? null : _react2['default'].createElement(
+          _react2['default'].createElement(
             _popover2['default'],
             {
               placement: 'right',
@@ -957,6 +988,21 @@ var _initialiseProps = function _initialiseProps() {
     }
     callback();
   };
+
+  this.onPreview = function (file) {
+    var uid = file.uid,
+        url = file.url,
+        name = file.name;
+
+    var fileNameArr = name.toLowerCase().split('.');
+    var fileType = fileNameArr[fileNameArr.length - 1];
+    if (_comonConfig.previewFileType.indexOf(fileType) >= 0) {
+      var src = _comonConfig.previewFileUrl + uid;
+      window.open(src, '_blank');
+    } else {
+      window.open(url);
+    }
+  };
 };
 
 exports['default'] = BigFileUpload;

package/lib/Easy3wUploadM/index.js

@@ -64,15 +64,15 @@ require('antd/lib/modal/style');
 
 var _comonConfig = require('comonConfigPath/comonConfig');
 
-var _Easy3wGetCookie = require('./../Easy3wGetCookie');
+var _Easy3wGetCookie = require('../Easy3wGetCookie');
 
 var _Easy3wGetCookie2 = _interopRequireDefault(_Easy3wGetCookie);
 
-var _Easy3wDownLoad = require('./../Easy3wDownLoad');
+var _Easy3wDownLoad = require('../Easy3wDownLoad');
 
 var _Easy3wDownLoad2 = _interopRequireDefault(_Easy3wDownLoad);
 
-var _Easy3wAESEncrypt = require('./../Easy3wAESEncrypt');
+var _Easy3wAESEncrypt = require('../Easy3wAESEncrypt');
 
 var _Easy3wAESEncrypt2 = _interopRequireDefault(_Easy3wAESEncrypt);
 
@@ -96,6 +96,20 @@ var Easy3wUploadM = function (_Component) {
 
     return _ret = (_temp = (_this = (0, _possibleConstructorReturn3['default'])(this, _Component.call.apply(_Component, [this].concat(args))), _this), _this.state = {
       fileList: [{}]
+      // 预览
+    }, _this.onPreview = function (file) {
+      var uid = file.uid,
+          url = file.url,
+          name = file.name;
+
+      var fileNameArr = name.toLowerCase().split('.');
+      var fileType = fileNameArr[fileNameArr.length - 1];
+      if (_comonConfig.previewFileType.indexOf(fileType) >= 0) {
+        var src = _this.urlDeal(_comonConfig.previewFileUrl, uid);
+        window.open(src, '_blank');
+      } else {
+        window.open(url);
+      }
     }, _this.urlDeal = function (urlDownloadFile, uid) {
       var retUrl = '';
       if (uid !== '' && _comonConfig.aFlag && (_comonConfig.aFlag === '1' || _comonConfig.aFlag === '2')) {
@@ -143,7 +157,8 @@ var Easy3wUploadM = function (_Component) {
     if (initialValue) {
       iniVal = initialValue.map(function (obj) {
         var uid = obj.uid,
-            name = obj.name;
+            name = obj.name,
+            status = obj.status;
 
         if (allivaule === '') {
           allivaule = uid;
@@ -151,7 +166,7 @@ var Easy3wUploadM = function (_Component) {
           allivaule = allivaule + ',' + uid;
         }
         var url = _this2.urlDeal(urlDownloadFile, uid);
-        return { uid: uid, name: name, url: url };
+        return { uid: uid, name: name, url: url, status: status || 'done' };
       });
     }
     if (!warnMessage) {
@@ -188,7 +203,10 @@ var Easy3wUploadM = function (_Component) {
       }
     };
     if (isRead) {
-      upProps = (0, _extends3['default'])({}, upProps, { showUploadList: { showPreviewIcon: true, showRemoveIcon: false } });
+      upProps = (0, _extends3['default'])({}, upProps, { children: true, showUploadList: { showPreviewIcon: false, showRemoveIcon: false } });
+    }
+    if (_comonConfig.previewFileFlag) {
+      upProps.onPreview = this.onPreview;
     }
     var beforeUpload = function beforeUpload(file) {
       // 限制上传大小
@@ -402,7 +420,7 @@ var Easy3wUploadM = function (_Component) {
           onRemove: handleRemove,
           multiple: true
         }),
-        _react2['default'].createElement(
+        isRead ? '' : _react2['default'].createElement(
           _popover2['default'],
           {
             placement: 'top',

package/package.json

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