From a9201c794e92fe9fed3b035d571b9539949b4364 Mon Sep 17 00:00:00 2001
From: junjie <junjie.xia@fit2cloud.com>
Date: Mon, 17 May 2021 19:11:07 +0800
Subject: [PATCH] =?UTF-8?q?feat(frontend):i18n=20fix;run=20build=20?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E5=86=B2=E7=AA=81=20fix=E5=90=8E=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../canvas/components/Editor/PreviewFullScreen.vue          | 2 +-
 frontend/src/components/canvas/components/Toolbar.vue       | 6 +++---
 .../src/components/canvas/custom-component/UserView.vue     | 2 +-
 frontend/src/lang/en.js                                     | 4 ++--
 frontend/src/lang/zh.js                                     | 2 +-
 frontend/src/layout/components/Topbar.vue                   | 2 +-
 frontend/src/styles/index.scss                              | 4 ++--
 frontend/src/styles/variables.scss                          | 2 +-
 frontend/src/views/login/index.vue                          | 4 ++--
 frontend/src/views/panel/edit/index.vue                     | 2 +-
 10 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/frontend/src/components/canvas/components/Editor/PreviewFullScreen.vue b/frontend/src/components/canvas/components/Editor/PreviewFullScreen.vue
index 730c1c558f..1ba977c4df 100644
--- a/frontend/src/components/canvas/components/Editor/PreviewFullScreen.vue
+++ b/frontend/src/components/canvas/components/Editor/PreviewFullScreen.vue
@@ -1,5 +1,5 @@
 <template>
-  <div style="width: 100%;height: 100%;">
+  <div style="width: 100%;height: 100vh;">
     <span style="line-height: 35px; position: absolute; top:10px;right: 20px;z-index:100000">
       <el-button size="mini" @click="toDir">
         关闭
diff --git a/frontend/src/components/canvas/components/Toolbar.vue b/frontend/src/components/canvas/components/Toolbar.vue
index cfd237818d..e74d86054d 100644
--- a/frontend/src/components/canvas/components/Toolbar.vue
+++ b/frontend/src/components/canvas/components/Toolbar.vue
@@ -3,13 +3,13 @@
     <div class="toolbar">
 
       <div class="canvas-config">
-        <span> {{ $t(panel.canvas_size)}} </span>
+        <span> {{ $t('panel.canvas_size') }} </span>
         <input v-model="canvasStyleData.width">
         <span>*</span>
         <input v-model="canvasStyleData.height">
       </div>
       <div class="canvas-config" style="margin-right: 10px">
-        <span> {{ $t(panel.canvas_scale)}} </span>
+        <span> {{ $t('panel.canvas_scale') }} </span>
         <input v-model="scale" @input="handleScaleChange"> %
       </div>
 
@@ -38,7 +38,7 @@
 
       <span style="float: right;margin-left: 10px">
         <el-button size="mini" @click="closePanelEdit">
-          {{ $t(commons.close) }}
+          {{ $t('commons.close') }}
         </el-button>
       </span>
     </div>
diff --git a/frontend/src/components/canvas/custom-component/UserView.vue b/frontend/src/components/canvas/custom-component/UserView.vue
index 4a810e9638..47484a844f 100644
--- a/frontend/src/components/canvas/custom-component/UserView.vue
+++ b/frontend/src/components/canvas/custom-component/UserView.vue
@@ -2,7 +2,7 @@
   <div v-loading="requestStatus==='waiting'" class="rect-shape">
     <div v-if="requestStatus==='error'" style=";width: 100%;height: 100%;background-color: #ece7e7; text-align: center">
       <div style="font-size: 12px; color: #9ea6b2;">
-        {{ $t(panel.error_data) }}<br>
+        {{ $t('panel.error_data') }}<br>
         {{ message }}
       </div>
     </div>
diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js
index d0b4cea339..5af22e3448 100644
--- a/frontend/src/lang/en.js
+++ b/frontend/src/lang/en.js
@@ -73,8 +73,8 @@ export default {
     size: 'Global Size'
   },
   login: {
-    title: 'Login Form',
-    welcome: 'welcome To ',
+    title: 'Login',
+    welcome: 'Welcome To ',
     logIn: 'Login',
     username: 'Username',
     password: 'Password',
diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js
index 44fd07237c..6036708098 100644
--- a/frontend/src/lang/zh.js
+++ b/frontend/src/lang/zh.js
@@ -852,7 +852,7 @@ export default {
     field: '字段',
     unshared_people: '未分享人员',
     shared_people: '已分享人员',
-    error_data: '获取数据出错 请联系管理员 Error getting data, please contact administrator',
+    error_data: '获取数据出错，请联系管理员',
     canvas_size: '画布大小',
     canvas_scale: '画布比例',
     style: '样式',
diff --git a/frontend/src/layout/components/Topbar.vue b/frontend/src/layout/components/Topbar.vue
index 3c11c823b6..ebb84789ec 100644
--- a/frontend/src/layout/components/Topbar.vue
+++ b/frontend/src/layout/components/Topbar.vue
@@ -39,7 +39,7 @@
       </template>
 
       <el-dropdown class="top-dropdown" style="display: flex;align-items: center;">
-        <span class="el-dropdown-link" style="font-size: 13px;">
+        <span class="el-dropdown-link" style="font-size: 14px;">
           {{ name }}<i class="el-icon-arrow-down el-icon--right" />
         </span>
         <el-dropdown-menu slot="dropdown">
diff --git a/frontend/src/styles/index.scss b/frontend/src/styles/index.scss
index 8234c98520..b0661ad2fa 100644
--- a/frontend/src/styles/index.scss
+++ b/frontend/src/styles/index.scss
@@ -13,7 +13,7 @@
 
 
 body {
-  height: $contentHeight;
+  //height: $contentHeight;
   -moz-osx-font-smoothing: grayscale;
   -webkit-font-smoothing: antialiased;
   text-rendering: optimizeLegibility;
@@ -30,7 +30,7 @@ html {
 }
 
 #app {
-  height: $contentHeight;
+  //height: $contentHeight;
 }
 
 *,
diff --git a/frontend/src/styles/variables.scss b/frontend/src/styles/variables.scss
index 737f134ef3..017776b1ff 100644
--- a/frontend/src/styles/variables.scss
+++ b/frontend/src/styles/variables.scss
@@ -42,7 +42,7 @@ $subMenuHover:#f18126;
 
 $sideBarWidth: 210px;
 $topBarHeight: 56px;
-$contentHeight: 100vh;
+$contentHeight: calc(100vh - 56px);
 
 // the :export directive is the magic sauce for webpack
 // https://www.bluematador.com/blog/how-to-share-variables-between-js-and-sass
diff --git a/frontend/src/views/login/index.vue b/frontend/src/views/login/index.vue
index 0edad9a879..f3c1f7a879 100644
--- a/frontend/src/views/login/index.vue
+++ b/frontend/src/views/login/index.vue
@@ -33,7 +33,7 @@
             </div>
             <div class="login-btn">
               <el-button type="primary" class="submit" size="default" @click.native.prevent="handleLogin">
-                {{ $t('commons.button.login') }}
+                {{ $t('commons.login') }}
               </el-button>
             </div>
             <div class="login-msg">
@@ -163,7 +163,7 @@ export default {
 
 .login-background {
   background-color: $--background-color-base;
-  height: 100%;
+  height: 100vh;
   @include login-center;
 }
 
diff --git a/frontend/src/views/panel/edit/index.vue b/frontend/src/views/panel/edit/index.vue
index 40e2aa03bf..850e36a2c4 100644
--- a/frontend/src/views/panel/edit/index.vue
+++ b/frontend/src/views/panel/edit/index.vue
@@ -115,7 +115,7 @@ import { get } from '@/api/panel/panel'
 // 引入样式
 import '@/components/canvas/assets/iconfont/iconfont.css'
 import '@/components/canvas/styles/animate.css'
-import '@/components/canvas/styles/reset.css'
+// import '@/components/canvas/styles/reset.css'
 
 import { ApplicationContext } from '@/utils/ApplicationContext'
 import FilterDialog from '../filter/filterDialog'