Compare commits

..
46 Commits
Author SHA1 Message Date
hooray 31c3a28c3d chore: release v2.7.0 2023-02-11 21:37:55 +08:00
hooray 9893b905db chore: 更新依赖 2023-02-11 21:35:57 +08:00
hooray 9d858bbe22 style: 解决eslint警告 2023-02-02 14:53:08 +08:00
hooray 474aaa7bb1 chore: 更新依赖 2023-02-02 14:52:46 +08:00
hooray 04d358878e chore: 更新依赖 2023-01-31 15:24:01 +08:00
hooray eeed2d9ded chore: release v2.6.2 2023-01-15 12:21:00 +08:00
hooray 89d17930d6 chore: 更新依赖 2023-01-15 12:19:34 +08:00
hooray 25569b1d35 fix: 修复面包屑导航显示bug
未设置`meta.breadcrumb`的路由无法在面包屑导航中显示的bug
2023-01-15 12:17:58 +08:00
hooray cefe0c6d78 chore: release v2.6.1 2023-01-09 11:00:52 +08:00
hooray 1187a29ca4 chore: 更新依赖 2023-01-09 10:20:07 +08:00
hooray 4cdfd7210e chore: 更新默认 copyright 信息 2023-01-03 11:26:15 +08:00
hooray 3d84d73e20 chore: release v2.6.0 2022-12-28 12:57:19 +08:00
hooray abbbd74e91 chore: 更新依赖 2022-12-28 12:57:01 +08:00
hooray 4c3512a13c fix: 修复次导航收起时图标不居中 2022-12-22 12:02:22 +08:00
hooray 7387cea6ce chore: 更新依赖 2022-12-22 11:56:37 +08:00
hooray 2e4610aec3 fix: 修复预览图片无法完整覆盖 el-table 固定列
涉及组件 image-preview / image-upload / images-upload
2022-12-19 22:13:32 +08:00
hooray b7b949c160 feat: 引入 vite-plugin-vue-inspector 插件 2022-12-19 20:43:46 +08:00
hooray 7ee5bcb935 fix: 修复应用配置中复制配置按钮,复制内容过多的问题 2022-12-18 18:52:23 +08:00
hooray c239f2fa0f chore: 移除环境配置文件里无效配置 2022-12-15 22:35:12 +08:00
hooray dcdba0d310 chore: 更新依赖 2022-12-13 22:29:41 +08:00
hooray 800e729c71 refactor!: pinia store 改为 setup 写法 2022-12-13 22:27:34 +08:00
hooray 77f62626de chore: release v2.5.0 2022-12-10 17:00:23 +08:00
hooray d1fc70175e chore: 更新依赖 2022-12-10 16:59:51 +08:00
hooray 55f7e0b9d2 refactor: 优化搜索界面布局样式 2022-12-10 16:58:20 +08:00
hooray 7960d9c6a2 refactor: 给 /src/types/ 路径增加 # alias 2022-12-09 01:01:19 +08:00
hooray 6f88513a5f refactor!: 将类型定义 d.ts 文件统一存放到 /src/types/ 目录下 2022-12-08 02:32:08 +08:00
hooray b9e48842ab fix: 修复导航栏a标签href异常 2022-12-07 12:02:44 +08:00
hooray 135dc85fa8 chore: 调整全局搜索快捷键说明文字因背景导致显示不清晰 2022-12-06 21:27:50 +08:00
hooray 87ac51726f refactor: 优化遮罩层样式 2022-12-05 00:36:57 +08:00
hooray 7882cd8f22 feat!: 顶栏增加粘性模式
设置粘性模式时,页面往下滚动隐藏,往上滚动显示

