diff --git a/plugin/lib/quickcomposer/simulate/screenCapture.js b/plugin/lib/quickcomposer/simulate/screenCapture.js index 954b720..44905d9 100644 --- a/plugin/lib/quickcomposer/simulate/screenCapture.js +++ b/plugin/lib/quickcomposer/simulate/screenCapture.js @@ -115,15 +115,15 @@ async function captureScreen(range = "fullscreen") { } async function captureScreenToFile(range = "fullscreen", path = null) { - if (!path) return null; + if (!path) return; const result = await captureScreen(range); - if (!result) return null; + if (!result) return; fs.writeFileSync( path, result.replace("data:image/png;base64,", ""), "base64" ); - return result; + return; } async function captureScreenToClipboard(range = "fullscreen") { diff --git a/src/components/composer/simulate/ImageSearchEditor.vue b/src/components/composer/simulate/ImageSearchEditor.vue index a446891..8249b4a 100644 --- a/src/components/composer/simulate/ImageSearchEditor.vue +++ b/src/components/composer/simulate/ImageSearchEditor.vue @@ -26,9 +26,7 @@ @@ -37,16 +35,16 @@
- +
- - 从剪贴板读取 + + 截图查找
@@ -157,7 +155,6 @@ export default defineComponent({ try { const reader = new FileReader(); reader.onload = (e) => { - this.argvs.imagePreview = e.target.result; this.updateArgvs("imagePreview", e.target.result); }; reader.readAsDataURL(file); @@ -176,7 +173,6 @@ export default defineComponent({ const blob = item.getAsFile(); const reader = new FileReader(); reader.onload = (e) => { - this.argvs.imagePreview = e.target.result; this.updateArgvs("imagePreview", e.target.result); }; reader.readAsDataURL(blob); @@ -186,17 +182,16 @@ export default defineComponent({ }, // 从剪贴板读取 - async pasteFromClipboard() { - const clipboardImage = quickcommand.readClipboardImage(); - if (!clipboardImage) - return quickcommand.showMessageBox("剪贴板中没有图片", "warning"); - this.argvs.imagePreview = clipboardImage; - this.updateArgvs("imagePreview", clipboardImage); + async getImgByCaptureScreen() { + const img = await quickcomposer.simulate.captureScreenToClipboard({ + type: "area", + }); + if (!img) return; + this.updateArgvs("imagePreview", img); }, // 清除图片 clearImage() { - this.argvs.imagePreview = ""; this.updateArgvs("imagePreview", ""); },