diff --git a/package.json b/package.json index 36392bc2..ffd51198 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,7 @@ "event-source-polyfill": "^1.0.31", "global": "^4.4.0", "jetlinks-store": "^0.0.3", - "jetlinks-ui-components": "^1.0.27", + "jetlinks-ui-components": "^1.0.28", "js-cookie": "^3.0.1", "jsencrypt": "^3.3.2", "less": "^4.1.3", diff --git a/src/views/device/components/Metadata/Base/Base.vue b/src/views/device/components/Metadata/Base/Base.vue index a9e04a99..0c439f27 100644 --- a/src/views/device/components/Metadata/Base/Base.vue +++ b/src/views/device/components/Metadata/Base/Base.vue @@ -476,7 +476,11 @@ watch(() => metadata.value, () => { dataSource.value = metadata.value }, { immediate: true }) -onBeforeRouteUpdate((to, from, next) => { +onBeforeRouteUpdate((to, from, next) => { // 设备管理内路由跳转 + parentTabsChange(next as Function) +}) + +onBeforeRouteLeave((to, from, next) => { // 设备管理外路由跳转 parentTabsChange(next as Function) }) diff --git a/yarn.lock b/yarn.lock index a73ec182..16539df8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3753,10 +3753,10 @@ jetlinks-ui-components@^1.0.23: sortablejs "^1.15.0" vuedraggable "^4.1.0" -jetlinks-ui-components@^1.0.27: - version "1.0.27" - resolved "http://registry.jetlinks.cn/jetlinks-ui-components/-/jetlinks-ui-components-1.0.27.tgz#03a2a9ba49d669c6d63e6c5d5b144f31a27253df" - integrity sha512-I9A05UXUtjRsSWU/jgRDfDNeCv2ZV21/PV4FEV3UG5bQOYa1/CvL7Lr7F7iB1m4Hjn9mnXTqAQ2pU11b6T2U8Q== +jetlinks-ui-components@^1.0.28: + version "1.0.28" + resolved "http://registry.jetlinks.cn/jetlinks-ui-components/-/jetlinks-ui-components-1.0.28.tgz#443df6fc65ecd0bfbc19eb12bff8d10c0ff6a129" + integrity sha512-+RmSq4LFoH/TODAELhUxK/YeqCvbnqjgT6C5mZyIM1veARbVyUEiIJ3+dDOLL42Sm/fbNTJ2IQH4PYeVAeTU9g== dependencies: "@vueuse/core" "^9.12.0" "@vueuse/router" "^9.13.0"