From abd87f35841d8004e1846c788e714a5c1c426ce6 Mon Sep 17 00:00:00 2001
From: kuaifan <aipaw@live.cn>
Date: Sat, 25 Dec 2021 02:07:17 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BB=BB=E5=8A=A1=E5=88=9B=E5=BB=BA?=
 =?UTF-8?q?=E7=AA=97=E5=8F=A3=E8=87=AA=E5=8A=A8=E9=80=89=E6=8B=A9=E4=B8=8A?=
 =?UTF-8?q?=E6=AC=A1=E6=B7=BB=E5=8A=A0=E7=9A=84=E9=A1=B9=E7=9B=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../js/pages/manage/components/TaskAdd.vue    | 20 ++++++++++++++-----
 resources/assets/sass/pages/common.scss       |  5 +++++
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/resources/assets/js/pages/manage/components/TaskAdd.vue b/resources/assets/js/pages/manage/components/TaskAdd.vue
index c40f6b963..d47fa4857 100644
--- a/resources/assets/js/pages/manage/components/TaskAdd.vue
+++ b/resources/assets/js/pages/manage/components/TaskAdd.vue
@@ -212,7 +212,10 @@ export default {
                 this.$nextTick(this.$refs.input.focus)
             }
         },
-        'addData.column_id' () {
+        'addData.project_id'(id) {
+            this.$store.state.method.setStorage("cacheAddTaskProjectId", id);
+        },
+        'addData.column_id'(id) {
             const {project_id, column_id} = this.addData;
             this.$nextTick(() => {
                 if (project_id && column_id) {
@@ -221,6 +224,7 @@ export default {
                     this.$set(this.addData, 'cascader', []);
                 }
             })
+            this.$store.state.method.setStorage("cacheAddTaskColumnId", id);
         }
     },
     methods: {
@@ -305,15 +309,21 @@ export default {
                     this.addData.column_id = column.id;
                 }
             } else {
-                let project = this.projects.find(({id}) => id == this.projectId) || this.projects.find(({id}) => id > 0);
+                let cacheAddTaskProjectId = this.$store.state.method.getStorageInt("cacheAddTaskProjectId");
+                let cacheAddTaskColumnId = this.$store.state.method.getStorageInt("cacheAddTaskColumnId");
+                let project = this.projects.find(({id}) => id == this.projectId)
+                    || this.projects.find(({id}) => id == cacheAddTaskProjectId)
+                    || this.projects.find(({id}) => id > 0);
                 if (project) {
-                    let column = this.columns.find(({project_id}) => project_id == project.id);
+                    let column = this.columns.find(({project_id, id}) => project_id == project.id && id == cacheAddTaskColumnId)
+                        || this.columns.find(({project_id}) => project_id == project.id);
                     if (column) {
                         this.addData.project_id = column.project_id;
                         this.addData.column_id = column.id;
                     } else {
-                        this.$store.dispatch("getColumns", project.id).then((data) => {
-                            column = data.find(({id}) => id > 0);
+                        this.$store.dispatch("getColumns", project.id).then(() => {
+                            column = this.columns.find(({project_id, id}) => project_id == project.id && id == cacheAddTaskColumnId)
+                                || this.columns.find(({project_id}) => project_id == project.id);
                             if (column) {
                                 this.addData.project_id = column.project_id;
                                 this.addData.column_id = column.id;
diff --git a/resources/assets/sass/pages/common.scss b/resources/assets/sass/pages/common.scss
index 3075ae0d7..8b5ac5f83 100755
--- a/resources/assets/sass/pages/common.scss
+++ b/resources/assets/sass/pages/common.scss
@@ -177,6 +177,11 @@ body {
                     .adaption {
                         display: flex;
                         align-items: center;
+                        .ivu-btn {
+                            height: 38px;
+                            line-height: 36px;
+                            min-width: auto;
+                        }
                         .ivu-btn,
                         .ivu-btn-group,
                         .ivu-poptip {