From 8910c3a514eca224362ff51c7ec983ec8601655d Mon Sep 17 00:00:00 2001 From: FatttSnake Date: Wed, 20 Dec 2023 17:46:37 +0800 Subject: [PATCH] Rename FitFullScreen to FitFullscreen --- .../common/{FitFullScreen.tsx => FitFullscreen.tsx} | 4 ++-- src/components/common/FullscreenLoadingMask.tsx | 6 +++--- src/components/home/Footer.tsx | 6 +++--- src/pages/SystemFramework.tsx | 6 +++--- src/pages/ToolsFramework.tsx | 6 +++--- src/pages/UserFramework.tsx | 6 +++--- src/pages/home/index.tsx | 4 ++-- src/pages/system/Group.tsx | 6 +++--- src/pages/system/Log.tsx | 6 +++--- src/pages/system/Role.tsx | 6 +++--- src/pages/system/Settings.tsx | 6 +++--- src/pages/system/Statistics.tsx | 8 ++++---- src/pages/system/User.tsx | 6 +++--- src/pages/system/index.tsx | 6 +++--- 14 files changed, 41 insertions(+), 41 deletions(-) rename src/components/common/{FitFullScreen.tsx => FitFullscreen.tsx} (87%) diff --git a/src/components/common/FitFullScreen.tsx b/src/components/common/FitFullscreen.tsx similarity index 87% rename from src/components/common/FitFullScreen.tsx rename to src/components/common/FitFullscreen.tsx index 2c3a49c..09d3658 100644 --- a/src/components/common/FitFullScreen.tsx +++ b/src/components/common/FitFullscreen.tsx @@ -7,7 +7,7 @@ interface FitFullscreenProps backgroundColor?: string } -const FitFullScreen = forwardRef((props, ref) => { +const FitFullscreen = forwardRef((props, ref) => { const { zIndex, backgroundColor, className, style, ..._props } = props return (
((props, ref ) }) -export default FitFullScreen +export default FitFullscreen diff --git a/src/components/common/FullscreenLoadingMask.tsx b/src/components/common/FullscreenLoadingMask.tsx index 4bddf5d..749a4ce 100644 --- a/src/components/common/FullscreenLoadingMask.tsx +++ b/src/components/common/FullscreenLoadingMask.tsx @@ -2,7 +2,7 @@ import React from 'react' import Icon from '@ant-design/icons' import '@/assets/css/components/common/fullscreen-loading-mask.scss' import { COLOR_FONT_MAIN } from '@/constants/common.constants' -import FitFullScreen from '@/components/common/FitFullScreen' +import FitFullscreen from '@/components/common/FitFullscreen' const FullscreenLoadingMask: React.FC = () => { const loadingIcon = ( @@ -16,11 +16,11 @@ const FullscreenLoadingMask: React.FC = () => { ) return ( <> - +
-
+
) } diff --git a/src/components/home/Footer.tsx b/src/components/home/Footer.tsx index 3dee754..1b2641b 100644 --- a/src/components/home/Footer.tsx +++ b/src/components/home/Footer.tsx @@ -2,12 +2,12 @@ import React from 'react' import Icon from '@ant-design/icons' import '@/assets/css/components/home/footer.scss' import FitCenter from '@/components/common/FitCenter' -import FitFullScreen from '@/components/common/FitFullScreen' +import FitFullscreen from '@/components/common/FitFullscreen' const Footer: React.FC = () => { return ( <> - +
@@ -21,7 +21,7 @@ const Footer: React.FC = () => { Mail
-
+
) } diff --git a/src/pages/SystemFramework.tsx b/src/pages/SystemFramework.tsx index baad543..85d7c73 100644 --- a/src/pages/SystemFramework.tsx +++ b/src/pages/SystemFramework.tsx @@ -1,7 +1,7 @@ import React from 'react' import '@/assets/css/pages/system-framework.scss' import { getSystemRouteJson } from '@/router/system' -import FitFullScreen from '@/components/common/FitFullScreen' +import FitFullscreen from '@/components/common/FitFullscreen' import Sidebar from '@/components/common/sidebar' import SidebarItemList from '@/components/common/sidebar/SidebarItemList' import SidebarItem from '@/components/common/sidebar/SidebarItem' @@ -10,7 +10,7 @@ import FullscreenLoadingMask from '@/components/common/FullscreenLoadingMask' const SystemFramework: React.FC = () => { return ( <> - +
@@ -39,7 +39,7 @@ const SystemFramework: React.FC = () => {
-
+
) } diff --git a/src/pages/ToolsFramework.tsx b/src/pages/ToolsFramework.tsx index f1a970b..c80d9df 100644 --- a/src/pages/ToolsFramework.tsx +++ b/src/pages/ToolsFramework.tsx @@ -1,7 +1,7 @@ import React from 'react' import '@/assets/css/pages/tools-framework.scss' import { tools } from '@/router/tools' -import FitFullScreen from '@/components/common/FitFullScreen' +import FitFullscreen from '@/components/common/FitFullscreen' import SidebarScroll, { SidebarScrollElement } from '@/components/common/sidebar/SidebarScroll' import Sidebar from '@/components/common/sidebar' import SidebarItemList from '@/components/common/sidebar/SidebarItemList' @@ -20,7 +20,7 @@ const ToolsFramework: React.FC = () => { return ( <> - +
@@ -74,7 +74,7 @@ const ToolsFramework: React.FC = () => {
-
+
) } diff --git a/src/pages/UserFramework.tsx b/src/pages/UserFramework.tsx index a8b5e4c..12a153f 100644 --- a/src/pages/UserFramework.tsx +++ b/src/pages/UserFramework.tsx @@ -2,7 +2,7 @@ import React from 'react' import '@/assets/css/pages/tools-framework.scss' import user from '@/router/user' import { hasPathPermission } from '@/util/auth' -import FitFullScreen from '@/components/common/FitFullScreen' +import FitFullscreen from '@/components/common/FitFullscreen' import Sidebar from '@/components/common/sidebar' import SidebarItemList from '@/components/common/sidebar/SidebarItemList' import SidebarItem from '@/components/common/sidebar/SidebarItem' @@ -11,7 +11,7 @@ import FullscreenLoadingMask from '@/components/common/FullscreenLoadingMask' const ToolsFramework: React.FC = () => { return ( <> - +
{
-
+
) } diff --git a/src/pages/home/index.tsx b/src/pages/home/index.tsx index fda272d..8c82483 100644 --- a/src/pages/home/index.tsx +++ b/src/pages/home/index.tsx @@ -1,7 +1,7 @@ import React from 'react' import '@/assets/css/components/home/home.scss' import { HomeFrameworkContext } from '@/pages/HomeFramework' -import FitFullScreen from '@/components/common/FitFullScreen' +import FitFullscreen from '@/components/common/FitFullscreen' import Slogan from '@/components/home/Slogan' import OxygenToolbox from '@/components/home/OxygenToolbox' import Indicator from '@/components/common/Indicator' @@ -155,7 +155,7 @@ const Home: React.FC = () => { onKeyDown={handleKeyDown} > {content.map((element, index) => { - return + return })}
diff --git a/src/pages/system/Group.tsx b/src/pages/system/Group.tsx index 3857267..8a3b5a0 100644 --- a/src/pages/system/Group.tsx +++ b/src/pages/system/Group.tsx @@ -23,7 +23,7 @@ import { r_sys_role_get_list } from '@/services/system' import Permission from '@/components/common/Permission' -import FitFullScreen from '@/components/common/FitFullScreen' +import FitFullscreen from '@/components/common/FitFullscreen' import HideScrollbar from '@/components/common/HideScrollbar' import FlexBox from '@/components/common/FlexBox' import Card from '@/components/common/Card' @@ -631,7 +631,7 @@ const Group: React.FC = () => { return ( <> - + { {table} - + { return ( <> - + { {table} - + ) } diff --git a/src/pages/system/Role.tsx b/src/pages/system/Role.tsx index 74c7c0c..bfe58b0 100644 --- a/src/pages/system/Role.tsx +++ b/src/pages/system/Role.tsx @@ -23,7 +23,7 @@ import { r_sys_role_delete_list } from '@/services/system' import Permission from '@/components/common/Permission' -import FitFullScreen from '@/components/common/FitFullScreen' +import FitFullscreen from '@/components/common/FitFullscreen' import HideScrollbar from '@/components/common/HideScrollbar' import FlexBox from '@/components/common/FlexBox' import Card from '@/components/common/Card' @@ -638,7 +638,7 @@ const Role: React.FC = () => { return ( <> - + { {table} - + { const Settings: React.FC = () => { return ( <> - + @@ -206,7 +206,7 @@ const Settings: React.FC = () => { - + ) } diff --git a/src/pages/system/Statistics.tsx b/src/pages/system/Statistics.tsx index 25ff4e7..4cd2fb0 100644 --- a/src/pages/system/Statistics.tsx +++ b/src/pages/system/Statistics.tsx @@ -29,7 +29,7 @@ import { } from '@/services/system' import Card from '@/components/common/Card' import FlexBox from '@/components/common/FlexBox' -import FitFullScreen from '@/components/common/FitFullScreen' +import FitFullscreen from '@/components/common/FitFullscreen' import HideScrollbar from '@/components/common/HideScrollbar' import LoadingMask from '@/components/common/LoadingMask' import Permission from '@/components/common/Permission' @@ -276,7 +276,7 @@ const OnlineInfo: React.FC = () => { 在线用户 - 当前 {currentOnlineCount === -1 ? '获取中...' : currentOnlineCount} + {currentOnlineCount === -1 ? '获取中...' : `当前 ${currentOnlineCount}`} @@ -939,7 +939,7 @@ const StorageInfo: React.FC = () => { const Statistics: React.FC = () => { return ( <> - + @@ -956,7 +956,7 @@ const Statistics: React.FC = () => { - + ) } diff --git a/src/pages/system/User.tsx b/src/pages/system/User.tsx index 10a3dfa..1824abd 100644 --- a/src/pages/system/User.tsx +++ b/src/pages/system/User.tsx @@ -26,7 +26,7 @@ import { } from '@/services/system' import Permission from '@/components/common/Permission' import { r_api_avatar_random_base64 } from '@/services/api/avatar' -import FitFullScreen from '@/components/common/FitFullScreen' +import FitFullscreen from '@/components/common/FitFullscreen' import HideScrollbar from '@/components/common/HideScrollbar' import FlexBox from '@/components/common/FlexBox' import Card from '@/components/common/Card' @@ -998,7 +998,7 @@ const User: React.FC = () => { return ( <> - + { {table} - + ((props) => { const System: React.FC = () => { return ( <> - + @@ -97,7 +97,7 @@ const System: React.FC = () => { - + ) }