From dbc5fc7f7c8ef73b6b175f6b421b0c64efe89e33 Mon Sep 17 00:00:00 2001
From: xjj <xjj@123>
Date: 星期二, 27 二月 2024 13:04:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 zy-asrs-flow/src/pages/User/Login/index.jsx |   40 ++++++++++++++++++++++++++++++++--------
 1 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/zy-asrs-flow/src/pages/User/Login/index.jsx b/zy-asrs-flow/src/pages/User/Login/index.jsx
index d6c982b..6a2f762 100644
--- a/zy-asrs-flow/src/pages/User/Login/index.jsx
+++ b/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);

--
Gitblit v1.9.1