Merge pull request #1221 from loadchange/issues-1007

Fix Issues #1007
2019-05-20 19:25:23 +08:00 · 2019-05-20 19:25:23 +08:00 · 45f01772cb
commit 45f01772cb
parent dd029a913a 7c1afc30c8
4 changed files with 18 additions and 17 deletions
--- a/console/src/main/resources/static/console-fe/src/pages/ServiceManagement/ServiceDetail/EditInstanceDialog.js
+++ b/console/src/main/resources/static/console-fe/src/pages/ServiceManagement/ServiceDetail/EditInstanceDialog.js
@ -67,7 +67,7 @@ class EditInstanceDialog extends React.Component {
        port,
        ephemeral,
        weight,
-        enable: enabled,
+        enabled,
        metadata: replaceEnter(METADATA_SEPARATOR)(metadataText),
      },
      dataType: 'text',
--- a/console/src/main/resources/static/console-fe/src/pages/ServiceManagement/ServiceDetail/InstanceTable.js
+++ b/console/src/main/resources/static/console-fe/src/pages/ServiceManagement/ServiceDetail/InstanceTable.js
@ -26,6 +26,7 @@ class InstanceTable extends React.Component {
    locale: PropTypes.object,
    clusterName: PropTypes.string,
    serviceName: PropTypes.string,
+    groupName: PropTypes.string,
  };

  constructor(props) {
@ -88,7 +89,7 @@ class InstanceTable extends React.Component {
        port,
        ephemeral,
        weight,
-        enable: !enabled,
+        enabled: !enabled,
        metadata: JSON.stringify(metadata),
      },
      dataType: 'text',
--- a/console/src/main/resources/static/css/main.css
+++ b/console/src/main/resources/static/css/main.css
--- a/console/src/main/resources/static/js/main.js
+++ b/console/src/main/resources/static/js/main.js