diff --git a/web/src/components/kibana/console/components/request_status_bar/request_status_bar.tsx b/web/src/components/kibana/console/components/request_status_bar/request_status_bar.tsx index c9e2e55c..0d98f85d 100644 --- a/web/src/components/kibana/console/components/request_status_bar/request_status_bar.tsx +++ b/web/src/components/kibana/console/components/request_status_bar/request_status_bar.tsx @@ -68,7 +68,7 @@ export const RequestStatusBar: FunctionComponent = ({ let content: React.ReactNode = null; const clusterContent = ( - {selectedCluster.endpoint} - {selectedCluster.version} + {selectedCluster.host} - {selectedCluster.version} ); diff --git a/web/src/models/global.js b/web/src/models/global.js index 61564c7c..caa25951 100644 --- a/web/src/models/global.js +++ b/web/src/models/global.js @@ -58,6 +58,7 @@ export default { name: item.name, id: item.id, endpoint: item.endpoint, + host: item.host, version: item.version, }; }) @@ -131,10 +132,10 @@ export default { if(pathname && global.selectedClusterID){ const newPart = `/elasticsearch/${global.selectedClusterID}/`; if(!pathname.includes('elasticsearch')){ - history.replace(pathname+newPart+search) + history.replace(pathname+newPart+ (search || '')) }else{ const newPath = pathname.replace(/\/elasticsearch\/(\w+)\/?/, newPart); - history.replace(newPath+search) + history.replace(newPath+(search || '')) } } }, diff --git a/web/src/pages/System/Cluster/Index.js b/web/src/pages/System/Cluster/Index.js index c9b8e618..510eb7a8 100644 --- a/web/src/pages/System/Cluster/Index.js +++ b/web/src/pages/System/Cluster/Index.js @@ -93,8 +93,8 @@ class Index extends React.Component { } },{ title: '集群地址', - dataIndex: 'endpoint', - key: 'endpoint', + dataIndex: 'host', + key: 'host', }, { title: '监控启用状态',