ZaiZai 1 рік тому
батько
коміт
72ac15d001
3 змінених файлів з 22 додано та 20 видалено
  1. 1 1
      public/version.json
  2. 21 5
      src/App.vue
  3. 0 14
      src/layout/index.vue

+ 1 - 1
public/version.json

@@ -1,3 +1,3 @@
 {
-  "value": "20240926114124"
+  "value": "20240926141626"
 }

+ 21 - 5
src/App.vue

@@ -6,15 +6,31 @@
 
 <script setup>
 import { onMounted } from 'vue'
+import { delStore } from '~src/utils/storage'
 import { detectionBrowser, getAppVersion } from 'hc-vue3-ui'
 import config from '~src/config/index'
 
+//渲染完成
 onMounted(() => {
-    if (config.localModel) return
-    detectionBrowser()
-    //生产环境下,检测更新
-    if (import.meta.env.PROD) {
-        getAppVersion()
+    if (config.localModel) {
+        setElectronLogin()
+    } else {
+        detectionBrowser()
+        //生产环境下,检测更新
+        if (import.meta.env.PROD) {
+            getAppVersion()
+        }
     }
 })
+
+//设置electron的重新登录
+const setElectronLogin = () => {
+    const electronAPI = window.electronAPI
+    electronAPI.onClearTokenCache(() => {
+        delStore('access-token')
+        setTimeout(() => {
+            electronAPI.tokenCacheCleared()
+        }, 500)
+    })
+}
 </script>

+ 0 - 14
src/layout/index.vue

@@ -28,7 +28,6 @@ import { onMounted, ref } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
 import { getMenuData } from '~src/router/routers'
 import { initButtons } from '~store/app'
-import config from '~src/config/index'
 
 //logo文件
 import logoPng from '~src/assets/logo/logo.png'
@@ -40,7 +39,6 @@ const useRoutes = useRoute()
 //子组件
 import MenuBar from './modules/MenuBar.vue'
 import UserInfoBar from './modules/UserInfoBar.vue'
-import { LogOut } from '~store/user'
 
 //菜单数据
 const menuBarKey = ref(useRoutes.name)
@@ -50,7 +48,6 @@ const menuBarData = ref([])
 onMounted(() => {
     getMenuBarData()
     initButtons()
-    setElectronLogin()
 })
 
 //获取菜单数据
@@ -63,17 +60,6 @@ const menuBarChange = ({ code }) => {
     menuBarKey.value = code
     router.push({ name: code })
 }
-
-//设置electron的重新登录
-const setElectronLogin = () => {
-    if (!config.localModel) return
-    const electronAPI = window.electronAPI
-    electronAPI.onClearTokenCache(() => {
-        LogOut()
-        router.push({ name: 'login' })
-        electronAPI.tokenCacheCleared()
-    })
-}
 </script>
 
 <style lang="scss">