From dc59836a6623401bcf02ce42c4dc251e11f64bef Mon Sep 17 00:00:00 2001
From: Orange <orangemtony@gmail.com>
Date: Fri, 19 Mar 2021 14:56:13 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=9B=B4=E5=A4=9A?=
 =?UTF-8?q?=E6=93=8D=E4=BD=9C=E6=95=B0=E9=87=8F=E4=B8=BA=E7=A9=BA=E6=97=B6?=
 =?UTF-8?q?=E4=BB=8D=E7=84=B6=E5=B1=95=E7=A4=BA=E7=9A=84Bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/DataActions/index.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/DataActions/index.vue b/src/components/DataActions/index.vue
index a4d9cb4bc..73aa804ad 100644
--- a/src/components/DataActions/index.vue
+++ b/src/components/DataActions/index.vue
@@ -3,6 +3,7 @@
     <template v-for="action in iActions">
       <el-dropdown
         v-if="action.dropdown"
+        v-show="action.dropdown.length > 0"
         :key="action.name"
         class="action-item"
         trigger="click"

From 4184401432aa59beb5e912990e09cf99701fb997 Mon Sep 17 00:00:00 2001
From: Orange <orangemtony@gmail.com>
Date: Fri, 19 Mar 2021 16:19:17 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8DLDAP=E5=B1=9E?=
 =?UTF-8?q?=E6=80=A7=E6=98=A0=E5=B0=84=E7=9A=84=E5=AD=97=E6=AE=B5=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/settings/Ldap/index.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/views/settings/Ldap/index.vue b/src/views/settings/Ldap/index.vue
index 4311a617f..1d4f17a39 100644
--- a/src/views/settings/Ldap/index.vue
+++ b/src/views/settings/Ldap/index.vue
@@ -57,9 +57,11 @@ export default {
       ],
       fieldsMeta: {
         AUTH_LDAP_USER_ATTR_MAP: {
+          component: 'el-input',
           el: {
             type: 'textarea'
-          }
+          },
+          label: this.$t('setting.authLdapUserAttrMap')
         }
       },
       url: '/api/v1/settings/setting/?category=ldap',