style(系统设置): 系统用户组页面调整

This commit is contained in:
RubyLiu 2023-09-15 19:01:19 +08:00 committed by 刘瑞斌
parent 1b8b75bd40
commit b645ac0f26
3 changed files with 16 additions and 12 deletions

View File

@ -6,7 +6,7 @@
@press-enter="enterData" @press-enter="enterData"
@search="searchData" @search="searchData"
/> />
<div v-if="showSystem" class="mt-2"> <div v-if="showSystem" class="mt-2 w-[252px]">
<CreateUserGroupPopup <CreateUserGroupPopup
:list="systemUserGroupList" :list="systemUserGroupList"
:visible="systemUserGroupVisible" :visible="systemUserGroupVisible"
@ -84,7 +84,7 @@
</div> </div>
</Transition> </Transition>
</div> </div>
<div v-if="showOrg" class="mt-2"> <div v-if="showOrg" class="mt-2 w-[252px]">
<CreateUserGroupPopup <CreateUserGroupPopup
:list="orgUserGroupList" :list="orgUserGroupList"
:visible="orgUserGroupVisible" :visible="orgUserGroupVisible"
@ -162,7 +162,7 @@
</div> </div>
</Transition> </Transition>
</div> </div>
<div v-if="showProject" class="mt-2"> <div v-if="showProject" class="mt-2 w-[252px]">
<CreateUserGroupPopup <CreateUserGroupPopup
:list="projectUserGroupList" :list="projectUserGroupList"
:visible="projectUserGroupVisible" :visible="projectUserGroupVisible"

View File

@ -45,21 +45,24 @@
{ {
title: 'system.userGroup.name', title: 'system.userGroup.name',
dataIndex: 'name', dataIndex: 'name',
showTooltip: true,
}, },
{ {
title: 'system.userGroup.email', title: 'system.userGroup.email',
dataIndex: 'email', dataIndex: 'email',
showTooltip: true,
}, },
{ {
title: 'system.userGroup.phone', title: 'system.userGroup.phone',
dataIndex: 'email', dataIndex: 'phone',
showTooltip: true,
}, },
{ {
title: 'system.userGroup.operation', title: 'system.userGroup.operation',
slotName: 'action', slotName: 'action',
dataIndex: 'operation', dataIndex: 'operation',
fixed: 'right', fixed: 'right',
width: 200, width: 100,
}, },
]; ];
@ -74,11 +77,11 @@
const { propsRes, propsEvent, loadList, setLoadListParams, setKeyword } = useTable(getRequestBySystemType(), { const { propsRes, propsEvent, loadList, setLoadListParams, setKeyword } = useTable(getRequestBySystemType(), {
columns: userGroupUsercolumns, columns: userGroupUsercolumns,
scroll: { y: 'auto', x: '600px' }, scroll: { x: '100%' },
selectable: false, selectable: false,
noDisable: false, noDisable: true,
size: 'default',
showSetting: false, showSetting: false,
heightUsed: 340,
}); });
const fetchData = async () => { const fetchData = async () => {

View File

@ -1,5 +1,5 @@
<template> <template>
<MsCard simple> <MsCard auto-height simple>
<div class="flex flex-row"> <div class="flex flex-row">
<div class="user-group-left" :style="{ padding: leftCollapse ? '24px 24px 24px 0' : 0 }"> <div class="user-group-left" :style="{ padding: leftCollapse ? '24px 24px 24px 0' : 0 }">
<UserGroupLeft v-if="leftCollapse" @on-select="handleSelect" /> <UserGroupLeft v-if="leftCollapse" @on-select="handleSelect" />
@ -149,9 +149,10 @@
<style lang="scss" scoped> <style lang="scss" scoped>
.user-group-left { .user-group-left {
position: relative; position: relative;
overflow-y: scroll;
width: 300px; width: 300px;
height: calc(100vh - 125px); height: calc(100vh - 125px);
border-right: 1px solid var(--color-border); border-right: 1px solid var(--color-border-1);
.usergroup-collapse { .usergroup-collapse {
position: absolute; position: absolute;
top: 50%; top: 50%;
@ -162,8 +163,8 @@
align-items: center; align-items: center;
width: 16px; width: 16px;
height: 36px; height: 36px;
background-color: var(--color-text-n8); background-color: var(--color-text-8);
opacity: 0; opacity: 1;
cursor: pointer; cursor: pointer;
&:hover { &:hover {
opacity: 1; opacity: 1;