@utogether/udp-core 1.0.1-beta.3 → 1.0.1-beta.31

package/src/router/index.ts

@@ -1,28 +1,16 @@
 import { findIndexOf, isEmpty } from 'xe-utils';
-import {
-  type Router,
-  createRouter,
-  type RouteRecordRaw,
-  type RouteComponent,
-  createWebHistory
-} from 'vue-router';
+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,
-  handleAliveRoute,
-  formatTwoStageRoutes,
-  formatFlatteningRoutes
-} from './utils';
-import { getEnv } from '../config';
+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}',
@@ -32,10 +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)))
@@ -50,23 +41,31 @@ export const remainingPaths = Object.keys(remainingRouter).map(v => {
 });
 
 /** 创建路由实例 */
-export const router: Router = createRouter({
-  history: createWebHistory(getEnv().VITE_ROUTER_HISTORY),
-  routes: constantRoutes.concat(...(remainingRouter as any)),
-  strict: true,
-  scrollBehavior(to, from, savedPosition) {
-    return new Promise(resolve => {
-      if (savedPosition) {
-        return savedPosition;
-      } else {
-        if (from.meta.saveSrollTop) {
-          const top: number = document.documentElement.scrollTop || document.body.scrollTop;
-          resolve({ left: 0, top });
-        }
-      }
-    });
-  }
-});
+// export const router: Router = createRouter({
+//   history: createWebHistory(window.__HISTORY_PATH__),
+//   routes: constantRoutes.concat(...(remainingRouter as any)),
+//   strict: true,
+//   scrollBehavior(to, from, savedPosition) {
+//     return new Promise(resolve => {
+//       if (savedPosition) {
+//         return savedPosition;
+//       } else {
+//         if (from.meta.saveSrollTop) {
+//           const top: number = document.documentElement.scrollTop || document.body.scrollTop;
+//           resolve({ left: 0, top });
+//         }
+//       }
+//     });
+//   }
+// });
+
+/** 记录已经加载的页面路径 */
+const loadedPaths = new Set<string>();
+
+/** 重置已加载页面记录 */
+export function resetLoadedPaths() {
+  loadedPaths.clear();
+}
 
 /** 重置路由 */
 export function resetRouter() {
@@ -74,17 +73,18 @@ export function resetRouter() {
     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;
-export function setViews(cviews) {
+export let router = null;
+export function setViews(cviews, crouter) {
   views = cviews;
+  router = crouter;
   Object.assign(views, systemRouter);
 }
 
@@ -94,7 +94,7 @@ export function getViews() {
 
 /** 路由白名单 */
 const whiteList = ['/login'];
-
+/*
 router.beforeEach((to: ToRouteType, _from, next) => {
   if (to.meta?.keepAlive) {
     handleAliveRoute(to, 'add');
@@ -105,64 +105,8 @@ router.beforeEach((to: ToRouteType, _from, next) => {
   }
   const userName = cookies.get(kLOGINER);
   NProgress.start();
-  const externalLink = isUrl(to?.name as string);
-  /** 如果已经登录并存在登录信息后不能跳转到路由白名单，而是继续保持在当前页面 */
-  function toCorrectRoute() {
-    whiteList.includes(to.fullPath) ? next(_from.fullPath) : next();
-  }
   if (userName) {
-    // TODO  无权限跳转403页面
-    // if (to.meta?.roles && !isOneOfArray(to.meta?.roles, userInfo?.roles)) {
-    //   next({ path: "/error/403" });
-    // }
-    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;
-      // 如果路由包含http 则是超链接 反之是普通路由
-      if (externalLink) {
-        openLink(to?.name as string);
-        NProgress?.done();
-      } else if (cmp?.default || to.name === 'redirect') {
-        toCorrectRoute();
-      } else {
-        next({ path: '/error/404' });
-      }
-    } else {
-      // 刷新
-      if (usePermissionStoreHook().wholeMenus.length === 0) {
-        initRouter(userName).then((router: Router) => {
-          if (!useMultiTagsStoreHook().getMultiTagsCache) {
-            const { path } = to;
-            const index = findIndexOf(remainingRouter, v => v.path === path);
-            const routes: any = index === -1 ? router.options.routes[0].children : router.options.routes;
-            const route = findRouteByPath(path, routes);
-            if (route && route.meta?.title) {
-              const { path, name, meta } = route;
-              useMultiTagsStoreHook().handleTags('push', { path, name, meta });
-            }
-          }
-          // 确保动态路由完全加入路由列表并且不影响静态路由
-          // （注意：动态路由刷新时router.beforeEach可能会触发两次，
-          // 第一次触发动态路由还未完全添加，第二次动态路由才完全添加到路由列表，
-          // 如果需要在router.beforeEach做一些判断可以在to.name存在的条件下去判断，这样就只会触发一次）
-          if (isEmpty(to.name)) router.push(to.fullPath);
-        });
-      }
-      if (_from.fullPath === '/' && to.fullPath === '/login' && !to.query?.tokenExpire) {
-        to.path = '/welcome';
-        to.fullPath = '/welcome';
-        to.name = 'SuHome';
-      } else if (_from.fullPath === '/' && to.path === '/workflow/approve/index') {
-        to.path = '/welcome';
-        to.fullPath = '/welcome';
-        to.name = 'SuHome';
-        to.query = {};
-      }
-      // next();
-      toCorrectRoute();
-    }
+    routerBefore(to, _from, next);
   } else {
     if (to.path !== '/login') {
       if (whiteList.indexOf(to.path) !== -1) {
@@ -180,4 +124,64 @@ router.afterEach(() => {
   NProgress?.done();
 });
 
-export default router;
+*/
+export const routerBefore = (to, _from, next) => {
+  // TODO  无权限跳转403页面
+  // if (to.meta?.roles && !isOneOfArray(to.meta?.roles, userInfo?.roles)) {
+  //   next({ path: "/error/403" });
+  // }
+  const userName = cookies.get(kLOGINER);
+  const externalLink = isUrl(to?.name as string);
+  /** 如果已经登录并存在登录信息后不能跳转到路由白名单，而是继续保持在当前页面 */
+  function toCorrectRoute() {
+    whiteList.includes(to.fullPath) ? next(_from.fullPath) : 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;
+    // 如果路由包含http 则是超链接 反之是普通路由
+    if (externalLink) {
+      openLink(to?.name as string);
+      NProgress?.done();
+    } else if (cmp?.default || to.name === 'redirect') {
+      toCorrectRoute();
+    } else {
+      next({ path: '/error/404' });
+    }
+  } else {
+    // 刷新
+    if (usePermissionStoreHook().wholeMenus.length === 0) {
+      initRouter(userName).then((router: Router) => {
+        if (!useMultiTagsStoreHook().getMultiTagsCache) {
+          const { path } = to;
+          const index = findIndexOf(remainingRouter, v => v.path === path);
+          const routes: any = index === -1 ? router.options.routes[0].children : router.options.routes;
+          const route = findRouteByPath(path, routes);
+          if (route && route.meta?.title) {
+            const { path, name, meta } = route;
+            useMultiTagsStoreHook().handleTags('push', { path, name, meta });
+          }
+        }
+        // 确保动态路由完全加入路由列表并且不影响静态路由
+        // （注意：动态路由刷新时router.beforeEach可能会触发两次，
+        // 第一次触发动态路由还未完全添加，第二次动态路由才完全添加到路由列表，
+        // 如果需要在router.beforeEach做一些判断可以在to.name存在的条件下去判断，这样就只会触发一次）
+        if (isEmpty(to.name)) router.push(to.fullPath);
+      });
+    }
+    if (_from.fullPath === '/' && to.fullPath === '/login' && !to.query?.tokenExpire) {
+      to.path = '/welcome';
+      to.fullPath = '/welcome';
+      to.name = 'SuHome';
+    } else if (_from.fullPath === '/' && to.path === '/workflow/approve/index') {
+      to.path = '/welcome';
+      to.fullPath = '/welcome';
+      to.name = 'SuHome';
+      to.query = {};
+    }
+    // next();
+    toCorrectRoute();
+  }
+};
+
+// export default router;

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/remaining.ts

@@ -2,7 +2,7 @@
  * @Author: wei.li
  * @Date: 2021-11-17 16:02:30
  * @LastEditors: levi7754 levi7754@163.com
- * @LastEditTime: 2024-12-18 08:44:24
+ * @LastEditTime: 2025-07-27 11:10:39
  * @Description: file content
  */
 const Layout = () => import('../../layout/layoutView.vue');
@@ -35,31 +35,6 @@ const remainingRouter: Array<any> = [
       showLink: false
     }
   },
-  // {
-  //   path: '/print/checkcard',
-  //   name: 'checkcard',
-  //   component: () => import('../../views/print/check-card.vue'),
-  //   meta: {
-  //     title: 'message.checkCard',
-  //     showLink: false
-  //   }
-  // },
-  // {
-  //   path: '/lowcode-design-platform',
-  //   name: 'LowcodeDesigin',
-  //   component: () => import('/src/views/udev/gantt/lcd-design.vue'),
-  //   meta: {
-  //     showLink: false
-  //   }
-  // },
-  // {
-  //   path: '/ulcd-app-menu',
-  //   name: 'AppMenu',
-  //   component: () => import('/src/views/udev/gantt/app-menu.vue'),
-  //   meta: {
-  //     showLink: false
-  //   }
-  // },
   {
     path: '/redirect',
     name: 'redirect',

package/src/router/utils.ts

@@ -1,3 +1,11 @@
+/*
+ * @Author: levi7754 levi7754@163.com
+ * @Date: 2024-08-01 21:42:39
+ * @LastEditors: levi7754 levi7754@163.com
+ * @LastEditTime: 2025-11-17 15:05:02
+ * @FilePath: \udp-front\packages\udp-core\src\router\utils.ts
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+ */
 import type { RouteRecordRaw, RouteComponent } from 'vue-router';
 import { isProxy, toRaw, defineAsyncComponent } from 'vue';
 import { useTimeoutFn } from '@vueuse/core';
@@ -44,9 +52,7 @@ function ascending(arr: any[]) {
 
 /** 过滤meta中showLink为false的菜单 */
 function filterTree(data: RouteComponent[]) {
-  const newTree = clone(data, true).filter(
-    (v: { meta: { showLink: boolean } }) => v && v.meta?.showLink !== false
-  );
+  const newTree = clone(data, true).filter((v: { meta: { showLink: boolean } }) => v && v.meta?.showLink !== false);
   newTree.forEach((v: { children }) => v.children && (v.children = filterTree(v.children)));
   return newTree;
 }
@@ -219,9 +225,7 @@ function formatFlatteningRoutes(routesList: RouteRecordRaw[]) {
   let hierarchyList = buildHierarchyTree(routesList);
   for (let i = 0; i < hierarchyList.length; i++) {
     if (hierarchyList[i].children) {
-      hierarchyList = hierarchyList
-        .slice(0, i + 1)
-        .concat(hierarchyList[i].children, hierarchyList.slice(i + 1));
+      hierarchyList = hierarchyList.slice(0, i + 1).concat(hierarchyList[i].children, hierarchyList.slice(i + 1));
     }
   }
   return hierarchyList;
@@ -277,6 +281,9 @@ const menuI18n = {
   zh: {},
   en: {}
 };
+
+const processMenus = [];
+
 const addAsyncRoutes = (arrRoutes: Array<any>) => {
   const modulesRoutes = getViews();
 
@@ -290,7 +297,18 @@ const addAsyncRoutes = (arrRoutes: Array<any>) => {
       v.redirect = v.children[0].path;
     }
     const { icon, permissionCode, extraIcon, frameSrc } = v;
-    v.meta = { keepAlive: true, rank: v.sort, title: `${v.i18nField}` };
+    // 流程菜单保存
+    v.isApprovalPage === 'Y' && processMenus.push(v);
+
+    v.meta = {
+      keepAlive: true,
+      rank: v.sort,
+      title: `${v.i18nField}`,
+      // 审批流设计页面和审批页面的code写死，只需配置页面即可(保底方式)
+      // showLink: !['UDPFlowTask'].includes(v.menuCode) ? null : false
+      showLink: v.showLink !== 'N'
+    };
+    v.hiddenTag = null;
     Object.assign(v.meta, { icon, permissionCode, extraIcon, frameSrc });
     menuI18n.zh[v.i18nField] = v.menuName || v.menuNameEn;
     menuI18n.en[v.i18nField] = v.menuNameEn || v.menuName;
@@ -362,10 +380,35 @@ function delCurrentRoute(current: any, toNext = true) {
   }
 }
 
+function handleTopMenu(route) {
+  if (route?.children && route.children.length > 1) {
+    if (route.redirect) {
+      return route.children.filter(cur => cur.path === route.redirect)[0];
+    } else {
+      return route.children[0];
+    }
+  } else {
+    return route;
+  }
+}
+
+/** 获取所有菜单中的第一个菜单（顶级菜单）*/
+function getTopMenu(tag = false) {
+  const topMenu = handleTopMenu(usePermissionStoreHook().wholeMenus[0]?.children[0]);
+  tag && useMultiTagsStoreHook().handleTags('push', topMenu);
+  return topMenu;
+}
+
+function getProcessMenu() {
+  return processMenus;
+}
+
 export {
   ascending,
   filterTree,
   initRouter,
+  getTopMenu,
+  getProcessMenu,
   hasPermissions,
   addAsyncRoutes,
   getParentPaths,

package/src/store/modules/app.ts

@@ -14,9 +14,7 @@ import { responsiveStorageNameSpace, getConfig } from '../../config';
 export const useAppStore = defineStore('udp-app', {
   state: (): appType => ({
     sidebar: {
-      opened:
-        storageLocal.getItem(`${responsiveStorageNameSpace()}layout`)?.sidebarStatus ??
-        getConfig().SidebarStatus,
+      opened: storageLocal.getItem(`${responsiveStorageNameSpace()}layout`)?.sidebarStatus ?? getConfig().SidebarStatus,
       withoutAnimation: false,
       isClickCollapse: false
     },

package/src/store/modules/multiTags.ts

@@ -1,12 +1,12 @@
 /*
  * @Author: wei.li
  * @Date: 2021-12-23 17:33:20
- * @LastEditors: wei.li
- * @LastEditTime: 2024-07-03 10:27:36
+ * @LastEditors: levi7754 levi7754@163.com
+ * @LastEditTime: 2025-11-06 17:48:20
  * @Description: file content
  */
 import { defineStore } from 'pinia';
-import { isEqual, isBoolean } from 'xe-utils';
+import { isEqual } from 'xe-utils';
 import { storageLocal, isUrl } from '@utogether/utils';
 import { store } from '../index';
 import { routerArrays } from '../../layout/types';
@@ -54,25 +54,26 @@ export const useMultiTagsStore = defineStore('udp-multiTags', {
             if (isUrl(tagVal?.name)) return;
             // 如果title为空拒绝添加空信息到标签页
             if (tagVal?.meta?.title?.length === 0) return;
-            // showLink:false 不添加到标签页
-            if (isBoolean(tagVal?.meta?.showLink) && !tagVal?.meta?.showLink) return;
+            // showLink:false 不添加到标签页 -- 因审批流注释2025/11/6
+            // if (isBoolean(tagVal?.meta?.showLink) && !tagVal?.meta?.showLink) return;
             const tagPath = tagVal.path;
             // 判断tag是否已存在
             const tagHasExits = this.multiTags.some(tag => {
-              return tag.path === tagPath;
+              return tag.path === tagPath && isEqual(tag?.query, tagVal?.query) && isEqual(tag?.params, tagVal?.params);
             });
 
             // 判断tag中的query键值是否相等
-            const tagQueryHasExits = this.multiTags.some(tag => {
-              return isEqual(tag?.query, tagVal?.query);
-            });
+            // const tagQueryHasExits = this.multiTags.some(tag => {
+            //   return isEqual(tag?.query, tagVal?.query);
+            // });
 
-            // 判断tag中的params键值是否相等
-            const tagParamsHasExits = this.multiTags.some(tag => {
-              return isEqual(tag?.params, tagVal?.params);
-            });
+            // // 判断tag中的params键值是否相等
+            // const tagParamsHasExits = this.multiTags.some(tag => {
+            //   return isEqual(tag?.params, tagVal?.params);
+            // });
 
-            if (tagHasExits && tagQueryHasExits && tagParamsHasExits) return;
+            // if (tagHasExits && tagQueryHasExits && tagParamsHasExits) return;
+            if (tagHasExits) return;
 
             // 动态路由可打开的最大数量
             const dynamicLevel = tagVal?.meta?.dynamicLevel ?? -1;

package/src/store/modules/permission.ts

@@ -1,15 +1,15 @@
 /*
  * @Author: wei.li
  * @Date: 2021-11-17 16:02:30
- * @LastEditors: wei.li
- * @LastEditTime: 2024-07-03 10:20:58
+ * @LastEditors: levi7754 levi7754@163.com
+ * @LastEditTime: 2025-10-19 11:58:29
  * @Description: file content
  */
 import { defineStore } from 'pinia';
 import { store } from '../index';
 import type { cacheType } from './types';
 import { constantMenus } from '../../router';
-import { clone, debounce, findLastIndexOf } from 'xe-utils';
+import { clone, findLastIndexOf } from 'xe-utils';
 import { getKeyList } from '../../utils';
 import { ascending, filterTree, formatFlatteningRoutes } from '../../router/utils';
 import { useMultiTagsStoreHook } from './multiTags';
@@ -58,35 +58,45 @@ export const usePermissionStore = defineStore('udp-permission', {
     setWholeMenus(wholeMenus) {
       this.wholeMenus = wholeMenus;
     },
+
+    /** 监听缓存页面是否存在于标签页，不存在则删除 */
+    clearCache() {
+      let cacheLength = this.cachePageList.length;
+      const nameList = getKeyList(useMultiTagsStoreHook().multiTags, 'name');
+      while (cacheLength > 0) {
+        nameList.findIndex(v => v === this.cachePageList[cacheLength - 1]) === -1 &&
+          this.cachePageList.splice(this.cachePageList.indexOf(this.cachePageList[cacheLength - 1]), 1);
+        cacheLength--;
+      }
+    },
     cacheOperate({ mode, name }: cacheType) {
       const delIndex = this.cachePageList.findIndex(v => v === name);
       switch (mode) {
         case 'refresh':
           this.cachePageList = this.cachePageList.filter(v => v !== name);
+          this.clearCache();
           break;
         case 'add':
           this.cachePageList.push(name);
           break;
         case 'delete':
           delIndex !== -1 && this.cachePageList.splice(delIndex, 1);
+          this.clearCache();
           break;
         case 'reset':
           this.cachePageList = [];
           break;
       }
       /** 监听缓存页面是否存在于标签页，不存在则删除 */
-      debounce(() => {
-        let cacheLength = this.cachePageList.length;
-        const nameList = getKeyList(useMultiTagsStoreHook().multiTags, 'name');
-        while (cacheLength > 0) {
-          nameList.findIndex(v => v === this.cachePageList[cacheLength - 1]) === -1 &&
-            this.cachePageList.splice(
-              this.cachePageList.indexOf(this.cachePageList[cacheLength - 1]),
-              1
-            );
-          cacheLength--;
-        }
-      }, 500)();
+      // debounce(() => {
+      //   let cacheLength = this.cachePageList.length;
+      //   const nameList = getKeyList(useMultiTagsStoreHook().multiTags, 'name');
+      //   while (cacheLength > 0) {
+      //     nameList.findIndex(v => v === this.cachePageList[cacheLength - 1]) === -1 &&
+      //       this.cachePageList.splice(this.cachePageList.indexOf(this.cachePageList[cacheLength - 1]), 1);
+      //     cacheLength--;
+      //   }
+      // }, 500)();
     },
     /** 清空缓存页面 */
     clearAllCachePage() {

package/src/store/modules/system.ts

@@ -166,9 +166,7 @@ export const useSystemStore = defineStore('udp-system', {
         organizationId: systemInfo.organizationId
       };
       cookies.set('kCookies_param', JSON.stringify(query));
-      this.isAdminRole = this.employee.sysRoles.some(
-        s => s.roleCode === 'admin' || ['管理员'].includes(s.roleName)
-      );
+      this.isAdminRole = this.employee.sysRoles.some(s => s.roleCode === 'admin' || ['管理员'].includes(s.roleName));
       // 缓存按钮数据权限
       usePermissionStoreHook().setAuthButton(systemInfo.dataMenus);
     }