支持注册

config/config.ts

@@ -1,22 +1,23 @@
 // https://umijs.org/config/
-import {defineConfig, utils} from 'umi';
+import { defineConfig, utils } from 'umi';
 import defaultSettings from './defaultSettings';
 import proxy from './proxy';
 import webpackPlugin from './plugin.config';
-
-const {winPath} = utils; // preview.pro.ant.design only do not use in your production ;
+const { winPath } = utils; // preview.pro.ant.design only do not use in your production ;
 // preview.pro.ant.design 专用环境变量，请不要在你的项目中使用它。
 
-const {ANT_DESIGN_PRO_ONLY_DO_NOT_USE_IN_YOUR_PRODUCTION, REACT_APP_ENV, GA_KEY} = process.env;
+const { ANT_DESIGN_PRO_ONLY_DO_NOT_USE_IN_YOUR_PRODUCTION, REACT_APP_ENV, GA_KEY } = process.env;
 export default defineConfig({
-
-  history: {type: 'hash'}, // 默认是 browser
+  history: {
+    type: 'hash',
+  },
+  // 默认是 browser
   hash: true,
   antd: {},
   analytics: GA_KEY
     ? {
-      ga: GA_KEY,
-    }
+        ga: GA_KEY,
+      }
     : false,
   dva: {
     hmr: true,
@@ -45,6 +46,12 @@ export default defineConfig({
           path: '/user/login',
           component: './user/login',
         },
+        {
+          name: '注册页',
+          icon: 'smile',
+          path: '/user/register',
+          component: './user/Register',
+        },
       ],
     },
     {
@@ -59,8 +66,7 @@ export default defineConfig({
             {
               path: '/',
               redirect: '/memory',
-            },
-            // {
+            }, // {
             //   path: '/welcome',
             //   name: 'welcome',
             //   icon: 'smile',
@@ -148,7 +154,7 @@ export default defineConfig({
           resourcePath: string;
         },
         _: string,
-        localName: string,
+        localName: string
       ) => {
         if (
           context.resourcePath.includes('node_modules') ||
@@ -177,9 +183,7 @@ export default defineConfig({
     basePath: '/',
   },
   proxy: proxy[REACT_APP_ENV || 'dev'],
-  chainWebpack: webpackPlugin,
-
-  // scripts: [
+  chainWebpack: webpackPlugin, // scripts: [
   //   'https://unpkg.com/react@16.8.6/umd/react.production.min.js',
   //   'https://unpkg.com/react-dom@16.8.6/umd/react-dom.production.min.js',
   //   'https://unpkg.com/bizcharts@3.5.5/umd/BizCharts.min.js',

package.json

@@ -60,6 +60,7 @@
     "lodash": "^4.17.19",
     "moment": "^2.24.0",
     "nice-hooks": "^1.2.1",
+    "nzh": "^1.0.4",
     "omit.js": "^1.0.2",
     "path-to-regexp": "2.4.0",
     "qs": "^6.9.0",

src/pages/UserList/_mock.ts

@@ -51,4 +51,6 @@ function success(req: Request, res: Response, u: string) {
 export default {
   'GET /service/queryList': getModels,
   'POST /service/forceUpdate': success,
+  '/api/user/delete': success,
+  '/api/user/forceUpdatePassword': success,
 };

src/pages/UserList/data.d.ts

@@ -1,13 +1,12 @@
 // 表单
 export interface TableListItem {
   id?: number;
-  userId: number;
-  front: string;
-  back: string;
-  tag: string;
-  period: number;
-  remindTime: Date;
-  updateTime:string;
+  userName: string;
+  gender: string;
+  age: number;
+  phone: string;
+  status: string;
+  roleId: number;
 }
 // 分页参数
 export interface TableListPagination {

src/pages/UserList/index.tsx

@@ -1,13 +1,11 @@
-import {Divider, message, Modal, Tooltip} from 'antd';
+import {Button, Divider, Input, message, Modal, Radio} from 'antd';
 import React, {useRef, useState} from 'react';
 import {PageHeaderWrapper} from '@ant-design/pro-layout';
 import ProTable, {ActionType, ProColumns} from '@ant-design/pro-table';
 import {SorterResult} from 'antd/es/table/interface';
+import {ExclamationCircleOutlined, PlusOutlined} from "@ant-design/icons/lib";
 import {TableListItem} from './data.d';
 import service from './service';
-import UpdateForm from "@/pages/Memory/components/UpdateForm";
-import {getTextFromHtml, minuteToDay} from "@/utils/utils";
-import {ExclamationCircleOutlined} from "@ant-design/icons/lib";
 
 
 /**
@@ -17,28 +15,81 @@ import {ExclamationCircleOutlined} from "@ant-design/icons/lib";
 const handleRemove = async (fields: TableListItem) => {
   const hide = message.loading('正在删除');
   try {
-    await service.delete(fields);
+    const res = await service.delete(fields);
+    if (res.success) {
+      message.success('删除成功，即将刷新');
+    } else {
+      message.error('删除失败，请重试');
+    }
     hide();
-    message.success('删除成功，即将刷新');
-    return true;
+    return res.success;
   } catch (error) {
     hide();
     message.error('删除失败，请重试');
     return false;
   }
 };
+/**
+ * 添加节点
+ * @param fields
+ */
+const handleAdd = async (fields: TableListItem) => {
+  const hide = message.loading('正在添加');
+  try {
+    const res = await service.register({...fields});
+    hide();
+    if (res.success) {
+      message.success('添加成功');
+      return true;
+    }
+    message.error('添加失败请重试！');
+    return false;
 
+  } catch (error) {
+    hide();
+    message.error('添加失败请重试！');
+    return false;
+  }
+};
+
+/**
+ * 更新节点
+ * @param fields
+ */
+const handleUpdate = async (fields: TableListItem) => {
+  const hide = message.loading('正在配置');
+  try {
+    const res = await service.update(fields);
+    hide();
+    if (res.success) {
+      message.success('配置成功');
+      return true;
+    }
+    message.error('配置失败请重试！');
+    return false;
+  } catch (error) {
+    hide();
+    message.error('配置失败请重试！');
+    return false;
+  }
+};
 
 
 const TableList: React.FC<{}> = () => {
   const [sorter, setSorter] = useState<string>('');
   const [modelVisible, setModalVisible] = useState<boolean>(false);
+
   const [formValues, setFormValues] = useState({});
   const actionRef = useRef<ActionType>();
 
-  const { confirm } = Modal;
+  // 重置表单
+  const [resetVisible, setResetVisible] = useState<boolean>(false);
+  const [resetLoading, setResetLoading] = useState<boolean>(false);
+  const [newPassword, setNewPassword] = useState<string>('');
 
-  const deleteMemory = async (record:any) => {
+  const {confirm} = Modal;
+
+  const deleteMemory = async (record: any) => {
     await handleRemove(record);
     if (actionRef.current) {
       actionRef.current.reload();
@@ -48,67 +99,67 @@ const TableList: React.FC<{}> = () => {
 
   const columns: ProColumns<TableListItem>[] = [
     {
-      title: '正面',
-      dataIndex: 'front',
-      width: 150,
-      hideInSearch: true,
-      render: (text, row) => {
-        const show = getTextFromHtml(row.front);
-        return (<>
-          <Tooltip title={show}>
-            <span>{show.substring(0, 10)}</span>
-          </Tooltip>
-        </>);
-      }
+      title: '用户名',
+      dataIndex: 'userName',
+      width: 100,
+      hideInSearch: false,
     },
     {
-      title: '背面',
-      dataIndex: 'back',
-      width: 150,
+      title: '性别',
+      dataIndex: 'gender',
+      width: 50,
       hideInSearch: true,
-      render: (text, row) => {
-        const show = getTextFromHtml(row.back);
-        return (<>
-          <Tooltip title={show}>
-            <span>{show.substring(0, 10)}</span>
-          </Tooltip>
-        </>);
-      }
+      renderFormItem: () => {
+        return (
+          <Radio.Group>
+            <Radio value="0">女</Radio>
+            <Radio value='1'>男</Radio>
+          </Radio.Group>
+        );
+      },
+      valueEnum: {
+        '0': {text: '女'},
+        '1': {text: '男'}
+      },
     },
     {
-      title: '间隔时间',
-      dataIndex: 'period',
-      width: 100,
+      title: '年龄',
+      dataIndex: 'age',
+      width: 50,
       hideInSearch: true,
-      hideInForm: true,
-      render: (text, row) => {
-        return (<>
-          <span>{minuteToDay(row.period)}</span>
-        </>);
-      }
     },
     {
-      title: '提醒时间',
-      dataIndex: 'remindTime',
-      valueType: 'dateTime',
-      width: 150,
+      title: '手机号',
+      dataIndex: 'phone',
+      width: 80,
       hideInSearch: true,
-      hideInForm: true,
-      sorter:true
     },
     {
-      title: '更新时间',
-      dataIndex: 'updateTime',
-      valueType: 'dateTime',
-      width: 150,
-      hideInSearch: true,
-      hideInForm: true,
-      sorter:true
+      title: '状态',
+      dataIndex: 'status',
+      width: 80,
+    },
+    {
+      title: '角色',
+      dataIndex: 'roleId',
+      width: 80,
+      renderFormItem: () => {
+        return (
+          <Radio.Group>
+            <Radio value={1}>管理员</Radio>
+            <Radio value={2}>普通用户</Radio>
+          </Radio.Group>
+        );
+      },
+      valueEnum: {
+        1: {text: '管理员'},
+        2: {text: '普通用户'}
+      },
     },
     {
       title: '操作',
       dataIndex: 'option',
-      width: 100,
+      width: 150,
       valueType: 'option',
       // eslint-disable-next-line @typescript-eslint/no-unused-vars
       render: (_, record, index, action) => (
@@ -126,7 +177,7 @@ const TableList: React.FC<{}> = () => {
             onClick={async () => {
               confirm({
                 title: '确定删除吗?',
-                icon: <ExclamationCircleOutlined />,
+                icon: <ExclamationCircleOutlined/>,
                 content: '删除后无法恢复',
                 okText: '确定',
                 okType: 'danger',
@@ -142,6 +193,15 @@ const TableList: React.FC<{}> = () => {
           >
             删除
           </a>
+          <Divider type="vertical"/>
+          <a
+            onClick={() => {
+              setFormValues(record);
+              setResetVisible(true);
+            }}
+          >
+            重置密码
+          </a>
         </>
       ),
     },
@@ -150,7 +210,7 @@ const TableList: React.FC<{}> = () => {
   return (
     <PageHeaderWrapper title={false}>
       <ProTable<TableListItem>
-        search={false}
+        // search={false}
         headerTitle="查询表格"
         actionRef={actionRef}
         rowKey="id"
@@ -160,6 +220,7 @@ const TableList: React.FC<{}> = () => {
             setSorter(`${sorterResult.field}_${sorterResult.order}`);
           }
         }}
+
         pagination={{
           defaultPageSize: 10,
         }}
@@ -178,18 +239,57 @@ const TableList: React.FC<{}> = () => {
         columns={columns}
         rowSelection={{}}
       />
-      {modelVisible ? (
-        <UpdateForm
-          onCancel={(refresh) => {
-            setModalVisible(false);
-            if (refresh && actionRef.current) {
-              actionRef.current.reload();
+
+      <Modal
+        title="重置密码"
+        visible={resetVisible}
+        onOk={ async ()=>{
+          setResetLoading(true);
+          let res = await service.forceUpdatePassword({user_Id: formValues['id'], newPassword: newPassword});
+          if (res.success) {
+            message.success("修改成功");
+            setResetVisible(false);
+          } else {
+            message.error("修改失败");
+          }
+          setResetLoading(false);
+        }}
+        confirmLoading={resetLoading}
+        onCancel={()=>{setResetVisible(false)}}
+      >
+        <Input placeholder="新密码" value={newPassword} onChange={(e)=>setNewPassword(e.target.value)} />
+      </Modal>
+
+      <Modal
+        destroyOnClose
+        title={'id' in formValues ? '编辑' : '新建'}
+        visible={modelVisible}
+        onCancel={() => setModalVisible(false)}
+        footer={null}
+      >
+        <ProTable<TableListItem, TableListItem>
+          onSubmit={async (value) => {
+            let success = false;
+            if ('id' in formValues) {
+              value['id'] = formValues['id']
+              success = await handleUpdate(value);
+            } else {
+              success = await handleAdd(value);
+            }
+            if (success) {
+              setModalVisible(false);
+              if (actionRef.current) {
+                actionRef.current.reload();
+              }
             }
           }}
-          modalVisible={modelVisible}
-          values={formValues}>
-        </UpdateForm>
-      ) : null}
+          rowKey="id"
+          type="form"
+          columns={columns}
+          rowSelection={{}}
+          form={{initialValues: formValues}}
+        />
+      </Modal>
 
     </PageHeaderWrapper>
   );

src/pages/UserList/service.ts

@@ -1,7 +1,10 @@
 import api from '@/utils/api';
 
 export default {
-  queryList: api.get('/api/memory/queryList'),
-  update: api.post('/api/memory/update'),
-  delete: api.post('/api/memory/delete'),
+  queryList: api.get('/api/user/queryList'),
+  update: api.post('/api/user/update'),
+  delete: api.post('/api/user/delete'),
+  register: api.post('/api/user/register'),
+  forceUpdatePassword: api.get('/api/user/forceUpdatePassword'),
+  nameExist: api.get('/api/user/nameExist'),
 };

src/pages/user/Register/_mock.ts

@@ -0,0 +1,8 @@
+// eslint-disable-next-line import/no-extraneous-dependencies
+import { Request, Response } from 'express';
+
+export default {
+  'POST  /api/register': (_: Request, res: Response) => {
+    res.send({ status: 'ok', currentAuthority: 'user' });
+  },
+};

src/pages/user/Register/index.tsx

@@ -0,0 +1,274 @@
+import {Button, Form, Input, message, Popover, Progress, Select} from 'antd';
+import React, {FC, useEffect, useState} from 'react';
+import {connect, Dispatch, formatMessage, FormattedMessage, history, Link} from 'umi';
+
+import {StateType} from './model';
+import styles from './style.less';
+
+const FormItem = Form.Item;
+const { Option } = Select;
+const InputGroup = Input.Group;
+
+const passwordStatusMap = {
+  ok: (
+    <div className={styles.success}>
+      <FormattedMessage id="userandregister.strength.strong" />
+    </div>
+  ),
+  pass: (
+    <div className={styles.warning}>
+      <FormattedMessage id="userandregister.strength.medium" />
+    </div>
+  ),
+  poor: (
+    <div className={styles.error}>
+      <FormattedMessage id="userandregister.strength.short" />
+    </div>
+  ),
+};
+
+const passwordProgressMap: {
+  ok: 'success';
+  pass: 'normal';
+  poor: 'exception';
+} = {
+  ok: 'success',
+  pass: 'normal',
+  poor: 'exception',
+};
+
+interface RegisterProps {
+  dispatch: Dispatch<any>;
+  userAndRegister: StateType;
+  submitting: boolean;
+}
+
+export interface UserRegisterParams {
+  userName: string;
+  password: string;
+  confirm: string;
+  mobile: string;
+  captcha: string;
+  prefix: string;
+}
+
+const Register: FC<RegisterProps> = ({
+  submitting,
+  dispatch,
+  userAndRegister,
+}) => {
+  const [visible, setvisible]: [boolean, any] = useState(false);
+  const [popover, setpopover]: [boolean, any] = useState(false);
+  const confirmDirty = false;
+  let interval: number | undefined;
+  const [form] = Form.useForm();
+  useEffect(() => {
+    if (!userAndRegister) {
+      return;
+    }
+    const account = form.getFieldValue('userName');
+    if (userAndRegister.status) {
+      message.success('注册成功！');
+
+      history.push({
+        pathname: '/user/login',
+        state: {
+          account,
+        },
+      });
+    } else {
+      message.info("请输入正确信息");
+    }
+  }, [userAndRegister]);
+  useEffect(
+    () => () => {
+      clearInterval(interval);
+    },
+    [],
+  );
+
+  const getPasswordStatus = () => {
+    const value = form.getFieldValue('password');
+    if (value && value.length > 9) {
+      return 'ok';
+    }
+    if (value && value.length > 5) {
+      return 'pass';
+    }
+    return 'poor';
+  };
+  const onFinish = (values: { [key: string]: any }) => {
+    dispatch({
+      type: 'userAndRegister/submit',
+      payload: {
+        ...values,
+      },
+    });
+  };
+  const checkConfirm = (_: any, value: string) => {
+    const promise = Promise;
+    if (value && value !== form.getFieldValue('password')) {
+      return promise.reject(formatMessage({ id: 'userandregister.password.twice' }));
+    }
+    return promise.resolve();
+  };
+  const checkPassword = (_: any, value: string) => {
+    const promise = Promise;
+    // 没有值的情况
+    if (!value) {
+      setvisible(!!value);
+      return promise.reject(formatMessage({ id: 'userandregister.password.required' }));
+    }
+    // 有值的情况
+    if (!visible) {
+      setvisible(!!value);
+    }
+    setpopover(!popover);
+    if (value.length < 6) {
+      return promise.reject('');
+    }
+    if (value && confirmDirty) {
+      form.validateFields(['confirm']);
+    }
+    return promise.resolve();
+  };
+
+  const renderPasswordProgress = () => {
+    const value = form.getFieldValue('password');
+    const passwordStatus = getPasswordStatus();
+    return value && value.length ? (
+      <div className={styles[`progress-${passwordStatus}`]}>
+        <Progress
+          status={passwordProgressMap[passwordStatus]}
+          className={styles.progress}
+          strokeWidth={6}
+          percent={value.length * 10 > 100 ? 100 : value.length * 10}
+          showInfo={false}
+        />
+      </div>
+    ) : null;
+  };
+
+  return (
+    <div className={styles.main}>
+      <h3>
+        <FormattedMessage id="userandregister.register.register" />
+      </h3>
+      <Form form={form} name="UserRegister" onFinish={onFinish}>
+        <FormItem
+          name="userName"
+          rules={[
+            {
+              required: true,
+              message: "用户名不能为空",
+            },
+          ]}
+        >
+          <Input size="large" placeholder="用户名" />
+        </FormItem>
+        <FormItem
+          name="registerCode"
+          rules={[
+            {
+              required: true,
+              message: "邀请码不能为空",
+            },
+          ]}
+        >
+          <Input size="large" placeholder="邀请码" />
+        </FormItem>
+        <Popover
+          getPopupContainer={(node) => {
+            if (node && node.parentNode) {
+              return node.parentNode as HTMLElement;
+            }
+            return node;
+          }}
+          content={
+            visible && (
+              <div style={{ padding: '4px 0' }}>
+                {passwordStatusMap[getPasswordStatus()]}
+                {renderPasswordProgress()}
+                <div style={{ marginTop: 10 }}>
+                  <FormattedMessage id="userandregister.strength.msg" />
+                </div>
+              </div>
+            )
+          }
+          overlayStyle={{ width: 240 }}
+          placement="right"
+          visible={visible}
+        >
+          <FormItem
+            name="password"
+            className={
+              form.getFieldValue('password') &&
+              form.getFieldValue('password').length > 0 &&
+              styles.password
+            }
+            rules={[
+              {
+                validator: checkPassword,
+              },
+            ]}
+          >
+            <Input
+              size="large"
+              type="password"
+              placeholder={formatMessage({ id: 'userandregister.password.placeholder' })}
+            />
+          </FormItem>
+        </Popover>
+        <FormItem
+          name="confirm"
+          rules={[
+            {
+              required: true,
+              message: formatMessage({ id: 'userandregister.confirm-password.required' }),
+            },
+            {
+              validator: checkConfirm,
+            },
+          ]}
+        >
+          <Input
+            size="large"
+            type="password"
+            placeholder={formatMessage({ id: 'userandregister.confirm-password.placeholder' })}
+          />
+        </FormItem>
+
+        <FormItem>
+          <Button
+            size="large"
+            loading={submitting}
+            className={styles.submit}
+            type="primary"
+            htmlType="submit"
+          >
+            <FormattedMessage id="userandregister.register.register" />
+          </Button>
+          <Link className={styles.login} to="/user/login">
+            <FormattedMessage id="userandregister.register.sign-in" />
+          </Link>
+        </FormItem>
+      </Form>
+    </div>
+  );
+};
+export default connect(
+  ({
+    userAndRegister,
+    loading,
+  }: {
+    userAndRegister: StateType;
+    loading: {
+      effects: {
+        [key: string]: boolean;
+      };
+    };
+  }) => ({
+    userAndRegister,
+    submitting: loading.effects['userAndRegister/submit'],
+  }),
+)(Register);

src/pages/user/Register/locales/en-US.ts

@@ -0,0 +1,78 @@
+export default {
+  'userandregister.login.userName': 'userName',
+  'userandregister.login.password': 'password',
+  'userandregister.login.message-invalid-credentials':
+    'Invalid username or password（admin/ant.design）',
+  'userandregister.login.message-invalid-verification-code': 'Invalid verification code',
+  'userandregister.login.tab-login-credentials': 'Credentials',
+  'userandregister.login.tab-login-mobile': 'Mobile number',
+  'userandregister.login.remember-me': 'Remember me',
+  'userandregister.login.forgot-password': 'Forgot your password?',
+  'userandregister.login.sign-in-with': 'Sign in with',
+  'userandregister.login.signup': 'Sign up',
+  'userandregister.login.login': 'Login',
+  'userandregister.register.register': 'Register',
+  'userandregister.register.get-verification-code': 'Get code',
+  'userandregister.register.sign-in': 'Already have an account?',
+  'userandregister.register-result.msg': 'Account：registered at {email}',
+  'userandregister.register-result.activation-email':
+    'The activation email has been sent to your email address and is valid for 24 hours. Please log in to the email in time and click on the link in the email to activate the account.',
+  'userandregister.register-result.back-home': 'Back to home',
+  'userandregister.register-result.view-mailbox': 'View mailbox',
+  'userandregister.email.required': 'Please enter your email!',
+  'userandregister.email.wrong-format': 'The email address is in the wrong format!',
+  'userandregister.userName.required': 'Please enter your userName!',
+  'userandregister.password.required': 'Please enter your password!',
+  'userandregister.password.twice': 'The passwords entered twice do not match!',
+  'userandregister.strength.msg':
+    "Please enter at least 6 characters and don't use passwords that are easy to guess.",
+  'userandregister.strength.strong': 'Strength: strong',
+  'userandregister.strength.medium': 'Strength: medium',
+  'userandregister.strength.short': 'Strength: too short',
+  'userandregister.confirm-password.required': 'Please confirm your password!',
+  'userandregister.phone-number.required': 'Please enter your phone number!',
+  'userandregister.phone-number.wrong-format': 'Malformed phone number!',
+  'userandregister.verification-code.required': 'Please enter the verification code!',
+  'userandregister.title.required': 'Please enter a title',
+  'userandregister.date.required': 'Please select the start and end date',
+  'userandregister.goal.required': 'Please enter a description of the goal',
+  'userandregister.standard.required': 'Please enter a metric',
+  'userandregister.form.get-captcha': 'Get Captcha',
+  'userandregister.captcha.second': 'sec',
+  'userandregister.form.optional': ' (optional) ',
+  'userandregister.form.submit': 'Submit',
+  'userandregister.form.save': 'Save',
+  'userandregister.email.placeholder': 'Email',
+  'userandregister.password.placeholder': 'Password',
+  'userandregister.confirm-password.placeholder': 'Confirm password',
+  'userandregister.phone-number.placeholder': 'Phone number',
+  'userandregister.verification-code.placeholder': 'Verification code',
+  'userandregister.title.label': 'Title',
+  'userandregister.title.placeholder': 'Give the target a name',
+  'userandregister.date.label': 'Start and end date',
+  'userandregister.placeholder.start': 'Start date',
+  'userandregister.placeholder.end': 'End date',
+  'userandregister.goal.label': 'Goal description',
+  'userandregister.goal.placeholder': 'Please enter your work goals',
+  'userandregister.standard.label': 'Metrics',
+  'userandregister.standard.placeholder': 'Please enter a metric',
+  'userandregister.client.label': 'Client',
+  'userandregister.label.tooltip': 'Target service object',
+  'userandregister.client.placeholder':
+    'Please describe your customer service, internal customers directly @ Name / job number',
+  'userandregister.invites.label': 'Inviting critics',
+  'userandregister.invites.placeholder':
+    'Please direct @ Name / job number, you can invite up to 5 people',
+  'userandregister.weight.label': 'Weight',
+  'userandregister.weight.placeholder': 'Please enter weight',
+  'userandregister.public.label': 'Target disclosure',
+  'userandregister.label.help': 'Customers and invitees are shared by default',
+  'userandregister.radio.public': 'Public',
+  'userandregister.radio.partially-public': 'Partially public',
+  'userandregister.radio.private': 'Private',
+  'userandregister.publicUsers.placeholder': 'Open to',
+  'userandregister.option.A': 'Colleague A',
+  'userandregister.option.B': 'Colleague B',
+  'userandregister.option.C': 'Colleague C',
+  'userandregister.navBar.lang': 'Languages',
+};

src/pages/user/Register/locales/zh-CN.ts

@@ -0,0 +1,74 @@
+export default {
+  'userandregister.login.userName': '用户名',
+  'userandregister.login.password': '密码',
+  'userandregister.login.message-invalid-credentials': '账户或密码错误（admin/ant.design）',
+  'userandregister.login.message-invalid-verification-code': '验证码错误',
+  'userandregister.login.tab-login-credentials': '账户密码登录',
+  'userandregister.login.tab-login-mobile': '手机号登录',
+  'userandregister.login.remember-me': '自动登录',
+  'userandregister.login.forgot-password': '忘记密码',
+  'userandregister.login.sign-in-with': '其他登录方式',
+  'userandregister.login.signup': '注册账户',
+  'userandregister.login.login': '登录',
+  'userandregister.register.register': '注册',
+  'userandregister.register.get-verification-code': '获取验证码',
+  'userandregister.register.sign-in': '使用已有账户登录',
+  'userandregister.register-result.msg': '你的账户：{email} 注册成功',
+  'userandregister.register-result.activation-email':
+    '激活邮件已发送到你的邮箱中，邮件有效期为24小时。请及时登录邮箱，点击邮件中的链接激活帐户。',
+  'userandregister.register-result.back-home': '返回首页',
+  'userandregister.register-result.view-mailbox': '查看邮箱',
+  'userandregister.email.required': '请输入邮箱地址！',
+  'userandregister.email.wrong-format': '邮箱地址格式错误！',
+  'userandregister.userName.required': '请输入用户名!',
+  'userandregister.password.required': '请输入密码！',
+  'userandregister.password.twice': '两次输入的密码不匹配!',
+  'userandregister.strength.msg': '请至少输入 6 个字符。请不要使用容易被猜到的密码。',
+  'userandregister.strength.strong': '强度：强',
+  'userandregister.strength.medium': '强度：中',
+  'userandregister.strength.short': '强度：太短',
+  'userandregister.confirm-password.required': '请确认密码！',
+  'userandregister.phone-number.required': '请输入手机号！',
+  'userandregister.phone-number.wrong-format': '手机号格式错误！',
+  'userandregister.verification-code.required': '请输入验证码！',
+  'userandregister.title.required': '请输入标题',
+  'userandregister.date.required': '请选择起止日期',
+  'userandregister.goal.required': '请输入目标描述',
+  'userandregister.standard.required': '请输入衡量标准',
+  'userandregister.form.get-captcha': '获取验证码',
+  'userandregister.captcha.second': '秒',
+  'userandregister.form.optional': '（选填）',
+  'userandregister.form.submit': '提交',
+  'userandregister.form.save': '保存',
+  'userandregister.email.placeholder': '邮箱',
+  'userandregister.password.placeholder': '至少6位密码，区分大小写',
+  'userandregister.confirm-password.placeholder': '确认密码',
+  'userandregister.phone-number.placeholder': '手机号',
+  'userandregister.verification-code.placeholder': '验证码',
+  'userandregister.title.label': '标题',
+  'userandregister.title.placeholder': '给目标起个名字',
+  'userandregister.date.label': '起止日期',
+  'userandregister.placeholder.start': '开始日期',
+  'userandregister.placeholder.end': '结束日期',
+  'userandregister.goal.label': '目标描述',
+  'userandregister.goal.placeholder': '请输入你的阶段性工作目标',
+  'userandregister.standard.label': '衡量标准',
+  'userandregister.standard.placeholder': '请输入衡量标准',
+  'userandregister.client.label': '客户',
+  'userandregister.label.tooltip': '目标的服务对象',
+  'userandregister.client.placeholder': '请描述你服务的客户，内部客户直接 @姓名／工号',
+  'userandregister.invites.label': '邀评人',
+  'userandregister.invites.placeholder': '请直接 @姓名／工号，最多可邀请 5 人',
+  'userandregister.weight.label': '权重',
+  'userandregister.weight.placeholder': '请输入',
+  'userandregister.public.label': '目标公开',
+  'userandregister.label.help': '客户、邀评人默认被分享',
+  'userandregister.radio.public': '公开',
+  'userandregister.radio.partially-public': '部分公开',
+  'userandregister.radio.private': '不公开',
+  'userandregister.publicUsers.placeholder': '公开给',
+  'userandregister.option.A': '同事甲',
+  'userandregister.option.B': '同事乙',
+  'userandregister.option.C': '同事丙',
+  'userandregister.navBar.lang': '语言',
+};

src/pages/user/Register/locales/zh-TW.ts

@@ -0,0 +1,74 @@
+export default {
+  'userandregister.login.userName': '賬戶',
+  'userandregister.login.password': '密碼',
+  'userandregister.login.message-invalid-credentials': '賬戶或密碼錯誤（admin/ant.design）',
+  'userandregister.login.message-invalid-verification-code': '驗證碼錯誤',
+  'userandregister.login.tab-login-credentials': '賬戶密碼登錄',
+  'userandregister.login.tab-login-mobile': '手機號登錄',
+  'userandregister.login.remember-me': '自動登錄',
+  'userandregister.login.forgot-password': '忘記密碼',
+  'userandregister.login.sign-in-with': '其他登錄方式',
+  'userandregister.login.signup': '註冊賬戶',
+  'userandregister.login.login': '登錄',
+  'userandregister.register.register': '註冊',
+  'userandregister.register.get-verification-code': '獲取驗證碼',
+  'userandregister.register.sign-in': '使用已有賬戶登錄',
+  'userandregister.register-result.msg': '妳的賬戶：{email} 註冊成功',
+  'userandregister.register-result.activation-email':
+    '激活郵件已發送到妳的郵箱中，郵件有效期為24小時。請及時登錄郵箱，點擊郵件中的鏈接激活帳戶。',
+  'userandregister.register-result.back-home': '返回首頁',
+  'userandregister.register-result.view-mailbox': '查看郵箱',
+  'userandregister.email.required': '請輸入郵箱地址！',
+  'userandregister.email.wrong-format': '郵箱地址格式錯誤！',
+  'userandregister.userName.required': '請輸入賬戶!',
+  'userandregister.password.required': '請輸入密碼！',
+  'userandregister.password.twice': '兩次輸入的密碼不匹配!',
+  'userandregister.strength.msg': '請至少輸入 6 個字符。請不要使用容易被猜到的密碼。',
+  'userandregister.strength.strong': '強度：強',
+  'userandregister.strength.medium': '強度：中',
+  'userandregister.strength.short': '強度：太短',
+  'userandregister.confirm-password.required': '請確認密碼！',
+  'userandregister.phone-number.required': '請輸入手機號！',
+  'userandregister.phone-number.wrong-format': '手機號格式錯誤！',
+  'userandregister.verification-code.required': '請輸入驗證碼！',
+  'userandregister.title.required': '請輸入標題',
+  'userandregister.date.required': '請選擇起止日期',
+  'userandregister.goal.required': '請輸入目標描述',
+  'userandregister.standard.required': '請輸入衡量標淮',
+  'userandregister.form.get-captcha': '獲取驗證碼',
+  'userandregister.captcha.second': '秒',
+  'userandregister.form.optional': '（選填）',
+  'userandregister.form.submit': '提交',
+  'userandregister.form.save': '保存',
+  'userandregister.email.placeholder': '郵箱',
+  'userandregister.password.placeholder': '至少6位密碼，區分大小寫',
+  'userandregister.confirm-password.placeholder': '確認密碼',
+  'userandregister.phone-number.placeholder': '手機號',
+  'userandregister.verification-code.placeholder': '驗證碼',
+  'userandregister.title.label': '標題',
+  'userandregister.title.placeholder': '給目標起個名字',
+  'userandregister.date.label': '起止日期',
+  'userandregister.placeholder.start': '開始日期',
+  'userandregister.placeholder.end': '結束日期',
+  'userandregister.goal.label': '目標描述',
+  'userandregister.goal.placeholder': '請輸入妳的階段性工作目標',
+  'userandregister.standard.label': '衡量標淮',
+  'userandregister.standard.placeholder': '請輸入衡量標淮',
+  'userandregister.client.label': '客戶',
+  'userandregister.label.tooltip': '目標的服務對象',
+  'userandregister.client.placeholder': '請描述妳服務的客戶，內部客戶直接 @姓名／工號',
+  'userandregister.invites.label': '邀評人',
+  'userandregister.invites.placeholder': '請直接 @姓名／工號，最多可邀請 5 人',
+  'userandregister.weight.label': '權重',
+  'userandregister.weight.placeholder': '請輸入',
+  'userandregister.public.label': '目標公開',
+  'userandregister.label.help': '客戶、邀評人默認被分享',
+  'userandregister.radio.public': '公開',
+  'userandregister.radio.partially-public': '部分公開',
+  'userandregister.radio.private': '不公開',
+  'userandregister.publicUsers.placeholder': '公開給',
+  'userandregister.option.A': '同事甲',
+  'userandregister.option.B': '同事乙',
+  'userandregister.option.C': '同事丙',
+  'userandregister.navBar.lang': '語言',
+};

src/pages/user/Register/model.ts

@@ -0,0 +1,48 @@
+import { Effect, Reducer } from 'umi';
+
+import { register } from './service';
+
+export interface StateType {
+  status?: true | false;
+  currentAuthority?: '1' | '2' | '3';
+}
+
+export interface ModelType {
+  namespace: string;
+  state: StateType;
+  effects: {
+    submit: Effect;
+  };
+  reducers: {
+    registerHandle: Reducer<StateType>;
+  };
+}
+
+const Model: ModelType = {
+  namespace: 'userAndRegister',
+
+  state: {
+    status: undefined,
+  },
+
+  effects: {
+    *submit({ payload }, { call, put }) {
+      const response = yield call(register, payload);
+      yield put({
+        type: 'registerHandle',
+        payload: response,
+      });
+    },
+  },
+
+  reducers: {
+    registerHandle(state, { payload }) {
+      return {
+        ...state,
+        status: payload.success,
+      };
+    },
+  },
+};
+
+export default Model;

src/pages/user/Register/service.ts

@@ -0,0 +1,9 @@
+import request from 'umi-request';
+import { UserRegisterParams } from './index';
+
+export async function register(params: UserRegisterParams) {
+  return request('/api/user/register', {
+    method: 'POST',
+    data: params,
+  });
+}

src/pages/user/login/index.tsx

@@ -1,6 +1,6 @@
 import {Alert} from 'antd';
 import React, {useState} from 'react';
-import {connect, Dispatch} from 'umi';
+import {connect, Dispatch, Link} from 'umi';
 import {StateType} from '@/models/login';
 import {LoginParamsType} from '@/services/login';
 import {ConnectState} from '@/models/connect';
@@ -123,17 +123,17 @@ const Login: React.FC<LoginProps> = (props) => {
 
 
         <Submit loading={submitting}>登录</Submit>
-        {/*
+
         <div className={styles.other}>
-          其他登录方式
-          <AlipayCircleOutlined className={styles.icon}/>
-          <TaobaoCircleOutlined className={styles.icon}/>
-          <WeiboCircleOutlined className={styles.icon}/>
+          {/*其他登录方式*/}
+          {/*<AlipayCircleOutlined className={styles.icon}/>*/}
+          {/*<TaobaoCircleOutlined className={styles.icon}/>*/}
+          {/*<WeiboCircleOutlined className={styles.icon}/>*/}
           <Link className={styles.register} to="/user/register">
             注册账户
           </Link>
         </div>
-        */}
+
 
       </LoginFrom>
     </div>