zsysview 0.0.15 → 0.0.17

package/core/app.ts

@@ -10,7 +10,7 @@ import zhCn from 'element-plus/es/locale/lang/zh-cn'
 
 
 //路由
-import {initRouter} from './router.ts' //导入路由模块
+import router from './router.ts' //导入路由模块
 
 
 const zsysapp=createApp(app)
@@ -20,7 +20,7 @@ pinia.use(piniaPluginPersistedstate)
 
 // addFrameRouter({path:'/desktop',component:()=>import('../../test_view/test_desktop.vue')})
 
-zsysapp.use(initRouter()) //将 Vue Router 插件注册到 Vue 应用中
+zsysapp.use(router) //将 Vue Router 插件注册到 Vue 应用中
 zsysapp.use(ElementPlus,{locale: zhCn}) //将 ElementPlus 插件注册到 Vue 应用中
 zsysapp.use(pinia)
 //从后台获取全局信息

package/core/router.ts

@@ -1,4 +1,4 @@
-import { createRouter, createWebHistory, type Router,type RouteRecordRaw } from "vue-router"
+import { createRouter, createWebHistory, type Router, type RouteRecordRaw } from "vue-router"
 import { useTokenStore } from "./user_token"
 
 const routes = [
@@ -83,52 +83,56 @@ const router = createRouter({
 })
 
 function addFrameRouter(r: RouteRecordRaw) {
-	try {
-    // 查找path为"/main"的路由
-    const mainRoute = routes.find(route => route.path === "/main");
-    
-    if (!mainRoute) {
-      console.error('未找到path为"/main"的路由');
-      return
-    }
-    
-    // 确保mainRoute有children数组
-    if (!mainRoute.children) {
-      mainRoute.children = [];
-    }
-    
-    // 检查是否已存在相同path的路由
-    const existingRouteIndex = mainRoute.children.findIndex(
-      child => child.path === r.path
-    );
-    
-    if (existingRouteIndex !== -1) {
-      // 如果已存在，替换该路由
-      mainRoute.children[existingRouteIndex] = r;
-      console.log(`已更新路由: ${r.path}`);
-    } else {
-      // 如果不存在，添加新路由
-      mainRoute.children.push(r);
-      console.log(`已添加新路由: ${r.path}`);
-    }
-    
-    // 重新创建router实例以确保路由更新生效
-    // 注意：在实际项目中可能需要更复杂的路由更新逻辑
-    // router.addRoute('main', r as RouteRecordRaw);
-    
-    return 1;
-  } catch (error) {
-    console.error('添加路由失败:', error);
-    return 0;
-  }
+	router.addRoute('main', r)
 }
 
-function initRouter(): Router {
-	return createRouter({
-		history: createWebHistory(),
-		routes
-	})
-}
+// function addFrameRouter(r: RouteRecordRaw) {
+// 	try {
+//     // 查找path为"/main"的路由
+//     const mainRoute = routes.find(route => route.path === "/main");
+
+//     if (!mainRoute) {
+//       console.error('未找到path为"/main"的路由');
+//       return
+//     }
+
+//     // 确保mainRoute有children数组
+//     if (!mainRoute.children) {
+//       mainRoute.children = [];
+//     }
+
+//     // 检查是否已存在相同path的路由
+//     const existingRouteIndex = mainRoute.children.findIndex(
+//       child => child.path === r.path
+//     );
+
+//     if (existingRouteIndex !== -1) {
+//       // 如果已存在，替换该路由
+//       mainRoute.children[existingRouteIndex] = r;
+//       console.log(`已更新路由: ${r.path}`);
+//     } else {
+//       // 如果不存在，添加新路由
+//       mainRoute.children.push(r);
+//       console.log(`已添加新路由: ${r.path}`);
+//     }
+
+//     // 重新创建router实例以确保路由更新生效
+//     // 注意：在实际项目中可能需要更复杂的路由更新逻辑
+//     // router.addRoute('main', r as RouteRecordRaw);
+
+//     return 1;
+//   } catch (error) {
+//     console.error('添加路由失败:', error);
+//     return 0;
+//   }
+// }
+
+// function initRouter(): Router {
+// 	return createRouter({
+// 		history: createWebHistory(),
+// 		routes
+// 	})
+// }
 
 router.beforeEach((to, _, next) => {
 	console.log('to', to.fullPath);
@@ -145,5 +149,5 @@ router.beforeEach((to, _, next) => {
 	}
 })
 
-// export default router
-export { initRouter, addFrameRouter }
+export default router
+export { addFrameRouter }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zsysview",
-  "version": "0.0.15",
+  "version": "0.0.17",
   "description": "zsystem view",
   "author": {
     "name": "liuhaomiao"

package/view/main/userHeader.vue

@@ -37,7 +37,7 @@ import { ArrowDown } from '@element-plus/icons-vue'
 // import logoUrl from '../../assets/logo_40.png';
 import { HttpApiV1 as http } from '../../core/httpapi/http_api_v1';
 import { reactive } from 'vue';
-import app from '../../core/app';
+// import app from '../../core/app';
 const r = useRouter()
 
 const user = reactive({