{item.component({ ...props, onClose }, tabRef)}
diff --git a/web/src/components/Licence/index.less b/web/src/components/Licence/index.less
index 41807c1b..de74b2bf 100644
--- a/web/src/components/Licence/index.less
+++ b/web/src/components/Licence/index.less
@@ -2,7 +2,7 @@
:global {
.ant-modal-body {
- padding: 20px 0 0 0;
+ padding: 0px 0 0 0;
.ant-tabs-top-bar {
justify-content: center;
diff --git a/web/src/components/SiderMenu/BottomMenu.js b/web/src/components/SiderMenu/BottomMenu.js
index a1d9b018..95c6b303 100644
--- a/web/src/components/SiderMenu/BottomMenu.js
+++ b/web/src/components/SiderMenu/BottomMenu.js
@@ -3,6 +3,7 @@ import { Menu, Icon } from 'antd';
import styles from './BottomMenu.less';
import Debounce from "lodash-decorators/debounce";
import Licence from "@/components/Licence";
+import { formatMessage } from "umi/locale";
export default class BottomMenu extends PureComponent {
@@ -23,7 +24,7 @@ export default class BottomMenu extends PureComponent {
const { theme, collapsed, global: { consoleInfo = {}, consoleLicence = {} }, onLicenceShow } = this.props;
- const text = `${consoleLicence.license_type} (${consoleInfo?.application?.version?.number})`
+ const text = `${formatMessage({ id: "license.menu.label" })} (${consoleInfo?.application?.version?.number})`
return (
diff --git a/web/src/layouts/BasicLayout.js b/web/src/layouts/BasicLayout.js
index b1fb145a..30348ebe 100644
--- a/web/src/layouts/BasicLayout.js
+++ b/web/src/layouts/BasicLayout.js
@@ -166,8 +166,6 @@ class BasicLayout extends React.PureComponent {
type: "global/fetchConsoleInfo",
});
- this.fetchConsoleLicence();
-
this.renderRef = requestAnimationFrame(() => {
this.setState({
rendering: false,
@@ -339,13 +337,6 @@ class BasicLayout extends React.PureComponent {
return ;
}
- fetchConsoleLicence = () => {
- const { dispatch } = this.props;
- dispatch({
- type: "global/fetchConsoleLicence",
- });
- };
-
render() {
this.init();
@@ -437,7 +428,6 @@ class BasicLayout extends React.PureComponent {
version={this.props.global.consoleInfo?.application}
licence={this.props.global.consoleLicence}
location={this.props.location}
- onLicenceUpdate={this.fetchConsoleLicence}
/>
);
diff --git a/web/src/locales/en-US.js b/web/src/locales/en-US.js
index 4dd9c66e..2869de7e 100644
--- a/web/src/locales/en-US.js
+++ b/web/src/locales/en-US.js
@@ -310,7 +310,7 @@ export default {
"menu.header.help.official_website": "Official website",
"menu.header.help.release_notes": "Release notes",
"menu.header.help.document": "Documentation",
- "menu.header.help.ticket": "Request support",
+ "menu.header.help.ticket": "Report issue",
"app.message.operate.success": "Operate successfully",
"app.message.operate.failed": "Operate failure",
diff --git a/web/src/locales/en-US/license.js b/web/src/locales/en-US/license.js
index e2c60166..858cd969 100644
--- a/web/src/locales/en-US/license.js
+++ b/web/src/locales/en-US/license.js
@@ -1,4 +1,5 @@
export default {
+ "license.menu.label": "About",
"license.tab.version.title": "Version",
"license.tab.tips.title": "License Tips",
"license.tab.license.title": "License",
diff --git a/web/src/locales/zh-CN.js b/web/src/locales/zh-CN.js
index d04c4036..a8a93a3f 100644
--- a/web/src/locales/zh-CN.js
+++ b/web/src/locales/zh-CN.js
@@ -315,7 +315,7 @@ export default {
"menu.header.help.official_website": "官方网站",
"menu.header.help.release_notes": "更新日志",
"menu.header.help.document": "产品文档",
- "menu.header.help.ticket": "提交工单",
+ "menu.header.help.ticket": "提交问题",
"app.message.operate.success": "操作成功",
"app.message.operate.failed": "操作失败",
diff --git a/web/src/locales/zh-CN/license.js b/web/src/locales/zh-CN/license.js
index f88f919a..306081d0 100644
--- a/web/src/locales/zh-CN/license.js
+++ b/web/src/locales/zh-CN/license.js
@@ -1,4 +1,5 @@
export default {
+ "license.menu.label": "关于",
"license.tab.version.title": "版本信息",
"license.tab.tips.title": "授权提示",
"license.tab.license.title": "授权信息",
diff --git a/web/src/models/global.js b/web/src/models/global.js
index 7d5885dd..5235d90d 100644
--- a/web/src/models/global.js
+++ b/web/src/models/global.js
@@ -2,7 +2,6 @@ import {
queryNotices,
clearNotices,
queryConsoleInfo,
- queryConsoleLicence,
} from "@/services/api";
import { message } from "antd";
import { searchClusterConfig, getClusterStatus } from "@/services/cluster";
@@ -291,14 +290,6 @@ export default {
payload: data,
});
},
-
- *fetchConsoleLicence(_, { call, put }) {
- const data = yield call(queryConsoleLicence);
- yield put({
- type: "saveConsoleLicence",
- payload: data || {},
- });
- },
},
reducers: {
diff --git a/web/src/services/api.js b/web/src/services/api.js
index 531ea3a3..0706519b 100644
--- a/web/src/services/api.js
+++ b/web/src/services/api.js
@@ -5,10 +5,6 @@ export async function queryConsoleInfo() {
return request("/_info");
}
-export async function queryConsoleLicence() {
- return request("/_license/info");
-}
-
export async function queryProjectNotice() {
return request("/api/project/notice");
}