Merge branch 'master' of ssh://git.infini.ltd:64221/infini/search-center

.gitignore

@@ -30,4 +30,5 @@ appveyor.yml
 *.exe
 web/.github/
 web/report*
-log/
+log/
+.env

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;

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 : (
           <SiderMenu
             icon={icon}
-            logo={logo}
+            logo={getLocale() === 'zh-CN' ? logo : logoEN}
             Authorized={Authorized}
             theme={navTheme}
             onCollapse={this.handleMenuCollapse}

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 (
+        <div>
+          <Descriptions
+              size='small'
+          >
+            <Descriptions.Item className={indexStyles.descriptionsItem} label="TLS">
+              {formatMessage({id: item.schema === 'https'
+                  ? "cluster.regist.step.complete.tls.yes"
+                  : "cluster.regist.step.complete.tls.no"})}
+            </Descriptions.Item>
+            <Descriptions.Item className={indexStyles.descriptionsItem} label={formatMessage({id: "cluster.regist.step.connect.label.auth"})}>
+              {(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"})}
+            </Descriptions.Item>
+            <Descriptions.Item className={indexStyles.descriptionsItem} label={formatMessage({id: "cluster.manage.table.column.description"})}>
+              {item.description}
+            </Descriptions.Item>
+          </Descriptions>
+        </div>
+    );
+  };
+
   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 {
           <Table
             bordered
             columns={this.columns}
+            expandedRowRender={this.formatExpandedRowRender}
             dataSource={data}
             onChange={this.handleTableChange}
             rowKey="id"

web/src/pages/System/Cluster/Index.less

@@ -0,0 +1,5 @@
+.descriptionsItem {
+  >span:first-child {
+    font-weight: 500;
+  }
+}