Skip to content

Commit 16198fe

Browse files
committed
update
1 parent 184f468 commit 16198fe

File tree

7 files changed

+14
-15
lines changed

7 files changed

+14
-15
lines changed

.eslintrc.cjs

+5
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,11 @@ module.exports = {
1919
tsconfigRootDir: __dirname,
2020
},
2121
plugins: ["react", "@typescript-eslint", "react-hooks"],
22+
settings: {
23+
react: {
24+
version: "detect",
25+
},
26+
},
2227
rules: {
2328
"prefer-const": "warn",
2429
"no-prototype-builtins": "off",

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"@ant-design/icons": "^5.0.1",
1414
"@loadable/component": "^5.15.3",
1515
"@rematch/core": "^2.1.0",
16-
"antd": "5.3.0",
16+
"antd": "4.24.8",
1717
"axios": "^1.3.4",
1818
"lodash": "^4.17.21",
1919
"normalize.css": "^8.0.1",

src/layouts/BasicLayout.tsx

+1-3
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,12 @@
55
// ==================
66
import React, { useState } from "react";
77
import { useSelector, useDispatch } from "react-redux";
8-
import { Route, useNavigate, Outlet } from "react-router-dom";
8+
import { useNavigate, Outlet } from "react-router-dom";
99
import { Layout, message } from "antd";
1010

1111
// ==================
1212
// 自定义的东西
1313
// ==================
14-
import tools from "@/util/tools";
1514
import "./BasicLayout.less";
1615

1716
// ==================
@@ -20,7 +19,6 @@ import "./BasicLayout.less";
2019
import Header from "@/components/Header";
2120
import MenuCom from "@/components/Menu";
2221
import Footer from "@/components/Footer";
23-
2422
import Bread from "@/components/Bread";
2523

2624
const { Content } = Layout;

src/pages/Login/index.tsx

+2-3
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
// 所需的各种插件
55
// ==================
66
import React, { useState, useEffect, useCallback } from "react";
7-
import { useSelector, useDispatch } from "react-redux";
7+
import { useDispatch } from "react-redux";
88
import { useNavigate } from "react-router-dom";
99
import tools from "@/util/tools";
1010

@@ -20,7 +20,7 @@ import LogoImg from "@/assets/logo.png";
2020
// ==================
2121
// 类型声明
2222
// ==================
23-
import { RootState, Dispatch } from "@/store";
23+
import { Dispatch } from "@/store";
2424
import {
2525
Role,
2626
Menu,
@@ -41,7 +41,6 @@ import "./index.less";
4141
// ==================
4242
function LoginContainer(): JSX.Element {
4343
const dispatch = useDispatch<Dispatch>();
44-
const p = useSelector((state: RootState) => state.app.powersCode);
4544

4645
const navigate = useNavigate();
4746
const [form] = Form.useForm();

src/pages/System/MenuAdmin/index.tsx

+1-6
Original file line numberDiff line numberDiff line change
@@ -432,12 +432,7 @@ function MenuAdminContainer() {
432432
<div className="l">
433433
<div className="title">目录结构</div>
434434
<div>
435-
<Tree
436-
defaultExpandedKeys={["0"]}
437-
onSelect={onTreeSelect}
438-
selectedKeys={[String(treeSelect.id)]}
439-
treeData={sourceData}
440-
></Tree>
435+
<Tree onSelect={onTreeSelect} treeData={sourceData} />
441436
</div>
442437
</div>
443438
<div className="r">

src/pages/System/RoleAdmin/index.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -356,7 +356,7 @@ function RoleAdminContainer() {
356356
title: "状态",
357357
dataIndex: "conditions",
358358
key: "conditions",
359-
render: (v: number, record: TableRecordData) =>
359+
render: (v: number) =>
360360
v === 1 ? (
361361
<span style={{ color: "green" }}>启用</span>
362362
) : (

src/pages/System/UserAdmin/index.tsx

+3-1
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,9 @@ function UserAdminContainer(): JSX.Element {
127127
roleData: res.data,
128128
});
129129
}
130-
} catch {}
130+
} catch {
131+
//
132+
}
131133
};
132134

133135
// 函数 - 查询当前页面所需列表数据

0 commit comments

Comments
 (0)