From 5735a591ba264cb3353580f65bfb1d68074e3148 Mon Sep 17 00:00:00 2001
From: Orange <orangemtony@gmail.com>
Date: Wed, 30 Dec 2020 20:08:58 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=85=81=E8=AE=B8=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E8=A1=A8=E6=A0=BC=E5=88=97=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/ActionsGroup/index.vue                         | 2 +-
 src/components/ListTable/TableAction/ColumnSettingPopover.vue | 3 +++
 src/components/ListTable/TableAction/RightSide.vue            | 2 +-
 src/i18n/langs/cn.json                                        | 1 +
 src/i18n/langs/en.json                                        | 1 +
 5 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/components/ActionsGroup/index.vue b/src/components/ActionsGroup/index.vue
index d9f11442d..c88b0e07b 100644
--- a/src/components/ActionsGroup/index.vue
+++ b/src/components/ActionsGroup/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div :class="grouped ? 'el-button-group' : ''">
     <el-button v-for="item in iActions" :key="item.name" :size="size" v-bind="item" @click="handleClick(item.name)">
-      <el-tooltip v-if="['actionExport', 'actionImport', 'actionRefresh'].indexOf(item.name) !== -1" effect="dark" :content="item.tip" placement="top">
+      <el-tooltip v-if="['actionExport', 'actionImport', 'actionRefresh','actionColumnSetting'].indexOf(item.name) !== -1" effect="dark" :content="item.tip" placement="top">
         <i v-if="item.fa" :class="'fa ' + item.fa" />{{ item.title }}
       </el-tooltip>
       <span v-else>
diff --git a/src/components/ListTable/TableAction/ColumnSettingPopover.vue b/src/components/ListTable/TableAction/ColumnSettingPopover.vue
index 79b2e4943..e24ba3386 100644
--- a/src/components/ListTable/TableAction/ColumnSettingPopover.vue
+++ b/src/components/ListTable/TableAction/ColumnSettingPopover.vue
@@ -9,6 +9,9 @@
     top="10%"
     @confirm="handleColumnConfirm()"
   >
+    <el-alert type="success">
+      {{ this.$t('common.TableColSettingInfo') }}
+    </el-alert>
     <el-checkbox-group
       v-model="columnList"
     >
diff --git a/src/components/ListTable/TableAction/RightSide.vue b/src/components/ListTable/TableAction/RightSide.vue
index 7497cca70..5794cc106 100644
--- a/src/components/ListTable/TableAction/RightSide.vue
+++ b/src/components/ListTable/TableAction/RightSide.vue
@@ -65,7 +65,7 @@ export default {
   data() {
     return {
       defaultRightSideActions: [
-        { name: 'actionColumnSetting', fa: 'fa-cog', tip: this.$t('common.Setting'), has: this.hasColumnSetting, callback: this.handleColumnConfig.bind(this) },
+        { name: 'actionColumnSetting', fa: 'fa-cog', tip: this.$t('common.CustomCol'), has: this.hasColumnSetting, callback: this.handleColumnConfig.bind(this) },
         { name: 'actionExport', fa: 'fa-download', tip: this.$t('common.Export'), has: this.hasExport, callback: this.handleExport.bind(this) },
         { name: 'actionImport', fa: 'fa-upload', tip: this.$t('common.Import'), has: this.hasImport, callback: this.handleImport.bind(this) },
         { name: 'actionRefresh', fa: 'fa-refresh', tip: this.$t('common.Refresh'), has: this.hasRefresh, callback: this.handleRefresh }
diff --git a/src/i18n/langs/cn.json b/src/i18n/langs/cn.json
index 6b74b13b1..ed5b6d679 100644
--- a/src/i18n/langs/cn.json
+++ b/src/i18n/langs/cn.json
@@ -187,6 +187,7 @@
     "Activate": "激活",
     "Active": "激活中",
     "actionsTips":"剪切板权限控制目前仅支持 RDP/VNC 协议的连接",
+    "TableColSettingInfo": "请选择您想显示的列表详细信息。",
     "Add": "添加",
     "AddSuccessMsg": "添加成功",
     "Auth": "认证",
diff --git a/src/i18n/langs/en.json b/src/i18n/langs/en.json
index a078842bc..91c168a17 100644
--- a/src/i18n/langs/en.json
+++ b/src/i18n/langs/en.json
@@ -187,6 +187,7 @@
     "Activate": "Activate",
     "actionsTips":"Clipboard's copy and paste control only support RDP/VNC protocol.",
     "Active": "Active",
+    "TableColSettingInfo": "Please select the list details you want to display",
     "Add": "Add",
     "AddSuccessMsg": "Add success",
     "Auth": "Authorization",