@utogether/udp-core 1.0.1-beta.2 → 1.0.1-beta.4

package/src/plugins/vxe-table/index.ts

@@ -2,7 +2,7 @@
  * @Author: levi7754 levi7754@163.com
  * @Date: 2024-06-05 14:32:03
  * @LastEditors: levi7754 levi7754@163.com
- * @LastEditTime: 2025-07-20 11:07:31
+ * @LastEditTime: 2025-07-30 09:51:55
  * @FilePath: /udp-front/packages/udp-core/src/plugins/vxe-table/index.ts
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */

package/src/plugins/vxe-table/render.tsx

@@ -2,7 +2,7 @@
  * @Author: wei.li
  * @Date: 2021-12-01 09:18:50
  * @LastEditors: levi7754 levi7754@163.com
- * @LastEditTime: 2025-07-14 18:17:16
+ * @LastEditTime: 2025-07-23 09:41:24
  * @Description: file content
  */
 
@@ -59,7 +59,7 @@ export const VxetableRender = (VXETable, { serviceApi, i18n }) => {
        * @param {*} val 目前的选中值
        */
       function onChange(val) {
-        componentHook.selectChange(val, data, column.field, renderOpts, {
+        componentHook.selectChange(val, row, column.field, renderOpts, {
           column,
           datasource: 'row'
         });
@@ -471,6 +471,7 @@ export const VxetableRender = (VXETable, { serviceApi, i18n }) => {
       const { row, column } = params;
       const { props, events } = renderOpts;
       const componentHook = useComponent();
+      console.log('lov====');
       function onChange(record, displayField) {
         const { mapField, field, displayName, multiple } = props;
         if (!multiple) {
@@ -493,6 +494,7 @@ export const VxetableRender = (VXETable, { serviceApi, i18n }) => {
         <ut-lov
           record={row}
           mode="vxe"
+          transfer
           {...props}
           onChange={(v, f) => onChange(v, f)}
           onClear={() => onClear()}

package/src/router/index.ts

@@ -1,183 +1,187 @@
-import { findIndexOf, isEmpty } from 'xe-utils';
-import {
-  type Router,
-  createRouter,
-  type RouteRecordRaw,
-  type RouteComponent,
-  createWebHistory
-} 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 { kLOGINER } from '../contant';
-
-import homeRouter from './modules/home';
-import errorRouter from './modules/error';
-import remainingRouter from './modules/remaining';
-
-const systemRouter = import.meta.glob([
-  '../views/system/**/*.{vue,tsx}',
-  '../views/uapp/**/*.{vue,tsx}',
-  '../views/upms/**/*.{vue,tsx}',
-  '../views/ufile/**/*.{vue}',
-  '../views/urpt/**/*.{vue,tsx}',
-  '../views/organization/**/*.{vue,tsx}',
-  '../views/udev/**/*.{vue, tsx}'
-]);
-
-// 原始静态路由（未做任何处理）
-const routes = [homeRouter, errorRouter];
-/** 导出处理后的静态路由（三级及以上的路由全部拍成二级） */
-export const constantRoutes: Array<RouteRecordRaw> = formatTwoStageRoutes(
-  formatFlatteningRoutes(buildHierarchyTree(ascending(routes)))
-);
-
-/** 用于渲染菜单，保持原始层级 */
-export const constantMenus: Array<RouteComponent> = ascending(routes).concat(...remainingRouter);
-
-/** 不参与菜单的路由 */
-export const remainingPaths = Object.keys(remainingRouter).map(v => {
-  return remainingRouter[v].path;
-});
-
-/** 创建路由实例 */
-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 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)))
-      );
-    }
-  });
-  usePermissionStoreHook().clearAllCachePage();
-}
-
-let views = null;
-export function setViews(cviews) {
-  views = cviews;
-  Object.assign(views, systemRouter);
-}
-
-export function getViews() {
-  return views;
-}
-
-/** 路由白名单 */
-const whiteList = ['/login'];
-
-router.beforeEach((to: ToRouteType, _from, next) => {
-  if (to.meta?.keepAlive) {
-    handleAliveRoute(to, 'add');
-    // 页面整体刷新和点击标签页刷新
-    if (_from.name === undefined || _from.name === 'redirect') {
-      handleAliveRoute(to);
-    }
-  }
-  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();
-    }
-  } else {
-    if (to.path !== '/login') {
-      if (whiteList.indexOf(to.path) !== -1) {
-        next();
-      } else {
-        next({ path: '/login' });
-      }
-    } else {
-      next();
-    }
-  }
-});
-
-router.afterEach(() => {
-  NProgress?.done();
-});
-
-export default router;
+import { findIndexOf, isEmpty } from 'xe-utils';
+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 { getEnv } from '../config';
+import { kLOGINER } from '../contant';
+
+import homeRouter from './modules/home';
+import errorRouter from './modules/error';
+import remainingRouter from './modules/remaining';
+
+const systemRouter = import.meta.glob([
+  '../views/system/**/*.{vue,tsx}',
+  '../views/uapp/**/*.{vue,tsx}',
+  '../views/upms/**/*.{vue,tsx}',
+  '../views/ufile/**/*.{vue}',
+  '../views/urpt/**/*.{vue,tsx}',
+  '../views/organization/**/*.{vue,tsx}',
+  '../views/udev/**/*.{vue, tsx}'
+]);
+
+export const remainingRouters = remainingRouter;
+
+// 原始静态路由（未做任何处理）
+const routes = [homeRouter, errorRouter];
+/** 导出处理后的静态路由（三级及以上的路由全部拍成二级） */
+export const constantRoutes: Array<RouteRecordRaw> = formatTwoStageRoutes(
+  formatFlatteningRoutes(buildHierarchyTree(ascending(routes)))
+);
+
+/** 用于渲染菜单，保持原始层级 */
+export const constantMenus: Array<RouteComponent> = ascending(routes).concat(...remainingRouter);
+
+/** 不参与菜单的路由 */
+export const remainingPaths = Object.keys(remainingRouter).map(v => {
+  return remainingRouter[v].path;
+});
+
+/** 创建路由实例 */
+// 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 });
+//         }
+//       }
+//     });
+//   }
+// });
+
+/** 重置路由 */
+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)))
+      );
+    }
+  });
+  usePermissionStoreHook().clearAllCachePage();
+}
+
+let views = null;
+export let router = null;
+export function setViews(cviews, crouter) {
+  views = cviews;
+  router = crouter;
+  Object.assign(views, systemRouter);
+}
+
+export function getViews() {
+  return views;
+}
+
+/** 路由白名单 */
+const whiteList = ['/login'];
+/*
+router.beforeEach((to: ToRouteType, _from, next) => {
+  if (to.meta?.keepAlive) {
+    handleAliveRoute(to, 'add');
+    // 页面整体刷新和点击标签页刷新
+    if (_from.name === undefined || _from.name === 'redirect') {
+      handleAliveRoute(to);
+    }
+  }
+  const userName = cookies.get(kLOGINER);
+  NProgress.start();
+  if (userName) {
+    routerBefore(to, _from, next);
+  } else {
+    if (to.path !== '/login') {
+      if (whiteList.indexOf(to.path) !== -1) {
+        next();
+      } else {
+        next({ path: '/login' });
+      }
+    } else {
+      next();
+    }
+  }
+});
+
+router.afterEach(() => {
+  NProgress?.done();
+});
+
+*/
+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/remaining.ts

@@ -1,83 +1,58 @@
-/*
- * @Author: wei.li
- * @Date: 2021-11-17 16:02:30
- * @LastEditors: levi7754 levi7754@163.com
- * @LastEditTime: 2024-12-18 08:44:24
- * @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: '/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',
-    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;