Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: update antd to 4.24.12 #60

Merged
merged 3 commits into from
Aug 7, 2024
+346 −276
Merged

feat: update antd to 4.24.12 #60

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3c12046
update: update antd to ~4.24.0
love98ooo Aug 7, 2024
21eaecf
update: remove ~
love98ooo Aug 7, 2024
2dfb2b9
update: remove comments
love98ooo Aug 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion web/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"dependencies": {
"@ant-design/icons": "4.6.2",
"@craco/craco": "6.4.5",
"antd": "4.15.5",
"antd": "~4.24.0",
nomeguy marked this conversation as resolved.
Show resolved Hide resolved
"casdoor-js-sdk": "^0.2.7",
"copy-to-clipboard": "^3.3.3",
"craco-less": "2.0.0",
Expand Down
23 changes: 13 additions & 10 deletions web/src/App.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,12 +167,10 @@ class App extends Component {
renderRightDropdown() {
const menu = (
<Menu onClick={this.handleRightDropdownClick.bind(this)}>
<Menu.Item key="/account">
<SettingOutlined />
<Menu.Item key="/account" icon={<SettingOutlined />}>
{i18next.t("account:My Account")}
</Menu.Item>
<Menu.Item key="/logout">
<LogoutOutlined />
<Menu.Item key="/logout" icon={<LogoutOutlined />}>
{i18next.t("account:Sign Out")}
</Menu.Item>
</Menu>
Expand Down Expand Up @@ -237,7 +235,7 @@ class App extends Component {
</div>
);
return (
<div style={{float: "right", margin: "0px", padding: "0px"}}>
<div style={{margin: "0px", padding: "0px"}}>
{
res
}
Expand Down Expand Up @@ -328,7 +326,7 @@ class App extends Component {
renderContent() {
return (
<div>
<Header style={{padding: "0", marginBottom: "3px"}}>
<Header style={{padding: "0", marginBottom: "3px", backgroundColor: "white", width: "100%"}} mode={"horizontal"}>
{
Setting.isMobile() ? null : (
<Link to={"/"}>
Expand All @@ -340,16 +338,21 @@ class App extends Component {
// theme="dark"
mode={"horizontal"}
selectedKeys={[`${this.state.selectedMenuKey}`]}
style={{lineHeight: "64px"}}
style={{lineHeight: "64px", position: "absolute", left: 138, right: "300px"}}
nomeguy marked this conversation as resolved.
Show resolved Hide resolved
>
{
this.renderMenu()
}
{
this.renderAccount()
}
{/* <SelectLanguageBox /> */}
</Menu>
{/* <Menu
nomeguy marked this conversation as resolved.
Show resolved Hide resolved
mode="horizontal"
style={{lineHeight: "64px", float: "right", marginRight: "20px"}}
> */}
{
this.renderAccount()
}
{/* </Menu> */}
</Header>
<Switch>
<Route exact path="/callback" component={AuthCallback} />
Expand Down
Loading
Loading