BREAKING CHANGE: 移除`topbar.fixed`属性,新增`topbar.mode`属性
2022-12-04 23:11:03 +08:00
hooray 5644268411 refactor: 改用 element plus 原生 api 实现密码输入框显示密码功能 2022-12-04 03:57:51 +08:00
hooray 989453a644 chore: 更新依赖 2022-12-03 16:04:20 +08:00
hooray 18285821d9 chore: 修改 readme 2022-12-03 16:02:54 +08:00
hooray 9c3085367b chore: readme 增加部分 badge 2022-12-02 17:51:11 +08:00
hooray 52f5a76ca4 chore: 更新readme 2022-12-02 10:45:16 +08:00
hooray 12c268d18d chore: release v2.4.0 2022-12-01 22:53:50 +08:00
hooray 0c43078d32 feat!: 增加外链路由跳转提示页面,重构外链路由的配置方式
BREAKING CHANGE: 原先在路由`path`上设置外链,现在在路由`meta.link`上设置外链
2022-12-01 20:12:53 +08:00
hooray c534577feb chore: 代码微调 2022-11-30 04:09:55 +08:00
hooray 7474a19af2 fix: 修复 eslint 警告 2022-11-30 03:59:14 +08:00
hooray ae1f81762f chore: 更新依赖 2022-11-30 02:11:47 +08:00
hooray ffb3c85b83 chore: release v2.3.0 2022-11-28 00:35:20 +08:00
hooray ca1ea48dc6 refactor: 修改 Menu.recordRaw 和 Menu.recordMainRaw 类型里的 meta 为可选参数 2022-11-27 23:40:16 +08:00
hooray 5c6494931b fix: 修复标题显示异常 2022-11-27 23:37:03 +08:00
hooray e24431c38a refactor!: 移除自定义 Route.recordRaw 类型,改用 RouteRecordRaw 类型 2022-11-27 17:50:31 +08:00
hooray f85a911b8e fix: 修复文件系统路由模式下,全局搜索列表 icon 显示不全 2022-11-27 04:09:30 +08:00
hooray 776fe7a944 feat: 路由meta.title修改为非必须 2022-11-27 03:52:22 +08:00
55 changed files with 3026 additions and 1807 deletions
-2
View File
@@ -1,5 +1,3 @@
NODE_ENV = production
# 页面标题
VITE_APP_TITLE = 页面标题
# 接口请求地址,会设置到 axios 的 baseURL 参数上
-2
View File
@@ -1,5 +1,3 @@
NODE_ENV = production
# 页面标题
VITE_APP_TITLE = 页面标题(test)
# 接口请求地址,会设置到 axios 的 baseURL 参数上
+56 -51
View File
@@ -1,5 +1,5 @@
<p align="center">
<img src="https://hooray.gitee.io/fantastic-admin/logo.png" width="200" height="200" />
<img src="https://hooray.gitee.io/fantastic-admin/logo.png" width="200" height="200" />
</p>
<h1 align="center">Fantastic-admin</h1>
@@ -7,18 +7,23 @@
<p align="center">一款<b>开箱即用</b>的 Vue 中后台管理系统框架</p>
<p align="center">
<a href="https://hooray.gitee.io/fantastic-admin/" target="_blank">官网</a>
( <a href="https://hooray.github.io/fantastic-admin" target="_blank">备用</a> )
<span>&nbsp;|&nbsp;</span>
演示
( <a href="https://hooray.gitee.io/fantastic-admin-example" target="_blank">基础版</a>
<a href="https://hooray.gitee.io/fantastic-admin-pro-example" target="_blank">专业版</a> )
<span>&nbsp;|&nbsp;</span>
<a href="https://hooray.gitee.io/fantastic-admin/support.html" target="_blank">技术支持</a>
<span>&nbsp;|&nbsp;</span>
<a href="https://hooray.gitee.io/fantastic-admin/buy.html" target="_blank">购买</a>
<a href="https://hooray.gitee.io/fantastic-admin" target="_blank">官网</a>
( <a href="https://hooray.github.io/fantastic-admin" target="_blank">备用</a> )
<span>&nbsp;|&nbsp;</span>
演示
( <a href="https://hooray.gitee.io/fantastic-admin-example" target="_blank">基础版</a>
<a href="https://hooray.gitee.io/fantastic-admin-pro-example" target="_blank">专业版</a> )
<span>&nbsp;|&nbsp;</span>
<a href="https://hooray.gitee.io/fantastic-admin/support.html" target="_blank">技术支持</a>
<span>&nbsp;|&nbsp;</span>
<a href="https://hooray.gitee.io/fantastic-admin/buy.html" target="_blank">购买</a>
<p>
<p align="center">
<a href="###"><img src="https://img.shields.io/github/license/hooray/fantastic-admin?label=%E5%BC%80%E6%BA%90%E5%8D%8F%E8%AE%AE&style=flat-square" /></a>
<a href="https://github.com/hooray/fantastic-admin/releases" target="_blank"><img src="https://img.shields.io/github/v/release/hooray/fantastic-admin?label=%E5%BD%93%E5%89%8D%E7%89%88%E6%9C%AC&style=flat-square" /></a>
</p>
## 特点
- 丰富的布局与主题,覆盖市面上各种中后台应用场景,兼容PC、平板和移动端
@@ -43,16 +48,16 @@
> 预览截图为 Vue3 专业版
<table>
<tr>
<td><img src="https://hooray.gitee.io/fantastic-admin/preview1.png" /></td>
<td><img src="https://hooray.gitee.io/fantastic-admin/preview2.png" /></td>
<td><img src="https://hooray.gitee.io/fantastic-admin/preview3.png" /></td>
</tr>
<tr>
<td><img src="https://hooray.gitee.io/fantastic-admin/preview4.png" /></td>
<td><img src="https://hooray.gitee.io/fantastic-admin/preview5.png" /></td>
<td><img src="https://hooray.gitee.io/fantastic-admin/preview6.png" /></td>
</tr>
<tr>
<td><img src="https://hooray.gitee.io/fantastic-admin/preview1.png" /></td>
<td><img src="https://hooray.gitee.io/fantastic-admin/preview2.png" /></td>
<td><img src="https://hooray.gitee.io/fantastic-admin/preview3.png" /></td>
</tr>
<tr>
<td><img src="https://hooray.gitee.io/fantastic-admin/preview4.png" /></td>
<td><img src="https://hooray.gitee.io/fantastic-admin/preview5.png" /></td>
<td><img src="https://hooray.gitee.io/fantastic-admin/preview6.png" /></td>
</tr>
</table>
## 支持
@@ -66,37 +71,37 @@
## 生态
<table>
<tr>
<th colspan="3" align="center">
<a href="https://hooray.gitee.io/fantastic-startkit/" target="_blank">Fantastic-startkit</a>
</th>
</tr>
<tr>
<th colspan="3" align="center">
一款开箱即用的 Vue 项目启动套件
</th>
</tr>
<tr>
<th colspan="3" align="center">
<a href="https://hooray.gitee.io/fantastic-startkit/" target="_blank">Fantastic-startkit</a>
</th>
</tr>
<tr>
<th colspan="3" align="center">
一款开箱即用的 Vue 项目启动套件
</th>
</tr>
</table>
<table>
<tr>
<th colspan="3" align="center">
<a href="https://hooray.gitee.io/one-step-admin/" target="_blank">One-step-admin</a>
</th>
</tr>
<tr>
<th colspan="3" align="center">
一款干啥都快人一步的 Vue 中后台管理系统框架
</th>
</tr>
<tr>
<td><img src="https://hooray.gitee.io/one-step-admin/preview1.png" /></td>
<td><img src="https://hooray.gitee.io/one-step-admin/preview2.png" /></td>
<td><img src="https://hooray.gitee.io/one-step-admin/preview3.png" /></td>
</tr>
<tr>
<td><img src="https://hooray.gitee.io/one-step-admin/preview4.png" /></td>
<td><img src="https://hooray.gitee.io/one-step-admin/preview5.png" /></td>
<td><img src="https://hooray.gitee.io/one-step-admin/preview6.png" /></td>
</tr>
<tr>
<th colspan="3" align="center">
<a href="https://hooray.gitee.io/one-step-admin/" target="_blank">One-step-admin</a>
</th>
</tr>
<tr>
<th colspan="3" align="center">
一款干啥都快人一步的 Vue 中后台管理系统框架
</th>
</tr>
<tr>
<td><img src="https://hooray.gitee.io/one-step-admin/preview1.png" /></td>
<td><img src="https://hooray.gitee.io/one-step-admin/preview2.png" /></td>
<td><img src="https://hooray.gitee.io/one-step-admin/preview3.png" /></td>
</tr>
<tr>
<td><img src="https://hooray.gitee.io/one-step-admin/preview4.png" /></td>
<td><img src="https://hooray.gitee.io/one-step-admin/preview5.png" /></td>
<td><img src="https://hooray.gitee.io/one-step-admin/preview6.png" /></td>
</tr>
</table>
+29 -28
View File
@@ -1,5 +1,5 @@
{
"version": "2.2.0",
"version": "2.7.0",
"scripts": {
"dev": "vite",
"build:test": "vue-tsc --noEmit && vite build --mode test",
@@ -19,11 +19,11 @@
},
"dependencies": {
"@tinymce/tinymce-vue": "^5.0.0",
"@vueuse/core": "^9.6.0",
"@vueuse/integrations": "^9.6.0",
"axios": "^1.2.0",
"dayjs": "^1.11.6",
"element-plus": "^2.2.25",
"@vueuse/core": "^9.12.0",
"@vueuse/integrations": "^9.12.0",
"axios": "^1.3.2",
"dayjs": "^1.11.7",
"element-plus": "^2.2.30",
"hotkeys-js": "^3.10.1",
"lodash-es": "^4.17.21",
"mitt": "^3.0.0",
@@ -31,54 +31,55 @@
"nprogress": "^0.2.0",
"path-browserify": "^1.0.1",
"path-to-regexp": "^6.2.1",
"pinia": "^2.0.26",
"pinia": "^2.0.30",
"qs": "^6.11.0",
"tinymce": "^6.3.0",
"vue": "^3.2.45",
"tinymce": "^6.3.1",
"vue": "^3.2.47",
"vue-router": "^4.1.6"
},
"devDependencies": {
"@antfu/eslint-config": "^0.31.0",
"@antfu/eslint-config": "^0.35.2",
"@iconify-json/ep": "^1.1.8",
"@iconify/vue": "^4.0.0",
"@iconify/vue": "^4.1.0",
"@types/nprogress": "^0.2.0",
"@types/path-browserify": "^1.0.0",
"@types/qs": "^6.9.7",
"@vitejs/plugin-vue": "^3.2.0",
"@vitejs/plugin-vue-jsx": "^2.1.1",
"@vitejs/plugin-vue": "^4.0.0",
"@vitejs/plugin-vue-jsx": "^3.0.0",
"autoprefixer": "^10.4.13",
"bumpp": "^8.2.1",
"cz-git": "^1.3.12",
"eslint": "^8.28.0",
"cz-git": "^1.4.1",
"eslint": "^8.34.0",
"esno": "^0.16.3",
"fs-extra": "^10.1.0",
"fs-extra": "^11.1.0",
"http-server": "^14.1.1",
"lint-staged": "^13.0.4",
"lint-staged": "^13.1.1",
"npm-run-all": "^4.1.5",
"plop": "^3.1.1",
"plop": "^3.1.2",
"postcss-html": "^1.5.0",
"sass": "^1.56.1",
"sass": "^1.58.0",
"simple-git-hooks": "^2.8.1",
"stylelint": "^14.15.0",
"stylelint-config-standard": "^29.0.0",
"stylelint": "^15.1.0",
"stylelint-config-standard": "^30.0.1",
"stylelint-config-standard-scss": "^6.1.0",
"stylelint-config-standard-vue": "^1.0.0",
"stylelint-scss": "^4.3.0",
"svgo": "^3.0.2",
"typescript": "^4.9.3",
"unplugin-auto-import": "^0.12.0",
"unplugin-vue-components": "^0.22.11",
"vite": "^3.2.4",
"vite-plugin-banner": "^0.6.1",
"typescript": "^4.9.5",
"unplugin-auto-import": "^0.14.2",
"unplugin-vue-components": "^0.23.0",
"vite": "^4.1.1",
"vite-plugin-banner": "^0.7.0",
"vite-plugin-compression": "^0.5.1",
"vite-plugin-html": "^3.2.0",
"vite-plugin-mock": "^2.9.6",
"vite-plugin-pages": "^0.27.1",
"vite-plugin-pages": "^0.28.0",
"vite-plugin-spritesmith": "^0.1.1",
"vite-plugin-svg-icons": "^2.0.1",
"vite-plugin-vue-inspector": "^3.3.2",
"vite-plugin-vue-layouts": "^0.6.0",
"vite-plugin-vue-setup-extend": "^0.4.0",
"vue-tsc": "^1.0.9"
"vue-tsc": "^1.0.24"
},
"simple-git-hooks": {
"pre-commit": "pnpm lint-staged",
+1863 -751
View File
File diff suppressed because it is too large Load Diff
+6 -42
View File
@@ -3,7 +3,6 @@ import zhCn from 'element-plus/es/locale/lang/zh-cn'
import hotkeys from 'hotkeys-js'
import eventBus from './utils/eventBus'
import useSettingsStore from '@/store/modules/settings'
import useMenuStore from '@/store/modules/menu'
const settingsStore = useSettingsStore()
@@ -14,7 +13,7 @@ const buttonConfig = ref({
// 侧边栏主导航当前实际宽度
const mainSidebarActualWidth = computed(() => {
let actualWidth = parseInt(getComputedStyle(document.documentElement).getPropertyValue('--g-main-sidebar-width'))
if (['head', 'single'].includes(settingsStore.menu.menuMode)) {
if (['head', 'single'].includes(settingsStore.settings.menu.menuMode)) {
actualWidth = 0
}
return `${actualWidth}px`
@@ -23,58 +22,23 @@ const mainSidebarActualWidth = computed(() => {
// 侧边栏次导航当前实际宽度
const subSidebarActualWidth = computed(() => {
let actualWidth = parseInt(getComputedStyle(document.documentElement).getPropertyValue('--g-sub-sidebar-width'))
if (settingsStore.menu.subMenuCollapse) {
if (settingsStore.settings.menu.subMenuCollapse) {
actualWidth = 64
}
return `${actualWidth}px`
})
watch(() => settingsStore.app.colorScheme, () => {
if (settingsStore.app.colorScheme === 'dark') {
document.documentElement.classList.add('dark')
}
else {
document.documentElement.classList.remove('dark')
}
}, {
immediate: true,
})
watch(() => settingsStore.mode, () => {
if (settingsStore.mode === 'pc') {
settingsStore.$patch((state) => {
state.menu.subMenuCollapse = settingsStore.subMenuCollapseLastStatus
})
}
else if (settingsStore.mode === 'mobile') {
settingsStore.$patch((state) => {
state.menu.subMenuCollapse = true
})
}
document.body.setAttribute('data-mode', settingsStore.mode)
}, {
immediate: true,
})
watch(() => settingsStore.menu.menuMode, () => {
document.body.setAttribute('data-menu-mode', settingsStore.menu.menuMode)
}, {
immediate: true,
})
watch([
() => settingsStore.app.enableDynamicTitle,
() => settingsStore.settings.app.enableDynamicTitle,
() => settingsStore.title,
], () => {
if (settingsStore.app.enableDynamicTitle && settingsStore.title) {
const title = settingsStore.title
if (settingsStore.settings.app.enableDynamicTitle && settingsStore.title) {
const title = typeof settingsStore.title === 'function' ? settingsStore.title() : settingsStore.title
document.title = `${title} - ${import.meta.env.VITE_APP_TITLE}`
}
else {
document.title = import.meta.env.VITE_APP_TITLE
}
}, {
immediate: true,
})
onMounted(() => {
@@ -89,7 +53,7 @@ onMounted(() => {
</script>
<template>
<el-config-provider :locale="zhCn" :size="settingsStore.app.elementSize" :button="buttonConfig">
<el-config-provider :locale="zhCn" :size="settingsStore.settings.app.elementSize" :button="buttonConfig">
<RouterView
:style="{
'--g-main-sidebar-actual-width': mainSidebarActualWidth,
+8 -7
View File
@@ -5,17 +5,18 @@ import router from '@/router/index'
import useUserStore from '@/store/modules/user'
const toLogin = () => {
useUserStore().logout()
router.push({
path: '/login',
query: {
redirect: router.currentRoute.value.path !== '/login' ? router.currentRoute.value.fullPath : undefined,
},
useUserStore().logout().then(() => {
router.push({
path: '/login',
query: {
redirect: router.currentRoute.value.path !== '/login' ? router.currentRoute.value.fullPath : undefined,
},
})
})
}
const api = axios.create({
baseURL: import.meta.env.DEV && import.meta.env.VITE_OPEN_PROXY === 'true' ? '/proxy/' : import.meta.env.VITE_APP_API_BASEURL,
baseURL: import.meta.env.DEV && (import.meta.env.VITE_OPEN_PROXY === 'true' ? '/proxy/' : import.meta.env.VITE_APP_API_BASEURL),
timeout: 1000 * 60,
responseType: 'json',
})
-30
View File
@@ -1,30 +0,0 @@
// generated by unplugin-vue-components
// We suggest you to commit this file into source control
// Read more: https://github.com/vuejs/core/pull/3399
import '@vue/runtime-core'
export {}
declare module '@vue/runtime-core' {
export interface GlobalComponents {
Auth: typeof import('./components/Auth/index.vue')['default']
AuthAll: typeof import('./components/AuthAll/index.vue')['default']
BatchActionBar: typeof import('./components/BatchActionBar/index.vue')['default']
Copyright: typeof import('./components/Copyright/index.vue')['default']
Editor: typeof import('./components/Editor/index.vue')['default']
FileUpload: typeof import('./components/FileUpload/index.vue')['default']
FixedActionBar: typeof import('./components/FixedActionBar/index.vue')['default']
ImagePreview: typeof import('./components/ImagePreview/index.vue')['default']
ImagesUpload: typeof import('./components/ImagesUpload/index.vue')['default']
ImageUpload: typeof import('./components/ImageUpload/index.vue')['default']
PageHeader: typeof import('./components/PageHeader/index.vue')['default']
PageMain: typeof import('./components/PageMain/index.vue')['default']
PcasCascader: typeof import('./components/PcasCascader/index.vue')['default']
RouterLink: typeof import('vue-router')['RouterLink']
RouterView: typeof import('vue-router')['RouterView']
SearchBar: typeof import('./components/SearchBar/index.vue')['default']
SvgIcon: typeof import('./components/SvgIcon/index.vue')['default']
SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
Trend: typeof import('./components/Trend/index.vue')['default']
}
}
+6 -6
View File
@@ -6,15 +6,15 @@ const settingsStore = useSettingsStore()
</script>
<template>
<footer v-if="route.meta.copyright ?? settingsStore.copyright.enable" class="copyright">
<footer v-if="route.meta.copyright ?? settingsStore.settings.copyright.enable" class="copyright">
<span>Copyright</span>
<span class="icon">©</span>
<span v-if="settingsStore.copyright.dates">{{ settingsStore.copyright.dates }}</span>
<template v-if="settingsStore.copyright.company">
<a v-if="settingsStore.copyright.website" :href="settingsStore.copyright.website" target="_blank" rel="noopener">{{ settingsStore.copyright.company }}</a>
<span v-else>{{ settingsStore.copyright.company }}</span>
<span v-if="settingsStore.settings.copyright.dates">{{ settingsStore.settings.copyright.dates }}</span>
<template v-if="settingsStore.settings.copyright.company">
<a v-if="settingsStore.settings.copyright.website" :href="settingsStore.settings.copyright.website" target="_blank" rel="noopener">{{ settingsStore.settings.copyright.company }}</a>
<span v-else>{{ settingsStore.settings.copyright.company }}</span>
</template>
<a v-if="settingsStore.copyright.beian" href="https://beian.miit.gov.cn/" target="_blank" rel="noopener">{{ settingsStore.copyright.beian }}</a>
<a v-if="settingsStore.settings.copyright.beian" href="https://beian.miit.gov.cn/" target="_blank" rel="noopener">{{ settingsStore.settings.copyright.beian }}</a>
</footer>
</template>
+3 -3
View File
@@ -42,8 +42,8 @@ const settingsStore = useSettingsStore()
const defaultSetting = ref({
language_url: 'tinymce/langs/zh-Hans.js',
language: 'zh-Hans',
skin_url: settingsStore.app.colorScheme === 'light' ? 'tinymce/skins/ui/oxide' : 'tinymce/skins/ui/oxide-dark',
content_css: settingsStore.app.colorScheme === 'light' ? 'tinymce/skins/content/default/content.min.css' : 'tinymce/skins/content/dark/content.min.css',
skin_url: settingsStore.settings.app.colorScheme === 'light' ? 'tinymce/skins/ui/oxide' : 'tinymce/skins/ui/oxide-dark',
content_css: settingsStore.settings.app.colorScheme === 'light' ? 'tinymce/skins/content/default/content.min.css' : 'tinymce/skins/content/dark/content.min.css',
min_height: 250,
max_height: 600,
selector: 'textarea',
@@ -59,7 +59,7 @@ const defaultSetting = ref({
'%H:%M:%S',
],
// https://www.tiny.cloud/docs/tinymce/6/file-image-upload/#images_upload_handler
images_upload_handler: (blobInfo: any, progress: any) => new Promise((resolve, reject) => {
images_upload_handler: (blobInfo: any) => new Promise((resolve) => {
const img = `data:image/jpeg;base64,${blobInfo.base64()}`
resolve(img)
}),
+1 -1
View File
@@ -24,7 +24,7 @@ const realHeight = computed(() => {
</script>
<template>
<el-image :src="src" fit="cover" :style="`width:${realWidth};height:${realHeight};`" :preview-src-list="[src]">
<el-image :src="src" fit="cover" :style="`width:${realWidth};height:${realHeight};`" :preview-src-list="[src]" preview-teleported>
<template #error>
<div class="image-slot">
<el-icon>
+1 -1
View File
@@ -147,7 +147,7 @@ const onSuccess: UploadProps['onSuccess'] = (res) => {
<el-alert :title="`上传图片支持 ${ext.join(' / ')} 格式,且图片大小不超过 ${size}MB,建议图片尺寸为 ${width}*${height}`" type="info" show-icon :closable="false" />
</div>
</div>
<el-image-viewer v-if="uploadData.imageViewerVisible" :url-list="[url]" @close="previewClose" />
<el-image-viewer v-if="uploadData.imageViewerVisible" :url-list="[url]" teleported @close="previewClose" />
</div>
</template>
+1 -1
View File
@@ -174,7 +174,7 @@ const onSuccess: UploadProps['onSuccess'] = (res) => {
<el-alert :title="`上传图片支持 ${ext.join(' / ')} 格式,单张图片大小不超过 ${size}MB,建议图片尺寸为 ${width}*${height},且图片数量不超过 ${max} 张`" type="info" show-icon :closable="false" />
</div>
</div>
<el-image-viewer v-if="uploadData.imageViewerVisible" :url-list="url as string[]" :initial-index="uploadData.dialogImageIndex" @close="previewClose" />
<el-image-viewer v-if="uploadData.imageViewerVisible" :url-list="url as string[]" :initial-index="uploadData.dialogImageIndex" teleported @close="previewClose" />
</div>
</template>
+41 -36
View File
@@ -1,7 +1,6 @@
<script lang="ts" setup name="AppSetting">
import { useClipboard } from '@vueuse/core'
import { ElMessage } from 'element-plus'
import { cloneDeep } from 'lodash-es'
import eventBus from '@/utils/eventBus'
import useSettingsStore from '@/store/modules/settings'
import useMenuStore from '@/store/modules/menu'
@@ -13,7 +12,7 @@ const menuStore = useMenuStore()
const isShow = ref(false)
watch(() => settingsStore.menu.menuMode, (value) => {
watch(() => settingsStore.settings.menu.menuMode, (value) => {
if (value === 'single') {
menuStore.setActived(0)
}
@@ -37,11 +36,7 @@ watch(copied, (val) => {
})
function handleCopy() {
const settings: any = cloneDeep(settingsStore.$state)
delete settings.subMenuCollapseLastStatus
delete settings.mode
delete settings.title
copy(JSON.stringify(settings, null, 2))
copy(JSON.stringify(settingsStore.settings, null, 2))
}
</script>
@@ -51,9 +46,9 @@ function handleCopy() {
<el-alert title="应用配置可实时预览效果,但只是临时生效,要想真正作用于项目,可以点击下方的“复制配置”按钮,并将配置粘贴到 src/settings.ts 文件中。同时建议在生产环境隐藏应用配置功能。" type="error" :closable="false" />
<el-divider>颜色主题</el-divider>
<div class="color-scheme">
<div class="switch" :class="settingsStore.app.colorScheme" @click="settingsStore.app.colorScheme = settingsStore.app.colorScheme === 'dark' ? 'light' : 'dark'">
<div class="switch" :class="settingsStore.settings.app.colorScheme" @click="settingsStore.settings.app.colorScheme = settingsStore.settings.app.colorScheme === 'dark' ? 'light' : 'dark'">
<el-icon class="icon">
<svg-icon :name="settingsStore.app.colorScheme === 'light' ? 'ep:sunny' : 'ep:moon'" />
<svg-icon :name="settingsStore.settings.app.colorScheme === 'light' ? 'ep:sunny' : 'ep:moon'" />
</el-icon>
</div>
</div>
@@ -62,7 +57,7 @@ function handleCopy() {
</el-divider>
<div v-if="settingsStore.mode === 'pc'" class="menu-mode">
<el-tooltip content="侧边栏模式(含主导航)" placement="top" :show-after="500">
<div class="mode mode-side" :class="{ active: settingsStore.menu.menuMode === 'side' }" @click="settingsStore.menu.menuMode = 'side'">
<div class="mode mode-side" :class="{ active: settingsStore.settings.menu.menuMode === 'side' }" @click="settingsStore.settings.menu.menuMode = 'side'">
<div class="mode-container" />
<el-icon>
<svg-icon name="ep:check" />
@@ -70,7 +65,7 @@ function handleCopy() {
</div>
</el-tooltip>
<el-tooltip content="顶部模式" placement="top" :show-after="500">
<div class="mode mode-head" :class="{ active: settingsStore.menu.menuMode === 'head' }" @click="settingsStore.menu.menuMode = 'head'">
<div class="mode mode-head" :class="{ active: settingsStore.settings.menu.menuMode === 'head' }" @click="settingsStore.settings.menu.menuMode = 'head'">
<div class="mode-container" />
<el-icon>
<svg-icon name="ep:check" />
@@ -78,7 +73,7 @@ function handleCopy() {
</div>
</el-tooltip>
<el-tooltip content="侧边栏模式(不含主导航)" placement="top" :show-after="500">
<div class="mode mode-single" :class="{ active: settingsStore.menu.menuMode === 'single' }" @click="settingsStore.menu.menuMode = 'single'">
<div class="mode mode-single" :class="{ active: settingsStore.settings.menu.menuMode === 'single' }" @click="settingsStore.settings.menu.menuMode = 'single'">
<div class="mode-container" />
<el-icon>
<svg-icon name="ep:check" />
@@ -96,7 +91,7 @@ function handleCopy() {
</el-icon>
</el-tooltip>
</div>
<el-switch v-model="settingsStore.menu.switchMainMenuAndPageJump" :disabled="['single'].includes(settingsStore.menu.menuMode)" />
<el-switch v-model="settingsStore.settings.menu.switchMainMenuAndPageJump" :disabled="['single'].includes(settingsStore.settings.menu.menuMode)" />
</div>
<div class="setting-item">
<div class="label">
@@ -107,32 +102,42 @@ function handleCopy() {
</el-icon>
</el-tooltip>
</div>
<el-switch v-model="settingsStore.menu.subMenuUniqueOpened" />
<el-switch v-model="settingsStore.settings.menu.subMenuUniqueOpened" />
</div>
<div class="setting-item">
<div class="label">
次导航是否折叠
</div>
<el-switch v-model="settingsStore.menu.subMenuCollapse" />
<el-switch v-model="settingsStore.settings.menu.subMenuCollapse" />
</div>
<div v-if="settingsStore.mode === 'pc'" class="setting-item">
<div class="label">
显示次导航折叠按钮
</div>
<el-switch v-model="settingsStore.menu.enableSubMenuCollapseButton" />
<el-switch v-model="settingsStore.settings.menu.enableSubMenuCollapseButton" />
</div>
<div class="setting-item">
<div class="label">
是否启用快捷键
</div>
<el-switch v-model="settingsStore.menu.enableHotkeys" :disabled="['single'].includes(settingsStore.menu.menuMode)" />
<el-switch v-model="settingsStore.settings.menu.enableHotkeys" :disabled="['single'].includes(settingsStore.settings.menu.menuMode)" />
</div>
<el-divider>顶栏</el-divider>
<div class="setting-item">
<div class="label">
是否固定
模式
</div>
<el-switch v-model="settingsStore.topbar.fixed" />
<el-radio-group v-model="settingsStore.settings.topbar.mode" size="small">
<el-radio-button label="static">
静止
</el-radio-button>
<el-radio-button label="fixed">
固定
</el-radio-button>
<el-radio-button label="sticky">
粘性
</el-radio-button>
</el-radio-group>
</div>
<el-divider>工具栏</el-divider>
<div v-if="settingsStore.mode === 'pc'" class="setting-item">
@@ -144,7 +149,7 @@ function handleCopy() {
</el-icon>
</el-tooltip>
</div>
<el-switch v-model="settingsStore.toolbar.enableFullscreen" />
<el-switch v-model="settingsStore.settings.toolbar.enableFullscreen" />
</div>
<div class="setting-item">
<div class="label">
@@ -155,7 +160,7 @@ function handleCopy() {
</el-icon>
</el-tooltip>
</div>
<el-switch v-model="settingsStore.toolbar.enablePageReload" />
<el-switch v-model="settingsStore.settings.toolbar.enablePageReload" />
</div>
<div class="setting-item">
<div class="label">
@@ -166,7 +171,7 @@ function handleCopy() {
</el-icon>
</el-tooltip>
</div>
<el-switch v-model="settingsStore.toolbar.enableColorScheme" />
<el-switch v-model="settingsStore.settings.toolbar.enableColorScheme" />
</div>
<el-divider v-if="settingsStore.mode === 'pc'">
面包屑导航
@@ -175,7 +180,7 @@ function handleCopy() {
<div class="label">
是否启用
</div>
<el-switch v-model="settingsStore.breadcrumb.enable" />
<el-switch v-model="settingsStore.settings.breadcrumb.enable" />
</div>
<el-divider>导航搜索</el-divider>
<div class="setting-item">
@@ -187,44 +192,44 @@ function handleCopy() {
</el-icon>
</el-tooltip>
</div>
<el-switch v-model="settingsStore.navSearch.enable" />
<el-switch v-model="settingsStore.settings.navSearch.enable" />
</div>
<div class="setting-item">
<div class="label">
是否启用快捷键
</div>
<el-switch v-model="settingsStore.navSearch.enableHotkeys" :disabled="!settingsStore.navSearch.enable" />
<el-switch v-model="settingsStore.settings.navSearch.enableHotkeys" :disabled="!settingsStore.settings.navSearch.enable" />
</div>
<el-divider>底部版权</el-divider>
<div class="setting-item">
<div class="label">
是否启用
</div>
<el-switch v-model="settingsStore.copyright.enable" />
<el-switch v-model="settingsStore.settings.copyright.enable" />
</div>
<div class="setting-item">
<div class="label">
日期
</div>
<el-input v-model="settingsStore.copyright.dates" size="small" :disabled="!settingsStore.copyright.enable" />
<el-input v-model="settingsStore.settings.copyright.dates" size="small" :disabled="!settingsStore.settings.copyright.enable" />
</div>
<div class="setting-item">
<div class="label">
公司
</div>
<el-input v-model="settingsStore.copyright.company" size="small" :disabled="!settingsStore.copyright.enable" />
<el-input v-model="settingsStore.settings.copyright.company" size="small" :disabled="!settingsStore.settings.copyright.enable" />
</div>
<div class="setting-item">
<div class="label">
网址
</div>
<el-input v-model="settingsStore.copyright.website" size="small" :disabled="!settingsStore.copyright.enable" />
<el-input v-model="settingsStore.settings.copyright.website" size="small" :disabled="!settingsStore.settings.copyright.enable" />
</div>
<div class="setting-item">
<div class="label">
备案
</div>
<el-input v-model="settingsStore.copyright.beian" size="small" :disabled="!settingsStore.copyright.enable" />
<el-input v-model="settingsStore.settings.copyright.beian" size="small" :disabled="!settingsStore.settings.copyright.enable" />
</div>
<el-divider>主页</el-divider>
<div class="setting-item">
@@ -236,13 +241,13 @@ function handleCopy() {
</el-icon>
</el-tooltip>
</div>
<el-switch v-model="settingsStore.home.enable" />
<el-switch v-model="settingsStore.settings.home.enable" />
</div>
<div class="setting-item">
<div class="label">
主页名称
</div>
<el-input v-model="settingsStore.home.title" size="small" />
<el-input v-model="settingsStore.settings.home.title" size="small" />
</div>
<el-divider>其它</el-divider>
<div class="setting-item">
@@ -254,7 +259,7 @@ function handleCopy() {
</el-icon>
</el-tooltip>
</div>
<el-radio-group v-model="settingsStore.app.elementSize" size="small">
<el-radio-group v-model="settingsStore.settings.app.elementSize" size="small">
<el-radio-button label="large">
较大
</el-radio-button>
@@ -270,7 +275,7 @@ function handleCopy() {
<div class="label">
是否启用权限
</div>
<el-switch v-model="settingsStore.app.enablePermission" />
<el-switch v-model="settingsStore.settings.app.enablePermission" />
</div>
<div class="setting-item">
<div class="label">
@@ -281,7 +286,7 @@ function handleCopy() {
</el-icon>
</el-tooltip>
</div>
<el-switch v-model="settingsStore.app.enableProgress" />
<el-switch v-model="settingsStore.settings.app.enableProgress" />
</div>
<div class="setting-item">
<div class="label">
@@ -292,7 +297,7 @@ function handleCopy() {
</el-icon>
</el-tooltip>
</div>
<el-switch v-model="settingsStore.app.enableDynamicTitle" />
<el-switch v-model="settingsStore.settings.app.enableDynamicTitle" />
</div>
<template v-if="isSupported" #footer>
<el-button type="primary" @click="handleCopy">
+4 -4
View File
@@ -21,7 +21,7 @@ function handlerMouserScroll(event: WheelEvent) {
<template>
<transition name="header">
<header v-if="settingsStore.mode === 'pc' && settingsStore.menu.menuMode === 'head'">
<header v-if="settingsStore.mode === 'pc' && settingsStore.settings.menu.menuMode === 'head'">
<div class="header-container">
<div class="main">
<Logo />
@@ -30,10 +30,10 @@ function handlerMouserScroll(event: WheelEvent) {
<template v-for="(item, index) in menuStore.allMenus" :key="index">
<div v-if="item.children && item.children.length !== 0" class="item-container" :class="{ active: index === menuStore.actived }">
<div class="item" @click="switchTo(index)">
<el-icon>
<svg-icon v-if="item.meta.icon" :name="item.meta.icon" />
<el-icon v-if="item.meta?.icon">
<svg-icon :name="item.meta.icon" />
</el-icon>
<span v-if="item.meta.title">{{ item.meta.title }}</span>
<span v-if="item.meta?.title">{{ item.meta.title }}</span>
</div>
</div>
</template>
@@ -20,11 +20,11 @@ onMounted(() => {
<el-descriptions-item label="查看系统信息">
Alt + I
</el-descriptions-item>
<el-descriptions-item v-if="settingsStore.navSearch.enable && settingsStore.navSearch.enableHotkeys" label="唤起导航搜索">
<el-descriptions-item v-if="settingsStore.settings.navSearch.enable && settingsStore.settings.navSearch.enableHotkeys" label="唤起导航搜索">
Alt + S
</el-descriptions-item>
</el-descriptions>
<el-descriptions v-if="settingsStore.menu.enableHotkeys && ['side', 'head'].includes(settingsStore.menu.menuMode)" title="主导航" :column="1" border>
<el-descriptions v-if="settingsStore.settings.menu.enableHotkeys && ['side', 'head'].includes(settingsStore.settings.menu.menuMode)" title="主导航" :column="1" border>
<el-descriptions-item label="激活下一个主导航">
Alt + `
</el-descriptions-item>
+2 -2
View File
@@ -22,7 +22,7 @@ const to = computed(() => {
const rtn: {
name?: string
} = {}
if (settingsStore.home.enable) {
if (settingsStore.settings.home.enable) {
rtn.name = 'home'
}
return rtn
@@ -30,7 +30,7 @@ const to = computed(() => {
</script>
<template>
<router-link :to="to" class="title" :class="{ 'is-link': settingsStore.home.enable }" :title="title">
<router-link :to="to" class="title" :class="{ 'is-link': settingsStore.settings.home.enable }" :title="title">
<img v-if="showLogo" :src="logo" class="logo">
<span v-if="showTitle">{{ title }}</span>
</router-link>
+5 -5
View File
@@ -11,7 +11,7 @@ const { switchTo } = useMenu()
<template>
<transition name="main-sidebar">
<div v-if="settingsStore.menu.menuMode === 'side' || (settingsStore.mode === 'mobile' && settingsStore.menu.menuMode !== 'single')" class="main-sidebar-container">
<div v-if="settingsStore.settings.menu.menuMode === 'side' || (settingsStore.mode === 'mobile' && settingsStore.settings.menu.menuMode !== 'single')" class="main-sidebar-container">
<Logo :show-title="false" class="sidebar-logo" />
<!-- 侧边栏模式(含主导航) -->
<div class="nav">
@@ -19,12 +19,12 @@ const { switchTo } = useMenu()
<div
v-if="item.children && item.children.length !== 0" :key="index" class="item" :class="{
active: index === menuStore.actived,
}" :title="item.meta.title" @click="switchTo(index)"
}" :title="item.meta?.title ?? '[ 无标题 ]'" @click="switchTo(index)"
>
<el-icon>
<svg-icon v-if="item.meta.icon" :name="item.meta.icon" />
<el-icon v-if="item.meta?.icon">
<svg-icon :name="item.meta.icon" />
</el-icon>
<span>{{ item.meta.title }}</span>
<span>{{ item.meta?.title ?? '[ 无标题 ]' }}</span>
</div>
</template>
</div>
+110 -79
View File
@@ -1,12 +1,12 @@
<script lang="ts" setup name="Search">
import { cloneDeep } from 'lodash-es'
import hotkeys from 'hotkeys-js'
import { isExternalLink } from '@/utils'
import type { RouteRecordRaw } from 'vue-router'
import eventBus from '@/utils/eventBus'
import useSettingsStore from '@/store/modules/settings'
import useRouteStore from '@/store/modules/route'
import useMenuStore from '@/store/modules/menu'
import type { Menu, Route } from '@/global'
import type { Menu } from '#/global'
const router = useRouter()
@@ -15,10 +15,11 @@ const routeStore = useRouteStore()
const menuStore = useMenuStore()
interface listTypes {
icon?: string
title: string
breadcrumb: string[]
path: string
icon?: string
title?: string | Function
link?: string
breadcrumb: (string | Function | undefined)[]
}
const isShow = ref(false)
@@ -38,13 +39,37 @@ const resultList = computed(() => {
let result = []
result = sourceList.value.filter((item) => {
let flag = false
if (item.title.includes(searchInput.value)) {
flag = true
if (item.title) {
if (typeof item.title === 'function') {
if (item.title().includes(searchInput.value)) {
flag = true
}
}
else {
if (item.title.includes(searchInput.value)) {
flag = true
}
}
}
if (item.path.includes(searchInput.value)) {
flag = true
}
if (item.breadcrumb.some(b => b.includes(searchInput.value))) {
if (item.breadcrumb.some((b) => {
let flag = false
if (b) {
if (typeof b === 'function') {
if (b().includes(searchInput.value)) {
flag = true
}
}
else {
if (b.includes(searchInput.value)) {
flag = true
}
}
}
return flag
})) {
flag = true
}
return flag
@@ -86,18 +111,18 @@ onMounted(() => {
isShow.value = !isShow.value
})
hotkeys('alt+s', (e) => {
if (settingsStore.navSearch.enable && settingsStore.navSearch.enableHotkeys) {
if (settingsStore.settings.navSearch.enable && settingsStore.settings.navSearch.enableHotkeys) {
e.preventDefault()
isShow.value = true
}
})
hotkeys('esc', (e) => {
if (settingsStore.navSearch.enable && settingsStore.navSearch.enableHotkeys) {
if (settingsStore.settings.navSearch.enable && settingsStore.settings.navSearch.enableHotkeys) {
e.preventDefault()
isShow.value = false
}
})
if (settingsStore.app.routeBaseOn !== 'filesystem') {
if (settingsStore.settings.app.routeBaseOn !== 'filesystem') {
routeStore.routes.forEach((item) => {
item.children && getSourceList(item.children)
})
@@ -109,52 +134,46 @@ onMounted(() => {
}
})
function hasChildren(item: Route.recordRaw) {
function hasChildren(item: RouteRecordRaw) {
let flag = true
if (item.children && item.children.every(i => i.meta.sidebar === false)) {
if (item.children?.every(i => i.meta?.sidebar === false)) {
flag = false
}
return flag
}
function getSourceList(arr: Route.recordRaw[], basePath?: string, icon?: string, breadcrumb?: string[]) {
function getSourceList(arr: RouteRecordRaw[], basePath?: string, icon?: string, breadcrumb?: (string | Function | undefined)[]) {
arr.forEach((item) => {
if (item.meta.sidebar !== false) {
if (item.meta?.sidebar !== false) {
const breadcrumbTemp = cloneDeep(breadcrumb) || []
if (item.children && hasChildren(item)) {
breadcrumbTemp.push(typeof item.meta.title === 'function' ? item.meta.title() : item.meta.title)
getSourceList(item.children, basePath ? [basePath, item.path].join('/') : item.path, item.meta.icon || icon, breadcrumbTemp)
breadcrumbTemp.push(item.meta?.title)
getSourceList(item.children, basePath ? [basePath, item.path].join('/') : item.path, item.meta?.icon ?? icon, breadcrumbTemp)
}
else {
breadcrumbTemp.push(typeof item.meta.title === 'function' ? item.meta.title() : item.meta.title)
let path = ''
if (isExternalLink(item.path)) {
path = item.path
}
else {
path = basePath ? [basePath, item.path].join('/') : item.path
}
breadcrumbTemp.push(item.meta?.title)
sourceList.value.push({
icon: item.meta.icon || icon,
title: typeof item.meta.title === 'function' ? item.meta.title() : item.meta.title,
path: basePath ? [basePath, item.path].join('/') : item.path,
icon: item.meta?.icon ?? icon,
title: item.meta?.title,
link: item.meta?.link,
breadcrumb: breadcrumbTemp,
path,
})
}
}
})
}
function getSourceListByMenus(arr: Menu.recordRaw[], icon?: string, breadcrumb?: string[]) {
function getSourceListByMenus(arr: Menu.recordRaw[], icon?: string, breadcrumb?: (string | Function | undefined)[]) {
arr.forEach((item) => {
const breadcrumbTemp = cloneDeep(breadcrumb) || []
if (item.children && item.children.length > 0) {
breadcrumbTemp.push(item.meta.title)
getSourceListByMenus(item.children, item.meta.icon, breadcrumbTemp)
breadcrumbTemp.push(item.meta?.title)
getSourceListByMenus(item.children, item.meta?.icon ?? icon, breadcrumbTemp)
}
else {
breadcrumbTemp.push(item.meta.title)
breadcrumbTemp.push(item.meta?.title)
sourceList.value.push({
icon: item.meta.icon || icon,
title: item.meta.title,
icon: item.meta?.icon ?? icon,
title: item.meta?.title,
path: item.path as string,
breadcrumb: breadcrumbTemp,
})
@@ -205,12 +224,12 @@ function handleScroll() {
})
}
function pageJump(url: string) {
if (isExternalLink(url)) {
window.open(url, 'top')
function pageJump(path: listTypes['path'], link: listTypes['link']) {
if (link) {
window.open(link, '_blank')
}
else {
router.push(url)
router.push(path)
}
}
</script>
@@ -228,48 +247,60 @@ function pageJump(url: string) {
</el-input>
<div v-if="settingsStore.mode === 'pc'" class="tips">
<div class="tip">
<span>Alt</span>+<span>S</span>
唤醒搜索面板
<el-tag type="info" size="large">
Alt + S
</el-tag>
<el-tag type="info" size="large">
唤醒搜索面板
</el-tag>
</div>
<div class="tip">
<span>
<el-tag type="info" size="large">
<el-icon>
<svg-icon name="search-up" />
</el-icon>
</span>
<span>
</el-tag>
<el-tag type="info" size="large">
<el-icon>
<svg-icon name="search-down" />
</el-icon>
</span>
切换搜索结果
</el-tag>
<el-tag type="info" size="large">
切换搜索结果
</el-tag>
</div>
<div class="tip">
<span>
<el-tag type="info" size="large">
<el-icon>
<svg-icon name="search-enter" />
</el-icon>
</span>
访问页面
</el-tag>
<el-tag type="info" size="large">
访问页面
</el-tag>
</div>
<div class="tip">
<span>ESC</span>
退出
<el-tag type="info" size="large">
ESC
</el-tag>
<el-tag type="info" size="large">
退出
</el-tag>
</div>
</div>
</div>
<div ref="searchResultRef" class="result" :class="{ mobile: settingsStore.mode === 'mobile' }">
<a v-for="(item, index) in resultList" :key="item.path" :ref="setSearchResultItemRef" class="item" :class="{ actived: index === actived }" @click="pageJump(item.path)" @mouseover="actived = index">
<div ref="searchResultRef" class="result">
<a v-for="(item, index) in resultList" :key="item.path" :ref="setSearchResultItemRef" class="item" :class="{ actived: index === actived }" @click="pageJump(item.path, item.link)" @mouseover="actived = index">
<el-icon class="icon">
<svg-icon v-if="item.icon" :name="item.icon" />
</el-icon>
<div class="info">
<div class="title">
{{ item.title }}
{{ item.title ?? '[ 无标题 ]' }}
</div>
<div class="breadcrumb">
<span v-for="(bc, bcIndex) in item.breadcrumb" :key="bcIndex">
{{ bc }}
{{ bc ?? '[ 无标题 ]' }}
<el-icon>
<svg-icon name="ep:arrow-right" />
</el-icon>
@@ -291,10 +322,10 @@ function pageJump(url: string) {
left: 0;
width: 100%;
height: 100%;
background-color: var(--el-overlay-color-lighter);
backdrop-filter: blur(10px);
background-image: radial-gradient(transparent 1px, rgb(0 0 0 / 30%) 1px);
background-size: 4px 4px;
backdrop-filter: saturate(50%) blur(4px);
transition: all 0.2s;
transform: translateZ(0);
opacity: 0;
visibility: hidden;
@@ -319,7 +350,7 @@ function pageJump(url: string) {
filter: blur(10px);
.search-box {
margin: 50px 20px 40px;
margin: 50px 20px 20px;
:deep(.el-input__inner) {
height: 52px;
@@ -335,39 +366,39 @@ function pageJump(url: string) {
.tips {
display: flex;
align-items: center;
justify-content: space-evenly;
margin-top: 20px;
line-height: 24px;
font-size: 14px;
color: #fff;
justify-content: center;
padding-top: 20px;
font-weight: bold;
span {
margin: 0 5px;
padding: 3px 8px 5px;
border-radius: 5px;
font-size: 12px;
font-weight: bold;
color: var(--el-text-color-primary);
background-color: var(--el-fill-color);
box-shadow: inset 0 -2px var(--el-fill-color-lighter), inset 0 0 1px 1px var(--el-fill-color-darker);
.tip {
display: flex;
align-items: center;
justify-content: center;
margin: 0 20px;
.el-tag {
margin: 0 5px;
&:first-child {
margin-left: 0;
}
&:last-child {
margin-right: 0;
}
}
}
}
}
.result {
position: relative;
margin: 0 20px;
max-height: calc(100% - 250px);
margin: 0 20px 50px;
border-radius: 5px;
overflow: auto;
background-color: var(--el-bg-color);
box-shadow: 0 0 0 1px var(--el-border-color-darker);
&.mobile {
max-height: calc(100% - 200px);
}
.item {
display: flex;
align-items: center;
+13 -14
View File
@@ -1,8 +1,8 @@
<script lang="ts" setup name="SidebarItem">
// import SidebarItem from './index.vue'
import { isExternalLink, resolveRoutePath } from '@/utils'
import { resolveRoutePath } from '@/utils'
import useSettingsStore from '@/store/modules/settings'
import type { Menu } from '@/global'
import type { Menu } from '#/global'
const props = defineProps({
item: {
@@ -20,7 +20,7 @@ const settingsStore = useSettingsStore()
const hasChildren = computed(() => {
let flag = true
if (props.item.children) {
if (props.item.children.every(item => item.meta.sidebar === false)) {
if (props.item.children.every(item => item.meta?.sidebar === false)) {
flag = false
}
}
@@ -33,25 +33,25 @@ const hasChildren = computed(() => {
<template>
<div class="sidebar-item">
<router-link v-if="!hasChildren" v-slot="{ href, navigate, isActive, isExactActive }" custom :to="resolveRoutePath(basePath, item.path || '')">
<a :href="isExternalLink(resolveRoutePath(basePath, item.path || '')) ? resolveRoutePath(basePath, item.path || '') : href" :class="[isActive && 'router-link-active', isExactActive && 'router-link-exact-active']" :target="isExternalLink(resolveRoutePath(basePath, item.path || '')) ? '_blank' : '_self'" @click="navigate">
<el-menu-item :title="item.meta.title" :index="resolveRoutePath(basePath, item.path || '')">
<el-icon v-if="item.meta.icon" class="title-icon">
<router-link v-if="!hasChildren" v-slot="{ href, navigate, isActive, isExactActive }" custom :to="resolveRoutePath(basePath, item.path)">
<a :href="item.meta?.link ? item.meta.link : href" :class="[isActive && 'router-link-active', isExactActive && 'router-link-exact-active']" :target="item.meta?.link ? '_blank' : '_self'" @click="navigate">
<el-menu-item :title="item.meta?.title ?? '[ 无标题 ]'" :index="resolveRoutePath(basePath, item.path || '')">
<el-icon v-if="item.meta?.icon" class="title-icon">
<svg-icon :name="item.meta.icon" />
</el-icon>
<span class="title">{{ item.meta.title }}</span>
<span class="title">{{ item.meta?.title ?? '[ 无标题 ]' }}</span>
</el-menu-item>
</a>
</router-link>
<el-sub-menu v-else :title="item.meta.title" :index="settingsStore.app.routeBaseOn !== 'filesystem' ? resolveRoutePath(basePath, item.path || '') : JSON.stringify(item)">
<el-sub-menu v-else :title="item.meta?.title ?? '[ 无标题 ]'" :index="settingsStore.settings.app.routeBaseOn !== 'filesystem' ? resolveRoutePath(basePath, item.path) : JSON.stringify(item)">
<template #title>
<el-icon v-if="item.meta.icon" class="title-icon">
<el-icon v-if="item.meta?.icon" class="title-icon">
<svg-icon :name="item.meta.icon" />
</el-icon>
<span class="title">{{ item.meta.title }}</span>
<span class="title">{{ item.meta?.title ?? '[ 无标题 ]' }}</span>
</template>
<template v-for="route in item.children">
<SidebarItem v-if="route.meta.sidebar !== false" :key="route.path" :item="route" :base-path="resolveRoutePath(basePath, item.path || '')" />
<SidebarItem v-if="route.meta?.sidebar !== false" :key="route.path" :item="route" :base-path="resolveRoutePath(basePath, item.path)" />
</template>
</el-sub-menu>
</div>
@@ -68,8 +68,7 @@ const hasChildren = computed(() => {
@include text-overflow;
}
:deep(.el-menu-item),
:deep(.el-sub-menu__title) {
:deep(.el-menu-item) {
display: flex;
align-items: center;
justify-content: center;
+6 -6
View File
@@ -15,22 +15,22 @@ function onSidebarScroll(e: Event) {
</script>
<template>
<div v-if="['side', 'head', 'single'].includes(settingsStore.menu.menuMode) || settingsStore.mode === 'mobile'" class="sub-sidebar-container" :class="{ 'is-collapse': settingsStore.mode === 'pc' && settingsStore.menu.subMenuCollapse }" @scroll="onSidebarScroll">
<div v-if="['side', 'head', 'single'].includes(settingsStore.settings.menu.menuMode) || settingsStore.mode === 'mobile'" class="sub-sidebar-container" :class="{ 'is-collapse': settingsStore.mode === 'pc' && settingsStore.settings.menu.subMenuCollapse }" @scroll="onSidebarScroll">
<Logo
:show-logo="settingsStore.menu.menuMode === 'single'" class="sidebar-logo" :class="{
'sidebar-logo-bg': settingsStore.menu.menuMode === 'single',
:show-logo="settingsStore.settings.menu.menuMode === 'single'" class="sidebar-logo" :class="{
'sidebar-logo-bg': settingsStore.settings.menu.menuMode === 'single',
'shadow': sidebarScrollTop,
}"
/>
<!-- 侧边栏模式(无主导航) -->
<el-menu
:unique-opened="settingsStore.menu.subMenuUniqueOpened" :default-openeds="menuStore.defaultOpenedPaths" :default-active="$route.meta.activeMenu || $route.path" :collapse="settingsStore.mode === 'pc' && settingsStore.menu.subMenuCollapse" :collapse-transition="false" :class="{
'is-collapse-without-logo': settingsStore.menu.menuMode !== 'single' && settingsStore.menu.subMenuCollapse,
:unique-opened="settingsStore.settings.menu.subMenuUniqueOpened" :default-openeds="menuStore.defaultOpenedPaths" :default-active="$route.meta.activeMenu || $route.path" :collapse="settingsStore.mode === 'pc' && settingsStore.settings.menu.subMenuCollapse" :collapse-transition="false" :class="{
'is-collapse-without-logo': settingsStore.settings.menu.menuMode !== 'single' && settingsStore.settings.menu.subMenuCollapse,
}"
>
<transition-group name="sub-sidebar">
<template v-for="(route, index) in menuStore.sidebarMenus">
<SidebarItem v-if="route.meta.sidebar !== false" :key="route.path || index" :item="route" :base-path="route.path" />
<SidebarItem v-if="route.meta?.sidebar !== false" :key="route.path || index" :item="route" :base-path="route.path" />
</template>
</transition-group>
</el-menu>
+9 -12
View File
@@ -36,36 +36,33 @@ function userCommand(command: 'home' | 'setting' | 'hotkeys' | 'logout') {
break
}
}
function pro() {
window.open('https://hooray.gitee.io/fantastic-admin-pro-example/', 'top')
}
</script>
<template>
<div class="tools">
<div class="buttons">
<span v-if="settingsStore.navSearch.enable" class="item" @click="eventBus.emit('global-search-toggle')">
<span v-if="settingsStore.settings.navSearch.enable" class="item" @click="eventBus.emit('global-search-toggle')">
<el-icon>
<svg-icon name="ep:search" />
</el-icon>
</span>
<span v-if="settingsStore.mode === 'pc' && settingsStore.toolbar.enableFullscreen" class="item" @click="toggle">
<span v-if="settingsStore.mode === 'pc' && settingsStore.settings.toolbar.enableFullscreen" class="item" @click="toggle">
<el-icon>
<svg-icon :name="isFullscreen ? 'fullscreen-exit' : 'fullscreen'" />
</el-icon>
</span>
<span v-if="settingsStore.toolbar.enablePageReload" class="item" @click="mainPage.reload()">
<span v-if="settingsStore.settings.toolbar.enablePageReload" class="item" @click="mainPage.reload()">
<el-icon>
<svg-icon name="ep:refresh-right" />
</el-icon>
</span>
<span v-if="settingsStore.toolbar.enableColorScheme" class="item" @click="settingsStore.setColorScheme(settingsStore.app.colorScheme === 'dark' ? 'light' : 'dark')">
<span v-if="settingsStore.settings.toolbar.enableColorScheme" class="item" @click="settingsStore.setColorScheme(settingsStore.settings.app.colorScheme === 'dark' ? 'light' : 'dark')">
<el-icon>
<svg-icon v-show="settingsStore.app.colorScheme === 'light'" name="ep:sunny" />
<svg-icon v-show="settingsStore.app.colorScheme === 'dark'" name="ep:moon" />
<svg-icon v-show="settingsStore.settings.app.colorScheme === 'light'" name="ep:sunny" />
<svg-icon v-show="settingsStore.settings.app.colorScheme === 'dark'" name="ep:moon" />
</el-icon>
</span>
<span v-if="settingsStore.toolbar.enableAppSetting" class="item" @click="eventBus.emit('global-theme-toggle')">
<span v-if="settingsStore.settings.toolbar.enableAppSetting" class="item" @click="eventBus.emit('global-theme-toggle')">
<el-icon>
<svg-icon name="ep:setting" />
</el-icon>
@@ -85,8 +82,8 @@ function pro() {
</div>
<template #dropdown>
<el-dropdown-menu class="user-dropdown">
<el-dropdown-item v-if="settingsStore.home.enable" command="home">
{{ settingsStore.home.title }}
<el-dropdown-item v-if="settingsStore.settings.home.enable" command="home">
{{ settingsStore.settings.home.title }}
</el-dropdown-item>
<el-dropdown-item command="setting">
个人设置
+21 -10
View File
@@ -9,17 +9,17 @@ const settingsStore = useSettingsStore()
const enableSubMenuCollapseButton = computed(() => {
return settingsStore.mode === 'mobile' || (
['side', 'head', 'single'].includes(settingsStore.menu.menuMode)
&& settingsStore.menu.enableSubMenuCollapseButton
['side', 'head', 'single'].includes(settingsStore.settings.menu.menuMode)
&& settingsStore.settings.menu.enableSubMenuCollapseButton
)
})
const breadcrumbList = computed(() => {
const breadcrumbList = []
if (settingsStore.home.enable) {
if (settingsStore.settings.home.enable) {
breadcrumbList.push({
path: '/',
title: settingsStore.home.title,
title: settingsStore.settings.home.title,
})
}
if (route.meta.breadcrumbNeste) {
@@ -29,6 +29,7 @@ const breadcrumbList = computed(() => {
})
const scrollTop = ref(0)
const scrollOnHide = ref(false)
onMounted(() => {
window.addEventListener('scroll', onScroll)
})
@@ -36,8 +37,12 @@ onUnmounted(() => {
window.removeEventListener('scroll', onScroll)
})
function onScroll() {
scrollTop.value = document.documentElement.scrollTop || document.body.scrollTop
scrollTop.value = (document.documentElement || document.body).scrollTop
}
watch(scrollTop, (val, oldVal) => {
const topbarHeight = parseInt(getComputedStyle(document.documentElement || document.body).getPropertyValue('--g-topbar-height'))
scrollOnHide.value = settingsStore.settings.topbar.mode === 'sticky' && val > oldVal && val > topbarHeight
})
function pathCompile(path: string) {
const toPath = compile(path)
@@ -48,20 +53,21 @@ function pathCompile(path: string) {
<template>
<div
class="topbar-container" :class="{
fixed: settingsStore.topbar.fixed,
[`topbar-${settingsStore.settings.topbar.mode}`]: true,
shadow: scrollTop,
hide: scrollOnHide,
}" data-fixed-calc-width
>
<div class="left-box">
<div v-if="enableSubMenuCollapseButton" class="sidebar-collapse" :class="{ 'is-collapse': settingsStore.menu.subMenuCollapse }" @click="settingsStore.toggleSidebarCollapse()">
<div v-if="enableSubMenuCollapseButton" class="sidebar-collapse" :class="{ 'is-collapse': settingsStore.settings.menu.subMenuCollapse }" @click="settingsStore.toggleSidebarCollapse()">
<el-icon>
<svg-icon name="toolbar-collapse" />
</el-icon>
</div>
<el-breadcrumb v-if="settingsStore.breadcrumb.enable && settingsStore.mode === 'pc' && settingsStore.app.routeBaseOn !== 'filesystem'">
<el-breadcrumb v-if="settingsStore.settings.breadcrumb.enable && settingsStore.mode === 'pc' && settingsStore.settings.app.routeBaseOn !== 'filesystem'">
<transition-group name="breadcrumb">
<el-breadcrumb-item v-for="(item, index) in breadcrumbList" :key="item.path" :to="index < breadcrumbList.length - 1 ? pathCompile(item.path) : ''">
{{ item.title }}
{{ item.title ?? '[ 无标题 ]' }}
</el-breadcrumb-item>
</transition-group>
</el-breadcrumb>
@@ -82,7 +88,8 @@ function pathCompile(path: string) {
background-color: var(--g-toolbar-bg);
transition: width 0.3s, top 0.3s, transform 0.3s, background-color 0.3s, var(--el-transition-box-shadow);
&.fixed {
&.topbar-fixed,
&.topbar-sticky {
position: fixed;
&.shadow {
@@ -90,6 +97,10 @@ function pathCompile(path: string) {
}
}
&.topbar-sticky.hide {
top: calc(var(--g-topbar-height) * -1) !important;
}
.left-box {
display: flex;
align-items: center;
+97
View File
@@ -0,0 +1,97 @@
<script lang="ts" setup name="LinkView">
const route = useRoute()
function open() {
window.open(route.meta.link, '_blank')
}
</script>
<template>
<div class="link-view">
<transition name="link" mode="out-in" appear>
<page-main :key="route.meta.link" title="⚠️访问提醒">
<div class="container">
<div class="title">
是否访问此链接
</div>
<div class="link">
{{ route.meta.link }}
</div>
<el-button type="primary" plain round @click="open">
<template #icon>
<el-icon>
<svg-icon name="ep:link" />
</el-icon>
</template>
立即访问
</el-button>
</div>
</page-main>
</transition>
</div>
</template>
<style lang="scss" scoped>
.link-view {
display: flex;
flex-direction: column;
position: absolute;
top: 0;
left: 0;
width: 100%;
height: 100%;
.page-main {
display: flex;
flex-direction: column;
height: 100%;
flex: 1;
.container {
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
height: 100%;
margin: 0 50px;
.title {
margin: 10px 0;
font-size: 22px;
color: var(--el-text-color-primary);
}
.link {
margin: 10px 0;
max-width: 300px;
font-size: 14px;
color: var(--el-text-color-disabled);
@include text-overflow(3);
}
.el-button {
margin: 20px 0;
}
}
}
}
// link 区动画
.link-enter-active {
transition: 0.2s;
}
.link-leave-active {
transition: 0.15s;
}
.link-enter-from {
opacity: 0;
transform: translateX(-20px);
}
.link-leave-to {
opacity: 0;
transform: translateX(20px);
}
</style>
+15 -11
View File
@@ -1,5 +1,6 @@
<script lang="ts" setup name="Layout">
import hotkeys from 'hotkeys-js'
import LinkView from './components/views/link.vue'
import Header from './components/Header/index.vue'
import MainSidebar from './components/MainSidebar/index.vue'
import SubSidebar from './components/SubSidebar/index.vue'
@@ -17,7 +18,9 @@ const settingsStore = useSettingsStore()
const keepAliveStore = useKeepAliveStore()
const menuStore = useMenuStore()
watch(() => settingsStore.menu.subMenuCollapse, (val) => {
const isLink = computed(() => !!routeInfo.meta.link)
watch(() => settingsStore.settings.menu.subMenuCollapse, (val) => {
if (settingsStore.mode === 'mobile') {
if (!val) {
document.body.classList.add('hidden')
@@ -31,20 +34,20 @@ watch(() => settingsStore.menu.subMenuCollapse, (val) => {
watch(() => routeInfo.path, () => {
if (settingsStore.mode === 'mobile') {
settingsStore.$patch((state) => {
state.menu.subMenuCollapse = true
state.settings.menu.subMenuCollapse = true
})
}
})
onMounted(() => {
hotkeys('f5', (e) => {
if (settingsStore.toolbar.enablePageReload) {
if (settingsStore.settings.toolbar.enablePageReload) {
e.preventDefault()
useMainPage().reload()
}
})
hotkeys('alt+`', (e) => {
if (settingsStore.menu.enableHotkeys) {
if (settingsStore.settings.menu.enableHotkeys) {
e.preventDefault()
useMenu().switchTo(menuStore.actived + 1 < menuStore.allMenus.length ? menuStore.actived + 1 : 0)
}
@@ -61,21 +64,22 @@ onUnmounted(() => {
<div id="app-main">
<Header />
<div class="wrapper">
<div class="sidebar-container" :class="{ show: settingsStore.mode === 'mobile' && !settingsStore.menu.subMenuCollapse }">
<div class="sidebar-container" :class="{ show: settingsStore.mode === 'mobile' && !settingsStore.settings.menu.subMenuCollapse }">
<MainSidebar />
<SubSidebar />
</div>
<div class="sidebar-mask" :class="{ show: settingsStore.mode === 'mobile' && !settingsStore.menu.subMenuCollapse }" @click="settingsStore.toggleSidebarCollapse()" />
<div class="sidebar-mask" :class="{ show: settingsStore.mode === 'mobile' && !settingsStore.settings.menu.subMenuCollapse }" @click="settingsStore.toggleSidebarCollapse()" />
<div class="main-container" :style="{ 'padding-bottom': $route.meta.paddingBottom } as any">
<Topbar v-if="!(settingsStore.menu.menuMode === 'head' && !settingsStore.menu.enableSubMenuCollapseButton && !settingsStore.breadcrumb.enable)" />
<Topbar v-if="!(settingsStore.settings.menu.menuMode === 'head' && !settingsStore.settings.menu.enableSubMenuCollapseButton && !settingsStore.settings.breadcrumb.enable)" />
<div class="main">
<router-view v-slot="{ Component, route }">
<transition name="main" mode="out-in" appear>
<keep-alive :include="keepAliveStore.list">
<component :is="Component" :key="route.fullPath" />
<component :is="Component" v-show="!isLink" :key="route.fullPath" />
</keep-alive>
</transition>
</router-view>
<LinkView v-if="isLink" />
</div>
<Copyright />
</div>
@@ -148,10 +152,10 @@ onUnmounted(() => {
left: 0;
width: 100%;
height: 100%;
background-color: rgb(0 0 0 / 50%);
backdrop-filter: blur(2px);
background-image: radial-gradient(transparent 1px, rgb(0 0 0 / 30%) 1px);
background-size: 4px 4px;
backdrop-filter: saturate(50%) blur(4px);
transition: all 0.2s;
transform: translateZ(0);
opacity: 0;
visibility: hidden;
+3 -3
View File
@@ -13,14 +13,14 @@ import 'virtual:svg-icons-register'
import '@/assets/styles/globals.scss'
// 加载 iconify 图标(element plus)
import { downloadAndInstall } from '@/iconify-ep'
if (useSettingsStore().app.iconifyOfflineUse) {
downloadAndInstall()
}
const app = createApp(App)
app.use(ElementPlus)
app.use(pinia)
app.use(router)
directive(app)
if (useSettingsStore().settings.app.iconifyOfflineUse) {
downloadAndInstall()
}
app.mount('#app')
+1 -1
View File
@@ -1,6 +1,6 @@
import MultilevelMenuExample from './modules/multilevel.menu.example'
import type { Menu } from '@/global'
import type { Menu } from '#/global'
const menu: Menu.recordMainRaw[] = [
{
+1 -1
View File
@@ -1,4 +1,4 @@
import type { Menu } from '@/global'
import type { Menu } from '#/global'
const menus: Menu.recordRaw = {
meta: {
+14 -9
View File
@@ -15,7 +15,7 @@ const { isLoading } = useNProgress()
const router = createRouter({
history: createWebHashHistory(),
routes: useSettingsStore(pinia).app.routeBaseOn === 'filesystem' ? constantRoutesByFilesystem : constantRoutes as RouteRecordRaw[],
routes: useSettingsStore(pinia).settings.app.routeBaseOn === 'filesystem' ? constantRoutesByFilesystem : constantRoutes as RouteRecordRaw[],
})
router.beforeEach(async (to, from, next) => {
@@ -23,13 +23,13 @@ router.beforeEach(async (to, from, next) => {
const userStore = useUserStore()
const menuStore = useMenuStore()
const routeStore = useRouteStore()
settingsStore.app.enableProgress && (isLoading.value = true)
settingsStore.settings.app.enableProgress && (isLoading.value = true)
// 是否已登录
if (userStore.isLogin) {
// 是否已根据权限动态生成并注册路由
if (routeStore.isGenerate) {
// 导航栏如果不是 single 模式,则需要根据 path 定位主导航的选中状态
settingsStore.menu.menuMode !== 'single' && menuStore.setActived(to.path)
settingsStore.settings.menu.menuMode !== 'single' && menuStore.setActived(to.path)
// 如果已登录状态下,进入登录页会强制跳转到主页
if (to.name === 'login') {
next({
@@ -38,7 +38,7 @@ router.beforeEach(async (to, from, next) => {
})
}
// 如果未开启主页,但进入的是主页,则会进入侧边栏导航第一个模块
else if (!settingsStore.home.enable && to.name === 'home') {
else if (!settingsStore.settings.home.enable && to.name === 'home') {
if (menuStore.sidebarMenus.length > 0) {
next({
path: menuStore.sidebarMenusFirstDeepestPath,
@@ -57,7 +57,7 @@ router.beforeEach(async (to, from, next) => {
}
else {
// 生成动态路由
switch (settingsStore.app.routeBaseOn) {
switch (settingsStore.settings.app.routeBaseOn) {
case 'frontend':
await routeStore.generateRoutesAtFront(asyncRoutes)
break
@@ -67,7 +67,7 @@ router.beforeEach(async (to, from, next) => {
case 'filesystem':
await routeStore.generateRoutesAtFilesystem(asyncRoutesByFilesystem)
// 文件系统生成的路由,需要手动生成导航数据
switch (settingsStore.menu.baseOn) {
switch (settingsStore.settings.menu.baseOn) {
case 'frontend':
await menuStore.generateMenusAtFront()
break
@@ -85,7 +85,7 @@ router.beforeEach(async (to, from, next) => {
removeRoutes.push(router.addRoute(route as RouteRecordRaw))
}
})
if (settingsStore.app.routeBaseOn !== 'filesystem') {
if (settingsStore.settings.app.routeBaseOn !== 'filesystem') {
routeStore.flatSystemRoutes.forEach((route) => {
removeRoutes.push(router.addRoute(route as RouteRecordRaw))
})
@@ -117,9 +117,14 @@ router.beforeEach(async (to, from, next) => {
router.afterEach((to, from) => {
const settingsStore = useSettingsStore()
const keepAliveStore = useKeepAliveStore()
settingsStore.app.enableProgress && (isLoading.value = false)
settingsStore.settings.app.enableProgress && (isLoading.value = false)
// 设置页面 title
to.meta.title && settingsStore.setTitle(typeof to.meta.title === 'function' ? to.meta.title() : to.meta.title)
if (settingsStore.settings.app.routeBaseOn !== 'filesystem') {
settingsStore.setTitle(to.meta.breadcrumbNeste?.at(-1)?.title)
}
else {
settingsStore.setTitle(to.meta.title)
}
// 判断当前页面是否开启缓存,如果开启,则将当前页面的 name 信息存入 keep-alive 全局状态
if (to.meta.cache) {
const componentName = to.matched.at(-1)?.components?.default.name
+2 -2
View File
@@ -1,8 +1,8 @@
import type { Route } from '@/global'
import type { RouteRecordRaw } from 'vue-router'
const Layout = () => import('@/layouts/index.vue')
const routes: Route.recordRaw = {
const routes: RouteRecordRaw = {
path: '/breadcrumb_example',
component: Layout,
redirect: '/breadcrumb_example/list1',
@@ -1,8 +1,8 @@
import type { Route } from '@/global'
import type { RouteRecordRaw } from 'vue-router'
const Layout = () => import('@/layouts/index.vue')
const routes: Route.recordRaw = {
const routes: RouteRecordRaw = {
path: '/multilevel_menu_example',
component: Layout,
redirect: '/multilevel_menu_example/page',
+7 -6
View File
@@ -1,12 +1,13 @@
import { setupLayouts } from 'virtual:generated-layouts'
import generatedRoutes from 'virtual:generated-pages'
import type { RouteRecordRaw } from 'vue-router'
import MultilevelMenuExample from './modules/multilevel.menu.example'
import BreadcrumbExample from './modules/breadcrumb.example'
import type { Route } from '@/global'
import type { Route } from '#/global'
import useSettingsStore from '@/store/modules/settings'
// 固定路由(默认路由)
const constantRoutes: Route.recordRaw[] = [
const constantRoutes: RouteRecordRaw[] = [
{
path: '/login',
name: 'login',
@@ -26,12 +27,12 @@ const constantRoutes: Route.recordRaw[] = [
]
// 系统路由
const systemRoutes: Route.recordRaw[] = [
const systemRoutes: RouteRecordRaw[] = [
{
path: '/',
component: () => import('@/layouts/index.vue'),
meta: {
title: () => useSettingsStore().home.title,
title: () => useSettingsStore().settings.home.title,
breadcrumb: false,
},
children: [
@@ -40,7 +41,7 @@ const systemRoutes: Route.recordRaw[] = [
name: 'home',
component: () => import('@/views/index.vue'),
meta: {
title: () => useSettingsStore().home.title,
title: () => useSettingsStore().settings.home.title,
breadcrumb: false,
},
},
@@ -94,7 +95,7 @@ const constantRoutesByFilesystem = generatedRoutes.filter((item) => {
const asyncRoutesByFilesystem = setupLayouts(generatedRoutes.filter((item) => {
return item.meta?.enabled !== false && item.meta?.constant !== true && item.meta?.layout !== false
})) as Route.recordRaw[]
}))
export {
constantRoutes,
+3 -3
View File
@@ -1,6 +1,6 @@
// 该文件为系统默认配置,请勿修改!!!
import type { RecursiveRequired, Settings } from './global'
import type { RecursiveRequired, Settings } from '#/global'
const globalSettingsDefault: RecursiveRequired<Settings.all> = {
app: {
@@ -29,7 +29,7 @@ const globalSettingsDefault: RecursiveRequired<Settings.all> = {
enableHotkeys: false,
},
topbar: {
fixed: true,
mode: 'static',
},
toolbar: {
enableFullscreen: false,
@@ -46,7 +46,7 @@ const globalSettingsDefault: RecursiveRequired<Settings.all> = {
},
copyright: {
enable: true,
dates: '2020-2022',
dates: '2020-2023',
company: 'Fantastic-admin',
website: 'https://hooray.gitee.io/fantastic-admin/',
beian: '',
+1 -1
View File
@@ -1,4 +1,4 @@
import type { Settings } from './global'
import type { Settings } from '#/global'
const globalSettings: Settings.all = {}
+35 -31
View File
@@ -1,37 +1,41 @@
const useKeepAliveStore = defineStore(
// 唯一ID
'keepAlive',
{
state: () => ({
list: [] as string[],
}),
actions: {
add(name: string | string[]) {
if (typeof name === 'string') {
!this.list.includes(name) && this.list.push(name)
}
else {
name.forEach((v) => {
v && !this.list.includes(v) && this.list.push(v)
})
}
},
remove(name: string | string[]) {
if (typeof name === 'string') {
this.list = this.list.filter((v) => {
return v !== name
})
}
else {
this.list = this.list.filter((v) => {
return !name.includes(v)
})
}
},
clean() {
this.list = []
},
},
() => {
const list = ref<string[]>([])
function add(name: string | string[]) {
if (typeof name === 'string') {
!list.value.includes(name) && list.value.push(name)
}
else {
name.forEach((v) => {
v && !list.value.includes(v) && list.value.push(v)
})
}
}
function remove(name: string | string[]) {
if (typeof name === 'string') {
list.value = list.value.filter((v) => {
return v !== name
})
}
else {
list.value = list.value.filter((v) => {
return !name.includes(v)
})
}
}
function clean() {
list.value = []
}
return {
list,
add,
remove,
clean,
}
},
)
+167 -180
View File
@@ -2,201 +2,188 @@ import { cloneDeep } from 'lodash-es'
import useSettingsStore from './settings'
import useUserStore from './user'
import useRouteStore from './route'
import type { Menu } from '@/global'
import type { Menu } from '#/global'
import { resolveRoutePath } from '@/utils'
import api from '@/api'
import menu from '@/menu'
function getDeepestPath(menu: Menu.recordRaw, rootPath = '') {
let retnPath = ''
if (menu.path !== undefined) {
if (menu.children) {
if (
menu.children.some((item) => {
return item.meta.sidebar !== false
})
) {
for (let i = 0; i < menu.children.length; i++) {
if (menu.children[i].meta.sidebar !== false) {
retnPath = getDeepestPath(menu.children[i], resolveRoutePath(rootPath, menu.path))
break
}
}
}
else {
retnPath = getDeepestPath(menu.children[0], resolveRoutePath(rootPath, menu.path))
}
}
else {
retnPath = resolveRoutePath(rootPath, menu.path)
}
}
return retnPath
}
function hasPermission(permissions: string[], menu: Menu.recordMainRaw | Menu.recordRaw) {
let isAuth = false
if (menu.meta && menu.meta.auth) {
isAuth = permissions.some((auth) => {
return typeof menu.meta.auth === 'string'
? menu.meta.auth === auth
: typeof menu.meta.auth === 'object'
? menu.meta.auth.includes(auth)
: false
})
}
else {
isAuth = true
}
return isAuth
}
function filterAsyncMenus<T extends Menu.recordMainRaw[] | Menu.recordRaw[]>(menus: T, permissions: string[]): T {
const res: any = []
menus.forEach((menu) => {
const tmpMenu = cloneDeep(menu)
if (hasPermission(permissions, tmpMenu)) {
if (tmpMenu.children) {
tmpMenu.children = filterAsyncMenus(tmpMenu.children, permissions) as Menu.recordRaw[]
tmpMenu.children.length && res.push(tmpMenu)
}
else {
res.push(tmpMenu)
}
}
})
return res
}
function getDefaultOpenedPaths(menus: Menu.recordRaw[], rootPath = '') {
const defaultOpenedPaths: string[] = []
menus.forEach((item) => {
if (item.path && item.meta.defaultOpened && item.children) {
defaultOpenedPaths.push(resolveRoutePath(rootPath, item.path))
const childrenDefaultOpenedPaths = getDefaultOpenedPaths(item.children, resolveRoutePath(rootPath, item.path))
if (childrenDefaultOpenedPaths.length > 0) {
defaultOpenedPaths.push(...childrenDefaultOpenedPaths)
}
}
})
return defaultOpenedPaths
}
const useMenuStore = defineStore(
// 唯一ID
'menu',
{
state: () => ({
menus: [{
() => {
const settingsStore = useSettingsStore()
const userStore = useUserStore()
const routeStore = useRouteStore()
const menus = ref<Menu.recordMainRaw[]>([{
meta: {},
children: [],
}])
const actived = ref(0)
// 完整导航数据
const allMenus = computed(() => {
let returnMenus: Menu.recordMainRaw[] = [{
meta: {},
children: [],
}] as Menu.recordMainRaw[],
actived: 0,
}),
getters: {
// 完整导航数据
allMenus() {
const settingsStore = useSettingsStore()
let menus: Menu.recordMainRaw[] = [{
meta: {},
children: [],
}]
if (settingsStore.app.routeBaseOn !== 'filesystem') {
const routeStore = useRouteStore()
if (settingsStore.menu.menuMode === 'single') {
menus[0].children = []
routeStore.routes.forEach((item) => {
menus[0].children?.push(...item.children as Menu.recordRaw[])
})
}
else {
menus = routeStore.routes as Menu.recordMainRaw[]
}
}
else {
menus = this.menus
}
return menus
},
// 次导航数据
sidebarMenus(): Menu.recordMainRaw['children'] {
return this.allMenus.length > 0
? this.allMenus[this.actived].children
: []
},
// 次导航里第一个导航的路径
sidebarMenusFirstDeepestPath(): string {
return this.allMenus.length > 0
? getDeepestPath(this.sidebarMenus[0])
: '/'
},
defaultOpenedPaths() {
const settingsStore = useSettingsStore()
let defaultOpenedPaths: string[] = []
if (settingsStore.app.routeBaseOn !== 'filesystem') {
defaultOpenedPaths = getDefaultOpenedPaths(this.sidebarMenus)
}
return defaultOpenedPaths
},
},
actions: {
// 生成导航(前端生成)
generateMenusAtFront() {
// eslint-disable-next-line no-async-promise-executor
return new Promise<void>(async (resolve) => {
const settingsStore = useSettingsStore()
const userStore = useUserStore()
let accessedMenus
// 如果权限功能开启,则需要对导航数据进行筛选过滤
if (settingsStore.app.enablePermission) {
const permissions = await userStore.getPermissions()
accessedMenus = filterAsyncMenus(menu, permissions)
}
else {
accessedMenus = cloneDeep(menu)
}
this.menus = accessedMenus.filter(item => item.children.length !== 0)
resolve()
})
},
// 生成导航(后端生成)
generateMenusAtBack() {
return new Promise<void>((resolve) => {
api.get('menu/list', {
baseURL: '/mock/',
}).then(async (res) => {
const settingsStore = useSettingsStore()
const userStore = useUserStore()
let accessedMenus: Menu.recordMainRaw[]
// 如果权限功能开启,则需要对导航数据进行筛选过滤
if (settingsStore.app.enablePermission) {
const permissions = await userStore.getPermissions()
accessedMenus = filterAsyncMenus(res.data, permissions)
}
else {
accessedMenus = cloneDeep(res.data)
}
this.menus = accessedMenus.filter(item => item.children.length !== 0)
resolve()
}]
if (settingsStore.settings.app.routeBaseOn !== 'filesystem') {
if (settingsStore.settings.menu.menuMode === 'single') {
returnMenus[0].children = []
routeStore.routes.forEach((item) => {
returnMenus[0].children?.push(...item.children as Menu.recordRaw[])
})
})
},
// 切换主导航
setActived(data: number | string) {
if (typeof data === 'number') {
// 如果是 number 类型,则认为是主导航的索引
this.actived = data
}
else {
// 如果是 string 类型,则认为是路由,需要查找对应的主导航索引
const findIndex = this.allMenus.findIndex(item => item.children.some(r => data.indexOf(`${r.path}/`) === 0 || data === r.path))
if (findIndex >= 0) {
this.actived = findIndex
returnMenus = routeStore.routes as Menu.recordMainRaw[]
}
}
else {
returnMenus = menus.value
}
return returnMenus
})
// 次导航数据
const sidebarMenus = computed<Menu.recordMainRaw['children']>(() => {
return allMenus.value.length > 0
? allMenus.value[actived.value].children
: []
})
// 次导航第一层最深路径
const sidebarMenusFirstDeepestPath = computed(() => {
return allMenus.value.length > 0
? getDeepestPath(sidebarMenus.value[0])
: '/'
})
function getDeepestPath(menu: Menu.recordRaw, rootPath = '') {
let retnPath = ''
if (menu.children) {
const item = menu.children.find(item => item.meta?.sidebar !== false)
if (item) {
retnPath = getDeepestPath(item, resolveRoutePath(rootPath, menu.path))
}
else {
retnPath = getDeepestPath(menu.children[0], resolveRoutePath(rootPath, menu.path))
}
}
else {
retnPath = resolveRoutePath(rootPath, menu.path)
}
return retnPath
}
// 默认展开的导航路径
const defaultOpenedPaths = computed(() => {
let defaultOpenedPaths: string[] = []
if (settingsStore.settings.app.routeBaseOn !== 'filesystem') {
defaultOpenedPaths = getDefaultOpenedPaths(sidebarMenus.value)
}
return defaultOpenedPaths
})
function getDefaultOpenedPaths(menus: Menu.recordRaw[], rootPath = '') {
const defaultOpenedPaths: string[] = []
menus.forEach((item) => {
if (item.meta?.defaultOpened && item.children) {
defaultOpenedPaths.push(resolveRoutePath(rootPath, item.path))
const childrenDefaultOpenedPaths = getDefaultOpenedPaths(item.children, resolveRoutePath(rootPath, item.path))
if (childrenDefaultOpenedPaths.length > 0) {
defaultOpenedPaths.push(...childrenDefaultOpenedPaths)
}
}
},
},
})
return defaultOpenedPaths
}
// 判断是否有权限
function hasPermission(permissions: string[], menu: Menu.recordMainRaw | Menu.recordRaw) {
let isAuth = false
if (menu.meta && menu.meta.auth) {
isAuth = permissions.some((auth) => {
return typeof menu.meta?.auth === 'string'
? menu.meta.auth === auth
: typeof menu.meta?.auth === 'object'
? menu.meta.auth.includes(auth)
: false
})
}
else {
isAuth = true
}
return isAuth
}
// 根据权限过滤导航
function filterAsyncMenus<T extends Menu.recordMainRaw[] | Menu.recordRaw[]>(menus: T, permissions: string[]): T {
const res: any = []
menus.forEach((menu) => {
const tmpMenu = cloneDeep(menu)
if (hasPermission(permissions, tmpMenu)) {
if (tmpMenu.children) {
tmpMenu.children = filterAsyncMenus(tmpMenu.children, permissions) as Menu.recordRaw[]
tmpMenu.children.length && res.push(tmpMenu)
}
else {
res.push(tmpMenu)
}
}
})
return res
}
// 生成导航(前端生成)
async function generateMenusAtFront() {
let accessedMenus
// 如果权限功能开启,则需要对导航数据进行筛选过滤
if (settingsStore.settings.app.enablePermission) {
const permissions = await userStore.getPermissions()
accessedMenus = filterAsyncMenus(menu, permissions)
}
else {
accessedMenus = cloneDeep(menu)
}
menus.value = accessedMenus.filter(item => item.children.length !== 0)
}
// 生成导航(后端生成)
async function generateMenusAtBack() {
await api.get('menu/list', {
baseURL: '/mock/',
}).then(async (res) => {
let accessedMenus: Menu.recordMainRaw[]
// 如果权限功能开启,则需要对导航数据进行筛选过滤
if (settingsStore.settings.app.enablePermission) {
const permissions = await userStore.getPermissions()
accessedMenus = filterAsyncMenus(res.data, permissions)
}
else {
accessedMenus = cloneDeep(res.data)
}
menus.value = accessedMenus.filter(item => item.children.length !== 0)
}).catch(() => {})
}
// 切换主导航
function setActived(data: number | string) {
if (typeof data === 'number') {
// 如果是 number 类型,则认为是主导航的索引
actived.value = data
}
else {
// 如果是 string 类型,则认为是路由,需要查找对应的主导航索引
const findIndex = allMenus.value.findIndex(item => item.children.some(r => data.indexOf(`${r.path}/`) === 0 || data === r.path))
if (findIndex >= 0) {
actived.value = findIndex
}
}
}
return {
menus,
actived,
allMenus,
sidebarMenus,
sidebarMenusFirstDeepestPath,
defaultOpenedPaths,
generateMenusAtFront,
generateMenusAtBack,
setActived,
}
},
)
+217 -218
View File
@@ -1,240 +1,239 @@
import { cloneDeep } from 'lodash-es'
import type { RouteRecordRaw } from 'vue-router'
import useSettingsStore from './settings'
import useUserStore from './user'
import api from '@/api'
import { resolveRoutePath } from '@/utils'
import { systemRoutes } from '@/router/routes'
import type { Route } from '@/global'
function hasPermission(permissions: string[], route: Route.recordMainRaw | Route.recordRaw) {
let isAuth = false
if (route.meta?.auth) {
isAuth = permissions.some((auth) => {
return typeof route.meta.auth === 'string'
? route.meta.auth === auth
: typeof route.meta.auth === 'object'
? route.meta.auth.includes(auth)
: false
})
}
else {
isAuth = true
}
return isAuth
}
function filterAsyncRoutes<T extends Route.recordMainRaw[] | Route.recordRaw[]>(routes: T, permissions: string[]): T {
const res: any = []
routes.forEach((route) => {
if (hasPermission(permissions, route)) {
const tmpRoute = cloneDeep(route)
if (tmpRoute.children) {
tmpRoute.children = filterAsyncRoutes(tmpRoute.children, permissions)
tmpRoute.children.length && res.push(tmpRoute)
}
else {
res.push(tmpRoute)
}
}
})
return res
}
function formatBackRoutes(routes: any, views = import.meta.glob('../../views/**/*.vue')): Route.recordMainRaw[] {
return routes.map((route: any) => {
switch (route.component) {
case 'Layout':
route.component = () => import('@/layouts/index.vue')
break
default:
if (route.component) {
route.component = views[`../../views/${route.component}`]
}
}
if (route.children) {
route.children = formatBackRoutes(route.children, views)
}
return route
})
}
// 将多层嵌套路由处理成两层,保留顶层和最子层路由,中间层级将被拍平
function flatAsyncRoutes<T extends Route.recordRaw>(routes: T): T {
if (routes.children) {
routes.children = flatAsyncRoutesRecursive(routes.children, [{
path: routes.path,
title: routes.meta.title,
hide: !routes.meta.breadcrumb && routes.meta.breadcrumb === false,
}], routes.path)
}
return routes
}
function flatAsyncRoutesRecursive(routes: Route.recordRaw[], breadcrumb: Route.breadcrumb[] = [], baseUrl = ''): Route.recordRaw[] {
const res: Route.recordRaw[] = []
routes.forEach((route) => {
if (route.children) {
const childrenBaseUrl = resolveRoutePath(baseUrl, route.path)
const tmpBreadcrumb = cloneDeep(breadcrumb)
if (route.meta.breadcrumb !== false) {
tmpBreadcrumb.push({
path: childrenBaseUrl,
title: route.meta.title,
hide: !route.meta.breadcrumb && route.meta.breadcrumb === false,
})
}
const tmpRoute = cloneDeep(route)
tmpRoute.path = childrenBaseUrl
tmpRoute.meta.breadcrumbNeste = tmpBreadcrumb
delete tmpRoute.children
res.push(tmpRoute)
const childrenRoutes = flatAsyncRoutesRecursive(route.children, tmpBreadcrumb, childrenBaseUrl)
childrenRoutes.forEach((item) => {
// 如果 path 一样则覆盖,因为子路由的 path 可能设置为空,导致和父路由一样,直接注册会提示路由重复
if (res.some(v => v.path === item.path)) {
res.forEach((v, i) => {
if (v.path === item.path) {
res[i] = item
}
})
}
else {
res.push(item)
}
})
}
else {
const tmpRoute = cloneDeep(route)
tmpRoute.path = resolveRoutePath(baseUrl, tmpRoute.path)
// 处理面包屑导航
const tmpBreadcrumb = cloneDeep(breadcrumb)
tmpBreadcrumb.push({
path: tmpRoute.path,
title: tmpRoute.meta.title,
hide: !tmpRoute.meta.breadcrumb && tmpRoute.meta.breadcrumb === false,
})
tmpRoute.meta.breadcrumbNeste = tmpBreadcrumb
res.push(tmpRoute)
}
})
return res
}
import type { Route } from '#/global'
const useRouteStore = defineStore(
// 唯一ID
'route',
{
state: () => ({
isGenerate: false,
routes: [] as Route.recordMainRaw[],
fileSystemRoutes: [] as Route.recordRaw[],
currentRemoveRoutes: [] as Function[],
}),
getters: {
// 扁平化路由(将三级及以上路由数据拍平成二级)
flatRoutes: (state) => {
const settingsStore = useSettingsStore()
const routes: Route.recordRaw[] = []
if (state.routes) {
if (settingsStore.app.routeBaseOn !== 'filesystem') {
state.routes.forEach((item) => {
routes.push(...cloneDeep(item.children))
})
routes.forEach(item => flatAsyncRoutes(item))
() => {
const settingsStore = useSettingsStore()
const userStore = useUserStore()
const isGenerate = ref(false)
const routes = ref<Route.recordMainRaw[]>([])
const fileSystemRoutes = ref<RouteRecordRaw[]>([])
const currentRemoveRoutes = ref<Function[]>([])
// 将多层嵌套路由处理成两层,保留顶层和最子层路由,中间层级将被拍平
function flatAsyncRoutes<T extends RouteRecordRaw>(routes: T): T {
if (routes.children) {
routes.children = flatAsyncRoutesRecursive(routes.children, [{
path: routes.path,
title: routes.meta?.title,
hide: !routes.meta?.breadcrumb && routes.meta?.breadcrumb === false,
}], routes.path)
}
return routes
}
function flatAsyncRoutesRecursive(routes: RouteRecordRaw[], breadcrumb: Route.breadcrumb[] = [], baseUrl = ''): RouteRecordRaw[] {
const res: RouteRecordRaw[] = []
routes.forEach((route) => {
if (route.children) {
const childrenBaseUrl = resolveRoutePath(baseUrl, route.path)
const tmpBreadcrumb = cloneDeep(breadcrumb)
tmpBreadcrumb.push({
path: childrenBaseUrl,
title: route.meta?.title,
hide: !route.meta?.breadcrumb && route.meta?.breadcrumb === false,
})
const tmpRoute = cloneDeep(route)
tmpRoute.path = childrenBaseUrl
if (!tmpRoute.meta) {
tmpRoute.meta = {}
}
else {
routes.push(...cloneDeep(state.fileSystemRoutes))
}
}
return routes
},
flatSystemRoutes: () => {
const routes = [...systemRoutes]
routes.forEach(item => flatAsyncRoutes(item))
return routes
},
},
actions: {
// 根据权限动态生成路由(前端生成)
generateRoutesAtFront(asyncRoutes: Route.recordMainRaw[]) {
// eslint-disable-next-line no-async-promise-executor
return new Promise<void>(async (resolve) => {
const settingsStore = useSettingsStore()
const userStore = useUserStore()
let accessedRoutes
// 如果权限功能开启,则需要对路由数据进行筛选过滤
if (settingsStore.app.enablePermission) {
const permissions = await userStore.getPermissions()
accessedRoutes = filterAsyncRoutes(asyncRoutes, permissions)
}
else {
accessedRoutes = cloneDeep(asyncRoutes)
}
// 设置 routes 数据
this.isGenerate = true
this.routes = accessedRoutes.filter(item => item.children?.length !== 0)
resolve()
})
},
// 根据权限动态生成路由(后端获取)
generateRoutesAtBack() {
return new Promise<void>((resolve) => {
api.get('route/list', {
baseURL: '/mock/',
}).then(async (res) => {
const settingsStore = useSettingsStore()
const userStore = useUserStore()
const asyncRoutes = formatBackRoutes(res.data)
let accessedRoutes
// 如果权限功能开启,则需要对路由数据进行筛选过滤
if (settingsStore.app.enablePermission) {
const permissions = await userStore.getPermissions()
accessedRoutes = filterAsyncRoutes(asyncRoutes, permissions)
tmpRoute.meta.breadcrumbNeste = tmpBreadcrumb
delete tmpRoute.children
res.push(tmpRoute)
const childrenRoutes = flatAsyncRoutesRecursive(route.children, tmpBreadcrumb, childrenBaseUrl)
childrenRoutes.forEach((item) => {
// 如果 path 一样则覆盖,因为子路由的 path 可能设置为空,导致和父路由一样,直接注册会提示路由重复
if (res.some(v => v.path === item.path)) {
res.forEach((v, i) => {
if (v.path === item.path) {
res[i] = item
}
})
}
else {
accessedRoutes = cloneDeep(asyncRoutes)
res.push(item)
}
// 设置 routes 数据
this.isGenerate = true
this.routes = accessedRoutes.filter(item => item.children.length !== 0)
resolve()
})
}
else {
const tmpRoute = cloneDeep(route)
tmpRoute.path = resolveRoutePath(baseUrl, tmpRoute.path)
// 处理面包屑导航
const tmpBreadcrumb = cloneDeep(breadcrumb)
tmpBreadcrumb.push({
path: tmpRoute.path,
title: tmpRoute.meta?.title,
hide: !tmpRoute.meta?.breadcrumb && tmpRoute.meta?.breadcrumb === false,
})
if (!tmpRoute.meta) {
tmpRoute.meta = {}
}
tmpRoute.meta.breadcrumbNeste = tmpBreadcrumb
res.push(tmpRoute)
}
})
return res
}
// 扁平化路由(将三级及以上路由数据拍平成二级)
const flatRoutes = computed(() => {
const settingsStore = useSettingsStore()
const returnRoutes: RouteRecordRaw[] = []
if (routes.value) {
if (settingsStore.settings.app.routeBaseOn !== 'filesystem') {
routes.value.forEach((item) => {
returnRoutes.push(...cloneDeep(item.children))
})
returnRoutes.forEach(item => flatAsyncRoutes(item))
}
else {
returnRoutes.push(...cloneDeep(fileSystemRoutes.value))
}
}
return returnRoutes
})
const flatSystemRoutes = computed(() => {
const routes = [...systemRoutes]
routes.forEach(item => flatAsyncRoutes(item))
return routes
})
// 判断是否有权限
function hasPermission(permissions: string[], route: Route.recordMainRaw | RouteRecordRaw) {
let isAuth = false
if (route.meta?.auth) {
isAuth = permissions.some((auth) => {
return typeof route.meta?.auth === 'string'
? route.meta.auth === auth
: typeof route.meta?.auth === 'object'
? route.meta.auth.includes(auth)
: false
})
},
// 根据权限动态生成路由(文件系统生成)
generateRoutesAtFilesystem(asyncRoutes: Route.recordRaw[]) {
// eslint-disable-next-line no-async-promise-executor
return new Promise<void>(async (resolve) => {
const settingsStore = useSettingsStore()
const userStore = useUserStore()
let accessedRoutes
// 如果权限功能开启,则需要对路由数据进行筛选过滤
if (settingsStore.app.enablePermission) {
const permissions = await userStore.getPermissions()
accessedRoutes = filterAsyncRoutes(asyncRoutes, permissions)
}
else {
isAuth = true
}
return isAuth
}
// 根据权限过滤路由
function filterAsyncRoutes<T extends Route.recordMainRaw[] | RouteRecordRaw[]>(routes: T, permissions: string[]): T {
const res: any = []
routes.forEach((route) => {
if (hasPermission(permissions, route)) {
const tmpRoute = cloneDeep(route)
if (tmpRoute.children) {
tmpRoute.children = filterAsyncRoutes(tmpRoute.children, permissions)
tmpRoute.children.length && res.push(tmpRoute)
}
else {
accessedRoutes = cloneDeep(asyncRoutes)
res.push(tmpRoute)
}
// 设置 routes 数据
this.isGenerate = true
this.fileSystemRoutes = accessedRoutes.filter(item => item.children?.length !== 0)
resolve()
})
},
// 记录 accessRoutes 路由,用于登出时删除路由
setCurrentRemoveRoutes(routes: Function[]) {
this.currentRemoveRoutes = routes
},
// 清空动态路由
removeRoutes() {
this.isGenerate = false
this.routes = []
this.currentRemoveRoutes.forEach((removeRoute) => {
removeRoute()
})
this.currentRemoveRoutes = []
},
},
}
})
return res
}
// 根据权限动态生成路由(前端生成)
async function generateRoutesAtFront(asyncRoutes: Route.recordMainRaw[]) {
let accessedRoutes
// 如果权限功能开启,则需要对路由数据进行筛选过滤
if (settingsStore.settings.app.enablePermission) {
const permissions = await userStore.getPermissions()
accessedRoutes = filterAsyncRoutes(asyncRoutes, permissions)
}
else {
accessedRoutes = cloneDeep(asyncRoutes)
}
// 设置 routes 数据
isGenerate.value = true
routes.value = accessedRoutes.filter(item => item.children?.length !== 0) as any
}
// 格式化后端路由数据
function formatBackRoutes(routes: any, views = import.meta.glob('../../views/**/*.vue')): Route.recordMainRaw[] {
return routes.map((route: any) => {
switch (route.component) {
case 'Layout':
route.component = () => import('@/layouts/index.vue')
break
default:
if (route.component) {
route.component = views[`../../views/${route.component}`]
}
}
if (route.children) {
route.children = formatBackRoutes(route.children, views)
}
return route
})
}
// 根据权限动态生成路由(后端获取)
async function generateRoutesAtBack() {
await api.get('route/list', {
baseURL: '/mock/',
}).then(async (res) => {
const asyncRoutes = formatBackRoutes(res.data)
let accessedRoutes
// 如果权限功能开启,则需要对路由数据进行筛选过滤
if (settingsStore.settings.app.enablePermission) {
const permissions = await userStore.getPermissions()
accessedRoutes = filterAsyncRoutes(asyncRoutes, permissions)
}
else {
accessedRoutes = cloneDeep(asyncRoutes)
}
// 设置 routes 数据
isGenerate.value = true
routes.value = accessedRoutes.filter(item => item.children.length !== 0) as any
}).catch(() => {})
}
// 根据权限动态生成路由(文件系统生成)
async function generateRoutesAtFilesystem(asyncRoutes: RouteRecordRaw[]) {
let accessedRoutes
// 如果权限功能开启,则需要对路由数据进行筛选过滤
if (settingsStore.settings.app.enablePermission) {
const permissions = await userStore.getPermissions()
accessedRoutes = filterAsyncRoutes(asyncRoutes, permissions)
}
else {
accessedRoutes = cloneDeep(asyncRoutes)
}
// 设置 routes 数据
isGenerate.value = true
fileSystemRoutes.value = accessedRoutes.filter(item => item.children?.length !== 0) as any
}
// 记录 accessRoutes 路由,用于登出时删除路由
function setCurrentRemoveRoutes(routes: Function[]) {
currentRemoveRoutes.value = routes
}
// 清空动态路由
function removeRoutes() {
isGenerate.value = false
routes.value = []
currentRemoveRoutes.value.forEach((removeRoute) => {
removeRoute()
})
currentRemoveRoutes.value = []
}
return {
isGenerate,
routes,
fileSystemRoutes,
flatRoutes,
flatSystemRoutes,
generateRoutesAtFront,
generateRoutesAtBack,
generateRoutesAtFilesystem,
setCurrentRemoveRoutes,
removeRoutes,
}
},
)
+94 -55
View File
@@ -1,67 +1,106 @@
import { defaultsDeep } from 'lodash-es'
import type { RecursiveRequired, Settings } from '@/global'
import settings from '@/settings'
import type { RouteMeta } from 'vue-router'
import type { RecursiveRequired, Settings } from '#/global'
import settingsCustom from '@/settings'
import settingsDefault from '@/settings.default'
interface SettingsStore extends RecursiveRequired<Settings.all> {
subMenuCollapseLastStatus: boolean
mode: 'pc' | 'mobile'
title: string
}
const useSettingsStore = defineStore(
// 唯一ID
'settings',
{
state: (): SettingsStore => ({
// 合并配置
...defaultsDeep(settings, settingsDefault),
// 侧边栏是否收起(用于记录 pc 模式下最后的状态)
subMenuCollapseLastStatus: settingsDefault.menu.subMenuCollapse,
// 显示模式,支持:mobile、pc
mode: 'pc',
// 页面标题
title: '',
}),
actions: {
// 设置网页标题
setTitle(title: string) {
this.title = title
},
// 设置访问模式
setMode(width: number) {
if (this.layout.enableMobileAdaptation) {
// 先判断 UA 是否为移动端设备(手机&平板)
if (/Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent)) {
this.mode = 'mobile'
}
else {
// 如果为桌面设备,再根据页面宽度判断是否需要切换为移动端展示
this.mode = width < 992 ? 'mobile' : 'pc'
}
() => {
const mergeSettings: RecursiveRequired<Settings.all> = defaultsDeep(settingsCustom, settingsDefault)
const settings = ref(mergeSettings)
watch(() => settings.value.app.colorScheme, (val) => {
if (val === '') {
val = window.matchMedia('(prefers-color-scheme: dark)').matches ? 'dark' : 'light'
}
switch (val) {
case 'dark':
document.documentElement.classList.add('dark')
break
case 'light':
document.documentElement.classList.remove('dark')
break
}
}, {
immediate: true,
})
watch(() => settings.value.menu.menuMode, (val) => {
document.body.setAttribute('data-menu-mode', val)
}, {
immediate: true,
})
// 页面标题
const title = ref<RouteMeta['title']>()
// 设置网页标题
function setTitle(_title: RouteMeta['title']) {
title.value = _title
}
// 显示模式
const mode = ref<'pc' | 'mobile'>('pc')
// 设置访问模式
function setMode(width: number) {
if (settings.value.layout.enableMobileAdaptation) {
// 先判断 UA 是否为移动端设备(手机&平板)
if (/Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent)) {
mode.value = 'mobile'
}
else {
this.mode = 'pc'
// 如果为桌面设备,再根据页面宽度判断是否需要切换为移动端展示
mode.value = width < 992 ? 'mobile' : 'pc'
}
},
// 切换侧边栏导航展开/收起
toggleSidebarCollapse() {
this.menu.subMenuCollapse = !this.menu.subMenuCollapse
if (this.mode === 'pc') {
this.subMenuCollapseLastStatus = !this.subMenuCollapseLastStatus
}
},
// 设置主题颜色模式
setColorScheme(color: Required<Settings.app>['colorScheme']) {
this.app.colorScheme = color
},
// 更新应用配置
updateSettings(data: Settings.all) {
Object.keys(data).forEach((key) => {
this[key as keyof Settings.all] = defaultsDeep(data[key as keyof Settings.all], this[key as keyof Settings.all])
})
},
},
}
else {
mode.value = 'pc'
}
}
// 侧边栏是否收起(用于记录 pc 模式下最后的状态)
const subMenuCollapseLastStatus = ref(mergeSettings.menu.subMenuCollapse)
// 切换侧边栏导航展开/收起
function toggleSidebarCollapse() {
settings.value.menu.subMenuCollapse = !settings.value.menu.subMenuCollapse
if (mode.value === 'pc') {
subMenuCollapseLastStatus.value = !subMenuCollapseLastStatus.value
}
}
watch(mode, (val) => {
switch (val) {
case 'pc':
settings.value.menu.subMenuCollapse = subMenuCollapseLastStatus.value
break
case 'mobile':
settings.value.menu.subMenuCollapse = true
break
}
document.body.setAttribute('data-mode', val)
}, {
immediate: true,
})
// 设置主题颜色模式
function setColorScheme(color: Required<Settings.app>['colorScheme']) {
settings.value.app.colorScheme = color
}
// 更新应用配置
function updateSettings(data: Settings.all) {
settings.value = defaultsDeep(data, settings.value)
}
return {
settings,
title,
setTitle,
mode,
setMode,
subMenuCollapseLastStatus,
toggleSidebarCollapse,
setColorScheme,
updateSettings,
}
},
)
+80 -86
View File
@@ -5,93 +5,87 @@ import api from '@/api'
const useUserStore = defineStore(
// 唯一ID
'user',
{
state: () => ({
account: localStorage.account || '',
token: localStorage.token || '',
failure_time: localStorage.failure_time || '',
permissions: [] as string[],
}),
getters: {
isLogin: (state) => {
let retn = false
if (state.token) {
if (new Date().getTime() < parseInt(state.failure_time) * 1000) {
retn = true
}
() => {
const routeStore = useRouteStore()
const menuStore = useMenuStore()
const account = ref(localStorage.account ?? '')
const token = ref(localStorage.token ?? '')
const failure_time = ref(localStorage.failure_time ?? '')
const permissions = ref<string[]>([])
const isLogin = computed(() => {
let retn = false
if (token.value) {
if (new Date().getTime() < parseInt(failure_time.value) * 1000) {
retn = true
}
return retn
},
},
actions: {
login(data: {
account: string
password: string
}) {
return new Promise<void>((resolve, reject) => {
// 通过 mock 进行登录
api.post('member/login', data, {
baseURL: '/mock/',
}).then((res) => {
localStorage.setItem('account', res.data.account)
localStorage.setItem('token', res.data.token)
localStorage.setItem('failure_time', res.data.failure_time)
this.account = res.data.account
this.token = res.data.token
this.failure_time = res.data.failure_time
resolve()
}).catch((error) => {
reject(error)
})
})
},
logout() {
return new Promise<void>((resolve) => {
const routeStore = useRouteStore()
const menuStore = useMenuStore()
localStorage.removeItem('account')
localStorage.removeItem('token')
localStorage.removeItem('failure_time')
this.account = ''
this.token = ''
this.failure_time = ''
routeStore.removeRoutes()
menuStore.setActived(0)
resolve()
})
},
// 获取我的权限
getPermissions() {
return new Promise<string[]>((resolve) => {
// 通过 mock 获取权限
api.get('member/permission', {
baseURL: '/mock/',
params: {
account: this.account,
},
}).then((res) => {
this.permissions = res.data.permissions
resolve(res.data.permissions)
})
})
},
editPassword(data: {
password: string
newpassword: string
}) {
return new Promise<void>((resolve) => {
api.post('member/edit/password', {
account: this.account,
password: data.password,
newpassword: data.newpassword,
}, {
baseURL: '/mock/',
}).then(() => {
resolve()
})
})
},
},
}
return retn
})
// 登录
async function login(data: {
account: string
password: string
}) {
// 通过 mock 进行登录
const res = await api.post('member/login', data, {
baseURL: '/mock/',
})
localStorage.setItem('account', res.data.account)
localStorage.setItem('token', res.data.token)
localStorage.setItem('failure_time', res.data.failure_time)
account.value = res.data.account
token.value = res.data.token
failure_time.value = res.data.failure_time
}
// 登出
async function logout() {
localStorage.removeItem('account')
localStorage.removeItem('token')
localStorage.removeItem('failure_time')
account.value = ''
token.value = ''
failure_time.value = ''
routeStore.removeRoutes()
menuStore.setActived(0)
}
// 获取我的权限
async function getPermissions() {
// 通过 mock 获取权限
const res = await api.get('member/permission', {
baseURL: '/mock/',
params: {
account: account.value,
},
})
permissions.value = res.data.permissions
return permissions.value
}
// 修改密码
async function editPassword(data: {
password: string
newpassword: string
}) {
await api.post('member/edit/password', {
account: account.value,
password: data.password,
newpassword: data.newpassword,
}, {
baseURL: '/mock/',
})
}
return {
account,
token,
permissions,
isLogin,
login,
logout,
getPermissions,
editPassword,
}
},
)
+9 -5
View File
@@ -47,7 +47,6 @@ declare global {
const readonly: typeof import('vue')['readonly']
const ref: typeof import('vue')['ref']
const resolveComponent: typeof import('vue')['resolveComponent']
const resolveDirective: typeof import('vue')['resolveDirective']
const setActivePinia: typeof import('pinia')['setActivePinia']
const setMapStoreSuffix: typeof import('pinia')['setMapStoreSuffix']
const shallowReactive: typeof import('vue')['shallowReactive']
@@ -60,13 +59,13 @@ declare global {
const triggerRef: typeof import('vue')['triggerRef']
const unref: typeof import('vue')['unref']
const useAttrs: typeof import('vue')['useAttrs']
const useAuth: typeof import('./utils/composables/useAuth')['default']
const useAuth: typeof import('../utils/composables/useAuth')['default']
const useCssModule: typeof import('vue')['useCssModule']
const useCssVars: typeof import('vue')['useCssVars']
const useGlobalProperties: typeof import('./utils/composables/useGlobalProperties')['default']
const useGlobalProperties: typeof import('../utils/composables/useGlobalProperties')['default']
const useLink: typeof import('vue-router')['useLink']
const useMainPage: typeof import('./utils/composables/useMainPage')['default']
const useMenu: typeof import('./utils/composables/useMenu')['default']
const useMainPage: typeof import('../utils/composables/useMainPage')['default']
const useMenu: typeof import('../utils/composables/useMenu')['default']
const useRoute: typeof import('vue-router')['useRoute']
const useRouter: typeof import('vue-router')['useRouter']
const useSlots: typeof import('vue')['useSlots']
@@ -75,3 +74,8 @@ declare global {
const watchPostEffect: typeof import('vue')['watchPostEffect']
const watchSyncEffect: typeof import('vue')['watchSyncEffect']
}
// for type re-export
declare global {
// @ts-ignore
export type { Component,ComponentPublicInstance,ComputedRef,InjectionKey,PropType,Ref,VNode } from 'vue'
}
+30
View File
@@ -0,0 +1,30 @@
// generated by unplugin-vue-components
// We suggest you to commit this file into source control
// Read more: https://github.com/vuejs/core/pull/3399
import '@vue/runtime-core'
export {}
declare module '@vue/runtime-core' {
export interface GlobalComponents {
Auth: typeof import('./../components/Auth/index.vue')['default']
AuthAll: typeof import('./../components/AuthAll/index.vue')['default']
BatchActionBar: typeof import('./../components/BatchActionBar/index.vue')['default']
Copyright: typeof import('./../components/Copyright/index.vue')['default']
Editor: typeof import('./../components/Editor/index.vue')['default']
FileUpload: typeof import('./../components/FileUpload/index.vue')['default']
FixedActionBar: typeof import('./../components/FixedActionBar/index.vue')['default']
ImagePreview: typeof import('./../components/ImagePreview/index.vue')['default']
ImagesUpload: typeof import('./../components/ImagesUpload/index.vue')['default']
ImageUpload: typeof import('./../components/ImageUpload/index.vue')['default']
PageHeader: typeof import('./../components/PageHeader/index.vue')['default']
PageMain: typeof import('./../components/PageMain/index.vue')['default']
PcasCascader: typeof import('./../components/PcasCascader/index.vue')['default']
RouterLink: typeof import('vue-router')['RouterLink']
RouterView: typeof import('vue-router')['RouterView']
SearchBar: typeof import('./../components/SearchBar/index.vue')['default']
SvgIcon: typeof import('./../components/SvgIcon/index.vue')['default']
SystemInfo: typeof import('./../components/SystemInfo/index.vue')['default']
Trend: typeof import('./../components/Trend/index.vue')['default']
}
}
+13 -13
View File
@@ -113,10 +113,12 @@ declare namespace Settings {
}
interface topbar {
/**
* 是否固定顶栏
* @默认值 `true`
* 模式
* @默认值 `'static'` 静止,跟随页面滚动
* @可选值 `'fixed'` 固定,不跟随页面滚动,始终固定在顶部
* @可选值 `'sticky'` 粘性,页面往下滚动时隐藏,往上滚动时显示
*/
fixed?: boolean
mode?: 'static' | 'fixed' | 'sticky'
}
interface toolbar {
/**
@@ -210,7 +212,7 @@ declare namespace Settings {
declare module 'vue-router' {
interface RouteMeta {
title: string | Function
title?: string | Function
i18n?: string
icon?: string
activeIcon?: string
@@ -220,17 +222,14 @@ declare module 'vue-router' {
breadcrumb?: boolean
activeMenu?: string
cache?: boolean | string | string[]
link?: string
breadcrumbNeste?: Route.breadcrumb[]
}
}
declare namespace Route {
interface recordRaw extends Omit<RouteRecordRaw, 'meta' | 'children'> {
meta: RouteMeta
children?: recordRaw[]
}
interface recordMainRaw {
meta: {
meta?: {
title?: string | Function
icon?: string
auth?: string | string[]
@@ -239,7 +238,7 @@ declare namespace Route {
}
interface breadcrumb {
path: string
title: string | Function
title?: string | Function
hide: boolean
}
}
@@ -248,18 +247,19 @@ declare namespace Menu {
/** 原始 */
interface recordRaw {
path?: string
meta: {
title: string
meta?: {
title?: string
icon?: string
defaultOpened?: boolean
auth?: string | string[]
sidebar?: boolean
link?: string
}
children?: recordRaw[]
}
/** 主导航 */
interface recordMainRaw {
meta: {
meta?: {
title?: string
icon?: string
auth?: string | string[]
+19 -19
View File
@@ -1,19 +1,19 @@
declare interface Window {
webkitDevicePixelRatio: any
mozDevicePixelRatio: any
}
declare module '*.vue' {
import { type DefineComponent } from 'vue'
const component: DefineComponent<{}, {}, any>
export default component
}
declare const __SYSTEM_INFO__: {
pkg: {
version: string
dependencies: Recordable<string>
devDependencies: Recordable<string>
}
lastBuildTime: string
}
declare interface Window {
webkitDevicePixelRatio: any
mozDevicePixelRatio: any
}
declare module '*.vue' {
import { type DefineComponent } from 'vue'
const component: DefineComponent<{}, {}, any>
export default component
}
declare const __SYSTEM_INFO__: {
pkg: {
version: string
dependencies: Recordable<string>
devDependencies: Recordable<string>
}
lastBuildTime: string
}
+1 -1
View File
@@ -5,7 +5,7 @@ export default function useAuth() {
function hasPermission(permission: string) {
const settingsStore = useSettingsStore()
const userStore = useUserStore()
if (settingsStore.app.enablePermission) {
if (settingsStore.settings.app.enablePermission) {
return userStore.permissions.includes(permission)
}
else {
+2 -8
View File
@@ -1,7 +1,6 @@
import router from '@/router'
import useSettingsStore from '@/store/modules/settings'
import useMenuStore from '@/store/modules/menu'
import { isExternalLink } from '@/utils'
export default function useMenu() {
const settingsStore = useSettingsStore()
@@ -9,13 +8,8 @@ export default function useMenu() {
function switchTo(index: number | string) {
menuStore.setActived(index)
if (settingsStore.menu.switchMainMenuAndPageJump) {
if (isExternalLink(menuStore.sidebarMenusFirstDeepestPath)) {
window.open(menuStore.sidebarMenusFirstDeepestPath, '_blank')
}
else {
router.push(menuStore.sidebarMenusFirstDeepestPath)
}
if (settingsStore.settings.menu.switchMainMenuAndPageJump) {
router.push(menuStore.sidebarMenusFirstDeepestPath)
}
}
+2 -12
View File
@@ -1,15 +1,5 @@
import path from 'path-browserify'
export function isExternalLink(path: string) {
return /^(https?:|mailto:|tel:)/.test(path)
}
export function resolveRoutePath(basePath: string, routePath: string) {
if (isExternalLink(routePath)) {
return routePath
}
if (isExternalLink(basePath)) {
return basePath
}
return basePath ? path.resolve(basePath, routePath) : routePath
export function resolveRoutePath(basePath: string, routePath?: string) {
return basePath ? path.resolve(basePath, routePath ?? '') : routePath ?? ''
}
+1 -1
View File
@@ -6,7 +6,7 @@ meta:
<script lang="ts" setup>
function open(url: string) {
window.open(url, 'top')
window.open(url, '_blank')
}
const fantasticStartkitInfo = ref({
+7 -39
View File
@@ -21,12 +21,10 @@ const title = import.meta.env.VITE_APP_TITLE
// 表单类型,login 登录,reset 重置密码
const formType = ref('login')
const loading = ref(false)
const passwordType = ref('password')
const redirect = ref(route.query.redirect?.toString() ?? '/')
// 登录
const loginFormRef = ref<FormInstance>()
const loginPasswordRef = ref<HTMLElement>()
const loginForm = ref({
account: localStorage.login_account || '',
password: '',
@@ -63,8 +61,6 @@ function handleLogin() {
// 注册
const registerFormRef = ref<FormInstance>()
const registerPasswordRef = ref<HTMLElement>()
const registerCheckPasswordRef = ref<HTMLElement>()
const registerForm = ref({
account: '',
captcha: '',
@@ -110,7 +106,6 @@ function handleRegister() {
// 重置密码
const resetFormRef = ref<FormInstance>()
const resetNewPasswordRef = ref<HTMLElement>()
const resetForm = ref({
account: localStorage.login_account || '',
captcha: '',
@@ -140,13 +135,6 @@ function handleReset() {
})
}
function showPassword(passwordEl: HTMLElement | undefined) {
passwordType.value = passwordType.value === 'password' ? '' : 'password'
nextTick(() => {
passwordEl?.focus()
})
}
function testAccount(account: string) {
loginForm.value.account = account
loginForm.value.password = '123456'
@@ -170,7 +158,7 @@ function testAccount(account: string) {
</div>
<div>
<el-form-item prop="account">
<el-input ref="name" v-model="loginForm.account" placeholder="用户名" text tabindex="1" autocomplete="on">
<el-input v-model="loginForm.account" placeholder="用户名" text tabindex="1" autocomplete="on">
<template #prefix>
<el-icon>
<svg-icon name="ep:user" />
@@ -179,17 +167,12 @@ function testAccount(account: string) {
</el-input>
</el-form-item>
<el-form-item prop="password">
<el-input ref="loginPasswordRef" v-model="loginForm.password" :type="passwordType" placeholder="密码" tabindex="2" autocomplete="on" @keyup.enter="handleLogin">
<el-input v-model="loginForm.password" type="password" placeholder="密码" tabindex="2" autocomplete="on" show-password @keyup.enter="handleLogin">
<template #prefix>
<el-icon>
<svg-icon name="ep:lock" />
</el-icon>
</template>
<template #suffix>
<el-icon>
<svg-icon :name="passwordType === 'password' ? 'eye' : 'eye-open'" @click="showPassword(loginPasswordRef)" />
</el-icon>
</template>
</el-input>
</el-form-item>
</div>
@@ -228,7 +211,7 @@ function testAccount(account: string) {
</div>
<div>
<el-form-item prop="account">
<el-input ref="name" v-model="registerForm.account" placeholder="用户名" tabindex="1" autocomplete="on">
<el-input v-model="registerForm.account" placeholder="用户名" tabindex="1" autocomplete="on">
<template #prefix>
<el-icon>
<svg-icon name="ep:user" />
@@ -249,31 +232,21 @@ function testAccount(account: string) {
</el-input>
</el-form-item>
<el-form-item prop="password">
<el-input ref="registerPasswordRef" v-model="registerForm.password" :type="passwordType" placeholder="密码" tabindex="3" autocomplete="on">
<el-input v-model="registerForm.password" type="password" placeholder="密码" tabindex="3" autocomplete="on" show-password>
<template #prefix>
<el-icon>
<svg-icon name="ep:lock" />
</el-icon>
</template>
<template #suffix>
<el-icon>
<svg-icon :name="passwordType === 'password' ? 'ep:hide' : 'ep:view'" @click="showPassword(registerPasswordRef)" />
</el-icon>
</template>
</el-input>
</el-form-item>
<el-form-item prop="checkPassword">
<el-input ref="registerCheckPasswordRef" v-model="registerForm.checkPassword" :type="passwordType" placeholder="确认密码" tabindex="4" autocomplete="on">
<el-input v-model="registerForm.checkPassword" type="password" placeholder="确认密码" tabindex="4" autocomplete="on" show-password>
<template #prefix>
<el-icon>
<svg-icon name="ep:lock" />
</el-icon>
</template>
<template #suffix>
<el-icon>
<svg-icon :name="passwordType === 'password' ? 'ep:hide' : 'ep:view'" @click="showPassword(registerCheckPasswordRef)" />
</el-icon>
</template>
</el-input>
</el-form-item>
</div>
@@ -295,7 +268,7 @@ function testAccount(account: string) {
</div>
<div>
<el-form-item prop="account">
<el-input ref="name" v-model="resetForm.account" placeholder="用户名" tabindex="1" autocomplete="on">
<el-input v-model="resetForm.account" placeholder="用户名" tabindex="1" autocomplete="on">
<template #prefix>
<el-icon>
<svg-icon name="ep:user" />
@@ -316,17 +289,12 @@ function testAccount(account: string) {
</el-input>
</el-form-item>
<el-form-item prop="newPassword">
<el-input ref="resetNewPasswordRef" v-model="resetForm.newPassword" :type="passwordType" placeholder="新密码" tabindex="3" autocomplete="on">
<el-input v-model="resetForm.newPassword" type="password" placeholder="新密码" tabindex="3" autocomplete="on" show-password>
<template #prefix>
<el-icon>
<svg-icon name="ep:lock" />
</el-icon>
</template>
<template #suffix>
<el-icon>
<svg-icon :name="passwordType === 'password' ? 'ep:hide' : 'ep:view'" @click="showPassword(resetNewPasswordRef)" />
</el-icon>
</template>
</el-input>
</el-form-item>
</div>
+3 -3
View File
@@ -74,13 +74,13 @@ function onSubmit() {
<el-col :md="24" :lg="12">
<el-form ref="formRef" :model="form" :rules="rules" label-width="120px">
<el-form-item label="原密码" prop="password">
<el-input v-model="form.password" type="password" placeholder="请输入原密码" />
<el-input v-model="form.password" type="password" placeholder="请输入原密码" show-password />
</el-form-item>
<el-form-item label="新密码" prop="newpassword">
<el-input v-model="form.newpassword" type="password" placeholder="请输入原密码" />
<el-input v-model="form.newpassword" type="password" placeholder="请输入原密码" show-password />
</el-form-item>
<el-form-item label="确认新密码" prop="checkpassword">
<el-input v-model="form.checkpassword" type="password" placeholder="请输入原密码" />
<el-input v-model="form.checkpassword" type="password" placeholder="请输入原密码" show-password />
</el-form-item>
</el-form>
</el-col>
+3
View File
@@ -19,6 +19,9 @@
"paths": {
"@/*": [
"src/*"
],
"#/*": [
"src/types/*"
]
},
"types": [
+1
View File
@@ -53,6 +53,7 @@ export default ({ mode, command }) => {
resolve: {
alias: {
'@': path.resolve(__dirname, 'src'),
'#': path.resolve(__dirname, 'src/types'),
},
},
css: {
+1 -1
View File
@@ -7,7 +7,7 @@ export default function createAutoImport() {
'vue-router',
'pinia',
],
dts: 'src/auto-imports.d.ts',
dts: './src/types/auto-imports.d.ts',
dirs: [
'./src/utils/composables/**',
],
+1 -1
View File
@@ -4,6 +4,6 @@ export default function createComponents() {
return components({
dirs: ['src/components'],
include: [/\.vue$/, /\.vue\?vue/, /\.tsx$/],
dts: 'src/components.d.ts',
dts: './src/types/components.d.ts',
})
}
+2
View File
@@ -2,6 +2,7 @@ import type { PluginOption } from 'vite'
import vue from '@vitejs/plugin-vue'
import vueJsx from '@vitejs/plugin-vue-jsx'
import createInspector from './inspector'
import createHtml from './html'
import createAutoImport from './auto-import'
import createComponents from './components'
@@ -21,6 +22,7 @@ export default function createVitePlugins(viteEnv, isBuild = false) {
}),
vueJsx(),
]
vitePlugins.push(createInspector())
vitePlugins.push(createHtml(viteEnv, isBuild))
vitePlugins.push(createAutoImport())
vitePlugins.push(createComponents())
+5
View File
@@ -0,0 +1,5 @@
import Inspector from 'vite-plugin-vue-inspector'
export default function createInspector() {
return Inspector()
}