From 135ae13b6f20cde721f40850b56c76525d417202 Mon Sep 17 00:00:00 2001
From: Zyronon <zyronon@163.com>
Date: Mon, 17 Nov 2025 23:44:45 +0800
Subject: [PATCH 01/14] save

---
 public/migrate.html                    |   7 +-
 public/static-home.html                | 130 ++++++++++++++++++-------
 src/components/list/ArticleList.vue    |   7 +-
 src/components/list/BaseList.vue       |   6 +-
 src/pages/article/PracticeArticles.vue |  24 +++--
 5 files changed, 118 insertions(+), 56 deletions(-)

diff --git a/public/migrate.html b/public/migrate.html
index 6da68ad4..0db735d0 100644
--- 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') {
diff --git a/public/static-home.html b/public/static-home.html
index 22e0a823..fe9f2f0f 100644
--- 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>
diff --git a/src/components/list/ArticleList.vue b/src/components/list/ArticleList.vue
index a4491444..8591efa9 100644
--- 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>
diff --git a/src/components/list/BaseList.vue b/src/components/list/BaseList.vue
index 85c6e2de..b3b86186 100644
--- 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
 }
 
diff --git a/src/pages/article/PracticeArticles.vue b/src/pages/article/PracticeArticles.vue
index 7de7e146..1b062627 100644
--- 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

From 76e5e7ba68c4f0759b7b5bcd9134a8190e8aaf12 Mon Sep 17 00:00:00 2001
From: Zyronon <zyronon@163.com>
Date: Tue, 18 Nov 2025 00:09:25 +0800
Subject: [PATCH 02/14] save

---
 public/migrate.html     | 180 ++++++++++++++++++++++++----------
 public/static-home.html | 208 +++++++++++++++++++++-------------------
 src/App.vue             | 206 ++++++++++++++++++++++++++++++++++-----
 3 files changed, 426 insertions(+), 168 deletions(-)

diff --git a/public/migrate.html b/public/migrate.html
index 0db735d0..1e896896 100644
--- a/public/migrate.html
+++ b/public/migrate.html
@@ -1,62 +1,146 @@
 <!DOCTYPE html>
-<html lang="en">
+<html lang="zh-CN">
 <head>
-    <meta charset="UTF-8">
-    <title>Migrate Data</title>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>TypeWords 数据迁移</title>
+    <style>
+        body { font-family: sans-serif; padding: 20px; }
+        button { padding: 10px 20px; font-size: 16px; }
+        pre { background: #f7f7f7; padding: 10px; border-radius: 4px; }
+    </style>
 </head>
 <body>
-<script>
-  async function readIndexedDB() {
-    return new Promise((resolve, reject) => {
-      const request = indexedDB.open('keyval-store', 1); // 你的数据库名
-      request.onsuccess = function (event) {
-        const db = event.target.result;
-        const keys = ['typing-word-dict', 'typing-word-setting', 'typing-word-files','type-words-app-version'];
-        const tx = db.transaction(keys, 'readonly');
-        const result = {};
+<h2>TypeWords 数据迁移（旧域名）</h2>
+<p>等待新域名发送迁移指令 ...</p>
+<pre id="log"></pre>
 
-        let count = 0;
-        keys.forEach((storeName) => {
-          const store = tx.objectStore(storeName);
-          const allRequest = store.getAll();
-          allRequest.onsuccess = function (e) {
-            result[storeName] = e.target.result;
-            count++;
-            if (count === keys.length) {
-              resolve(result);
-            }
-          };
-          allRequest.onerror = function (e) {
-            result[storeName] = null;
-            count++;
-            if (count === keys.length) resolve(result);
-          };
+<script>
+  function log(msg) {
+    console.log(msg);
+    document.getElementById('log').textContent += msg + "\n";
+  }
+
+  // --- localStorage 读取 ---
+  function readLocalStorageKeys(keys) {
+    const out = {};
+    keys.forEach(k => { out[k] = localStorage.getItem(k); });
+    return out;
+  }
+
+  // --- IndexedDB（兼容 idb-keyval）读取 ---
+  function readIndexedDBCompatible(dbName, keys = [
+    'type-words-app-version',
+    'typing-word-dict',
+    'typing-word-setting',
+    'typing-word-files'
+  ]) {
+    return new Promise((resolve) => {
+      const openReq = indexedDB.open(dbName);
+
+      openReq.onerror = tryOpenKeyvalDefault;
+
+      openReq.onsuccess = function () {
+        const db = openReq.result;
+        const stores = Array.from(db.objectStoreNames);
+
+        if (stores.length === 0) {
+          db.close();
+          tryOpenKeyvalDefault();
+          return;
+        }
+
+        if (stores.length === 1 && stores[0] === 'keyval') {
+          readFromKeyvalDB(db).then(result => {
+            db.close(); resolve(result);
+          });
+        } else {
+          readFromMultipleStores(db, stores).then(result => {
+            db.close(); resolve(result);
+          });
+        }
+      };
+
+      function tryOpenKeyvalDefault() {
+        const req = indexedDB.open('keyval');
+        req.onerror = () => resolve({ indexedDB: {}, reason: 'no-db' });
+        req.onsuccess = function () {
+          const db2 = req.result;
+          readFromKeyvalDB(db2).then(result => {
+            db2.close(); resolve(result);
+          });
+        };
+      }
+
+      function readFromKeyvalDB(db) {
+        return new Promise((res) => {
+          const tx = db.transaction('keyval', 'readonly');
+          const store = tx.objectStore('keyval');
+
+          const out = {};
+          let finished = 0;
+          keys.forEach(k => {
+            const r = store.get(k);
+            r.onsuccess = () => {
+              out[k] = r.result ?? null;
+              if (++finished === keys.length) res({ indexedDB: out });
+            };
+            r.onerror = () => {
+              out[k] = null;
+              if (++finished === keys.length) res({ indexedDB: out });
+            };
+          });
         });
-      };
-      request.onerror = function (e) {
-        resolve({});
-      };
+      }
+
+      function readFromMultipleStores(db, stores) {
+        return new Promise(res => {
+          const result = {};
+          let count = 0;
+          stores.forEach(storeName => {
+            try {
+              const tx = db.transaction(storeName, 'readonly');
+              const store = tx.objectStore(storeName);
+              const req = store.getAll();
+
+              req.onsuccess = () => {
+                result[storeName] = req.result;
+                if (++count === stores.length) res({ indexedDB: result });
+              };
+              req.onerror = () => {
+                result[storeName] = [];
+                if (++count === stores.length) res({ indexedDB: result });
+              };
+            } catch {
+              result[storeName] = [];
+              if (++count === stores.length) res({ indexedDB: result });
+            }
+          });
+        });
+      }
     });
   }
-  // 监听 postMessage
-  window.addEventListener('message', async (e) => {
-    if (e.data && e.data.type === 'requestData') {
-      const local = {};
-      ['PracticeSaveWord', 'PracticeSaveArticle'].forEach(key => {
-        local[key] = localStorage.getItem(key) || null;
-      });
 
-      const indexed = await readIndexedDB();
+  async function readAllStorageForMigration() {
+    const local = readLocalStorageKeys(['PracticeSaveWord', 'PracticeSaveArticle']);
+    const indexed = await readIndexedDBCompatible('keyval-store');
+    return { localStorage: local, indexedDB: indexed.indexedDB ?? {} };
+  }
 
-      // 回复新域名
-      e.source.postMessage({
-        type: 'responseData',
-        localStorageData: local,
-        indexedDBData: indexed
-      }, e.origin);
+  // =====================
+  // 🔥 自动监听迁移指令
+  // =====================
+  window.addEventListener('message', async (event) => {
+    if (event.data?.type === 'REQUEST_MIGRATION_DATA') {
+      log('收到迁移指令，开始读取本地数据...');
+      const data = await readAllStorageForMigration();
+      log('读取完成，开始发送数据到新域名');
+
+      event.source.postMessage({ type: 'MIGRATE_DATA', payload: data }, event.origin);
+
+      log('已发送迁移数据');
     }
   });
-
 </script>
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/public/static-home.html b/public/static-home.html
index fe9f2f0f..fe6bd0d4 100644
--- a/public/static-home.html
+++ b/public/static-home.html
@@ -326,111 +326,125 @@
     </script>
 
     <script>
-      function migrateFromOldDomain() {
+      // 旧域名
+      const OLD_ORIGIN = "https://2study.top";
+
+      // 需要迁移的 IndexedDB store 名称
+      const IDB_STORE_NAMES = [
+        "type-words-app-version",
+        "typing-word-dict",
+        "typing-word-setting",
+        "typing-word-files",
+      ];
+
+      // 需要迁移的 localStorage key
+      const LS_KEYS = [
+        "PracticeSaveWord",
+        "PracticeSaveArticle"
+      ];
+      let key = 'keyval-store'
+
+      // 打开或创建新的 IndexedDB
+      function openIndexedDB() {
         return new Promise((resolve, reject) => {
-          const OLD_ORIGIN = 'https://2study.top';
-          const iframe = document.createElement('iframe');
-          iframe.style.display = 'none';
-          iframe.src = OLD_ORIGIN + '/migrate.html';
+          const request = indexedDB.open(key, 1);
 
-          // 超时保护
-          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]);
+          request.onupgradeneeded = (event) => {
+            const db = event.target.result;
+            IDB_STORE_NAMES.forEach((storeName) => {
+              if (!db.objectStoreNames.contains(storeName)) {
+                db.createObjectStore(storeName);
               }
-
-              // 写 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});
-                  }
-                });
-              };
-              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);
-                    });
-                  }
-                }
-              };
-              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);
+          request.onsuccess = () => resolve(request.result);
+          request.onerror = () => reject(request.error);
         });
       }
 
