From 99cadf31303b6199eee8a072a32b50e9bde4d364 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Sat, 28 Dec 2024 19:44:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BE=93=E5=87=BA=E7=BB=93?=
 =?UTF-8?q?=E6=9E=9C=E7=9B=B8=E5=85=B3=E5=87=BD=E6=95=B0=E5=8F=8A=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/CommandRunResult.vue |  6 +++---
 src/components/popup/ResultMenu.vue | 16 ++++++++--------
 src/js/options/outputTypes.js       |  8 ++++----
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/components/CommandRunResult.vue b/src/components/CommandRunResult.vue
index 0e92208..f57bc72 100644
--- a/src/components/CommandRunResult.vue
+++ b/src/components/CommandRunResult.vue
@@ -13,11 +13,11 @@
           <div>
             <q-avatar :size="`${headerHeight}`">
               <q-icon :class="runResultStatus ? 'text-green' : 'text-red'"
-                :name="runResultStatus ? 'task_alt' : 'error'"></q-icon>
+                :name="runResultStatus ? 'task_alt' : 'error'" size="sm"></q-icon>
             </q-avatar>
-            <span class="text-weight-bold text-h6">运行结果</span>
+            <span class="text-weight-bold text-h7">运行结果</span>
           </div>
-          <ResultMenu class="no-shadow" :stretch="true" :content="runResult.join('')" :closebtn="!fromUtools"
+          <ResultMenu class="no-shadow q-pa-sm" :stretch="true" :content="runResult.join('')" :closebtn="!fromUtools"
             :textbtn="!enableHtml" :imagebtn="!enableHtml && isDataUrl" @showImg="showBase64Img" :style="{
       height: headerHeight + 'px',
     }" />
diff --git a/src/components/popup/ResultMenu.vue b/src/components/popup/ResultMenu.vue
index 0745a77..5a6c0a5 100644
--- a/src/components/popup/ResultMenu.vue
+++ b/src/components/popup/ResultMenu.vue
@@ -1,16 +1,17 @@
 <template>
   <q-btn-group :stretch="stretch" class="text-primary">
-    <q-btn icon="image" @click="dataUrlToImg" v-show="imagebtn" :dense="dense"
+    <q-btn icon="image" @click="dataUrlToImg" v-show="imagebtn" dense size="sm"
       ><q-tooltip v-if="!dense">将 DataUrl 转为图片</q-tooltip></q-btn
     >
     <q-btn
       icon="content_paste"
       @click="copyResult"
       v-show="textbtn"
-      :dense="dense"
+      dense
+      size="sm"
       ><q-tooltip v-if="!dense">复制到剪贴板</q-tooltip></q-btn
     >
-    <q-btn icon="send" @click="sendResult" v-show="textbtn" :dense="dense"
+    <q-btn icon="send" size="sm" @click="sendResult" v-show="textbtn" dense
       ><q-tooltip v-if="!dense">发送到活动窗口</q-tooltip></q-btn
     >
     <q-btn
@@ -18,7 +19,8 @@
       class="text-negative"
       v-close-popup
       v-show="closebtn"
-      :dense="dense"
+      dense
+      size="sm"
     />
   </q-btn-group>
 </template>
@@ -35,13 +37,11 @@ export default {
   },
   methods: {
     copyResult() {
-      utools.copyText(this.content);
+      window.utools.copyText(this.content);
       quickcommand.showMessageBox("已复制到剪贴板");
     },
     sendResult() {
-      utools.copyText(this.content);
-      utools.hideMainWindow();
-      quickcommand.simulatePaste();
+      window.utools.hideMainWindowTypeString(this.content);
     },
     dataUrlToImg() {
       let imgs = this.content
diff --git a/src/js/options/outputTypes.js b/src/js/options/outputTypes.js
index 7fe5f70..1e7625e 100644
--- a/src/js/options/outputTypes.js
+++ b/src/js/options/outputTypes.js
@@ -41,22 +41,22 @@ const outputTypes = {
         label: "复制到剪贴板",
         icon: "content_paste",
         outPlugin: true,
-        action: result => window.copyTo(result)
+        action: result => window.utools.copyText(result)
     },
     send: {
         name: "send",
         label: "发送到活动窗口",
         icon: "web_asset",
         outPlugin: true,
-        action: result => window.send(result)
+        action: result => window.utools.hideMainWindowTypeString(result)
     },
     notice: {
         name: "notice",
         label: "发送系统通知",
         icon: "sms",
         outPlugin: true,
-        action: result => window.message(result)
+        action: result => window.utools.showNotification(result)
     },
 };
 
-export default outputTypes
\ No newline at end of file
+export default outputTypes