From 3ebd24209ddd258fa769c071f01ba4dd854dea47 Mon Sep 17 00:00:00 2001 From: shiyang Date: Fri, 3 Dec 2021 10:13:42 +0800 Subject: [PATCH 1/4] update .gitignore --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 73b94a01..b634ceff 100644 --- a/.gitignore +++ b/.gitignore @@ -30,4 +30,5 @@ appveyor.yml *.exe web/.github/ web/report* -log/ \ No newline at end of file +log/ +.env \ No newline at end of file From 3399fa0dc99eec67d0cadf7b670235b416dae2c7 Mon Sep 17 00:00:00 2001 From: shiyang Date: Fri, 3 Dec 2021 10:27:12 +0800 Subject: [PATCH 2/4] add logo en --- web/src/assets/logo_en.svg | 1 + web/src/components/SiderMenu/SiderMenu.js | 1 - web/src/layouts/BasicLayout.js | 5 +++-- 3 files changed, 4 insertions(+), 3 deletions(-) create mode 100644 web/src/assets/logo_en.svg diff --git a/web/src/assets/logo_en.svg b/web/src/assets/logo_en.svg new file mode 100644 index 00000000..bb1eea37 --- /dev/null +++ b/web/src/assets/logo_en.svg @@ -0,0 +1 @@ +未标题-1 \ No newline at end of file diff --git a/web/src/components/SiderMenu/SiderMenu.js b/web/src/components/SiderMenu/SiderMenu.js index 0f7173dd..0ab425f7 100644 --- a/web/src/components/SiderMenu/SiderMenu.js +++ b/web/src/components/SiderMenu/SiderMenu.js @@ -6,7 +6,6 @@ import Link from 'umi/link'; import styles from './index.less'; import BaseMenu, { getMenuMatches } from './BaseMenu'; import { urlToList } from '../_utils/pathTools'; -import { formatMessage, FormattedMessage } from 'umi/locale'; const { Sider } = Layout; diff --git a/web/src/layouts/BasicLayout.js b/web/src/layouts/BasicLayout.js index 7253f611..09982843 100644 --- a/web/src/layouts/BasicLayout.js +++ b/web/src/layouts/BasicLayout.js @@ -8,12 +8,13 @@ import { ContainerQuery } from 'react-container-query'; import classNames from 'classnames'; import pathToRegexp from 'path-to-regexp'; import { enquireScreen, unenquireScreen } from 'enquire-js'; -import { formatMessage } from 'umi/locale'; +import { formatMessage,getLocale } from 'umi/locale'; import SiderMenu from '@/components/SiderMenu'; import Authorized from '@/utils/Authorized'; import SettingDrawer from '@/components/SettingDrawer'; import icon from '../assets/icon.png'; import logo from '../assets/logo.svg'; +import logoEN from '../assets/logo_en.svg'; import Footer from './Footer'; import Header from './Header'; import Context from './MenuContext'; @@ -240,7 +241,7 @@ class BasicLayout extends React.PureComponent { {isTop && !isMobile ? null : ( Date: Mon, 6 Dec 2021 18:01:55 +0800 Subject: [PATCH 3/4] add table ExpandedRowRender Descriptions --- web/src/pages/System/Cluster/Index.js | 40 +++++++++++++++++++++---- web/src/pages/System/Cluster/Index.less | 5 ++++ 2 files changed, 39 insertions(+), 6 deletions(-) create mode 100644 web/src/pages/System/Cluster/Index.less diff --git a/web/src/pages/System/Cluster/Index.js b/web/src/pages/System/Cluster/Index.js index d283371f..78314a84 100644 --- a/web/src/pages/System/Cluster/Index.js +++ b/web/src/pages/System/Cluster/Index.js @@ -12,11 +12,13 @@ import { Icon, Popconfirm, message, + Descriptions, } from "antd"; import Link from "umi/link"; import { connect } from "dva"; import { HealthStatusCircle } from "@/components/infini/health_status_circle"; import PageHeaderWrapper from "@/components/PageHeaderWrapper"; +import indexStyles from "./index.less"; import styles from "./step.less"; import clusterBg from "@/assets/cluster_bg.png"; import { formatMessage } from "umi/locale"; @@ -206,6 +208,37 @@ class Index extends React.Component { }, ]; + componentDidMount() { + const { pageSize } = this.props.clusterConfig; + this.fetchData({ + size: pageSize, + }); + } + + formatExpandedRowRender = (item) => { + return ( +
+ + + {formatMessage({id: item.schema === 'https' + ? "cluster.regist.step.complete.tls.yes" + : "cluster.regist.step.complete.tls.no"})} + + + {(item.basic_auth && typeof item.basic_auth.username !=='undefined' && item.basic_auth.username !== '') + ? formatMessage({id: "cluster.regist.step.complete.tls.yes"}) + : formatMessage({id: "cluster.regist.step.complete.tls.no"})} + + + {item.description} + + +
+ ); + }; + fetchData = (params) => { const { dispatch } = this.props; dispatch({ @@ -213,12 +246,6 @@ class Index extends React.Component { payload: params, }); }; - componentDidMount() { - const { pageSize } = this.props.clusterConfig; - this.fetchData({ - size: pageSize, - }); - } handleSearchClick = () => { const { form } = this.props; @@ -356,6 +383,7 @@ class Index extends React.Component { span:first-child { + font-weight: 500; + } +} From bbb176f868bc79ed80fcee0ee144afcd784c92a5 Mon Sep 17 00:00:00 2001 From: shiyang Date: Mon, 6 Dec 2021 18:08:57 +0800 Subject: [PATCH 4/4] update infini logo_en.svg --- web/src/assets/logo_en.svg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/src/assets/logo_en.svg b/web/src/assets/logo_en.svg index bb1eea37..c7f54723 100644 --- a/web/src/assets/logo_en.svg +++ b/web/src/assets/logo_en.svg @@ -1 +1 @@ -未标题-1 \ No newline at end of file +infinidata \ No newline at end of file