From f0b78d86d83e408c0b47a6196b5cdfb4c414031f Mon Sep 17 00:00:00 2001
From: ZaneYork <ZaneYork@qq.com>
Date: Tue, 27 Oct 2020 13:54:31 +0800
Subject: [PATCH] Bug fix

---
 package.json                       |  2 +-
 src/components/VirtualKeyboard.vue | 11 +++--------
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/package.json b/package.json
index bae933c..6e89c38 100644
--- a/package.json
+++ b/package.json
@@ -6,7 +6,7 @@
     "serve": "vue-cli-service serve",
     "build": "vue-cli-service build",
     "lint": "vue-cli-service lint",
-    "i18n:report": "vue-cli-service i18n:report --src './src/**/*.?(js|vue)' --locales './src/locales/**/*.json'"
+    "i18n:report": "vue-cli-service i18n:report --src \"./src/**/*.?(js|vue)\" --locales \"./src/locales/**/*.json\""
   },
   "dependencies": {
     "core-js": "^3.6.5",
diff --git a/src/components/VirtualKeyboard.vue b/src/components/VirtualKeyboard.vue
index 5e92f33..afeaa13 100644
--- a/src/components/VirtualKeyboard.vue
+++ b/src/components/VirtualKeyboard.vue
@@ -31,7 +31,7 @@
         </v-group>
       </v-layer>
       <v-layer v-if="!isEmpty(currentButtonId)">
-        <v-rect :config="getButtonConfig(currentButton, 'lightcyan')" ref="currentButtonRect"></v-rect>
+        <v-rect :config="getButtonConfig(currentButton, 'lightcyan')"></v-rect>
         <v-text :config="getTextConfig(currentButton, firstNotEmpty(currentButton.alias, currentButton.key))"></v-text>
       </v-layer>
     </v-stage>
@@ -41,7 +41,7 @@
       direction="rtl"
       size="40%"
       :with-header="true">
-      <el-form ref="form" label-width="50px">
+      <el-form label-width="50px">
         <el-form-item :label="$t('X')">
           <el-slider
             v-model="currentButton.rectangle.X"
@@ -75,7 +75,7 @@
     <el-button v-if="landscape && !isEmpty(currentButtonId)"
                type="primary" icon="el-icon-edit" circle @click="drawer=true"
                class="button-float"></el-button>
-    <el-form ref="form" label-width="80px">
+    <el-form label-width="80px">
       <el-form-item :label="$t('key')">
         <el-autocomplete
           class="inline-input"
@@ -160,7 +160,6 @@
         drawer: false,
         landscape: false,
         currentButtonId: '',
-        cachedCurrentButtonId: '',
         currentButton: {
           key: '',
           alias: '',
@@ -266,10 +265,6 @@
         event.cancelBubble = true;
       },
       onActivated: function (button) {
-        if (this.currentButtonId !== this.cachedCurrentButtonId && this.$refs.currentButtonRect != null) {
-          this.$refs.currentButtonRect.getNode().cache();
-          this.cachedCurrentButtonId = this.currentButtonId;
-        }
         this.currentButton = button;
         this.currentButtonId = button.id;
       },