From e07b05d18d994113236f36c305ed22c46b2cedda Mon Sep 17 00:00:00 2001
From: kuaifan <aipaw@live.cn>
Date: Thu, 1 Jul 2021 14:46:54 +0800
Subject: [PATCH] no message

---
 app/Http/Controllers/Api/ProjectController.php |  2 +-
 resources/assets/js/pages/manage/calendar.vue  |  8 +++-----
 resources/assets/js/store/actions.js           | 10 +++++-----
 resources/assets/sass/pages/page-calendar.scss | 14 +++++++++++++-
 4 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/app/Http/Controllers/Api/ProjectController.php b/app/Http/Controllers/Api/ProjectController.php
index b6a802cd..c7611a60 100755
--- a/app/Http/Controllers/Api/ProjectController.php
+++ b/app/Http/Controllers/Api/ProjectController.php
@@ -709,7 +709,7 @@ class ProjectController extends AbstractController
      * @apiParam {String} name                  任务描述
      * @apiParam {String} [content]             任务详情
      * @apiParam {Array} [times]                计划时间（格式：开始时间,结束时间；如：2020-01-01 00:00,2020-01-01 23:59）
-     * @apiParam {Number} [owner]               负责人，留空为自己
+     * @apiParam {Number} [owner]               负责人
      * @apiParam {Array} [subtasks]             子任务（格式：[{name,owner,times}]）
      * @apiParam {Number} [top]                 添加的任务排到列表最前面
      */
diff --git a/resources/assets/js/pages/manage/calendar.vue b/resources/assets/js/pages/manage/calendar.vue
index 7ef7e31c..359fd362 100644
--- a/resources/assets/js/pages/manage/calendar.vue
+++ b/resources/assets/js/pages/manage/calendar.vue
@@ -67,12 +67,9 @@ export default {
         }
     },
 
-    mounted() {
-        this.setRenderRange();
-    },
-
     activated() {
         this.$refs.cal.resetRender();
+        this.setRenderRange();
     },
 
     computed: {
@@ -248,7 +245,8 @@ export default {
             this.$store.dispatch("taskAdd", {
                 project_id: res.calendarId,
                 times: [res.start.toDate(), res.end.toDate()],
-                name: res.title
+                name: res.title,
+                owner: this.userId,
             }).then(({msg}) => {
                 $A.messageSuccess(msg);
             }).catch(({msg}) => {
diff --git a/resources/assets/js/store/actions.js b/resources/assets/js/store/actions.js
index 925af971..56607397 100644
--- a/resources/assets/js/store/actions.js
+++ b/resources/assets/js/store/actions.js
@@ -1413,10 +1413,10 @@ export default {
         //
         state.ws = new WebSocket(url);
         state.ws.onopen = (e) => {
-            console.log("[WS] Open", e)
+            // console.log("[WS] Open", e)
         };
         state.ws.onclose = (e) => {
-            console.log("[WS] Close", e);
+            // console.log("[WS] Close", e);
             state.ws = null;
             //
             clearTimeout(state.wsTimeout);
@@ -1425,7 +1425,7 @@ export default {
             }, 3000);
         };
         state.ws.onerror = (e) => {
-            console.log("[WS] Error", e);
+            // console.log("[WS] Error", e);
             state.ws = null;
             //
             clearTimeout(state.wsTimeout);
@@ -1434,7 +1434,7 @@ export default {
             }, 3000);
         };
         state.ws.onmessage = (e) => {
-            console.log("[WS] Message", e);
+            // console.log("[WS] Message", e);
             const msgDetail = state.method.jsonParse(event.data);
             const {type, msgId} = msgDetail;
             switch (type) {
@@ -1459,7 +1459,7 @@ export default {
                             try {
                                 call(msgDetail);
                             } catch (err) {
-                                console.log("[WS] Callerr", err);
+                                // console.log("[WS] Callerr", err);
                             }
                         }
                     });
diff --git a/resources/assets/sass/pages/page-calendar.scss b/resources/assets/sass/pages/page-calendar.scss
index 15c1a803..c58d4412 100644
--- a/resources/assets/sass/pages/page-calendar.scss
+++ b/resources/assets/sass/pages/page-calendar.scss
@@ -1,5 +1,8 @@
 .page-calendar {
+    display: flex;
+    flex-direction: column;
     .calendar-head {
+        flex-shrink: 0;
         display: flex;
         align-items: flex-start;
         margin: 32px 32px 16px;
@@ -42,7 +45,11 @@
         }
     }
     .calendar-box {
-        padding: 0 48px;
+        flex: 1;
+        display: flex;
+        flex-direction: column;
+        padding: 0 48px 6px;
+        overflow: hidden;
         .calendar-wrapper {
             flex: 1;
             position: relative;
@@ -68,6 +75,10 @@
                     border-bottom-color: rgba(217, 217, 217, .5);
                 }
             }
+            .tui-full-calendar-dropdown-menu {
+                border-color: #e8e8e8;
+                width: calc(100% - 14px);
+            }
             .tui-full-calendar-popup-creation {
                 .tui-full-calendar-icon {
                     &.tui-full-calendar-ic-title,
@@ -88,6 +99,7 @@
                     margin-bottom: 10px;
                     .tui-full-calendar-popup-section-item {
                         height: 36px;
+                        line-height: 34px;
                         border-color: #e8e8e8;
                         border-radius: 4px;
                     }