{{ runtimeStore.editDict.name }}
- 每日{{ runtimeStore.editDict.chapterWordNumber }}词 剩余100天
+ 每日{{ chapterWordNumber[0] }}词 剩余{{ days[0] }}天
diff --git a/src/pages/mobile/practice/index.vue b/src/pages/mobile/practice/index.vue
index dbf49d3b..9ea50ef9 100644
--- a/src/pages/mobile/practice/index.vue
+++ b/src/pages/mobile/practice/index.vue
@@ -13,6 +13,11 @@ import {ShortcutKey} from "@/types.ts";
import {useStartKeyboardEventListener} from "@/hooks/event.ts";
import useTheme from "@/hooks/theme.ts";
+
+defineOptions({
+ name: 'PracticeWord'
+})
+
const practiceStore = usePracticeStore()
const store = useBaseStore()
const settingStore = useSettingStore()
diff --git a/src/router.ts b/src/router.ts
index a51b0464..82af6264 100644
--- a/src/router.ts
+++ b/src/router.ts
@@ -60,19 +60,20 @@ router.beforeEach((to, from) => {
if (toDepth > fromDepth) {
if (to.matched && to.matched.length) {
- let toComponentName = to.matched[0].components.default.name
+ let def = to.matched[0].components.default
+ let toComponentName = def.name ?? def.__name
runtimeStore.updateExcludeRoutes({type: 'remove', value: toComponentName})
- // console.log('to', toComponentName)
+ // console.log('删除', toComponentName)
// console.log('前进')
// console.log('删除', toComponentName)
}
-
} else {
if (from.matched && from.matched.length) {
- let fromComponentName = from.matched[0].components.default.name
+ let def = from.matched[0].components.default
+ let fromComponentName = def.name ?? def.__name
runtimeStore.updateExcludeRoutes({type: 'add', value: fromComponentName})
- // console.log('后退')
// console.log('添加', fromComponentName)
+ // console.log('后退')
}
}
// ...
diff --git a/src/stores/runtime.ts b/src/stores/runtime.ts
index 422d94cf..fd6bb6c2 100644
--- a/src/stores/runtime.ts
+++ b/src/stores/runtime.ts
@@ -24,6 +24,7 @@ export const useRuntimeStore = defineStore('runtime', {
},
actions: {
updateExcludeRoutes(val: any) {
+ // console.log('val', val)
if (val.type === 'add') {
if (!this.excludeRoutes.find(v => v === val.value)) {
this.excludeRoutes.push(val.value)
diff --git a/tsconfig.json b/tsconfig.json
index 8cb6241b..f426e7c2 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -29,7 +29,8 @@
"types": [
"vue/ref-macros",
"vite/client",
- "element-plus/global"
+ "element-plus/global",
+ "unplugin-vue-define-options"
],
"baseUrl": "src",
//This is because TypeScript does not resolve webpack aliases automatically.
diff --git a/vite.config.ts b/vite.config.ts
index a22d128b..98cca4dc 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -7,8 +7,9 @@ import {ElementPlusResolver} from "unplugin-vue-components/resolvers";
import AutoImport from 'unplugin-auto-import/vite'
import Components from 'unplugin-vue-components/vite'
import {getLastCommit} from "git-last-commit";
+import DefineOptions from 'unplugin-vue-define-options/vite' // 引入插件
-function pathResolve(dir:string) {
+function pathResolve(dir: string) {
return resolve(__dirname, ".", dir)
}
@@ -31,6 +32,8 @@ export default defineConfig(async () => {
Components({
resolvers: [ElementPlusResolver()],
}),
+ //用于给setup组件定义名字的，keep-alive需要name才能正常工作
+ DefineOptions(),
vueJsx(),
lifecycle === 'report' ?
visualizer({