AMAZEHOME/TypeWords
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix:move components,parse sentences using regular expressions

Browse Source
This commit is contained in:
zyronon
2025-09-19 23:37:02 +08:00
parent 9113d772a3
commit ff1c4f4afc
81 changed files with 337 additions and 413 deletions
Download Patch File Download Diff File Expand all files Collapse all files

114
src/router.ts
View File

@@ -1,17 +1,16 @@
import * as VueRouter from 'vue-router'
import {RouteRecordRaw} from 'vue-router'
import {useRuntimeStore} from "@/stores/runtime.ts";
import WordHomePage from "@/pages/pc/word/WordHomePage.vue";
import PC from "@/pages/pc/index.vue";
import ArticleHomePage from "@/pages/pc/article/ArticleHomePage.vue";
import StudyArticle from "@/pages/pc/article/StudyArticle.vue";
import DictDetail from "@/pages/pc/word/DictDetail.vue";
import StudyWord from "@/pages/pc/word/StudyWord.vue";
import BookDetail from "@/pages/pc/article/BookDetail.vue";
import DictList from "@/pages/pc/word/DictList.vue";
import BookList from "@/pages/pc/article/BookList.vue";
import Setting from "@/pages/pc/setting/Setting.vue";
import Home from "@/pages/pc/home/index.vue";
import WordsPage from "@/pages/word/WordsPage.vue";
import PC from "@/pages/index.vue";
import ArticlesPage from "@/pages/article/ArticlesPage.vue";
import PracticeArticles from "@/pages/article/PracticeArticles.vue";
import DictDetail from "@/pages/word/DictDetail.vue";
import PracticeWords from "@/pages/word/PracticeWords.vue";
import BookDetail from "@/pages/article/BookDetail.vue";
import DictList from "@/pages/word/DictList.vue";
import BookList from "@/pages/article/BookList.vue";
import Setting from "@/pages/setting/Setting.vue";
import Home from "@/pages/home/index.vue";
export const routes: RouteRecordRaw[] = [
{
@@ -20,25 +19,23 @@ export const routes: RouteRecordRaw[] = [
redirect: '/',
children: [
{path: '/', component: Home},
{path: 'words', component: WordHomePage},
{path: 'words', component: WordsPage},
{path: 'word', redirect: '/words'},
{path: 'practice-words/:id', component: PracticeWords},
{path: 'study-word', redirect: '/words'},
{path: 'dict-list', component: DictList},
{path: 'practice-words/:id', component: StudyWord},
{path: 'study-word', redirect: '/word'},
{path: 'dict-detail', component: DictDetail},
{path: 'articles', component: ArticleHomePage},
{path: 'articles', component: ArticlesPage},
{path: 'article', redirect: '/articles'},
{path: 'practice-articles/:id', component: StudyArticle},
{path: 'study-article', redirect: '/article'},
{path: 'practice-articles/:id', component: PracticeArticles},
{path: 'study-article', redirect: '/articles'},
{path: 'book-detail', component: BookDetail},
{path: 'book-list', component: BookList},
{path: 'edit-article', component: () => import("@/pages/pc/article/EditArticlePage.vue")},
{path: 'setting', component: Setting},
]
},
{path: '/batch-edit-article', component: () => import("@/pages/pc/article/BatchEditArticlePage.vue")},
{path: '/batch-edit-article', component: () => import("@/pages/article/BatchEditArticlePage.vue")},
{path: '/test', component: () => import("@/pages/test/test.vue")},
{path: '/:pathMatch(.*)*', redirect: '/word'},
]
@@ -59,48 +56,47 @@ const router = VueRouter.createRouter({
router.beforeEach((to: any, from: any) => {
return true
// console.log('beforeEach-to',to.path)
// console.log('beforeEach-from',from.path)
const runtimeStore = useRuntimeStore()
//footer下面的5个按钮，对跳不要用动画
let noAnimation = [
'/pc/practice',
'/pc/dict',
'/mobile',
'/'
]
if (noAnimation.indexOf(from.path) !== -1 && noAnimation.indexOf(to.path) !== -1) {
return true
}
const toDepth = routes.findIndex(v => v.path === to.path)
const fromDepth = routes.findIndex(v => v.path === from.path)
// const fromDepth = routeDeep.indexOf(from.path)
if (toDepth > fromDepth) {
if (to.matched && to.matched.length) {
let def = to.matched[0].components.default
let toComponentName = def.name ?? def.__name
runtimeStore.updateExcludeRoutes({type: 'remove', value: toComponentName})
// console.log('删除', toComponentName)
// console.log('前进')
// console.log('删除', toComponentName)
}
} else {
if (from.matched && from.matched.length) {
let def = from.matched[0].components.default
let fromComponentName = def.name ?? def.__name
runtimeStore.updateExcludeRoutes({type: 'add', value: fromComponentName})
// console.log('添加', fromComponentName)
// console.log('后退')
}
}
// const runtimeStore = useRuntimeStore()
//
// //footer下面的5个按钮，对跳不要用动画
// let noAnimation = [
// '/pc/practice',
// '/pc/dict',
// '/mobile',
// '/'
// ]
//
// if (noAnimation.indexOf(from.path) !== -1 && noAnimation.indexOf(to.path) !== -1) {
// return true
// }
//
// const toDepth = routes.findIndex(v => v.path === to.path)
// const fromDepth = routes.findIndex(v => v.path === from.path)
// // const fromDepth = routeDeep.indexOf(from.path)
//
// if (toDepth > fromDepth) {
// if (to.matched && to.matched.length) {
// let def = to.matched[0].components.default
// let toComponentName = def.name ?? def.__name
// runtimeStore.updateExcludeRoutes({type: 'remove', value: toComponentName})
// // console.log('删除', toComponentName)
// // console.log('前进')
// // console.log('删除', toComponentName)
// }
// } else {
// if (from.matched && from.matched.length) {
// let def = from.matched[0].components.default
// let fromComponentName = def.name ?? def.__name
// runtimeStore.updateExcludeRoutes({type: 'add', value: fromComponentName})
// // console.log('添加', fromComponentName)
// // console.log('后退')
// }
// }
// ...
// 返回 false 以取消导航
return true
// return true
})