@utogether/udp-core 1.0.1-beta.9 → 1.0.2

package/src/router/index.ts

@@ -3,19 +3,14 @@ import type { Router, RouteRecordRaw, RouteComponent } from 'vue-router';
 import { cookies, NProgress, openLink, isUrl, buildHierarchyTree } from '@utogether/utils';
 import { useMultiTagsStoreHook } from '../store/modules/multiTags';
 import { usePermissionStoreHook } from '../store/modules/permission';
-import {
-  ascending,
-  initRouter,
-  findRouteByPath,
-  formatTwoStageRoutes,
-  formatFlatteningRoutes
-} from './utils';
+import { ascending, initRouter, findRouteByPath, formatTwoStageRoutes, formatFlatteningRoutes } from './utils';
 // import { getEnv } from '../config';
 import { kLOGINER } from '../contant';
 
 import homeRouter from './modules/home';
 import errorRouter from './modules/error';
 import remainingRouter from './modules/remaining';
+import flow from './modules/flow';
 
 const systemRouter = import.meta.glob([
   '../views/system/**/*.{vue,tsx}',
@@ -25,12 +20,13 @@ const systemRouter = import.meta.glob([
   '../views/urpt/**/*.{vue,tsx}',
   '../views/organization/**/*.{vue,tsx}',
   '../views/udev/**/*.{vue, tsx}'
+  // '../views/uflow/**/*.{vue, tsx}'
 ]);
 
 export const remainingRouters = remainingRouter;
 
 // 原始静态路由（未做任何处理）
-const routes = [homeRouter, errorRouter];
+const routes = [homeRouter, errorRouter, flow];
 /** 导出处理后的静态路由（三级及以上的路由全部拍成二级） */
 export const constantRoutes: Array<RouteRecordRaw> = formatTwoStageRoutes(
   formatFlatteningRoutes(buildHierarchyTree(ascending(routes)))
@@ -63,18 +59,25 @@ export const remainingPaths = Object.keys(remainingRouter).map(v => {
 //   }
 // });
 
+/** 记录已经加载的页面路径 */
+const loadedPaths = new Set<string>();
+
+/** 重置已加载页面记录 */
+export function resetLoadedPaths() {
+  loadedPaths.clear();
+}
+
 /** 重置路由 */
 export function resetRouter() {
   router.getRoutes().forEach(route => {
     const { name, meta } = route;
     if (name && router.hasRoute(name) && meta?.backstage) {
       router.removeRoute(name);
-      router.options.routes = formatTwoStageRoutes(
-        formatFlatteningRoutes(buildHierarchyTree(ascending(routes)))
-      );
+      router.options.routes = formatTwoStageRoutes(formatFlatteningRoutes(buildHierarchyTree(ascending(routes))));
     }
   });
   usePermissionStoreHook().clearAllCachePage();
+  resetLoadedPaths();
 }
 
 let views = null;
@@ -128,7 +131,6 @@ export const routerBefore = (to, _from, next) => {
   //   next({ path: "/error/403" });
   // }
   const userName = cookies.get(kLOGINER);
-
   const externalLink = isUrl(to?.name as string);
   /** 如果已经登录并存在登录信息后不能跳转到路由白名单，而是继续保持在当前页面 */
   function toCorrectRoute() {
@@ -136,9 +138,7 @@ export const routerBefore = (to, _from, next) => {
   }
   if (_from?.name && _from?.name !== 'login') {
     // m.name === to.name 判断param路由跳转
-    const cmp = to.matched.find(
-      m => m.path === to.path || (m.name === to.name && to.params)
-    )?.components;
+    const cmp = to.matched.find(m => m.path === to.path || (m.name === to.name && to.params))?.components;
     // 如果路由包含http 则是超链接 反之是普通路由
     if (externalLink) {
       openLink(to?.name as string);
@@ -172,11 +172,11 @@ export const routerBefore = (to, _from, next) => {
     if (_from.fullPath === '/' && to.fullPath === '/login' && !to.query?.tokenExpire) {
       to.path = '/welcome';
       to.fullPath = '/welcome';
-      to.name = 'SuHome';
+      to.name = 'UdpWelcome';
     } else if (_from.fullPath === '/' && to.path === '/workflow/approve/index') {
       to.path = '/welcome';
       to.fullPath = '/welcome';
-      to.name = 'SuHome';
+      to.name = 'UdpWelcome';
       to.query = {};
     }
     // next();

package/src/router/modules/flow.ts

@@ -0,0 +1,35 @@
+/*
+ * @Author: levi7754 levi7754@163.com
+ * @Date: 2023-10-10 11:31:53
+ * @LastEditors: levi7754 levi7754@163.com
+ * @LastEditTime: 2025-11-05 19:17:32
+ * @FilePath: /sitzone-mes/src/router/modules/tabs.ts
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+ */
+const Layout = () => import('../../layout/layoutView.vue');
+
+const tabsRouter: RouteConfigsTable = {
+  component: Layout,
+  path: '/utask',
+  redirect: '/utask/task/flow-task',
+  meta: {
+    showLink: false,
+    icon: 'IF-pure-iconfont-tabs',
+    title: 'message.udp.flowTask'
+  },
+  children: [
+    // query 传参模式
+    {
+      path: '/utask/task/flow-task',
+      name: 'FlowTask',
+      component: () => import('../../views/utask/flow-task.vue'),
+      meta: {
+        // 不在menu菜单中显示
+        title: '',
+        showLink: false,
+        activePath: '/uflow/index'
+      }
+    }
+  ]
+};
+export default tabsRouter;

package/src/router/modules/home.ts

@@ -1,32 +1,32 @@
-/*
- * @Author: wei.li
- * @Date: 2021-11-17 16:02:30
- * @LastEditors: wei.li
- * @LastEditTime: 2024-06-18 10:38:44
- * @Description: file content
- */
-const Layout = () => import('../../layout/layoutView.vue');
-const homeRouter: RouteConfigsTable = {
-  path: '/',
-  name: 'home',
-  component: Layout,
-  redirect: '/welcome',
-  meta: {
-    icon: 'home-filled',
-    title: 'message.udp.home',
-    rank: 0
-  },
-  children: [
-    {
-      path: '/welcome',
-      name: 'SuHome',
-      component: () => import('../../views/uhome/su-welcome.vue'),
-      meta: {
-        title: 'message.udp.home',
-        keepAlive: true
-      }
-    }
-  ]
-};
-
-export default homeRouter;
+/*
+ * @Author: wei.li
+ * @Date: 2021-11-17 16:02:30
+ * @LastEditors: levi7754 levi7754@163.com
+ * @LastEditTime: 2025-12-02 18:28:00
+ * @Description: file content
+ */
+const Layout = () => import('../../layout/layoutView.vue');
+const homeRouter: RouteConfigsTable = {
+  path: '/',
+  name: 'home',
+  component: Layout,
+  redirect: '/welcome',
+  meta: {
+    icon: 'home-filled',
+    title: 'message.udp.home',
+    rank: 0
+  },
+  children: [
+    {
+      path: '/welcome',
+      name: 'UdpWelcome',
+      component: () => import('../../views/uhome/su-welcome.vue'),
+      meta: {
+        title: 'message.udp.home',
+        keepAlive: true
+      }
+    }
+  ]
+};
+
+export default homeRouter;

package/src/router/modules/remaining.ts

@@ -1,58 +1,58 @@
-/*
- * @Author: wei.li
- * @Date: 2021-11-17 16:02:30
- * @LastEditors: levi7754 levi7754@163.com
- * @LastEditTime: 2025-07-27 11:10:39
- * @Description: file content
- */
-const Layout = () => import('../../layout/layoutView.vue');
-
-const remainingRouter: Array<any> = [
-  {
-    path: '/login',
-    name: 'login',
-    component: () => import('../../views/ulogin/login.vue'),
-    meta: {
-      title: 'message.udp.login',
-      showLink: false
-    }
-  },
-  {
-    path: '/error/404',
-    name: '404',
-    component: () => import('../../views/error/404.vue'),
-    meta: {
-      title: 'message.udp.fourZeroFour',
-      showLink: false
-    }
-  },
-  {
-    path: '/error/500',
-    name: '500',
-    component: () => import('../../views/error/500.vue'),
-    meta: {
-      title: 'message.udp.five',
-      showLink: false
-    }
-  },
-  {
-    path: '/redirect',
-    name: 'redirect',
-    component: Layout,
-    meta: {
-      icon: 'home-filled',
-      title: 'message.udp.home',
-      showLink: false,
-      rank: 104
-    },
-    children: [
-      {
-        path: '/redirect/:path(.*)',
-        // 2024-12-17
-        name: 'redirectView',
-        component: () => import('../../layout/redirect.vue')
-      }
-    ]
-  }
-];
-export default remainingRouter;
+/*
+ * @Author: wei.li
+ * @Date: 2021-11-17 16:02:30
+ * @LastEditors: levi7754 levi7754@163.com
+ * @LastEditTime: 2025-07-27 11:10:39
+ * @Description: file content
+ */
+const Layout = () => import('../../layout/layoutView.vue');
+
+const remainingRouter: Array<any> = [
+  {
+    path: '/login',
+    name: 'login',
+    component: () => import('../../views/ulogin/login.vue'),
+    meta: {
+      title: 'message.udp.login',
+      showLink: false
+    }
+  },
+  {
+    path: '/error/404',
+    name: '404',
+    component: () => import('../../views/error/404.vue'),
+    meta: {
+      title: 'message.udp.fourZeroFour',
+      showLink: false
+    }
+  },
+  {
+    path: '/error/500',
+    name: '500',
+    component: () => import('../../views/error/500.vue'),
+    meta: {
+      title: 'message.udp.five',
+      showLink: false
+    }
+  },
+  {
+    path: '/redirect',
+    name: 'redirect',
+    component: Layout,
+    meta: {
+      icon: 'home-filled',
+      title: 'message.udp.home',
+      showLink: false,
+      rank: 104
+    },
+    children: [
+      {
+        path: '/redirect/:path(.*)',
+        // 2024-12-17
+        name: 'redirectView',
+        component: () => import('../../layout/redirect.vue')
+      }
+    ]
+  }
+];
+export default remainingRouter;