-      // // 使用示例
-      // migrateFromOldDomain().then(() => {
-      //   console.log('迁移成功');
-      // }).catch(err => {
-      //   console.error('迁移失败', err);
-      // });
+      // 写入数据到 IndexedDB
+      async function writeToIndexedDB(data) {
+        const db = await openIndexedDB();
+
+        return new Promise((resolve, reject) => {
+          const tx = db.transaction(IDB_STORE_NAMES, "readwrite");
+
+          for (const storeName of IDB_STORE_NAMES) {
+            const store = tx.objectStore(storeName);
+            const value = data.indexedDB[storeName];
+            if (value !== undefined) {
+              store.put(value, "value");
+            }
+          }
+
+          tx.oncomplete = () => resolve();
+          tx.onerror = () => reject(tx.error);
+        });
+      }
+
+      // 写入 LocalStorage
+      function writeToLocalStorage(data) {
+        for (const key of LS_KEYS) {
+          if (data.localStorage[key] !== undefined) {
+            localStorage.setItem(key, data.localStorage[key]);
+          }
+        }
+      }
+
+      // ---- 主逻辑 ----
+
+      async function migrateFromOldSite() {
+        return new Promise((resolve) => {
+          // 创建隐藏 iframe
+          const iframe = document.createElement("iframe");
+          iframe.style.display = "none";
+          iframe.src = `${OLD_ORIGIN}/migrate.html`;
+          document.body.appendChild(iframe);
+
+          // 接收旧域名的数据
+          window.addEventListener("message", async (event) => {
+            if (event.data.type !== "MIGRATE_RESULT") return;
+            const payload = event.data.payload;
+            // 写入 LocalStorage
+            writeToLocalStorage(payload);
+            // 写入 IndexedDB
+            await writeToIndexedDB(payload);
+            // 清理 iframe
+            iframe.remove();
+
+            resolve(true);
+          });
+
+          iframe.onload = () => {
+            // iframe 加载完成，发送命令
+            iframe.contentWindow.postMessage(
+              {type: "MIGRATE_REQUEST"},
+              OLD_ORIGIN
+            );
+          };
+        });
+      }
+
+      // 自动启动迁移（只执行一次）
+      (async () => {
+        // 避免重复迁移
+        if (localStorage.getItem("__migrated_from_2study_top__")) {
+          console.log("数据已迁移过");
+          return;
+        }
+
+        console.log("开始从旧域名迁移数据…");
+
+        try {
+          await migrateFromOldSite();
+          localStorage.setItem("__migrated_from_2study_top__", "1");
+          console.log("迁移完成");
+        } catch (e) {
+          console.error("迁移失败", e);
+        }
+      })();
+
 
       if (location.href === 'https://typewords.cc/') {
         document.onload = function () {
diff --git a/src/App.vue b/src/App.vue
index c6325637..8f22d5cb 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -17,12 +17,12 @@ const store = useBaseStore()
 const runtimeStore = useRuntimeStore()
 const settingStore = useSettingStore()
 const userStore = useUserStore()
-const { setTheme } = useTheme()
+const {setTheme} = useTheme()
 
 let lastAudioFileIdList = []
 watch(store.$state, (n: BaseState) => {
   let data = shakeCommonDict(n)
-  set(SAVE_DICT_KEY.key, JSON.stringify({ val: data, version: SAVE_DICT_KEY.version }))
+  set(SAVE_DICT_KEY.key, JSON.stringify({val: data, version: SAVE_DICT_KEY.version}))
 
   //筛选自定义和收藏
   let bookList = data.article.bookList.filter(v => v.custom || [DictId.articleCollect].includes(v.id))
@@ -51,11 +51,11 @@ watch(store.$state, (n: BaseState) => {
 })
 
 watch(() => settingStore.$state, (n) => {
-  set(SAVE_SETTING_KEY.key, JSON.stringify({ val: n, version: SAVE_SETTING_KEY.version }))
+  set(SAVE_SETTING_KEY.key, JSON.stringify({val: n, version: SAVE_SETTING_KEY.version}))
   if (AppEnv.CAN_REQUEST) {
     syncSetting(null, settingStore.$state)
   }
-}, { deep: true })
+}, {deep: true})
 
 async function init() {
   await userStore.init()
@@ -66,37 +66,197 @@ async function init() {
   setTheme(settingStore.theme)
 
   if (settingStore.first) {
-    set(APP_VERSION.key,APP_VERSION.version)
-  }else {
+    set(APP_VERSION.key, APP_VERSION.version)
+  } else {
     get(APP_VERSION.key).then(r => {
       runtimeStore.isNew = r ? (APP_VERSION.version > Number(r)) : true
     })
   }
-  window.umami?.track('host', { host: window.location.host })
+  window.umami?.track('host', {host: window.location.host})
 }
 
 onMounted(init)
 
+onMounted(() => {
+  let key = 'keyval-store'
+
+  // keys: 你想读取的 idb key 列表
+  async function readIndexedDBCompatible(dbName = 'type-words', keys = [
+    'type-words-app-version',
+    'typing-word-dict',
+    'typing-word-setting',
+    'typing-word-files'
+  ]) {
+    // 尝试打开数据库；如果不存在则会触发 onerror 或返回空
+    return new Promise((resolve, reject) => {
+      const openReq = indexedDB.open(dbName);
+
+      openReq.onerror = function () {
+        // 如果按 dbName 打不开，再尝试 idb-keyval 默认 db 名：'keyval'
+        tryOpenKeyvalDefault();
+      };
+
+      openReq.onsuccess = function () {
+        const db = openReq.result;
+        // 列出所有 objectStoreNames
+        const stores = Array.from(db.objectStoreNames);
+        if (stores.length === 0) {
+          db.close();
+          // 没有 store，尝试 idb-keyval 默认 db
+          tryOpenKeyvalDefault();
+          return;
+        }
+
+        // 如果只有 keyval（idb-keyval 常见情况），直接按 key 获取
+        if (stores.length === 1 && stores[0] === 'keyval') {
+          readFromKeyvalDB(db, keys).then(result => {
+            db.close();
+            resolve(result);
+          }).catch(err => {
+            db.close();
+            reject(err);
+          });
+        } else {
+          // 否则尝试按每个 store 名读取全部（兼容之前代码）
+          readFromMultipleStores(db, stores).then(result => {
+            db.close();
+            resolve(result);
+          }).catch(err => {
+            db.close();
+            reject(err);
+          });
+        }
+      };
+
+      function tryOpenKeyvalDefault() {
+        const req2 = indexedDB.open('keyval');
+        req2.onerror = function () {
+          // 两种尝试都失败，返回空结果而不是抛错（容错）
+          resolve({indexedDB: {}, reason: 'no-db'});
+        };
+        req2.onsuccess = function () {
+          const db2 = req2.result;
+          readFromKeyvalDB(db2, keys).then(result => {
+            db2.close();
+            resolve(result);
+          }).catch(err => {
+            db2.close();
+            reject(err);
+          });
+        };
+      }
+
+      function readFromKeyvalDB(db, keysToRead) {
+        return new Promise((res, rej) => {
+          const tx = db.transaction('keyval', 'readonly');
+          const store = tx.objectStore('keyval');
+          const out = {};
+          let done = 0;
+
+          keysToRead.forEach(k => {
+            const r = store.get(k);
+            r.onsuccess = function (e) {
+              out[k] = e.target.result === undefined ? null : e.target.result;
+              done++;
+              if (done === keysToRead.length) res({indexedDB: out});
+            };
+            r.onerror = function (e) {
+              out[k] = null;
+              done++;
+              if (done === keysToRead.length) res({indexedDB: out});
+            };
+          });
+
+          // 如果 keysToRead 为空，直接返回空对象
+          if (keysToRead.length === 0) res({indexedDB: {}});
+        });
+      }
+
+      function readFromMultipleStores(db, stores) {
+        return new Promise((res, rej) => {
+          const result = {};
+          let idx = 0;
+          stores.forEach(storeName => {
+            try {
+              const tx = db.transaction(storeName, 'readonly');
+              const store = tx.objectStore(storeName);
+              const getAllReq = store.getAll();
+              getAllReq.onsuccess = function (e) {
+                result[storeName] = e.target.result;
+                idx++;
+                if (idx === stores.length) res({indexedDB: result});
+              };
+              getAllReq.onerror = function () {
+                result[storeName] = [];
+                idx++;
+                if (idx === stores.length) res({indexedDB: result});
+              };
+            } catch (err) {
+              // 可能 store 不存在或其它问题
+              result[storeName] = [];
+              idx++;
+              if (idx === stores.length) res({indexedDB: result});
+            }
+          });
+          if (stores.length === 0) res({indexedDB: {}});
+        });
+      }
+    });
+  }
+
+// 读取 localStorage 的指定 keys
+  function readLocalStorageKeys(keys = ['PracticeSaveWord', 'PracticeSaveArticle']) {
+    const out = {};
+    keys.forEach(k => {
+      out[k] = localStorage.getItem(k);
+    });
+    return out;
+  }
+
+// 汇总读取：localStorage + IndexedDB（兼容 idb-keyval）
+  async function readAllStorageForMigration() {
+    const local = readLocalStorageKeys(['PracticeSaveWord', 'PracticeSaveArticle']);
+    // 这里 dbName 传 'type-words'（你之前创建的）或也可以尝试 'keyval'，函数内部会降级尝试
+    const indexed = await readIndexedDBCompatible(key, [
+      'type-words-app-version',
+      'typing-word-dict',
+      'typing-word-setting',
+      'typing-word-files'
+    ]);
+    return {
+      localStorage: local,
+      indexedDB: indexed.indexedDB || {}
+    };
+  }
+
+// 使用示例（在老域名 2study.top 的控制台执行）：
+//   readAllStorageForMigration().then(result => {
+//     console.log('读取到的数据：', result);
+//   }).catch(err => {
+//     console.error('读取失败：', err);
+//   });
+})
+
 // let transitionName = $ref('go')
 // const route = useRoute()
 // watch(() => route.path, (to, from) => {
 //   return transitionName = ''
-  // console.log('watch', to, from)
-  // //footer下面的5个按钮，对跳不要用动画
-  // let noAnimation = [
-  //   '/pc/practice',
-  //   '/pc/dict',
-  //   '/mobile',
-  //   '/'
-  // ]
-  // if (noAnimation.indexOf(from) !== -1 && noAnimation.indexOf(to) !== -1) {
-  //   return transitionName = ''
-  // }
-  //
-  // const toDepth = routes.findIndex(v => v.path === to)
-  // const fromDepth = routes.findIndex(v => v.path === from)
-  // transitionName = toDepth > fromDepth ? 'go' : 'back'
-  // console.log('transitionName', transitionName, toDepth, fromDepth)
+// console.log('watch', to, from)
+// //footer下面的5个按钮，对跳不要用动画
+// let noAnimation = [
+//   '/pc/practice',
+//   '/pc/dict',
+//   '/mobile',
+//   '/'
+// ]
+// if (noAnimation.indexOf(from) !== -1 && noAnimation.indexOf(to) !== -1) {
+//   return transitionName = ''
+// }
+//
+// const toDepth = routes.findIndex(v => v.path === to)
+// const fromDepth = routes.findIndex(v => v.path === from)
+// transitionName = toDepth > fromDepth ? 'go' : 'back'
+// console.log('transitionName', transitionName, toDepth, fromDepth)
 // })
 </script>
 

From b4cf3b3c623247a190009106693c62e20b231e89 Mon Sep 17 00:00:00 2001
From: Zyronon <zyronon@163.com>
Date: Tue, 18 Nov 2025 00:49:56 +0800
Subject: [PATCH 03/14] save

---
 public/migrate.html     | 115 +++++++++++++++++++++++++++-------------
 public/static-home.html |  43 +++++++--------
 src/App.vue             |  24 +++++++++
 3 files changed, 120 insertions(+), 62 deletions(-)

diff --git a/public/migrate.html b/public/migrate.html
index 1e896896..0b746463 100644
--- a/public/migrate.html
+++ b/public/migrate.html
@@ -1,13 +1,25 @@
 <!DOCTYPE html>
 <html lang="zh-CN">
 <head>
-    <meta charset="UTF-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <meta charset="UTF-8"/>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
     <title>TypeWords 数据迁移</title>
     <style>
-        body { font-family: sans-serif; padding: 20px; }
-        button { padding: 10px 20px; font-size: 16px; }
-        pre { background: #f7f7f7; padding: 10px; border-radius: 4px; }
+        body {
+            font-family: sans-serif;
+            padding: 20px;
+        }
+
+        button {
+            padding: 10px 20px;
+            font-size: 16px;
+        }
+
+        pre {
+            background: #f7f7f7;
+            padding: 10px;
+            border-radius: 4px;
+        }
     </style>
 </head>
 <body>
@@ -21,10 +33,40 @@
     document.getElementById('log').textContent += msg + "\n";
   }
 
+  let dbReadyPromise = null;
+  let name = 'keyval-store';
+
+  function openDB(dbName, keys) {
+    if (dbReadyPromise) return dbReadyPromise;
+
+    dbReadyPromise = new Promise((resolve, reject) => {
+      const request = indexedDB.open(dbName, 1);
+
+      request.onupgradeneeded = (event) => {
+        const db = event.target.result;
+
+        keys.forEach((name) => {
+          if (!db.objectStoreNames.contains(name)) {
+            db.createObjectStore(name);
+          }
+        });
+      };
+
+      request.onsuccess = () => resolve(request.result);
+      request.onerror = () => reject(request.error);
+    });
+
+    return dbReadyPromise;
+  }
+
+  openDB(name)
+
   // --- localStorage 读取 ---
   function readLocalStorageKeys(keys) {
     const out = {};
-    keys.forEach(k => { out[k] = localStorage.getItem(k); });
+    keys.forEach(k => {
+      out[k] = localStorage.getItem(k);
+    });
     return out;
   }
 
@@ -35,39 +77,36 @@
     'typing-word-setting',
     'typing-word-files'
   ]) {
-    return new Promise((resolve) => {
-      const openReq = indexedDB.open(dbName);
+    return new Promise(async (resolve) => {
+      const db = await openDB(dbName, keys);
+      const stores = Array.from(db.objectStoreNames);
 
-      openReq.onerror = tryOpenKeyvalDefault;
+      if (stores.length === 0) {
+        db.close();
+        tryOpenKeyvalDefault();
+        return;
+      }
 
-      openReq.onsuccess = function () {
-        const db = openReq.result;
-        const stores = Array.from(db.objectStoreNames);
-
-        if (stores.length === 0) {
+      if (stores.length === 1 && stores[0] === 'keyval') {
+        readFromKeyvalDB(db).then(result => {
           db.close();
-          tryOpenKeyvalDefault();
-          return;
-        }
-
-        if (stores.length === 1 && stores[0] === 'keyval') {
-          readFromKeyvalDB(db).then(result => {
-            db.close(); resolve(result);
-          });
-        } else {
-          readFromMultipleStores(db, stores).then(result => {
-            db.close(); resolve(result);
-          });
-        }
-      };
+          resolve(result);
+        });
+      } else {
+        readFromMultipleStores(db, stores).then(result => {
+          db.close();
+          resolve(result);
+        });
+      }
 
       function tryOpenKeyvalDefault() {
         const req = indexedDB.open('keyval');
-        req.onerror = () => resolve({ indexedDB: {}, reason: 'no-db' });
+        req.onerror = () => resolve({indexedDB: {}, reason: 'no-db'});
         req.onsuccess = function () {
           const db2 = req.result;
           readFromKeyvalDB(db2).then(result => {
-            db2.close(); resolve(result);
+            db2.close();
+            resolve(result);
           });
         };
       }
@@ -83,11 +122,11 @@
             const r = store.get(k);
             r.onsuccess = () => {
               out[k] = r.result ?? null;
-              if (++finished === keys.length) res({ indexedDB: out });
+              if (++finished === keys.length) res({indexedDB: out});
             };
             r.onerror = () => {
               out[k] = null;
-              if (++finished === keys.length) res({ indexedDB: out });
+              if (++finished === keys.length) res({indexedDB: out});
             };
           });
         });
@@ -105,15 +144,15 @@
 
               req.onsuccess = () => {
                 result[storeName] = req.result;
-                if (++count === stores.length) res({ indexedDB: result });
+                if (++count === stores.length) res({indexedDB: result});
               };
               req.onerror = () => {
                 result[storeName] = [];
-                if (++count === stores.length) res({ indexedDB: result });
+                if (++count === stores.length) res({indexedDB: result});
               };
             } catch {
               result[storeName] = [];
-              if (++count === stores.length) res({ indexedDB: result });
+              if (++count === stores.length) res({indexedDB: result});
             }
           });
         });
