save

2025-11-17 23:44:45 +08:00
parent 697db5f975
commit 135ae13b6f
5 changed files with 118 additions and 56 deletions
--- a/public/migrate.html
+++ b/public/migrate.html
@@ -8,14 +8,14 @@
 <script>
  async function readIndexedDB() {
    return new Promise((resolve, reject) => {
-      const request = indexedDB.open('type-words', 1); // 你的数据库名
+      const request = indexedDB.open('keyval-store', 1); // 你的数据库名
      request.onsuccess = function (event) {
        const db = event.target.result;
-        const tx = db.transaction(['typing-word-dict', 'typing-word-setting', 'typing-word-files'], 'readonly');
+        const keys = ['typing-word-dict', 'typing-word-setting', 'typing-word-files','type-words-app-version'];
+        const tx = db.transaction(keys, 'readonly');
        const result = {};

        let count = 0;
-        const keys = ['typing-word-dict', 'typing-word-setting', 'typing-word-files'];
        keys.forEach((storeName) => {
          const store = tx.objectStore(storeName);
          const allRequest = store.getAll();
@@ -38,7 +38,6 @@
      };
    });
  }
-
  // 监听 postMessage
  window.addEventListener('message', async (e) => {
    if (e.data && e.data.type === 'requestData') {
--- a/public/static-home.html
+++ b/public/static-home.html
@@ -327,61 +327,117 @@

    <script>
      function migrateFromOldDomain() {
-        return new Promise((resolve) => {
+        return new Promise((resolve, reject) => {
+          const OLD_ORIGIN = 'https://2study.top';
          const iframe = document.createElement('iframe');
          iframe.style.display = 'none';
-          iframe.src = 'https://2study.top/migrate.html';
-          document.body.appendChild(iframe);
+          iframe.src = OLD_ORIGIN + '/migrate.html';

-          // 接收数据
-          window.addEventListener('message', async function handler(e) {
-            if (e.data && e.data.type === 'responseData') {
-              // 写入 localStorage
-              const localData = e.data.localStorageData;
-              for (const key in localData) {
-                if (localData[key] !== null) localStorage.setItem(key, localData[key]);
+          // 超时保护
+          const TIMEOUT = 15000;
+          const timeoutId = setTimeout(() => {
+            cleanup();
+            reject(new Error('迁移超时：未收到老域名响应'));
+          }, TIMEOUT);
+
+          // 确保先监听消息
+          function messageHandler(e) {
+            try {
+              // 校验来源
+              if (e.origin !== OLD_ORIGIN) return;
+              if (!e.data || e.data.type !== 'responseData') return;
+
+              // 写 localStorage
+              const local = e.data.localStorageData || {};
+              for (const key in local) {
+                if (local[key] !== null) localStorage.setItem(key, local[key]);
              }

-              // 写入 IndexedDB
-              const indexedData = e.data.indexedDBData;
-              const request = indexedDB.open('type-words', 1);
-              request.onupgradeneeded = function (event) {
-                const db = event.target.result;
-                // 建 store
-                ['typing-word-dict', 'typing-word-setting', 'typing-word-files'].forEach(name => {
+              // 写 IndexedDB（简单实现：覆盖写入）
+              const indexed = e.data.indexedDBData || {};
+              const req = indexedDB.open('keyval-store', 1);
+
+              const keys = ['typing-word-dict', 'typing-word-setting', 'typing-word-files', 'type-words-app-version'];
+              req.onupgradeneeded = function (ev) {
+                const db = ev.target.result;
+                keys.forEach(name => {
                  if (!db.objectStoreNames.contains(name)) {
                    db.createObjectStore(name, {autoIncrement: true});
                  }
                });
              };
-              request.onsuccess = function (event) {
-                const db = event.target.result;
-                const tx = db.transaction(['typing-word-dict', 'typing-word-setting', 'typing-word-files'], 'readwrite');
-                for (const storeName in indexedData) {
-                  const store = tx.objectStore(storeName);
-                  const items = indexedData[storeName];
-                  if (items) {
-                    items.forEach(item => store.put(item));
+              req.onsuccess = function (ev) {
+                const db = ev.target.result;
+                const tx = db.transaction(keys, 'readwrite');
+                tx.oncomplete = function () {
+                  clearTimeout(timeoutId);
+                  cleanup();
+                  resolve(true);
+                };
+                tx.onerror = function () {
+                  clearTimeout(timeoutId);
+                  cleanup();
+                  reject(new Error('写入 IndexedDB 出错'));
+                };
+                for (const storeName in indexed) {
+                  const items = indexed[storeName];
+                  if (Array.isArray(items)) {
+                    const store = tx.objectStore(storeName);
+                    items.forEach(item => {
+                      // 如果你的对象有主键 id，请改用 put(item, id)
+                      store.put(item);
+                    });
                  }
                }
-                tx.oncomplete = function () {
-                  resolve(true);
-                  window.removeEventListener('message', handler);
-                  iframe.remove();
-                };
              };
-
-              // 发送请求
-              iframe.contentWindow.postMessage({type: 'requestData'}, 'https://2study.top');
+              req.onerror = function () {
+                clearTimeout(timeoutId);
+                cleanup();
+                reject(new Error('打开 IndexedDB 失败'));
+              };
+            } catch (err) {
+              clearTimeout(timeoutId);
+              cleanup();
+              reject(err);
            }
-          });
+          }
+
+          function cleanup() {
+            window.removeEventListener('message', messageHandler);
+            if (iframe.parentNode) iframe.parentNode.removeChild(iframe);
+          }
+
+          window.addEventListener('message', messageHandler);
+
+          // 把 iframe 插入 DOM，等待加载完成再发请求
+          iframe.onload = function () {
+            // 此时 iframe.contentWindow 应该可用，向老域名发送请求
+            try {
+              iframe.contentWindow.postMessage({type: 'requestData'}, OLD_ORIGIN);
+            } catch (err) {
+              clearTimeout(timeoutId);
+              cleanup();
+              reject(err);
+            }
+          };
+
+          document.body.appendChild(iframe);
        });
      }

+      // // 使用示例
+      // migrateFromOldDomain().then(() => {
+      //   console.log('迁移成功');
+      // }).catch(err => {
+      //   console.error('迁移失败', err);
+      // });
+
      if (location.href === 'https://typewords.cc/') {
-        migrateFromOldDomain().then(() => {
-          console.log('数据迁移完成！');
-        });
+        document.onload = function () {
+          migrateFromOldDomain().then(() => {
+            console.log('数据迁移完成！');
+          });
+        }
      }
    </script>
 </head>
--- a/src/components/list/ArticleList.vue
+++ b/src/components/list/ArticleList.vue
@@ -7,13 +7,11 @@ import BaseInput from "@/components/base/BaseInput.vue";
 interface IProps {
  list: Article[];
  showTranslate?: boolean;
-  activeId: string | number;
 }

 const props = withDefaults(defineProps<IProps>(), {
  list: () => [] as Article[],
  showTranslate: true,
-  activeId: ""
 })

 const emit = defineEmits<{
@@ -79,7 +77,10 @@ defineExpose({ scrollToBottom, scrollToItem })
        </template>
      </BaseInput>
    </div>
-    <BaseList ref="listRef" @click="(e: any) => emit('click', e)" :list="localList" v-bind="$attrs">
+    <BaseList ref="listRef"
+              @click="(e: any) => emit('click', e)"
+              :list="localList"
+              v-bind="$attrs">
      <template v-slot:prefix="{ item, index }">
        <slot name="prefix" :item="item" :index="index"></slot>
      </template>
--- a/src/components/list/BaseList.vue
+++ b/src/components/list/BaseList.vue
@@ -5,13 +5,13 @@ import { nextTick, watch } from 'vue'
 const props = withDefaults(defineProps<{
  list?: any[],
  activeIndex?: number,
-  activeId?: number,
+  activeId?: number | string,
  isActive?: boolean
  static?: boolean
 }>(), {
  list: [],
  activeIndex: -1,
-  activeId: null,
+  activeId: '',
  isActive: false,
  static: true
 })
@@ -94,7 +94,7 @@ function scrollToItem(index: number) {

 function itemIsActive(item: any, index: number) {
  return props.activeId ?
-      props.activeId === item.id
+      props.activeId == item.id
      : props.activeIndex === index
 }

--- a/src/pages/article/PracticeArticles.vue
+++ b/src/pages/article/PracticeArticles.vue
@@ -42,7 +42,7 @@ const store = useBaseStore()
 const runtimeStore = useRuntimeStore()
 const settingStore = useSettingStore()
 const statStore = usePracticeStore()
-const { toggleTheme } = useTheme()
+const {toggleTheme} = useTheme()

 let articleData = $ref({
  list: [],
@@ -132,6 +132,7 @@ async function init() {
    router.push('/articles')
  }
 }
+
 const initAudio = () => {
  _nextTick(() => {
    audioRef.volume = settingStore.articleSoundVolume / 100
@@ -154,11 +155,11 @@ const handleSpeedUpdate = (speed: number) => {

 watch(() => store.load, (n) => {
  if (n && loading) init()
-}, { immediate: true })
+}, {immediate: true})

 watch(() => settingStore.$state, (n) => {
  initAudio()
-}, { immediate: true, deep: true })
+}, {immediate: true, deep: true})

 onMounted(() => {
  if (store.sbook?.articles?.length) {
@@ -190,9 +191,9 @@ function savePracticeData(init = true, regenerate = true) {
        let data = obj.val
        //如果全是0，说明未进行练习，直接重置
        if (
-          data.practiceData.sectionIndex === 0 &&
-          data.practiceData.sentenceIndex === 0 &&
-          data.practiceData.wordIndex === 0
+            data.practiceData.sectionIndex === 0 &&
+            data.practiceData.sentenceIndex === 0 &&
+            data.practiceData.wordIndex === 0
        ) {
          throw new Error()
        }
@@ -262,6 +263,10 @@ function setArticle(val: Article) {
  })
 }

+watch(() => articleData.article.id, n => {
+  console.log('articleData.article.id', n)
+})
+
 async function complete() {
  clearInterval(timer)
  setTimeout(() => {
@@ -279,7 +284,7 @@ async function complete() {
  }

  if (AppEnv.CAN_REQUEST) {
-    let res = await addStat({ ...data, type: 'article' })
+    let res = await addStat({...data, type: 'article'})
    if (!res.success) {
      Toast.error(res.msg)
    }
@@ -438,7 +443,8 @@ onUnmounted(() => {
  timer && clearInterval(timer)
 })

-const { playSentenceAudio } = usePlaySentenceAudio()
+const {playSentenceAudio} = usePlaySentenceAudio()
+
 function play2(e) {
  _nextTick(() => {
    if (settingStore.articleSound || e.handle) {
@@ -485,7 +491,7 @@ provide('currentPractice', currentPractice)
              :static="false"
              :show-translate="settingStore.translate"
              @click="changeArticle"
-              :active-id="articleData.article.id"
+              :active-id="articleData.article.id??''"
              :list="articleData.list ">
            <template v-slot:suffix="{item,index}">
              <BaseIcon