From 2d3f0dd95a9dce0550ecd9ab10eafaa46ad9a2d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9F=A6=E8=8D=A3=E8=B6=85?= <302645122@qq.com>
Date: Mon, 7 Mar 2022 17:03:29 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20'=E6=9C=80=E8=BF=91=E6=89=93=E5=BC=80?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1'=E6=95=B0=E6=8D=AE=E6=B2=A1=E6=9C=89?=
 =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E7=94=A8=E6=88=B7=E5=8C=BA=E5=88=86=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resources/assets/js/store/actions.js | 20 +++++++++++++++++---
 resources/assets/js/store/state.js   |  2 +-
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/resources/assets/js/store/actions.js b/resources/assets/js/store/actions.js
index 697cb1cc3..150873695 100644
--- a/resources/assets/js/store/actions.js
+++ b/resources/assets/js/store/actions.js
@@ -207,6 +207,7 @@ export default {
         dispatch("getProjects").catch(() => {});
         dispatch("getDialogs");
         dispatch("getTaskForDashboard");
+        dispatch("getTaskBrowse");
     },
 
     /**
@@ -424,20 +425,29 @@ export default {
             try {
                 const cacheLoginEmail = $A.getStorageString("cacheLoginEmail");
                 const cacheThemeMode = $A.getStorageString("cacheThemeMode");
+                let userId = state.userId > 0 ? state.userId : userInfo.userid;
+                const cacheTaskBrowse = $A.getStorageArray("cacheTaskBrowse" + userId)
+
                 //
-                window.localStorage.clear();
+                // window.localStorage.clear();
                 //
                 state.cacheUserBasic = [];
                 state.cacheDialogs = [];
                 state.cacheProjects = [];
                 state.cacheColumns = [];
                 state.cacheTasks = [];
-                state.cacheTaskBrowse = [];
+                state.cacheLoading = {};
+                state.cacheDrawerIndex = 0;
+                state.cacheDrawerOverlay = [];
+                state.cacheUserActive = {};
+                state.cacheUserWait = [];
+
                 //
                 $A.setStorage("cacheProjectParameter", state.cacheProjectParameter);
                 $A.setStorage("cacheServerUrl", state.cacheServerUrl);
                 $A.setStorage("cacheLoginEmail", cacheLoginEmail);
                 $A.setStorage("cacheThemeMode", cacheThemeMode);
+                $A.setStorage("cacheTaskBrowse" + userId, cacheTaskBrowse);
                 dispatch("saveUserInfo", $A.isJson(userInfo) ? userInfo : state.userInfo);
                 //
                 resolve()
@@ -1396,7 +1406,7 @@ export default {
                     state.cacheTaskBrowse.splice(0, parseInt(deleteNum))
                 }
                 setTimeout(() => {
-                    $A.setStorage("cacheTaskBrowse", state.cacheTaskBrowse);
+                    $A.setStorage("cacheTaskBrowse" + state.userId, state.cacheTaskBrowse);
                 })
             }).catch(({msg}) => {
                 $A.modalWarning({
@@ -2368,4 +2378,8 @@ export default {
     websocketClose({state}) {
         state.ws && state.ws.close();
     },
+
+    getTaskBrowse({state}) {
+        state.cacheTaskBrowse = $A.getStorageArray("cacheTaskBrowse" + state.userId);
+    }
 }
diff --git a/resources/assets/js/store/state.js b/resources/assets/js/store/state.js
index a74ba3d48..d10ccffd0 100644
--- a/resources/assets/js/store/state.js
+++ b/resources/assets/js/store/state.js
@@ -29,7 +29,7 @@ const stateData = {
     cacheColumns: $A.getStorageArray("cacheColumns"),
     cacheTasks: $A.getStorageArray("cacheTasks"),
     cacheProjectParameter: $A.getStorageArray("cacheProjectParameter"),
-    cacheTaskBrowse: $A.getStorageArray("cacheTaskBrowse"),
+    cacheTaskBrowse: $A.getStorageArray("cacheTaskBrowse" + $A.getStorageJson("userInfo").userid),
 
     // ServerUrl
     cacheServerUrl: $A.getStorageString("cacheServerUrl"),