Merge branch 'develop' into feature_htl

threadpool/console-new/src/App.tsx

@@ -1,10 +1,10 @@
-import { Suspense } from 'react';
+// import { Suspense } from 'react';
 import LayoutCom from './components/layout-com';
 import { Routes, Route, Link } from 'react-router-dom';
 
 import routeList from './route';
 import Login from '@/page/login';
-import { MenuProps, Spin, ConfigProvider } from 'antd';
+import { MenuProps } from 'antd';
 import { useTran } from './hooks';
 import { STR_MAP } from './config/i18n/locales/constants';
 import IconFont from './components/icon';
@@ -21,36 +21,10 @@ const App = () => {
         { label: <Link to={'/thread-poll/index'}>{useTran(STR_MAP.THREAD_POOL)}</Link>, key: '/thread-poll/index' },
       ],
     },
-    {
-      // label: <Link to={'/tenant'}>{useTran(STR_MAP.LOG_MANAGE)}</Link>,
-      label: <Link to={'/tenant'}>租户管理</Link>,
-      key: STR_MAP.TENANT_MANAGE,
-      icon: <IconFont type="icon-hot-for-ux"></IconFont>,
-    },
-    {
-      // label: <Link to={'/item'}>{useTran(STR_MAP.PROJECT_MANAGE)}</Link>,
-      label: <Link to={'/item'}>项目管理</Link>,
-      key: STR_MAP.PROJECT_MANAGE,
-      icon: <IconFont type="icon-hot-for-ux"></IconFont>,
-    },
-    {
-      // label: <Link to={'/user'}>{useTran(STR_MAP.USE_RIGHT)}</Link>,
-      label: <Link to={'/user'}>用户权限</Link>,
-      key: STR_MAP.USE_RIGHT,
-      icon: <IconFont type="icon-hot-for-ux"></IconFont>,
-    },
-    {
-      // label: <Link to={'/log'}>{useTran(STR_MAP.LOG_MANAGE)}</Link>,
-      label: <Link to={'/log'}>日志管理</Link>,
-      key: STR_MAP.LOG_MANAGE,
-      icon: <IconFont type="icon-hot-for-ux"></IconFont>,
-    },
   ];
 
   return (
-    <ConfigProvider>
+    <LayoutCom sideMenuList={sideMenuList} isSider={true} isHeader={true}>
-      <Suspense fallback={<Spin size="small" />}>
-        <LayoutCom sideMenuList={sideMenuList} isSider={true}>
       <Routes>
         <Route path="/Login" Component={Login}></Route>
         {routeList.map(item => (
@@ -58,8 +32,6 @@ const App = () => {
         ))}
       </Routes>
     </LayoutCom>
-      </Suspense>
-    </ConfigProvider>
   );
 };
 

threadpool/console-new/src/config/i18n/locales/constants.ts

@@ -17,8 +17,4 @@ export enum STR_MAP {
   CREATION_TIME = 'creationTime',
   UPDATE_TIME = 'update time',
   EDIT = 'edit',
-  TENANT_MANAGE = 'tenantManage',
-  PROJECT_MANAGE = 'projectManage',
-  LOG_MANAGE = 'logManage',
-  USE_RIGHT = 'userRight',
 }

threadpool/console-new/src/route/index.tsx

@@ -3,17 +3,9 @@ import homeRouter from '@/page/home/router';
 import aboutRouter from '@/page/about/router';
 import ThreadPoolRouter from '@/page/thread-pool/router';
 import tenantRouter from '@/page/tenant/router';
-import itemRouter from '@/page/item/router';
+// import itemRouter from '@/page/item/router';
-import userRouter from '@/page/user/router';
+// import userRouter from '@/page/user/router';
-import logRouter from '@/page/log/router';
+// import logRouter from '@/page/log/router';
 
-const routerList: IRouterList[] = [
+const routerList: IRouterList[] = [...homeRouter, ...aboutRouter, ...tenantRouter, ...ThreadPoolRouter];
-  ...homeRouter,
-  ...aboutRouter,
-  ...tenantRouter,
-  ...ThreadPoolRouter,
-  ...itemRouter,
-  ...userRouter,
-  ...logRouter,
-];
 export default routerList;