Merge remote-tracking branch 'origin/main' into gitee

This commit is contained in:
xiaoxian521
2024-01-03 17:32:52 +08:00
6 changed files with 156 additions and 90 deletions

View File

@@ -19,5 +19,5 @@ const props = defineProps({
:noticeItem="item"
/>
</div>
<el-empty description="暂无消息" />
<el-empty v-else description="暂无消息" />
</template>

View File

@@ -18,7 +18,14 @@ const showLogo = ref(
)?.showLogo ?? true
);
const { device, pureApp, isCollapse, menuSelect, toggleSideBar } = useNav();
const {
device,
pureApp,
isCollapse,
tooltipEffect,
menuSelect,
toggleSideBar
} = useNav();
const subMenuData = ref([]);
@@ -91,6 +98,7 @@ onBeforeUnmount(() => {
router
unique-opened
mode="vertical"
:popper-effect="tooltipEffect"
class="outer-most select-none"
:collapse="isCollapse"
:default-active="defaultActive"