v3.2.1 released, merge from dev

bothyan · Jan 16, 2019 · b306116 · b306116
2 parents 1dd6392 + 05c262e
commit b306116
Show file tree

Hide file tree

Showing 20 changed files with 246 additions and 185 deletions.
diff --git a/.babelrc b/.babelrc
@@ -1,7 +1,24 @@
 {
   "presets": [
-    "es2015",
-    "stage-3"
+    [
+      "@babel/env",
+      {
+        "modules": 'umd',
+        "targets": {
+          "node": "8.9",
+        },
+      },
+    ],
+  ],
+  "plugins": [
+    [
+      "@babel/plugin-proposal-class-properties",
+      {
+        "loose": true,
+      },
+    ],
+    "@babel/plugin-proposal-export-namespace-from",
+    "@babel/plugin-proposal-object-rest-spread",
+    "add-module-exports"
   ],
-  "plugins": ["add-module-exports"]
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,15 @@
 English | [简体中文](./CHANGELOG_CN.md)
 
+#### V3.2.1 (2019-01-16)
+
+- [FEATURE] Add console command prompt. (by @65147400)
+- [FIX] Fix `JSON.stringify` function which was incorrectly rewritten.
+- [FIX] Fix `logNumber` bug which was not reset when clear logs. (by @liuyuekeng)
+- [FIX] Fix unencoded HTML tag in Network tab. (by @mokang)
+- [FIX] Fix possible crash when decode content in Storage tab. (by @wolfsilver)
+- [IMPROVE] Add bottom safe area to adapt to full screen such as iPhone X. (by @dingyi1993)
+
+
 #### V3.2.0 (2018-04-10)
 
 - [FEATURE] Support `console.time()` and `console.timeEnd()`.

diff --git a/CHANGELOG_CN.md b/CHANGELOG_CN.md
@@ -1,5 +1,15 @@
 [English](./CHANGELOG.md) | 简体中文
 
+#### V3.2.1 (2019-01-16)
+
+- 【特性】新增控制台输入提示。 (by @65147400)
+- 【修复】修复 `JSON.stringify` 函数被错误地改写的问题。
+- 【修复】修复清空日志时没有重置 `logNumber` 的问题。 (by @liuyuekeng)
+- 【修复】修复 Network 面板中 HTML 标签未被 encode 的问题。 (by @mokang)
+- 【修复】修复 Storage 面板 decode 内容时可能会导致崩溃的问题。 (by @wolfsilver)
+- 【优化】增加底部安全区域，适配 iPhone X 等全面屏。 (by @dingyi1993)
+
+
 #### V3.2.0 (2018-04-10)
 
 - 【特性】支持 `console.time()` 及 `console.timeEnd()`。

diff --git a/README.md b/README.md
@@ -69,13 +69,7 @@ Plugin:
 
  - [vConsole-sources](https://github.com/WechatFE/vConsole-sources)
  - [vconsole-webpack-plugin](https://github.com/diamont1001/vconsole-webpack-plugin)
-
-
-## CDN
-
-- [v3.0.0](https://res.wx.qq.com/mmbizwap/zh_CN/htmledition/js/vconsole/3.0.0/vconsole.min.js) (Recommended)
-- [v2.5.2](https://res.wx.qq.com/mmbizwap/zh_CN/htmledition/js/vconsole/2.5.2/vconsole.min.js)
-
+
 
 ## Changelog
 

diff --git a/README_CN.md b/README_CN.md
@@ -81,13 +81,6 @@ vConsole 本体：
 
 
 
-## CDN
-
-- [v3.0.0](https://res.wx.qq.com/mmbizwap/zh_CN/htmledition/js/vconsole/3.0.0/vconsole.min.js) （推荐）
-- [v2.5.2](https://res.wx.qq.com/mmbizwap/zh_CN/htmledition/js/vconsole/2.5.2/vconsole.min.js)
-
-
-
 ## 交流反馈
 
 QQ 群：497430533

diff --git a/dist/vconsole.min.js b/dist/vconsole.min.js
diff --git a/example/demo1.html b/example/demo1.html
@@ -2,7 +2,7 @@
 <html>
 <head>
   <meta charset="utf-8">
-  <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no, viewport-fit=cover">
   <title>vConsole/Demo1</title>
   <link href="./lib/weui.min.css" rel="stylesheet"/>
   <link href="./lib/demo.css" rel="stylesheet"/>
@@ -12,7 +12,7 @@
 
   <!-- 引入vConsole的JS库 -->
   <script src="../dist/vconsole.min.js"></script>
-  
+
 </head>
 <body ontouchstart>
   <div class="page">

diff --git a/example/demo2.php b/example/demo2.php
@@ -8,7 +8,7 @@
 <html>
 <head>
   <meta charset="utf-8">
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no, viewport-fit=cover">
   <title>vConsole/Demo2</title>
   <link href="./lib/weui.min.css" rel="stylesheet"/>
   <link href="./lib/demo.css" rel="stylesheet"/>

diff --git a/example/demo3.php b/example/demo3.php
@@ -6,7 +6,7 @@
 <html>
 <head>
   <meta charset="utf-8">
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no, viewport-fit=cover">
   <title>vConsole/Demo3</title>
   <link href="./lib/weui.min.css" rel="stylesheet"/>
   <link href="./lib/demo.css" rel="stylesheet"/>

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vconsole",
-  "version": "3.2.0",
+  "version": "3.2.1",
   "description": "A lightweight, extendable front-end developer tool for mobile web page.",
   "homepage": "https://github.com/Tencent/vConsole",
   "main": "dist/vconsole.min.js",
@@ -19,22 +19,24 @@
   },
   "dependencies": {},
   "devDependencies": {
-    "babel-core": "^6.7.7",
-    "babel-loader": "^6.2.4",
-    "babel-plugin-add-module-exports": "^0.1.4",
-    "babel-preset-es2015": "^6.6.0",
-    "babel-preset-stage-3": "^6.5.0",
-    "chai": "^3.5.0",
-    "css-loader": "^0.23.1",
-    "extract-text-webpack-plugin": "^1.0.1",
-    "html-loader": "^0.4.3",
-    "jsdom": "^9.2.1",
-    "json-loader": "^0.5.4",
-    "less": "^2.5.3",
-    "less-loader": "^2.2.3",
-    "mocha": "^2.5.3",
-    "style-loader": "^0.13.1",
-    "webpack": "~1.12.11"
+    "@babel/core": "^7.2.2",
+    "@babel/preset-env": "^7.2.3",
+    "@babel/plugin-proposal-class-properties": "^7.2.3",
+    "@babel/plugin-proposal-export-namespace-from": "^7.2.0",
+    "@babel/plugin-proposal-object-rest-spread": "^7.2.0",
+    "babel-loader": "^8.0.4",
+    "babel-plugin-add-module-exports": "^1.0.0",
+    "chai": "^4.2.0",
+    "css-loader": "^2.1.0",
+    "html-loader": "^0.5.5",
+    "jsdom": "^13.1.0",
+    "json-loader": "^0.5.7",
+    "less": "^3.9.0",
+    "less-loader": "^4.1.0",
+    "mocha": "^5.2.0",
+    "style-loader": "^0.23.1",
+    "webpack": "^4.28.4",
+    "webpack-cli": "^3.2.1"
   },
   "author": "Tencent",
   "license": "MIT"

diff --git a/src/core/core.less b/src/core/core.less
@@ -107,6 +107,8 @@
     right: 0;
     bottom: 40em / @font;
     -webkit-overflow-scrolling: touch;
+    margin-bottom: constant(safe-area-inset-bottom);
+    margin-bottom: env(safe-area-inset-bottom);
   }
   .vc-content.vc-has-topbar {
     top: 71em / @font;
@@ -371,6 +373,21 @@
       .vc-cmd-btn:active {
         background-color: rgba(0,0,0,0.15);
       }
+
+      .vc-cmd-prompted {
+        position: fixed;
+        width: 100%;
+        background-color: #FBF9FE;
+        border: 1px solid #D9D9D9;
+        overflow-x: scroll;
+        display: none;
+      }
+      .vc-cmd-prompted li {
+        list-style: none;
+        line-height: 30px;
+        padding: 0 6em / @font;
+        border-bottom: 1px solid #D9D9D9;
+      }
     }
 
     .vc-group {
@@ -514,6 +531,13 @@
       border: none;
     }
   }
+  @supports (bottom: constant(safe-area-inset-bottom)) or (bottom: env(safe-area-inset-bottom)) {
+    .vc-toolbar,
+    .vc-switch {
+      bottom: constant(safe-area-inset-bottom);
+      bottom: env(safe-area-inset-bottom);
+    }
+  }
 
 }
 
@@ -532,9 +556,4 @@
     -webkit-transform: translate(0, 0);
     transform: translate(0, 0);
   }
-}
-.vc-cmd-prompted li{
-  list-style: none;
-  line-height: 30px;
-  margin-left: -20px;
 }
diff --git a/src/lib/tool.js b/src/lib/tool.js
@@ -132,60 +132,68 @@ export function htmlEncode(text) {
 }
 
 /**
- * JSON stringify, support circular structure
+ * Simple JSON stringify, stringify top level key-value
  */
+export function JSONStringify(stringObject) {
+  if (!isObject(stringObject) && !isArray(stringObject)) {
+    return JSON.stringify(stringObject);
+  }
 
-export function JSONStringify(stringObject, formatOption = '\t', replaceString = 'CIRCULAR_DEPENDECY_OBJECT') {
-  let cache = [];
-/*  const returnStringObject = JSON.stringify(stringObject, (key, value) => {
-    if (typeof value === 'object' && value !== null) {
-      if (~cache.indexOf(value)) {
-        return replaceString;
+  let prefix = '{', suffix = '}';
+  if (isArray(stringObject)) {
+    prefix = '[';
+    suffix = ']'
+  }
+  let str = prefix;
+  const keys = getObjAllKeys(stringObject);
+  for (let i = 0; i < keys.length; i ++) {
+    const key = keys[i];
+    const value = stringObject[key];
+    try {
+      // key
+      if (!isArray(stringObject)) {
+        if (isObject(key) || isArray(key) || isSymbol(key)) {
+          str += Object.prototype.toString.call(key);
+        } else {
+          str += key;
+        }
+        str += ': ';
+      }
+
+      // value
+      if (isArray(value)) {
+        str += 'Array[' + value.length + ']';
+      } else if (isObject(value) || isSymbol(value) || isFunction(value)) {
+        str += Object.prototype.toString.call(value);
+      } else {
+        str += JSON.stringify(value);
+      }
+      if (i < keys.length - 1) {
+        str += ', ';
       }
-      cache.push(value);
+    } catch (e) {
+      continue;
     }
-    return value;
-  }, formatOption);
-  cache = null;*/
-let returnStringObject = '{\n';
-  let keys = getObjAllKeys(stringObject);
-for(let i = 0; i < keys.length; i ++){
-  let key = keys[i];
-  try {
-    returnStringObject += key + ':' + stringObject[key] + ',\n';
-  } catch (e) {
-    //console.log(e);
-    continue;
-  }
   }
-  returnStringObject+='}';
-  return returnStringObject;
+  str += suffix;
+  return str;
 }
-window.JSON.stringify=JSONStringify;
+
 /**
  * get an object's all keys ignore whether they are not enumerable
  */
 export function getObjAllKeys(obj) {
   if (!isObject(obj) && !isArray(obj)) {
     return [];
   }
-/*  let dontEnums = [
-    'toString',
-    'toLocaleString',
-    'valueOf',
-    'hasOwnProperty',
-    'isPrototypeOf',
-    'propertyIsEnumerable',
-    'constructor'
-  ];
-  let keys = [];
-  for (let key in obj) {
-    if (dontEnums.indexOf(key) < 0) {
-      keys.push(key);
-    }
+  if (isArray(obj)) {
+    const m = [];
+    obj.forEach((_, index) => {
+      m.push(index)
+    });
+    return m;
   }
-  keys = keys.sort();*/
-  return  Object.getOwnPropertyNames(obj).sort();
+  return Object.getOwnPropertyNames(obj).sort();
 }
 
 /**