diff --git a/.umirc.js b/.umirc.js
index 85f1038f928e8e09395f08268816b551e3e96b19..75ec0fc91214c0f490a31f8e6dd71856d8abe7d1 100644
--- a/.umirc.js
+++ b/.umirc.js
@@ -3,7 +3,7 @@ export default {
     [
       'umi-plugin-block-dev',
       {
-        layout: 'ant-design-pro',
+        layout: 'ant-design-pro-user',
         menu: {
           name: '主页',
           icon: 'home',
diff --git a/UserLogin/src/_mock.js b/UserLogin/src/_mock.ts
similarity index 100%
rename from UserLogin/src/_mock.js
rename to UserLogin/src/_mock.ts
diff --git a/UserLogin/src/components/Login/LoginContext.tsx b/UserLogin/src/components/Login/LoginContext.tsx
new file mode 100644
index 0000000000000000000000000000000000000000..6e46556ff6479612000b2cd0fc5a1290f05aacab
--- /dev/null
+++ b/UserLogin/src/components/Login/LoginContext.tsx
@@ -0,0 +1,13 @@
+import { createContext } from 'react';
+
+export interface ILoginContext {
+  tabUtil?: {
+    addTab: (id: string) => void;
+    removeTab: (id: string) => void;
+  };
+  updateActive?: (activeItem: { [key: string]: string } | string) => void;
+}
+
+const LoginContext: React.Context<ILoginContext> = createContext({});
+
+export default LoginContext;
diff --git a/UserLogin/src/components/Login/LoginItem.tsx b/UserLogin/src/components/Login/LoginItem.tsx
new file mode 100644
index 0000000000000000000000000000000000000000..e3694eff163aa91b6dde13c947eaf16b0b9b16f2
--- /dev/null
+++ b/UserLogin/src/components/Login/LoginItem.tsx
@@ -0,0 +1,189 @@
+import React, { Component } from 'react';
+import { Form, Input, Button, Row, Col } from 'antd';
+import omit from 'omit.js';
+import styles from './index.less';
+import ItemMap from './map';
+import LoginContext, { ILoginContext } from './loginContext';
+import { FormComponentProps } from 'antd/lib/form';
+
+type Omit<T, K extends keyof T> = Pick<T, Exclude<keyof T, K>>;
+
+export type WrappedLoginItemProps = Omit<LoginItemProps, 'form' | 'type' | 'updateActive'>;
+export type LoginItemKeyType = keyof typeof ItemMap;
+export type LoginItemType = { [K in keyof typeof ItemMap]: React.FC<WrappedLoginItemProps> };
+
+export interface LoginItemProps extends FormComponentProps {
+  name?: string;
+  rules?: any[];
+  style?: React.CSSProperties;
+  onGetCaptcha?: (event?: MouseEvent) => void | Promise<any> | false;
+  placeholder?: string;
+  buttonText?: React.ReactNode;
+  onPressEnter?: (e: any) => void;
+  countDown?: number;
+  getCaptchaButtonText?: string;
+  getCaptchaSecondText?: string;
+  updateActive: ILoginContext['updateActive'];
+  type: string;
+  defaultValue?: string;
+  customProps?: { [key: string]: any };
+  onChange?: (e: any) => void;
+}
+
+interface LoginItemState {
+  count: number;
+}
+
+const FormItem = Form.Item;
+
+class WrapFormItem extends Component<LoginItemProps, LoginItemState> {
+  static defaultProps = {
+    getCaptchaButtonText: 'captcha',
+    getCaptchaSecondText: 'second',
+  };
+
+  constructor(props: LoginItemProps) {
+    super(props);
+    this.state = {
+      count: 0,
+    };
+  }
+  interval: number | undefined;
+  componentDidMount() {
+    const { updateActive, name = '' } = this.props;
+    if (updateActive) {
+      updateActive(name);
+    }
+  }
+
+  componentWillUnmount() {
+    clearInterval(this.interval);
+  }
+
+  onGetCaptcha = () => {
+    const { onGetCaptcha } = this.props;
+    const result = onGetCaptcha ? onGetCaptcha() : null;
+    if (result === false) {
+      return;
+    }
+    if (result instanceof Promise) {
+      result.then(this.runGetCaptchaCountDown);
+    } else {
+      this.runGetCaptchaCountDown();
+    }
+  };
+
+  getFormItemOptions = ({ onChange, defaultValue, customProps = {}, rules }: LoginItemProps) => {
+    const options: {
+      rules?: Array<any>;
+      onChange?: LoginItemProps['onChange'];
+      initialValue?: LoginItemProps['defaultValue'];
+    } = {
+      rules: rules || customProps.rules,
+    };
+    if (onChange) {
+      options.onChange = onChange;
+    }
+    if (defaultValue) {
+      options.initialValue = defaultValue;
+    }
+    return options;
+  };
+
+  runGetCaptchaCountDown = () => {
+    const { countDown } = this.props;
+    let count = countDown || 59;
+    this.setState({ count });
+    this.interval = window.setInterval(() => {
+      count -= 1;
+      this.setState({ count });
+      if (count === 0) {
+        clearInterval(this.interval);
+      }
+    }, 1000);
+  };
+
+  render() {
+    const { count } = this.state;
+
+    // 这么写是为了防止restProps中 带入 onChange, defaultValue, rules props
+    const {
+      onChange,
+      customProps,
+      defaultValue,
+      rules,
+      name,
+      getCaptchaButtonText,
+      getCaptchaSecondText,
+      updateActive,
+      type,
+      form,
+      ...restProps
+    } = this.props;
+    if (!name) {
+      console.warn('name is required!');
+      return null;
+    }
+    console.log(form);
+    if (!form) {
+      return null;
+    }
+    const { getFieldDecorator } = form;
+    // get getFieldDecorator props
+    const options = this.getFormItemOptions(this.props);
+
+    const otherProps = restProps || {};
+    if (type === 'Captcha') {
+      const inputProps = omit(otherProps, ['onGetCaptcha', 'countDown']);
+      return (
+        <FormItem>
+          <Row gutter={8}>
+            <Col span={16}>
+              {getFieldDecorator(name, options)(<Input {...customProps} {...inputProps} />)}
+            </Col>
+            <Col span={8}>
+              <Button
+                disabled={!!count}
+                className={styles.getCaptcha}
+                size="large"
+                onClick={this.onGetCaptcha}
+              >
+                {count ? `${count} ${getCaptchaSecondText}` : getCaptchaButtonText}
+              </Button>
+            </Col>
+          </Row>
+        </FormItem>
+      );
+    }
+    return (
+      <FormItem>
+        {getFieldDecorator(name, options)(<Input {...customProps} {...otherProps} />)}
+      </FormItem>
+    );
+  }
+}
+
+const LoginItem: Partial<LoginItemType> = {};
+
+Object.keys(ItemMap).forEach(key => {
+  const item = ItemMap[key];
+  LoginItem[key] = (props: LoginItemProps) => (
+    <LoginContext.Consumer>
+      {context => {
+        console.log(context);
+        return (
+          <WrapFormItem
+            customProps={item.props}
+            rules={item.rules}
+            {...props}
+            type={key}
+            {...context}
+            updateActive={context.updateActive}
+          />
+        );
+      }}
+    </LoginContext.Consumer>
+  );
+});
+
+export default LoginItem as LoginItemType;
diff --git a/UserLogin/src/components/Login/LoginSubmit.tsx b/UserLogin/src/components/Login/LoginSubmit.tsx
new file mode 100644
index 0000000000000000000000000000000000000000..2a6c246cc07517a5034536fc863e6a032506c87c
--- /dev/null
+++ b/UserLogin/src/components/Login/LoginSubmit.tsx
@@ -0,0 +1,21 @@
+import React from 'react';
+import classNames from 'classnames';
+import { Button, Form } from 'antd';
+import styles from './index.less';
+import { ButtonProps } from 'antd/lib/button';
+const FormItem = Form.Item;
+
+interface LoginSubmitProps extends ButtonProps {
+  className: string;
+}
+
+const LoginSubmit: React.SFC<LoginSubmitProps> = ({ className, ...rest }) => {
+  const clsString = classNames(styles.submit, className);
+  return (
+    <FormItem>
+      <Button size="large" className={clsString} type="primary" htmlType="submit" {...rest} />
+    </FormItem>
+  );
+};
+
+export default LoginSubmit;
diff --git a/UserLogin/src/components/Login/LoginTab.tsx b/UserLogin/src/components/Login/LoginTab.tsx
new file mode 100644
index 0000000000000000000000000000000000000000..90743f08cdd12b5dbe12527f67c20704d21b995a
--- /dev/null
+++ b/UserLogin/src/components/Login/LoginTab.tsx
@@ -0,0 +1,46 @@
+import React, { Component } from 'react';
+import { Tabs } from 'antd';
+import { TabPaneProps } from 'antd/lib/tabs';
+import LoginContext, { ILoginContext } from './LoginContext';
+
+const { TabPane } = Tabs;
+
+const generateId = (() => {
+  let i = 0;
+  return (prefix = '') => {
+    i += 1;
+    return `${prefix}${i}`;
+  };
+})();
+
+interface LoginTabProps extends TabPaneProps {
+  tabUtil: ILoginContext['tabUtil'];
+}
+
+class LoginTab extends Component<LoginTabProps> {
+  constructor(props: LoginTabProps) {
+    super(props);
+    this.uniqueId = generateId('login-tab-');
+  }
+  uniqueId: string;
+  componentDidMount() {
+    const { tabUtil } = this.props;
+    tabUtil && tabUtil.addTab(this.uniqueId);
+  }
+
+  render() {
+    const { children } = this.props;
+    return <TabPane {...this.props}>{children}</TabPane>;
+  }
+}
+
+const wrapContext = (props: TabPaneProps) => (
+  <LoginContext.Consumer>
+    {value => <LoginTab tabUtil={value.tabUtil} {...props} />}
+  </LoginContext.Consumer>
+);
+
+// 标志位 用来判断是不是自定义组件
+wrapContext.typeName = 'LoginTab';
+
+export default wrapContext;
diff --git a/UserLogin/src/components/Login/index.less b/UserLogin/src/components/Login/index.less
new file mode 100644
index 0000000000000000000000000000000000000000..242e067569f995f371fe169fc2b58f93a4a08a86
--- /dev/null
+++ b/UserLogin/src/components/Login/index.less
@@ -0,0 +1,53 @@
+@import '~antd/lib/style/themes/default.less';
+
+.login {
+  :global {
+    .ant-tabs .ant-tabs-bar {
+      margin-bottom: 24px;
+      text-align: center;
+      border-bottom: 0;
+    }
+
+    .ant-form-item {
+      margin: 0 2px 24px;
+    }
+  }
+
+  .getCaptcha {
+    display: block;
+    width: 100%;
+  }
+
+  .icon {
+    margin-left: 16px;
+    color: rgba(0, 0, 0, 0.2);
+    font-size: 24px;
+    vertical-align: middle;
+    cursor: pointer;
+    transition: color 0.3s;
+
+    &:hover {
+      color: @primary-color;
+    }
+  }
+
+  .other {
+    margin-top: 24px;
+    line-height: 22px;
+    text-align: left;
+
+    .register {
+      float: right;
+    }
+  }
+
+  .prefixIcon {
+    color: @disabled-color;
+    font-size: @font-size-base;
+  }
+
+  .submit {
+    width: 100%;
+    margin-top: 24px;
+  }
+}
diff --git a/UserLogin/src/components/Login/index.tsx b/UserLogin/src/components/Login/index.tsx
new file mode 100644
index 0000000000000000000000000000000000000000..8ff29d165380812d763688eb2c7af5ece0b3e53b
--- /dev/null
+++ b/UserLogin/src/components/Login/index.tsx
@@ -0,0 +1,152 @@
+import React, { Component } from 'react';
+import { Form, Tabs } from 'antd';
+import classNames from 'classnames';
+import LoginItem, { LoginItemType, LoginItemProps } from './LoginItem';
+import LoginTab from './LoginTab';
+import styles from './index.less';
+import LoginContext, { ILoginContext } from './LoginContext';
+import { FormComponentProps } from 'antd/lib/form';
+import LoginSubmit from './LoginSubmit';
+
+export interface LoginProps extends FormComponentProps {
+  defaultActiveKey?: string;
+  onTabChange?: (key: string) => void;
+  style?: React.CSSProperties;
+  onSubmit?: (error: any, values: any) => void;
+  className?: string;
+  children: React.ReactElement<LoginTab>[];
+}
+
+interface LoginState {
+  tabs?: string[];
+  type?: string;
+  active?: { [key: string]: Array<any> };
+}
+
+class Login extends Component<LoginProps, LoginState> {
+  public static Tab = LoginTab;
+  public static Submit = LoginSubmit;
+  public static UserName: React.FunctionComponent<LoginItemProps>;
+  public static Password: React.FunctionComponent<LoginItemProps>;
+  public static Mobile: React.FunctionComponent<LoginItemProps>;
+  public static Captcha: React.FunctionComponent<LoginItemProps>;
+  static defaultProps = {
+    className: '',
+    defaultActiveKey: '',
+    onTabChange: () => {},
+    onSubmit: () => {},
+  };
+
+  constructor(props: LoginProps) {
+    super(props);
+    this.state = {
+      type: props.defaultActiveKey,
+      tabs: [],
+      active: {},
+    };
+  }
+
+  onSwitch = (type: string) => {
+    this.setState(
+      {
+        type,
+      },
+      () => {
+        const { onTabChange } = this.props;
+        if (onTabChange) {
+          onTabChange(type);
+        }
+      }
+    );
+  };
+
+  getContext: () => ILoginContext = () => {
+    const { form } = this.props;
+    const { tabs = [] } = this.state;
+    return {
+      tabUtil: {
+        addTab: id => {
+          this.setState({
+            tabs: [...tabs, id],
+          });
+        },
+        removeTab: id => {
+          this.setState({
+            tabs: tabs.filter(currentId => currentId !== id),
+          });
+        },
+      },
+      form: { ...form },
+      updateActive: activeItem => {
+        const { type = '', active = {} } = this.state;
+        if (active[type]) {
+          active[type].push(activeItem);
+        } else {
+          active[type] = [activeItem];
+        }
+        this.setState({
+          active,
+        });
+      },
+    };
+  };
+
+  handleSubmit = (e: React.FormEvent) => {
+    e.preventDefault();
+    const { active = {}, type = '' } = this.state;
+    const { form, onSubmit } = this.props;
+    const activeFields = active[type] || [];
+    form.validateFields(activeFields, { force: true }, (err, values) => {
+      onSubmit && onSubmit(err, values);
+    });
+  };
+
+  render() {
+    const { className, children } = this.props;
+    const { type, tabs = [] } = this.state;
+    const TabChildren: React.ReactComponentElement<LoginTab>[] = [];
+    const otherChildren: React.ReactElement<any>[] = [];
+    React.Children.forEach(
+      children,
+      (child: React.ReactComponentElement<LoginTab> | React.ReactElement<any>) => {
+        if (!child) {
+          return;
+        }
+        if (child.type.typeName === 'LoginTab') {
+          TabChildren.push(child);
+        } else {
+          otherChildren.push(child);
+        }
+      }
+    );
+    console.log(this.getContext());
+    return (
+      <LoginContext.Provider value={this.getContext()}>
+        <div className={classNames(className, styles.login)}>
+          {tabs.length ? (
+            <React.Fragment>
+              <Form onSubmit={this.handleSubmit}>
+                <Tabs
+                  animated={false}
+                  className={styles.tabs}
+                  activeKey={type}
+                  onChange={this.onSwitch}
+                >
+                  {TabChildren}
+                </Tabs>
+                {otherChildren}
+              </Form>
+            </React.Fragment>
+          ) : (
+            children
+          )}
+        </div>
+      </LoginContext.Provider>
+    );
+  }
+}
+(Object.keys(LoginItem) as Array<keyof LoginItemType>).forEach(item => {
+  Login[item] = LoginItem[item];
+});
+
+export default Form.create()(Login);
diff --git a/UserLogin/src/components/Login/map.tsx b/UserLogin/src/components/Login/map.tsx
new file mode 100644
index 0000000000000000000000000000000000000000..dfa88199875ab0079636c8ccfc8f3037fc7eab99
--- /dev/null
+++ b/UserLogin/src/components/Login/map.tsx
@@ -0,0 +1,65 @@
+import React from 'react';
+import { Icon } from 'antd';
+import styles from './index.less';
+
+export default {
+  UserName: {
+    props: {
+      size: 'large',
+      id: 'userName',
+      prefix: <Icon type="user" className={styles.prefixIcon} />,
+      placeholder: 'admin',
+    },
+    rules: [
+      {
+        required: true,
+        message: 'Please enter username!',
+      },
+    ],
+  },
+  Password: {
+    props: {
+      size: 'large',
+      prefix: <Icon type="lock" className={styles.prefixIcon} />,
+      type: 'password',
+      id: 'password',
+      placeholder: '888888',
+    },
+    rules: [
+      {
+        required: true,
+        message: 'Please enter password!',
+      },
+    ],
+  },
+  Mobile: {
+    props: {
+      size: 'large',
+      prefix: <Icon type="mobile" className={styles.prefixIcon} />,
+      placeholder: 'mobile number',
+    },
+    rules: [
+      {
+        required: true,
+        message: 'Please enter mobile number!',
+      },
+      {
+        pattern: /^1\d{10}$/,
+        message: 'Wrong mobile number format!',
+      },
+    ],
+  },
+  Captcha: {
+    props: {
+      size: 'large',
+      prefix: <Icon type="mail" className={styles.prefixIcon} />,
+      placeholder: 'captcha',
+    },
+    rules: [
+      {
+        required: true,
+        message: 'Please enter Captcha!',
+      },
+    ],
+  },
+};
diff --git a/UserLogin/src/index.js b/UserLogin/src/index.tsx
similarity index 97%
rename from UserLogin/src/index.js
rename to UserLogin/src/index.tsx
index b255a8bac104fa697b280e1720738fc06ee5a1d2..cfcc0b8e774f6cb4754f46a0a374e43337d1bf55 100644
--- a/UserLogin/src/index.js
+++ b/UserLogin/src/index.tsx
@@ -3,9 +3,8 @@ import { connect } from 'dva';
 import { formatMessage, FormattedMessage } from 'umi-plugin-react/locale';
 import Link from 'umi/link';
 import { Checkbox, Alert, Icon } from 'antd';
-import { Login } from 'ant-design-pro';
+import Login from './components/Login';
 import styles from './style.less';
-
 const { Tab, UserName, Password, Mobile, Captcha, Submit } = Login;
 
 @connect(({ BLOCK_NAME_CAMEL_CASE, loading }) => ({
@@ -21,7 +20,7 @@ class LoginPage extends Component {
   onTabChange = type => {
     this.setState({ type });
   };
-
+  loginForm: loginForm;
   onGetCaptcha = () =>
     new Promise((resolve, reject) => {
       this.loginForm.validateFields(['mobile'], {}, (err, values) => {
@@ -93,7 +92,7 @@ class LoginPage extends Component {
                   message: formatMessage({ id: 'BLOCK_NAME.userName.required' }),
                 },
               ]}
-            />
+            />{' '}
             <Password
               name="password"
               placeholder={`${formatMessage({ id: 'BLOCK_NAME.login.password' })}: ant.design`}
@@ -113,7 +112,7 @@ class LoginPage extends Component {
               this.renderMessage(
                 formatMessage({ id: 'BLOCK_NAME.login.message-invalid-verification-code' })
               )}
-            <Mobile
+            {/* <Mobile
               name="mobile"
               placeholder={formatMessage({ id: 'BLOCK_NAME.phone-number.placeholder' })}
               rules={[
@@ -140,7 +139,7 @@ class LoginPage extends Component {
                   message: formatMessage({ id: 'BLOCK_NAME.verification-code.required' }),
                 },
               ]}
-            />
+            /> */}
           </Tab>
           <div>
             <Checkbox checked={autoLogin} onChange={this.changeAutoLogin}>
diff --git a/UserLogin/src/locales/en-US.js b/UserLogin/src/locales/en-US.ts
similarity index 100%
rename from UserLogin/src/locales/en-US.js
rename to UserLogin/src/locales/en-US.ts
diff --git a/UserLogin/src/locales/zh-CN.js b/UserLogin/src/locales/zh-CN.ts
similarity index 100%
rename from UserLogin/src/locales/zh-CN.js
rename to UserLogin/src/locales/zh-CN.ts
diff --git a/UserLogin/src/locales/zh-TW.js b/UserLogin/src/locales/zh-TW.ts
similarity index 100%
rename from UserLogin/src/locales/zh-TW.js
rename to UserLogin/src/locales/zh-TW.ts
diff --git a/UserLogin/src/model.js b/UserLogin/src/model.ts
similarity index 91%
rename from UserLogin/src/model.js
rename to UserLogin/src/model.ts
index 12af13ab1f22b8aa28102b6503ce688b96c614a4..80d73caa4d5c290400a6ad4e01bf0f0ae2845386 100644
--- a/UserLogin/src/model.js
+++ b/UserLogin/src/model.ts
@@ -1,7 +1,5 @@
 import { routerRedux } from 'dva/router';
 import { getPageQuery } from './utils/utils';
-import { setAuthority } from './utils/authority';
-import { reloadAuthorized } from './utils/Authorized';
 import { fakeAccountLogin, getFakeCaptcha } from './service';
 
 export default {
@@ -20,7 +18,6 @@ export default {
       });
       // Login successfully
       if (response.status === 'ok') {
-        reloadAuthorized();
         const urlParams = new URL(window.location.href);
         const params = getPageQuery();
         let { redirect } = params;
diff --git a/UserLogin/src/service.js b/UserLogin/src/service.ts
similarity index 100%
rename from UserLogin/src/service.js
rename to UserLogin/src/service.ts
diff --git a/UserLogin/src/utils/Authorized.js b/UserLogin/src/utils/Authorized.js
deleted file mode 100644
index 25948912b62f33f71f2ccbec1cea3668cefe827f..0000000000000000000000000000000000000000
--- a/UserLogin/src/utils/Authorized.js
+++ /dev/null
@@ -1,12 +0,0 @@
-import RenderAuthorized from 'ant-design-pro/lib/Authorized';
-import { getAuthority } from './authority';
-
-let Authorized = RenderAuthorized(getAuthority()); // eslint-disable-line
-
-// Reload the rights component
-const reloadAuthorized = () => {
-  Authorized = RenderAuthorized(getAuthority());
-};
-
-export { reloadAuthorized };
-export default Authorized;
diff --git a/UserLogin/src/utils/authority.js b/UserLogin/src/utils/authority.js
deleted file mode 100644
index 3d2e7b34961a0b6fdf2a705d040f9726d9981065..0000000000000000000000000000000000000000
--- a/UserLogin/src/utils/authority.js
+++ /dev/null
@@ -1,22 +0,0 @@
-// use localStorage to store the authority info, which might be sent from server in actual project.
-export function getAuthority(str) {
-  // return localStorage.getItem('antd-pro-authority') || ['admin', 'user'];
-  const authorityString =
-    typeof str === 'undefined' ? localStorage.getItem('antd-pro-authority') : str;
-  // authorityString could be admin, "admin", ["admin"]
-  let authority;
-  try {
-    authority = JSON.parse(authorityString);
-  } catch (e) {
-    authority = authorityString;
-  }
-  if (typeof authority === 'string') {
-    return [authority];
-  }
-  return authority || ['admin'];
-}
-
-export function setAuthority(authority) {
-  const proAuthority = typeof authority === 'string' ? [authority] : authority;
-  return localStorage.setItem('antd-pro-authority', JSON.stringify(proAuthority));
-}
diff --git a/package.json b/package.json
index 11aadd64d8db8da1027c00e2fd1c7254e6a870ea..a40dfa0583e0f2cf2a32f81d96aaa05a52d2df12 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "private": true,
   "scripts": {
-    "dev": "cross-env PAGES_PATH='TableList/src' umi dev",
+    "dev": "cross-env PAGES_PATH='UserLogin/src' umi dev",
     "lint:style": "stylelint \"src/**/*.less\" --syntax less",
     "lint": "eslint --ext .js src mock tests && npm run lint:style",
     "lint:fix": "eslint --fix --ext .js src mock tests && npm run lint:style",