From f05914f2a1cb9409d8801468e96897262b4c88a0 Mon Sep 17 00:00:00 2001
From: kuaifan <aipaw@live.cn>
Date: Thu, 9 Jun 2022 11:05:02 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=A1=8C=E9=9D=A2=E5=AE=A2=E6=88=B7?=
 =?UTF-8?q?=E7=AB=AF=E4=BB=BB=E5=8A=A1=E7=8B=AC=E7=AB=8B=E7=AA=97=E5=8F=A3?=
 =?UTF-8?q?=E6=97=A0=E6=B3=95=E6=93=8D=E4=BD=9C=E4=BB=BB=E5=8A=A1=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resources/assets/js/App.vue                    | 18 +++++++++++++++++-
 resources/assets/js/pages/manage.vue           | 15 ++++++---------
 .../pages/manage/components/TaskOperation.vue  |  4 ++++
 3 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/resources/assets/js/App.vue b/resources/assets/js/App.vue
index 1bdcba851..52a0b4304 100755
--- a/resources/assets/js/App.vue
+++ b/resources/assets/js/App.vue
@@ -3,11 +3,26 @@
         <keep-alive>
             <router-view class="child-view"></router-view>
         </keep-alive>
+
+        <!--任务操作-->
+        <TaskOperation/>
+
+        <!--右下角加载提示-->
         <Spinner/>
+
+        <!--右下角客户端-->
         <RightBottom/>
+
+        <!--网络提示-->
         <NetworkException/>
+
+        <!--图片预览-->
         <PreviewImageState/>
+
+        <!--音频播放-->
         <AudioManager/>
+
+        <!--Manifest-->
         <iframe v-if="manifestUrl" v-show="false" :src="manifestUrl"></iframe>
     </div>
 </template>
@@ -27,10 +42,11 @@ import RightBottom from "./components/RightBottom";
 import PreviewImageState from "./components/PreviewImage/state";
 import NetworkException from "./components/NetworkException";
 import AudioManager from "./components/AudioManager";
+import TaskOperation from "./pages/manage/components/TaskOperation";
 import {mapState} from "vuex";
 
 export default {
-    components: {AudioManager, NetworkException, PreviewImageState, RightBottom, Spinner},
+    components: {TaskOperation, AudioManager, NetworkException, PreviewImageState, RightBottom, Spinner},
 
     data() {
         return {
diff --git a/resources/assets/js/pages/manage.vue b/resources/assets/js/pages/manage.vue
index 6c2756139..4677dc9dc 100644
--- a/resources/assets/js/pages/manage.vue
+++ b/resources/assets/js/pages/manage.vue
@@ -310,9 +310,6 @@
             </div>
         </Modal>
 
-        <!--任务操作-->
-        <TaskOperation/>
-
         <!--任务详情-->
         <TaskModal ref="taskModal"/>
 
@@ -382,11 +379,9 @@ import TaskModal from "./manage/components/TaskModal";
 import notificationKoro from "notification-koro1";
 import {Store} from "le5le-store";
 import ManageLoad from "../components/ManageLoad";
-import TaskOperation from "./manage/components/TaskOperation";
 
 export default {
     components: {
-        TaskOperation,
         ManageLoad,
         TaskModal,
         DialogModal,
@@ -461,10 +456,6 @@ export default {
             $A.messageSuccess("清除成功");
         }
         //
-        this.loadUser();
-        this.$store.dispatch("getTaskPriority").catch(_ => {})
-        //
-        this.getReportUnread(0);
         this.notificationInit();
         this.onVisibilityChange();
         //
@@ -474,6 +465,12 @@ export default {
         document.addEventListener('keydown', this.shortcutEvent);
     },
 
+    activated() {
+        this.loadUser();
+        this.getReportUnread(0);
+        this.$store.dispatch("getTaskPriority").catch(_ => {})
+    },
+
     beforeDestroy() {
         if (this.addTaskSubscribe) {
             this.addTaskSubscribe.unsubscribe();
diff --git a/resources/assets/js/pages/manage/components/TaskOperation.vue b/resources/assets/js/pages/manage/components/TaskOperation.vue
index 33a815b2a..3bdf1f130 100644
--- a/resources/assets/js/pages/manage/components/TaskOperation.vue
+++ b/resources/assets/js/pages/manage/components/TaskOperation.vue
@@ -124,6 +124,10 @@ export default {
     watch: {
         taskOperation(data) {
             if (data.event && data.task) {
+                if (this.$refs.dropdown.visible && this.element === data.event.target) {
+                    this.hide();
+                    return;
+                }
                 const eventRect = data.event.target.getBoundingClientRect();
                 this.styles = {
                     left: `${eventRect.left}px`,