diff --git a/web/src/App.js b/web/src/App.js index 242e0412..e151f035 100644 --- a/web/src/App.js +++ b/web/src/App.js @@ -16,8 +16,8 @@ import React, {Component} from "react"; import "./App.less"; import {Helmet} from "react-helmet"; import * as Setting from "./Setting"; -import {DownOutlined, LogoutOutlined, SettingOutlined} from "@ant-design/icons"; -import {Avatar, BackTop, Button, Card, Dropdown, Layout, Menu, Result} from "antd"; +import {BarsOutlined, DownOutlined, LogoutOutlined, SettingOutlined} from "@ant-design/icons"; +import {Avatar, BackTop, Button, Card, Drawer, Dropdown, Layout, Menu, Result} from "antd"; import {Link, Redirect, Route, Switch, withRouter} from "react-router-dom"; import OrganizationListPage from "./OrganizationListPage"; import OrganizationEditPage from "./OrganizationEditPage"; @@ -85,6 +85,7 @@ class App extends Component { selectedMenuKey: 0, account: undefined, uri: null, + menuVisible: false, }; Setting.initServerUrl(); @@ -595,6 +596,18 @@ class App extends Component { ); } + onClose = () => { + this.setState({ + menuVisible: false, + }); + }; + + showMenu = () => { + this.setState({ + menuVisible: true, + }); + }; + renderContent() { if (!Setting.isMobile()) { return ( @@ -613,7 +626,7 @@ class App extends Component { // theme="dark" mode={(Setting.isMobile() && this.isStartPages()) ? "inline" : "horizontal"} selectedKeys={[`${this.state.selectedMenuKey}`]} - style={{lineHeight: "64px", width: "78%", position: "absolute", left: "145px"}} + style={{lineHeight: "64px", position: "absolute", left: "145px", right: "200px"}} > { this.renderMenu() @@ -646,22 +659,28 @@ class App extends Component { ) } - - { - this.renderMenu() - } -
+ + { - this.renderAccount() + this.renderMenu() } - -
-
+ + + +
+ { + this.renderAccount() + } + +
{ this.renderRouter() diff --git a/web/src/basic/SingleCard.js b/web/src/basic/SingleCard.js index e45a7cf5..826359eb 100644 --- a/web/src/basic/SingleCard.js +++ b/web/src/basic/SingleCard.js @@ -44,10 +44,11 @@ class SingleCard extends React.Component { return ( Setting.goToLinkSoft(this, silentSigninLink)}> - logo + logo ); @@ -61,7 +62,7 @@ class SingleCard extends React.Component { + logo } onClick={() => Setting.goToLinkSoft(this, silentSigninLink)} style={isSingle ? {width: "320px"} : {width: "100%"}} diff --git a/web/src/locales/de/data.json b/web/src/locales/de/data.json index d99d667a..5594ed1b 100644 --- a/web/src/locales/de/data.json +++ b/web/src/locales/de/data.json @@ -133,6 +133,7 @@ "Certs": "Certs", "Click to Upload": "Click to Upload", "Client IP": "Client-IP", + "Close": "Close", "Created time": "Erstellte Zeit", "Default application": "Default application", "Default application - Tooltip": "Default application - Tooltip", @@ -165,6 +166,7 @@ "Logo - Tooltip": "App's image tag", "Master password": "Master-Passwort", "Master password - Tooltip": "Masterpasswort - Tooltip", + "Menu": "Menu", "Method": "Methode", "Model": "Model", "Model - Tooltip": "Model - Tooltip", diff --git a/web/src/locales/en/data.json b/web/src/locales/en/data.json index 135a000a..856d5acc 100644 --- a/web/src/locales/en/data.json +++ b/web/src/locales/en/data.json @@ -133,6 +133,7 @@ "Certs": "Certs", "Click to Upload": "Click to Upload", "Client IP": "Client IP", + "Close": "Close", "Created time": "Created time", "Default application": "Default application", "Default application - Tooltip": "Default application - Tooltip", @@ -165,6 +166,7 @@ "Logo - Tooltip": "Logo - Tooltip", "Master password": "Master password", "Master password - Tooltip": "Master password - Tooltip", + "Menu": "Menu", "Method": "Method", "Model": "Model", "Model - Tooltip": "Model - Tooltip", diff --git a/web/src/locales/fr/data.json b/web/src/locales/fr/data.json index 12bf9af1..4961ed6f 100644 --- a/web/src/locales/fr/data.json +++ b/web/src/locales/fr/data.json @@ -133,6 +133,7 @@ "Certs": "Certes", "Click to Upload": "Click to Upload", "Client IP": "IP du client", + "Close": "Close", "Created time": "Date de création", "Default application": "Default application", "Default application - Tooltip": "Default application - Tooltip", @@ -165,6 +166,7 @@ "Logo - Tooltip": "App's image tag", "Master password": "Mot de passe maître", "Master password - Tooltip": "Mot de passe maître - Infobulle", + "Menu": "Menu", "Method": "Méthode", "Model": "Model", "Model - Tooltip": "Model - Tooltip", diff --git a/web/src/locales/ja/data.json b/web/src/locales/ja/data.json index b5736f78..03339fe5 100644 --- a/web/src/locales/ja/data.json +++ b/web/src/locales/ja/data.json @@ -133,6 +133,7 @@ "Certs": "Certs", "Click to Upload": "Click to Upload", "Client IP": "クライアント IP", + "Close": "Close", "Created time": "作成日時", "Default application": "Default application", "Default application - Tooltip": "Default application - Tooltip", @@ -165,6 +166,7 @@ "Logo - Tooltip": "App's image tag", "Master password": "マスターパスワード", "Master password - Tooltip": "マスターパスワード - ツールチップ", + "Menu": "Menu", "Method": "方法", "Model": "Model", "Model - Tooltip": "Model - Tooltip", diff --git a/web/src/locales/ko/data.json b/web/src/locales/ko/data.json index 36b82770..f0d43e8d 100644 --- a/web/src/locales/ko/data.json +++ b/web/src/locales/ko/data.json @@ -133,6 +133,7 @@ "Certs": "Certs", "Click to Upload": "Click to Upload", "Client IP": "Client IP", + "Close": "Close", "Created time": "Created time", "Default application": "Default application", "Default application - Tooltip": "Default application - Tooltip", @@ -165,6 +166,7 @@ "Logo - Tooltip": "App's image tag", "Master password": "Master password", "Master password - Tooltip": "Master password - Tooltip", + "Menu": "Menu", "Method": "Method", "Model": "Model", "Model - Tooltip": "Model - Tooltip", diff --git a/web/src/locales/ru/data.json b/web/src/locales/ru/data.json index f8408816..369e1281 100644 --- a/web/src/locales/ru/data.json +++ b/web/src/locales/ru/data.json @@ -133,6 +133,7 @@ "Certs": "Сертификаты", "Click to Upload": "Нажмите здесь, чтобы загрузить", "Client IP": "IP клиента", + "Close": "Close", "Created time": "Время создания", "Default application": "Default application", "Default application - Tooltip": "Default application - Tooltip", @@ -165,6 +166,7 @@ "Logo - Tooltip": "App's image tag", "Master password": "Мастер-пароль", "Master password - Tooltip": "Мастер-пароль - Tooltip", + "Menu": "Menu", "Method": "Метод", "Model": "Модель", "Model - Tooltip": "Модель - Подсказка", diff --git a/web/src/locales/zh/data.json b/web/src/locales/zh/data.json index c81353f4..0051d2fb 100644 --- a/web/src/locales/zh/data.json +++ b/web/src/locales/zh/data.json @@ -133,6 +133,7 @@ "Certs": "证书", "Click to Upload": "点击上传", "Client IP": "客户端IP", + "Close": "关闭", "Created time": "创建时间", "Default application": "默认应用", "Default application - Tooltip": "默认应用", @@ -165,6 +166,7 @@ "Logo - Tooltip": "应用程序向外展示的图标", "Master password": "万能密码", "Master password - Tooltip": "可用来登录该组织下的所有用户,方便管理员以该用户身份登录,以解决技术问题", + "Menu": "目录", "Method": "方法", "Model": "模型", "Model - Tooltip": "Casbin模型",