From 3c3a31571a383e130660bb5452ec385cb18ac175 Mon Sep 17 00:00:00 2001
From: fangxiang <fangxiang@cloudview.work>
Date: Thu, 10 Feb 2022 19:39:15 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=A1=B6=E9=83=A8=E8=8F=9C?=
 =?UTF-8?q?=E5=8D=95=E5=B8=83=E5=B1=80=20=E5=8E=BB=E9=99=A4=E5=86=97?=
 =?UTF-8?q?=E4=BD=99=E7=AA=97=E5=8F=A3=E5=8F=B3=E9=94=AE=20=E5=B0=9D?=
 =?UTF-8?q?=E8=AF=95=E4=BF=AE=E5=A4=8D=E6=8B=96=E6=8B=BD=E4=BF=A1=E5=8F=B7?=
 =?UTF-8?q?=E6=BA=90=E5=A4=B1=E8=B4=A5=E7=9A=84BUG(=E7=82=B9=E5=87=BB?=
 =?UTF-8?q?=E7=A9=BA=E7=99=BD=E5=A2=99=E5=A4=8D=E7=8E=B0)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Window.vue |  6 ++-
 src/i18n/zh-CN/index.ts   |  4 +-
 src/pages/TopToolBar.vue  | 87 +++++++++++++++++++++++++++++++--------
 src/pages/WallPage.vue    |  1 +
 4 files changed, 77 insertions(+), 21 deletions(-)

diff --git a/src/components/Window.vue b/src/components/Window.vue
index ed91bf6..ce4c66b 100644
--- a/src/components/Window.vue
+++ b/src/components/Window.vue
@@ -18,7 +18,7 @@
           v-close-popup
           :disable="$props.disable"
           @click="$emit('edit_volume', $props.window.window_id)"
-          v-if="!$props.window.muted && is_audo_player_window"
+          v-if="false && !$props.window.muted && is_audo_player_window"
         >
           <q-item-section> {{ $t("edit volume") }} </q-item-section>
         </q-item>
@@ -27,7 +27,7 @@
           v-close-popup
           :disable="$props.disable"
           @click="$emit('mute_unmute', $props.window.window_id)"
-          v-if="is_audo_player_window"
+          v-if="false && is_audo_player_window"
         >
           <q-item-section>
             {{ $props.window.muted ? $t("unmute") : $t("mute") }}
@@ -60,6 +60,7 @@
           <q-item-section> {{ $t("close all windwos") }} </q-item-section>
         </q-item>
         <q-item
+          v-if="false"
           clickable
           v-close-popup
           :disable="$props.disable"
@@ -70,6 +71,7 @@
           </q-item-section>
         </q-item>
         <q-item
+          v-if="false"
           clickable
           v-close-popup
           :disable="$props.disable"
diff --git a/src/i18n/zh-CN/index.ts b/src/i18n/zh-CN/index.ts
index 0f5c50b..dcfe528 100644
--- a/src/i18n/zh-CN/index.ts
+++ b/src/i18n/zh-CN/index.ts
@@ -314,6 +314,6 @@ export default {
   "font name": "字体",
   "font color": "字体颜色",
   "new signal source": "新建信号源",
-  "lower window": "窗口置底",
-  "top window": "窗口置顶",
+  "lower window": "置底窗口",
+  "top window": "置顶窗口",
 };
diff --git a/src/pages/TopToolBar.vue b/src/pages/TopToolBar.vue
index 1aaff50..9e003f2 100644
--- a/src/pages/TopToolBar.vue
+++ b/src/pages/TopToolBar.vue
@@ -2,6 +2,7 @@
   <div>
     <q-toolbar style="background-color: #3e9acd" class="shadow-2 text-white">
       <q-btn-dropdown
+        v-if="false"
         v-touch-hold:10000.mouse="handleHold"
         :disable-dropdown="!show_advanced_menu"
         stretch
@@ -25,6 +26,24 @@
           </q-item>
         </q-list>
       </q-btn-dropdown>
+
+      <q-btn-dropdown
+        stretch
+        flat
+        icon="devices"
+        :label="$store.state.device_ip_address"
+        class="q-mr-sm"
+      >
+        <q-list>
+          <q-item clickable v-close-popup @click="logout">
+            <q-item-section avatar> <q-icon name="logout" /> </q-item-section>
+            <q-item-section>
+              {{ $t("logout") }}
+            </q-item-section>
+          </q-item>
+        </q-list>
+      </q-btn-dropdown>
+
       <q-separator vertical inset />
 
       <q-btn
@@ -86,6 +105,26 @@
         @click="lowerWindow"
       />
 
+      <q-btn
+        stretch
+        flat
+        stack
+        icon="close"
+        :label="$t('close this window')"
+        class="q-mr-sm"
+        @click="closeCurrentWindow"
+      />
+
+      <q-btn
+        stretch
+        flat
+        stack
+        icon="clear_all"
+        :label="$t('close all windwos')"
+        class="q-mr-sm"
+        @click="closeAllWindows"
+      />
+
       <q-btn
         stretch
         flat
@@ -138,6 +177,18 @@
               {{ $t("database export") }}
             </q-item-section>
           </q-item>
+          <q-item
+            clickable
+            v-close-popup
+            @click="$refs.upgrade_dialog.showDialog()"
+          >
+            <q-item-section avatar>
+              <q-icon name="system_update" />
+            </q-item-section>
+            <q-item-section>
+              {{ $t("upgrade") }}
+            </q-item-section>
+          </q-item>
           <q-item
             clickable
             v-close-popup
@@ -163,23 +214,6 @@
           {{ $store.state.fan_temp.toFixed(1) }} ℃
         </q-item-section>
       </q-item>
-      <q-separator vertical inset />
-      <q-btn-dropdown
-        stretch
-        flat
-        icon="devices"
-        :label="$store.state.device_ip_address"
-        class="q-mr-sm"
-      >
-        <q-list>
-          <q-item clickable v-close-popup @click="logout">
-            <q-item-section avatar> <q-icon name="logout" /> </q-item-section>
-            <q-item-section>
-              {{ $t("logout") }}
-            </q-item-section>
-          </q-item>
-        </q-list>
-      </q-btn-dropdown>
     </q-toolbar>
   </div>
   <grid-setting-dialog ref="grid_setting_dialog" />
@@ -311,6 +345,25 @@ export default defineComponent({
             ?.lowerWindow(window.window_id);
         }
       },
+      closeCurrentWindow() {
+        const window = $store.state.windows.find(
+          (element) => element && element.uuid == $store.state.selected_window
+        );
+        if (window) {
+          GlobalData.getInstance()
+            .getCurrentClient()
+            ?.closeWindow(window.window_id);
+        }
+      },
+      closeAllWindows() {
+        for (const window of $store.state.windows) {
+          if (window) {
+            GlobalData.getInstance()
+              .getCurrentClient()
+              ?.closeWindow(window.window_id);
+          }
+        }
+      },
       logout() {
         SessionStorage.clear();
         window.location.reload();
diff --git a/src/pages/WallPage.vue b/src/pages/WallPage.vue
index 80d7867..e9be72c 100644
--- a/src/pages/WallPage.vue
+++ b/src/pages/WallPage.vue
@@ -671,6 +671,7 @@ export default defineComponent({
       },
 
       onWallGridsClick(e: MouseEvent) {
+        e.stopPropagation();
         EventBus.getInstance().emit(EventNamesDefine.UnSelectAllWindows);
         $store.commit("setSelectedWindow", "");
       },