From a2f51274e608d2790167dd72e364faa676236893 Mon Sep 17 00:00:00 2001
From: maochaoying <925670706@qq.com>
Date: Sun, 10 Sep 2023 16:45:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=AD=E6=96=87=E9=94=AE=E7=9B=98=E6=8E=92?=
=?UTF-8?q?=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.env | 8 ++++----
src/components/AddPreSetting.vue | 12 +++++++++++-
src/components/UpdatePreSetting.vue | 12 +++++++++++-
src/pages/Login.vue | 2 +-
4 files changed, 27 insertions(+), 7 deletions(-)
diff --git a/.env b/.env
index c4ae906..fe3f0dd 100644
--- a/.env
+++ b/.env
@@ -1,5 +1,5 @@
-# VITE_BASE_WS1_URL=ws://192.168.8.10:19001/
-# VITE_BASE_WS2_URL=ws://192.168.8.10:19002/
+VITE_BASE_WS1_URL=ws://192.168.8.10:19001/
+VITE_BASE_WS2_URL=ws://192.168.8.10:19002/
-VITE_BASE_WS1_URL=ws://127.0.0.1:19001/
-VITE_BASE_WS2_URL=ws://127.0.0.1:19002/
\ No newline at end of file
+# VITE_BASE_WS1_URL=ws://127.0.0.1:19001/
+# VITE_BASE_WS2_URL=ws://127.0.0.1:19002/
\ No newline at end of file
diff --git a/src/components/AddPreSetting.vue b/src/components/AddPreSetting.vue
index 511205a..682e5d7 100644
--- a/src/components/AddPreSetting.vue
+++ b/src/components/AddPreSetting.vue
@@ -685,7 +685,17 @@ onMounted(() => {
document.addEventListener('click', e => {
let box = document.getElementById('keyboard_formula')
let room = document.getElementById('id_formula')
- if (!box?.contains(e.target) && e.target != room) {
+ const arr = [
+ 'hg-candidate-box-next',
+ 'hg-candidate-box-btn-active',
+ 'hg-candidate-box-prev',
+ 'hg-candidate-box-list-item',
+ ]
+ if (
+ !box?.contains(e.target) &&
+ e.target != room &&
+ !arr.includes(Array.from(e.target.classList)[0])
+ ) {
showkeyboard.value = false
}
})
diff --git a/src/components/UpdatePreSetting.vue b/src/components/UpdatePreSetting.vue
index f8aeb43..e1572f1 100644
--- a/src/components/UpdatePreSetting.vue
+++ b/src/components/UpdatePreSetting.vue
@@ -735,7 +735,17 @@ onMounted(() => {
document.addEventListener('click', e => {
let box = document.getElementById('keyboard_formula')
let room = document.getElementById('id_formula')
- if (!box?.contains(e.target) && e.target != room) {
+ const arr = [
+ 'hg-candidate-box-next',
+ 'hg-candidate-box-btn-active',
+ 'hg-candidate-box-prev',
+ 'hg-candidate-box-list-item',
+ ]
+ if (
+ !box?.contains(e.target) &&
+ e.target != room &&
+ !arr.includes(Array.from(e.target.classList)[0])
+ ) {
showkeyboard.value = false
}
})
diff --git a/src/pages/Login.vue b/src/pages/Login.vue
index e104e15..d7bb467 100644
--- a/src/pages/Login.vue
+++ b/src/pages/Login.vue
@@ -6,7 +6,7 @@
:input="input"
:handleHideKey="handleHideKey"
/>
- CopyRight@ xxxxxx公司
+ CopyRight@ 全思美特