easy3wui 1.6.2 → 2.0.2

package/assets/login.css

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

package/assets/userLayout.css

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

package/lib/Easy3wButton/index.js

@@ -103,7 +103,6 @@ var Easy3wButton = function (_Component) {
       }
     }, _this.getOneBtnObj = function (obj, index) {
       var btnType = obj.btnType;
-      var cmptPros = _this.props.cmptPros;
 
       var typeProps = {};
       if (btnType) {
@@ -118,7 +117,7 @@ var Easy3wButton = function (_Component) {
       }
       return _react2['default'].createElement(
         _button2['default'],
-        (0, _extends3['default'])({}, cmptPros, {
+        (0, _extends3['default'])({
           onClick: function onClick(e) {
             return _this.onClickFunc(e, obj.func);
           },
@@ -132,7 +131,6 @@ var Easy3wButton = function (_Component) {
     }, _this.getOneBtnTypeObj = function (obj, index) {
       var props = obj.props,
           btnType = obj.btnType;
-      var cmptPros = props.cmptPros;
 
       var typeProps = {};
       if (btnType) {
@@ -150,7 +148,7 @@ var Easy3wButton = function (_Component) {
         props,
         _react2['default'].createElement(
           _button2['default'],
-          (0, _extends3['default'])({}, cmptPros, {
+          (0, _extends3['default'])({
             onClick: function onClick(e) {
               return _this.onClickFunc(e, obj.func);
             },
@@ -167,7 +165,6 @@ var Easy3wButton = function (_Component) {
           cName = obj.cName,
           confirmContent = obj.confirmContent,
           btnType = obj.btnType;
-      var cmptPros = _this.props.cmptPros;
 
       var typeProps = {};
       if (btnType) {
@@ -187,14 +184,13 @@ var Easy3wButton = function (_Component) {
           }, key: index },
         _react2['default'].createElement(
           _button2['default'],
-          (0, _extends3['default'])({}, typeProps, cmptPros, { className: (0, _classnames2['default'])(['btn', 'e3wFootBtn']) }),
+          (0, _extends3['default'])({}, typeProps, { 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;
@@ -217,7 +213,7 @@ var Easy3wButton = function (_Component) {
         { overlay: menuOverlay },
         _react2['default'].createElement(
           _button2['default'],
-          cmptPros,
+          null,
           cName,
           ' ',
           _react2['default'].createElement(_icon2['default'], { type: 'down' })

package/lib/Easy3wButtonOne/index.js

@@ -117,7 +117,7 @@ var Easy3wButtonOne = function (_Component) {
           } },
         _react2['default'].createElement(
           _button2['default'],
-          (0, _extends3['default'])({}, typeProps, { className: (0, _classnames2['default'])(['btn', 'e3wFormBtn']) }),
+          (0, _extends3['default'])({}, typeProps, { className: (0, _classnames2['default'])(['btn', 'e3wFootBtn']) }),
           cName || children
         )
       );

package/lib/Easy3wCaHandler/index.js

@@ -23,10 +23,15 @@ function Easy3wCaHandler(serverURL) {
   if (url.charAt(url.length - 1) === '/') {
     url = url.substring(0, url.length - 1);
   }
+  var protocol = url.substring(0, url.indexOf(':'));
   var host = url.substring(url.indexOf(':') + 1);
   var sender = getId();
   var receiver = sender + '_server';
-  var urlSignatureSocket = 'wss:' + host + '/signatureSocket/' + sender;
+  var wsprotocol = 'ws';
+  if (protocol.toUpperCase() === 'HTTPS') {
+    wsprotocol = 'wss';
+  }
+  var urlSignatureSocket = wsprotocol + ':' + host + '/signatureSocket/' + sender;
   var urlCASign = url + '/TWCA/signMessageNew.html?listenerno=' + receiver;
   var caIframe = document.getElementById('casigniframe');
   if (caIframe) {
@@ -54,15 +59,25 @@ function Easy3wCaHandler(serverURL) {
     return null;
   }
   // 签名回调
-  var signCallBackFunc = void 0;
+  var signCallbackFunc = void 0;
+  // 根据证书名称签名回调
+  var signByCNCallbackFunc = void 0;
   // 验签回调
-  var verifyCallBackFunc = void 0;
+  var verifyCallbackFunc = void 0;
   // 获取公钥回调
   var getPublicKeyCallbackFunc = void 0;
+  // 根据证书名称获取公钥回调
+  var getPublicKeyByCNCallbackFunc = void 0;
   // 获取供方名称
   var getSupplierNameCallbackFunc = void 0;
   // 获取证书列表回调
   var getCertListCallbackFunc = void 0;
+  // 解密回调
+  var decryptCallbackFunc = void 0;
+  // 加密回调
+  var encryptCallbackFunc = void 0;
+  // 根据证书名称加密回调
+  var encryptByCNCallbackFunc = void 0;
   // 连接发生错误的回调方法
   window.signSocket.onerror = function () {
     console.log('WebSocket连接发生错误');
@@ -84,24 +99,24 @@ function Easy3wCaHandler(serverURL) {
 
           if (method === 'sign') {
             // 签名数据
-            if (signCallBackFunc && typeof signCallBackFunc === 'function') {
+            if (signCallbackFunc && typeof signCallbackFunc === 'function') {
               var response = { data: data, status: status };
               if (status === 'success') {
                 // 签名成功
-                signCallBackFunc(response);
+                signCallbackFunc(response);
               } else {
                 response = (0, _extends3['default'])({}, response, { errorMsg: errorMsg });
-                signCallBackFunc(response);
+                signCallbackFunc(response);
               }
             }
           } else if (method === 'verify') {
-            if (verifyCallBackFunc && typeof verifyCallBackFunc === 'function') {
+            if (verifyCallbackFunc && typeof verifyCallbackFunc === 'function') {
               var _response = { status: status };
               if (status === 'success') {
-                verifyCallBackFunc(_response);
+                verifyCallbackFunc(_response);
               } else {
                 _response = (0, _extends3['default'])({}, _response, { errorMsg: errorMsg });
-                verifyCallBackFunc(_response);
+                verifyCallbackFunc(_response);
               }
             }
           } else if (method === 'getPublicKey') {
@@ -114,24 +129,74 @@ function Easy3wCaHandler(serverURL) {
                 getPublicKeyCallbackFunc(_response2);
               }
             }
-          } else if (method === 'getSupplierName') {
-            if (getSupplierNameCallbackFunc && typeof getSupplierNameCallbackFunc === 'function') {
+          } else if (method === 'getPublicKeyByCN') {
+            if (getPublicKeyByCNCallbackFunc && typeof getPublicKeyByCNCallbackFunc === 'function') {
               var _response3 = { data: data, status: status };
               if (status === 'success') {
-                getSupplierNameCallbackFunc(_response3);
+                getPublicKeyByCNCallbackFunc(_response3);
               } else {
                 _response3 = (0, _extends3['default'])({}, _response3, { errorMsg: errorMsg });
-                getSupplierNameCallbackFunc(_response3);
+                getPublicKeyByCNCallbackFunc(_response3);
               }
             }
-          } else if (method === 'getCertList') {
-            if (getCertListCallbackFunc && typeof getCertListCallbackFunc === 'function') {
+          } else if (method === 'getSupplierName') {
+            if (getSupplierNameCallbackFunc && typeof getSupplierNameCallbackFunc === 'function') {
               var _response4 = { data: data, status: status };
               if (status === 'success') {
-                getCertListCallbackFunc(_response4);
+                getSupplierNameCallbackFunc(_response4);
               } else {
                 _response4 = (0, _extends3['default'])({}, _response4, { errorMsg: errorMsg });
-                getCertListCallbackFunc(_response4);
+                getSupplierNameCallbackFunc(_response4);
+              }
+            }
+          } else if (method === 'getCertList') {
+            if (getCertListCallbackFunc && typeof getCertListCallbackFunc === 'function') {
+              var _response5 = { data: data, status: status };
+              if (status === 'success') {
+                getCertListCallbackFunc(_response5);
+              } else {
+                _response5 = (0, _extends3['default'])({}, _response5, { errorMsg: errorMsg });
+                getCertListCallbackFunc(_response5);
+              }
+            }
+          } else if (method === 'decrypt') {
+            if (decryptCallbackFunc && typeof decryptCallbackFunc === 'function') {
+              var _response6 = { data: data, status: status };
+              if (status === 'success') {
+                decryptCallbackFunc(_response6);
+              } else {
+                _response6 = (0, _extends3['default'])({}, _response6, { errorMsg: errorMsg });
+                decryptCallbackFunc(_response6);
+              }
+            }
+          } else if (method === 'encrypt') {
+            if (encryptCallbackFunc && typeof encryptCallbackFunc === 'function') {
+              var _response7 = { data: data, status: status };
+              if (status === 'success') {
+                encryptCallbackFunc(_response7);
+              } else {
+                _response7 = (0, _extends3['default'])({}, _response7, { errorMsg: errorMsg });
+                encryptCallbackFunc(_response7);
+              }
+            }
+          } else if (method === 'signByCN') {
+            if (signByCNCallbackFunc && typeof signByCNCallbackFunc === 'function') {
+              var _response8 = { data: data, status: status };
+              if (status === 'success') {
+                signByCNCallbackFunc(_response8);
+              } else {
+                _response8 = (0, _extends3['default'])({}, _response8, { errorMsg: errorMsg });
+                signByCNCallbackFunc(_response8);
+              }
+            }
+          } else if (method === 'encryptByCN') {
+            if (encryptByCNCallbackFunc && typeof encryptByCNCallbackFunc === 'function') {
+              var _response9 = { data: data, status: status };
+              if (status === 'success') {
+                encryptByCNCallbackFunc(_response9);
+              } else {
+                _response9 = (0, _extends3['default'])({}, _response9, { errorMsg: errorMsg });
+                encryptByCNCallbackFunc(_response9);
               }
             }
           }
@@ -152,18 +217,26 @@ function Easy3wCaHandler(serverURL) {
     window.signSocket.close();
   };
   var CAExec = {
-    // 获取签名
-    getSign: function getSign(original, serialNumber, signCallBack) {
-      signCallBackFunc = null;
-      signCallBackFunc = signCallBack;
+    // 根据序列号获取签名
+    getSign: function getSign(original, serialNumber, signCallback) {
+      signCallbackFunc = null;
+      signCallbackFunc = signCallback;
       var sendData = { method: 'sign', data: original, serialNumber: serialNumber, receiver: receiver, sender: sender };
       var msg = JSON.stringify(sendData);
       window.signSocket.send(msg);
     },
+    // 根据证书名称获取签名
+    getSignByCN: function getSignByCN(original, cn, signByCNCallback) {
+      signByCNCallbackFunc = null;
+      signByCNCallbackFunc = signByCNCallback;
+      var sendData = { method: 'signByCN', data: original, cn: cn, receiver: receiver, sender: sender };
+      var msg = JSON.stringify(sendData);
+      window.signSocket.send(msg);
+    },
     // 验签
-    verifySign: function verifySign(original, sign, verifyCallBack) {
-      verifyCallBackFunc = null;
-      verifyCallBackFunc = verifyCallBack;
+    verifySign: function verifySign(original, sign, verifyCallback) {
+      verifyCallbackFunc = null;
+      verifyCallbackFunc = verifyCallback;
       var sendData = { method: 'verify', data: { sign: sign, original: original }, receiver: receiver, sender: sender };
       var msg = JSON.stringify(sendData);
       window.signSocket.send(msg);
@@ -176,6 +249,14 @@ function Easy3wCaHandler(serverURL) {
       var msg = JSON.stringify(sendData);
       window.signSocket.send(msg);
     },
+    // 根据证书名称获取公钥
+    getPublicKeyByCN: function getPublicKeyByCN(cn, certType, getPublicKeyByCNCallback) {
+      getPublicKeyByCNCallbackFunc = null;
+      getPublicKeyByCNCallbackFunc = getPublicKeyByCNCallback;
+      var sendData = { method: 'getPublicKeyByCN', cn: cn, certType: certType, receiver: receiver, sender: sender };
+      var msg = JSON.stringify(sendData);
+      window.signSocket.send(msg);
+    },
     // 获取供方名称
     getSupplierName: function getSupplierName(serialNumber, getSupplierNameCallback) {
       getSupplierNameCallbackFunc = null;
@@ -191,6 +272,30 @@ function Easy3wCaHandler(serverURL) {
       var sendData = { method: 'getCertList', receiver: receiver, sender: sender };
       var msg = JSON.stringify(sendData);
       window.signSocket.send(msg);
+    },
+    // 加密
+    encrypt: function encrypt(encryptOriginal, serialNumber, encryptCallback) {
+      encryptCallbackFunc = null;
+      encryptCallbackFunc = encryptCallback;
+      var sendData = { method: 'encrypt', data: encryptOriginal, serialNumber: serialNumber, receiver: receiver, sender: sender };
+      var msg = JSON.stringify(sendData);
+      window.signSocket.send(msg);
+    },
+    // 根据证书名称加密
+    encryptByCN: function encryptByCN(encryptOriginal, cn, encryptByCNCallback) {
+      encryptByCNCallbackFunc = null;
+      encryptByCNCallbackFunc = encryptByCNCallback;
+      var sendData = { method: 'encryptByCN', data: encryptOriginal, cn: cn, receiver: receiver, sender: sender };
+      var msg = JSON.stringify(sendData);
+      window.signSocket.send(msg);
+    },
+    // 解密
+    decrypt: function decrypt(encryptData, decryptCallback) {
+      decryptCallbackFunc = null;
+      decryptCallbackFunc = decryptCallback;
+      var sendData = { method: 'decrypt', data: encryptData, receiver: receiver, sender: sender };
+      var msg = JSON.stringify(sendData);
+      window.signSocket.send(msg);
     }
   };
   return CAExec;
@@ -199,6 +304,7 @@ function Easy3wCaHandler(serverURL) {
 var getId = function getId() {
   return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
     var r = Math.random() * 16 | 0;
+    // eslint-disable-next-line no-mixed-operators
     var v = c === 'x' ? r : r & 0x3 | 0x8;
     return v.toString(16);
   }).toUpperCase();

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,16 +58,21 @@ 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);
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
 
+var _ref = _comonConfig.objPreviewFile || {},
+    previewFileUrl = _ref.previewFileUrl,
+    previewFileFlag = _ref.previewFileFlag,
+    previewFileType = _ref.previewFileType;
+
 var Easy3wDownLoad = function (_Component) {
   (0, _inherits3['default'])(Easy3wDownLoad, _Component);
 
@@ -64,9 +81,51 @@ var Easy3wDownLoad = function (_Component) {
 
     var _this = (0, _possibleConstructorReturn3['default'])(this, _Component.call(this, props));
 
+    _this.onPreview = function (file, url) {
+      var uid = file.uid,
+          name = file.name;
+
+      var fileNameArr = name.toLowerCase().split('.');
+      var fileType = fileNameArr[fileNameArr.length - 1];
+      if (previewFileType.indexOf(fileType) >= 0) {
+        var src = _this.urlDeal(previewFileUrl, uid);
+        window.open(src, '_blank');
+      } else {
+        // window.open(url);
+        var aEle = document.createElement('a');
+        aEle.setAttribute('href', url);
+        aEle.setAttribute('target', '_blank');
+        aEle.setAttribute('id', 'downReportFile');
+        document.body.appendChild(aEle);
+        if (!document.getElementById('downReportFile')) {
+          document.body.appendChild(aEle);
+        }
+        aEle.click();
+      }
+    };
+
+    _this.touchDownload = function (file, url) {
+      var uid = file.uid,
+          name = file.name;
+      // const src = this.urlDeal(previewFileUrl, uid);
+      // window.open(url);
+
+      var aEle = document.createElement('a');
+      aEle.setAttribute('href', url);
+      aEle.setAttribute('target', '_blank');
+      aEle.setAttribute('id', 'downReportFile');
+      document.body.appendChild(aEle);
+      if (!document.getElementById('downReportFile')) {
+        document.body.appendChild(aEle);
+      }
+      aEle.click();
+    };
+
     _this.urlDeal = function (urlDownloadFile, uid) {
+      var propsAFlag = _this.props.propsAFlag; // propsAFlag 加密标识 从引用组件处传入 '1':加密 '0':不加密
+
       var retUrl = '';
-      if (uid !== '' && _comonConfig.aFlag && (_comonConfig.aFlag === '1' || _comonConfig.aFlag === '2')) {
+      if (uid !== '' && propsAFlag === '1' || uid !== '' && propsAFlag !== '0' && (_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);
@@ -88,14 +147,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 });
     };
@@ -114,6 +177,10 @@ var Easy3wDownLoad = function (_Component) {
     };
     return _this;
   }
+  // 预览
+
+  // 下载
+
 
   Easy3wDownLoad.prototype.render = function render() {
     var _this2 = this;
@@ -136,14 +203,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 (previewFileFlag) {
+          // 预览
+          return _react2['default'].createElement(
+            'div',
+            { style: { width: '100%', display: 'flex', alignItems: 'center' } },
+            _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, url);
+                  }, style: { overflow: 'hidden', whiteSpace: 'nowrap', textOverflow: 'ellipsis', paddingRight: '12px' } },
+                name
+              )
+            ),
+            _react2['default'].createElement(_icon2['default'], { type: 'download', onClick: function onClick() {
+                return _this2.touchDownload(obj, url);
+              }, 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
             )