From 1016e272686b9bec9ae67410c2bb37cf40e5b8d3 Mon Sep 17 00:00:00 2001
From: XieYongHong <18010623010@163.com>
Date: Tue, 1 Aug 2023 16:27:28 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E7=89=A9=E6=A8=A1?=
 =?UTF-8?q?=E5=9E=8B=E9=A1=B5=E9=9D=A2=E8=B7=AF=E7=94=B1=E8=B7=B3=E8=BD=AC?=
 =?UTF-8?q?=E6=97=A0=E6=B3=95=E8=A7=A6=E5=8F=91=E4=BF=AE=E6=94=B9=E6=9C=AA?=
 =?UTF-8?q?=E4=BF=9D=E5=AD=98=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                       | 2 +-
 src/views/device/components/Metadata/Base/Base.vue | 6 +++++-
 yarn.lock                                          | 8 ++++----
 3 files changed, 10 insertions(+), 6 deletions(-)

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"