diff --git a/apps/cube-admin/src/pages/admin/user/index.vue b/apps/cube-admin/src/pages/admin/user/index.vue
index 1ead1b1..c0aff1f 100644
--- a/apps/cube-admin/src/pages/admin/user/index.vue
+++ b/apps/cube-admin/src/pages/admin/user/index.vue
@@ -86,7 +86,7 @@
import { ref, reactive, onMounted } from 'vue';
import { ElMessage, ElMessageBox } from 'element-plus';
import type { FormInstance, FormRules } from 'element-plus';
-import { request } from 'd:/WORK/cube-front/core/utils/request';
+import { request } from '@core/utils/request';
// 定义用户类型接口
interface User {
diff --git a/components.d.ts b/components.d.ts
index c8db5e1..792a361 100644
--- a/components.d.ts
+++ b/components.d.ts
@@ -31,7 +31,7 @@ declare module 'vue' {
TheWelcome: typeof import('./src/components/TheWelcome.vue')['default']
WelcomeItem: typeof import('./src/components/WelcomeItem.vue')['default']
}
- export interface GlobalDirectives {
+ export interface ComponentCustomProperties {
vLoading: typeof import('element-plus/es')['ElLoadingDirective']
}
}
diff --git a/core/layouts/MainLayout/index.vue b/core/layouts/MainLayout/index.vue
index 6e0ea3f..fcd91aa 100644
--- a/core/layouts/MainLayout/index.vue
+++ b/core/layouts/MainLayout/index.vue
@@ -3,7 +3,7 @@ import { ref } from 'vue';
import Navbar from './Navbar/index.vue';
import Content from './Content/index.vue';
import Sider from './Sider/index.vue';
-import { useUserStore } from 'cube-front/core/stores/user';
+import { useUserStore } from '@core/stores/user';
const userStore = useUserStore();
const collapsed = ref(false);
diff --git a/core/layouts/MainLayout/Navbar/CascaderMenu/components/SecondCascaderMenu.vue b/core/layouts/MainLayout/Navbar/CascaderMenu/components/SecondCascaderMenu.vue
index 8feb62d..efcac7d 100644
--- a/core/layouts/MainLayout/Navbar/CascaderMenu/components/SecondCascaderMenu.vue
+++ b/core/layouts/MainLayout/Navbar/CascaderMenu/components/SecondCascaderMenu.vue
@@ -16,8 +16,8 @@
</template>
<script setup lang="ts">
-import { type TreeMenuItem } from 'cube-front/core/stores/menu';
-import { renderMenuTitle } from 'cube-front/core/utils/menuHelpers';
+import { type TreeMenuItem } from '@core/stores/menu';
+import { renderMenuTitle } from '@core/utils/menuHelpers';
import SecondCascaderMenuItem from './SecondCascaderMenuItem.vue';
import { computed } from 'vue';
diff --git a/core/layouts/MainLayout/Navbar/CascaderMenu/components/SecondCascaderMenuItem.vue b/core/layouts/MainLayout/Navbar/CascaderMenu/components/SecondCascaderMenuItem.vue
index 31da6dc..1e47fae 100644
--- a/core/layouts/MainLayout/Navbar/CascaderMenu/components/SecondCascaderMenuItem.vue
+++ b/core/layouts/MainLayout/Navbar/CascaderMenu/components/SecondCascaderMenuItem.vue
@@ -13,9 +13,9 @@
</template>
<script setup lang="ts">
-import { type TreeMenuItem } from 'cube-front/core/stores/menu';
-import { isChildMenu, renderMenuTitle } from 'cube-front/core/utils/menuHelpers';
-import TextOverflow from 'cube-front/core/components/TextOverflow.vue';
+import { type TreeMenuItem } from '@core/stores/menu';
+import { isChildMenu, renderMenuTitle } from '@core/utils/menuHelpers';
+import TextOverflow from '@core/components/TextOverflow.vue';
/**
* 二级层叠菜单项组件Props接口定义
diff --git a/core/layouts/MainLayout/Navbar/CascaderMenu/index.vue b/core/layouts/MainLayout/Navbar/CascaderMenu/index.vue
index 66456d9..c93d5d4 100644
--- a/core/layouts/MainLayout/Navbar/CascaderMenu/index.vue
+++ b/core/layouts/MainLayout/Navbar/CascaderMenu/index.vue
@@ -1,8 +1,8 @@
<script setup lang="ts">
import { computed } from 'vue';
-import { type TreeMenuItem } from 'cube-front/core/stores/menu';
+import { type TreeMenuItem } from '@core/stores/menu';
import SecondCascaderMenu from './components/SecondCascaderMenu.vue';
-import { isChildMenu, hasChildren } from 'cube-front/core/utils/menuHelpers';
+import { isChildMenu, hasChildren } from '@core/utils/menuHelpers';
/**
* 层叠菜单组件Props接口定义
diff --git a/core/layouts/MainLayout/Navbar/index.vue b/core/layouts/MainLayout/Navbar/index.vue
index 37f955d..571402d 100644
--- a/core/layouts/MainLayout/Navbar/index.vue
+++ b/core/layouts/MainLayout/Navbar/index.vue
@@ -1,9 +1,9 @@
<script setup lang="ts">
import { storeToRefs } from 'pinia';
import Menu from './Menu/index.vue';
-import { type UserInfo } from 'cube-front/core/stores/user';
-import { useMenuStore } from 'cube-front/core/stores/menu';
-import { getConfig } from 'cube-front/core/configure';
+import { type UserInfo } from '@core/stores/user';
+import { useMenuStore } from '@core/stores/menu';
+import { getConfig } from '@core/configure';
interface NavbarProps {
currentUser?: Partial<UserInfo>;
diff --git a/core/layouts/MainLayout/Navbar/Menu/index.vue b/core/layouts/MainLayout/Navbar/Menu/index.vue
index 6156ac7..2ed5f31 100644
--- a/core/layouts/MainLayout/Navbar/Menu/index.vue
+++ b/core/layouts/MainLayout/Navbar/Menu/index.vue
@@ -1,11 +1,11 @@
<script setup lang="tsx">
import { computed, ref, onMounted, nextTick, watch } from 'vue';
import { useRouter } from 'vue-router';
-import { type TreeMenuItem, useMenuStore } from 'cube-front/core/stores/menu';
+import { type TreeMenuItem, useMenuStore } from '@core/stores/menu';
import CascaderMenu from '../CascaderMenu/index.vue';
import { ElScrollbar } from 'element-plus';
-import { hasChildren } from 'cube-front/core/utils/menuHelpers';
-import { openMenuTab } from 'cube-front/core/utils/menuTab';
+import { hasChildren } from '@core/utils/menuHelpers';
+import { openMenuTab } from '@core/utils/menuTab';
/**
* Menu组件Props接口定义
diff --git a/core/layouts/MainLayout/Sider/index.vue b/core/layouts/MainLayout/Sider/index.vue
index 7c0381f..2012f22 100644
--- a/core/layouts/MainLayout/Sider/index.vue
+++ b/core/layouts/MainLayout/Sider/index.vue
@@ -1,9 +1,9 @@
<script setup lang="ts">
import { computed } from 'vue';
-import { openMenuTab } from '../../../utils/menuTab';
-import { useMenuStore, type TreeMenuItem } from '../../../stores/menu';
-import { renderMenuTitle } from 'cube-front/core/utils/menuHelpers';
-import TextOverflow from '../../../components/TextOverflow.vue';
+import { openMenuTab } from '@core/utils/menuTab';
+import { useMenuStore, type TreeMenuItem } from '@core/stores/menu';
+import { renderMenuTitle } from '@core/utils/menuHelpers';
+import TextOverflow from '@core/components/TextOverflow.vue';
const menuStore = useMenuStore();
diff --git a/core/stores/menu.ts b/core/stores/menu.ts
index 3c6faa5..cff79ec 100644
--- a/core/stores/menu.ts
+++ b/core/stores/menu.ts
@@ -1,5 +1,5 @@
import { defineStore } from 'pinia';
-import { getConfig } from 'cube-front/core/configure';
+import { getConfig } from '@core/configure';
import { getDataByKey } from '../utils/common';
import { type AxiosRequestConfig } from 'axios';
import request from '../utils/request';
diff --git a/core/stores/user.ts b/core/stores/user.ts
index 8b5a057..eafb1e3 100644
--- a/core/stores/user.ts
+++ b/core/stores/user.ts
@@ -1,5 +1,5 @@
import { defineStore } from 'pinia';
-import { getConfig } from 'cube-front/core/configure';
+import { getConfig } from '@core/configure';
import { type AxiosRequestConfig, type AxiosResponse } from 'axios';
import request from '../utils/request';
import { removeAccessToken } from '../utils/token';
diff --git a/core/utils/menuHelpers.ts b/core/utils/menuHelpers.ts
index d81c358..c0b9059 100644
--- a/core/utils/menuHelpers.ts
+++ b/core/utils/menuHelpers.ts
@@ -1,4 +1,4 @@
-import { type TreeMenuItem } from 'cube-front/core/stores/menu';
+import { type TreeMenuItem } from '@core/stores/menu';
/**
* 判断 childMenu 的祖先是否是parentMenu
diff --git a/tsconfig.app.json b/tsconfig.app.json
index e2e3c70..6924686 100644
--- a/tsconfig.app.json
+++ b/tsconfig.app.json
@@ -24,6 +24,9 @@
"@/*": [
"./src/*"
],
+ "@core/*": [
+ "./core/*"
+ ],
"cube-front/core": [
"./core"
],
diff --git a/vite.config.ts b/vite.config.ts
index 6630d97..ff2a6ac 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -65,7 +65,8 @@ export default defineConfig(({ command, mode }) => {
resolve: {
alias: {
'@': fileURLToPath(new URL('./src', import.meta.url)),
- 'cube-front/core': fileURLToPath(new URL('./core', import.meta.url)),
+ '@core': fileURLToPath(new URL('./core', import.meta.url)),
+ // 'cube-front/core': fileURLToPath(new URL('./core', import.meta.url)),
'cube-front': join(__dirname, './'),
},
},