@@ -123,8 +162,8 @@
 
   async function readAllStorageForMigration() {
     const local = readLocalStorageKeys(['PracticeSaveWord', 'PracticeSaveArticle']);
-    const indexed = await readIndexedDBCompatible('keyval-store');
-    return { localStorage: local, indexedDB: indexed.indexedDB ?? {} };
+    const indexed = await readIndexedDBCompatible(name);
+    return {localStorage: local, indexedDB: indexed.indexedDB ?? {}};
   }
 
   // =====================
@@ -136,7 +175,7 @@
       const data = await readAllStorageForMigration();
       log('读取完成，开始发送数据到新域名');
 
-      event.source.postMessage({ type: 'MIGRATE_DATA', payload: data }, event.origin);
+      event.source.postMessage({type: 'MIGRATE_DATA', payload: data}, event.origin);
 
       log('已发送迁移数据');
     }
diff --git a/public/static-home.html b/public/static-home.html
index fe6bd0d4..38c85a20 100644
--- a/public/static-home.html
+++ b/public/static-home.html
@@ -426,32 +426,27 @@
         });
       }
 
-      // 自动启动迁移（只执行一次）
-      (async () => {
-        // 避免重复迁移
-        if (localStorage.getItem("__migrated_from_2study_top__")) {
-          console.log("数据已迁移过");
-          return;
-        }
-
-        console.log("开始从旧域名迁移数据…");
-
-        try {
-          await migrateFromOldSite();
-          localStorage.setItem("__migrated_from_2study_top__", "1");
-          console.log("迁移完成");
-        } catch (e) {
-          console.error("迁移失败", e);
-        }
-      })();
-
 
       if (location.href === 'https://typewords.cc/') {
-        document.onload = function () {
-          migrateFromOldDomain().then(() => {
-            console.log('数据迁移完成！');
-          });
-        }
+        window.addEventListener("DOMContentLoaded", () => {
+          (async () => {
+            // 避免重复迁移
+            if (localStorage.getItem("__migrated_from_2study_top__")) {
+              console.log("数据已迁移过");
+              return;
+            }
+
+            console.log("开始从旧域名迁移数据…");
+
+            try {
+              await migrateFromOldSite();
+              localStorage.setItem("__migrated_from_2study_top__", "1");
+              console.log("迁移完成");
+            } catch (e) {
+              console.error("迁移失败", e);
+            }
+          })();
+        });
       }
     </script>
 </head>
diff --git a/src/App.vue b/src/App.vue
index 8f22d5cb..0198f88d 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -229,6 +229,29 @@ onMounted(() => {
     };
   }
 
+
+  // if (!OLD_ORIGIN){
+  //   var OLD_ORIGIN = "https://2study.top";
+  // }
+  // // 创建隐藏 iframe
+  // const iframe = document.createElement("iframe");
+  // iframe.style.display = "none";
+  // iframe.src = `${OLD_ORIGIN}/migrate.html`;
+  // document.body.appendChild(iframe);
+  // // 接收旧域名的数据
+  // window.addEventListener("message", async (event) => {
+  //   if (event.data.type !== "MIGRATE_RESULT") return;
+  //   const payload = event.data.payload;
+  //   console.log('payload', payload)
+  // });
+  //
+  // iframe.onload = function () {
+  //   setTimeout(()=>{
+  //     iframe.contentWindow.postMessage({type: "REQUEST_MIGRATION_DATA"}, OLD_ORIGIN);
+  //   },3000)
+  // };
+
+
 // 使用示例（在老域名 2study.top 的控制台执行）：
 //   readAllStorageForMigration().then(result => {
 //     console.log('读取到的数据：', result);
@@ -237,6 +260,7 @@ onMounted(() => {
 //   });
 })
 
+
 // let transitionName = $ref('go')
 // const route = useRoute()
 // watch(() => route.path, (to, from) => {

From d9340f8e0498bb7695531788af07aad92938dcdf Mon Sep 17 00:00:00 2001
From: Zyronon <zyronon@163.com>
Date: Tue, 18 Nov 2025 00:56:50 +0800
Subject: [PATCH 04/14] save

---
 public/migrate.html     | 15 ++++++++-------
 public/static-home.html | 10 ++++------
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/public/migrate.html b/public/migrate.html
index 0b746463..094a26cc 100644
--- a/public/migrate.html
+++ b/public/migrate.html
@@ -35,6 +35,12 @@
 
   let dbReadyPromise = null;
   let name = 'keyval-store';
+  let keys = [
+    'type-words-app-version',
+    'typing-word-dict',
+    'typing-word-setting',
+    'typing-word-files'
+  ]
 
   function openDB(dbName, keys) {
     if (dbReadyPromise) return dbReadyPromise;
@@ -59,7 +65,7 @@
     return dbReadyPromise;
   }
 
