easy3wmui 0.0.33 → 0.0.35

package/assets/index.css

@@ -275,9 +275,23 @@
   border-top: var(--border-top);
   padding-top: 12px;
 }
+#Easy3wMLogin .adm-input-element {
+  height: 40px;
+  border-radius: 4px;
+  padding: 0 12px;
+}
+#Easy3wMLogin .adm-list-item-content-extra {
+  padding-left: 0;
+  width: 56px;
+}
 #Easy3wMLogin .errorMsgReal {
   background: #fff1f0;
   border: 1px solid #ffa39e;
   padding-top: 3px;
   padding-bottom: 3px;
 }
+#Easy3wMLogin .adm-button {
+  height: 40px;
+  border-left: 0;
+  --adm-button-border-color: #d9d9d9;
+}

package/assets/mLogin.css

@@ -1,6 +1,20 @@
+#Easy3wMLogin .adm-input-element {
+  height: 40px;
+  border-radius: 4px;
+  padding: 0 12px;
+}
+#Easy3wMLogin .adm-list-item-content-extra {
+  padding-left: 0;
+  width: 56px;
+}
 #Easy3wMLogin .errorMsgReal {
   background: #fff1f0;
   border: 1px solid #ffa39e;
   padding-top: 3px;
   padding-bottom: 3px;
 }
+#Easy3wMLogin .adm-button {
+  height: 40px;
+  border-left: 0;
+  --adm-button-border-color: #d9d9d9;
+}

package/lib/Easy3wMLogin/index.js

@@ -38,12 +38,12 @@ var _antdMobile = require('antd-mobile');
 
 var _antdMobileIcons = require('antd-mobile-icons');
 
-var _Easy3wMCaptcha = require('../Easy3wMCaptcha');
-
-var _Easy3wMCaptcha2 = _interopRequireDefault(_Easy3wMCaptcha);
+var _easy3wmui = require('easy3wmui');
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
 
+// import styles from './index.less';
+
 var Tab = _tabs2['default'].Tab;
 
 var FormItem = _form2['default'].Item;
@@ -86,9 +86,11 @@ var Easy3wMLogin = function (_Component) {
       });
     };
 
-    _this.touchSetPassword = function (visible) {
+    _this.touchSetPassword = function () {
+      var visible = _this.state.visible;
+
       _this.setState({
-        visible: visible // 密码显示隐藏
+        visible: !visible // 密码显示隐藏
       });
     };
 
@@ -112,8 +114,6 @@ var Easy3wMLogin = function (_Component) {
 
 
   Easy3wMLogin.prototype.render = function render() {
-    var _this2 = this;
-
     var _props = this.props,
         form = _props.form,
         status = _props.status,
@@ -169,13 +169,13 @@ var Easy3wMLogin = function (_Component) {
                 name: 'password',
                 required: true,
                 extra: _react2['default'].createElement(
-                  'div',
-                  null,
-                  visible ? _react2['default'].createElement(_antdMobileIcons.EyeOutline, { onClick: function onClick() {
-                      return _this2.touchSetPassword(false);
-                    } }) : _react2['default'].createElement(_antdMobileIcons.EyeInvisibleOutline, { onClick: function onClick() {
-                      return _this2.touchSetPassword(true);
-                    } })
+                  _button2['default'],
+                  {
+                    size: 'small',
+                    onClick: this.touchSetPassword,
+                    htmlType: 'button'
+                  },
+                  visible ? _react2['default'].createElement(_antdMobileIcons.EyeOutline, null) : _react2['default'].createElement(_antdMobileIcons.EyeInvisibleOutline, null)
                 )
               },
               _react2['default'].createElement(_input2['default'], { placeholder: '\u8BF7\u8F93\u5165\u5BC6\u7801', type: visible ? 'text' : 'password' })
@@ -185,7 +185,7 @@ var Easy3wMLogin = function (_Component) {
               {
                 name: 'piccaptcha',
                 rules: [{ required: true, message: '请输入验证码 不区分大小写' }, { validator: this.checkCaptcha }],
-                extra: _react2['default'].createElement(_Easy3wMCaptcha2['default'], { touchCaptchaResult: this.touchCaptchaResult })
+                extra: _react2['default'].createElement(_easy3wmui.Easy3wMCaptcha, { touchCaptchaResult: this.touchCaptchaResult })
               },
               _react2['default'].createElement(_input2['default'], { placeholder: '\u8BF7\u8F93\u5165\u9A8C\u8BC1\u7801 \u4E0D\u533A\u5206\u5927\u5C0F\u5199' })
             )

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "easy3wmui",
-  "version": "0.0.33",
+  "version": "0.0.35",
   "description": "easy3wmui components for react",
   "keywords": [
     "react",