From 7ff691471b365d2eb954e3cf712ce227a0aade2d Mon Sep 17 00:00:00 2001
From: dayou <853094838@qq.com>
Date: Tue, 16 Jul 2024 14:32:28 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20user=E6=A8=A1=E5=9D=97=E5=8D=87=E7=BA=A7?=
 =?UTF-8?q?=E4=B8=BAts=20(#348)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../settingModule/skin/CatalogPanel.vue        |  1 -
 .../pages/list/components/MemberSelect.vue     |  2 +-
 web/src/management/router/index.ts             |  1 -
 web/src/management/stores/{user.js => user.ts} | 18 ++++++++++++------
 4 files changed, 13 insertions(+), 9 deletions(-)
 rename web/src/management/stores/{user.js => user.ts} (76%)

diff --git a/web/src/management/pages/edit/modules/settingModule/skin/CatalogPanel.vue b/web/src/management/pages/edit/modules/settingModule/skin/CatalogPanel.vue
index ae7d844c..5e82c68c 100644
--- a/web/src/management/pages/edit/modules/settingModule/skin/CatalogPanel.vue
+++ b/web/src/management/pages/edit/modules/settingModule/skin/CatalogPanel.vue
@@ -27,7 +27,6 @@
 </template>
 <script setup lang="ts">
 import { computed, ref } from 'vue'
-import { useStore } from 'vuex'
 import { useEditStore } from '@/management/stores/edit'
 
 import skinPresets from '@/management/config/skinPresets.js'
diff --git a/web/src/management/pages/list/components/MemberSelect.vue b/web/src/management/pages/list/components/MemberSelect.vue
index 9bb83ad2..2633adf0 100644
--- a/web/src/management/pages/list/components/MemberSelect.vue
+++ b/web/src/management/pages/list/components/MemberSelect.vue
@@ -65,7 +65,7 @@ const remoteMethod = async (query: string) => {
     if (res.code === CODE_MAP.SUCCESS) {
       selectOptions.value = res.data.map((item: any) => {
         // 不可以选中自己
-        const currentUser = item.username === userStore.userInfo.username
+        const currentUser = item.username === userStore.userInfo?.username
         return {
           value: item.userId,
           label: item.username,
diff --git a/web/src/management/router/index.ts b/web/src/management/router/index.ts
index 9ca35d6d..be4ef401 100644
--- a/web/src/management/router/index.ts
+++ b/web/src/management/router/index.ts
@@ -5,7 +5,6 @@ import {
   type NavigationGuardNext
 } from 'vue-router'
 import type { RouteRecordRaw } from 'vue-router'
-import { useStore, type Store } from 'vuex'
 import { SurveyPermissions } from '@/management/utils/types/workSpace'
 import { analysisTypeMap } from '@/management/config/analysisConfig'
 import { ElMessage } from 'element-plus'
diff --git a/web/src/management/stores/user.js b/web/src/management/stores/user.ts
similarity index 76%
rename from web/src/management/stores/user.js
rename to web/src/management/stores/user.ts
index 468fc177..5b152519 100644
--- a/web/src/management/stores/user.js
+++ b/web/src/management/stores/user.ts
@@ -1,22 +1,27 @@
-import { ref } from 'vue'
 import { defineStore } from 'pinia'
+import { ref } from 'vue'
+
+type IUserInfo = {
+  username: string
+  token: string
+}
 
 const USER_INFO_KEY = 'surveyUserInfo'
 export const useUserStore = defineStore('user', () => {
-  const userInfo = ref({
+  const userInfo = ref<IUserInfo | null>({
     username: '',
     token: ''
   })
   const hasLogined = ref(false)
-  const loginTime = ref(null)
+  const loginTime = ref<number | null>(null)
   const initialized = ref(false)
 
   const init = () => {
     const localData = localStorage.getItem(USER_INFO_KEY)
     if (localData) {
       try {
-        const { userInfo: info, loginTime } = JSON.parse(localData)
-        if (Date.now() - loginTime > 7 * 3600000) {
+        const { userInfo: info, loginTime: time } = JSON.parse(localData)
+        if (Date.now() - time > 7 * 3600000) {
           localStorage.removeItem(USER_INFO_KEY)
         } else {
           login(info)
@@ -27,7 +32,7 @@ export const useUserStore = defineStore('user', () => {
     }
     initialized.value = true
   }
-  const login = (data) => {
+  const login = (data: IUserInfo) => {
     userInfo.value = data
     hasLogined.value = true
     loginTime.value = Date.now()
@@ -47,3 +52,4 @@ export const useUserStore = defineStore('user', () => {
 
   return { userInfo, hasLogined, loginTime, initialized, init, login, logout }
 })
+