fix: 代码格式化 & 兼容前后台登录用户身份信息识别

Author: liuyueyi

src/components/ErrorMessage/403.tsx

@@ -1,6 +1,8 @@
-import { Button, Result } from "antd";
 import { useNavigate } from "react-router-dom";
+import { Button, Result } from "antd";
+
 import { HOME_URL } from "@/config/config";
+
 import "./index.less";
 
 const NotAuth = () => {

src/components/ErrorMessage/404.tsx

@@ -1,6 +1,8 @@
-import { Button, Result } from "antd";
 import { useNavigate } from "react-router-dom";
+import { Button, Result } from "antd";
+
 import { HOME_URL } from "@/config/config";
+
 import "./index.less";
 
 const NotFound = () => {

src/components/ErrorMessage/500.tsx

@@ -1,6 +1,8 @@
-import { Button, Result } from "antd";
 import { useNavigate } from "react-router-dom";
+import { Button, Result } from "antd";
+
 import { HOME_URL } from "@/config/config";
+
 import "./index.less";
 
 const NotNetwork = () => {

src/components/Loading/index.tsx

@@ -1,4 +1,5 @@
 import { Spin } from "antd";
+
 import "./index.less";
 
 const Loading = ({ tip = "Loading" }: { tip?: string }) => {

src/components/SwitchDark/index.tsx

@@ -1,5 +1,6 @@
-import { Switch } from "antd";
 import { connect } from "react-redux";
+import { Switch } from "antd";
+
 import { setThemeConfig } from "@/redux/modules/global/action";
 
 const SwitchDark = (props: any) => {

src/layouts/components/Header/index.tsx

@@ -13,16 +13,23 @@ import Theme from "./components/Theme";
 import "./index.less";
 
 const LayoutHeader = (props: any) => {
+	const { setToken, setUserInfo } = props;
 	let { userInfo } = props || {};
-	if (!userInfo || JSON.stringify(userInfo) === "{}") {
+	let toCheck = !userInfo || JSON.stringify(userInfo) === "{}";
+	if (toCheck) {
 		let fetchUsrInfo = async () => {
-			const { status, result } = await loginUserInfo();
-			if (status && status.code == 0 && result && result?.userId > 0) {
-				// fixme 拿登录的用户名、用户头像来替换默认的用户名头像
-				setToken(result?.userId);
+			try {
+				const { status, result } = await loginUserInfo();
+				console.log("请求用户信息: ", result);
+				if (status && status.code == 0 && result && result?.userId > 0) {
+					// fixme 拿登录的用户名、用户头像来替换默认的用户名头像
+					setToken(result?.userId);
 
-				setUserInfo(result);
-				userInfo = result;
+					setUserInfo(result);
+					userInfo = result;
+				}
+			} catch (e) {
+				console.log("初始化用户身份异常!", e);
 			}
 		};
 		// 未拿到用户信息时，主动去拿一下
@@ -51,5 +58,5 @@ const LayoutHeader = (props: any) => {
 };
 
 const mapStateToProps = (state: any) => state.global;
-const mapDispatchToProps = {};
+const mapDispatchToProps = { setToken, setUserInfo };
 export default connect(mapStateToProps, mapDispatchToProps)(LayoutHeader);

src/views/column/article/components/tableselect/TableSelect.tsx

@@ -1,12 +1,12 @@
 /* eslint-disable prettier/prettier */
 import React, { FC, useEffect, useState } from "react";
+import { PoweroffOutlined } from "@ant-design/icons";
 import { Avatar,Button, Checkbox, Divider, Input, Select, Table } from "antd";
 import type { ColumnsType } from "antd/es/table";
 
 import { getArticleListApi } from "@/api/modules/article";
 import { initPagination,IPagination } from "@/enums/common";
 import { MapItem } from "@/typings/common";
-import { PoweroffOutlined } from "@ant-design/icons";
 
 const { Option } = Select;