From fb509cb39a15ce9e3c940042ffbeeb901dabdf85 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Sat, 6 Jun 2020 20:38:46 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E6=A1=A3=E7=95=8C=E9=9D=A2=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E5=AF=BC=E8=88=AA=E7=9B=AE=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/index.js                   |  5 ++++-
 src/assets/options.js                 |  4 ++--
 src/assets/plugins/jquery.autoMenu.js | 10 ++++++----
 src/assets/styles/jquery.autoMenu.css | 12 ++++++------
 src/assets/styles/manual.css          |  7 ++++++-
 5 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/src/assets/index.js b/src/assets/index.js
index 52e4144e..6d74835a 100644
--- a/src/assets/index.js
+++ b/src/assets/index.js
@@ -104,7 +104,10 @@ showManual = path => {
             $('#manualNavi').autoMenu();
             if ($('h1,h2,h3').length < 10 && $('#manual ul').is(":visible")) {
                 $('.btn-box span').removeClass('icon-minus-sign').addClass('icon-plus-sign')
+                // $('#manualBody').removeClass('withNaviBar')
                 $('#manual ul').hide()
+            // } else {
+            //     $('#manualBody').addClass('withNaviBar')
             }
             manualSubInput();
         });
@@ -242,7 +245,7 @@ utools.onPluginEnter( async ({ code, type, payload }) => {
             } else {
                 manualSubInput();
             }
-            if (type == 'over') {
+            if (type == 'regex') {
                 utools.setSubInputValue(payload)
                 // showList(payload, index, 300)
             } else {
diff --git a/src/assets/options.js b/src/assets/options.js
index acff5821..1c133981 100644
--- a/src/assets/options.js
+++ b/src/assets/options.js
@@ -49,7 +49,7 @@ showOptions = async () => {
             if (c.code == features.code) {
                 isChecked1 = 'checked';
                 isDisabled2 = '';
-                if (c.cmds[c.cmds.length - 1].type == 'over') isChecked2 = 'checked';
+                if (c.cmds[c.cmds.length - 1].type == 'regex') isChecked2 = 'checked';
                 break;
             }
         }
@@ -140,7 +140,7 @@ $("#options").on('change', 'input[type=checkbox]', async function () {
         if($(this).prop('checked')){
             featureConf.cmds.push({
                 "type": "regex",
-                "match":"/[a-zA-Z\\.\\_]{2,20}/i",
+                "match":"/^[a-zA-Z._]{2,20}$/i",
                 "label": featureConf.cmds[0]
             });
         }
diff --git a/src/assets/plugins/jquery.autoMenu.js b/src/assets/plugins/jquery.autoMenu.js
index d2c772d7..6e800b4d 100644
--- a/src/assets/plugins/jquery.autoMenu.js
+++ b/src/assets/plugins/jquery.autoMenu.js
@@ -107,17 +107,19 @@
                 var _this = this;
                 $('#manual').scroll(function() {
                     _this.setActive()
-                    var actived = $('#manual .active')
-                    if(actived) actived.get(0).scrollIntoView({ behavior: "smooth", block: "center" });
+                    var actived = $('#manual .active').get(0)
+                    if(actived) actived.scrollIntoView({ behavior: "smooth", block: "center" });
                 });
                 _this.$element.off()
                 _this.$element.on('click', '.btn-box', function() {
                     if ($(this).find('span').hasClass('icon-minus-sign')) {
                         $(this).find('span').removeClass('icon-minus-sign').addClass('icon-plus-sign');
                         _this.$element.find('ul').fadeOut();
+                        // $('#manualBody').removeClass('withNaviBar')
                     } else {
                         $(this).find('span').removeClass('icon-plus-sign').addClass('icon-minus-sign');
                         _this.$element.find('ul').fadeIn();
+                        // $('#manualBody').addClass('withNaviBar')
                     }
 
                 })
@@ -159,8 +161,8 @@
         levelOne: 'h1', //一级标题
         levelTwo: 'h2', //二级标题（暂不支持更多级）
         levelThree: 'h3', //二级标题（暂不支持更多级）
-        width: 200, //容器宽度
-        height: 400, //容器高度
+        width: 220, //容器宽度
+        height: 480, //容器高度
         padding: 20, //内部间距
         offTop: 100, //滚动切换导航时离顶部的距离
 
diff --git a/src/assets/styles/jquery.autoMenu.css b/src/assets/styles/jquery.autoMenu.css
index cff41ae3..ccd1f0ea 100644
--- a/src/assets/styles/jquery.autoMenu.css
+++ b/src/assets/styles/jquery.autoMenu.css
@@ -50,8 +50,8 @@ a:focus {
 
 #manualNavi {
     position: fixed;
-    bottom: 10%;
-    right: 5%;
+    bottom: 0;
+    right: 15px;
     z-index: 1;
     text-align: left;
 }
@@ -102,8 +102,8 @@ a:focus {
     border: 4px solid #91ba61;
     background: #91ba61;
     position: absolute;
-    top: -415px;
-    left: 245px;
+    /* top: 0px; */
+    left: 235px;
 }
 
 .icon-plus-sign:before,
@@ -131,8 +131,8 @@ a:focus {
     border: 4px solid #ff5370;
     background: #ff5370;
     position: absolute;
-    top: -415px;
-    left: 245px;
+    /* top: 0px; */
+    left: 235px;
 }
 
 .icon-minus-sign:before {
diff --git a/src/assets/styles/manual.css b/src/assets/styles/manual.css
index 7caaa769..11017458 100644
--- a/src/assets/styles/manual.css
+++ b/src/assets/styles/manual.css
@@ -973,4 +973,9 @@ pre code {
 
 #manual .pl-12 {
     padding-left: 128px !important;
-}
\ No newline at end of file
+}
+
+/* #manual .withNaviBar {
+    padding-right: 250px;
+    transition: 0.2s;
+} */
\ No newline at end of file