-  openDB(name)
+  openDB(name, keys)
 
   // --- localStorage 读取 ---
   function readLocalStorageKeys(keys) {
@@ -71,12 +77,7 @@
   }
 
   // --- IndexedDB（兼容 idb-keyval）读取 ---
-  function readIndexedDBCompatible(dbName, keys = [
-    'type-words-app-version',
-    'typing-word-dict',
-    'typing-word-setting',
-    'typing-word-files'
-  ]) {
+  function readIndexedDBCompatible(dbName, keys) {
     return new Promise(async (resolve) => {
       const db = await openDB(dbName, keys);
       const stores = Array.from(db.objectStoreNames);
diff --git a/public/static-home.html b/public/static-home.html
index 38c85a20..22d7049d 100644
--- a/public/static-home.html
+++ b/public/static-home.html
@@ -416,12 +416,10 @@
             resolve(true);
           });
 
-          iframe.onload = () => {
-            // iframe 加载完成，发送命令
-            iframe.contentWindow.postMessage(
-              {type: "MIGRATE_REQUEST"},
-              OLD_ORIGIN
-            );
+          iframe.onload = function () {
+            setTimeout(()=>{
+              iframe.contentWindow.postMessage({type: "REQUEST_MIGRATION_DATA"}, OLD_ORIGIN);
+            },3000)
           };
         });
       }

From 202d0f827da5daa37d4ca23e39afed78d3a30706 Mon Sep 17 00:00:00 2001
From: Zyronon <zyronon@163.com>
Date: Tue, 18 Nov 2025 01:03:15 +0800
Subject: [PATCH 05/14] save

---
 public/migrate.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/migrate.html b/public/migrate.html
index 094a26cc..d155252e 100644
--- a/public/migrate.html
+++ b/public/migrate.html
@@ -163,7 +163,7 @@
 
   async function readAllStorageForMigration() {
     const local = readLocalStorageKeys(['PracticeSaveWord', 'PracticeSaveArticle']);
-    const indexed = await readIndexedDBCompatible(name);
+    const indexed = await readIndexedDBCompatible(name, keys);
     return {localStorage: local, indexedDB: indexed.indexedDB ?? {}};
   }
 

From 5fc0dbaa1d08910792e5bee320cbc4f2be70efe7 Mon Sep 17 00:00:00 2001
From: Zyronon <zyronon@163.com>
Date: Tue, 18 Nov 2025 01:35:27 +0800
Subject: [PATCH 06/14] save

---
 public/migrate.html     | 221 +++++++++++-----------------------------
 public/static-home.html | 155 ++++++++++++----------------
 src/App.vue             | 186 +--------------------------------
 3 files changed, 123 insertions(+), 439 deletions(-)

diff --git a/public/migrate.html b/public/migrate.html
index d155252e..1d99d837 100644
--- a/public/migrate.html
+++ b/public/migrate.html
@@ -1,30 +1,11 @@
 <!DOCTYPE html>
-<html lang="zh-CN">
+<html lang="en">
 <head>
-    <meta charset="UTF-8"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-    <title>TypeWords 数据迁移</title>
-    <style>
-        body {
-            font-family: sans-serif;
-            padding: 20px;
-        }
-
-        button {
-            padding: 10px 20px;
-            font-size: 16px;
-        }
-
-        pre {
-            background: #f7f7f7;
-            padding: 10px;
-            border-radius: 4px;
-        }
-    </style>
+    <meta charset="UTF-8">
+    <title>TypeWords 数据迁移（旧域名）</title>
 </head>
 <body>
-<h2>TypeWords 数据迁移（旧域名）</h2>
-<p>等待新域名发送迁移指令 ...</p>
+<h2>等待新域名发送迁移指令...</h2>
 <pre id="log"></pre>
 
 <script>
@@ -33,154 +14,66 @@
     document.getElementById('log').textContent += msg + "\n";
   }
 
