easy3wmui 0.0.42-beta7 → 0.0.42-beta9

package/assets/index.css

@@ -73,6 +73,7 @@
   -ms-flex-item-align: auto;
       -ms-grid-row-align: auto;
       align-self: auto;
+  line-height: 24px;
 }
 :root:root .adm-form .adm-form-footer {
   padding: 12px;
@@ -185,7 +186,6 @@
   background-repeat: no-repeat;
   background-position: center;
   background-size: 100%;
-  padding: 40px 0 0 0;
 }
 #Easy3wMCard .adm-card {
   padding: 0;
@@ -211,6 +211,9 @@
   border-bottom: var(--border-bottom);
   margin-bottom: 12px;
 }
+#Easy3wMFormPage .adm-form-item-label {
+  line-height: 24px;
+}
 #Easy3wMFormPage .adm-list-item-content-main {
   color: var(--adm-color-text);
   text-align: right;

package/assets/mFormPage.css

@@ -12,6 +12,9 @@
   border-bottom: var(--border-bottom);
   margin-bottom: 12px;
 }
+#Easy3wMFormPage .adm-form-item-label {
+  line-height: 24px;
+}
 #Easy3wMFormPage .adm-list-item-content-main {
   color: var(--adm-color-text);
   text-align: right;

package/assets/mUserLayout.css

@@ -5,5 +5,4 @@
   background-repeat: no-repeat;
   background-position: center;
   background-size: 100%;
-  padding: 40px 0 0 0;
 }

package/lib/Easy3wMLogin/index.js

@@ -117,7 +117,13 @@ var Easy3wMLogin = function (_Component) {
         form = _props.form,
         status = _props.status,
         submitting = _props.submitting,
-        errorMsg = _props.errorMsg;
+        errorMsg = _props.errorMsg,
+        objLoginMethod = _props.objLoginMethod;
+
+    var _ref = objLoginMethod || {},
+        account = _ref.account,
+        phone = _ref.phone;
+
     var visible = this.state.visible;
 
     var errorMsgReal = errorMsg || '账户或密码错误';
@@ -127,9 +133,72 @@ var Easy3wMLogin = function (_Component) {
       _react2['default'].createElement(
         _tabs2['default'],
         { activeKey: 'account', onChange: this.onChange },
-        _react2['default'].createElement(
+        account ? _react2['default'].createElement(
+          Tab,
+          { title: '\u8D26\u53F7\u5BC6\u7801\u767B\u5F55', key: 'account' },
+          _react2['default'].createElement(
+            _form2['default'],
+            {
+              // ref={this.formRef}
+              onFinish: this.submitAccountLogin,
+              form: form,
+              layout: 'horizontal' // 字段与
+              , name: 'login',
+              footer: // 表单尾部的内容，常常用来放置提交按钮
+              _react2['default'].createElement(
+                'div',
+                null,
+                _react2['default'].createElement(
+                  _button2['default'],
+                  { color: 'primary', fill: 'solid', block: true, type: 'primary', htmlType: 'submit' },
+                  '\u767B\u5F55'
+                )
+              )
+            },
+            status === 'error' && submitting === false ? _react2['default'].createElement(
+              FormItem,
+              null,
+              _react2['default'].createElement(
+                'div',
+                { className: 'errorMsgReal' },
+                errorMsgReal
+              )
+            ) : '',
+            _react2['default'].createElement(
+              FormItem,
+              { name: 'userName', required: true },
+              _react2['default'].createElement(_input2['default'], { onClick: this.changePsmode, placeholder: '\u8BF7\u8F93\u5165\u7528\u6237\u540D' })
+            ),
+            _react2['default'].createElement(
+              FormItem,
+              {
+                name: 'password',
+                required: true,
+                extra: _react2['default'].createElement(
+                  _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' })
+            ),
+            _react2['default'].createElement(
+              FormItem,
+              {
+                name: 'piccaptcha',
+                rules: [{ required: true, message: '请输入验证码 不区分大小写' }, { validator: this.checkCaptcha }],
+                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' })
+            )
+          )
+        ) : phone ? _react2['default'].createElement(
           Tab,
-          { title: '\u7528\u6237\u767B\u5F55', key: 'account' },
+          { title: '\u624B\u673A\u9A8C\u8BC1\u7801\u767B\u5F55', key: 'account' },
           _react2['default'].createElement(
             _form2['default'],
             {
@@ -190,7 +259,7 @@ var Easy3wMLogin = function (_Component) {
               _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.42-beta7",
+  "version": "0.0.42-beta9",
   "description": "easy3wmui components for react",
   "keywords": [
     "react",