easy3wui 1.4.40 → 1.4.91

package/assets/login.css

@@ -6,6 +6,10 @@
   width: 368px;
   margin: 0 auto;
   z-index: 100;
+  background-color: #fff;
+  border: 1px solid #0000001f;
+  border-radius: 0.8em;
+  padding: 20px;
 }
 .e3wLoginMain .e3wLoginTabs {
   padding: 0 2px;
@@ -16,7 +20,7 @@
   line-height: 24px;
 }
 .e3wLoginMain .e3wLoginTabs :global .ant-input-affix-wrapper .ant-input:not(:first-child) {
-  padding-left: 5px;
+  padding-left: 34px;
 }
 .e3wLoginMain :global .ant-tabs .ant-tabs-bar {
   border-bottom: 0;

package/assets/userLayout.css

@@ -9,7 +9,7 @@
   background-repeat: no-repeat;
   background-position: center;
   background-size: 100%;
-  padding: 40px 0 0 0;
+  padding: 60px 0 0 0;
   position: relative;
 }
 .e3wUserLayoutTop {
@@ -67,4 +67,5 @@
   width: 100%;
   height: 50px;
   z-index: 99;
+  position: fixed;
 }

package/lib/Easy3wAESDecrypt/index.js

@@ -0,0 +1,21 @@
+'use strict';
+
+exports.__esModule = true;
+exports['default'] = Easy3wAESDecrypt;
+
+var _base64Url = require('base64-url');
+
+var _base64Url2 = _interopRequireDefault(_base64Url);
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
+
+function Easy3wAESDecrypt(cipherText, AESKey, AESIV) {
+  var text = _base64Url2['default'].decode(cipherText);
+  var CryptoJS = require('crypto-js');
+  var keyStr = CryptoJS.enc.Utf8.parse(AESKey);
+  var ivStr = CryptoJS.enc.Utf8.parse(AESIV);
+  var bytes = CryptoJS.AES.decrypt(text, keyStr, { iv: ivStr, mode: CryptoJS.mode.CBC, padding: CryptoJS.pad.Pkcs7 });
+  var originalText = bytes.toString(CryptoJS.enc.Utf8);
+  return originalText;
+}
+module.exports = exports['default'];

package/lib/Easy3wAESEncrypt/index.js

@@ -0,0 +1,20 @@
+'use strict';
+
+exports.__esModule = true;
+exports['default'] = Easy3wAESEncrypt;
+
+var _base64Url = require('base64-url');
+
+var _base64Url2 = _interopRequireDefault(_base64Url);
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
+
+function Easy3wAESEncrypt(data, AESKey, AESIV) {
+  var CryptoJS = require('crypto-js');
+  var srcData = CryptoJS.enc.Utf8.parse(data);
+  var keyStr = CryptoJS.enc.Utf8.parse(AESKey);
+  var ivStr = CryptoJS.enc.Utf8.parse(AESIV);
+  var ciphertext = CryptoJS.AES.encrypt(srcData, keyStr, { iv: ivStr, mode: CryptoJS.mode.CBC, padding: CryptoJS.pad.Pkcs7 }).toString();
+  return _base64Url2['default'].encode(ciphertext);
+}
+module.exports = exports['default'];

package/lib/Easy3wButton/index.js

@@ -90,7 +90,7 @@ var Easy3wButton = function (_Component) {
       args[_key] = arguments[_key];
     }
 
