fix(style): 一些样式的优化(header、namespace)

1Panel-dev · Oct 27, 2021 · a4b7cb9 · a4b7cb9
1 parent fbd521f
commit a4b7cb9
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 12 deletions.
diff --git a/web/dashboard/src/business/app-layout/header-components/Help.vue b/web/dashboard/src/business/app-layout/header-components/Help.vue
@@ -15,7 +15,7 @@
         <img style="margin-left: 0;" :src="require('@/assets/KubePi-red.png')" class="sidebar-logo" alt="Sidebar Logo">
         <p>{{ $t("commons.personal.introduction") }}</p>
         <p>{{ $t("commons.personal.introduction2") }}</p>
-        <strong>{{ $t("commons.personal.version") }}: v1.1.0</strong>
+        <strong>{{ $t("commons.personal.version") }}: v1.1.1</strong>
       </div>
       <div style="padding:15px 20px;box-shadow:rgb(69 70 70) 0 -14px 24px -12px;">
         <el-row style="font-size: 6px;color: #ffffff;text-align: center">
@@ -54,7 +54,7 @@ export default {
           window.open("https://kubeoperator.io/", "_blank")
           break
         case "docs":
-          window.open("https://kubeoperator.io/docs/", "_blank")
+          window.open("https://kubeoperator.io/docs/kubepi/", "_blank")
           break
         default:
           this.aboutDialogVisible = true

diff --git a/web/dashboard/src/business/app-layout/header-components/ProjectSwitch.vue b/web/dashboard/src/business/app-layout/header-components/ProjectSwitch.vue
@@ -5,7 +5,7 @@
       <span>{{ getNamespaceName }}</span>
       <i class="el-icon-arrow-down el-icon--right"></i>
     </span>
-    <el-dropdown-menu slot="dropdown" style="height: 600px;overflow:auto">
+    <el-dropdown-menu slot="dropdown" style="max-height: 300px;overflow:auto">
       <el-dropdown-item command="">All Namespaces</el-dropdown-item>
       <el-dropdown-item disabled divided></el-dropdown-item>
       <el-dropdown-item v-for="(value,key) in namespaceOptions" :key="key" :command="value">{{ value }}

diff --git a/web/dashboard/src/business/app-layout/header-components/UserSetting.vue b/web/dashboard/src/business/app-layout/header-components/UserSetting.vue
@@ -6,7 +6,10 @@
         <i class="el-icon-arrow-down el-icon--right"></i>
     </span>
         <el-dropdown-menu slot="dropdown">
-            <el-dropdown-item style="text-align: center" command="exit">
+            <el-dropdown-item style="text-align: center;width:80px" command="back">
+                {{ $t("commons.personal.back") }}
+            </el-dropdown-item>
+            <el-dropdown-item style="text-align: center;width:80px" command="exit">
                 {{ $t("commons.personal.exit") }}
             </el-dropdown-item>
         </el-dropdown-menu>
@@ -32,7 +35,7 @@
                         this.exit()
                         break
                     default:
-                        this.aboutDialogVisible = true
+                        window.open("/kubepi", '_self');
                         break
                 }
             },

