Compare commits

...
8 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
10 changed files with 1187 additions and 630 deletions
+20 -20
View File
@@ -1,5 +1,5 @@
{
"version": "2.6.1",
"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.10.0",
"@vueuse/integrations": "^9.10.0",
"axios": "^1.2.1",
"@vueuse/core": "^9.12.0",
"@vueuse/integrations": "^9.12.0",
"axios": "^1.3.2",
"dayjs": "^1.11.7",
"element-plus": "^2.2.28",
"element-plus": "^2.2.30",
"hotkeys-js": "^3.10.1",
"lodash-es": "^4.17.21",
"mitt": "^3.0.0",
@@ -31,16 +31,16 @@
"nprogress": "^0.2.0",
"path-browserify": "^1.0.1",
"path-to-regexp": "^6.2.1",
"pinia": "^2.0.28",
"pinia": "^2.0.30",
"qs": "^6.11.0",
"tinymce": "^6.3.1",
"vue": "^3.2.45",
"vue": "^3.2.47",
"vue-router": "^4.1.6"
},
"devDependencies": {
"@antfu/eslint-config": "^0.34.0",
"@antfu/eslint-config": "^0.35.2",
"@iconify-json/ep": "^1.1.8",
"@iconify/vue": "^4.0.2",
"@iconify/vue": "^4.1.0",
"@types/nprogress": "^0.2.0",
"@types/path-browserify": "^1.0.0",
"@types/qs": "^6.9.7",
@@ -49,26 +49,26 @@
"autoprefixer": "^10.4.13",
"bumpp": "^8.2.1",
"cz-git": "^1.4.1",
"eslint": "^8.31.0",
"eslint": "^8.34.0",
"esno": "^0.16.3",
"fs-extra": "^11.1.0",
"http-server": "^14.1.1",
"lint-staged": "^13.1.0",
"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.57.1",
"sass": "^1.58.0",
"simple-git-hooks": "^2.8.1",
"stylelint": "^14.16.1",
"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.4",
"unplugin-auto-import": "^0.12.1",
"unplugin-vue-components": "^0.22.12",
"vite": "^4.0.4",
"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",
@@ -76,7 +76,7 @@
"vite-plugin-pages": "^0.28.0",
"vite-plugin-spritesmith": "^0.1.1",
"vite-plugin-svg-icons": "^2.0.1",
"vite-plugin-vue-inspector": "^3.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.24"
+1154 -594
View File
File diff suppressed because it is too large Load Diff
-1
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()
+1 -1
View File
@@ -16,7 +16,7 @@ const toLogin = () => {
}
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',
})
+1 -1
View File
@@ -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,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'
+1 -1
View File
@@ -6,7 +6,7 @@ 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()
-3
View File
@@ -36,9 +36,6 @@ function userCommand(command: 'home' | 'setting' | 'hotkeys' | 'logout') {
break
}
}
function pro() {
window.open('https://hooray.gitee.io/fantastic-admin-pro-example/', '_blank')
}
</script>
<template>
+5 -7
View File
@@ -36,13 +36,11 @@ const useRouteStore = defineStore(
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,
})
}
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) {
+5 -1
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']
@@ -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'
}