easy3wui 1.5.23 → 1.5.24-beta2

package/assets/formPage.css

@@ -13,3 +13,28 @@
 .e3wFormItem .ant-form-item {
   margin-bottom: 8px;
 }
+.inputNumberFormat {
+  display: -ms-flexbox;
+  display: flex;
+  -ms-flex-direction: row;
+      flex-direction: row;
+  -ms-flex-wrap: nowrap;
+      flex-wrap: nowrap;
+  line-height: 32px;
+}
+.inputNumberFormat .addonBtns {
+  height: 32px;
+  width: auto;
+  border-left: none;
+  border-right: 1px solid #d9d9d9;
+}
+.inputNumberFormat .inputNumberBtns .e3wFootBtn {
+  margin: 0;
+}
+input.ant-input-number-input {
+  text-align: right;
+  padding-right: 22px;
+}
+.rightText {
+  text-align: right;
+}

package/assets/index.css

@@ -1394,6 +1394,31 @@ s {
 .e3wFormItem .ant-form-item {
   margin-bottom: 8px;
 }
+.inputNumberFormat {
+  display: -ms-flexbox;
+  display: flex;
+  -ms-flex-direction: row;
+      flex-direction: row;
+  -ms-flex-wrap: nowrap;
+      flex-wrap: nowrap;
+  line-height: 32px;
+}
+.inputNumberFormat .addonBtns {
+  height: 32px;
+  width: auto;
+  border-left: none;
+  border-right: 1px solid #d9d9d9;
+}
+.inputNumberFormat .inputNumberBtns .e3wFootBtn {
+  margin: 0;
+}
+input.ant-input-number-input {
+  text-align: right;
+  padding-right: 22px;
+}
+.rightText {
+  text-align: right;
+}
 .e3wFootBtn {
   margin: 0px 8px;
 }

package/lib/Easy3wButton/index.js

@@ -190,7 +190,9 @@ var Easy3wButton = function (_Component) {
       );
     }, _this.getDropdownArrObj = function (obj) {
       var cName = obj.cName,
-          dropdownArr = obj.dropdownArr;
+          dropdownArr = obj.dropdownArr,
+          _obj$dropdownProps = obj.dropdownProps,
+          dropdownProps = _obj$dropdownProps === undefined ? {} : _obj$dropdownProps;
 
       var menuArr = dropdownArr.map(function (dropdown) {
         var func = dropdown.func;
@@ -210,7 +212,7 @@ var Easy3wButton = function (_Component) {
       );
       return _react2['default'].createElement(
         _dropdown2['default'],
-        { overlay: menuOverlay },
+        (0, _extends3['default'])({ overlay: menuOverlay }, dropdownProps),
         _react2['default'].createElement(
           _button2['default'],
           null,

package/lib/Easy3wCaHandler/index.js

@@ -27,7 +27,6 @@ function Easy3wCaHandler(serverURL) {
   var host = url.substring(url.indexOf(':') + 1);
   var sender = getId();
   var receiver = sender + '_server';
-  // const urlSignatureSocket = `wss:${host}/signatureSocket/${sender}`;
   var wsprotocol = 'ws';
   if (protocol.toUpperCase() === 'HTTPS') {
     wsprotocol = 'wss';
@@ -60,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连接发生错误');
@@ -90,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') {
@@ -120,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);
               }
             }
           }
@@ -158,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);
@@ -182,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;
@@ -197,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;
@@ -205,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/Easy3wFormPage/index.js

@@ -319,8 +319,8 @@ var Easy3wFormPage = function (_Component) {
           return _this.inputHandler(itemNew);
         case 'textarea':
           return _this.textareaHandler(itemNew);
-        case 'inputNumber':
-          return _this.inputNumberHandler(itemNew);
+        // case 'inputNumber':
+        //   return this.inputNumberHandler(itemNew);
         // case 'inputNumberFormat':
         //   return this.inputNumberFormatHandler(itemNew);
         case 'numberInput':
@@ -377,6 +377,9 @@ var Easy3wFormPage = function (_Component) {
         return _braftEditor2['default'].createEditorState(value);
       }
       if (allReadFlag || readFlag) {
+        if (fieldType === 'rangePicker') {
+          value = value.length ? value.join(' 至 ') : '';
+        }
         return value;
       }
       if (fieldType === 'datePicker') {
@@ -916,6 +919,10 @@ var Easy3wFormPage = function (_Component) {
         var _up3 = _this.inputNumberFormatHandler(colObj, formItemLayout);
         return _up3;
       }
+      if (fieldType === 'inputNumber') {
+        var _up4 = _this.inputNumberHandler(colObj, formItemLayout);
+        return _up4;
+      }
       var formItem = _this.getFormItem(colObj, itemValue, afterBtns, itemArea, formItemLayout);
       return formItem;
     }, _this.getAllForms = function () {
@@ -1054,10 +1061,11 @@ var Easy3wFormPage = function (_Component) {
       return _react2['default'].createElement(
         _select2['default'],
         (0, _extends3['default'])({
-          style: { width: '100%' }
-        }, cmptPros, {
-          allowClear: true
-        }),
+          style: { width: '100%' },
+          allowClear: true,
+          showSearch: true // 是否开启搜索
+          , optionFilterProp: 'children' // 搜索时过滤对应的 option 属性，如设置为 children 表示对内嵌内容进行搜索
+        }, cmptPros),
         selectOpts
       );
     }, _this.tagSelectHandler = function (item) {
@@ -1188,22 +1196,83 @@ var Easy3wFormPage = function (_Component) {
         _message3['default'].info('\u8F93\u5165\u5B57\u6570\u4E0D\u80FD\u8D85\u8FC7' + maxLength);
       }
     }, _this.textareaHandler = function (item) {
-      var cmptPros = item.cmptPros;
+      var _item$cmptPros2 = item.cmptPros,
+          cmptPros = _item$cmptPros2 === undefined ? {} : _item$cmptPros2;
 
       var maxlength = void 0;
-      if (!cmptPros || cmptPros && !cmptPros.rows) {
-        cmptPros = (0, _extends3['default'])({}, cmptPros, { autosize: true });
-      }
-      if (cmptPros && (cmptPros.maxLength || cmptPros.maxlength)) {
+      if (cmptPros.maxLength || cmptPros.maxlength) {
         maxlength = cmptPros.maxLength || cmptPros.maxlength;
       }
+      if (!cmptPros.rows) {
+        cmptPros = (0, _extends3['default'])({ autosize: { minRows: 2, maxRows: true } }, cmptPros);
+      }
       return _react2['default'].createElement(TextArea, (0, _extends3['default'])({ onChange: function onChange(e) {
           return _this.textAreaOnchange(e, maxlength);
         } }, cmptPros));
-    }, _this.inputNumberHandler = function (item) {
-      var cmptPros = item.cmptPros;
+    }, _this.inputNumberHandler = function (item, formItemLayout) {
+      var allReadFlag = _this.props.allReadFlag;
+      var getFieldDecorator = _this.props.form.getFieldDecorator;
+      var cmptPros = item.cmptPros,
+          label = item.label,
+          fieldId = item.fieldId,
+          requiredMessage = item.requiredMessage,
+          required = item.required,
+          value = item.value,
+          disableFlag = item.disableFlag,
+          formItemProps = item.formItemProps,
+          readFlag = item.readFlag;
 
-      return _react2['default'].createElement(_inputNumber2['default'], cmptPros);
+      var addrules = [{ required: required, message: requiredMessage || '\u8BF7\u586B\u5199' + label }];
+      if (cmptPros && cmptPros.rules) {
+        var rules = cmptPros.rules;
+
+        addrules.push.apply(addrules, rules);
+      }
+      var afterBtns = _this.getAfterBtn(item);
+      if (readFlag || allReadFlag) {
+        return _react2['default'].createElement(
+          FormItem,
+          (0, _extends3['default'])({
+            label: label
+          }, formItemLayout, formItemProps, {
+            style: formItemStyle
+          }),
+          getFieldDecorator(fieldId + 'Easy3wView', {
+            initialValue: 'easy3wView',
+            rules: [{ required: required, message: requiredMessage || '\u8BF7\u586B\u5199' + label }]
+          })(_react2['default'].createElement(_input2['default'], { type: 'hidden' })),
+          value,
+          ' ',
+          afterBtns
+        );
+      }
+      return _react2['default'].createElement(
+        FormItem,
+        (0, _extends3['default'])({
+          label: label
+        }, formItemLayout, formItemProps, {
+          style: formItemStyle
+        }),
+        _react2['default'].createElement(
+          'div',
+          { className: (0, _classnames2['default'])(['inputNumberFormat']) },
+          getFieldDecorator(fieldId, { rules: addrules, initialValue: value })(_react2['default'].createElement(_inputNumber2['default'], (0, _extends3['default'])({
+            precision: 2,
+            style: { flex: 1 },
+            disabled: disableFlag
+          }, cmptPros))),
+          cmptPros ? cmptPros.addonAfter ? _react2['default'].createElement(
+            'div',
+            { className: (0, _classnames2['default'])(['ant-input-group-addon', 'addonBtns']), style: { borderRadius: '0px 4px 4px 0px' } },
+            cmptPros.addonAfter
+          ) : null : null,
+          _react2['default'].createElement(
+            'div',
+            { className: (0, _classnames2['default'])(['inputNumberBtns']) },
+            afterBtns
+          )
+        )
+      );
     }, _this.inputNumberFormatHandler = function (item, formItemLayout) {
       var allReadFlag = _this.props.allReadFlag;
       var getFieldDecorator = _this.props.form.getFieldDecorator;
@@ -1250,43 +1319,32 @@ var Easy3wFormPage = function (_Component) {
         }),
         _react2['default'].createElement(
           'div',
-          { style: { position: 'relative' } },
-          _react2['default'].createElement(
-            _row2['default'],
-            null,
-            _react2['default'].createElement(
-              _col2['default'],
-              { span: cmptPros && cmptPros.addonAfter ? 21 : 24 },
-              getFieldDecorator(fieldId, { rules: addrules, initialValue: value })(_react2['default'].createElement(_inputNumber2['default'], (0, _extends3['default'])({
-                formatter: function formatter(val) {
-                  return ('' + val).replace(/\B(?=(\d{3})+(?!\d))/g, ',');
-                },
-                parser: function parser(val) {
-                  return val.replace(/\$\s?|(,*)/g, '');
-                },
-                precision: 2,
-                disabled: disableFlag,
-                onChange: function onChange(onChangeValue) {
-                  var _this$props$form$setF;
+          { className: (0, _classnames2['default'])(['inputNumberFormat']) },
+          getFieldDecorator(fieldId, { rules: addrules, initialValue: value })(_react2['default'].createElement(_inputNumber2['default'], (0, _extends3['default'])({
+            formatter: function formatter(val) {
+              return ('' + val).replace(/\B(?=(\d{3})+(?!\d))/g, ',');
+            },
+            parser: function parser(val) {
+              return val.replace(/\$\s?|(,*)/g, '');
+            },
+            precision: 2,
+            disabled: disableFlag,
+            onChange: function onChange(onChangeValue) {
+              var _this$props$form$setF;
 
-                  return _this.props.form.setFieldsValue((_this$props$form$setF = {}, _this$props$form$setF[item.fieldId] = onChangeValue, _this$props$form$setF));
-                },
-                style: { width: '100%', bottom: '4px' }
-              }, cmptPros)))
-            ),
-            _react2['default'].createElement(
-              _col2['default'],
-              { span: cmptPros && cmptPros.addonAfter ? 3 : 0 },
-              cmptPros ? cmptPros.addonAfter ? _react2['default'].createElement(
-                'span',
-                { className: 'ant-input-group-addon', style: { lineHeight: '30px', borderRadius: '0px 5px 5px 0px' } },
-                cmptPros.addonAfter
-              ) : null : null
-            )
-          ),
+              return _this.props.form.setFieldsValue((_this$props$form$setF = {}, _this$props$form$setF[item.fieldId] = onChangeValue, _this$props$form$setF));
+            }
+          }, cmptPros, {
+            style: { flex: 1 }
+          }))),
+          cmptPros ? cmptPros.addonAfter ? _react2['default'].createElement(
+            'div',
+            { className: (0, _classnames2['default'])(['ant-input-group-addon', 'addonBtns']), style: { borderRadius: '0px 4px 4px 0px' } },
+            cmptPros.addonAfter
+          ) : null : null,
           _react2['default'].createElement(
             'div',
-            { style: { position: 'absolute', left: '100%', zIndex: 2, top: '0px' } },
+            { className: (0, _classnames2['default'])(['inputNumberBtns']) },
             afterBtns
           )
         )
@@ -1302,7 +1360,8 @@ var Easy3wFormPage = function (_Component) {
         onPressEnter: function onPressEnter(e) {
           return _this.numberInputonBlur(e, item);
         },
-        rules: [{ pattern: /^\d+(\.\d+)?$/, message: '数字' }]
+        rules: [{ pattern: /^\d+(\.\d+)?$/, message: '数字' }],
+        className: (0, _classnames2['default'])(['rightText'])
       }, cmptPros));
     }, _this.numberInputonChange = function (e) {
       var value = e.target.value;

package/lib/Easy3wGridSelect/index.js

@@ -74,7 +74,9 @@ var Easy3wGridSelect = function (_Component) {
       })(_react2['default'].createElement(
         _select2['default'],
         (0, _extends3['default'])({
-          style: { minWidth: 100, width: '100%' }
+          style: { minWidth: 100, width: '100%' },
+          showSearch: true // 是否开启搜索
+          , optionFilterProp: 'children' // 搜索时过滤对应的 option 属性，如设置为 children 表示对内嵌内容进行搜索
         }, cmptPros),
         _react2['default'].createElement(
           Option,

package/lib/Easy3wModal/index.js

@@ -122,6 +122,7 @@ var Easy3wModal = function (_Component) {
         footer: btnObj,
         width: width,
         destroyOnClose: true,
+        maskClosable: false,
         style: { top: 20 }
       }, this.props, {
         afterClose: function afterClose() {

package/package.json

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