Skip to content

Commit

Permalink
bug:访问控制页前端样式修改 #2501
Browse files Browse the repository at this point in the history
* bug:访问控制页下方目录控制数目过多无法展示 #2501

* bug:创建目录权限新加用户组管理链接以及修复切换tab,目录控制展示的修复 #2501
  • Loading branch information
lannoy0523 authored Aug 20, 2024
1 parent 16622ff commit bdd1d81
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 17 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,7 @@
get () {
if (this.baseData.name === 'pipeline') return 'pipeline'
if (this.baseData.public) {
this.$emit('showPermissionConfigTab', false)
return 'public'
}
if (this.rootDirectoryPermission === 'DIR_CTRL') {
Expand All @@ -176,6 +177,7 @@
this.$emit('showPermissionConfigTab', true)
return 'strict'
}
this.$emit('showPermissionConfigTab', false)
return 'default'
},
set (val) {
Expand Down
2 changes: 2 additions & 0 deletions src/frontend/devops-repository/src/views/repoConfig/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -413,6 +413,8 @@
.showPermissionConfigTab {
background-image: none!important;
margin-top: 10px;
max-height: 40%;
overflow-y: auto;
&:before {
content: '';
position: absolute;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,17 @@
</div>
</bk-form-item>
<bk-form-item :label="$t('associatedUseGroup')" property="roles" error-display-type="normal">
<bk-tag-input
class="w480"
v-model="permissionForm.roles"
:placeholder="$t('enterPlaceHolder')"
trigger="focus"
:list="roleList"
:has-delete-icon="true">
</bk-tag-input>
<div style="display: flex;">
<bk-tag-input
class="w480"
v-model="permissionForm.roles"
:placeholder="$t('enterPlaceHolder')"
trigger="focus"
:list="roleList"
:has-delete-icon="true">
</bk-tag-input>
<bk-link theme="primary" @click="manageUserGroup" style="margin-right: auto;margin-left: 10px">{{ $t('manage') + $t('space') + $t('userGroup') }}</bk-link>
</div>
</bk-form-item>
</bk-form>
<add-user-dialog ref="addUserDialog" :visible.sync="showAddUserDialog" @complete="handleAddUsers"></add-user-dialog>
Expand Down Expand Up @@ -178,15 +181,10 @@
this.$refs.permissionForm.clearError()
this.$emit('refresh')
},
parseFn (data) {
if (data !== '') {
const users = data.toString().split(',')
for (let i = 0; i < users.length; i++) {
users[i] = users[i].toString().trim()
this.permissionForm.users.push(users[i])
}
this.permissionForm.user = Array.from(new Set(this.permissionForm.users))
}
manageUserGroup () {
this.$router.replace({
name: 'userGroup'
})
},
deleteUser (index) {
const temp = []
Expand Down

0 comments on commit bdd1d81

Please sign in to comment.