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 @@ ## 隐形页面容器 带有头部 -不显示任何背景色和边框,但是有一个和分页组件效果融合的头部 +不显示任何背景色和边框,但是有一个和分页组件效果融合的头部,看起来更舒服一点 ``` 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 @@ + + + + + \ 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