From 05d932586c835fa22365f3ade43f3a50447630e5 Mon Sep 17 00:00:00 2001 From: fangxiang Date: Fri, 23 Sep 2022 10:09:38 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E5=85=B3=E6=9C=BA=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E8=A2=AB=E7=82=B9=E5=87=BB=E5=90=8E=E7=A6=81=E7=94=A8=E4=BA=94?= =?UTF-8?q?=E7=A7=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 4 ++-- src/pad/TopToolbar.vue | 21 +++++++++++++++++++++ src/pages/TopToolBar.vue | 21 +++++++++++++++++++++ yarn.lock | 16 ++++++++-------- 4 files changed, 52 insertions(+), 10 deletions(-) diff --git a/package.json b/package.json index e48fa6f..eb5dfd3 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@quasar/cli": "^1.3.2", - "@quasar/extras": "^1.15.0", + "@quasar/extras": "^1.15.3", "@tinymce/tinymce-vue": "4", "@types/element-resize-detector": "^1.1.3", "autoprefixer": "^10.4.2", @@ -18,7 +18,7 @@ "core-js": "^3.21.0", "element-resize-detector": "^1.2.4", "qrcode.vue": "^3.3.3", - "quasar": "^2.7.5", + "quasar": "^2.8.4", "reconnecting-websocket": "^4.4.0", "sortablejs": "^1.15.0", "to": "^0.2.9", diff --git a/src/pad/TopToolbar.vue b/src/pad/TopToolbar.vue index 3ee71a8..786ba8c 100644 --- a/src/pad/TopToolbar.vue +++ b/src/pad/TopToolbar.vue @@ -92,6 +92,7 @@ stack flat no-caps + :disable="power_flag" icon="img:pad/toolbar/power_on_icon.png" :label="$t('power on')" @click="powerOn" @@ -102,6 +103,7 @@ stack flat no-caps + :disable="power_flag" icon="img:pad/toolbar/power_off_icon.png" :label="$t('power off')" @click="powerOff" @@ -298,11 +300,24 @@ export default defineComponent({ } ); + const power_flag = ref(false); + watch( + () => power_flag.value, + (newV) => { + if (newV) { + setTimeout(() => { + power_flag.value = false; + }, 1100 * 5); + } + } + ); + return { plan_running, function_center_control, is_custon_isv, window_rect_edit_dialog, + power_flag, toogleFullScreen() { if (!$q.fullscreen.isCapable) { @@ -428,6 +443,9 @@ export default defineComponent({ success = response?.success ?? false; } } catch {} + if (success) { + power_flag.value = true; + } $q.notify({ color: success ? "positive" : "negative", icon: success ? "done" : "warning", @@ -449,6 +467,9 @@ export default defineComponent({ success = response?.success ?? false; } } catch {} + if (success) { + power_flag.value = true; + } $q.notify({ color: success ? "positive" : "negative", icon: success ? "done" : "warning", diff --git a/src/pages/TopToolBar.vue b/src/pages/TopToolBar.vue index 65cb413..4669066 100644 --- a/src/pages/TopToolBar.vue +++ b/src/pages/TopToolBar.vue @@ -218,6 +218,7 @@ no-caps flat stack + :disable="power_flag" icon="img:new_icon/power_off.png" :label="$t('power off')" class="q-mr-sm" @@ -229,6 +230,7 @@ no-caps flat stack + :disable="power_flag" icon="img:new_icon/power_on.png" :label="$t('power on')" class="q-mr-sm" @@ -501,6 +503,18 @@ export default defineComponent({ const window_rect_edit_dialog: Ref = ref(null); + const power_flag = ref(false); + watch( + () => power_flag.value, + (newV) => { + if (newV) { + setTimeout(() => { + power_flag.value = false; + }, 1100 * 5); + } + } + ); + const plan_running = computed( () => $store.state.current_running_plan.trim() != "" ); @@ -589,6 +603,7 @@ export default defineComponent({ is_custon_isv, window_rect_edit_dialog, show_device_list, + power_flag, async backupDB() { let client = GlobalData.getInstance().getCurrentClient(); @@ -715,6 +730,9 @@ export default defineComponent({ success = response?.success ?? false; } } catch {} + if (success) { + power_flag.value = true; + } $q.notify({ color: success ? "positive" : "negative", icon: success ? "done" : "warning", @@ -737,6 +755,9 @@ export default defineComponent({ success = response?.success ?? false; } } catch {} + if (success) { + power_flag.value = true; + } $q.notify({ color: success ? "positive" : "negative", icon: success ? "done" : "warning", diff --git a/yarn.lock b/yarn.lock index bc10558..5b664b0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1245,10 +1245,10 @@ update-notifier "^5.1.0" validate-npm-package-name "^3.0.0" -"@quasar/extras@^1.15.0": - version "1.15.0" - resolved "https://registry.npmmirror.com/@quasar/extras/-/extras-1.15.0.tgz#ed397abdc8372b2b1de525dd93c7ec6bc061db8f" - integrity sha512-e5IHHqo3i/u7yWdcdspBbthnrDDZ3VRXaQoyhEEy526lzITFAw3hnlt4h7YnZ6Ck6gVIM0YbCaZbKaQYfKPOzQ== +"@quasar/extras@^1.15.3": + version "1.15.3" + resolved "https://registry.npmmirror.com/@quasar/extras/-/extras-1.15.3.tgz#3fa4cab6df9b6d2001e6e8192a005ca71b1b0719" + integrity sha512-kc2h+zTOBRx8eR3TYUjB3ZmALYoH3LBSaOFuha11Ncixk8NTwm9GNCQL6kxmC/CQiaP9Q78KFFgrv3AXGnCvLw== "@quasar/fastclick@1.1.4": version "1.1.4" @@ -8890,10 +8890,10 @@ qs@6.9.6: resolved "https://registry.npmmirror.com/qs/-/qs-6.9.6.tgz#26ed3c8243a431b2924aca84cc90471f35d5a0ee" integrity sha512-TIRk4aqYLNoJUbd+g2lEdz5kLWIuTMRagAXxl78Q0RiVjAOugHmeKNGdd3cwo/ktpf9aL9epCfFqWDEKysUlLQ== -quasar@^2.7.5: - version "2.7.5" - resolved "https://registry.npmmirror.com/quasar/-/quasar-2.7.5.tgz#a3feb5d50647313c4d6e1451223c158e10792902" - integrity sha512-DWI0S+bXASfMSPrB8c/LVsXpA4dF7cBUbaJlcrM+1ioTNBHtiudma2Nhk2SDd5bzk9AYVHh5A8JCZuKqQAXt7g== +quasar@^2.8.4: + version "2.8.4" + resolved "https://registry.npmmirror.com/quasar/-/quasar-2.8.4.tgz#d32d7f0c1c4f313ee45f8f3d72028f3085727172" + integrity sha512-bygg0GgSwQyrUJJTaHmYV50nVrz779QsNeH/cg2R/SHOQ4UmJI2FBA1hxU/nlpJ6DbmezNab1COa5ID57PvKfw== query-string@^5.0.1: version "5.1.1"