From f34b80ee42476fa5eccc8be576b948e202b53ec4 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Fri, 1 Mar 2024 09:24:52 +0800
Subject: [PATCH] =?UTF-8?q?quickcommand.showConfirmBox=E6=94=AF=E6=8C=81ht?=
 =?UTF-8?q?ml=E5=8F=8A=E8=AE=BE=E7=BD=AE=E5=AE=BD=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/quickcommandUI/ConfirmBox.vue  | 16 ++++--
 .../quickcommandUI/QuickCommand.vue           | 49 ++++++-------------
 2 files changed, 28 insertions(+), 37 deletions(-)

diff --git a/src/components/quickcommandUI/ConfirmBox.vue b/src/components/quickcommandUI/ConfirmBox.vue
index 7266c1f..fa6136d 100644
--- a/src/components/quickcommandUI/ConfirmBox.vue
+++ b/src/components/quickcommandUI/ConfirmBox.vue
@@ -1,11 +1,12 @@
 <template>
-  <q-card class="q-dialog-plugin">
+  <q-card class="q-dialog-plugin" :style="{
+    width: options.width ? options.width + 'px' : '450px'
+  }">
     <q-card-section>
       <div class="text-h5" align="left" v-text="options.title"></div>
     </q-card-section>
-    <q-card-section>
-      {{ options.message }}
-    </q-card-section>
+    <q-card-section v-if="options.isHtml" v-html="options.message" class="content" />
+    <q-card-section v-else v-text="options.message" class="content" />
     <q-card-section class="flex justify-end q-gutter-sm">
       <q-btn flat label="取消" color="grey" @click="hide" />
       <q-btn flat autofocus label="确定" color="primary" @click="clickOK()" />
@@ -29,3 +30,10 @@ export default {
   },
 };
 </script>
+
+<style scoped>
+.content {
+  overflow: auto;
+  max-height: 350px;
+}
+</style>
diff --git a/src/components/quickcommandUI/QuickCommand.vue b/src/components/quickcommandUI/QuickCommand.vue
index 05be426..52fb595 100644
--- a/src/components/quickcommandUI/QuickCommand.vue
+++ b/src/components/quickcommandUI/QuickCommand.vue
@@ -1,30 +1,13 @@
 <template>
-  <q-dialog
-    v-model="showDialog"
-    :maximized="maximized"
-    :transition-show="maximized ? 'fade' : 'scale'"
-    :transition-hide="maximized ? 'fade' : 'scale'"
-  >
-    <component
-      ref="ui"
-      :is="currentUI"
-      :options="options"
-      @clickOK="clickOK"
-      @hide="showDialog = false"
-    />
+  <q-dialog v-model="showDialog" :maximized="maximized" :transition-show="maximized ? 'fade' : 'scale'"
+    :transition-hide="maximized ? 'fade' : 'scale'">
+    <component ref="ui" :is="currentUI" :options="options" @clickOK="clickOK" @hide="showDialog = false" />
   </q-dialog>
   <!-- waitButton 单独一个 -->
-  <q-btn
-    class="fixed-top-right"
-    style="z-index: 9999"
-    v-if="showWb"
-    color="primary"
-    :label="wbLabel"
-    @click="
-      showWb = false;
-      wbEvent();
-    "
-  />
+  <q-btn class="fixed-top-right" style="z-index: 9999" v-if="showWb" color="primary" :label="wbLabel" @click="
+    showWb = false;
+  wbEvent();
+  " />
 </template>
 
 <script>
@@ -79,9 +62,9 @@ export default {
           this.showUI(ButtonBox, { labels, title }, false, reslove);
         }),
 
-      showConfirmBox: (message = "", title = "提示") =>
+      showConfirmBox: (message = "", title = "提示", isHtml = false, width) =>
         new Promise((reslove, reject) => {
-          this.showUI(ConfirmBox, { message, title }, false, reslove);
+          this.showUI(ConfirmBox, { message, title, isHtml, width }, false, reslove);
         }),
 
       showMessageBox: (message, icon = "success", time) => {
@@ -98,11 +81,11 @@ export default {
           actions:
             time === 0
               ? [
-                  {
-                    label: "确定",
-                    color: "white",
-                  },
-                ]
+                {
+                  label: "确定",
+                  color: "white",
+                },
+              ]
               : [],
         });
       },
@@ -160,8 +143,8 @@ export default {
     Object.freeze(quickcommand);
   },
   methods: {
-    clickOK() {},
-    wbEvent() {},
+    clickOK() { },
+    wbEvent() { },
     showUI(uiComponent, options, maximized, reslove) {
       this.showDialog = true;
       this.options = options;