Merge pull request #1201 from justlive1/master

修复服务详情页面集群列表获取只获取groupName=DEFAULT_GROUP的数据
alibaba · May 14, 2019 · 8639759 · 8639759
2 parents 80dd3bd + fd32726
commit 8639759
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 18 deletions.
diff --git a/...in/resources/static/console-fe/src/pages/ServiceManagement/ServiceDetail/InstanceTable.js b/...in/resources/static/console-fe/src/pages/ServiceManagement/ServiceDetail/InstanceTable.js
@@ -52,14 +52,15 @@ class InstanceTable extends React.Component {
   }
 
   getInstanceList() {
-    const { clusterName, serviceName } = this.props;
+    const { clusterName, serviceName, groupName } = this.props;
     if (!clusterName) return;
     const { pageSize, pageNum } = this.state;
     request({
       url: 'v1/ns/catalog/instances',
       data: {
         serviceName,
         clusterName,
+        groupName,
         pageSize,
         pageNo: pageNum,
       },

diff --git a/...in/resources/static/console-fe/src/pages/ServiceManagement/ServiceDetail/ServiceDetail.js b/...in/resources/static/console-fe/src/pages/ServiceManagement/ServiceDetail/ServiceDetail.js
@@ -93,7 +93,7 @@ class ServiceDetail extends React.Component {
 
   render() {
     const { locale = {} } = this.props;
-    const { serviceName, loading, service = {}, clusters } = this.state;
+    const { serviceName, groupName, loading, service = {}, clusters } = this.state;
     const { metadata = {}, selector = {} } = service;
     const metadataText = processMetaData(METADATA_ENTER)(metadata);
     return (
@@ -169,7 +169,11 @@ class ServiceDetail extends React.Component {
                 </Button>
               }
             >
-              <InstanceTable clusterName={cluster.name} serviceName={serviceName} />
+              <InstanceTable
+                clusterName={cluster.name}
+                serviceName={serviceName}
+                groupName={groupName}
+              />
             </Card>
           ))}
         </Loading>

diff --git a/console/src/main/resources/static/css/main.css b/console/src/main/resources/static/css/main.css
diff --git a/console/src/main/resources/static/js/main.js b/console/src/main/resources/static/js/main.js