From ee485020d1fc001c7f05d1f45d0fce4def601d52 Mon Sep 17 00:00:00 2001
From: kuaifan <aipaw@live.cn>
Date: Mon, 25 Apr 2022 21:54:12 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=B7=BB=E5=8A=A0=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E7=AA=97=E5=8F=A3=E9=80=89=E6=8B=A9=E5=85=B6=E4=BB=96=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E6=97=A0=E6=95=88=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../assets/js/pages/manage/components/TaskAdd.vue   | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/resources/assets/js/pages/manage/components/TaskAdd.vue b/resources/assets/js/pages/manage/components/TaskAdd.vue
index 39721f27f..48a4ea18c 100644
--- a/resources/assets/js/pages/manage/components/TaskAdd.vue
+++ b/resources/assets/js/pages/manage/components/TaskAdd.vue
@@ -292,7 +292,13 @@ export default {
         },
 
         initCascaderData() {
-            this.cascaderData = this.cacheProjects.map(project => {
+            const data = $A.cloneJSON(this.cacheProjects).sort((a, b) => {
+                if (a.top_at || b.top_at) {
+                    return $A.Date(b.top_at) - $A.Date(a.top_at);
+                }
+                return b.id - a.id;
+            });
+            this.cascaderData = data.map(project => {
                 const children = this.cacheColumns.filter(({project_id}) => project_id == project.id).map(column => {
                     return {
                         value: column.id,
@@ -432,7 +438,10 @@ export default {
         },
 
         cascaderChange(value) {
-            value[1] && this.$set(this.addData, 'column_id', value[1])
+            if (value[1]) {
+                this.$set(this.addData, 'project_id', value[0])
+                this.$set(this.addData, 'column_id', value[1])
+            }
         },
 
         cascaderInputChange(key) {