From da6751cd492dae26b36756ed799c4b03a6cd28b3 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Mon, 2 Jul 2018 22:42:56 +0800
Subject: [PATCH] no message

Former-commit-id: f6cebe3561446aee9a7c77e7b90e981b04c04437 [formerly f6cebe3561446aee9a7c77e7b90e981b04c04437 [formerly f6cebe3561446aee9a7c77e7b90e981b04c04437 [formerly f6cebe3561446aee9a7c77e7b90e981b04c04437 [formerly ba17af8d6e4ab1deb21e6bbf2c9ca6a4d2dd75c9 [formerly 44b073ce1fe4addef18298c3f941cf569c216393]]]]]
Former-commit-id: e10e949848ec08b0bb678b16b396539a7debf803
Former-commit-id: 205a81acd245e104e1fdf9e6c06bcd2020f6267c
Former-commit-id: 10c321ed9464c675d82209bb9684bd27dfda99b4 [formerly 91f33d6b05ee82995ee2fd844b8e829851e2c7dc]
Former-commit-id: 3e87f4f0e4a961fb42287ae74c6635f881c2e3d4
Former-commit-id: 6a800214a61fa686f8ae1a70a9cb84a8af871970
Former-commit-id: 76bb32d5779efd63d1ba70c3cd676a054ea40b3e
Former-commit-id: 0725bb5934012f799fffe69df7adb12ccece71b3
Former-commit-id: e6b787b50bfc00896b833168f4b3ad48da0be68a
---
 docs/zh/guide/change-log.md                   |  1 +
 package.json                                  |  1 +
 src/main.js                                   |  3 ++
 src/menu/index.js.REMOVED.git-id              |  2 +-
 .../container/md/doc-ghost-header.md          |  2 +-
 src/pages/demo/components/json-tree/index.vue | 30 +++++++++++++++++++
 src/router/routes.js.REMOVED.git-id           |  2 +-
 7 files changed, 38 insertions(+), 3 deletions(-)
 create mode 100644 src/pages/demo/components/json-tree/index.vue

diff --git a/docs/zh/guide/change-log.md b/docs/zh/guide/change-log.md
index 15c0f2bd..8f907500 100644
--- a/docs/zh/guide/change-log.md
+++ b/docs/zh/guide/change-log.md
@@ -14,6 +14,7 @@
 * [ 新增 ] 现在页面标题可以根据路由做出对应变化了
 * [ 新增 ] 版本检查机制
 * [ 新增 ] `d2-container` 隐形模式支持 header 插槽
+* [ 新增 ] 版本检查可以设置为不显示提示框
 
 ## v1.1.3
 
diff --git a/package.json b/package.json
index ee1b73e6..d770d4e8 100755
--- a/package.json
+++ b/package.json
@@ -40,6 +40,7 @@
     "vue": "^2.5.2",
     "vue-grid-layout": "^2.1.11",
     "vue-i18n": "^7.4.2",
+    "vue-json-tree-view": "^2.1.4",
     "vue-router": "^3.0.1",
     "vue-splitpane": "^1.0.2",
     "vuex": "^3.0.1",
diff --git a/src/main.js b/src/main.js
index 817065af..87900b6e 100755
--- a/src/main.js
+++ b/src/main.js
@@ -64,6 +64,8 @@ import pluginLog from '@/plugin/log'
 import pluginOpen from '@/plugin/open'
 // 插件 支持百万级数据的表格
 import bigdataTable from '@/plugin/vue-bigdata-table'
+// 插件 json 展示
+import vueJsonTreeView from 'vue-json-tree-view'
 
 // 打包的设置 用户获取路径
 import buildConfig from '../config/index'
@@ -77,6 +79,7 @@ Vue.use(pluginExport)
 Vue.use(pluginLog)
 Vue.use(pluginOpen)
 Vue.use(bigdataTable)
+Vue.use(vueJsonTreeView)
 
 Vue.config.productionTip = false
 
diff --git a/src/menu/index.js.REMOVED.git-id b/src/menu/index.js.REMOVED.git-id
index a9877f11..bab80261 100644
--- a/src/menu/index.js.REMOVED.git-id
+++ b/src/menu/index.js.REMOVED.git-id
@@ -1 +1 @@
-094903b1e629e596be720ff155ff60a312127a92
\ No newline at end of file
+6a871cd88b3b63f275668bcd3c20c6bfa0716909
\ No newline at end of file
diff --git a/src/pages/demo/components/container/md/doc-ghost-header.md b/src/pages/demo/components/container/md/doc-ghost-header.md
index 8ba0f53e..d11ba747 100644
--- a/src/pages/demo/components/container/md/doc-ghost-header.md
+++ b/src/pages/demo/components/container/md/doc-ghost-header.md
@@ -1,6 +1,6 @@
 ## 隐形页面容器 带有头部
 
-不显示任何背景色和边框，但是有一个和分页组件效果融合的头部
+不显示任何背景色和边框，但是有一个和分页组件效果融合的头部，看起来更舒服一点
 
 ```
 <d2-container type="ghost">
diff --git a/src/pages/demo/components/json-tree/index.vue b/src/pages/demo/components/json-tree/index.vue
new file mode 100644
index 00000000..372df6ac
--- /dev/null
+++ b/src/pages/demo/components/json-tree/index.vue
@@ -0,0 +1,30 @@
+<template>
+  <d2-container class="page">
+    <tree-view :data="packJson" :options="options"></tree-view>
+  </d2-container>
+</template>
+
+<script>
+import packJson from '../../../../../package.json'
+export default {
+  data () {
+    return {
+      options: {
+        maxDepth: 10,
+        rootObjectKey: 'package.json',
+        modifiable: false
+      },
+      packJson
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+@import '~@/assets/style/public.scss';
+.page {
+  // Your page style here
+  // Do not use empty rulesets
+  // If empty, delete it
+}
+</style>
\ No newline at end of file
diff --git a/src/router/routes.js.REMOVED.git-id b/src/router/routes.js.REMOVED.git-id
index ed6f49f3..1ac5e80a 100644
--- a/src/router/routes.js.REMOVED.git-id
+++ b/src/router/routes.js.REMOVED.git-id
@@ -1 +1 @@
-6aad8f65fcc71569df2969b2d39a121bcdec2aa6
\ No newline at end of file
+a83598d185531f4f568ff58da2a51ad426f050e4
\ No newline at end of file