Merge pull request #702 from jumpserver/dev

Merge v2.8.1

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"

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',