Optimize file name

src/pages/Sign/index.tsx

@@ -4,10 +4,10 @@ import { useUpdatedEffect } from '@/util/hooks'
 import FitFullscreen from '@/components/common/FitFullscreen'
 import FitCenter from '@/components/common/FitCenter'
 import FlexBox from '@/components/common/FlexBox'
-import SignUp from '@/pages/sign_/SignUp'
-import Verify from '@/pages/sign_/Verify'
-import Forget from '@/pages/sign_/Forget'
-import SignIn from '@/pages/sign_/SignIn'
+import SignUp from '@/pages/Sign/SignUp'
+import Verify from '@/pages/Sign/Verify'
+import Forget from '@/pages/Sign/Forget'
+import SignIn from '@/pages/Sign/SignIn'
 
 const Sign: React.FC = () => {
     const lastPage = useRef('none')

src/pages/System/Settings/Base.tsx

@@ -2,9 +2,9 @@ import React from 'react'
 import { useUpdatedEffect } from '@/util/hooks'
 import { hasPermission } from '@/util/auth'
 import { r_sys_settings_base_get, r_sys_settings_base_update } from '@/services/system'
-import { SettingsCard } from '@/pages/system_/settings_'
+import { SettingsCard } from '@/pages/System/Settings'
 
-const BaseSettings: React.FC = () => {
+const Base: React.FC = () => {
     const [baseForm] = AntdForm.useForm<BaseSettingsParam>()
     const baseFormValues = AntdForm.useWatch([], baseForm)
     const [loading, setLoading] = useState(false)
@@ -78,4 +78,4 @@ const BaseSettings: React.FC = () => {
     )
 }
 
-export default BaseSettings
+export default Base

src/pages/System/Settings/Mail.tsx

@@ -7,9 +7,9 @@ import {
     r_sys_settings_mail_send,
     r_sys_settings_mail_update
 } from '@/services/system'
-import { SettingsCard } from '@/pages/system_/settings_'
+import { SettingsCard } from '@/pages/System/Settings'
 
-const MailSettings: React.FC = () => {
+const Mail: React.FC = () => {
     const [modal, contextHolder] = AntdModal.useModal()
     const [mailForm] = AntdForm.useForm<MailSettingsParam>()
     const mailFormValues = AntdForm.useWatch([], mailForm)
@@ -152,4 +152,4 @@ const MailSettings: React.FC = () => {
     )
 }
 
-export default MailSettings
+export default Mail

src/pages/System/Settings/SensitiveWord.tsx

@@ -8,9 +8,9 @@ import {
     r_sys_settings_sensitive_get,
     r_sys_settings_sensitive_update
 } from '@/services/system'
-import { SettingsCard } from '@/pages/system_/settings_'
+import { SettingsCard } from '@/pages/System/Settings'
 
-const SensitiveWordSettings: React.FC = () => {
+const SensitiveWord: React.FC = () => {
     const [dataSource, setDataSource] = useState<SensitiveWordVo[]>()
     const [targetKeys, setTargetKeys] = useState<string[]>([])
     const [selectedKeys, setSelectedKeys] = useState<string[]>([])
@@ -160,4 +160,4 @@ const SensitiveWordSettings: React.FC = () => {
     )
 }
 
-export default SensitiveWordSettings
+export default SensitiveWord

src/pages/System/Settings/index.tsx

@@ -7,9 +7,9 @@ import Card from '@/components/common/Card'
 import FlexBox from '@/components/common/FlexBox'
 import LoadingMask from '@/components/common/LoadingMask'
 import Permission from '@/components/common/Permission'
-import BaseSettings from '@/pages/system_/settings_/BaseSettings'
-import MailSettings from '@/pages/system_/settings_/MailSettings'
-import SensitiveWordSettings from '@/pages/system_/settings_/SensitiveWordSettings'
+import Base from '@/pages/System/Settings/Base'
+import Mail from '@/pages/System/Settings/Mail'
+import SensitiveWord from '@/pages/System/Settings/SensitiveWord'
 
 interface SettingsCardProps extends React.PropsWithChildren {
     icon: IconComponent
@@ -58,15 +58,15 @@ const Settings: React.FC = () => {
                     <FlexBox direction={'horizontal'} className={'root-content'}>
                         <FlexBox className={'root-col'}>
                             <Permission operationCode={'system:settings:query:base'}>
-                                <BaseSettings />
+                                <Base />
                             </Permission>
                             <Permission operationCode={'system:settings:query:sensitive'}>
-                                <SensitiveWordSettings />
+                                <SensitiveWord />
                             </Permission>
                         </FlexBox>
                         <FlexBox className={'root-col'}>
                             <Permission operationCode={'system:settings:query:mail'}>
-                                <MailSettings />
+                                <Mail />
                             </Permission>
                         </FlexBox>
                     </FlexBox>

src/pages/System/Statistics/ActiveInfo.tsx

@@ -5,8 +5,8 @@ import { useUpdatedEffect } from '@/util/hooks'
 import { getTimesBetweenTwoTimes } from '@/util/datetime'
 import { r_sys_statistics_active } from '@/services/system'
 import FlexBox from '@/components/common/FlexBox'
-import { getTooltipTimeFormatter, lineEChartsBaseOption } from '@/pages/system_/statistics_/shared'
-import { CommonCard } from '@/pages/system_/statistics_'
+import { getTooltipTimeFormatter, lineEChartsBaseOption } from '@/pages/System/Statistics/shared'
+import { CommonCard } from '@/pages/System/Statistics'
 
 const ActiveInfo: React.FC = () => {
     const activeInfoDivRef = useRef<HTMLDivElement>(null)

src/pages/System/Statistics/CPUInfo.tsx

@@ -8,8 +8,8 @@ import {
     barDefaultSeriesOption,
     barEChartsBaseOption,
     EChartsOption
-} from '@/pages/system_/statistics_/shared'
-import { CommonCard } from '@/pages/system_/statistics_'
+} from '@/pages/System/Statistics/shared'
+import { CommonCard } from '@/pages/System/Statistics'
 
 const CPUInfo: React.FC = () => {
     const keyDivRef = useRef<HTMLDivElement>(null)

src/pages/System/Statistics/HardwareInfo.tsx

@@ -2,7 +2,7 @@ import React from 'react'
 import { useUpdatedEffect } from '@/util/hooks'
 import { r_sys_statistics_hardware } from '@/services/system'
 import FlexBox from '@/components/common/FlexBox'
-import { CommonCard } from '@/pages/system_/statistics_'
+import { CommonCard } from '@/pages/System/Statistics'
 
 const HardwareInfo: React.FC = () => {
     const [hardwareInfoData, setHardwareInfoData] = useState<HardwareInfoVo>()

src/pages/System/Statistics/OnlineInfo.tsx

@@ -5,8 +5,8 @@ import { useUpdatedEffect } from '@/util/hooks'
 import { getTimesBetweenTwoTimes } from '@/util/datetime'
 import { r_sys_statistics_online } from '@/services/system'
 import FlexBox from '@/components/common/FlexBox'
-import { getTooltipTimeFormatter, lineEChartsBaseOption } from '@/pages/system_/statistics_/shared'
-import { CommonCard } from '@/pages/system_/statistics_'
+import { getTooltipTimeFormatter, lineEChartsBaseOption } from '@/pages/System/Statistics/shared'
+import { CommonCard } from '@/pages/System/Statistics'
 
 const OnlineInfo: React.FC = () => {
     const onlineInfoDivRef = useRef<HTMLDivElement>(null)

src/pages/System/Statistics/SoftwareInfo.tsx

@@ -3,7 +3,7 @@ import { useUpdatedEffect } from '@/util/hooks'
 import { utcToLocalTime } from '@/util/datetime'
 import { r_sys_statistics_software } from '@/services/system'
 import FlexBox from '@/components/common/FlexBox'
-import { CommonCard } from '@/pages/system_/statistics_'
+import { CommonCard } from '@/pages/System/Statistics'
 
 const SoftwareInfo: React.FC = () => {
     const [softwareInfoData, setSoftwareInfoData] = useState<SoftwareInfoVo>()

src/pages/System/Statistics/StorageInfo.tsx

@@ -9,8 +9,8 @@ import {
     barDefaultSeriesOption,
     barEChartsBaseOption,
     EChartsOption
-} from '@/pages/system_/statistics_/shared'
-import { CommonCard } from '@/pages/system_/statistics_'
+} from '@/pages/System/Statistics/shared'
+import { CommonCard } from '@/pages/System/Statistics'
 
 const StorageInfo: React.FC = () => {
     const keyDivRef = useRef<HTMLDivElement>(null)

src/pages/System/Statistics/index.tsx

@@ -7,12 +7,12 @@ import FitFullscreen from '@/components/common/FitFullscreen'
 import HideScrollbar from '@/components/common/HideScrollbar'
 import LoadingMask from '@/components/common/LoadingMask'
 import Permission from '@/components/common/Permission'
-import OnlineInfo from '@/pages/system_/statistics_/OnlineInfo'
-import ActiveInfo from '@/pages/system_/statistics_/ActiveInfo'
-import SoftwareInfo from '@/pages/system_/statistics_/SoftwareInfo'
-import HardwareInfo from '@/pages/system_/statistics_/HardwareInfo'
-import CPUInfo from '@/pages/system_/statistics_/CPUInfo'
-import StorageInfo from '@/pages/system_/statistics_/StorageInfo'
+import OnlineInfo from '@/pages/System/Statistics/OnlineInfo'
+import ActiveInfo from '@/pages/System/Statistics/ActiveInfo'
+import SoftwareInfo from '@/pages/System/Statistics/SoftwareInfo'
+import HardwareInfo from '@/pages/System/Statistics/HardwareInfo'
+import CPUInfo from '@/pages/System/Statistics/CPUInfo'
+import StorageInfo from '@/pages/System/Statistics/StorageInfo'
 
 interface CommonCardProps extends React.PropsWithChildren {
     icon: IconComponent

src/pages/SystemFramework.tsx

@@ -2,9 +2,7 @@ import React from 'react'
 import '@/assets/css/pages/system-framework.scss'
 import { getSystemRouteJson } from '@/router/system'
 import FitFullscreen from '@/components/common/FitFullscreen'
-import Sidebar from 'src/components/common/sidebar_'
-import SidebarItemList from '@/components/common/sidebar_/SidebarItemList'
-import SidebarItem from '@/components/common/sidebar_/SidebarItem'
+import Sidebar from '@/components/common/Sidebar'
 import FullscreenLoadingMask from '@/components/common/FullscreenLoadingMask'
 
 const SystemFramework: React.FC = () => {
@@ -13,10 +11,10 @@ const SystemFramework: React.FC = () => {
             <FitFullscreen data-component={'system-framework'} className={'flex-horizontal'}>
                 <div className={'left-panel'}>
                     <Sidebar title={'系统配置'}>
-                        <SidebarItemList>
+                        <Sidebar.ItemList>
                             {getSystemRouteJson().map((value) => {
                                 return value.menu ? (
-                                    <SidebarItem
+                                    <Sidebar.Item
                                         end={value.id === 'system' ? true : undefined}
                                         path={value.absolutePath}
                                         icon={value.icon}
@@ -25,7 +23,7 @@ const SystemFramework: React.FC = () => {
                                     />
                                 ) : undefined
                             })}
-                        </SidebarItemList>
+                        </Sidebar.ItemList>
                     </Sidebar>
                 </div>
                 <div className={'right-panel'}>

src/pages/ToolsFramework.tsx

@@ -2,11 +2,8 @@ import React from 'react'
 import '@/assets/css/pages/tools-framework.scss'
 import { tools } from '@/router/tools'
 import FitFullscreen from '@/components/common/FitFullscreen'
-import SidebarScroll, { SidebarScrollElement } from '@/components/common/sidebar_/SidebarScroll'
-import Sidebar from 'src/components/common/sidebar_'
-import SidebarItemList from '@/components/common/sidebar_/SidebarItemList'
-import SidebarItem from '@/components/common/sidebar_/SidebarItem'
-import SidebarSeparate from '@/components/common/sidebar_/SidebarSeparate'
+import Sidebar from '@/components/common/Sidebar'
+import { SidebarScrollElement } from '@/components/common/Sidebar/Scroll'
 import FullscreenLoadingMask from '@/components/common/FullscreenLoadingMask'
 
 const ToolsFramework: React.FC = () => {
@@ -23,23 +20,23 @@ const ToolsFramework: React.FC = () => {
             <FitFullscreen data-component={'tools-framework'} className={'flex-horizontal'}>
                 <div className={'left-panel'}>
                     <Sidebar title={'氧工具'} onSidebarSwitch={handleOnSidebarSwitch}>
-                        <SidebarItemList>
-                            <SidebarItem end path={''} icon={tools[0].icon} text={tools[0].name} />
-                            <SidebarItem
+                        <Sidebar.ItemList>
+                            <Sidebar.Item end path={''} icon={tools[0].icon} text={tools[0].name} />
+                            <Sidebar.Item
                                 end
                                 path={'all'}
                                 icon={tools[1].icon}
                                 text={tools[1].name}
                             />
-                        </SidebarItemList>
-                        <SidebarSeparate style={{ marginBottom: 0 }} />
-                        <SidebarScroll ref={sidebarScrollRef}>
-                            <SidebarItemList>
+                        </Sidebar.ItemList>
+                        <Sidebar.Separate style={{ marginBottom: 0 }} />
+                        <Sidebar.Scroll ref={sidebarScrollRef}>
+                            <Sidebar.ItemList>
                                 {tools.map((tool) => {
                                     return tool.menu &&
                                         tool.id !== 'tools' &&
                                         tool.id !== 'tools-all' ? (
-                                        <SidebarItem
+                                        <Sidebar.Item
                                             path={tool.absolutePath}
                                             icon={tool.icon}
                                             text={tool.name}
@@ -48,7 +45,7 @@ const ToolsFramework: React.FC = () => {
                                             {tool.children
                                                 ? tool.children.map((subTool) => {
                                                       return (
-                                                          <SidebarItem
+                                                          <Sidebar.Item
                                                               path={subTool.absolutePath}
                                                               text={subTool.name}
                                                               key={subTool.id}
@@ -56,11 +53,11 @@ const ToolsFramework: React.FC = () => {
                                                       )
                                                   })
                                                 : undefined}
-                                        </SidebarItem>
+                                        </Sidebar.Item>
                                     ) : undefined
                                 })}
-                            </SidebarItemList>
-                        </SidebarScroll>
+                            </Sidebar.ItemList>
+                        </Sidebar.Scroll>
                     </Sidebar>
                 </div>
                 <div className={'right-panel'}>

src/pages/UserFramework.tsx

@@ -3,9 +3,7 @@ import '@/assets/css/pages/user-framework.scss'
 import user from '@/router/user'
 import { hasPathPermission } from '@/util/auth'
 import FitFullscreen from '@/components/common/FitFullscreen'
-import Sidebar from 'src/components/common/sidebar_'
-import SidebarItemList from '@/components/common/sidebar_/SidebarItemList'
-import SidebarItem from '@/components/common/sidebar_/SidebarItem'
+import Sidebar from '@/components/common/Sidebar'
 import FullscreenLoadingMask from '@/components/common/FullscreenLoadingMask'
 
 const ToolsFramework: React.FC = () => {
@@ -16,22 +14,26 @@ const ToolsFramework: React.FC = () => {
                     <Sidebar
                         title={'个人中心'}
                         bottomFixed={
-                            <SidebarItemList>
+                            <Sidebar.ItemList>
                                 {hasPathPermission('/system') ? (
-                                    <SidebarItem
+                                    <Sidebar.Item
                                         path={'/system'}
                                         icon={IconOxygenSetting}
                                         text={'系统配置'}
                                     />
                                 ) : undefined}
-                                <SidebarItem path={'/'} icon={IconOxygenBack} text={'回到氧工具'} />
-                            </SidebarItemList>
+                                <Sidebar.Item
+                                    path={'/'}
+                                    icon={IconOxygenBack}
+                                    text={'回到氧工具'}
+                                />
+                            </Sidebar.ItemList>
                         }
                     >
-                        <SidebarItemList>
+                        <Sidebar.ItemList>
                             {user.map((value) => {
                                 return value.menu ? (
-                                    <SidebarItem
+                                    <Sidebar.Item
                                         end={value.id === 'user' ? true : undefined}
                                         path={value.absolutePath}
                                         icon={value.icon}
@@ -40,7 +42,7 @@ const ToolsFramework: React.FC = () => {
                                     />
                                 ) : undefined
                             })}
-                        </SidebarItemList>
+                        </Sidebar.ItemList>
                     </Sidebar>
                 </div>
                 <div className={'right-panel'}>