diff --git a/src/components/article/EditArticle.vue b/src/components/article/EditArticle.vue index 917c1923..08872d6a 100644 --- a/src/components/article/EditArticle.vue +++ b/src/components/article/EditArticle.vue @@ -16,9 +16,7 @@ import {$ref} from "vue/macros"; import {MessageBox} from "@/utils/MessageBox.tsx"; import {getSplitTranslateText} from "@/hooks/article.ts"; import {cloneDeep} from "lodash-es"; -import {v4 as uuidv4} from "uuid"; -import {h, watch} from "vue"; -import {useBaseStore} from "@/stores/base.ts"; +import {watch} from "vue"; import Empty from "@/components/Empty.vue"; interface IProps { diff --git a/src/components/article/EditBatchArticleModal-FQ.vue b/src/components/article/EditBatchArticleModal-FQ.vue index 15b71869..a80cad1d 100644 --- a/src/components/article/EditBatchArticleModal-FQ.vue +++ b/src/components/article/EditBatchArticleModal-FQ.vue @@ -6,15 +6,15 @@ import BaseButton from "@/components/BaseButton.vue"; import {cloneDeep} from "lodash-es"; import BaseIcon from "@/components/BaseIcon.vue"; import {useBaseStore} from "@/stores/base.ts"; -import {$computed, $ref} from "vue/macros"; +import {$ref} from "vue/macros"; import List from "@/components/list/List.vue"; -import {v4 as uuidv4} from 'uuid'; import Dialog from "@/components/dialog/Dialog.vue"; import EditArticle from "@/components/article/EditArticle.vue"; import {emitter, EventKey} from "@/utils/eventBus.ts"; import {useDisableEventListener} from "@/hooks/event.ts"; import {MessageBox} from "@/utils/MessageBox.tsx"; import {useRuntimeStore} from "@/stores/runtime.ts"; +import {nanoid} from "nanoid"; const base = useBaseStore() const runtimeStore = useRuntimeStore() @@ -154,7 +154,7 @@ function importData(e: Event) { if (!obj.articles[i]?.useTranslateType) obj.articles[i].useTranslateType = 'none' if (!obj.articles[i]?.textAllWords) obj.articles[i].textAllWords = [] if (!obj.articles[i]?.sections) obj.articles[i].sections = [] - obj.articles[i].id = uuidv4() + obj.articles[i].id = nanoid(6) } obj.sort = Sort.normal obj.type = DictType.customArticle @@ -210,9 +210,9 @@ function saveArticle(val: Article): boolean { ElMessage.error('已存在同名文章!') return false } - val.id = uuidv4() + val.id = nanoid(6) runtimeStore.editDict.articles.push(val) - setTimeout(()=>{ + setTimeout(() => { listEl.scrollBottom() }) } diff --git a/src/components/article/EditBatchArticleModal.vue b/src/components/article/EditBatchArticleModal.vue index 0fa99390..f7b8485c 100644 --- a/src/components/article/EditBatchArticleModal.vue +++ b/src/components/article/EditBatchArticleModal.vue @@ -4,17 +4,16 @@ import {onMounted, onUnmounted} from "vue"; import {Article, DefaultArticle, DictType, Sort} from "@/types.ts"; import BaseButton from "@/components/BaseButton.vue"; import {cloneDeep} from "lodash-es"; -import BaseIcon from "@/components/BaseIcon.vue"; import {useBaseStore} from "@/stores/base.ts"; -import {$computed, $ref} from "vue/macros"; +import {$ref} from "vue/macros"; import List from "@/components/list/List.vue"; -import {v4 as uuidv4} from 'uuid'; import Dialog from "@/components/dialog/Dialog.vue"; import EditArticle from "@/components/article/EditArticle.vue"; import {emitter, EventKey} from "@/utils/eventBus.ts"; import {useDisableEventListener} from "@/hooks/event.ts"; import {MessageBox} from "@/utils/MessageBox.tsx"; import {useRuntimeStore} from "@/stores/runtime.ts"; +import {nanoid} from "nanoid"; const base = useBaseStore() const runtimeStore = useRuntimeStore() @@ -154,7 +153,7 @@ function importData(e: Event) { if (!obj.articles[i]?.useTranslateType) obj.articles[i].useTranslateType = 'none' if (!obj.articles[i]?.textAllWords) obj.articles[i].textAllWords = [] if (!obj.articles[i]?.sections) obj.articles[i].sections = [] - obj.articles[i].id = uuidv4() + obj.articles[i].id = nanoid(6) } obj.sort = Sort.normal obj.type = DictType.customArticle @@ -210,7 +209,7 @@ function saveArticle(val: Article): boolean { ElMessage.error('已存在同名文章!') return false } - val.id = uuidv4() + val.id = nanoid(6) runtimeStore.editDict.articles.push(val) setTimeout(()=>{ listEl.scrollBottom() diff --git a/src/components/dialog/DictDiglog.vue b/src/components/dialog/DictDiglog.vue index 43176b2d..91938a8f 100644 --- a/src/components/dialog/DictDiglog.vue +++ b/src/components/dialog/DictDiglog.vue @@ -8,7 +8,6 @@ import {$computed, $ref} from "vue/macros"; import BaseButton from "@/components/BaseButton.vue"; import {Icon} from '@iconify/vue'; import DictGroup from "@/components/toolbar/DictGroup.vue"; -import {v4 as uuidv4} from "uuid"; import {ActivityCalendar} from "vue-activity-calendar"; import "vue-activity-calendar/style.css"; import ChapterList from "@/components/list/ChapterList.vue"; @@ -88,7 +87,7 @@ async function selectDict(val: { dict: DictResource | Dict, index: number }) { let r = await fetch(url) let v = await r.json() runtimeStore.editDict.articles = cloneDeep(v.map(s => { - s.id = uuidv4() + s.id = nanoid(6) return s })) } @@ -643,7 +642,7 @@ onMounted(() => {
-
{{dictIsArticle?'句子':'单词'}}发音
+
{{ dictIsArticle ? '句子' : '单词' }}发音
美音 @@ -652,7 +651,7 @@ onMounted(() => {
-
{{dictIsArticle?'句子':'单词'}}自动发音
+
{{ dictIsArticle ? '句子' : '单词' }}自动发音
{ - v.id = uuidv4() + v.id = nanoid(6) return v })) } diff --git a/src/pages/dict/components/ArticleDictDetail.vue b/src/pages/dict/components/ArticleDictDetail.vue index 7cad8f22..6eedad6d 100644 --- a/src/pages/dict/components/ArticleDictDetail.vue +++ b/src/pages/dict/components/ArticleDictDetail.vue @@ -234,7 +234,7 @@ defineExpose({getDictDetail}) {{ runtimeStore.editDict.name }}
diff --git a/src/stores/base.ts b/src/stores/base.ts index f4dedfa1..6b7a9184 100644 --- a/src/stores/base.ts +++ b/src/stores/base.ts @@ -2,7 +2,6 @@ import {defineStore} from 'pinia' import {DefaultDict, Dict, DictType, DisplayStatistics, SaveDict, Word} from "../types.ts" import {chunk, cloneDeep, merge} from "lodash-es"; import {emitter, EventKey} from "@/utils/eventBus.ts" -import {v4 as uuidv4} from 'uuid'; import {useRuntimeStore} from "@/stores/runtime.ts"; import * as localforage from "localforage"; import {nanoid} from "nanoid"; @@ -242,7 +241,7 @@ export const useBaseStore = defineStore('base', { let r = await fetch(dictResourceUrl) let s: any[] = await r.json() this.currentDict.articles = cloneDeep(s.map(v => { - v.id = uuidv4() + v.id = nanoid(6) return v })) } diff --git a/src/types.ts b/src/types.ts index f22b0985..3446b100 100644 --- a/src/types.ts +++ b/src/types.ts @@ -95,7 +95,7 @@ export interface Article { } export const DefaultArticle: Article = { - // id: uuidv4(), + // id: nanoid(6), id: '', title: '', titleTranslate: '',