fix(network): Fix disableLogScrolling not working in Network panel.…

… (issue #282, #379)
Tencent · Apr 28, 2021 · 2a4fd4d · 2a4fd4d
1 parent 2817f73
commit 2a4fd4d
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,12 +1,13 @@
 English | [简体中文](./CHANGELOG_CN.md)
 
 
-#### 3.5.0 (2021-MM-DD)
+#### 3.5.0 (2021-04-28)
 
 - `Feature(Log)` Add button to copy logs. (by @akai)
 - `Feature(Plugin)` New third-party plugin [vconsole-vue-devtools-plugin](https://github.com/Zippowxk/vue-vconsole-devtools). (by @Zippowxk)
 - `Fix(Log)` Do not sort array's keys. (issue #372)
 - `Fix(Network)` Fix error when `contentType` is `text/html`. (by @zimv)
+- `Fix(Network)` Fix `disableLogScrolling` not working in Network panel. (issue #282, #379)
 
 
 #### V3.4.1 (2021-04-09)

diff --git a/dev/log.html b/dev/log.html
@@ -37,6 +37,11 @@
   }
 });
 
+// setInterval(() => {
+//   console.log(Math.random());
+//   console.log('[system]', Math.random());
+// }, 300);
+
 function formattedLog() {
   console.info('formattedLog() Start');
   console.log('[default]', 'This log should be shown in Log tab.');

diff --git a/dev/network.html b/dev/network.html
@@ -24,7 +24,17 @@
 </html>
 
 <script>
-window.vConsole = new window.VConsole();
+window.vConsole = new window.VConsole({
+  maxLogNumber: 1000,
+  // disableLogScrolling: true,
+  onReady: function() {
+    console.log('vConsole is ready.');
+  }
+});
+
+// setInterval(() => {
+//   postAjax();
+// }, 300);
 
 function postAjax() {
   console.info('postAjax() Start, response should be logged after End');

diff --git a/dist/vconsole.min.js b/dist/vconsole.min.js
diff --git a/src/network/network.js b/src/network/network.js
@@ -109,7 +109,7 @@ class VConsoleNetworkTab extends VConsolePlugin {
   onShow() {
     this.isShow = true;
     if (this.isInBottom == true) {
-      this.scrollToBottom();
+      this.autoScrollToBottom();
     }
   }
 
@@ -119,6 +119,12 @@ class VConsoleNetworkTab extends VConsolePlugin {
 
   onShowConsole() {
     if (this.isInBottom == true) {
+      this.autoScrollToBottom();
+    }
+  }
+
+  autoScrollToBottom() {
+    if (!this.vConsole.option.disableLogScrolling) {
       this.scrollToBottom();
     }
   }
@@ -254,8 +260,8 @@ class VConsoleNetworkTab extends VConsolePlugin {
     }
 
     // scroll to bottom
-    if (this.isInBottom) {
-      this.scrollToBottom();
+    if (this.isInBottom && this.isShow) {
+      this.autoScrollToBottom();
     }
   }