diff --git a/web/mock/cluster/cluster.js b/web/mock/cluster/cluster.js index 539f3756..318b7d80 100644 --- a/web/mock/cluster/cluster.js +++ b/web/mock/cluster/cluster.js @@ -21,7 +21,7 @@ export default { }, "created": "2021-02-20T16:03:30.867084+08:00", "description": "xx业务集群1", - "enabled": false, + "enabled": true, "endpoint": "http://localhost:9200", "name": "cluster1", "updated": "2021-02-20T16:03:30.867084+08:00" @@ -38,7 +38,7 @@ export default { }, "created": "2021-02-20T16:03:30.867084+08:00", "description": "xx业务集群2", - "enabled": false, + "enabled": true, "endpoint": "http://localhost:9201", "name": "cluster2", "updated": "2021-02-20T16:03:30.867084+08:00" diff --git a/web/src/components/GlobalHeader/DropdownSelect.js b/web/src/components/GlobalHeader/DropdownSelect.js index 11d93254..d59b36db 100644 --- a/web/src/components/GlobalHeader/DropdownSelect.js +++ b/web/src/components/GlobalHeader/DropdownSelect.js @@ -44,7 +44,7 @@ class DropdownSelect extends React.Component{ } handleInfiniteOnLoad = (page) => { - let { data } = this.state; + let { data } = this.props; this.setState({ loading: true, }) diff --git a/web/src/models/global.js b/web/src/models/global.js index 25c28128..a8e194ef 100644 --- a/web/src/models/global.js +++ b/web/src/models/global.js @@ -2,6 +2,8 @@ import { queryNotices } from '@/services/api'; import {message} from "antd"; import {searchClusterConfig} from "@/services/cluster"; import {formatESSearchResult} from '@/lib/elasticsearch/util'; +import {Modal} from 'antd'; +import router from "umi/router"; export default { @@ -47,13 +49,33 @@ export default { } res = formatESSearchResult(res) let clusterList = yield select(state => state.global.clusterList); - let data = res.data.map((item)=>{ + let data = res.data.filter(item=>item.enabled).map((item)=>{ return { name: item.name, id: item.id, }; }) + if(clusterList.length === 0){ + if(data.length === 0 ){ + Modal.info({ + title: '系统提示', + content: '当前没有可用集群,点击确定将自动跳转到 系统设置=>集群设置', + okText: '确定', + onOk() { + router.push('/system/cluster') + }, + }); + }else{ + yield put({ + type: 'saveData', + payload:{ + selectedCluster: data[0], + } + }); + } + } + yield put({ type: 'saveData', payload: {