Merge "feature: update to support configuration"

.zuul.yaml

@@ -564,6 +564,7 @@
               - ^src/styles/.*$
               - ^src/locales/.*$
               - ^src/asset/.*$
+              - ^src/layouts/.*$
               # .zuul.yaml
               - ^.zuul.yaml$
               # markdown
@@ -595,6 +596,7 @@
               - ^src/styles/.*$
               - ^src/locales/.*$
               - ^src/asset/.*$
+              - ^src/layouts/.*$
               # .zuul.yaml
               - ^.zuul.yaml$
               # markdown
@@ -619,6 +621,7 @@
               - ^src/styles/.*$
               - ^src/locales/.*$
               - ^src/asset/.*$
+              - ^src/layouts/.*$
               # .zuul.yaml
               - ^.zuul.yaml$
               # markdown
@@ -651,6 +654,7 @@
               - ^src/styles/.*$
               - ^src/locales/.*$
               - ^src/asset/.*$
+              - ^src/layouts/.*$
               # .zuul.yaml
               - ^.zuul.yaml$
               # markdown

src/layouts/Auth/index.jsx

@@ -22,15 +22,31 @@ import loginFullImage from 'asset/image/login-full.png';
 import loginRightLogo from 'asset/image/loginRightLogo.png';
 import styles from './index.less';
 
-@inject('rootStore')
+export class AuthLayout extends Component {
-@observer
-class AuthLayout extends Component {
   constructor(props) {
     super(props);
 
     this.routes = props.route.routes;
   }
 
+  renderRight() {
+    return (
+      <div className={styles.right}>
+        <img
+          alt=""
+          className={styles['login-full-image']}
+          src={loginFullImage}
+        />
+        <div className={styles['full-image-front']} />
+        <img
+          src={loginRightLogo}
+          alt=""
+          className={styles['login-right-logo']}
+        />
+      </div>
+    );
+  }
+
   render() {
     return (
       <div className={styles.container}>
@@ -47,22 +63,10 @@ class AuthLayout extends Component {
             {renderRoutes(this.routes)}
           </div>
         </div>
-        <div className={styles.right}>
+        {this.renderRight()}
-          <img
-            alt=""
-            className={styles['login-full-image']}
-            src={loginFullImage}
-          />
-          <div className={styles['full-image-front']} />
-          <img
-            src={loginRightLogo}
-            alt=""
-            className={styles['login-right-logo']}
-          />
-        </div>
       </div>
     );
   }
 }
 
-export default AuthLayout;
+export default inject('rootStore')(observer(AuthLayout));

src/pages/auth/containers/Login/index.jsx

@@ -63,7 +63,7 @@ export class Login extends Component {
       product_name: { zh = t('Cloud Platform'), en = 'Cloud Platform' } = {},
     } = this.info;
     const { isLocaleZh } = i18n;
-    return isLocaleZh ? zh : en;
+    return t('Welcome, {name}', { name: isLocaleZh ? zh : en });
   }
 
   get domains() {
@@ -280,9 +280,7 @@ export class Login extends Component {
   render() {
     return (
       <>
-        <h1 className={styles.welcome}>
+        <h1 className={styles.welcome}>{this.productName}</h1>
-          {t('Welcome, {name}', { name: this.productName })}
-        </h1>
         <SimpleForm
           formItems={this.formItems}
           name="normal_login"