diff --git a/build.bat b/build.bat index a415c3429cdd3418f05b2dc124c83f8526e18ee3..d9a20548f547efa62aef77e783b3141639e5b458 100755 --- a/build.bat +++ b/build.bat @@ -4,7 +4,7 @@ set dist_dir=dist set app_name=torna -set version="1.13.1" +set version="1.14.1" set build_folder=%app_name%-%version% diff --git a/build.sh b/build.sh index 343b97351f229895907d32a5a76d7a649adf3ab0..5e3892c7a380f873cb4c3d81f180073063ad8911 100644 --- a/build.sh +++ b/build.sh @@ -6,7 +6,7 @@ dist_dir="dist" # 执行文件名称 app_name="torna" -version="1.13.1" +version="1.14.1" build_folder="${app_name}-${version}" diff --git a/changelog.md b/changelog.md index 19d8c3872d5d4f97fd9730eec445ed0760431e7d..1d5c3d9548c18b59e53bc06dd33231fdc2f13604 100644 --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,9 @@ # 更新日志 +## 1.14.1 + +- 【修复】推送报空指针异常问题 + ## 1.14.0 - 【新增】推送文档新增`deprecated`指定废弃信息 diff --git a/front/src/layout_view/components/Sidebar/index.vue b/front/src/layout_view/components/Sidebar/index.vue index 4fed69281c73cf5f381ae3106ea7f3e13da96847..fe2e66fa9ddb7a11556124bc069717832844b70c 100644 --- a/front/src/layout_view/components/Sidebar/index.vue +++ b/front/src/layout_view/components/Sidebar/index.vue @@ -56,7 +56,9 @@ export default { // 树点击事件 onNodeClick(data, node, tree) { if (data.type === this.types.TYPE_DOC) { - this.goRoute(`/view/${data.docId}`) + // 目前没想到好的办法传输文档名称到标签路由中 + // this.goRoute(`/view/${data.docId}`) + this.$router.push({ path: `/view/${data.docId}`, query: { meta_title: data.label }}) } }, onSpaceChange(spaceId) { diff --git a/front/src/layout_view/components/TabsRouter/index.vue b/front/src/layout_view/components/TabsRouter/index.vue new file mode 100644 index 0000000000000000000000000000000000000000..6052f68fdb050c9f135ed4a3115c3c718dfb8b72 --- /dev/null +++ b/front/src/layout_view/components/TabsRouter/index.vue @@ -0,0 +1,322 @@ + + + + + diff --git a/front/src/layout_view/components/ViewMain.vue b/front/src/layout_view/components/ViewMain.vue index 3bce364786999e45f3548c87120036d291377305..2ddae9326eab8a6b917674077d62515e290e96aa 100644 --- a/front/src/layout_view/components/ViewMain.vue +++ b/front/src/layout_view/components/ViewMain.vue @@ -17,7 +17,7 @@ export default { } - diff --git a/front/src/layout_view/components/index.js b/front/src/layout_view/components/index.js index f93678ec51ad1084e3145377621029787fdea869..1c828837f9ac929fe34b7c04a82a65ad8f545f51 100644 --- a/front/src/layout_view/components/index.js +++ b/front/src/layout_view/components/index.js @@ -1,3 +1,4 @@ export { default as Navbar } from './Navbar' export { default as Sidebar } from './Sidebar' export { default as ViewMain } from './ViewMain' +export { default as TabsRouter } from './TabsRouter' diff --git a/front/src/layout_view/index.vue b/front/src/layout_view/index.vue index 8cc3b76549cb0f8dea9db3de6de6892b1447e892..9b0cc66cb097bd06bb1fdeba8e06c945cb48ce62 100644 --- a/front/src/layout_view/index.vue +++ b/front/src/layout_view/index.vue @@ -1,10 +1,11 @@