From f52053b7637d4d065db0b7def79348da5fcdf889 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Sun, 14 Jun 2020 15:39:27 +0800
Subject: [PATCH] =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=AE=9E=E6=97=B6=E7=BB=93?=
 =?UTF-8?q?=E6=9E=9C=EF=BC=8C=E6=B7=BB=E5=8A=A0vscode=E5=BF=AB=E6=8D=B7?=
 =?UTF-8?q?=E9=94=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/options.js | 47 ++++++++++++++++++++++++++-----------------
 1 file changed, 29 insertions(+), 18 deletions(-)

diff --git a/src/assets/options.js b/src/assets/options.js
index 6eb0035..0aa21fb 100644
--- a/src/assets/options.js
+++ b/src/assets/options.js
@@ -309,7 +309,7 @@ let showCustomize = () => {
         lineWrapping: true,
         autoCloseBrackets: true,
         styleActiveLine: true,
-        keyMap: "vscode",
+        keyMap: "sublime",
         theme: "mdn-like",
         extraKeys: {
             "Alt-Enter": cm => {
@@ -324,7 +324,9 @@ let showCustomize = () => {
             "Ctrl-Q": () => {
                 quitQuickCommand()
             },
-            "Ctrl-F": "findPersistent",
+            "Alt-Up": "swapLineUp",
+            "Alt-Down": "swapLineDown",
+            "Shift-Alt-Down": "duplicateLine"
           }
     });
 
@@ -776,31 +778,40 @@ let SaveQuickCommand = async () => {
 // 显示运行结果
 let showResult = (content, raw, success) => {
     var options
-    var htmlEncode = value => {
-        return !value ? value : String(value).replace(/&/g, "&amp;").replace(/>/g, "&gt;").replace(/</g, "&lt;").replace(/"/g, "&quot;")
+    var maxlength = raw ? 1000 : 100000
+    var htmlEncode = (value, raw) => {
+        return raw ? String(value).replace(/&/g, "&amp;").replace(/>/g, "&gt;").replace(/</g, "&lt;").replace(/"/g, "&quot;") : value
     }
     var preView = () => {
         var result = $('#swal2-content').text()
         var style = "text-align: left; padding: 0px 10px; white-space: pre-wrap; word-break: break-all;"
-        if (raw) result = htmlEncode(result)
+        result = htmlEncode(result, raw)
+        $(".swal2-content").css("width", "100%")
         $('#swal2-content').html(`<pre style="${style}">${result}</pre>`)
         $('.swal2-popup').addClass('swal2-toast')
     }
-    options = {
-        onBeforeOpen: preView,
-        icon: success ? "success" : "error",
-        text: content,
-        position: 'top',
-        width: 800,
-        showConfirmButton: false,
-        showClass: {
-            popup: 'fadeInDownWindow'
-        },
-        hideClass: {
-            popup: 'fadeOutUpWindow'
+    var contlength = content.length
+    if(contlength > maxlength) content = content.slice(0, maxlength - 100) + `\n\n...\n${contlength - maxlength - 100} 字省略\n...\n\n` + content.slice(contlength - 100)
+    content += '\n'
+    if (Swal.isVisible()) {
+        $("#swal2-content > pre").append(htmlEncode(content, raw))
+    } else {
+        options = {
+            onBeforeOpen: preView,
+            icon: success ? "success" : "error",
+            text: content,
+            position: 'top',
+            width: 800,
+            showConfirmButton: false,
+            showClass: {
+                popup: 'fadeInDownWindow'
+            },
+            hideClass: {
+                popup: 'fadeOutUpWindow'
+            }
         }
+        Swal.fire(options)
     }
-    Swal.fire(options)
 }
 
 let runQuickCommand = () => {