Revert "#116 #102 enhancement (#177)" (#179)

This reverts commit 9670956.
byzer-org · Apr 12, 2022 · c13bc40 · c13bc40
1 parent 9670956
commit c13bc40
Show file tree

Hide file tree

Showing 12 changed files with 22 additions and 374 deletions.
diff --git a/src/assets/css/variable.scss b/src/assets/css/variable.scss
@@ -10,7 +10,6 @@ $cellTextColor: #39414D;
 $cellCommentColor: #66A0A4;
 $cellStringColor: #1021D5;
 $cellKeywordColor: #CF2F72;
-$pattern-grey-100: #A5B2C5;
 $pattern-blue-100: #CEE6FD;
 $pattern-blue-200: #e6f1fb;
 $pattern-blue-300: #3991e1;

diff --git a/src/components/CreateConnection/Form.vue b/src/components/CreateConnection/Form.vue
@@ -2,9 +2,7 @@
   <div class="connect-form">
     <el-form size="small" ref="form" :model="form" :rules="rules">
       <el-form-item :label="$t('settings.connectionName')" prop="name">
-        <el-input v-model.trim="form.name" :placeholder="$t('pleaseInput')">
-          <template slot="prepend">{{ userInfo.username + '_' }}</template>
-        </el-input>
+        <el-input v-model.trim="form.name" :placeholder="$t('pleaseInput')" />
       </el-form-item>
       <el-form-item :label="$t('settings.dataSource')" prop="datasource">
         <el-select v-model="form.datasource" style="width: 100%;" @change="value => handleInput('datasource', value)"  :placeholder="$t('pleaseSelect')">
@@ -72,9 +70,6 @@ import { encryptData } from '@/util'
 
 @Component({
   computed: {
-    ...mapState({
-      userInfo: state => state.user.userInfo
-    }),
     ...mapState('CreateConnectionModal', {
       form: state => state.form,
       type: state => state.type,

diff --git a/src/components/CreateConnection/index.vue b/src/components/CreateConnection/index.vue
@@ -31,9 +31,6 @@ import Form from './Form.vue'
 
 @Component({
   computed: {
-    ...mapState({
-      userInfo: state => state.user.userInfo
-    }),
     ...mapState('CreateConnectionModal', {
       isShow: state => state.isShow,
       form: state => state.form,
@@ -86,7 +83,7 @@ export default class CreateConnectionModal extends Vue {
       await this.$refs.ruleForm.checkForm()
       this.isSubmiting = true
       const params = {
-        name: this.userInfo.username + '_' + this.form.name,
+        name: this.form.name,
         content: { ...this.form }
       }
       if (params.content.password) {

diff --git a/src/components/Header/EngineInfo.vue b/src/components/Header/EngineInfo.vue
diff --git a/src/components/Header/index.vue b/src/components/Header/index.vue
@@ -6,7 +6,6 @@
       <header-menu v-if="!isLoginPage"></header-menu>
     </div>
     <div class="page-header-right">
-      <EngineInfo />
       <GlobalHelp />
       <ChangeLang />
       <UserInfo class="page-header-right-item" v-if="!isLoginPage" />
@@ -19,20 +18,17 @@ import { Component } from 'vue-property-decorator'
 import HeaderMenu from './HeaderMenu'
 import UserInfo from './UserInfo'
 import GlobalHelp from './GlobalHelp'
-import ChangeLang from './ChangeLang'
-import EngineInfo from './EngineInfo'
+import ChangeLang from './ChangeLang.vue'
 import { mapState } from 'vuex'
 @Component({
   components: {
     HeaderMenu,
     UserInfo,
     GlobalHelp,
-    ChangeLang,
-    EngineInfo
+    ChangeLang
   },
   computed: {
     ...mapState({
-      userInfo: state => state.user.userInfo,
       isTrial: state => state.global.is_trial
     }),
     isLoginPage () {

diff --git a/src/config/index.js b/src/config/index.js
@@ -110,8 +110,3 @@ export const ACTION_OF_STATE = {
   [INSTANCE_STATE['9']]: [0, 0, 5, 0],
   [INSTANCE_STATE['10']]: [0, 0, 5, 0]
 }
-
-export const ENGINE_STATUS = {
-  0: 'unavailable',
-  2: 'available'
-}
diff --git a/src/locale/en.json b/src/locale/en.json
@@ -48,21 +48,7 @@
     "schedules": "Schedules",
     "settings": "Settings",
     "give_feedback": "Give Feedback",
-    "Byzer_docs": "Byzer Notebook Docs",
-    "engine_status": "Engine State: ",
-    "heart_beat": "Heartbeat Detection: ",
-    "usage": "Resource Rate: ",
-    "state": {
-      "available": "Running",
-      "unavailable": "Disabled"
-    },
-    "percentage": {
-      "available": "Normal",
-      "unavailable": "Disabled",
-      "crowded": "Crowded"
-    },
-    "step": "Auto-refresh engine state every 10 seconds",
-    "refresh_success": "Engine state refreshed successfully"
+    "Byzer_docs": "Byzer Notebook Docs"
   },
   "home": {
     "quick_start": "Quick Start",

diff --git a/src/locale/zh.json b/src/locale/zh.json
@@ -47,21 +47,7 @@
     "schedules": "调度",
     "settings": "设置",
     "give_feedback": "反馈",
-    "Byzer_docs": "Byzer Notebook 手册",
-    "engine_status": "引擎状态：",
-    "heart_beat": "心跳检测：",
-    "usage": "资源占比：",
-    "state": {
-      "available": "运行中",
-      "unavailable": "不可用"
-    },
-    "percentage": {
-      "available": "正常",
-      "unavailable": "不可用",
-      "crowded": "拥挤"
-    },
-    "step": "每 10 秒自动刷新引擎状态",
-    "refresh_success": "引擎状态刷新成功"
+    "Byzer_docs": "Byzer Notebook 手册"
   },
   "home": {
     "quick_start": "快速开始",