Merge pull request alibaba#738 from loadchange/issues-735

Fix Issues alibaba#735
dabingRyan · Feb 28, 2019 · 04bc0e2 · 04bc0e2
2 parents f62c66e + 589d6c3
commit 04bc0e2
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 10 deletions.
diff --git a/console/src/main/resources/static/console-fe/src/locales/en-US.js b/console/src/main/resources/static/console-fe/src/locales/en-US.js
@@ -110,6 +110,9 @@ const I18N_CONF = {
     protectThreshold: 'Protect Threshold',
     serviceName: 'Service Name',
     editService: 'Edit Service',
+    healthCheckPatternService: 'Service',
+    healthCheckPatternClient: 'Client',
+    healthCheckPatternNone: 'None',
   },
   EditServiceDialog: {
     createService: 'Create Service',

diff --git a/console/src/main/resources/static/console-fe/src/locales/zh-CN.js b/console/src/main/resources/static/console-fe/src/locales/zh-CN.js
@@ -110,6 +110,9 @@ const I18N_CONF = {
     protectThreshold: '保护阈值',
     serviceName: '服务名',
     editService: '编辑服务',
+    healthCheckPatternService: '服务端',
+    healthCheckPatternClient: '客户端',
+    healthCheckPatternNone: '禁止',
   },
   EditServiceDialog: {
     createService: '创建服务',

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
@@ -91,6 +91,11 @@ class ServiceDetail extends React.Component {
     const { locale = {} } = this.props;
     const { serviceName, loading, service = {}, clusters } = this.state;
     const { metadata = {}, selector = {} } = service;
+    const healthCheckMap = {
+      server: locale.healthCheckPatternService,
+      client: locale.healthCheckPatternClient,
+      none: locale.healthCheckPatternNone,
+    };
     const metadataText = Object.keys(metadata)
       .map(key => `${key}=${metadata[key]}`)
       .join(',');
@@ -134,7 +139,7 @@ class ServiceDetail extends React.Component {
               <Input value={service.protectThreshold} readOnly />
             </FormItem>
             <FormItem label={`${locale.healthCheckPattern}:`}>
-              <Input value={service.healthCheckMode} readOnly />
+              <Input value={healthCheckMap[service.healthCheckMode]} readOnly />
             </FormItem>
             <FormItem label={`${locale.metadata}:`}>
               <Input value={metadataText} readOnly />

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