Merge branch 'master' into feature/feature-update

Author: javaLuo

src/components/Header/index.tsx

@@ -5,7 +5,7 @@
 // ==================
 import React, { useState, useCallback } from "react";
 import { Link } from "react-router-dom";
-import { Layout, Tooltip, Menu, Dropdown } from "antd";
+import { Layout, Tooltip, Dropdown } from "antd";
 import {
   MenuFoldOutlined,
   FullscreenOutlined,

src/components/Menu/index.tsx

@@ -9,7 +9,6 @@ import { Link, useNavigate, useLocation } from "react-router-dom";
 import { cloneDeep } from "lodash";
 
 const { Sider } = Layout;
-const { SubMenu, Item } = MenuAntd;
 
 // ==================
 // 自定义的东西
@@ -21,7 +20,8 @@ import Icon from "@/components/Icon";
 // ==================
 // 类型声明
 // ==================
-import { Menu } from "@/models/index.type";
+import type { Menu } from "@/models/index.type";
+import type { ItemType } from "antd/lib/menu/hooks/useItems";
 
 interface Props {
   data: Menu[]; // 所有的菜单数据
@@ -107,7 +107,7 @@ export default function MenuCom(props: Props): JSX.Element {
   // ==================
 
   /** 处理原始数据，将原始数据处理为层级关系 **/
-  const treeDom: JSX.Element[] = useMemo(() => {
+  const treeDom: ItemType[] = useMemo(() => {
     const d: Menu[] = cloneDeep(props.data);
     // 按照sort排序
     d.sort((a, b) => {

src/pages/ErrorPages/401.tsx

@@ -2,18 +2,15 @@
 
 import React from "react";
 import { Button } from "antd";
-import Img from "@/assets/error.gif";
-import { History } from "history";
+import { useNavigate } from "react-router-dom";
 
 import "./index.less";
+import Img from "@/assets/error.gif";
 
-interface Props {
-  history: History;
-}
-
-export default function NoPowerContainer(props: Props): JSX.Element {
+export default function NoPowerContainer(): JSX.Element {
+  const navigate = useNavigate();
   const gotoHome = (): void => {
-    props.history.replace("/");
+    navigate("/", { replace: true });
   };
 
   return (

src/pages/System/RoleAdmin/index.type.ts

@@ -40,4 +40,4 @@ export type PowerTreeInfo = {
 export type SearchInfo = {
   title: string | undefined; // 用户名
   conditions: number | undefined; // 状态
-};
+};

src/router/index.tsx

@@ -3,7 +3,7 @@
 // ==================
 // 第三方库
 // ==================
-import React, { useEffect, useCallback } from "react";
+import React, { useEffect } from "react";
 import { Routes, Route, Navigate } from "react-router-dom";
 import { useSelector, useDispatch } from "react-redux";
 import { message } from "antd";

src/util/tools.ts

@@ -135,7 +135,7 @@ const tools = {
    * 0 算有效值
    * @param {Object} obj  待处理的对象
    * **/
-   clearNull<T>(obj: T): T {
+  clearNull<T>(obj: T): T {
     const temp: any = { ...obj };
     for (const key in temp) {
       if (temp.hasOwnProperty(key)) {