Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bug：访问控制页前端样式修改 #2501 #2502

Merged
merged 2 commits into from
Aug 20, 2024
Merged

bug：访问控制页前端样式修改 #2501 #2502

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e3f02d5
bug：访问控制页下方目录控制数目过多无法展示 #2501
lannoy0523 Aug 20, 2024
f5bf5e8
bug：创建目录权限新加用户组管理链接以及修复切换tab，目录控制展示的修复 #2501
lannoy0523 Aug 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/frontend/devops-repository/src/views/repoConfig/controlConfig/index.vue
View file
Open in desktop
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
View file
Open in desktop
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
32 changes: 15 additions & 17 deletions src/frontend/devops-repository/src/views/repoConfig/permissionConfig/createPermission.vue
View file
Open in desktop
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
Loading