diff --git a/web/dashboard/src/i18n/lang/en-US.js b/web/dashboard/src/i18n/lang/en-US.js
@@ -9,6 +9,7 @@ const message = {
       prompt: "Prompt",
     },
     personal: {
+      back: "Back",
       exit: "Exit",
       project_url: "Project Address",
       issue: "Feedback",

diff --git a/web/dashboard/src/i18n/lang/zh-CN.js b/web/dashboard/src/i18n/lang/zh-CN.js
@@ -10,6 +10,7 @@ const message = {
       prompt: "提示",
     },
     personal: {
+      back: "返回",
       exit: "退出",
       project_url: "项目地址",
       issue: "问题反馈",

diff --git a/web/kubepi/src/business/app-layout/header-components/Help.vue b/web/kubepi/src/business/app-layout/header-components/Help.vue
@@ -15,7 +15,7 @@
         <img style="margin-left: 0;" :src="require('@/assets/KubePi-red.png')" class="sidebar-logo" alt="Sidebar Logo">
         <p>{{ $t("commons.personal.introduction") }}</p>
         <p>{{ $t("commons.personal.introduction2") }}</p>
-        <strong>{{ $t("commons.personal.version") }}: v1.1.0</strong>
+        <strong>{{ $t("commons.personal.version") }}: v1.1.1</strong>
       </div>
       <div style="padding:15px 20px;box-shadow:rgb(69 70 70) 0 -14px 24px -12px;">
         <el-row style="font-size: 6px;color: #ffffff;text-align: center">
@@ -54,7 +54,7 @@ export default {
           window.open("https://kubeoperator.io/", "_blank")
           break
         case "docs":
-          window.open("https://kubeoperator.io/docs/", "_blank")
+          window.open("https://kubeoperator.io/docs/kubepi/", "_blank")
           break
         default:
           this.aboutDialogVisible = true

diff --git a/web/kubepi/src/business/cluster-management/create/index.vue b/web/kubepi/src/business/cluster-management/create/index.vue
@@ -11,14 +11,14 @@
             </el-form-item>
 
             <el-divider content-position="center">{{ $t('business.cluster.connect_setting') }}</el-divider>
-            <el-form-item :label="$t('business.cluster.connect_direction')">
+            <!-- <el-form-item :label="$t('business.cluster.connect_direction')">
               <el-radio v-model="form.direction" label="forward" @change="onDirectionChange">
                 {{ $t('business.cluster.connect_forward') }}
               </el-radio>
               <el-radio v-model="form.direction" disabled label="backward" @change="onDirectionChange">
                 {{ $t('business.cluster.connect_backward') }}({{ $t("business.cluster.expect") }})
               </el-radio>
-            </el-form-item>
+            </el-form-item> -->
             <el-form-item :label="$t('business.cluster.authenticate_mode')">
               <el-radio v-model="form.authenticationMode" label="bearer"
                         @change="onAuthenticationModeChange">Bearer Token
@@ -36,13 +36,13 @@
               </el-form-item>
               <div v-if="!form.apiServerInsecure">
                 <el-form-item label="Ca Certificate" prop="caDataStr">
-                  <el-input  type="textarea" v-model="form.caDataStr" clearable></el-input>
+                  <el-input :autosize="{ minRows: 5, maxRows: 10}" type="textarea" v-model="form.caDataStr" clearable></el-input>
                 </el-form-item>
               </div>
             </div>
             <div v-if="form.authenticationMode==='bearer'">
               <el-form-item label="Bearer Token" prop="token">
-                <el-input type="textarea" v-model="form.token" clearable></el-input>
+                <el-input :autosize="{ minRows: 5, maxRows: 10}" type="textarea" v-model="form.token" clearable></el-input>
               </el-form-item>
             </div>
             <div v-if="form.authenticationMode==='certificate'">
@@ -55,7 +55,7 @@
             </div>
             <div v-if="form.authenticationMode==='configFile'">
               <el-form-item v-if="form.configContent" :label="$t('business.cluster.config_content')">
-                <el-input type="textarea"  v-model="form.configContent"></el-input>
+                <el-input :autosize="{ minRows: 5, maxRows: 10}" type="textarea"  v-model="form.configContent"></el-input>
               </el-form-item>
               <el-form-item>
                 <el-upload :before-upload="readFile" action="" style="display: inline-block;margin-left: 5px">

diff --git a/web/kubepi/src/i18n/lang/en-US.js b/web/kubepi/src/i18n/lang/en-US.js
@@ -70,6 +70,7 @@ const message = {
       select: "please select {0}",
       required: "required",
       email: "please input a valid email",
+      number_limit: "Please enter the correct number",
       password_help: "Valid password: 8-30 digits, English letters + numbers + special characters (optional)",
       name_not_compliant: "The name does not conform to the naming convention!",
     },

diff --git a/web/kubepi/src/i18n/lang/zh-CN.js b/web/kubepi/src/i18n/lang/zh-CN.js
@@ -77,6 +77,7 @@ const message = {
       select: "请选择{0}",
       required: "必填项",
       email: "请输入有效的电子邮箱",
+      number_limit: "请输入正确的数字",
       password_help: "有效密码:8-30位,英文字母+数字+特殊字符(~!@#$%^&*,可选)",
       name_not_compliant: "该名称不符合命名规范",
     },