From cb9cd49627b65a4c0e137e08063271a8cefe1826 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期四, 23 七月 2026 17:48:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro2.0' into dev_pro2.0
---
src/layouts/basic.vue | 32 +++++++++++++++++++++-----------
1 files changed, 21 insertions(+), 11 deletions(-)
diff --git a/src/layouts/basic.vue b/src/layouts/basic.vue
index 212bcc2..ee2b152 100644
--- a/src/layouts/basic.vue
+++ b/src/layouts/basic.vue
@@ -1,21 +1,21 @@
<script lang="ts" setup>
-import type { NotificationItem } from '../packages/effects/layouts/src';
+import type { NotificationItem } from '@vben/layouts';
import type { SystemTenantApi } from '#/api/system/tenant';
import { computed, onMounted, ref, watch } from 'vue';
-import { useAccess } from '../packages/effects/access/src';
-import { AuthenticationLoginExpiredModal, useVbenModal } from '../packages/effects/common-ui/src';
-import { VBEN_DOC_URL, VBEN_GITHUB_URL } from '../packages/constants/src';
-import { isTenantEnable, useTabs, useWatermark } from '../packages/effects/hooks/src';
+import { useAccess } from '@vben/access';
+import { AuthenticationLoginExpiredModal, useVbenModal } from '@vben/common-ui';
+import { VBEN_DOC_URL, VBEN_GITHUB_URL } from '@vben/constants';
+import { isTenantEnable, useTabs, useWatermark } from '@vben/hooks';
import {
AntdProfileOutlined,
BookOpenText,
CircleHelp,
IconifyIcon,
SvgGithubIcon,
-} from '../packages/icons/src';
+} from '@vben/icons';
import {
BasicLayout,
Help,
@@ -23,10 +23,10 @@
Notification,
TenantDropdown,
UserDropdown,
-} from '../packages/effects/layouts/src';
-import { preferences, usePreferences } from '../packages/preferences/src';
-import { useAccessStore, useUserStore } from '../packages/stores/src';
-import { formatDateTime, openWindow } from '../packages/utils/src';
+} from '@vben/layouts';
+import { preferences, usePreferences } from '@vben/preferences';
+import { useAccessStore, useUserStore } from '@vben/stores';
+import { formatDateTime, openWindow } from '@vben/utils';
import { message } from 'ant-design-vue';
@@ -293,7 +293,7 @@
@on-click="handleClick"
/>
</template>
- <template #header-right-1>
+ <!-- <template #header-right-1>
<div v-if="tenantEnable">
<TenantDropdown
class="mr-2"
@@ -302,6 +302,16 @@
@success="handleTenantChange"
/>
</div>
+ </template> -->
+ <template #header-right-170>
+ <button
+ type="button"
+ class="flex cursor-pointer items-center gap-1.5 rounded-md border-none bg-primary/15 px-3 py-1.5 text-sm font-medium text-primary transition-colors hover:bg-primary/25"
+ @click="router.push({ name: 'MesWorkbench' })"
+ >
+ <IconifyIcon icon="lucide:factory" class="size-4" />
+ <span>宸ヤ綔鍙�</span>
+ </button>
</template>
<template #extra>
<AuthenticationLoginExpiredModal
--
Gitblit v1.9.3