easy3wui 1.5.93-beta2 → 1.5.93-beta3

package/lib/Easy3wA/index.js

@@ -36,19 +36,15 @@ require('antd/lib/notification/style');
 
 var _dva = require('dva');
 
-var _Easy3wAESEncryptUrl = require('../Easy3wAESEncryptUrl');
-
-var _Easy3wAESEncryptUrl2 = _interopRequireDefault(_Easy3wAESEncryptUrl);
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
 
-var Easy3wA = function (_Component) {
-  (0, _inherits3['default'])(Easy3wA, _Component);
+var Easy3wAFile = function (_Component) {
+  (0, _inherits3['default'])(Easy3wAFile, _Component);
 
-  function Easy3wA() {
+  function Easy3wAFile() {
     var _temp, _this, _ret;
 
-    (0, _classCallCheck3['default'])(this, Easy3wA);
+    (0, _classCallCheck3['default'])(this, Easy3wAFile);
 
     for (var _len = arguments.length, args = Array(_len), _key = 0; _key < _len; _key++) {
       args[_key] = arguments[_key];
@@ -72,27 +68,16 @@ var Easy3wA = function (_Component) {
     }, _temp), (0, _possibleConstructorReturn3['default'])(_this, _ret);
   }
 
-  Easy3wA.prototype.render = function render() {
+  Easy3wAFile.prototype.render = function render() {
     var _this2 = this;
 
     var _props = this.props,
         children = _props.children,
         onClick = _props.onClick,
         notPrevent = _props.notPrevent,
-        _props$inFlag = _props.inFlag,
-        inFlag = _props$inFlag === undefined ? '1' : _props$inFlag,
-        _props$downloadFlag = _props.downloadFlag,
-        downloadFlag = _props$downloadFlag === undefined ? '0' : _props$downloadFlag,
-        href = _props.href,
-        otherProps = (0, _objectWithoutProperties3['default'])(_props, ['children', 'onClick', 'notPrevent', 'inFlag', 'downloadFlag', 'href']);
-
-    if (href) {
-      return _react2['default'].createElement(
-        'a',
-        (0, _extends3['default'])({}, this.props, { href: (0, _Easy3wAESEncryptUrl2['default'])(href, downloadFlag, inFlag) }),
-        children || ''
-      );
-    } else if (notPrevent) {
+        otherProps = (0, _objectWithoutProperties3['default'])(_props, ['children', 'onClick', 'notPrevent']);
+
+    if (notPrevent) {
       return _react2['default'].createElement(
         'a',
         this.props,
@@ -109,12 +94,12 @@ var Easy3wA = function (_Component) {
     }
   };
 
-  return Easy3wA;
+  return Easy3wAFile;
 }(_react.Component);
 
 exports['default'] = (0, _dva.connect)(function (state) {
   return {
     loading: state.loading
   };
-})(Easy3wA);
+})(Easy3wAFile);
 module.exports = exports['default'];

package/lib/Easy3wAESEncryptUrl/index.js

@@ -19,29 +19,32 @@ var _Easy3wGetCookie2 = _interopRequireDefault(_Easy3wGetCookie);
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
 
-function Easy3wAESEncryptUrl(url, downloadFlag, inFlag) {
+function Easy3wAESEncryptUrl(url) {
+  var fileFlag = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '0';
+
   // 文件下载，需要加密文件id
   // 页面跳转，需要加密参数
   var strUrl = url; // 最终打开的地址
-  if (url && inFlag === '1') {
+  if (url) {
     // 路径地址 && 内部地址
     var arrUrl = url.split('?');
     var pathname = arrUrl[0],
         search = arrUrl[1];
 
-    if (downloadFlag === '1' && search) {
+    if (fileFlag === '1' && search) {
       // 文件下载 && 有参数
       // const arrSearch = search.split('&');
       var objSearch = _queryString2['default'].parse(search);
       if (objSearch && objSearch.fileId) {
         // 有文件Id，需要加密文件Id
         var authToken = (0, _Easy3wGetCookie2['default'])('userToken') || 'E3WSAFEAPPQWEFGHYI7I483S';
+        // eslint-disable-next-line no-undef
         var nowStr = _.now();
         objSearch.fileId = (0, _Easy3wAESEncrypt2['default'])(objSearch.fileId + '@#' + nowStr + '@#' + authToken, _comonConfig.a, _comonConfig.b);
         var strSearch = _queryString2['default'].stringify(objSearch);
         strUrl = pathname + '?' + strSearch;
       }
-    } else if (downloadFlag === '0' && search) {
+    } else if (fileFlag === '0' && search) {
       // 页面跳转 && 有参数
       strUrl = pathname + '?' + (0, _Easy3wAESEncrypt2['default'])(search, _comonConfig.a, _comonConfig.b);
     }

package/lib/Easy3wAFile/index.js

@@ -0,0 +1,59 @@
+'use strict';
+
+exports.__esModule = true;
+
+var _extends2 = require('babel-runtime/helpers/extends');
+
+var _extends3 = _interopRequireDefault(_extends2);
+
+var _classCallCheck2 = require('babel-runtime/helpers/classCallCheck');
+
+var _classCallCheck3 = _interopRequireDefault(_classCallCheck2);
+
+var _possibleConstructorReturn2 = require('babel-runtime/helpers/possibleConstructorReturn');
+
+var _possibleConstructorReturn3 = _interopRequireDefault(_possibleConstructorReturn2);
+
+var _inherits2 = require('babel-runtime/helpers/inherits');
+
+var _inherits3 = _interopRequireDefault(_inherits2);
+
+var _react = require('react');
+
+var _react2 = _interopRequireDefault(_react);
+
+var _Easy3wAESEncryptUrl = require('../Easy3wAESEncryptUrl');
+
+var _Easy3wAESEncryptUrl2 = _interopRequireDefault(_Easy3wAESEncryptUrl);
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
+
+var Easy3wAFile = function (_React$Component) {
+  (0, _inherits3['default'])(Easy3wAFile, _React$Component);
+
+  function Easy3wAFile() {
+    (0, _classCallCheck3['default'])(this, Easy3wAFile);
+    return (0, _possibleConstructorReturn3['default'])(this, _React$Component.apply(this, arguments));
+  }
+
+  Easy3wAFile.prototype.render = function render() {
+    var _props = this.props,
+        children = _props.children,
+        href = _props.href;
+
+    if (href) {
+      return _react2['default'].createElement(
+        'a',
+        (0, _extends3['default'])({}, this.props, { href: (0, _Easy3wAESEncryptUrl2['default'])(href, '1') }),
+        children || ''
+      );
+    } else {
+      return '';
+    }
+  };
+
+  return Easy3wAFile;
+}(_react2['default'].Component);
+
+exports['default'] = Easy3wAFile;
+module.exports = exports['default'];

package/lib/Easy3wAUrl/index.js

@@ -0,0 +1,59 @@
+'use strict';
+
+exports.__esModule = true;
+
+var _extends2 = require('babel-runtime/helpers/extends');
+
+var _extends3 = _interopRequireDefault(_extends2);
+
+var _classCallCheck2 = require('babel-runtime/helpers/classCallCheck');
+
+var _classCallCheck3 = _interopRequireDefault(_classCallCheck2);
+
+var _possibleConstructorReturn2 = require('babel-runtime/helpers/possibleConstructorReturn');
+
+var _possibleConstructorReturn3 = _interopRequireDefault(_possibleConstructorReturn2);
+
+var _inherits2 = require('babel-runtime/helpers/inherits');
+
+var _inherits3 = _interopRequireDefault(_inherits2);
+
+var _react = require('react');
+
+var _react2 = _interopRequireDefault(_react);
+
+var _Easy3wAESEncryptUrl = require('../Easy3wAESEncryptUrl');
+
+var _Easy3wAESEncryptUrl2 = _interopRequireDefault(_Easy3wAESEncryptUrl);
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
+
+var Easy3wAUrl = function (_React$Component) {
+  (0, _inherits3['default'])(Easy3wAUrl, _React$Component);
+
+  function Easy3wAUrl() {
+    (0, _classCallCheck3['default'])(this, Easy3wAUrl);
+    return (0, _possibleConstructorReturn3['default'])(this, _React$Component.apply(this, arguments));
+  }
+
+  Easy3wAUrl.prototype.render = function render() {
+    var _props = this.props,
+        children = _props.children,
+        href = _props.href;
+
+    if (href) {
+      return _react2['default'].createElement(
+        'a',
+        (0, _extends3['default'])({}, this.props, { href: (0, _Easy3wAESEncryptUrl2['default'])(href) }),
+        children || ''
+      );
+    } else {
+      return '';
+    }
+  };
+
+  return Easy3wAUrl;
+}(_react2['default'].Component);
+
+exports['default'] = Easy3wAUrl;
+module.exports = exports['default'];

package/lib/Easy3wDocument/index.js

@@ -34,31 +34,16 @@ var Easy3wDocument = function (_React$PureComponent) {
   (0, _inherits3['default'])(Easy3wDocument, _React$PureComponent);
 
   function Easy3wDocument() {
-    var _temp, _this, _ret;
-
     (0, _classCallCheck3['default'])(this, Easy3wDocument);
-
-    for (var _len = arguments.length, args = Array(_len), _key = 0; _key < _len; _key++) {
-      args[_key] = arguments[_key];
-    }
-
-    return _ret = (_temp = (_this = (0, _possibleConstructorReturn3['default'])(this, _React$PureComponent.call.apply(_React$PureComponent, [this].concat(args))), _this), _this.cancelHandler = function () {
-      var hideModal = _this.props.hideModal;
-
-      hideModal();
-    }, _temp), (0, _possibleConstructorReturn3['default'])(_this, _ret);
+    return (0, _possibleConstructorReturn3['default'])(this, _React$PureComponent.apply(this, arguments));
   }
 
   Easy3wDocument.prototype.render = function render() {
     var _props = this.props,
         file = _props.file,
-        _props$inFlag = _props.inFlag,
-        inFlag = _props$inFlag === undefined ? '1' : _props$inFlag,
-        _props$downloadFlag = _props.downloadFlag,
-        downloadFlag = _props$downloadFlag === undefined ? '1' : _props$downloadFlag,
         children = _props.children;
 
-    var fileNew = (0, _Easy3wAESEncryptUrl2['default'])(file, downloadFlag, inFlag);
+    var fileNew = (0, _Easy3wAESEncryptUrl2['default'])(file, '1');
     return fileNew ? _react2['default'].createElement(
       _reactPdf.Document,
       (0, _extends3['default'])({}, this.props, {

package/lib/Easy3wIframe/index.js

@@ -32,31 +32,18 @@ var Easy3wIframe = function (_React$PureComponent) {
   (0, _inherits3['default'])(Easy3wIframe, _React$PureComponent);
 
   function Easy3wIframe() {
-    var _temp, _this, _ret;
-
     (0, _classCallCheck3['default'])(this, Easy3wIframe);
-
-    for (var _len = arguments.length, args = Array(_len), _key = 0; _key < _len; _key++) {
-      args[_key] = arguments[_key];
-    }
-
-    return _ret = (_temp = (_this = (0, _possibleConstructorReturn3['default'])(this, _React$PureComponent.call.apply(_React$PureComponent, [this].concat(args))), _this), _this.cancelHandler = function () {
-      var hideModal = _this.props.hideModal;
-
-      hideModal();
-    }, _temp), (0, _possibleConstructorReturn3['default'])(_this, _ret);
+    return (0, _possibleConstructorReturn3['default'])(this, _React$PureComponent.apply(this, arguments));
   }
 
   Easy3wIframe.prototype.render = function render() {
     var _props = this.props,
         src = _props.src,
-        _props$inFlag = _props.inFlag,
-        inFlag = _props$inFlag === undefined ? '1' : _props$inFlag,
-        _props$downloadFlag = _props.downloadFlag,
-        downloadFlag = _props$downloadFlag === undefined ? '1' : _props$downloadFlag,
-        children = _props.children;
+        children = _props.children,
+        _props$fileFlag = _props.fileFlag,
+        fileFlag = _props$fileFlag === undefined ? '1' : _props$fileFlag;
 
-    var srcNew = (0, _Easy3wAESEncryptUrl2['default'])(src, downloadFlag, inFlag);
+    var srcNew = (0, _Easy3wAESEncryptUrl2['default'])(src, fileFlag);
     return srcNew ? _react2['default'].createElement(
       'iframe',
       (0, _extends3['default'])({

package/lib/index.js

@@ -38,6 +38,24 @@ Object.defineProperty(exports, 'Easy3wA', {
   }
 });
 
+var _Easy3wAFile = require('./Easy3wAFile');
+
+Object.defineProperty(exports, 'Easy3wAFile', {
+  enumerable: true,
+  get: function get() {
+    return _interopRequireDefault(_Easy3wAFile)['default'];
+  }
+});
+
+var _Easy3wAUrl = require('./Easy3wAUrl');
+
+Object.defineProperty(exports, 'Easy3wAUrl', {
+  enumerable: true,
+  get: function get() {
+    return _interopRequireDefault(_Easy3wAUrl)['default'];
+  }
+});
+
 var _Easy3wButton = require('./Easy3wButton');
 
 Object.defineProperty(exports, 'Easy3wButton', {
@@ -416,6 +434,15 @@ Object.defineProperty(exports, 'Easy3wAESDecrypt', {
   }
 });
 
+var _Easy3wAESEncryptUrl = require('./Easy3wAESEncryptUrl');
+
+Object.defineProperty(exports, 'Easy3wAESEncryptUrl', {
+  enumerable: true,
+  get: function get() {
+    return _interopRequireDefault(_Easy3wAESEncryptUrl)['default'];
+  }
+});
+
 var _Easy3wGetDesensitization = require('./Easy3wGetDesensitization');
 
 Object.defineProperty(exports, 'Easy3wGetDesensitization', {
@@ -488,13 +515,4 @@ Object.defineProperty(exports, 'Easy3wIframe', {
   }
 });
 
-var _Easy3wAESEncryptUrl = require('./Easy3wAESEncryptUrl');
-
-Object.defineProperty(exports, 'Easy3wAESEncryptUrl', {
-  enumerable: true,
-  get: function get() {
-    return _interopRequireDefault(_Easy3wAESEncryptUrl)['default'];
-  }
-});
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }

package/package.json

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