af-mobile-client-vue3 1.1.29 → 1.1.30

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "af-mobile-client-vue3",
   "type": "module",
-  "version": "1.1.29",
+  "version": "1.1.30",
   "description": "Vue + Vite component lib",
   "license": "MIT",
   "engines": {

package/src/bootstrap.ts

@@ -1,5 +1,6 @@
 import type { Router } from 'vue-router'
 import guards from '@af-mobile-client-vue3/router/guards'
+import { useSettingStore } from '@af-mobile-client-vue3/stores/modules/setting'
 import { loadGuards, loadRoutes } from '@af-mobile-client-vue3/utils/routerUtil'
 
 type GuardFunction = (to: any, from: any, next?: any) => void
@@ -13,6 +14,13 @@ async function bootstrap(router: Router, customGuard: Guards = {}) {
   loadRoutes()
   // 加载路由守卫
   loadGuards({ ...guards, ...customGuard }, router)
+  // 初始化时先加载webMobileConfig，防止登录页拿不到配置信息
+  try {
+    await useSettingStore().init()
+  }
+  catch (e) {
+    console.error(e)
+  }
 }
 
 export default bootstrap

package/src/main.ts

@@ -28,21 +28,20 @@ import 'vant/es/dialog/style'
 import 'vant/es/notify/style'
 import 'vant/es/image-preview/style'
 
-const app = createApp(App)
-const head = createHead()
+(async () => {
+  const app = createApp(App)
+  const head = createHead()
 
-app.use(head)
-app.use(router)
-app.use(pinia)
-app.use(Plugins)
+  app.use(head)
+  app.use(pinia)
+  app.use(router)
+  app.use(Plugins)
 
-async function main() {
   await bootstrap(router)
   app.mount('#system-app')
-}
-main().then((_r) => {})
 
-// 👇 将卸载操作放入 unmount 函数，就是上面步骤2中的卸载函数
-window.unmount = () => {
-  app.unmount()
-}
+  // 👇 将卸载操作放入 unmount 函数，就是上面步骤2中的卸载函数
+  window.unmount = () => {
+    app.unmount()
+  }
+})()

package/src/stores/modules/setting.ts

@@ -16,36 +16,42 @@ export interface WebConfig {
 //  存放 webConfig 中的 setting 配置
 export const useSettingStore = defineStore('setting', () => {
   const setting = ref<WebConfig>(undefined)
+  const isInitialized = ref(false)
+
   const setSetting = (newSetting: WebConfig) => {
     setting.value = newSetting
   }
+
   const getSetting = () => {
     return setting.value
   }
 
-  const useStore = createStorage()
-
-  const store = useSettingStore()
-
+  // 将 init 作为 store 的方法导出
   const init = async () => {
+    if (isInitialized.value)
+      return
+
+    const useStore = createStorage()
     const catchWebConfig = useStore.get(APP_WEB_CONFIG_KEY)
     if (catchWebConfig) {
       setSetting(catchWebConfig)
     }
     else {
       const res = await getConfigByNameAsync('webMobileConfig')
-      useStore.set(APP_WEB_CONFIG_KEY, res)
-      const setting: WebConfig = res.setting
-      if (setting)
-        store.setSetting(setting)
+      if (res.setting) {
+        useStore.set(APP_WEB_CONFIG_KEY, res)
+        setSetting(res.setting)
+      }
     }
-  }
 
-  init().then(() => {})
+    isInitialized.value = true
+  }
 
   return {
     setSetting,
     getSetting,
+    init, // 导出 init 方法
+    isInitialized,
   }
 })