diff --git a/src/components/PrometheusChart/component/BaseContent.jsx b/src/components/PrometheusChart/component/BaseContent.jsx
index 18130795..b4c043c1 100644
--- a/src/components/PrometheusChart/component/BaseContent.jsx
+++ b/src/components/PrometheusChart/component/BaseContent.jsx
@@ -36,6 +36,7 @@ const BaseContent = (props) => {
fetchNodesFunc,
defaultNode,
children,
+ type,
} = props;
const [node, Nodes, setNode, setNodes] = useNodeSelect(defaultNode);
@@ -56,7 +57,7 @@ const BaseContent = (props) => {
setIsFetchingNodes(true);
const ret = await fetchNodesFunc();
setNodes(ret);
- if (!node) {
+ if (!node || refresh) {
setNode(ret[0]);
}
// 非自选时间段刷新时间
@@ -82,6 +83,10 @@ const BaseContent = (props) => {
handleRefresh();
}, [interval, range]);
+ useEffect(() => {
+ handleRefresh(true);
+ }, [type]);
+
useEffect(() => {
setIsLoading(true);
setTimeout(() => {
diff --git a/src/pages/monitor/containers/OtherService/components/Memcache/index.jsx b/src/pages/monitor/containers/OtherService/components/Memcache/index.jsx
index e4fe68c0..d2244b8c 100644
--- a/src/pages/monitor/containers/OtherService/components/Memcache/index.jsx
+++ b/src/pages/monitor/containers/OtherService/components/Memcache/index.jsx
@@ -98,6 +98,10 @@ export const chartConfig = {
chartCardList,
};
-export default () => (
-
+export default ({ type }) => (
+
);
diff --git a/src/pages/monitor/containers/OtherService/components/Mysql/index.jsx b/src/pages/monitor/containers/OtherService/components/Mysql/index.jsx
index 2becbe6f..4026a691 100644
--- a/src/pages/monitor/containers/OtherService/components/Mysql/index.jsx
+++ b/src/pages/monitor/containers/OtherService/components/Mysql/index.jsx
@@ -111,6 +111,10 @@ export const chartConfig = {
chartCardList,
};
-export default () => (
-
+export default ({ type }) => (
+
);
diff --git a/src/pages/monitor/containers/OtherService/components/RabbitMQ/index.jsx b/src/pages/monitor/containers/OtherService/components/RabbitMQ/index.jsx
index 74bcb326..b2bb8ee7 100644
--- a/src/pages/monitor/containers/OtherService/components/RabbitMQ/index.jsx
+++ b/src/pages/monitor/containers/OtherService/components/RabbitMQ/index.jsx
@@ -128,6 +128,10 @@ export const chartConfig = {
chartCardList,
};
-export default () => (
-
+export default ({ type }) => (
+
);
diff --git a/src/pages/monitor/containers/OtherService/index.jsx b/src/pages/monitor/containers/OtherService/index.jsx
index 0cd31ed7..771a2c13 100644
--- a/src/pages/monitor/containers/OtherService/index.jsx
+++ b/src/pages/monitor/containers/OtherService/index.jsx
@@ -63,7 +63,7 @@ class OtherService extends Component {
Cmp = Mysql;
break;
}
- return ;
+ return ;
};
render() {
diff --git a/test/e2e/config/config-other.yaml b/test/e2e/config/config-other.yaml
index 2d0c528a..df17b908 100644
--- a/test/e2e/config/config-other.yaml
+++ b/test/e2e/config/config-other.yaml
@@ -20,8 +20,8 @@ testFiles:
# identity
- pages/identity/role.spec.js
- pages/identity/domain.spec.js
- - pages/identity/user.spec.js
- - pages/identity/project.spec.js
+ # - pages/identity/user.spec.js
+ # - pages/identity/project.spec.js
- pages/identity/user-group.spec.js
# configuration
- pages/configuration/metadata.spec.js