wip

Author: zyronon

apps/nuxt/app/pages/(articles)/articles.vue

@@ -363,7 +363,7 @@ onMounted(() => {
           >
             {{ isMultiple ? $t('cancel') : $t('manage_books') }}
           </div>
-          <div class="color-link cursor-pointer" @click="nav('/book', { isAdd: true })">
+          <div class="color-link cursor-pointer" @click="nav('/book/new', { isAdd: true })">
             {{ $t('create_personal_book') }}
           </div>
         </div>
@@ -418,4 +418,4 @@ onMounted(() => {
     @apply color-gray-500;
   }
 }
-</style>
+</style>

apps/nuxt/app/pages/(articles)/batch-edit-article.vue

@@ -1,22 +1,24 @@
 <script setup lang="ts">
 import type { Article } from '@typewords/core/types/types.ts'
 import { BaseButton, Toast, MiniDialog, UploadButton ,BackIcon} from '@typewords/base'
-import { cloneDeep, loadJsLib } from '@typewords/core/utils'
+import { cloneDeep, ensureCustomDictCopy, loadJsLib } from '@typewords/core/utils'
 
 import List from '@typewords/core/components/list/List.vue'
 import { useWindowClick } from '@typewords/core/hooks/event.ts'
 import { MessageBox } from '@typewords/core/utils/MessageBox.tsx'
 import { useRuntimeStore } from '@typewords/core/stores/runtime.ts'
 import { nanoid } from 'nanoid'
 import EditArticle from '@typewords/core/components/article/EditArticle.vue'
-import { getDefaultArticle } from '@typewords/core/types/func.ts'
+import { getDefaultArticle, getDefaultDict } from '@typewords/core/types/func.ts'
+import { useBaseStore } from '@typewords/core/stores/base.ts'
 import { onMounted } from 'vue'
 import { LIB_JS_URL } from '@typewords/core/config/env.ts'
 import { syncBookInMyStudyList } from '@typewords/core/hooks/article.ts'
 import { useI18n } from 'vue-i18n'
 const { t } = useI18n()
 
 const runtimeStore = useRuntimeStore()
+const baseStore = useBaseStore()
 
 let article = $ref<Article>(getDefaultArticle())
 let editArticleRef: any = $ref()
@@ -119,6 +121,16 @@ let showExport = $ref(false)
 useWindowClick(() => (showExport = false))
 
 onMounted(() => {
+  // 官方资源不允许直接编辑，自动转为副本
+  if (!runtimeStore.editDict.custom) {
+    const copy = ensureCustomDictCopy(runtimeStore.editDict)
+    copy.name = runtimeStore.editDict.name + ' (副本)'
+    const existIdx = baseStore.article.bookList.findIndex(v => v.id === copy.id)
+    if (existIdx === -1) {
+      baseStore.article.bookList.push(getDefaultDict(copy))
+    }
+    runtimeStore.editDict = copy
+  }
   if (runtimeStore.editDict.articles.length) {
     article = runtimeStore.editDict.articles[0]
   }

apps/nuxt/app/pages/(articles)/book/[id].vue

@@ -12,6 +12,8 @@ import {
   _dateFormat,
   _getDictDataByUrl,
   _nextTick,
+  ensureCustomDictCopy,
+  findOfficialSourceDict,
   msToHourMinute,
   resourceWrap,
   total,
@@ -46,6 +48,7 @@ const practice = usePracticeWordPersistence()
 let isEdit = $ref(false)
 let isAdd = $ref(false)
 let studyLoading = $ref(false)
+let _copyData: Dict | null = null // createCopy 生成的副本数据，作为 initialData 传给 EditBook
 let articleRef = $ref<HTMLDivElement>()
 let audioRef = $ref<HTMLAudioElement>()
 
@@ -94,8 +97,17 @@ const showBookDetail = computed(() => {
 
 const { loading } = useGetDict()
 
+function createCopy() {
+  // 生成副本数据，不写入 store。经由 initialData 传给 EditBook，确认后才写入
+  const copy = ensureCustomDictCopy(runtimeStore.editDict)
+  copy.name = runtimeStore.editDict.name + ' (副本)'
+  _copyData = copy
+  isAdd = true
+}
+
 onMounted(() => {
-  if (route.query?.isAdd) {
+  // id='new' 或 ?isAdd=true 均为新建场景（兼容从 /book/new 进入）
+  if (route.query?.isAdd || route.params?.id === 'new') {
     isAdd = true
     runtimeStore.editDict = getDefaultDict()
   }
@@ -113,8 +125,26 @@ function handleResize() {
 }
 
 function formClose() {
-  if (isEdit) isEdit = false
-  else router.back()
+  if (isEdit) {
+    isEdit = false
+  } else if (isAdd) {
+    if (_copyData) {
+      // 创建副本场景：取消回到书籍详情
+      _copyData = null
+      isAdd = false
+    } else {
+      // 直接新建场景（/book/new）：取消返回上一页
+      router.back()
+    }
+  } else {
+    router.back()
+  }
+}
+
+function handleSubmit() {
+  _copyData = null
+  isEdit = false
+  isAdd = false
 }
 
 const { data: book_list } = useFetch(resourceWrap(DICT_LIST.ARTICLE.ALL)).json()
@@ -124,17 +154,24 @@ function reset() {
     '继续此操作会重置所有文章，并从官方书籍获取最新文章列表，学习记录不会被重置。确认恢复默认吗？',
     '恢复默认',
     async () => {
-      let dict = book_list.value.find(v => v.url === runtimeStore.editDict.url) as Dict
+      let dict = findOfficialSourceDict(book_list.value ?? [], runtimeStore.editDict) as Dict
       if (dict && dict.id) {
         dict = await _getDictDataByUrl(dict, DictType.article)
         let rIndex = store.article.bookList.findIndex(v => v.id === runtimeStore.editDict.id)
         if (rIndex > -1) {
           let item = store.article.bookList[rIndex]
-          item.custom = false
-          item.id = dict.id
           item.articles = dict.articles
+          item.length = dict.articles.length
+          item.url = dict.url
+          item.cover = dict.cover
+          item.description = dict.description
+          item.name = dict.name
+          item.category = dict.category
+          item.tags = dict.tags
+          item.enName = dict.enName
+          item.sourceId = String(dict.id)
           if (item.lastLearnIndex >= item.articles.length) {
-            item.lastLearnIndex = item.articles.length - 1
+            item.lastLearnIndex = Math.max(item.articles.length - 1, 0)
           }
           runtimeStore.editDict = item
           Toast.success('恢复成功')
@@ -285,10 +322,11 @@ watch(
             <BaseButton v-if="runtimeStore.editDict.custom && runtimeStore.editDict.url" type="info" @click="reset">
               {{ $t('restore_default') }}
             </BaseButton>
-            <BaseButton :loading="studyLoading || loading" type="info" @click="isEdit = true">{{
-              $t('edit')
-            }}</BaseButton>
-            <BaseButton type="info" @click="router.push('/batch-edit-article')">{{
+            <BaseButton v-if="!runtimeStore.editDict.custom" type="info" @click="createCopy">{{ $t('create_copy') }}</BaseButton>
+             <BaseButton v-if="runtimeStore.editDict.custom" :loading="studyLoading || loading" type="info" @click="isEdit = true">{{
+                $t('edit')
+              }}</BaseButton>
+            <BaseButton v-if="runtimeStore.editDict.custom || runtimeStore.editDict.system" type="info" @click="router.push('/batch-edit-article')">{{
               $t('article_management')
             }}</BaseButton>
             <BaseButton :loading="studyLoading || loading" @click="startPractice">{{ $t('learn') }}</BaseButton>
@@ -489,13 +527,13 @@ watch(
       </div>
       <div class="" v-else>
         <div class="dict-header flex justify-between items-center relative">
-          <BackIcon class="dict-back z-2" @click="isAdd ? $router.back() : (isEdit = false)" />
-          <div class="dict-title absolute text-2xl text-align-center w-full">
-            {{ runtimeStore.editDict.id ? $t('edit_book') : $t('create_book') }}
+<BackIcon class="dict-back z-2" @click="formClose" />
+<div class="dict-title absolute text-2xl text-align-center w-full">
+  {{ isAdd ? $t('create_book') : $t('edit_book') }}
           </div>
         </div>
         <div class="center">
-          <EditBook :is-add="isAdd" :is-book="true" @close="formClose" @submit="isEdit = isAdd = false" />
+          <EditBook :is-add="isAdd" :is-book="true" :initial-data="_copyData"  @close="formClose" @submit="handleSubmit" />
         </div>
       </div>
     </div>
@@ -658,4 +696,4 @@ $article-lh: 2.4;
     line-height: 1.35;
   }
 }
-</style>
+</style>