-  let dbReadyPromise = null;
-  let name = 'keyval-store';
-  let keys = [
-    'type-words-app-version',
-    'typing-word-dict',
-    'typing-word-setting',
-    'typing-word-files'
-  ]
-
-  function openDB(dbName, keys) {
-    if (dbReadyPromise) return dbReadyPromise;
-
-    dbReadyPromise = new Promise((resolve, reject) => {
-      const request = indexedDB.open(dbName, 1);
-
-      request.onupgradeneeded = (event) => {
-        const db = event.target.result;
-
-        keys.forEach((name) => {
-          if (!db.objectStoreNames.contains(name)) {
-            db.createObjectStore(name);
-          }
-        });
+  // 1️⃣ 先动态加载 idb-keyval
+  function loadIDBKeyval() {
+    return new Promise((resolve) => {
+      let script = document.createElement("script");
+      script.src = 'https://cdn.jsdelivr.net/npm/idb-keyval@6.2.2/dist/umd.js';
+      script.onload = function () {
+        log("idb-keyval 加载完成");
+        resolve(window.idbKeyval);
       };
-
-      request.onsuccess = () => resolve(request.result);
-      request.onerror = () => reject(request.error);
-    });
-
-    return dbReadyPromise;
-  }
-
-  openDB(name, keys)
-
-  // --- localStorage 读取 ---
-  function readLocalStorageKeys(keys) {
-    const out = {};
-    keys.forEach(k => {
-      out[k] = localStorage.getItem(k);
-    });
-    return out;
-  }
-
-  // --- IndexedDB（兼容 idb-keyval）读取 ---
-  function readIndexedDBCompatible(dbName, keys) {
-    return new Promise(async (resolve) => {
-      const db = await openDB(dbName, keys);
-      const stores = Array.from(db.objectStoreNames);
-
-      if (stores.length === 0) {
-        db.close();
-        tryOpenKeyvalDefault();
-        return;
-      }
-
-      if (stores.length === 1 && stores[0] === 'keyval') {
-        readFromKeyvalDB(db).then(result => {
-          db.close();
-          resolve(result);
-        });
-      } else {
-        readFromMultipleStores(db, stores).then(result => {
-          db.close();
-          resolve(result);
-        });
-      }
-
-      function tryOpenKeyvalDefault() {
-        const req = indexedDB.open('keyval');
-        req.onerror = () => resolve({indexedDB: {}, reason: 'no-db'});
-        req.onsuccess = function () {
-          const db2 = req.result;
-          readFromKeyvalDB(db2).then(result => {
-            db2.close();
-            resolve(result);
-          });
-        };
-      }
-
-      function readFromKeyvalDB(db) {
-        return new Promise((res) => {
-          const tx = db.transaction('keyval', 'readonly');
-          const store = tx.objectStore('keyval');
-
-          const out = {};
-          let finished = 0;
-          keys.forEach(k => {
-            const r = store.get(k);
-            r.onsuccess = () => {
-              out[k] = r.result ?? null;
-              if (++finished === keys.length) res({indexedDB: out});
-            };
-            r.onerror = () => {
-              out[k] = null;
-              if (++finished === keys.length) res({indexedDB: out});
-            };
-          });
-        });
-      }
-
-      function readFromMultipleStores(db, stores) {
-        return new Promise(res => {
-          const result = {};
-          let count = 0;
-          stores.forEach(storeName => {
-            try {
-              const tx = db.transaction(storeName, 'readonly');
-              const store = tx.objectStore(storeName);
-              const req = store.getAll();
-
-              req.onsuccess = () => {
-                result[storeName] = req.result;
-                if (++count === stores.length) res({indexedDB: result});
-              };
-              req.onerror = () => {
-                result[storeName] = [];
-                if (++count === stores.length) res({indexedDB: result});
-              };
-            } catch {
-              result[storeName] = [];
-              if (++count === stores.length) res({indexedDB: result});
-            }
-          });
-        });
-      }
+      document.head.appendChild(script);
     });
   }
 
-  async function readAllStorageForMigration() {
-    const local = readLocalStorageKeys(['PracticeSaveWord', 'PracticeSaveArticle']);
-    const indexed = await readIndexedDBCompatible(name, keys);
-    return {localStorage: local, indexedDB: indexed.indexedDB ?? {}};
-  }
+  // 2️⃣ 读取 IndexedDB
+  async function readAllStorageForMigration(db) {
+    // localStorage 数据
+    const localStorageData = {
+      PracticeSaveWord: localStorage.getItem('PracticeSaveWord'),
+      PracticeSaveArticle: localStorage.getItem('PracticeSaveArticle')
+    };
 
-  // =====================
-  // 🔥 自动监听迁移指令
-  // =====================
-  window.addEventListener('message', async (event) => {
-    if (event.data?.type === 'REQUEST_MIGRATION_DATA') {
-      log('收到迁移指令，开始读取本地数据...');
-      const data = await readAllStorageForMigration();
-      log('读取完成，开始发送数据到新域名');
+    // IndexedDB 数据，key 对应你的老项目
+    const keys = [
+      'type-words-app-version',
+      'typing-word-dict',
+      'typing-word-setting',
+      'typing-word-files'
+    ];
 
-      event.source.postMessage({type: 'MIGRATE_DATA', payload: data}, event.origin);
-
-      log('已发送迁移数据');
+    const indexedDBData = {};
+    for (let key of keys) {
+      indexedDBData[key] = await db.get(key);
     }
+
+    return {
+      localStorage: localStorageData,
+      indexedDB: indexedDBData
+    };
+  }
+
+  // 3️⃣ 接收新域名指令
+  window.addEventListener('message', async (event) => {
+    if (event.data?.type !== 'REQUEST_MIGRATION_DATA') return;
+
+    // 安全校验 origin，可选
+    // if (event.origin !== 'https://typewords.cc') return;
+
+    log("收到迁移指令，开始读取数据...");
+
+    const db = await loadIDBKeyval(); // 确保 idb-keyval 已经加载
+    const data = await readAllStorageForMigration(db);
+
+    log("读取完成，发送数据给新域名");
+    event.source.postMessage({
+      type: 'MIGRATION_RESULT',
+      payload: data
+    }, event.origin);
+
+    log("已发送迁移数据");
   });
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/public/static-home.html b/public/static-home.html
index 22d7049d..5d2e297e 100644
--- a/public/static-home.html
+++ b/public/static-home.html
@@ -326,122 +326,97 @@
     </script>
 
     <script>
-      // 旧域名
-      const OLD_ORIGIN = "https://2study.top";
+      // 旧域名地址
+      const OLD_ORIGIN = 'https://2study.top';
 
-      // 需要迁移的 IndexedDB store 名称
-      const IDB_STORE_NAMES = [
-        "type-words-app-version",
-        "typing-word-dict",
-        "typing-word-setting",
-        "typing-word-files",
+      // 需要迁移的 IndexedDB key
+      const IDB_KEYS = [
+        'type-words-app-version',
+        'typing-word-dict',
+        'typing-word-setting',
+        'typing-word-files'
       ];
 
       // 需要迁移的 localStorage key
       const LS_KEYS = [
-        "PracticeSaveWord",
-        "PracticeSaveArticle"
+        'PracticeSaveWord',
+        'PracticeSaveArticle'
       ];
-      let key = 'keyval-store'
 
-      // 打开或创建新的 IndexedDB
-      function openIndexedDB() {
-        return new Promise((resolve, reject) => {
-          const request = indexedDB.open(key, 1);
+      // 1️⃣ 动态加载 idb-keyval
+      function loadIDBKeyval() {
+        return new Promise((resolve) => {
+          if (window.idbKeyval) return resolve(window.idbKeyval);
 
-          request.onupgradeneeded = (event) => {
-            const db = event.target.result;
-            IDB_STORE_NAMES.forEach((storeName) => {
-              if (!db.objectStoreNames.contains(storeName)) {
-                db.createObjectStore(storeName);
+          const script = document.createElement('script');
+          script.src = 'https://cdn.jsdelivr.net/npm/idb-keyval@6.2.2/dist/umd.js';
+          script.onload = () => resolve(window.idbKeyval);
+          document.head.appendChild(script);
+        });
+      }
+
+      // 2️⃣ 创建 iframe 并发送迁移请求
+      async function migrateFromOldSite() {
+        return new Promise(async (resolve, reject) => {
+          const db = await loadIDBKeyval();
+
+          const iframe = document.createElement('iframe');
+          iframe.style.display = 'none';
+          iframe.src = `${OLD_ORIGIN}/migrate.html`;
+
+          // 安全接收旧域名返回的数据
+          function onMessage(event) {
+            if (event.data?.type !== 'MIGRATION_RESULT') return;
+
+            const payload = event.data.payload;
+
+            // 写入 localStorage
+            LS_KEYS.forEach(key => {
+              if (payload.localStorage[key] !== undefined) {
+                localStorage.setItem(key, payload.localStorage[key]);
               }
             });
-          };
 
-          request.onsuccess = () => resolve(request.result);
-          request.onerror = () => reject(request.error);
-        });
-      }
-
-      // 写入数据到 IndexedDB
-      async function writeToIndexedDB(data) {
-        const db = await openIndexedDB();
-
-        return new Promise((resolve, reject) => {
-          const tx = db.transaction(IDB_STORE_NAMES, "readwrite");
-
-          for (const storeName of IDB_STORE_NAMES) {
-            const store = tx.objectStore(storeName);
-            const value = data.indexedDB[storeName];
-            if (value !== undefined) {
-              store.put(value, "value");
-            }
-          }
-
-          tx.oncomplete = () => resolve();
-          tx.onerror = () => reject(tx.error);
-        });
-      }
-
-      // 写入 LocalStorage
-      function writeToLocalStorage(data) {
-        for (const key of LS_KEYS) {
-          if (data.localStorage[key] !== undefined) {
-            localStorage.setItem(key, data.localStorage[key]);
-          }
-        }
-      }
-
-      // ---- 主逻辑 ----
-
-      async function migrateFromOldSite() {
-        return new Promise((resolve) => {
-          // 创建隐藏 iframe
-          const iframe = document.createElement("iframe");
-          iframe.style.display = "none";
-          iframe.src = `${OLD_ORIGIN}/migrate.html`;
-          document.body.appendChild(iframe);
-
-          // 接收旧域名的数据
-          window.addEventListener("message", async (event) => {
-            if (event.data.type !== "MIGRATE_RESULT") return;
-            const payload = event.data.payload;
-            // 写入 LocalStorage
-            writeToLocalStorage(payload);
             // 写入 IndexedDB
-            await writeToIndexedDB(payload);
-            // 清理 iframe
-            iframe.remove();
+            (async () => {
+              for (let key of IDB_KEYS) {
+                if (payload.indexedDB[key] !== undefined) {
+                  await db.set(key, payload.indexedDB[key]);
+                }
+              }
 
-            resolve(true);
-          });
+              // 清理
+              window.removeEventListener('message', onMessage);
+              iframe.remove();
+              resolve(true);
+            })();
+          }
 
-          iframe.onload = function () {
-            setTimeout(()=>{
-              iframe.contentWindow.postMessage({type: "REQUEST_MIGRATION_DATA"}, OLD_ORIGIN);
-            },3000)
+          window.addEventListener('message', onMessage);
+
+          // 等 iframe 加载完成再发请求
+          iframe.onload = () => {
+            iframe.contentWindow.postMessage({type: 'REQUEST_MIGRATION_DATA'}, OLD_ORIGIN);
           };
+
+          document.body.appendChild(iframe);
         });
       }
 
-
       if (location.href === 'https://typewords.cc/') {
         window.addEventListener("DOMContentLoaded", () => {
+          // 3️⃣ 自动执行迁移（只执行一次）
           (async () => {
-            // 避免重复迁移
-            if (localStorage.getItem("__migrated_from_2study_top__")) {
-              console.log("数据已迁移过");
-              return;
-            }
+            if (localStorage.getItem('__migrated_from_2study_top__')) return;
 
-            console.log("开始从旧域名迁移数据…");
+            console.log('开始从旧域名迁移数据…');
 
             try {
               await migrateFromOldSite();
-              localStorage.setItem("__migrated_from_2study_top__", "1");
-              console.log("迁移完成");
+              localStorage.setItem('__migrated_from_2study_top__', '1');
+              console.log('迁移完成');
             } catch (e) {
-              console.error("迁移失败", e);
+              console.error('迁移失败', e);
             }
           })();
         });
diff --git a/src/App.vue b/src/App.vue
index 0198f88d..a6ebf175 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -4,7 +4,7 @@ import { BaseState, useBaseStore } from "@/stores/base.ts";
 import { useRuntimeStore } from "@/stores/runtime.ts";
 import { useSettingStore } from "@/stores/setting.ts";
 import useTheme from "@/hooks/theme.ts";
-import { shakeCommonDict } from "@/utils";
+import { loadJsLib, shakeCommonDict } from "@/utils";
 import { get, set } from 'idb-keyval'
 
 import { useRoute } from "vue-router";
@@ -77,190 +77,6 @@ async function init() {
 
 onMounted(init)
 
-onMounted(() => {
-  let key = 'keyval-store'
-
-  // keys: 你想读取的 idb key 列表
-  async function readIndexedDBCompatible(dbName = 'type-words', keys = [
-    'type-words-app-version',
-    'typing-word-dict',
-    'typing-word-setting',
-    'typing-word-files'
-  ]) {
-    // 尝试打开数据库；如果不存在则会触发 onerror 或返回空
-    return new Promise((resolve, reject) => {
-      const openReq = indexedDB.open(dbName);
-
-      openReq.onerror = function () {
-        // 如果按 dbName 打不开，再尝试 idb-keyval 默认 db 名：'keyval'
-        tryOpenKeyvalDefault();
-      };
-
-      openReq.onsuccess = function () {
-        const db = openReq.result;
-        // 列出所有 objectStoreNames
-        const stores = Array.from(db.objectStoreNames);
-        if (stores.length === 0) {
-          db.close();
-          // 没有 store，尝试 idb-keyval 默认 db
-          tryOpenKeyvalDefault();
-          return;
-        }
-
-        // 如果只有 keyval（idb-keyval 常见情况），直接按 key 获取
-        if (stores.length === 1 && stores[0] === 'keyval') {
-          readFromKeyvalDB(db, keys).then(result => {
-            db.close();
-            resolve(result);
-          }).catch(err => {
-            db.close();
-            reject(err);
-          });
-        } else {
-          // 否则尝试按每个 store 名读取全部（兼容之前代码）
-          readFromMultipleStores(db, stores).then(result => {
-            db.close();
-            resolve(result);
-          }).catch(err => {
-            db.close();
-            reject(err);
-          });
-        }
-      };
-
-      function tryOpenKeyvalDefault() {
-        const req2 = indexedDB.open('keyval');
-        req2.onerror = function () {
-          // 两种尝试都失败，返回空结果而不是抛错（容错）
-          resolve({indexedDB: {}, reason: 'no-db'});
-        };
-        req2.onsuccess = function () {
-          const db2 = req2.result;
-          readFromKeyvalDB(db2, keys).then(result => {
-            db2.close();
-            resolve(result);
-          }).catch(err => {
-            db2.close();
-            reject(err);
-          });
-        };
-      }
-
-      function readFromKeyvalDB(db, keysToRead) {
-        return new Promise((res, rej) => {
-          const tx = db.transaction('keyval', 'readonly');
-          const store = tx.objectStore('keyval');
-          const out = {};
-          let done = 0;
-
-          keysToRead.forEach(k => {
-            const r = store.get(k);
-            r.onsuccess = function (e) {
-              out[k] = e.target.result === undefined ? null : e.target.result;
-              done++;
-              if (done === keysToRead.length) res({indexedDB: out});
-            };
-            r.onerror = function (e) {
-              out[k] = null;
-              done++;
-              if (done === keysToRead.length) res({indexedDB: out});
-            };
-          });
-
-          // 如果 keysToRead 为空，直接返回空对象
-          if (keysToRead.length === 0) res({indexedDB: {}});
-        });
-      }
-
-      function readFromMultipleStores(db, stores) {
-        return new Promise((res, rej) => {
-          const result = {};
-          let idx = 0;
-          stores.forEach(storeName => {
-            try {
-              const tx = db.transaction(storeName, 'readonly');
-              const store = tx.objectStore(storeName);
-              const getAllReq = store.getAll();
-              getAllReq.onsuccess = function (e) {
-                result[storeName] = e.target.result;
-                idx++;
-                if (idx === stores.length) res({indexedDB: result});
-              };
-              getAllReq.onerror = function () {
-                result[storeName] = [];
-                idx++;
-                if (idx === stores.length) res({indexedDB: result});
-              };
-            } catch (err) {
-              // 可能 store 不存在或其它问题
-              result[storeName] = [];
-              idx++;
-              if (idx === stores.length) res({indexedDB: result});
-            }
-          });
-          if (stores.length === 0) res({indexedDB: {}});
-        });
-      }
-    });
-  }
-
-// 读取 localStorage 的指定 keys
-  function readLocalStorageKeys(keys = ['PracticeSaveWord', 'PracticeSaveArticle']) {
-    const out = {};
-    keys.forEach(k => {
-      out[k] = localStorage.getItem(k);
-    });
-    return out;
-  }
-
-// 汇总读取：localStorage + IndexedDB（兼容 idb-keyval）
-  async function readAllStorageForMigration() {
-    const local = readLocalStorageKeys(['PracticeSaveWord', 'PracticeSaveArticle']);
-    // 这里 dbName 传 'type-words'（你之前创建的）或也可以尝试 'keyval'，函数内部会降级尝试
-    const indexed = await readIndexedDBCompatible(key, [
-      'type-words-app-version',
-      'typing-word-dict',
-      'typing-word-setting',
-      'typing-word-files'
-    ]);
-    return {
-      localStorage: local,
-      indexedDB: indexed.indexedDB || {}
-    };
-  }
-
-
-  // if (!OLD_ORIGIN){
-  //   var OLD_ORIGIN = "https://2study.top";
-  // }
-  // // 创建隐藏 iframe
-  // const iframe = document.createElement("iframe");
-  // iframe.style.display = "none";
-  // iframe.src = `${OLD_ORIGIN}/migrate.html`;
-  // document.body.appendChild(iframe);
-  // // 接收旧域名的数据
-  // window.addEventListener("message", async (event) => {
-  //   if (event.data.type !== "MIGRATE_RESULT") return;
-  //   const payload = event.data.payload;
-  //   console.log('payload', payload)
-  // });
-  //
-  // iframe.onload = function () {
-  //   setTimeout(()=>{
-  //     iframe.contentWindow.postMessage({type: "REQUEST_MIGRATION_DATA"}, OLD_ORIGIN);
-  //   },3000)
-  // };
-
-
-// 使用示例（在老域名 2study.top 的控制台执行）：
-//   readAllStorageForMigration().then(result => {
-//     console.log('读取到的数据：', result);
-//   }).catch(err => {
-//     console.error('读取失败：', err);
-//   });
-})
-
-
 // let transitionName = $ref('go')
 // const route = useRoute()
 // watch(() => route.path, (to, from) => {

From 920ec425afd7bc9c1f6df895012747610a71aaa5 Mon Sep 17 00:00:00 2001
From: Zyronon <zyronon@163.com>
Date: Tue, 18 Nov 2025 01:45:15 +0800
Subject: [PATCH 07/14] save

---
 public/migrate.html     |  2 ++
 public/static-home.html | 14 ++++++++------
 src/App.vue             | 27 +++++++++++++++++++++++++++
 3 files changed, 37 insertions(+), 6 deletions(-)

diff --git a/public/migrate.html b/public/migrate.html
index 1d99d837..e7182d22 100644
--- a/public/migrate.html
+++ b/public/migrate.html
@@ -27,6 +27,8 @@
     });
   }
 
+  loadIDBKeyval(); // 确保 idb-keyval 已经加载
+
   // 2️⃣ 读取 IndexedDB
   async function readAllStorageForMigration(db) {
     // localStorage 数据
diff --git a/public/static-home.html b/public/static-home.html
index 5d2e297e..355ccdd5 100644
--- a/public/static-home.html
+++ b/public/static-home.html
@@ -327,10 +327,10 @@
 
     <script>
       // 旧域名地址
-      const OLD_ORIGIN = 'https://2study.top';
+      var OLD_ORIGIN = 'https://2study.top';
 
       // 需要迁移的 IndexedDB key
-      const IDB_KEYS = [
+      var IDB_KEYS = [
         'type-words-app-version',
         'typing-word-dict',
         'typing-word-setting',
@@ -338,7 +338,7 @@
       ];
 
       // 需要迁移的 localStorage key
-      const LS_KEYS = [
+      var LS_KEYS = [
         'PracticeSaveWord',
         'PracticeSaveArticle'
       ];
@@ -348,7 +348,7 @@
         return new Promise((resolve) => {
           if (window.idbKeyval) return resolve(window.idbKeyval);
 
-          const script = document.createElement('script');
+          var script = document.createElement('script');
           script.src = 'https://cdn.jsdelivr.net/npm/idb-keyval@6.2.2/dist/umd.js';
           script.onload = () => resolve(window.idbKeyval);
           document.head.appendChild(script);
@@ -367,8 +367,8 @@
           // 安全接收旧域名返回的数据
           function onMessage(event) {
             if (event.data?.type !== 'MIGRATION_RESULT') return;
-
             const payload = event.data.payload;
+            console.log('payload',payload)
 
             // 写入 localStorage
             LS_KEYS.forEach(key => {
@@ -396,7 +396,9 @@
 
           // 等 iframe 加载完成再发请求
           iframe.onload = () => {
-            iframe.contentWindow.postMessage({type: 'REQUEST_MIGRATION_DATA'}, OLD_ORIGIN);
+            setTimeout(()=>{
+              iframe.contentWindow.postMessage({type: 'REQUEST_MIGRATION_DATA'}, 'https://2study.top');
+            },3000)
           };
 
           document.body.appendChild(iframe);
diff --git a/src/App.vue b/src/App.vue
index a6ebf175..9d33fdbb 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -77,6 +77,33 @@ async function init() {
 
 onMounted(init)
 
+onMounted(()=>{
+  return
+  // const iframe = document.createElement('iframe');
+  // iframe.style.display = 'none';
+  // iframe.src = `https://2study.top/migrate.html`;
+  // function onMessage(event) {
+  //   if (event.data?.type !== 'MIGRATION_RESULT') return;
+  //
+  //   const payload = event.data.payload;
+  //   console.log('payload',payload)
+  // }
+  //
+  // window.addEventListener('message', onMessage);
+  // iframe.onload = () => {
+  //   setTimeout(()=>{
+  //     iframe.contentWindow.postMessage({type: 'REQUEST_MIGRATION_DATA'}, 'https://2study.top');
+  //   },3000)
+  // };
+  // document.body.appendChild(iframe);
+  //
+  // (async () => {
+  //   const db = await loadIDBKeyval(); // 确保 idb-keyval 已经加载
+  //   const data = await readAllStorageForMigration(db);
+  //   console.log('data',data)
+  // })()
+})
+
 // let transitionName = $ref('go')
 // const route = useRoute()
 // watch(() => route.path, (to, from) => {

From fadfec0fc293ae4bb9f242ef2185c96fa6c7f0c2 Mon Sep 17 00:00:00 2001
From: Zyronon <zyronon@163.com>
Date: Tue, 18 Nov 2025 11:44:01 +0800
Subject: [PATCH 08/14] save

---
 public/migrate.html     |  6 ++++++
 public/static-home.html | 38 ++++++++++++++++++++++----------------
 2 files changed, 28 insertions(+), 16 deletions(-)

diff --git a/public/migrate.html b/public/migrate.html
index e7182d22..67960858 100644
--- a/public/migrate.html
+++ b/public/migrate.html
@@ -75,7 +75,13 @@
     }, event.origin);
 
     log("已发送迁移数据");
+    // 自动关闭窗口（延迟 500ms）
+    setTimeout(() => {
+      window.close();
+    }, 500);
   });
+
+
 </script>
 </body>
 </html>
diff --git a/public/static-home.html b/public/static-home.html
index 355ccdd5..e0d29462 100644
--- a/public/static-home.html
+++ b/public/static-home.html
@@ -355,20 +355,22 @@
         });
       }
 
-      // 2️⃣ 创建 iframe 并发送迁移请求
+      // 创建迁移窗口并接收数据
       async function migrateFromOldSite() {
         return new Promise(async (resolve, reject) => {
           const db = await loadIDBKeyval();
 
-          const iframe = document.createElement('iframe');
-          iframe.style.display = 'none';
-          iframe.src = `${OLD_ORIGIN}/migrate.html`;
+          const migrateWin = window.open(`${OLD_ORIGIN}/migrate.html`, '_blank', 'width=400,height=400');
+
+          if (!migrateWin) return reject('弹窗被阻止，请允许弹窗');
 
-          // 安全接收旧域名返回的数据
           function onMessage(event) {
+            if (event.origin !== OLD_ORIGIN) return;
             if (event.data?.type !== 'MIGRATION_RESULT') return;
+
             const payload = event.data.payload;
-            console.log('payload',payload)
+
+            console.log('payload', payload);
 
             // 写入 localStorage
             LS_KEYS.forEach(key => {
@@ -385,26 +387,30 @@
                 }
               }
 
-              // 清理
               window.removeEventListener('message', onMessage);
-              iframe.remove();
               resolve(true);
             })();
           }
 
           window.addEventListener('message', onMessage);
 
-          // 等 iframe 加载完成再发请求
-          iframe.onload = () => {
-            setTimeout(()=>{
-              iframe.contentWindow.postMessage({type: 'REQUEST_MIGRATION_DATA'}, 'https://2study.top');
-            },3000)
-          };
-
-          document.body.appendChild(iframe);
+          // 等窗口加载完毕后发请求
+          const timer = setInterval(() => {
+            if (!migrateWin || migrateWin.closed) {
+              clearInterval(timer);
+              reject('迁移窗口已关闭');
+            } else {
+              try {
+                migrateWin.postMessage({type: 'REQUEST_MIGRATION_DATA'}, OLD_ORIGIN);
+              } catch (e) {
+                // 跨域安全错误忽略，等窗口完全加载后再试
+              }
+            }
+          }, 100);
         });
       }
 
+
       if (location.href === 'https://typewords.cc/') {
         window.addEventListener("DOMContentLoaded", () => {
           // 3️⃣ 自动执行迁移（只执行一次）

From 58a07821fda0db5315223e04a1b448474740d005 Mon Sep 17 00:00:00 2001
From: Zyronon <zyronon@163.com>
Date: Tue, 18 Nov 2025 13:05:58 +0800
Subject: [PATCH 09/14] save2

---
 public/static-home.html     | 106 ----------------------------------
 src/App.vue                 |  59 ++++++++-----------
 src/pages/MigrateDialog.vue | 111 ++++++++++++++++++++++++++++++++++++
 3 files changed, 134 insertions(+), 142 deletions(-)
 create mode 100644 src/pages/MigrateDialog.vue

diff --git a/public/static-home.html b/public/static-home.html
index e0d29462..096c5a1b 100644
--- a/public/static-home.html
+++ b/public/static-home.html
@@ -324,112 +324,6 @@
         toggleEl('#qqDialog', true)
       }
     </script>
-
-    <script>
-      // 旧域名地址
-      var OLD_ORIGIN = 'https://2study.top';
-
-      // 需要迁移的 IndexedDB key
-      var IDB_KEYS = [
-        'type-words-app-version',
-        'typing-word-dict',
-        'typing-word-setting',
-        'typing-word-files'
-      ];
-
-      // 需要迁移的 localStorage key
-      var LS_KEYS = [
-        'PracticeSaveWord',
-        'PracticeSaveArticle'
-      ];
-
-      // 1️⃣ 动态加载 idb-keyval
-      function loadIDBKeyval() {
-        return new Promise((resolve) => {
-          if (window.idbKeyval) return resolve(window.idbKeyval);
-
-          var script = document.createElement('script');
-          script.src = 'https://cdn.jsdelivr.net/npm/idb-keyval@6.2.2/dist/umd.js';
-          script.onload = () => resolve(window.idbKeyval);
-          document.head.appendChild(script);
-        });
-      }
-
-      // 创建迁移窗口并接收数据
-      async function migrateFromOldSite() {
-        return new Promise(async (resolve, reject) => {
-          const db = await loadIDBKeyval();
-
-          const migrateWin = window.open(`${OLD_ORIGIN}/migrate.html`, '_blank', 'width=400,height=400');
-
-          if (!migrateWin) return reject('弹窗被阻止，请允许弹窗');
-
-          function onMessage(event) {
-            if (event.origin !== OLD_ORIGIN) return;
-            if (event.data?.type !== 'MIGRATION_RESULT') return;
-
-            const payload = event.data.payload;
-
-            console.log('payload', payload);
-
-            // 写入 localStorage
-            LS_KEYS.forEach(key => {
-              if (payload.localStorage[key] !== undefined) {
-                localStorage.setItem(key, payload.localStorage[key]);
-              }
-            });
-
-            // 写入 IndexedDB
-            (async () => {
-              for (let key of IDB_KEYS) {
-                if (payload.indexedDB[key] !== undefined) {
-                  await db.set(key, payload.indexedDB[key]);
-                }
-              }
-
-              window.removeEventListener('message', onMessage);
-              resolve(true);
-            })();
-          }
-
-          window.addEventListener('message', onMessage);
-
-          // 等窗口加载完毕后发请求
-          const timer = setInterval(() => {
-            if (!migrateWin || migrateWin.closed) {
-              clearInterval(timer);
-              reject('迁移窗口已关闭');
-            } else {
-              try {
-                migrateWin.postMessage({type: 'REQUEST_MIGRATION_DATA'}, OLD_ORIGIN);
-              } catch (e) {
-                // 跨域安全错误忽略，等窗口完全加载后再试
-              }
-            }
-          }, 100);
-        });
-      }
-
-
-      if (location.href === 'https://typewords.cc/') {
-        window.addEventListener("DOMContentLoaded", () => {
-          // 3️⃣ 自动执行迁移（只执行一次）
-          (async () => {
-            if (localStorage.getItem('__migrated_from_2study_top__')) return;
-
-            console.log('开始从旧域名迁移数据…');
-
-            try {
-              await migrateFromOldSite();
-              localStorage.setItem('__migrated_from_2study_top__', '1');
-              console.log('迁移完成');
-            } catch (e) {
-              console.error('迁移失败', e);
-            }
-          })();
-        });
-      }
-    </script>
 </head>
 <body>
 <div class="wrapper">
diff --git a/src/App.vue b/src/App.vue
index 9d33fdbb..761479f2 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,17 +1,18 @@
 <script setup lang="ts">
-import { onMounted, watch } from "vue";
-import { BaseState, useBaseStore } from "@/stores/base.ts";
-import { useRuntimeStore } from "@/stores/runtime.ts";
-import { useSettingStore } from "@/stores/setting.ts";
+import {onMounted, watch} from "vue";
+import {BaseState, useBaseStore} from "@/stores/base.ts";
+import {useRuntimeStore} from "@/stores/runtime.ts";
+import {useSettingStore} from "@/stores/setting.ts";
 import useTheme from "@/hooks/theme.ts";
-import { loadJsLib, shakeCommonDict } from "@/utils";
-import { get, set } from 'idb-keyval'
+import {loadJsLib, shakeCommonDict} from "@/utils";
+import {get, set} from 'idb-keyval'
 
-import { useRoute } from "vue-router";
-import { DictId } from "@/types/types.ts";
-import { APP_VERSION, AppEnv, LOCAL_FILE_KEY, SAVE_DICT_KEY, SAVE_SETTING_KEY } from "@/config/env.ts";
-import { syncSetting } from "@/apis";
-import { useUserStore } from "@/stores/auth.ts";
+import {useRoute} from "vue-router";
+import {DictId} from "@/types/types.ts";
+import {APP_VERSION, AppEnv, LOCAL_FILE_KEY, Origin, SAVE_DICT_KEY, SAVE_SETTING_KEY} from "@/config/env.ts";
+import {syncSetting} from "@/apis";
+import {useUserStore} from "@/stores/auth.ts";
+import MigrateDialog from "@/pages/MigrateDialog.vue";
 
 const store = useBaseStore()
 const runtimeStore = useRuntimeStore()
@@ -77,31 +78,16 @@ async function init() {
 
 onMounted(init)
 
-onMounted(()=>{
-  return
-  // const iframe = document.createElement('iframe');
-  // iframe.style.display = 'none';
-  // iframe.src = `https://2study.top/migrate.html`;
-  // function onMessage(event) {
-  //   if (event.data?.type !== 'MIGRATION_RESULT') return;
-  //
-  //   const payload = event.data.payload;
-  //   console.log('payload',payload)
-  // }
-  //
-  // window.addEventListener('message', onMessage);
-  // iframe.onload = () => {
-  //   setTimeout(()=>{
-  //     iframe.contentWindow.postMessage({type: 'REQUEST_MIGRATION_DATA'}, 'https://2study.top');
-  //   },3000)
-  // };
-  // document.body.appendChild(iframe);
-  //
-  // (async () => {
-  //   const db = await loadIDBKeyval(); // 确保 idb-keyval 已经加载
-  //   const data = await readAllStorageForMigration(db);
-  //   console.log('data',data)
-  // })()
+
+//迁移数据
+let showTransfer = $ref(false)
+onMounted(() => {
+  if (new URLSearchParams(window.location.search).get('from_old_site') === '1' && location.origin === Origin) {
+    if (localStorage.getItem('__migrated_from_2study_top__')) return;
+    setTimeout(() => {
+      showTransfer = true
+    }, 1000)
+  }
 })
 
 // let transitionName = $ref('go')
@@ -136,4 +122,5 @@ onMounted(()=>{
   <!--    </transition>-->
   <!--  </router-view>-->
   <router-view></router-view>
+  <MigrateDialog v-model="showTransfer"/>
 </template>
\ No newline at end of file
diff --git a/src/pages/MigrateDialog.vue b/src/pages/MigrateDialog.vue
new file mode 100644
index 00000000..d8c35c4b
--- /dev/null
+++ b/src/pages/MigrateDialog.vue
@@ -0,0 +1,111 @@
+<script setup lang="ts">
+
+import {Origin} from "@/config/env.ts";
+import BaseButton from "@/components/BaseButton.vue";
+import {set} from 'idb-keyval'
+import {defineAsyncComponent} from "vue";
+import Toast from "@/components/base/toast/Toast.ts";
+
+const Dialog = defineAsyncComponent(() => import('@/components/dialog/Dialog.vue'))
+
+const model = defineModel()
+
+async function migrateFromOldSite() {
+  return new Promise(async (resolve, reject) => {
+    // 旧域名地址
+    var OLD_ORIGIN = 'https://2study.top';
+    // 需要迁移的 IndexedDB key
+    var IDB_KEYS = [
+      'type-words-app-version',
+      'typing-word-dict',
+      'typing-word-setting',
+      'typing-word-files'
+    ];
+    // 需要迁移的 localStorage key
+    var LS_KEYS = [
+      'PracticeSaveWord',
+      'PracticeSaveArticle'
+    ];
+    const migrateWin = window.open(`${OLD_ORIGIN}/migrate.html`, '_blank', 'width=400,height=400');
+
+    if (!migrateWin) return reject('弹窗被阻止，请在网址输入栏最右边，点击允许弹窗');
+
+    async function onMessage(event) {
+      if (event.origin !== OLD_ORIGIN) return;
+      if (event.data?.type !== 'MIGRATION_RESULT') return;
+      const payload = event.data.payload;
+      console.log('payload', payload);
+
+      // 写入 localStorage
+      LS_KEYS.forEach(key => {
+        if (payload.localStorage[key] !== undefined) {
+          localStorage.setItem(key, payload.localStorage[key]);
+        }
+      });
+
+      // 写入 IndexedDB
+      for (let key of IDB_KEYS) {
+        if (payload.indexedDB[key] !== undefined) {
+          await set(key, payload.indexedDB[key]);
+        }
+      }
+
+      window.removeEventListener('message', onMessage);
+      resolve(true);
+    }
+
+    window.addEventListener('message', onMessage);
+
+    // 等窗口加载完毕后发请求
+    const timer = setInterval(() => {
+      if (!migrateWin || migrateWin.closed) {
+        clearInterval(timer);
+        reject('迁移窗口已关闭');
+      } else {
+        try {
+          migrateWin.postMessage({type: 'REQUEST_MIGRATION_DATA'}, OLD_ORIGIN);
+        } catch (e) {
+          // 跨域安全错误忽略，等窗口完全加载后再试
+        }
+      }
+    }, 100);
+  });
+}
+
+async function transfer() {
+  try {
+    await migrateFromOldSite();
+    localStorage.setItem('__migrated_from_2study_top__', '1');
+    console.log('迁移完成');
+    Toast.success('迁移完成')
+    model.value = false
+  } catch (e) {
+    Toast.error('迁移失败：' + e)
+    console.error('迁移失败', e);
+  }
+}
+</script>
+
+<template>
+  <Dialog v-model="model" title="迁移数据">
+    <div class="px-4 flex-col center text-align-center w-100">
+      <h2>
+        本网站已启用新域名 <span class="color-blue">{{ Origin }}</span>
+      </h2>
+      <h3>
+        由于浏览器安全限制，新老网站数据无法互通，需要您手动点击转移数据
+      </h3>
+      <h3>
+        <BaseButton
+          size="large"
+          @click="transfer">
+          转移数据
+        </BaseButton>
+      </h3>
+    </div>
+  </Dialog>
+</template>
+
+<style scoped lang="scss">
+
+</style>
\ No newline at end of file

From 4945269f5795a180426c34ce9d1b114bdb928280 Mon Sep 17 00:00:00 2001
From: Zyronon <zyronon@163.com>
Date: Tue, 18 Nov 2025 14:16:58 +0800
Subject: [PATCH 10/14] save3

---
 index.html                  | 12 ------------
 public/migrate.html         |  2 --
 public/s.js                 |  1 -
 src/App.vue                 |  6 ++++--
 src/pages/MigrateDialog.vue |  6 +++++-
 5 files changed, 9 insertions(+), 18 deletions(-)
 delete mode 100644 public/s.js

diff --git a/index.html b/index.html
index 6fdae1fe..a0fa74b9 100644
--- a/index.html
+++ b/index.html
@@ -62,18 +62,6 @@
           s.parentNode.insertBefore(hm, s);
         })();
 
-        (function () {
-          var umami = document.createElement("script");
-          umami.src = 'https://typewords.cc/s.js'
-          if (location.href.includes('vercel') || location.href.includes('tw')) {
-            umami.setAttribute("data-website-id", "f630eefc-8b91-4e20-b890-106e6c7bcc10");
-          } else {
-            umami.setAttribute("data-website-id", "160308c9-7900-4b1d-a0b1-c3b25a9530f6");
-          }
-          var s = document.getElementsByTagName("script")[0];
-          s.parentNode.insertBefore(umami, s);
-        })();
-
         (function () {
           var umami2 = document.createElement("script");
           umami2.src = 'https://stat.typewords.cc/script.js'
diff --git a/public/migrate.html b/public/migrate.html
index 67960858..27b34936 100644
--- a/public/migrate.html
+++ b/public/migrate.html
@@ -80,8 +80,6 @@
       window.close();
     }, 500);
   });
-
-
 </script>
 </body>
 </html>
diff --git a/public/s.js b/public/s.js
deleted file mode 100644
index 5f207329..00000000
--- a/public/s.js
+++ /dev/null
@@ -1 +0,0 @@
-!function(){"use strict";(t=>{const{screen:{width:e,height:a},navigator:{language:n,doNotTrack:i,msDoNotTrack:r},location:o,document:s,history:c,top:u,doNotTrack:d}=t,{currentScript:l,referrer:h}=s;if(!l)return;const{hostname:f,href:m,origin:p}=o,y=m.startsWith("data:")?void 0:t.localStorage,g="data-",b="true",v=l.getAttribute.bind(l),w=v(g+"website-id"),S=v(g+"host-url"),k=v(g+"before-send"),N=v(g+"tag")||void 0,T="false"!==v(g+"auto-track"),A=v(g+"do-not-track")===b,j=v(g+"exclude-search")===b,x=v(g+"exclude-hash")===b,$=v(g+"domains")||"",E=$.split(",").map(t=>t.trim()),K=`${(S||"https://api-gateway.umami.dev"||l.src.split("/").slice(0,-1).join("/")).replace(/\/$/,"")}/api/send`,L=`${e}x${a}`,O=/data-umami-event-([\w-_]+)/,_=g+"umami-event",D=300,U=()=>({website:w,screen:L,language:n,title:s.title,hostname:f,url:z,referrer:F,tag:N,id:q||void 0}),W=(t,e,a)=>{a&&(F=z,z=new URL(a,o.href),j&&(z.search=""),x&&(z.hash=""),z=z.toString(),z!==F&&setTimeout(J,D))},B=()=>H||!w||y&&y.getItem("umami.disabled")||$&&!E.includes(f)||A&&(()=>{const t=d||i||r;return 1===t||"1"===t||"yes"===t})(),C=async(e,a="event")=>{if(B())return;const n=t[k];if("function"==typeof n&&(e=n(a,e)),e)try{const t=await fetch(K,{keepalive:!0,method:"POST",body:JSON.stringify({type:a,payload:e}),headers:{"Content-Type":"application/json",...void 0!==R&&{"x-umami-cache":R}},credentials:"omit"}),n=await t.json();n&&(H=!!n.disabled,R=n.cache)}catch(t){}},I=()=>{G||(G=!0,J(),(()=>{const t=(t,e,a)=>{const n=t[e];return(...e)=>(a.apply(null,e),n.apply(t,e))};c.pushState=t(c,"pushState",W),c.replaceState=t(c,"replaceState",W)})(),(()=>{const t=async t=>{const e=t.getAttribute(_);if(e){const a={};return t.getAttributeNames().forEach(e=>{const n=e.match(O);n&&(a[n[1]]=t.getAttribute(e))}),J(e,a)}};s.addEventListener("click",async e=>{const a=e.target,n=a.closest("a,button");if(!n)return t(a);const{href:i,target:r}=n;if(n.getAttribute(_)){if("BUTTON"===n.tagName)return t(n);if("A"===n.tagName&&i){const a="_blank"===r||e.ctrlKey||e.shiftKey||e.metaKey||e.button&&1===e.button;return a||e.preventDefault(),t(n).then(()=>{a||(("_top"===r?u.location:o).href=i)})}}},!0)})())},J=(t,e)=>C("string"==typeof t?{...U(),name:t,data:e}:"object"==typeof t?{...t}:"function"==typeof t?t(U()):U()),P=(t,e)=>("string"==typeof t&&(q=t),R="",C({...U(),data:"object"==typeof t?t:e},"identify"));t.umami||(t.umami={track:J,identify:P});let R,q,z=m,F=h.startsWith(p)?"":h,G=!1,H=!1;T&&!B()&&("complete"===s.readyState?I():s.addEventListener("readystatechange",I,!0))})(window)}();
diff --git a/src/App.vue b/src/App.vue
index 761479f2..8a93dde9 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -78,7 +78,6 @@ async function init() {
 
 onMounted(init)
 
-
 //迁移数据
 let showTransfer = $ref(false)
 onMounted(() => {
@@ -122,5 +121,8 @@ onMounted(() => {
   <!--    </transition>-->
   <!--  </router-view>-->
   <router-view></router-view>
-  <MigrateDialog v-model="showTransfer"/>
+  <MigrateDialog
+    v-model="showTransfer"
+    @ok="init"
+  />
 </template>
\ No newline at end of file
diff --git a/src/pages/MigrateDialog.vue b/src/pages/MigrateDialog.vue
index d8c35c4b..683ce4f9 100644
--- a/src/pages/MigrateDialog.vue
+++ b/src/pages/MigrateDialog.vue
@@ -10,6 +10,8 @@ const Dialog = defineAsyncComponent(() => import('@/components/dialog/Dialog.vue
 
 const model = defineModel()
 
+const emit = defineEmits<{ ok: [] }>()
+
 async function migrateFromOldSite() {
   return new Promise(async (resolve, reject) => {
     // 旧域名地址
@@ -79,6 +81,8 @@ async function transfer() {
     console.log('迁移完成');
     Toast.success('迁移完成')
     model.value = false
+    emit('ok')
+
   } catch (e) {
     Toast.error('迁移失败：' + e)
     console.error('迁移失败', e);
@@ -93,7 +97,7 @@ async function transfer() {
         本网站已启用新域名 <span class="color-blue">{{ Origin }}</span>
       </h2>
       <h3>
-        由于浏览器安全限制，新老网站数据无法互通，需要您手动点击转移数据
+        老域名即将停用，由于浏览器安全限制，新老网站数据无法互通，需要您手动点击转移数据
       </h3>
       <h3>
         <BaseButton

From 6b9423414dd5e518d635a49826a748eb420ce2df Mon Sep 17 00:00:00 2001
From: Zyronon <zyronon@163.com>
Date: Tue, 18 Nov 2025 14:19:05 +0800
Subject: [PATCH 11/14] save4

---
 public/migrate.html | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/public/migrate.html b/public/migrate.html
index 27b34936..1ad795d4 100644
--- a/public/migrate.html
+++ b/public/migrate.html
@@ -47,7 +47,10 @@
 
     const indexedDBData = {};
     for (let key of keys) {
-      indexedDBData[key] = await db.get(key);
+      let res = await db.get(key);
+      if (res === null) {
+        indexedDBData[key] = res
+      }
     }
 
     return {

From 8af36d93f8c1f2e023709d1655f408b1b1aa7b6b Mon Sep 17 00:00:00 2001
From: Zyronon <zyronon@163.com>
Date: Tue, 18 Nov 2025 15:00:26 +0800
Subject: [PATCH 12/14] save4

---
 public/migrate.html | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/public/migrate.html b/public/migrate.html
index 1ad795d4..72bc2c29 100644
--- a/public/migrate.html
+++ b/public/migrate.html
@@ -48,9 +48,7 @@
     const indexedDBData = {};
     for (let key of keys) {
       let res = await db.get(key);
-      if (res === null) {
-        indexedDBData[key] = res
-      }
+      if (res) indexedDBData[key] = res
     }
 
     return {

From ccd1586667cfd1f835f4435d92198c0efadeb61d Mon Sep 17 00:00:00 2001
From: Zyronon <zyronon@163.com>
Date: Tue, 18 Nov 2025 15:40:50 +0800
Subject: [PATCH 13/14] update:readme.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 3efda9c1..09f03c51 100644
--- a/README.md
+++ b/README.md
@@ -42,7 +42,7 @@
 
 ### 单词练习
 
-- 三种输入模式：跟打 / 复习 / 默写
+- 四种输入模式：跟打 / 辨认 / 复习 / 默写
 - 智能模式：记忆曲线自动计算学习单词，并通过默写加深记忆
 - 自由模式：不受限制，自行规划
 - 提供音标、发音（美音、英音）、例句、短语、近义词、同根词、词源、错误统计等功能

From 2a515aaf8f2be5c567cbb628e5826748e75d04c0 Mon Sep 17 00:00:00 2001
From: Zyronon <zyronon@163.com>
Date: Tue, 18 Nov 2025 16:18:06 +0800
Subject: [PATCH 14/14] fix:#162

---
 public/list/word.json | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/public/list/word.json b/public/list/word.json
index d7fef4dd..d77fe020 100644
--- a/public/list/word.json
+++ b/public/list/word.json
@@ -1896,9 +1896,6 @@
       "tags": [
         "通用"
       ],
-      "words": [
-        "private","fuck","add","remove"
-      ],
       "url": "GaoKaoZhenTiHeXinGaoPin.json",
       "length": 799,
       "language": "en",