diff --git a/web/src/components/GlobalHeader/DropdownSelect.js b/web/src/components/GlobalHeader/DropdownSelect.js index df5b23a6..fa3deb57 100644 --- a/web/src/components/GlobalHeader/DropdownSelect.js +++ b/web/src/components/GlobalHeader/DropdownSelect.js @@ -73,8 +73,9 @@ class DropdownSelect extends React.Component{ > ( @@ -100,7 +101,7 @@ class DropdownSelect extends React.Component{ return( this.props.visible ? ( - ) : "" ) diff --git a/web/src/components/GlobalHeader/DropdownSelect.less b/web/src/components/GlobalHeader/DropdownSelect.less index b9b49117..359532d8 100644 --- a/web/src/components/GlobalHeader/DropdownSelect.less +++ b/web/src/components/GlobalHeader/DropdownSelect.less @@ -17,6 +17,7 @@ .dropmenu{ box-shadow: 0 0 15px 0 rgba(0, 0, 0, .15); padding: 20px; + padding-bottom: 4px; width: 500px; background: #fff; .item{ @@ -39,4 +40,10 @@ bottom: 40px; width: 100%; text-align: center; +} + +@media screen and (max-width: 500px) { + .dropmenu{ + width: 100%; + } } \ No newline at end of file diff --git a/web/src/components/GlobalHeader/index.js b/web/src/components/GlobalHeader/index.js index bf0b0cd5..28b830de 100644 --- a/web/src/components/GlobalHeader/index.js +++ b/web/src/components/GlobalHeader/index.js @@ -24,7 +24,7 @@ export default class GlobalHeader extends PureComponent { this.triggerResizeEvent(); }; render() { - const { collapsed, isMobile, logo, clusterVisible, clusterList } = this.props; + const { collapsed, isMobile, logo, clusterVisible, clusterList, selectedCluster } = this.props; return (
{isMobile && ( @@ -37,7 +37,8 @@ export default class GlobalHeader extends PureComponent { type={collapsed ? 'menu-unfold' : 'menu-fold'} onClick={this.toggle} /> - { diff --git a/web/src/layouts/Header.js b/web/src/layouts/Header.js index 5a3e7bd4..de8a3263 100644 --- a/web/src/layouts/Header.js +++ b/web/src/layouts/Header.js @@ -182,4 +182,5 @@ export default connect(({ user, global, setting, loading }) => ({ setting, clusterVisible: global.clusterVisible, clusterList: global.clusterList, + selectedCluster: global.selectedCluster, }))(HeaderView); diff --git a/web/src/models/global.js b/web/src/models/global.js index 1b28442a..498048e2 100644 --- a/web/src/models/global.js +++ b/web/src/models/global.js @@ -12,7 +12,7 @@ export default { notices: [], clusterVisible: true, clusterList: [], - selectedCluster: '', + selectedCluster: {name:"Select cluster", id: ""}, }, effects: { @@ -46,6 +46,17 @@ export default { } res = formatESSearchResult(res) let clusterList = yield select(state => state.global.clusterList); + if(clusterList.length === 0 && res.data.length > 0){ + yield put({ + type: 'saveData', + payload: { + selectedCluster: { + name: res.data[0].name, + id: res.data[0].id, + } + } + }) + } let data = res.data.map((item)=>{ return { name: item.name, diff --git a/web/src/pages/Cluster/ClusterItem.less b/web/src/pages/Cluster/ClusterItem.less index e4e5b1cc..624cfb45 100644 --- a/web/src/pages/Cluster/ClusterItem.less +++ b/web/src/pages/Cluster/ClusterItem.less @@ -1,7 +1,10 @@ .clusterItem { - display: inline-block; - text-align: center; width: 100%; height: 400px; } + +.clusterItemWrapper { + display: inline-block; + margin: 0 auto; +} \ No newline at end of file diff --git a/web/src/pages/Cluster/ClusterList.js b/web/src/pages/Cluster/ClusterList.js index 13a44cf7..1346b5d7 100644 --- a/web/src/pages/Cluster/ClusterList.js +++ b/web/src/pages/Cluster/ClusterList.js @@ -52,6 +52,9 @@ class ClusterList extends React.Component{ } class ClusterItem extends Component { + state={ + wrapperWidth: 235 + } componentDidMount(){ this.root.addEventListener("click", function({offsetX, offsetY}){ @@ -117,7 +120,9 @@ class ClusterItem extends Component { } render(){ return ( -
this.root=ref}>
+
+
this.root=ref}>
+
) } }