github/lina
1
0
Fork 0
mirror of https://github.com/jumpserver/lina.git synced 2025-08-15 05:24:54 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #702 from jumpserver/dev

Browse Source 
Merge v2.8.1
This commit is contained in:
Orange 2021-03-19 19:06:18 +08:00 committed by GitHub
commit a24fab51af
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/components/DataActions/index.vue
View File

@ -3,6 +3,7 @@
<template v-for="action in iActions"> <template v-for="action in iActions">
<el-dropdown <el-dropdown
v-if="action.dropdown" v-if="action.dropdown"
v-show="action.dropdown.length > 0"
:key="action.name" :key="action.name"
class="action-item" class="action-item"
trigger="click" trigger="click"

4
src/views/settings/Ldap/index.vue
View File

@ -57,9 +57,11 @@ export default {
], ],
fieldsMeta: { fieldsMeta: {
AUTH_LDAP_USER_ATTR_MAP: { AUTH_LDAP_USER_ATTR_MAP: {
component: 'el-input',
el: { el: {
type: 'textarea' type: 'textarea'
} },
label: this.$t('setting.authLdapUserAttrMap')
} }
}, },
url: '/api/v1/settings/setting/?category=ldap', url: '/api/v1/settings/setting/?category=ldap',