-    return _ret = (_temp = (_this = (0, _possibleConstructorReturn3['default'])(this, _Component.call.apply(_Component, [this].concat(args))), _this), _this.onClickFunc = function (func) {
+    return _ret = (_temp = (_this = (0, _possibleConstructorReturn3['default'])(this, _Component.call.apply(_Component, [this].concat(args))), _this), _this.onClickFunc = function (e, func) {
       var globalLoading = _this.props.loading.global;
       if (globalLoading) {
         _notification2['default'].warning({
@@ -99,10 +99,11 @@ var Easy3wButton = function (_Component) {
           duration: 3
         });
       } else {
-        func();
+        func(e);
       }
     }, _this.getOneBtnObj = function (obj, index) {
       var btnType = obj.btnType;
+      var cmptPros = _this.props.cmptPros;
 
       var typeProps = {};
       if (btnType) {
@@ -117,9 +118,9 @@ var Easy3wButton = function (_Component) {
       }
       return _react2['default'].createElement(
         _button2['default'],
-        (0, _extends3['default'])({
-          onClick: function onClick() {
-            return _this.onClickFunc(obj.func);
+        (0, _extends3['default'])({}, cmptPros, {
+          onClick: function onClick(e) {
+            return _this.onClickFunc(e, obj.func);
           },
           loading: obj.loading
         }, typeProps, {
@@ -131,6 +132,7 @@ var Easy3wButton = function (_Component) {
     }, _this.getOneBtnTypeObj = function (obj, index) {
       var props = obj.props,
           btnType = obj.btnType;
+      var cmptPros = props.cmptPros;
 
       var typeProps = {};
       if (btnType) {
@@ -148,9 +150,9 @@ var Easy3wButton = function (_Component) {
         props,
         _react2['default'].createElement(
           _button2['default'],
-          (0, _extends3['default'])({
-            onClick: function onClick() {
-              return _this.onClickFunc(obj.func);
+          (0, _extends3['default'])({}, cmptPros, {
+            onClick: function onClick(e) {
+              return _this.onClickFunc(e, obj.func);
             },
             loading: obj.loading
           }, typeProps, {
@@ -165,6 +167,7 @@ var Easy3wButton = function (_Component) {
           cName = obj.cName,
           confirmContent = obj.confirmContent,
           btnType = obj.btnType;
+      var cmptPros = _this.props.cmptPros;
 
       var typeProps = {};
       if (btnType) {
@@ -179,26 +182,27 @@ var Easy3wButton = function (_Component) {
       }
       return _react2['default'].createElement(
         _popconfirm2['default'],
-        { title: confirmContent, onConfirm: function onConfirm() {
-            return _this.onClickFunc(func);
+        { title: confirmContent, onConfirm: function onConfirm(e) {
+            return _this.onClickFunc(e, func);
           }, key: index },
         _react2['default'].createElement(
           _button2['default'],
-          (0, _extends3['default'])({}, typeProps, { className: (0, _classnames2['default'])(['btn', 'e3wFootBtn']) }),
+          (0, _extends3['default'])({}, typeProps, cmptPros, { className: (0, _classnames2['default'])(['btn', 'e3wFootBtn']) }),
           cName
         )
       );
     }, _this.getDropdownArrObj = function (obj) {
       var cName = obj.cName,
           dropdownArr = obj.dropdownArr;
+      var cmptPros = _this.props.cmptPros;
 
       var menuArr = dropdownArr.map(function (dropdown) {
         var func = dropdown.func;
 
         return _react2['default'].createElement(
           _menu2['default'].Item,
-          { key: cName, onClick: function onClick() {
-              return _this.onClickFunc(func);
+          { key: cName, onClick: function onClick(e) {
+              return _this.onClickFunc(e, func);
             } },
           dropdown.cName
         );
@@ -213,7 +217,7 @@ var Easy3wButton = function (_Component) {
         { overlay: menuOverlay },
         _react2['default'].createElement(
           _button2['default'],
-          null,
+          cmptPros,
           cName,
           ' ',
           _react2['default'].createElement(_icon2['default'], { type: 'down' })
@@ -243,9 +247,12 @@ var Easy3wButton = function (_Component) {
 
   Easy3wButton.prototype.render = function render() {
     var btnObj = this.getBtnObj();
+    var bodyStyle = {
+      paddingBottom: 0
+    };
     return _react2['default'].createElement(
       _card2['default'],
-      { bordered: false },
+      { bordered: false, size: 'small', bodyStyle: bodyStyle },
       _react2['default'].createElement(
         'div',
         { style: { textAlign: 'center' } },

package/lib/Easy3wButtonOne/index.js

@@ -28,22 +28,22 @@ var _react = require('react');
 
 var _react2 = _interopRequireDefault(_react);
 
+var _antd = require('antd');
+
 var _button = require('antd/lib/button');
 
 var _button2 = _interopRequireDefault(_button);
 
 require('antd/lib/upload/style');
 
+var _dva = require('dva');
+
 var _popconfirm = require('antd/lib/popconfirm');
 
 var _popconfirm2 = _interopRequireDefault(_popconfirm);
 
 require('antd/lib/popconfirm/style');
 
-var _dva = require('dva');
-
-var _antd = require('antd');
-
 var _classnames = require('classnames');
 
 var _classnames2 = _interopRequireDefault(_classnames);
@@ -76,9 +76,8 @@ var Easy3wButtonOne = function (_Component) {
     }, _this.getOneBtnObj = function () {
       var _this$props = _this.props,
           func = _this$props.func,
-          cName = _this$props.cName,
           loading = _this$props.loading,
-          style = _this$props.style,
+          cName = _this$props.cName,
           typeProp = _this$props.typeProp,
           _onClick = _this$props.onClick,
           children = _this$props.children;
@@ -94,7 +93,6 @@ var Easy3wButtonOne = function (_Component) {
             return _this.onClickFunc(e, func || _onClick);
           },
           loading: loading,
-          style: style,
           className: (0, _classnames2['default'])(['e3wFootBtn'])
         }, typeProps),
         cName || children
@@ -104,7 +102,6 @@ var Easy3wButtonOne = function (_Component) {
           func = _this$props2.func,
           cName = _this$props2.cName,
           confirmContent = _this$props2.confirmContent,
-          style = _this$props2.style,
           typeProp = _this$props2.typeProp,
           onClick = _this$props2.onClick,
           children = _this$props2.children;
@@ -120,7 +117,7 @@ var Easy3wButtonOne = function (_Component) {
           } },
         _react2['default'].createElement(
           _button2['default'],
-          (0, _extends3['default'])({}, typeProps, { className: (0, _classnames2['default'])(['btn', 'e3wFootBtn']), style: style }),
+          (0, _extends3['default'])({}, typeProps, { className: (0, _classnames2['default'])(['btn', 'e3wFormBtn']) }),
           cName || children
         )
       );

package/lib/Easy3wCaHandler/index.js

@@ -26,7 +26,7 @@ function Easy3wCaHandler(serverURL) {
   var host = url.substring(url.indexOf(':') + 1);
   var sender = getId();
   var receiver = sender + '_server';
-  var urlSignatureSocket = 'ws:' + host + '/signatureSocket/' + sender;
+  var urlSignatureSocket = 'wss:' + host + '/signatureSocket/' + sender;
   var urlCASign = url + '/TWCA/signMessageNew.html?listenerno=' + receiver;
   var caIframe = document.getElementById('casigniframe');
   if (caIframe) {

package/lib/Easy3wCard/index.js

@@ -46,14 +46,15 @@ var Easy3wCard = function (_Component) {
     return _react2['default'].createElement(
       _card2['default'],
       {
-        title: _react2['default'].createElement(
+        title: label ? _react2['default'].createElement(
           'span',
           { className: (0, _classnames2['default'])(['e3wCardSpanCardTitle']) },
           _react2['default'].createElement('s', null),
           label
-        ),
+        ) : '',
         bordered: false,
-        className: (0, _classnames2['default'])(['e3wCardForm'])
+        className: (0, _classnames2['default'])(['e3wCardForm']),
+        size: 'small'
       },
       children
     );

package/lib/Easy3wDownLoad/Easy3wRCView.js

@@ -0,0 +1,65 @@
+'use strict';
+
+exports.__esModule = true;
+
+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 _rcViewer = require('@hanyk/rc-viewer');
+
+var _rcViewer2 = _interopRequireDefault(_rcViewer);
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
+
+var Easy3wRCView = function (_PureComponent) {
+  (0, _inherits3['default'])(Easy3wRCView, _PureComponent);
+
+  function Easy3wRCView() {
+    (0, _classCallCheck3['default'])(this, Easy3wRCView);
+    return (0, _possibleConstructorReturn3['default'])(this, _PureComponent.apply(this, arguments));
+  }
+
+  Easy3wRCView.prototype.componentDidUpdate = function componentDidUpdate() {
+    // eslint-disable-next-line react/no-string-refs
+    var viewer = this.refs.viewer.viewer;
+
+    viewer.show();
+  };
+
+  Easy3wRCView.prototype.render = function render() {
+    var _props = this.props,
+        imgUrl = _props.imgUrl,
+        hideModal = _props.hideModal;
+
+    return _react2['default'].createElement(
+      _rcViewer2['default'],
+      {
+        options: {
+          // 关闭时的回调
+          hide: hideModal
+        }
+        // eslint-disable-next-line react/no-string-refs
+        , ref: 'viewer'
+      },
+      _react2['default'].createElement('img', { style: { display: 'none' }, src: imgUrl, alt: '' })
+    );
+  };
+
+  return Easy3wRCView;
+}(_react.PureComponent);
+
+exports['default'] = Easy3wRCView;
+module.exports = exports['default'];

package/lib/Easy3wDownLoad/index.js

@@ -2,10 +2,6 @@
 
 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);
@@ -36,9 +32,7 @@ var _reactImages = require('react-images');
 
 var _reactImages2 = _interopRequireDefault(_reactImages);
 
-var _reactZmage = require('react-zmage');
-
-var _reactZmage2 = _interopRequireDefault(_reactZmage);
+var _comonConfig = require('comonConfigPath/comonConfig');
 
 var _Easy3wPDFView = require('./Easy3wPDFView');
 
@@ -48,9 +42,17 @@ var _Easy3wFileView = require('./Easy3wFileView');
 
 var _Easy3wFileView2 = _interopRequireDefault(_Easy3wFileView);
 
-var _Easy3wImgView = require('./Easy3wImgView');
+var _Easy3wRCView = require('./Easy3wRCView');
+
+var _Easy3wRCView2 = _interopRequireDefault(_Easy3wRCView);
+
+var _Easy3wGetCookie = require('./../Easy3wGetCookie');
+
+var _Easy3wGetCookie2 = _interopRequireDefault(_Easy3wGetCookie);
 
-var _Easy3wImgView2 = _interopRequireDefault(_Easy3wImgView);
+var _Easy3wAESEncrypt = require('./../Easy3wAESEncrypt');
+
+var _Easy3wAESEncrypt2 = _interopRequireDefault(_Easy3wAESEncrypt);
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
 
@@ -62,6 +64,19 @@ var Easy3wDownLoad = function (_Component) {
 
     var _this = (0, _possibleConstructorReturn3['default'])(this, _Component.call(this, props));
 
+    _this.urlDeal = function (urlDownloadFile, uid) {
+      var retUrl = '';
+      if (uid !== '' && _comonConfig.aFlag && (_comonConfig.aFlag === '1' || _comonConfig.aFlag === '2')) {
+        var authToken = (0, _Easy3wGetCookie2['default'])('userToken') || 'E3WSAFEAPPQWEFGHYI7I483S';
+        var nowStr = _.now();
+        var encUrl = (0, _Easy3wAESEncrypt2['default'])(uid + '@#' + nowStr + '@#' + authToken, _comonConfig.a, _comonConfig.b);
+        return '' + urlDownloadFile + encUrl;
+      } else {
+        retUrl = '' + urlDownloadFile + uid;
+        return retUrl;
+      }
+    };
+
     _this.showFileView = function (uid, name, apiKey, fileViewURL, fileCallURL) {
       var callURl = fileCallURL + '?fileId=' + uid;
       var crypto = require('crypto');
@@ -81,17 +96,21 @@ var Easy3wDownLoad = function (_Component) {
       _this.setState({ fileId: '', fileURL: '', fileName: '', fileViewFlag: false });
     };
 
-    _this.hideImgModal = function () {
-      _this.setState({ fileId: '', fileURL: '', fileName: '', imgVisible: false });
+    _this.showImageView = function (url) {
+      _this.setState({ imageViewURL: url });
+    };
+
+    _this.hideImageView = function () {
+      _this.setState({ imageViewURL: '' });
     };
 
     _this.state = {
       pdfViewFlag: false, // pdf预览
       fileViewFlag: false, // xls、xlsx、doc、docx等office文件预览
-      imgVisible: false, // 图片预览
       fileId: '', // 文件id
       fileName: '', // 文件名称
-      fileURL: '' // 文件url
+      fileURL: '', // 文件url
+      imageViewURL: '' // 图片预览url
     };
     return _this;
   }
@@ -114,7 +133,7 @@ var Easy3wDownLoad = function (_Component) {
         var uid = obj.uid,
             name = obj.name;
 
-        var url = '' + urlDownloadFile + uid;
+        var url = _this2.urlDeal(urlDownloadFile, uid);
         var fileNameArr = name.toLowerCase().split('.');
         var fileType = fileNameArr[fileNameArr.length - 1];
         if (previwPdfFlag && fileType.indexOf('pdf') >= 0) {
@@ -148,7 +167,7 @@ var Easy3wDownLoad = function (_Component) {
             _react2['default'].createElement(
               'a',
               { onClick: function onClick() {
-                  return _reactZmage2['default'].browsing({ src: url, controller: { download: true } });
+                  return _this2.showImageView(url);
                 } },
               name
             )
@@ -185,33 +204,7 @@ var Easy3wDownLoad = function (_Component) {
       hideModal: this.hideFileModal,
       viewFileUrl: this.state.viewFileUrl
     });
-    var viewImgObjbak = _react2['default'].createElement(_Easy3wImgView2['default'], {
-      fileId: this.state.fileId,
-      fileName: this.state.fileName,
-      fileURL: this.state.fileURL,
-      visible: this.state.imgVisible,
-      hideModal: this.hideImgModal
-    });
-    var customStyles = {
-      header: function header(base, state) {
-        return (0, _extends3['default'])({}, base, {
-          paddingTop: 42
-        });
-      }
-    };
-    var viewImgObj = _react2['default'].createElement(
-      'div',
-      null,
-      _react2['default'].createElement(
-        _reactImages.ModalGateway,
-        null,
-        this.state.imgVisible ? _react2['default'].createElement(
-          _reactImages.Modal,
-          { allowFullscreen: true, onClose: this.hideImgModal },
-          _react2['default'].createElement(_reactImages2['default'], { styles: customStyles, views: [{ src: this.state.fileURL }] })
-        ) : null
-      )
-    );
+    var viewImgObj = _react2['default'].createElement(_Easy3wRCView2['default'], { imgUrl: this.state.imageViewURL, hideModal: this.hideImageView });
     return _react2['default'].createElement(
       'div',
       null,