style(系统设置): 修复用户组样式
--bug=1035250 --user=吕梦园 https://www.tapd.cn/55049933/bugtrace/bugs/view/1155049933001035250 --bug=1035253 --user=吕梦园 https://www.tapd.cn/55049933/bugtrace/bugs/view/1155049933001035253
This commit is contained in:
teukkk
刘瑞斌
parent
e260dfc75c
commit
fab408b574
|
|
@ -2,7 +2,7 @@
|
||||||
<a-popover
|
<a-popover
|
||||||
ref="popoverRef"
|
ref="popoverRef"
|
||||||
:popup-visible="currentVisible"
|
:popup-visible="currentVisible"
|
||||||
position="bl"
|
position="br"
|
||||||
trigger="click"
|
trigger="click"
|
||||||
class="w-[350px]"
|
class="w-[350px]"
|
||||||
:content-class="props.id ? 'move-left' : ''"
|
:content-class="props.id ? 'move-left' : ''"
|
||||||
|
|
@ -30,10 +30,7 @@
|
||||||
@press-enter="handleBeforeOk"
|
@press-enter="handleBeforeOk"
|
||||||
@keyup.esc="handleCancel"
|
@keyup.esc="handleCancel"
|
||||||
/>
|
/>
|
||||||
<span
|
<span v-if="!props.id" class="mt-[8px] text-[13px] font-medium text-[var(--color-text-4)]">
|
||||||
v-if="!props.id && props.authScope === AuthScopeEnum.SYSTEM"
|
|
||||||
class="mt-[8px] text-[13px] font-medium text-[var(--color-text-4)]"
|
|
||||||
>
|
|
||||||
{{ t('system.userGroup.createUserGroupTip') }}
|
{{ t('system.userGroup.createUserGroupTip') }}
|
||||||
</span>
|
</span>
|
||||||
</a-form-item>
|
</a-form-item>
|
||||||
|
|
|
||||||
|
|
@ -10,42 +10,45 @@
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
<div v-if="showSystem" v-permission="['SYSTEM_USER_ROLE:READ']" class="mt-2">
|
<div v-if="showSystem" v-permission="['SYSTEM_USER_ROLE:READ']" class="mt-2">
|
||||||
<CreateUserGroupPopup
|
<div class="flex items-center justify-between px-[4px] py-[7px]">
|
||||||
:list="systemUserGroupList"
|
<div class="flex flex-row items-center gap-1 text-[var(--color-text-4)]">
|
||||||
:visible="systemUserGroupVisible"
|
<MsIcon
|
||||||
:auth-scope="AuthScopeEnum.SYSTEM"
|
v-if="systemToggle"
|
||||||
@cancel="systemUserGroupVisible = false"
|
class="cursor-pointer"
|
||||||
@submit="handleCreateUserGroup"
|
type="icon-icon_expand-down_filled"
|
||||||
>
|
size="12"
|
||||||
<div class="flex items-center justify-between px-[4px] py-[7px]">
|
@click="systemToggle = false"
|
||||||
<div class="flex flex-row items-center gap-1 text-[var(--color-text-4)]">
|
|
||||||
<MsIcon
|
|
||||||
v-if="systemToggle"
|
|
||||||
class="cursor-pointer"
|
|
||||||
type="icon-icon_expand-down_filled"
|
|
||||||
size="12"
|
|
||||||
@click="systemToggle = false"
|
|
||||||
/>
|
|
||||||
<MsIcon
|
|
||||||
v-else
|
|
||||||
class="cursor-pointer"
|
|
||||||
type="icon-icon_expand-right_filled"
|
|
||||||
size="12"
|
|
||||||
@click="systemToggle = true"
|
|
||||||
/>
|
|
||||||
<div class="text-[14px]">
|
|
||||||
{{ t('system.userGroup.systemUserGroup') }}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<icon-plus-circle-fill
|
|
||||||
v-permission="props.addPermission"
|
|
||||||
class="cursor-pointer text-[rgb(var(--primary-7))]"
|
|
||||||
size="20"
|
|
||||||
@click="handleCreateUG(AuthScopeEnum.SYSTEM)"
|
|
||||||
/>
|
/>
|
||||||
|
<MsIcon
|
||||||
|
v-else
|
||||||
|
class="cursor-pointer"
|
||||||
|
type="icon-icon_expand-right_filled"
|
||||||
|
size="12"
|
||||||
|
@click="systemToggle = true"
|
||||||
|
/>
|
||||||
|
<div class="text-[14px]">
|
||||||
|
{{ t('system.userGroup.systemUserGroup') }}
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</CreateUserGroupPopup>
|
<CreateUserGroupPopup
|
||||||
|
:list="systemUserGroupList"
|
||||||
|
:visible="systemUserGroupVisible"
|
||||||
|
:auth-scope="AuthScopeEnum.SYSTEM"
|
||||||
|
@cancel="systemUserGroupVisible = false"
|
||||||
|
@submit="handleCreateUserGroup"
|
||||||
|
>
|
||||||
|
<a-tooltip :content="`创建${t('system.userGroup.systemUserGroup')}`" position="right">
|
||||||
|
<MsIcon
|
||||||
|
v-permission="props.addPermission"
|
||||||
|
type="icon-icon_create_planarity"
|
||||||
|
size="20"
|
||||||
|
class="cursor-pointer text-[rgb(var(--primary-5))] hover:text-[rgb(var(--primary-4))]"
|
||||||
|
@click="handleCreateUG(AuthScopeEnum.SYSTEM)"
|
||||||
|
/>
|
||||||
|
</a-tooltip>
|
||||||
|
</CreateUserGroupPopup>
|
||||||
|
</div>
|
||||||
|
|
||||||
<Transition>
|
<Transition>
|
||||||
<div v-if="systemToggle">
|
<div v-if="systemToggle">
|
||||||
<div
|
<div
|
||||||
|
|
@ -112,42 +115,44 @@
|
||||||
</Transition>
|
</Transition>
|
||||||
</div>
|
</div>
|
||||||
<div v-if="showOrg" v-permission="['ORGANIZATION_USER_ROLE:READ']" class="mt-2">
|
<div v-if="showOrg" v-permission="['ORGANIZATION_USER_ROLE:READ']" class="mt-2">
|
||||||
<CreateUserGroupPopup
|
<div class="flex items-center justify-between px-[4px] py-[7px]">
|
||||||
:list="orgUserGroupList"
|
<div class="flex flex-row items-center gap-1 text-[var(--color-text-4)]">
|
||||||
:visible="orgUserGroupVisible"
|
<MsIcon
|
||||||
:auth-scope="AuthScopeEnum.ORGANIZATION"
|
v-if="orgToggle"
|
||||||
@cancel="orgUserGroupVisible = false"
|
class="cursor-pointer"
|
||||||
@submit="handleCreateUserGroup"
|
type="icon-icon_expand-down_filled"
|
||||||
>
|
size="12"
|
||||||
<div class="flex items-center justify-between px-[4px] py-[7px]">
|
@click="orgToggle = false"
|
||||||
<div class="flex flex-row items-center gap-1 text-[var(--color-text-4)]">
|
|
||||||
<MsIcon
|
|
||||||
v-if="orgToggle"
|
|
||||||
class="cursor-pointer"
|
|
||||||
type="icon-icon_expand-down_filled"
|
|
||||||
size="12"
|
|
||||||
@click="orgToggle = false"
|
|
||||||
/>
|
|
||||||
<MsIcon
|
|
||||||
v-else
|
|
||||||
class="cursor-pointer"
|
|
||||||
type="icon-icon_expand-right_filled"
|
|
||||||
size="12"
|
|
||||||
@click="orgToggle = true"
|
|
||||||
/>
|
|
||||||
<div class="text-[14px]">
|
|
||||||
{{ t('system.userGroup.orgUserGroup') }}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<icon-plus-circle-fill
|
|
||||||
v-permission="props.addPermission"
|
|
||||||
class="cursor-pointer text-[rgb(var(--primary-7))]"
|
|
||||||
size="20"
|
|
||||||
@click="orgUserGroupVisible = true"
|
|
||||||
/>
|
/>
|
||||||
|
<MsIcon
|
||||||
|
v-else
|
||||||
|
class="cursor-pointer"
|
||||||
|
type="icon-icon_expand-right_filled"
|
||||||
|
size="12"
|
||||||
|
@click="orgToggle = true"
|
||||||
|
/>
|
||||||
|
<div class="text-[14px]">
|
||||||
|
{{ t('system.userGroup.orgUserGroup') }}
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</CreateUserGroupPopup>
|
<CreateUserGroupPopup
|
||||||
|
:list="orgUserGroupList"
|
||||||
|
:visible="orgUserGroupVisible"
|
||||||
|
:auth-scope="AuthScopeEnum.ORGANIZATION"
|
||||||
|
@cancel="orgUserGroupVisible = false"
|
||||||
|
@submit="handleCreateUserGroup"
|
||||||
|
>
|
||||||
|
<a-tooltip :content="`创建${t('system.userGroup.orgUserGroup')}`" position="right">
|
||||||
|
<MsIcon
|
||||||
|
v-permission="props.addPermission"
|
||||||
|
type="icon-icon_create_planarity"
|
||||||
|
size="20"
|
||||||
|
class="cursor-pointer text-[rgb(var(--primary-5))] hover:text-[rgb(var(--primary-4))]"
|
||||||
|
@click="orgUserGroupVisible = true"
|
||||||
|
/>
|
||||||
|
</a-tooltip>
|
||||||
|
</CreateUserGroupPopup>
|
||||||
|
</div>
|
||||||
<Transition>
|
<Transition>
|
||||||
<div v-if="orgToggle">
|
<div v-if="orgToggle">
|
||||||
<div
|
<div
|
||||||
|
|
@ -240,42 +245,44 @@
|
||||||
</Transition>
|
</Transition>
|
||||||
</div>
|
</div>
|
||||||
<div v-if="showProject" v-permission="['PROJECT_GROUP:READ']" class="mt-2">
|
<div v-if="showProject" v-permission="['PROJECT_GROUP:READ']" class="mt-2">
|
||||||
<CreateUserGroupPopup
|
<div class="flex items-center justify-between px-[4px] py-[7px]">
|
||||||
:list="projectUserGroupList"
|
<div class="flex flex-row items-center gap-1 text-[var(--color-text-4)]">
|
||||||
:visible="projectUserGroupVisible"
|
<MsIcon
|
||||||
:auth-scope="AuthScopeEnum.PROJECT"
|
v-if="projectToggle"
|
||||||
@cancel="projectUserGroupVisible = false"
|
class="cursor-pointer"
|
||||||
@submit="handleCreateUserGroup"
|
type="icon-icon_expand-down_filled"
|
||||||
>
|
size="12"
|
||||||
<div class="flex items-center justify-between px-[4px] py-[7px]">
|
@click="projectToggle = false"
|
||||||
<div class="flex flex-row items-center gap-1 text-[var(--color-text-4)]">
|
|
||||||
<MsIcon
|
|
||||||
v-if="projectToggle"
|
|
||||||
class="cursor-pointer"
|
|
||||||
type="icon-icon_expand-down_filled"
|
|
||||||
size="12"
|
|
||||||
@click="projectToggle = false"
|
|
||||||
/>
|
|
||||||
<MsIcon
|
|
||||||
v-else
|
|
||||||
class="cursor-pointer"
|
|
||||||
type="icon-icon_expand-right_filled"
|
|
||||||
size="12"
|
|
||||||
@click="projectToggle = true"
|
|
||||||
/>
|
|
||||||
<div class="text-[14px]">
|
|
||||||
{{ t('system.userGroup.projectUserGroup') }}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<icon-plus-circle-fill
|
|
||||||
v-permission="props.addPermission"
|
|
||||||
class="cursor-pointer text-[rgb(var(--primary-7))]"
|
|
||||||
size="20"
|
|
||||||
@click="projectUserGroupVisible = true"
|
|
||||||
/>
|
/>
|
||||||
|
<MsIcon
|
||||||
|
v-else
|
||||||
|
class="cursor-pointer"
|
||||||
|
type="icon-icon_expand-right_filled"
|
||||||
|
size="12"
|
||||||
|
@click="projectToggle = true"
|
||||||
|
/>
|
||||||
|
<div class="text-[14px]">
|
||||||
|
{{ t('system.userGroup.projectUserGroup') }}
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</CreateUserGroupPopup>
|
<CreateUserGroupPopup
|
||||||
|
:list="projectUserGroupList"
|
||||||
|
:visible="projectUserGroupVisible"
|
||||||
|
:auth-scope="AuthScopeEnum.PROJECT"
|
||||||
|
@cancel="projectUserGroupVisible = false"
|
||||||
|
@submit="handleCreateUserGroup"
|
||||||
|
>
|
||||||
|
<a-tooltip :content="`创建${t('system.userGroup.projectUserGroup')}`" position="right">
|
||||||
|
<MsIcon
|
||||||
|
v-permission="props.addPermission"
|
||||||
|
type="icon-icon_create_planarity"
|
||||||
|
size="20"
|
||||||
|
class="cursor-pointer text-[rgb(var(--primary-5))] hover:text-[rgb(var(--primary-4))]"
|
||||||
|
@click="projectUserGroupVisible = true"
|
||||||
|
/>
|
||||||
|
</a-tooltip>
|
||||||
|
</CreateUserGroupPopup>
|
||||||
|
</div>
|
||||||
<Transition>
|
<Transition>
|
||||||
<div v-if="projectToggle">
|
<div v-if="projectToggle">
|
||||||
<div
|
<div
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue