diff --git a/src/pages/pc/article/BookDetail.vue b/src/pages/pc/article/BookDetail.vue
index 07876965..7d0f7943 100644
--- a/src/pages/pc/article/BookDetail.vue
+++ b/src/pages/pc/article/BookDetail.vue
@@ -146,7 +146,7 @@ const {
-
+
{{ runtimeStore.editDict.id ? '修改' : '创建' }}书籍
diff --git a/src/pages/pc/article/StudyArticle.vue b/src/pages/pc/article/StudyArticle.vue
index f1510933..b6284c57 100644
--- a/src/pages/pc/article/StudyArticle.vue
+++ b/src/pages/pc/article/StudyArticle.vue
@@ -10,7 +10,7 @@ import useTheme from "@/hooks/theme.ts";
import Toast from '@/pages/pc/components/base/toast/Toast.ts'
import {_getDictDataByUrl, cloneDeep} from "@/utils";
import {usePracticeStore} from "@/stores/practice.ts";
-import {useArticleOptions} from "@/hooks/dict.ts";
+import {getCurrentStudyWord, useArticleOptions} from "@/hooks/dict.ts";
import {genArticleSectionData, usePlaySentenceAudio} from "@/hooks/article.ts";
import {getDefaultArticle, getDefaultDict} from "@/types/func.ts";
import TypingArticle from "@/pages/pc/article/components/TypingArticle.vue";
@@ -20,7 +20,7 @@ import ArticleList from "@/pages/pc/components/list/ArticleList.vue";
import EditSingleArticleModal from "@/pages/pc/article/components/EditSingleArticleModal.vue";
import Tooltip from "@/pages/pc/components/base/Tooltip.vue";
import ConflictNotice from "@/pages/pc/components/ConflictNotice.vue";
-import {enArticle} from "@/assets/dictionary.ts";
+import {dictionaryResources, enArticle} from "@/assets/dictionary.ts";
import {useRoute, useRouter} from "vue-router";
import {useRuntimeStore} from "@/stores/runtime.ts";
@@ -39,7 +39,7 @@ let articleData = $ref({
})
let showEditArticle = $ref(false)
let typingArticleRef = $ref
()
-let loading = $ref(true)
+let loading = $ref(false)
let editArticle = $ref(getDefaultArticle())
function write() {
@@ -87,61 +87,51 @@ function next() {
const router = useRouter()
const route = useRoute()
-const runtimeStore = useRuntimeStore()
-
-watch(() => store.load, (n) => {
- if (n && loading && runtimeStore.editDict.id) {
- console.log('load好了开始加载')
- store.changeBook(runtimeStore.editDict)
- articleData.list = cloneDeep(store.sbook.articles)
- getCurrentPractice()
- loading = false
- }
-},{immediate: true})
-
-useStartKeyboardEventListener()
-useDisableEventListener(() => loading)
-
-function init() {
- if (store.sbook?.articles?.length) {
- articleData.list = cloneDeep(store.sbook.articles)
- getCurrentPractice()
- loading = false
- } else {
- let dictName = route.query.name
- let dictId = route.query.id
- //如果url里有词典id或name，那么直接请求词典数据，并加到bookList里面进行学习
- //todo 这里要处理自定义词典的问题
- if (dictName || dictId) {
- let dictResource = getDefaultDict()
- if (dictId) dictResource = enArticle.find(v => v.id === dictId) as Dict
- else if (dictName) dictResource = enArticle.find(v => v.name === dictName) as Dict
- if (dictResource.id) {
- loading = true
- _getDictDataByUrl(dictResource, DictType.article).then(r => {
- if (!r.articles.length) {
- router.push('/article')
- return Toast.warning('没有文章可学习！')
- }
- runtimeStore.editDict = r
- if (store.load) {
- console.log('直接加载')
- store.changeBook(r)
- articleData.list = cloneDeep(store.sbook.articles)
- getCurrentPractice()
- loading = false
- }
- })
- } else {
+async function init() {
+ console.log('load好了开始加载')
+ let dict = getDefaultDict()
+ let dictId = route.params.id
+ if (dictId) {
+ //先在自己的词典列表里面找，如果没有再在资源列表里面找
+ dict = store.article.bookList.find(v => v.id === dictId)
+ if (!dict) dict = enArticle.find(v => v.id === dictId) as Dict
+ if (dict && dict.id) {
+ //如果是不是自定义词典，就请求数据
+ if (!dict.custom) dict = await _getDictDataByUrl(dict, DictType.article)
+ if (!dict.articles.length) {
router.push('/article')
+ return Toast.warning('没有文章可学习！')
}
+ store.changeBook(dict)
+ articleData.list = cloneDeep(store.sbook.articles)
+ getCurrentPractice()
+ loading = false
} else {
router.push('/article')
}
+ } else {
+ router.push('/article')
}
}
+watch(() => store.load, (n) => {
+ if (n && loading) init()
+}, {immediate: true})
+
+onMounted(() => {
+ if (store.sbook?.articles?.length) {
+ articleData.list = cloneDeep(store.sbook.articles)
+ getCurrentPractice()
+ } else {
+ loading = true
+ }
+})
+
+
+useStartKeyboardEventListener()
+useDisableEventListener(() => loading)
+
function setArticle(val: Article) {
statisticsStore.inputWordNumber = 0
statisticsStore.wrong = 0
@@ -246,8 +236,6 @@ async function onKeyDown(e: KeyboardEvent) {
useOnKeyboardEventListener(onKeyDown, onKeyUp)
-onMounted(init)
-
useEvents([
[EventKey.write, write],
[EventKey.repeatStudy, repeat],
diff --git a/src/pages/pc/word/StudyWord.vue b/src/pages/pc/word/StudyWord.vue
index 16fa0a8f..7f6384e9 100644
--- a/src/pages/pc/word/StudyWord.vue
+++ b/src/pages/pc/word/StudyWord.vue
@@ -61,54 +61,47 @@ let data = $ref({
wrongWords: [],
})
-watch(() => store.load, (n) => {
- if (n && loading && runtimeStore.editDict.id) {
- console.log('load好了开始加载')
- store.changeDict(runtimeStore.editDict)
- studyData = getCurrentStudyWord()
- loading = false
+async function init() {
+ console.log('load好了开始加载')
+ let dict = getDefaultDict()
+ let dictId = route.params.id
+ if (dictId) {
+ //先在自己的词典列表里面找，如果没有再在资源列表里面找
+ dict = store.word.bookList.find(v => v.id === dictId)
+ if (!dict) dict = dictionaryResources.find(v => v.id === dictId) as Dict
+ if (dict && dict.id) {
+ //如果是不是自定义词典，就请求数据
+ if (!dict.custom) dict = await _getDictDataByUrl(dict)
+ if (!dict.words.length) {
+ router.push('/word')
+ return Toast.warning('没有单词可学习！')
+ }
+ store.changeDict(dict)
+ studyData = getCurrentStudyWord()
+ loading = false
+ } else {
+ router.push('/word')
+ }
+ } else {
+ router.push('/word')
}
-}, {immediate: true})
+}
-useStartKeyboardEventListener()
-useDisableEventListener(() => loading)
+watch(() => store.load, (n) => {
+ if (n && loading) init()
+}, {immediate: true})
onMounted(() => {
if (runtimeStore.routeData) {
studyData = runtimeStore.routeData
} else {
- let dictName = route.query.name
- let dictId = route.query.id
- //如果url里有词典id或name，那么直接请求词典数据，并加到bookList里面进行学习
- //todo 这里要处理自定义词典的问题
- if (dictName || dictId) {
- let dictResource = getDefaultDict()
- if (dictId) dictResource = dictionaryResources.find(v => v.id === dictId) as Dict
- else if (dictName) dictResource = dictionaryResources.find(v => v.name === dictName) as Dict
- if (dictResource.id) {
- loading = true
- _getDictDataByUrl(dictResource).then(r => {
- if (!r.words.length) {
- router.push('/word')
- return Toast.warning('没有单词可学习！')
- }
- runtimeStore.editDict = r
- if (store.load) {
- console.log('直接加载')
- store.changeDict(r)
- studyData = getCurrentStudyWord()
- loading = false
- }
- })
- } else {
- router.push('/word')
- }
- } else {
- router.push('/word')
- }
+ loading = true
}
})
+useStartKeyboardEventListener()
+useDisableEventListener(() => loading)
+
watch(() => studyData, () => {
if (studyData.new.length === 0) {
if (studyData.review.length) {
diff --git a/src/pages/pc/word/WordHomePage.vue b/src/pages/pc/word/WordHomePage.vue
index 17de57c2..aee63aa2 100644
--- a/src/pages/pc/word/WordHomePage.vue
+++ b/src/pages/pc/word/WordHomePage.vue
@@ -60,7 +60,7 @@ function startStudy() {
custom: store.sdict.custom,
complete: store.sdict.complete,
})
- nav('study-word', {name: store.sdict.name, id: store.sdict.id}, currentStudy)
+ nav('study-word/' + store.sdict.id, {}, currentStudy)
} else {
window.umami?.track('no-dict')
Toast.warning('请先选择一本词典')
diff --git a/src/router.ts b/src/router.ts
index d1c90c1a..f3bd3286 100644
--- a/src/router.ts
+++ b/src/router.ts
@@ -21,11 +21,11 @@ export const routes: RouteRecordRaw[] = [
// {path: 'home', component: HomeIndex},
{path: 'word', component: WordHomePage},
{path: 'dict-list', component: DictList},
- {path: 'study-word', component: StudyWord},
+ {path: 'study-word/:id', component: StudyWord},
{path: 'dict-detail', component: DictDetail},
{path: 'article', component: ArticleHomePage},
- {path: 'study-article', component: StudyArticle},
+ {path: 'study-article/:id', component: StudyArticle},
{path: 'book-detail', component: BookDetail},
{path: 'book-list', component: BookList},
{path: 'edit-article', component: () => import("@/pages/pc/article/EditArticlePage.vue")},
@@ -39,8 +39,8 @@ export const routes: RouteRecordRaw[] = [
]
const router = VueRouter.createRouter({
- // history: VueRouter.createWebHistory(),
- history: VueRouter.createWebHashHistory(),
+ history: VueRouter.createWebHistory(),
+ // history: VueRouter.createWebHashHistory(),
routes,
scrollBehavior(to, from, savedPosition) {
// console.log('savedPosition', savedPosition)
diff --git a/src/utils/index.ts b/src/utils/index.ts
index d29c5c76..517670e0 100644
--- a/src/utils/index.ts
+++ b/src/utils/index.ts
@@ -414,9 +414,9 @@ export async function sleep(time: number) {
export async function _getDictDataByUrl(val: DictResource, type: DictType = DictType.word): Promise {
// await sleep(2000);
- let dictResourceUrl = `./dicts/${val.language}/word/${val.url}`
+ let dictResourceUrl = `/dicts/${val.language}/word/${val.url}`
if (type === DictType.article) {
- dictResourceUrl = `./dicts/${val.language}/${val.type}/${val.url}`;
+ dictResourceUrl = `/dicts/${val.language}/${val.type}/${val.url}`;
}
let s = await getDictFile(dictResourceUrl)
if (s) {