From 8ec1578f50569dc52a04d02b5d80a50acf73791e Mon Sep 17 00:00:00 2001
From: kuaifan <aipaw@live.cn>
Date: Fri, 7 Jan 2022 18:23:30 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A6=E8=BE=B9=E5=BA=95=E9=83=A8=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E6=B7=BB=E5=8A=A0=E4=BB=BB=E5=8A=A1=E9=80=89=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resources/assets/js/pages/manage.vue         | 31 +++++++++++++++-----
 resources/assets/sass/pages/page-manage.scss | 18 ++++++++++--
 2 files changed, 39 insertions(+), 10 deletions(-)

diff --git a/resources/assets/js/pages/manage.vue b/resources/assets/js/pages/manage.vue
index 065c56d5..39dd2137 100644
--- a/resources/assets/js/pages/manage.vue
+++ b/resources/assets/js/pages/manage.vue
@@ -90,7 +90,17 @@
                 :class="{loading:projectKeyLoading > 0}">
                 <Input prefix="ios-search" v-model="projectKeyValue" :placeholder="$L('共' + projectTotal + '个项目，搜索...')" clearable />
             </div>
-            <Button class="manage-box-new" type="primary" icon="md-add" @click="onAddShow">{{$L('新建项目')}}</Button>
+            <ButtonGroup class="manage-box-new-group">
+                <Button class="manage-box-new" type="primary" icon="md-add" @click="onAddShow">{{$L('新建项目')}}</Button>
+                <Dropdown @on-click="onAddTask(0)">
+                    <Button type="primary">
+                        <Icon type="ios-arrow-down"></Icon>
+                    </Button>
+                    <DropdownMenu slot="list">
+                        <DropdownItem>{{$L('新建任务')}} ({{mateName}}+K)</DropdownItem>
+                    </DropdownMenu>
+                </Dropdown>
+            </ButtonGroup>
         </div>
 
         <div class="manage-box-main">
@@ -207,6 +217,7 @@ export default {
             loadIng: 0,
 
             curPath: this.$route.path,
+            mateName: /macintosh|mac os x/i.test(navigator.userAgent) ? '⌘' : 'Ctrl',
 
             addShow: false,
             addData: {
@@ -252,12 +263,7 @@ export default {
         this.onVisibilityChange();
         //
         this.addTaskSubscribe = Store.subscribe('addTask', (data) => {
-            this.$refs.addTask.defaultPriority();
-            this.$refs.addTask.setData($A.isJson(data) ? data : {
-                'owner': this.userId,
-                'column_id': data,
-            });
-            this.addTaskShow = true;
+            this.onAddTask(data)
         });
         //
         document.addEventListener('keydown', this.shortcutEvent);
@@ -585,11 +591,20 @@ export default {
             if (e.keyCode === 75 || e.keyCode === 78) {
                 if (e.metaKey || e.ctrlKey) {
                     e.preventDefault();
-                    Store.set('addTask', 0);
+                    this.onAddTask(0)
                 }
             }
         },
 
+        onAddTask(data) {
+            this.$refs.addTask.defaultPriority();
+            this.$refs.addTask.setData($A.isJson(data) ? data : {
+                'owner': this.userId,
+                'column_id': data,
+            });
+            this.addTaskShow = true;
+        },
+
         taskVisibleChange(visible) {
             if (!visible) {
                 this.$store.dispatch('openTask', 0)
diff --git a/resources/assets/sass/pages/page-manage.scss b/resources/assets/sass/pages/page-manage.scss
index 8a1bb730..a5be6562 100644
--- a/resources/assets/sass/pages/page-manage.scss
+++ b/resources/assets/sass/pages/page-manage.scss
@@ -247,11 +247,25 @@
                 }
             }
         }
-        .manage-box-new {
+        .manage-box-new-group {
             width: 80%;
-            height: 38px;
             margin-top: 16px;
             margin-bottom: 20px;
+            display: flex;
+            align-items: center;
+            .manage-box-new {
+                flex: 1;
+            }
+            .ivu-btn {
+                height: 38px;
+            }
+            .ivu-dropdown {
+                .ivu-btn {
+                    min-width: auto !important;
+                    padding: 0 4px;
+                    border-radius: 0 4px 4px 0;
+                }
+            }
         }
     }
     .manage-box-main {