From 0702704e0a520299c14489a43fbc5a22a8e5bf48 Mon Sep 17 00:00:00 2001
From: fangxiang <fangxiang@cloudview.work>
Date: Sat, 12 Feb 2022 12:23:36 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=89=A7=E8=A1=8C=E9=A2=84?=
 =?UTF-8?q?=E6=A1=88=E6=97=B6=EF=BC=8C=E7=A6=81=E6=AD=A2=E7=AA=97=E5=8F=A3?=
 =?UTF-8?q?=E6=93=8D=E4=BD=9C=E7=9A=84=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/common/RemoteDataExangeProcesser.ts |  2 ++
 src/components/ModeTree.vue             |  8 ++++++-
 src/components/Window.vue               | 27 +++++++++++++++++++++
 src/pages/MediaControlPage.vue          | 27 ++++-----------------
 src/pages/TopToolBar.vue                | 31 +++++++------------------
 src/pages/WallPage.vue                  | 17 ++++----------
 src/store/index.ts                      |  5 ++++
 7 files changed, 59 insertions(+), 58 deletions(-)

diff --git a/src/common/RemoteDataExangeProcesser.ts b/src/common/RemoteDataExangeProcesser.ts
index 67ea912..9b2e247 100644
--- a/src/common/RemoteDataExangeProcesser.ts
+++ b/src/common/RemoteDataExangeProcesser.ts
@@ -81,6 +81,7 @@ export default class RemoteDataExangeProcesser {
             ) as Protocol.PlanRunningStateChangeNotifyEntity;
             if (temp && temp.plan) {
               if (temp.running) {
+                $store.commit("setCurrentRunningPlan", temp.plan.uuid);
                 if (this.plan_notify) {
                   this.plan_notify(void 0);
                   this.plan_notify = null;
@@ -99,6 +100,7 @@ export default class RemoteDataExangeProcesser {
                     "!",
                 });
               } else {
+                $store.commit("setCurrentRunningPlan", "");
                 if (this.plan_notify) {
                   this.plan_notify(void 0);
                   this.plan_notify = null;
diff --git a/src/components/ModeTree.vue b/src/components/ModeTree.vue
index 8318711..10058ad 100644
--- a/src/components/ModeTree.vue
+++ b/src/components/ModeTree.vue
@@ -8,9 +8,13 @@
         <template v-slot:default-header="prop">
           <q-item
             class="full-width"
+            :disable="$store.state.current_running_plan.trim() != ''"
             clickable
             @dblclick="
-              (evt) => !prop.node.is_group && callMode(prop.node.item_data)
+              (evt) =>
+                $store.state.current_running_plan.trim() == '' &&
+                !prop.node.is_group &&
+                callMode(prop.node.item_data)
             "
           >
             <q-item-section avatar>
@@ -131,6 +135,8 @@ import { useQuasar } from "quasar";
 import { useI18n } from "vue-i18n";
 import { ModeEntity } from "src/entities/ModeEntity";
 import EventBus, { EventNamesDefine } from "src/common/EventBus";
+import { NotifyMessage } from "src/common/ClientConnection";
+import { Protocol } from "src/entities/WSProtocol";
 
 export default defineComponent({
   name: "ComponentModeTree",
diff --git a/src/components/Window.vue b/src/components/Window.vue
index d509d05..81ae826 100644
--- a/src/components/Window.vue
+++ b/src/components/Window.vue
@@ -61,6 +61,25 @@
         >
           <q-item-section> {{ $t("close all windwos") }} </q-item-section>
         </q-item>
+        <q-item clickable v-if="false">
+          <q-item-section>{{ $t("trimming window") }}</q-item-section>
+          <q-item-section side>
+            <q-icon name="keyboard_arrow_right" />
+          </q-item-section>
+
+          <q-menu anchor="top end" self="top start">
+            <q-list>
+              <q-item v-close-popup :disable="$props.disable" clickable>
+                <q-item-section>{{ $t("trimming window pos") }}</q-item-section>
+              </q-item>
+              <q-item v-close-popup :disable="$props.disable" clickable>
+                <q-item-section>{{
+                  $t("trimming window size")
+                }}</q-item-section>
+              </q-item>
+            </q-list>
+          </q-menu>
+        </q-item>
         <q-item
           v-if="false"
           clickable
@@ -190,6 +209,8 @@ import GlobalData from "src/common/GlobalData";
 import { defineComponent, ref, watch, onUnmounted, computed } from "vue";
 import { useStore } from "src/store";
 import { SignalSourceEntity } from "src/entities/SignalSourceEntity";
+import { NotifyMessage } from "src/common/ClientConnection";
+import { Protocol } from "src/entities/WSProtocol";
 
 class _Flags {
   get up_flag() {
@@ -225,6 +246,9 @@ export default defineComponent({
     mouse_area_flag: {
       type: Boolean,
     },
+    plan_running: {
+      type: Boolean,
+    },
   },
   emits: [
     "close_this_window",
@@ -284,6 +308,9 @@ export default defineComponent({
         }
       },
       onClick(evt: MouseEvent) {
+        if (props.plan_running) {
+          return;
+        }
         if (ctrl_press_flag) {
           ctrl_press_flag = false;
           return;
diff --git a/src/pages/MediaControlPage.vue b/src/pages/MediaControlPage.vue
index ad5bedc..18927cd 100644
--- a/src/pages/MediaControlPage.vue
+++ b/src/pages/MediaControlPage.vue
@@ -1,7 +1,6 @@
 <template>
   <div
     v-show="is_multimedia_window && selected_window"
-    ref="wall"
     class="col full-width"
     style="
       background-color: #bce0f0;
@@ -17,7 +16,7 @@
           round
           flag
           size="lg"
-          icon="arrow_back"
+          icon="skip_previous"
           :disable="!can_next_prev_window || plan_running"
           @click="playPrev"
         >
@@ -54,7 +53,7 @@
           flag
           size="lg"
           :disable="!can_next_prev_window || plan_running"
-          icon="arrow_forward"
+          icon="skip_next"
           @click="playNext"
         >
           <q-tooltip> {{ $t("play next") }}</q-tooltip></q-btn
@@ -145,26 +144,8 @@ export default defineComponent({
     let can_pause_window = ref(false);
     let can_next_prev_window = ref(false);
 
-    let plan_running = ref(false);
-
-    EventBus.getInstance().on(
-      EventNamesDefine.NotifyMessage,
-      (notify: NotifyMessage) => {
-        if (notify) {
-          switch (notify.packet.command) {
-            case Protocol.Commands.kCurrentRunningPlanStateChanged:
-              {
-                const temp = JSON.parse(
-                  notify.data
-                ) as Protocol.PlanRunningStateChangeNotifyEntity;
-                if (temp && temp.plan) {
-                  plan_running.value = temp.running;
-                }
-              }
-              break;
-          }
-        }
-      }
+    const plan_running = computed(
+      () => $store.state.current_running_plan.trim() != ""
     );
 
     watch(
diff --git a/src/pages/TopToolBar.vue b/src/pages/TopToolBar.vue
index 9e003f2..1dfc154 100644
--- a/src/pages/TopToolBar.vue
+++ b/src/pages/TopToolBar.vue
@@ -89,6 +89,7 @@
         stretch
         flat
         stack
+        :disable="plan_running"
         icon="vertical_align_top"
         :label="$t('top window')"
         class="q-mr-sm"
@@ -99,6 +100,7 @@
         stretch
         flat
         stack
+        :disable="plan_running"
         icon="vertical_align_bottom"
         :label="$t('lower window')"
         class="q-mr-sm"
@@ -109,6 +111,7 @@
         stretch
         flat
         stack
+        :disable="plan_running"
         icon="close"
         :label="$t('close this window')"
         class="q-mr-sm"
@@ -119,6 +122,7 @@
         stretch
         flat
         stack
+        :disable="plan_running"
         icon="clear_all"
         :label="$t('close all windwos')"
         class="q-mr-sm"
@@ -132,7 +136,7 @@
         icon="stop"
         :label="$t('stop plan')"
         class="q-mr-sm"
-        v-if="show_stop_plan"
+        v-if="plan_running"
         @click="stopPlan"
       />
 
@@ -227,7 +231,7 @@
 </template>
 
 <script lang="ts">
-import { defineComponent, ref } from "vue";
+import { defineComponent, ref, computed } from "vue";
 import { useStore } from "src/store";
 
 import GridSettingDialog from "src/components/GridSettingDialog.vue";
@@ -268,31 +272,14 @@ export default defineComponent({
     let $t = useI18n();
 
     let show_advanced_menu = ref(true);
-    let show_stop_plan = ref(false);
 
-    EventBus.getInstance().on(
-      EventNamesDefine.NotifyMessage,
-      (notify: NotifyMessage) => {
-        if (notify) {
-          switch (notify.packet.command) {
-            case Protocol.Commands.kCurrentRunningPlanStateChanged:
-              {
-                const temp = JSON.parse(
-                  notify.data
-                ) as Protocol.PlanRunningStateChangeNotifyEntity;
-                if (temp && temp.plan) {
-                  show_stop_plan.value = temp.running;
-                }
-              }
-              break;
-          }
-        }
-      }
+    const plan_running = computed(
+      () => $store.state.current_running_plan.trim() != ""
     );
 
     return {
       show_advanced_menu,
-      show_stop_plan,
+      plan_running,
 
       async backupDB() {
         let client = GlobalData.getInstance().getCurrentClient();
diff --git a/src/pages/WallPage.vue b/src/pages/WallPage.vue
index 94aa140..3292e6c 100644
--- a/src/pages/WallPage.vue
+++ b/src/pages/WallPage.vue
@@ -50,10 +50,11 @@
           :id="'window_' + item.window_id"
           :uuid="item.uuid"
           :disable="plan_running"
-          class="window fit"
           :mouse_area_flag="area_open_window_flag"
           :signal_source_table_uuid="item.signal_source_table_uuid"
           :window="item"
+          :plan_running="plan_running"
+          class="window fit"
         >
         </window>
       </vue3-resize-drag>
@@ -193,7 +194,9 @@ export default defineComponent({
     const edit_volume_dialog: Ref<any> = ref(null);
     const polling_setting_dialog: Ref<any> = ref(null);
 
-    const plan_running = ref(false);
+    const plan_running = computed(
+      () => $store.state.current_running_plan.trim() != ""
+    );
 
     const windows = computed({
       get: () => $store.state.windows,
@@ -560,16 +563,6 @@ export default defineComponent({
                 }
               }
               break;
-            case Protocol.Commands.kCurrentRunningPlanStateChanged:
-              {
-                const temp = JSON.parse(
-                  notify.data
-                ) as Protocol.PlanRunningStateChangeNotifyEntity;
-                if (temp && temp.plan) {
-                  plan_running.value = temp.running;
-                }
-              }
-              break;
           }
         } catch {}
       }
diff --git a/src/store/index.ts b/src/store/index.ts
index 40deb8a..168db65 100644
--- a/src/store/index.ts
+++ b/src/store/index.ts
@@ -44,6 +44,7 @@ export interface StateInterface {
   fan_temp: number;
   selected_window: string;
   selected_signal_source: string;
+  current_running_plan: string;
 }
 
 // provide typings for `this.$store`
@@ -277,6 +278,7 @@ export default store(function (/* { ssrContext } */) {
       selected_window: "",
       selected_signal_source:
         "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF",
+      current_running_plan: "",
     },
 
     mutations: {
@@ -722,6 +724,9 @@ export default store(function (/* { ssrContext } */) {
       setSelectedSignalSource(state: StateInterface, playload?: any) {
         state.selected_signal_source = playload;
       },
+      setCurrentRunningPlan(state: StateInterface, playload?: any) {
+        state.current_running_plan = playload;
+      },
     },
 
     // enable strict mode (adds overhead!)