From f49cafc0ccae3f399e59ad87f691a2ab9e36ce4c Mon Sep 17 00:00:00 2001
From: jxxghp <jxxghp@gmail.com>
Date: Sun, 26 Jan 2025 08:42:09 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E7=A1=AE=E4=BF=9D?=
 =?UTF-8?q?=E6=B8=B2=E6=9F=93=E5=AE=8C=E6=88=90=E7=9A=84=E5=87=BD=E6=95=B0?=
 =?UTF-8?q?=E5=B9=B6=E4=BC=98=E5=8C=96=E5=8A=A0=E8=BD=BD=E8=83=8C=E6=99=AF?=
 =?UTF-8?q?=E7=A7=BB=E9=99=A4=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/@core/utils/dom.ts | 9 +++++++--
 src/App.vue            | 7 +++++++
 src/main.ts            | 2 --
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/@core/utils/dom.ts b/src/@core/utils/dom.ts
index ad5504ce..04f61ede 100644
--- a/src/@core/utils/dom.ts
+++ b/src/@core/utils/dom.ts
@@ -10,8 +10,7 @@ export function useDefer(maxFrameCount = 1) {
   const refreshFrameCount = () => {
     requestAnimationFrame(() => {
       frameCount.value++
-      if (frameCount.value < maxFrameCount)
-        refreshFrameCount()
+      if (frameCount.value < maxFrameCount) refreshFrameCount()
     })
   }
   refreshFrameCount()
@@ -19,3 +18,9 @@ export function useDefer(maxFrameCount = 1) {
     return frameCount.value >= showInFrameCount
   }
 }
+
+export function ensureRenderComplete(callback: () => void) {
+  requestAnimationFrame(() => {
+    requestAnimationFrame(callback)
+  })
+}
diff --git a/src/App.vue b/src/App.vue
index db1233ee..383cb694 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,6 +1,7 @@
 <script lang="ts" setup>
 import { useTheme } from 'vuetify'
 import { checkPrefersColorSchemeIsDark } from '@/@core/utils'
+import { ensureRenderComplete, removeEl } from './@core/utils/dom'
 
 const { global: globalTheme } = useTheme()
 
@@ -45,6 +46,12 @@ if (window.Apex) {
 onBeforeMount(async () => {
   setTheme()
 })
+
+onMounted(() => {
+  ensureRenderComplete(() => {
+    nextTick(() => removeEl('#loading-bg'))
+  });
+})
 </script>
 
 <template>
diff --git a/src/main.ts b/src/main.ts
index 20d973c6..301425e4 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -17,7 +17,6 @@ import { PerfectScrollbarPlugin } from 'vue3-perfect-scrollbar'
 import { CronVuetify } from '@vue-js-cron/vuetify'
 
 // 4. 工具函数和其他辅助模块
-import { removeEl } from './@core/utils/dom'
 import { fetchGlobalSettings } from './api'
 import { isPWA } from './@core/utils/navigator'
 
@@ -114,5 +113,4 @@ initializeApp().then(() => {
       },
     })
     .mount('#app')
-    .$nextTick(() => removeEl('#loading-bg'))
 })