From 37037c19f033984de4af6e19540ca2c55d8722db Mon Sep 17 00:00:00 2001 From: GraceWalk Date: Fri, 28 Oct 2022 17:36:52 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=9B=B4=E6=96=B0=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E8=8E=B7=E5=8F=96=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../packages/layout-clusters-fe/src/app.tsx | 25 ++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/km-console/packages/layout-clusters-fe/src/app.tsx b/km-console/packages/layout-clusters-fe/src/app.tsx index ee66c5db..b945a9c0 100755 --- a/km-console/packages/layout-clusters-fe/src/app.tsx +++ b/km-console/packages/layout-clusters-fe/src/app.tsx @@ -3,12 +3,13 @@ import '@babel/polyfill'; import React, { useState, useEffect, useLayoutEffect } from 'react'; import { BrowserRouter, Switch, Route, useLocation, useHistory } from 'react-router-dom'; import { get as lodashGet } from 'lodash'; -import { DProLayout, AppContainer, Menu, Utils, Page403, Page404, Page500, Modal } from 'knowdesign'; +import { DProLayout, AppContainer, Menu, Utils, Page500, Modal } from 'knowdesign'; import { IconFont } from '@knowdesign/icons'; import dantdZhCN from 'knowdesign/es/locale/zh_CN'; import dantdEnUS from 'knowdesign/es/locale/en_US'; import { DotChartOutlined } from '@ant-design/icons'; import { licenseEventBus } from './constants/axiosConfig'; +import { Page403, Page404, NoLicense } from './pages/ErrorPages'; import intlZhCN from './locales/zh'; import intlEnUS from './locales/en'; import registerApps from '../config/registerApps'; @@ -18,13 +19,21 @@ import { Login } from './pages/Login'; import { getLicenseInfo } from './constants/common'; import api from './api'; import ClusterContainer from './pages/index'; -import NoLicense from './pages/NoLicense'; import ksLogo from './assets/ks-logo.png'; interface ILocaleMap { [index: string]: any; } +interface VersionInfo { + 'git.branch': string; + 'git.build.itme': string; + 'git.build.version': string; + 'git.commit.id': string; + 'git.commit.id.abbrev': string; + 'git.commit.time': string; +} + const localeMap: ILocaleMap = { 'zh-CN': { dantd: dantdZhCN, @@ -106,6 +115,7 @@ const AppContent = (props: { setlanguage: (language: string) => void }) => { const history = useHistory(); const userInfo = localStorage.getItem('userInfo'); const [curActiveAppName, setCurActiveAppName] = useState(''); + const [versionInfo, setVersionInfo] = useState(); useEffect(() => { if (pathname.startsWith('/config')) { @@ -115,6 +125,13 @@ const AppContent = (props: { setlanguage: (language: string) => void }) => { } }, [pathname]); + // 获取版本信息 + useEffect(() => { + Utils.request(api.getVersionInfo()).then((res: VersionInfo) => { + setVersionInfo(res); + }); + }, []); + return ( void }) => { isFixed: false, userDropMenuItems: [ - 版本说明 + + 版本: {versionInfo?.['git.build.version']} + , 登出