From dd509d81400570fa208ff0adbf527ecaa2b805a3 Mon Sep 17 00:00:00 2001
From: kuaifan <aipaw@live.cn>
Date: Wed, 23 Jun 2021 00:25:33 +0800
Subject: [PATCH] =?UTF-8?q?=E7=8B=AC=E7=AB=8B=E6=98=BE=E7=A4=BA=E5=AE=8C?=
 =?UTF-8?q?=E6=88=90=E9=A1=B9=E7=9B=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/manage/components/ProjectList.vue   | 20 +++++++++----------
 resources/assets/js/store/actions.js          | 10 ----------
 resources/assets/js/store/getters.js          |  1 +
 resources/assets/js/store/state.js            |  1 -
 4 files changed, 10 insertions(+), 22 deletions(-)

diff --git a/resources/assets/js/pages/manage/components/ProjectList.vue b/resources/assets/js/pages/manage/components/ProjectList.vue
index 3d788b54..f77fa9ab 100644
--- a/resources/assets/js/pages/manage/components/ProjectList.vue
+++ b/resources/assets/js/pages/manage/components/ProjectList.vue
@@ -46,7 +46,7 @@
             <div v-if="projectData.desc" class="project-subtitle">{{projectData.desc}}</div>
             <div class="project-switch">
                 <div v-if="completedCount > 0" class="project-checkbox">
-                    <Checkbox :value="showCompletedTask" @on-change="$store.dispatch('toggleBoolean', 'showCompletedTask')">{{$L('显示已完成')}}</Checkbox>
+                    <Checkbox :value="tablePanel('completedTask')" @on-change="$store.dispatch('toggleTablePanel', 'completedTask')">{{$L('显示已完成')}}</Checkbox>
                 </div>
                 <div :class="['project-switch-button', !tablePanel('card') ? 'menu' : '']" @click="$store.dispatch('toggleTablePanel', 'card')">
                     <div><i class="iconfont">&#xe60c;</i></div>
@@ -407,8 +407,6 @@ export default {
             'projectLoad',
             'tasks',
             'columns',
-
-            'showCompletedTask',
         ]),
 
         ...mapGetters(['projectData', 'tablePanel']),
@@ -420,9 +418,9 @@ export default {
         },
 
         panelTask() {
-            const {searchText, showCompletedTask} = this;
+            const {searchText} = this;
             return function (list) {
-                if (!showCompletedTask) {
+                if (!this.tablePanel('completedTask')) {
                     list = list.filter(({complete_at}) => {
                         return !complete_at;
                     });
@@ -437,12 +435,12 @@ export default {
         },
 
         myList() {
-            const {projectId, tasks, searchText, showCompletedTask, userId} = this;
+            const {projectId, tasks, searchText, userId} = this;
             const array = tasks.filter((task) => {
                 if (task.project_id != projectId) {
                     return false;
                 }
-                if (!showCompletedTask) {
+                if (!this.tablePanel('completedTask')) {
                     if (task.complete_at) {
                         return false;
                     }
@@ -466,12 +464,12 @@ export default {
         },
 
         undoneList() {
-            const {projectId, tasks, searchText, showCompletedTask} = this;
+            const {projectId, tasks, searchText} = this;
             const array = tasks.filter((task) => {
                 if (task.project_id != projectId) {
                     return false;
                 }
-                if (!showCompletedTask) {
+                if (!this.tablePanel('completedTask')) {
                     if (task.complete_at) {
                         return false;
                     }
@@ -935,8 +933,8 @@ export default {
 
         taskIsHidden(task) {
             const {name, desc, complete_at} = task;
-            const {searchText, showCompletedTask} = this;
-            if (!showCompletedTask) {
+            const {searchText} = this;
+            if (!this.tablePanel('completedTask')) {
                 if (complete_at) {
                     return true;
                 }
diff --git a/resources/assets/js/store/actions.js b/resources/assets/js/store/actions.js
index 7f6ccf2b..58121436 100644
--- a/resources/assets/js/store/actions.js
+++ b/resources/assets/js/store/actions.js
@@ -122,16 +122,6 @@ export default {
         })
     },
 
-    /**
-     * 切换Boolean变量
-     * @param state
-     * @param key
-     */
-    toggleBoolean({state}, key) {
-        state[key] = !state[key]
-        state.method.setStorage("boolean:" + key, state[key]);
-    },
-
     /**
      * 切换面板变量
      * @param state
diff --git a/resources/assets/js/store/getters.js b/resources/assets/js/store/getters.js
index fb83b439..b38ef0a6 100644
--- a/resources/assets/js/store/getters.js
+++ b/resources/assets/js/store/getters.js
@@ -64,6 +64,7 @@ export default {
                     showMy: true,
                     showUndone: true,
                     showCompleted: false,
+                    completedTask: false,
                 }
                 state.cacheTablePanel.push(cache);
             }
diff --git a/resources/assets/js/store/state.js b/resources/assets/js/store/state.js
index 4c88f5d6..93e477d0 100644
--- a/resources/assets/js/store/state.js
+++ b/resources/assets/js/store/state.js
@@ -233,7 +233,6 @@ state.cacheColumns = state.method.getStorageArray("cacheColumns");
 state.cacheTasks = state.method.getStorageArray("cacheTasks");
 state.cacheTaskSubs = state.method.getStorageArray("cacheTaskSubs");
 state.cacheTablePanel = state.method.getStorageArray("cacheTablePanel");
-state.showCompletedTask = state.method.getStorageBoolean("showCompletedTask")
 
 // Ajax
 state.ajaxLoadNum = 0;