Merge remote-tracking branch 'origin/master'

xjj

2024-02-27 dbc5fc7f7c8ef73b6b175f6b421b0c64efe89e33

Merge remote-tracking branch 'origin/master'

 zy-asrs-flow/config/config.ts

@@ -135,18 +135,18 @@
   * @doc https://pro.ant.design/zh-cn/docs/openapi/
   */
  openAPI: [
    {
      requestLibPath: "import { request } from '@umijs/max'",
      // 或者使用在线的版本
      // schemaPath: "https://gw.alipayobjects.com/os/antfincdn/M%24jrzTTYJN/oneapi.json"
      schemaPath: join(__dirname, 'oneapi.json'),
      mock: false,
    },
    {
      requestLibPath: "import { request } from '@umijs/max'",
      schemaPath: 'https://gw.alipayobjects.com/os/antfincdn/CA1dOm%2631B/openapi.json',
      projectName: 'swagger',
    },
    // {
    //   requestLibPath: "import { request } from '@umijs/max'",
    //   // 或者使用在线的版本
    //   // schemaPath: "https://gw.alipayobjects.com/os/antfincdn/M%24jrzTTYJN/oneapi.json"
    //   schemaPath: join(__dirname, 'oneapi.json'),
    //   mock: false,
    // },
    // {
    //   requestLibPath: "import { request } from '@umijs/max'",
    //   schemaPath: 'https://gw.alipayobjects.com/os/antfincdn/CA1dOm%2631B/openapi.json',
    //   projectName: 'swagger',
    // },
  ],
  mfsu: {
    strategy: 'normal',

 zy-asrs-flow/src/pages/User/Login/index.jsx

@@ -10,7 +10,7 @@
    ProFormCheckbox,
    ProFormText,
} from '@ant-design/pro-components';
import { Button, Divider, Alert, Tabs, message, theme } from 'antd';
import { Button, Divider, Alert, Tabs, message, theme, Form } from 'antd';
import { useState, useEffect } from 'react';
import { FormattedMessage, history, SelectLang, useIntl, useModel, Helmet } from '@umijs/max';
import { flushSync } from 'react-dom';
@@ -38,15 +38,32 @@
    const { initialState, setInitialState } = useModel('@@initialState');
    const { token } = theme.useToken();

    const [form] = Form.useForm();
    const [loginType, setLoginType] = useState('account');
    const [status, setStatus] = useState(200);
    const [rememberMe, setRememberMe] = useState(true);

    console.log(initialState.memo);
    const [rememberMe, setRememberMe] = useState(() => {
        const storedValue = localStorage.getItem('rememberMe');
        return storedValue !== null ? JSON.parse(storedValue) : true;
    });
    const [rememberData, setRememberData] = useState(() => {
        const storedValue = localStorage.getItem('rememberData');
        return storedValue !== null ? JSON.parse(storedValue) : true;
    });

    useEffect(() => {
        console.log(rememberMe);
        form.setFieldsValue({
            autoLogin: rememberMe
        });
        localStorage.setItem('rememberMe', JSON.stringify(rememberMe));
    }, [rememberMe])

    useEffect(() => {
        form.setFieldsValue({
            username: rememberData.username,
            password: rememberData.password
        });
        localStorage.setItem('rememberData', JSON.stringify(rememberData));
    }, [rememberData])

    const fetchUserInfo = async () => {
        const userInfo = await initialState?.fetchUserInfo?.();
@@ -71,6 +88,13 @@
            })

            if (r.code === 200) {
                localStorage.removeItem("rememberData");
                if (rememberMe) {
                    setRememberData({
                        username: values.username,
                        password: values.password
                    })
                }
                message.success(intl.formatMessage({
                    id: 'pages.login.success',
                    defaultMessage: '登录成功！',
@@ -99,6 +123,7 @@
            }}
        >
            <LoginFormPage
                form={form}
                backgroundImageUrl="https://mdn.alipayobjects.com/huamei_gcee1x/afts/img/A*y0ZTS6WLwvgAAAAAAAAAAAAADml6AQ/fmt.webp"
                logo={logo}
                backgroundVideoUrl="https://gw.alipayobjects.com/v/huamei_gcee1x/afts/video/jXRBRK_VAwoAAAAAAAAAAAAAK4eUAQBr"
@@ -109,9 +134,8 @@
                    backdropFilter: 'blur(4px)',
                }}
                initialValues={{
                    username: 'root',
                    password: '123456',
                    autoLogin: true,
                    // username: 'root',
                    // password: '123456',
                }}
                onFinish={async (values) => {
                    await handleSubmit(values);