From 94ad624fb8172c5ab90f5fcdcd1c3a51b4a33f86 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Tue, 26 Apr 2022 09:41:23 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=96=E6=B6=88v-close-popup?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/quickcommandUI/ButtonBox.vue    |  5 ++++-
 src/components/quickcommandUI/ConfirmBox.vue   | 15 ++++++---------
 src/components/quickcommandUI/InputBox.vue     | 10 +++++++---
 src/components/quickcommandUI/QuickCommand.vue |  9 ++++++++-
 src/components/quickcommandUI/TextArea.vue     |  6 +++++-
 5 files changed, 30 insertions(+), 15 deletions(-)

diff --git a/src/components/quickcommandUI/ButtonBox.vue b/src/components/quickcommandUI/ButtonBox.vue
index e20c357..9f941b6 100644
--- a/src/components/quickcommandUI/ButtonBox.vue
+++ b/src/components/quickcommandUI/ButtonBox.vue
@@ -9,7 +9,6 @@
           class="full-width"
           color="primary"
           :label="label"
-          v-close-popup
           @click="clickOK(label, index)"
         />
       </div>
@@ -28,8 +27,12 @@ export default {
     options: Object,
   },
   methods: {
+    hide() {
+      this.$emit("hide");
+    },
     clickOK(label, index) {
       this.$emit("clickOK", { id: index, text: label });
+      this.hide();
     },
   },
 };
diff --git a/src/components/quickcommandUI/ConfirmBox.vue b/src/components/quickcommandUI/ConfirmBox.vue
index 4f07dad..7266c1f 100644
--- a/src/components/quickcommandUI/ConfirmBox.vue
+++ b/src/components/quickcommandUI/ConfirmBox.vue
@@ -7,15 +7,8 @@
       {{ options.message }}
     </q-card-section>
     <q-card-section class="flex justify-end q-gutter-sm">
-      <q-btn flat label="取消" color="grey" v-close-popup />
-      <q-btn
-        flat
-        autofocus
-        label="确定"
-        color="primary"
-        v-close-popup
-        @click="clickOK()"
-      />
+      <q-btn flat label="取消" color="grey" @click="hide" />
+      <q-btn flat autofocus label="确定" color="primary" @click="clickOK()" />
     </q-card-section>
   </q-card>
 </template>
@@ -23,8 +16,12 @@
 <script>
 export default {
   methods: {
+    hide() {
+      this.$emit("hide");
+    },
     clickOK() {
       this.$emit("clickOK", true);
+      this.hide();
     },
   },
   props: {
diff --git a/src/components/quickcommandUI/InputBox.vue b/src/components/quickcommandUI/InputBox.vue
index 32cb0ad..8eae34f 100644
--- a/src/components/quickcommandUI/InputBox.vue
+++ b/src/components/quickcommandUI/InputBox.vue
@@ -11,14 +11,14 @@
           :label="label"
           :hint="options.hints[index]"
           hide-hint
-          autofocus
+          :autofocus="index === 0"
           @keyup.enter="clickOK"
         />
       </div>
     </q-card-section>
     <q-card-actions align="right">
-      <q-btn color="negative" label="取消" v-close-popup />
-      <q-btn color="blue-9" label="确定" @click="clickOK" v-close-popup />
+      <q-btn color="negative" label="取消" @click="hide" />
+      <q-btn color="blue-9" label="确定" @click="clickOK" />
     </q-card-actions>
   </q-card>
 </template>
@@ -34,8 +34,12 @@ export default {
     options: Object,
   },
   methods: {
+    hide() {
+      this.$emit("hide");
+    },
     clickOK() {
       this.$emit("clickOK", this.results);
+      this.hide();
     },
   },
 };
diff --git a/src/components/quickcommandUI/QuickCommand.vue b/src/components/quickcommandUI/QuickCommand.vue
index 05922b3..14497a2 100644
--- a/src/components/quickcommandUI/QuickCommand.vue
+++ b/src/components/quickcommandUI/QuickCommand.vue
@@ -16,7 +16,14 @@
   <!-- waitButton 单独一个 -->
   <q-dialog seamless position="right" style="z-index: 9999" v-model="showWb">
     <q-card>
-      <q-btn color="primary" :label="wbLabel" @click="wbEvent" v-close-popup />
+      <q-btn
+        color="primary"
+        :label="wbLabel"
+        @click="
+          showWb = false;
+          wbEvent();
+        "
+      />
     </q-card>
   </q-dialog>
 </template>
diff --git a/src/components/quickcommandUI/TextArea.vue b/src/components/quickcommandUI/TextArea.vue
index 52375c2..2b95406 100644
--- a/src/components/quickcommandUI/TextArea.vue
+++ b/src/components/quickcommandUI/TextArea.vue
@@ -19,7 +19,7 @@
       }"
     />
     <div class="fixed-bottom-right q-pa-md q-gutter-sm">
-      <q-btn round color="blue-grey" icon="arrow_back" v-close-popup />
+      <q-btn round color="blue-grey" icon="arrow_back" @click="hide" />
       <q-btn round color="primary" icon="done" @click="clickOK" />
     </div>
   </q-card>
@@ -36,8 +36,12 @@ export default {
     options: Object,
   },
   methods: {
+    hide() {
+      this.$emit("hide");
+    },
     clickOK() {
       this.$emit("clickOK", this.result);
+      this.hide();
     },
   },
 };