center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

Merge pull request #9332 from dataease/pr@dev-v2_st

Browse Source 
fix(系统管理): 修复系统设置、组织管理中心、工具箱-侧边栏可展开收起的问题
This commit is contained in:
dataeaseShu 2024-04-25 13:43:41 +08:00 committed by GitHub
commit bd0ee27199
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/core-frontend/src/layout/components/AiTips.vue
View File

@ -42,6 +42,7 @@ onMounted(() => {
.ai-popper-tips {
z-index: 10001 !important;
padding: 24px !important;
box-shadow: none;
background: var(--ed-color-primary) !important;
.ed-popper__arrow::before {
border: 1px solid var(--ed-color-primary) !important;
@ -67,6 +68,7 @@ onMounted(() => {
line-height: 22px;
text-align: right;
button {
border-color: #ffffff !important;
font-weight: 500;
color: rgba(51, 112, 255, 1) !important;
}

32
core/core-frontend/src/layout/index.vue
View File

@ -27,22 +27,22 @@ const setCollapse = () => {
/>
<Header v-else></Header>
<el-container class="layout-container">
<Sidebar
v-if="(systemMenu || settingMenu || toolboxMenu) && !isCollapse"
class="layout-sidebar"
>
<div @click="setCollapse" v-if="systemMenu && !isCollapse" class="org-config-center">
组织管理中心
</div>
<Menu :style="{ height: systemMenu ? 'calc(100% - 48px)' : '100%' }"></Menu>
</Sidebar>
<el-aside class="layout-sidebar layout-sidebar-collapse" v-else>
<Menu
:collapse="isCollapse"
:style="{ height: systemMenu ? 'calc(100% - 48px)' : '100%' }"
></Menu>
</el-aside>
<CollapseBar @setCollapse="setCollapse" :isCollapse="isCollapse"></CollapseBar>
<template v-if="systemMenu || settingMenu || toolboxMenu">
<Sidebar v-if="!isCollapse" class="layout-sidebar">
<div @click="setCollapse" v-if="systemMenu && !isCollapse" class="org-config-center">
组织管理中心
</div>
<Menu :style="{ height: systemMenu ? 'calc(100% - 48px)' : '100%' }"></Menu>
</Sidebar>
<el-aside class="layout-sidebar layout-sidebar-collapse" v-else>
<Menu
:collapse="isCollapse"
:style="{ height: systemMenu ? 'calc(100% - 48px)' : '100%' }"
></Menu>
</el-aside>
<CollapseBar @setCollapse="setCollapse" :isCollapse="isCollapse"></CollapseBar>
</template>
<Main
class="layout-main"
:class="{ 'with-sider': systemMenu || settingMenu || toolboxMenu }"