From bf46881e3b8ca19ff9aabff5e0fef44879ce8786 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9F=A6=E8=8D=A3=E8=B6=85?= <302645122@qq.com>
Date: Tue, 15 Mar 2022 16:44:35 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E9=A1=B9=E7=9B=AE-=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8tab=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resources/assets/js/functions/web.js          |  3 +-
 .../pages/manage/components/ProjectList.vue   | 48 ++++++++-----------
 resources/assets/js/store/actions.js          |  7 ++-
 resources/assets/js/store/getters.js          |  2 +-
 4 files changed, 29 insertions(+), 31 deletions(-)

diff --git a/resources/assets/js/functions/web.js b/resources/assets/js/functions/web.js
index aa37a4cbc..f832901a7 100755
--- a/resources/assets/js/functions/web.js
+++ b/resources/assets/js/functions/web.js
@@ -66,8 +66,7 @@
             return {
                 project_id,
                 card: true,
-                menu: false,
-                gantt: false,
+                menuType: 'card',
                 cardInit: false,
                 chat: false,
                 showMy: true,
diff --git a/resources/assets/js/pages/manage/components/ProjectList.vue b/resources/assets/js/pages/manage/components/ProjectList.vue
index c9a4fcfd1..a116b0ebd 100644
--- a/resources/assets/js/pages/manage/components/ProjectList.vue
+++ b/resources/assets/js/pages/manage/components/ProjectList.vue
@@ -82,14 +82,14 @@
                         </Cascader>
                     </div>
                     <div class="project-switch-button">
-                        <div @click="tabTypeChange('card')" :class="{ 'active': projectParameter('card')}"><i class="taskfont">&#xe60c;</i></div>
-                        <div @click="tabTypeChange('menu')" :class="{ 'active': projectParameter('menu')}"><i class="taskfont">&#xe66a;</i></div>
-                        <div @click="tabTypeChange('gantt')" :class="{ 'active': projectParameter('gantt')}"><i class="taskfont">&#xe797;</i></div>
+                        <div @click="tabTypeChange('card')" :class="{ 'active': projectParameter('menuType') === 'card'}"><i class="taskfont">&#xe60c;</i></div>
+                        <div @click="tabTypeChange('menu')" :class="{ 'active': projectParameter('menuType') === 'menu'}"><i class="taskfont">&#xe66a;</i></div>
+                        <div @click="tabTypeChange('gantt')" :class="{ 'active': projectParameter('menuType') === 'gantt'}"><i class="taskfont">&#xe797;</i></div>
                     </div>
                 </div>
             </div>
         </div>
-        <div v-if="projectParameter('card')" class="project-column">
+        <div v-if="projectParameter('menuType') === 'card'" class="project-column">
             <Draggable
                 :list="columnList"
                 :animation="150"
@@ -225,7 +225,7 @@
                 </li>
             </Draggable>
         </div>
-        <div v-if="projectParameter('menu')" class="project-table overlay-y">
+        <div v-if="projectParameter('menuType') === 'menu'" class="project-table overlay-y">
             <div class="project-table-head">
                 <Row class="task-row">
                     <Col span="12"># {{$L('任务名称')}}</Col>
@@ -312,7 +312,7 @@
                 <TaskRow v-if="projectParameter('showCompleted')" :list="completedList" open-key="completed" @on-priority="addTaskOpen" showCompleteAt/>
             </div>
         </div>
-        <div v-if="projectParameter('gantt')" class="project-table overlay-y" style="position: relative">
+        <div v-if="projectParameter('menuType') === 'gantt'" class="project-table overlay-y" style="position: relative">
             <!-- 甘特图 -->
             <ProjectGantt :lineData="ganttColumnList[0].tasks"
                           :projectLabel="ganttColumnList"
@@ -1401,31 +1401,25 @@ export default {
         tabTypeChange(type) {
             switch (type) {
                 case "card":
-                    this.$store.dispatch('toggleProjectParameter', 'card');
-                    if (this.projectParameter('card')) {
-                        this.projectParameter('menu') ? this.$store.dispatch('toggleProjectParameter', 'menu') : '';
-                        this.projectParameter('gantt') ? this.$store.dispatch('toggleProjectParameter', 'gantt') : '';
-                    } else {
-                        this.$store.dispatch('toggleProjectParameter', 'card');
-                    }
+                    this.$store.dispatch('toggleProjectParameter', {
+                        project_id: this.projectId,
+                        key: 'menuType',
+                        value: 'card'
+                    });
                     break;
                 case "menu":
-                    this.$store.dispatch('toggleProjectParameter', 'menu');
-                    if (this.projectParameter('menu')) {
-                        this.projectParameter('card') ? this.$store.dispatch('toggleProjectParameter', 'card') : '';
-                        this.projectParameter('gantt') ? this.$store.dispatch('toggleProjectParameter', 'gantt') : '';
-                    } else {
-                        this.$store.dispatch('toggleProjectParameter', 'menu');
-                    }
+                    this.$store.dispatch('toggleProjectParameter', {
+                        project_id: this.projectId,
+                        key: 'menuType',
+                        value: 'menu'
+                    });
                     break;
                 case "gantt":
-                    this.$store.dispatch('toggleProjectParameter', 'gantt');
-                    if (this.projectParameter('gantt')) {
-                        this.projectParameter('menu') ? this.$store.dispatch('toggleProjectParameter', 'menu') : '';
-                        this.projectParameter('card') ? this.$store.dispatch('toggleProjectParameter', 'card') : '';
-                    } else {
-                        this.$store.dispatch('toggleProjectParameter', 'gantt');
-                    }
+                    this.$store.dispatch('toggleProjectParameter', {
+                        project_id: this.projectId,
+                        key: 'menuType',
+                        value: 'gantt'
+                    });
                     break;
             }
         },
diff --git a/resources/assets/js/store/actions.js b/resources/assets/js/store/actions.js
index fe32d1fa3..42c76c965 100644
--- a/resources/assets/js/store/actions.js
+++ b/resources/assets/js/store/actions.js
@@ -148,9 +148,11 @@ export default {
         $A.execMainDispatch("toggleProjectParameter", data)
         //
         let key = data;
+        let value = null;
         let project_id = state.projectId;
         if ($A.isJson(data)) {
             key = data.key;
+            value = data.value;
             project_id = data.project_id;
         }
         if (project_id) {
@@ -160,9 +162,12 @@ export default {
                 index = state.cacheProjectParameter.findIndex(item => item.project_id == project_id)
             }
             const cache = state.cacheProjectParameter[index];
-            if (!$A.isJson(key)) {
+            if (!$A.isJson(key) && !value) {
                 key = {[key]: !cache[key]};
             }
+            if (value) {
+                key = {[key]: value};
+            }
             state.cacheProjectParameter.splice(index, 1, Object.assign(cache, key))
             setTimeout(() => {
                 $A.setStorage("cacheProjectParameter", state.cacheProjectParameter);
diff --git a/resources/assets/js/store/getters.js b/resources/assets/js/store/getters.js
index 67b8b2f68..638501e4e 100644
--- a/resources/assets/js/store/getters.js
+++ b/resources/assets/js/store/getters.js
@@ -34,7 +34,7 @@ export default {
                 cache = $A.projectParameterTemplate(state.projectId)
                 state.cacheProjectParameter.push(cache);
             }
-            return cache && !!cache[key];
+            return cache[key];
         }
     },