try catch errors when eval commands, fix issue Tencent#86

hqdmyjsw · Dec 27, 2016 · 2266b8a · 2266b8a
1 parent 169e2b0
commit 2266b8a
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 22 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 English | [简体中文](./CHANGELOG_CN.md)
 
+#### V2.5.2 (2016-12-??)
+
+- [FIX] Catch errors when eval custom commands in Log tab.
+
+
 #### V2.5.1 (2016-10-18)
 
 - [FIX] Fix `scrollHeight` error in some cases.

diff --git a/CHANGELOG_CN.md b/CHANGELOG_CN.md
@@ -1,5 +1,9 @@
 [English](./CHANGELOG.md) | 简体中文
 
+#### V2.5.2 (2016-12-??)
+
+- 【修复】捕获执行自定义命令行时发生的错误。
+
 #### V2.5.1 (2016-10-18)
 
 - 【修复】修复一些情况下的 `scrollHeight` 错误。

diff --git a/dist/vconsole.min.js b/dist/vconsole.min.js
diff --git a/src/log/default.js b/src/log/default.js
@@ -71,29 +71,38 @@ class VConsoleDefaultTab extends VConsoleLogTab {
       style: ''
     });
     // eval
-    let result = eval(cmd);
-    // print result to console
-    let $content;
-    if (tool.isArray(result) || tool.isObject(result)) {
-      $content = this.getFoldedLine(result);
-    } else {
-      if (tool.isNull(result)) {
-        result = 'null';
-      } else if (tool.isUndefined(result)) {
-        result = 'undefined';
-      } else if (tool.isFunction(result)) {
-        result = 'function()'
-      } else if (tool.isString(result)) {
-        result = '"' + result + '"';
+    try {
+      let result = eval(cmd);
+      // print result to console
+      let $content;
+      if (tool.isArray(result) || tool.isObject(result)) {
+        $content = this.getFoldedLine(result);
+      } else {
+        if (tool.isNull(result)) {
+          result = 'null';
+        } else if (tool.isUndefined(result)) {
+          result = 'undefined';
+        } else if (tool.isFunction(result)) {
+          result = 'function()'
+        } else if (tool.isString(result)) {
+          result = '"' + result + '"';
+        }
+        $content = $.render(tplItemCode, {content: result, type: 'output'});
       }
-      $content = $.render(tplItemCode, {content: result, type: 'output'});
+      this.printLog({
+        logType: 'log',
+        content: $content,
+        noMeta: true,
+        style: ''
+      });
+    } catch (e) {
+      this.printLog({
+        logType: 'error',
+        logs: [e.message],
+        noMeta: true,
+        style: ''
+      });
     }
-    this.printLog({
-      logType: 'log',
-      content: $content,
-      noMeta: true,
-      style: ''
-    });
   }
 
 } // END class