From d835d1b51f832889929cdf69010034a30ef44d02 Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期四, 17 十月 2024 13:57:29 +0800
Subject: [PATCH] #
---
zy-asrs-flow/src/App.jsx | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/zy-asrs-flow/src/App.jsx b/zy-asrs-flow/src/App.jsx
index cc6252a..84866e2 100644
--- a/zy-asrs-flow/src/App.jsx
+++ b/zy-asrs-flow/src/App.jsx
@@ -1,5 +1,5 @@
import React from 'react';
-import { Footer, Question, SelectLang, AvatarDropdown, AvatarName, Brightness, LayoutSwitch } from '@/components';
+import { Footer, Question, SelectLang, AvatarDropdown, AvatarName, Brightness, LayoutSwitch, FullScreen } from '@/components';
import { LinkOutlined } from '@ant-design/icons';
import { SettingDrawer } from '@ant-design/pro-components';
import { history, Link } from '@umijs/max';
@@ -8,7 +8,7 @@
import { getRemoteMenu, getRoutersInfo, getUserInfo, setRemoteMenu, patchRouteWithRemoteMenus } from './services/route';
import { getToken, setToken } from '@/utils/token-util'
import { TOKEN_HEADER_NAME, TOKEN_STORE_NAME } from '@/config/setting';
-import { API_BASE_URL } from '@/config/setting'
+import { API_BASE_URL, API_TIMEOUT } from '@/config/setting'
import { message } from 'antd';
import logo from '../public/img/logo.png'
@@ -85,13 +85,16 @@
// 浼樺厛绾� layout > config > defaultSetting
export const layout = ({ initialState, setInitialState }) => {
const [darkMode, setDarkMode] = React.useState(() => {
- return JSON.parse(localStorage.getItem('darkMode')) || true;
+ const storedValue = localStorage.getItem('darkMode');
+ return storedValue !== null ? JSON.parse(storedValue) : false;
});
const [layoutMode, setLayoutMode] = React.useState(() => {
- return JSON.parse(localStorage.getItem('layoutMode')) || true;
+ const storedValue = localStorage.getItem('layoutMode');
+ return storedValue !== null ? JSON.parse(storedValue) : true;
});
+ const [fullScreen, setFullScreen] = React.useState(false);
React.useEffect(() => {
localStorage.setItem('darkMode', JSON.stringify(darkMode));
@@ -100,10 +103,11 @@
return {
actionsRender: () => [
+ // <Question key="doc" />,
+ <SelectLang key="SelectLang" />,
+ <FullScreen fullScreen={fullScreen} setFullScreen={setFullScreen} />,
<LayoutSwitch layoutMode={layoutMode} setLayoutMode={setLayoutMode} />,
<Brightness darkMode={darkMode} setDarkMode={setDarkMode} />,
- // <Question key="doc" />,
- // <SelectLang key="SelectLang" />
],
avatarProps: {
src: initialState?.currentUser?.avatar,
@@ -227,7 +231,7 @@
export const request = {
baseURL: API_BASE_URL,
...errorConfig,
- timeout: 60000,
+ timeout: API_TIMEOUT * 1000,
// 鍓嶇疆瀹堝崼
requestInterceptors: [
(url, options) => {
--
Gitblit v1.9.1