Skip to content

Commit 751b5b0

Browse files
committed
feat: header breadcrumb
1 parent d9f366b commit 751b5b0

File tree

7 files changed

+46
-10
lines changed

7 files changed

+46
-10
lines changed

package-lock.json

Lines changed: 16 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
"http-proxy-middleware": "^2.0.6",
1616
"react": "^18.1.0",
1717
"react-dom": "^18.1.0",
18+
"react-fast-marquee": "^1.3.5",
1819
"react-redux": "^8.0.2",
1920
"react-router-dom": "^6.3.0",
2021
"react-scripts": "5.0.1",

src/pages/Frame/component/BreadcrumbUI.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ interface FrameBreadcrumbUIProps {
88

99
const FrameBreadcrumbUI = (props: FrameBreadcrumbUIProps) => {
1010
return (
11-
<div className="admin-breadcrumb">
11+
<div className="admin-breadcrumb" style={{ marginTop: props.items.length > 0 ? 8 : 0 }}>
1212
<div className="admin-breadcrumb-nav">
1313
<Breadcrumb style={{ margin: '0 4px' }} separator="/">
1414
{props.items.map(item => (

src/pages/Main/component/IndexUI.tsx

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
import { Alert } from 'antd';
2+
import Marquee from 'react-fast-marquee';
3+
14
interface MainIndexUIProps {}
25

36
/**
@@ -6,7 +9,18 @@ interface MainIndexUIProps {}
69
* @returns
710
*/
811
const MainIndexUI = (props: MainIndexUIProps) => {
9-
return <div className="panel-body">这里是默认的主页页面</div>;
12+
return (
13+
<div className="panel-body">
14+
<Alert
15+
banner
16+
message={
17+
<Marquee pauseOnHover gradient={false}>
18+
公告:xxxxxxxxxxxx
19+
</Marquee>
20+
}
21+
/>
22+
</div>
23+
);
1024
};
1125

1226
export default MainIndexUI;

src/pages/Privilege/component/ListTreeUI.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ interface PrivilegeListTreeUIProps {
2828
*/
2929
const PrivilegeListTreeUI = (props: PrivilegeListTreeUIProps) => {
3030
const privilegeList = props.privilegeList;
31-
if (privilegeList.length == 0) {
31+
if (privilegeList.length === 0) {
3232
return <Empty></Empty>;
3333
}
3434

@@ -47,7 +47,7 @@ const PrivilegeListTreeUI = (props: PrivilegeListTreeUIProps) => {
4747
title: (
4848
<span>
4949
{privilegeItem.privilege_info.name}
50-
<a onClick={() => props.editClickCallback(privilegeItem.privilege_info)}>
50+
<a href="#!" onClick={() => props.editClickCallback(privilegeItem.privilege_info)}>
5151
<EditOutlined style={{ marginLeft: 6 }} />
5252
</a>
5353
<Popconfirm
@@ -157,7 +157,7 @@ const PrivilegeListTreeUI = (props: PrivilegeListTreeUIProps) => {
157157
style={{ marginRight: '6px' }}
158158
/>
159159
{privilegeListItem.privilege_info.name}
160-
<a onClick={() => props.editClickCallback(privilegeListItem.privilege_info)}>
160+
<a href="#!" onClick={() => props.editClickCallback(privilegeListItem.privilege_info)}>
161161
<EditOutlined style={{ marginLeft: 6, marginRight: 0 }} />
162162
</a>
163163
<Popconfirm

src/pages/Role/component/PrivilegeUI.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -96,12 +96,12 @@ const getAllChildPrivilegeIds = (privilegeList: PrivilegeListItemType[]): bigint
9696
*/
9797
const PrivilegeUI = (props: PrivilegeUIProps) => {
9898
const privilegeList = props.privilegeList;
99-
const defaultPrivilegeIds = props.defaultPrivilegeIds ? props.defaultPrivilegeIds : [];
100-
const [checkedPrivilegeIds, setCheckedPrivilegeIds] = useState<string[]>(defaultPrivilegeIds);
99+
const [checkedPrivilegeIds, setCheckedPrivilegeIds] = useState<string[]>([]);
101100

102101
useEffect(() => {
102+
const defaultPrivilegeIds = props.defaultPrivilegeIds ? props.defaultPrivilegeIds : [];
103103
setCheckedPrivilegeIds(defaultPrivilegeIds);
104-
}, [defaultPrivilegeIds]);
104+
}, [props.defaultPrivilegeIds]);
105105

106106
if (privilegeList.length === 0) {
107107
return <Empty></Empty>;

yarn.lock

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7807,7 +7807,7 @@
78077807
"strip-ansi" "^6.0.1"
78087808
"text-table" "^0.2.0"
78097809

7810-
"react-dom@*", "react-dom@^16.8 || ^17.0 || ^18.0", "react-dom@^18.0.0", "react-dom@^18.1.0", "react-dom@>=16.0.0", "react-dom@>=16.11.0", "react-dom@>=16.8", "react-dom@>=16.9.0":
7810+
"react-dom@*", "react-dom@^16.8 || ^17.0 || ^18.0", "react-dom@^18.0.0", "react-dom@^18.1.0", "react-dom@>= 16.8.0 || 18.0.0", "react-dom@>=16.0.0", "react-dom@>=16.11.0", "react-dom@>=16.8", "react-dom@>=16.9.0":
78117811
"integrity" "sha512-fU1Txz7Budmvamp7bshe4Zi32d0ll7ect+ccxNu9FlObT605GOEB8BfO4tmRJ39R5Zj831VCpvQ05QPBW5yb+w=="
78127812
"resolved" "https://registry.npmmirror.com/react-dom/-/react-dom-18.1.0.tgz"
78137813
"version" "18.1.0"
@@ -7820,6 +7820,11 @@
78207820
"resolved" "https://registry.npmmirror.com/react-error-overlay/-/react-error-overlay-6.0.11.tgz"
78217821
"version" "6.0.11"
78227822

7823+
"react-fast-marquee@^1.3.5":
7824+
"integrity" "sha512-eOqLoz4iVVBvi2wN/web8hd2XX9y2Z6CYR7g++7nTVHlTOXBtqyARQJ9rYNpbp179hAzloMx0yBFAo8LpNYmKQ=="
7825+
"resolved" "https://registry.npmjs.org/react-fast-marquee/-/react-fast-marquee-1.3.5.tgz"
7826+
"version" "1.3.5"
7827+
78237828
"react-is@^16.12.0":
78247829
"integrity" "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="
78257830
"resolved" "https://registry.npmmirror.com/react-is/-/react-is-16.13.1.tgz"
@@ -7932,7 +7937,7 @@
79327937
optionalDependencies:
79337938
"fsevents" "^2.3.2"
79347939

7935-
"react@*", "react@^16.8 || ^17.0 || ^18.0", "react@^16.8.0 || ^17.0.0 || ^18.0.0", "react@^18.0.0", "react@^18.1.0", "react@>= 16", "react@>=16.0.0", "react@>=16.11.0", "react@>=16.8", "react@>=16.9.0":
7940+
"react@*", "react@^16.8 || ^17.0 || ^18.0", "react@^16.8.0 || ^17.0.0 || ^18.0.0", "react@^18.0.0", "react@^18.1.0", "react@>= 16", "react@>= 16.8.0 || 18.0.0", "react@>=16.0.0", "react@>=16.11.0", "react@>=16.8", "react@>=16.9.0":
79367941
"integrity" "sha512-4oL8ivCz5ZEPyclFQXaNksK3adutVS8l2xzZU0cqEFrE9Sb7fC0EFK5uEk74wIreL1DERyjvsU915j1pcT2uEQ=="
79377942
"resolved" "https://registry.npmmirror.com/react/-/react-18.1.0.tgz"
79387943
"version" "18.1.0"

0 commit comments

Comments
 (0)