@truenewx/tnxvue3 3.4.6 → 3.4.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truenewx/tnxvue3",
-  "version": "3.4.6",
+  "version": "3.4.8",
   "description": "互联网技术解决方案：Vue3扩展支持",
   "private": false,
   "type": "module",
@@ -28,7 +28,7 @@
     "tdesign-vue-next": "~1.20.0",
     "validator": "~13.15.0",
     "vue": "~3.5.0",
-    "vue-router": "~4.6.0"
+    "vue-router": "~5.1.0"
   },
   "dependencies": {
     "@truenewx/tnxcore": "3.4.5",

package/src/components/ScrollView.vue

@@ -28,7 +28,7 @@ export default {
 }
 </script>
 
-<style lang="less" scoped>
+<style>
 .scroll-view {
     height: 100%;
     min-height: 0;

package/src/tnxvue-router.ts

@@ -11,7 +11,6 @@ import {
     RouteLocationNormalized,
     RouteLocationNormalizedLoaded,
     RouteLocationNormalizedLoadedGeneric,
-    NavigationGuardNext,
 } from 'vue-router';
 import * as NetUtil from '../../tnxcore/src/util/net.ts';
 
@@ -160,8 +159,7 @@ export default function (items: RouteItem[], useHashHistory = true, fnImportPage
         router.$beforeLeaveHandlers[path] = handler;
     };
 
-    router.beforeEach((to: RouteLocationNormalized, from: RouteLocationNormalizedLoaded, next: NavigationGuardNext): void => {
-        let allow = true;
+    router.beforeEach((to: RouteLocationNormalized, from: RouteLocationNormalizedLoaded) => {
         let beforeLeaveHandler = router.$beforeLeaveHandlers[from.path];
         if (!beforeLeaveHandler) {
             let toItem = findItemByPath(null, items, to.path);
@@ -177,20 +175,7 @@ export default function (items: RouteItem[], useHashHistory = true, fnImportPage
             }
         }
         if (beforeLeaveHandler) {
-            let result = beforeLeaveHandler(to);
-            if (result instanceof Promise) {
-                result.then((allowed: boolean): void => {
-                    if (allowed) {
-                        next();
-                    }
-                });
-                return;
-            } else if (result === false) {
-                allow = false;
-            }
-        }
-        if (allow) {
-            next();
+            return beforeLeaveHandler(to);
         }
     });
 

package/src/vue.d.ts

@@ -1,6 +0,0 @@
-declare module '*.vue' {
-    import type { DefineComponent } from 'vue';
-
-    const component: DefineComponent<Record<string, never>, Record<string, never>, any>;
-    export default component;
-}