From 76269c50fe23c6b862f3cafff8bbbd9c90225b08 Mon Sep 17 00:00:00 2001
From: zyronon <zyronon@163.com>
Date: Thu, 9 Nov 2023 01:42:02 +0800
Subject: [PATCH] Adding loading effects when downloading a universal
 dictionary

---
 components.d.ts                                     |  3 +++
 src/App.vue                                         | 11 +++++++----
 src/components/Practice/PracticeWord/TypingWord.vue |  5 ++++-
 src/stores/base.ts                                  |  4 +++-
 4 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/components.d.ts b/components.d.ts
index 412774bd..2b805ad6 100644
--- a/components.d.ts
+++ b/components.d.ts
@@ -71,4 +71,7 @@ declare module 'vue' {
     WordList2: typeof import('./src/components/list/WordList2.vue')['default']
     WordListModal: typeof import('./src/components/Modal/WordListModal.vue')['default']
   }
+  export interface ComponentCustomProperties {
+    vLoading: typeof import('element-plus/es')['ElLoadingDirective']
+  }
 }
diff --git a/src/App.vue b/src/App.vue
index 9cc999cb..f784acde 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -40,17 +40,20 @@ watch(store.wrong.originWords, (n) => {
 
 useStartKeyboardEventListener()
 
-onMounted(() => {
+async function init() {
   console.time()
-  Promise.allSettled([store.init(), settingStore.init()]).then(e => {
+  store.init().then(() => {
     store.load = true
-    setTheme(settingStore.theme)
     console.timeEnd()
   })
-})
+  await settingStore.init()
+  setTheme(settingStore.theme)
+}
 
 onMounted(() => {
+  init()
 })
+
 </script>
 
 <template>
diff --git a/src/components/Practice/PracticeWord/TypingWord.vue b/src/components/Practice/PracticeWord/TypingWord.vue
index d98d5f98..c2a433ef 100644
--- a/src/components/Practice/PracticeWord/TypingWord.vue
+++ b/src/components/Practice/PracticeWord/TypingWord.vue
@@ -251,6 +251,7 @@ onUnmounted(() => {
       </div>
     </div>
     <Typing
+        v-loading="!store.load"
         ref="typingRef"
         :word="word"
         @wrong="wordWrong"
@@ -270,7 +271,9 @@ onUnmounted(() => {
       <div class="word-panel-wrapper">
         <Panel>
           <template v-slot="{active}">
-            <div class="panel-page-item">
+            <div class="panel-page-item"
+                 v-loading="!store.load"
+            >
               <div class="list-header">
                 <div class="left">
                   <Tooltip title="切换词典">
diff --git a/src/stores/base.ts b/src/stores/base.ts
index 9448eacc..f6b168fc 100644
--- a/src/stores/base.ts
+++ b/src/stores/base.ts
@@ -228,7 +228,9 @@ export const useBaseStore = defineStore('base', {
                         if (res) w = Object.assign(w, res)
                       })
 
-                      resolve(true)
+                      setTimeout(()=>{
+                        resolve(true)
+                      },5000)
                     })
                   })
                 } else {