From cec3fdfcae299197db1e9059e57842f72637d4b2 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Tue, 28 Jul 2020 10:09:19 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=AF=BC=E5=85=A5=E5=91=BD=E4=BB=A4?=
 =?UTF-8?q?=E5=90=8E=E6=A0=87=E7=AD=BE=E8=B7=B3=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/index.js | 47 +++++++++++++++++++++++++++++----------------
 1 file changed, 30 insertions(+), 17 deletions(-)

diff --git a/src/assets/index.js b/src/assets/index.js
index f71f4fd..90c4c15 100644
--- a/src/assets/index.js
+++ b/src/assets/index.js
@@ -33,7 +33,7 @@
         return utoolsFull.db.allDocs(key)
     }
     // 获取所有 qc，等效于 1.6 版本 getDB('customFts')
-    window.getAllQuickCommands = () => {
+    let getAllQuickCommands = () => {
         let allQcs = {}
         getDocs(QC_PREFIX).forEach(x => allQcs[x.data.features.code] = x.data)
         return allQcs
@@ -328,13 +328,14 @@
         if (pushData.single) {
             var code = pushData.qc.features.code;
             putDB(pushData.qc, QC_PREFIX + code);
+            return { tags: pushData.qc.tags, code: code }
         // 多个命令导入
         } else {
             for (var code of Object.keys(pushData.qc)) {
                 putDB(pushData.qc[code], QC_PREFIX + code);
             }
+            return true
         }
-        return true
     }
 
     // 全部导出
@@ -917,8 +918,14 @@
                 break;
             case 'import':
                 var success = importCommand()
-                if (success) showOptions() || quickcommand.showMessageBox("导入成功")
-                else if (success == false) quickcommand.showMessageBox("导入失败，格式错误", "error")
+                if (success) {
+                    if (success instanceof Object) locateToCode(success.tags, success.code)
+                    else showOptions()
+                    quickcommand.showMessageBox("导入成功")
+                }
+                else if (success == false) {
+                    quickcommand.showMessageBox("导入失败，格式错误", "error")
+                }
                 break;
             case 'enableAll': $(".checked-switch:not(:checked)").click();
                 break;
@@ -1391,19 +1398,7 @@
                 if ($('#customize').data('returnShare')) {
                     getSharedQCFromYuQue()
                 } else {
-                    // 保存后标签跳转处理
-                    var redirectTag, currentTag = $('.currentTag').text()
-                    if (tags.length) {
-                        if (pushData.tags.includes(currentTag)) {
-                            redirectTag = currentTag
-                        } else {
-                            redirectTag = pushData.tags[0]
-                        }
-                    } else {
-                        redirectTag = "未分类"
-                    }
-                    showOptions(redirectTag);
-                    location.href = '#' + code
+                    locateToCode(pushData.tags, code)
                     let checkSwitch = $(`#${code} .checked-switch`)
                     checkSwitch.click()
                     checkSwitch.is(':checked') || checkSwitch.click()
@@ -1412,6 +1407,24 @@
         }
     }
 
+    // 保存后标签跳转处理
+    let locateToCode = (tags, code) => {
+        let redirectTag
+        let currentTag = $('.currentTag').text()
+        // let AllTags = Array.from($('.sidebar li')).map(x => x.innerText)
+        if (tags.length) {
+            if (tags.includes(currentTag)) {
+                redirectTag = currentTag
+            } else {
+                redirectTag = tags[0]
+            }
+        } else {
+            redirectTag = "未分类"
+        }
+        showOptions(redirectTag);
+        location.href = '#' + code
+    }
+
     // 显示运行结果
     let showRunResult = (content, raw, success) => {
         var options, position, showClass, hideClass, maxlength = 100000