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

package/src/layout/components/lay-panel/index.vue

@@ -2,7 +2,7 @@
  * @Author: wei.li
  * @Date: 2021-12-23 17:33:20
  * @LastEditors: levi7754 levi7754@163.com
- * @LastEditTime: 2025-04-16 15:54:13
+ * @LastEditTime: 2025-07-31 10:15:40
  * @Description: 个性化设置页面
 -->
 <script setup lang="ts">
@@ -52,7 +52,7 @@ onBeforeUnmount(() => {
 <template>
   <div :class="{ show }">
     <div class="right-panel-background" />
-    <div ref="target" class="right-panel bg-bg_color">
+    <div ref="target" class="right-panel bg-bg_color bg-white">
       <div
         class="project-configuration border-0 border-b-[1px] border-solid border-[var(--pure-border-color)]"
       >
@@ -118,7 +118,7 @@ onBeforeUnmount(() => {
   position: fixed;
   top: 0;
   right: 0;
-  z-index: 40000;
+  z-index: 400000;
   width: 100%;
   max-width: 300px;
   box-shadow: 0 0 15px 0 rgb(0 0 0 / 5%);

package/src/main.ts

@@ -1,110 +1,111 @@
-/*
- * @Author: wei.li
- * @Date: 2022-10-18 18:13:54
- * @LastEditors: levi7754 levi7754@163.com
- * @LastEditTime: 2025-07-21 11:28:01
- * @Description: file content
- */
-import { createApp, type Directive } from 'vue';
-import App from './App.vue';
-import router from './router';
-import { setViews } from './router';
-import { setupStore } from './store';
-import { setConfig, setSystemEnv } from './config';
-import { useI18n } from '../src/plugins/i18n';
-import { setTableConfig } from '../src/plugins/vxe-table';
-import { injectResponsiveStorage } from './utils/storage';
-import hasAuthority from './utils/authority';
-import { getServiceApi, getBaseURL, setRouter } from './api';
-
-import 'nprogress/nprogress.css';
-// 一定要在main.ts中导入tailwind.css，防止vite每次hmr都会请求src/style/index.scss整体css文件导致热更新慢的问题
-import './style/tailwind.css';
-// // 引入重置样式
-import './style/reset.scss';
-// 导入公共样式
-import './style/index.scss';
-
-import 'viewerjs/dist/viewer.css';
-
-import VueViewer from 'v-viewer';
-
-// import SuTable from './components/SuTable/SuTable.vue';
-
-// import {
-//   UtButton,
-// utLov2,
-// UGrid,
-//   UtDivider,
-// UtModalForm2,
-// FormUpload2
-//   UtForm,
-// UtGrid2
-//   UtContent,
-//   UtCountdown,
-//   UtIconSelect,
-//   UtCalendar
-// uAttachment
-// } from './components/udp';
-
-const app = createApp(App);
-
-// 全局注册`@iconify/vue`图标库
-import { IconifyIconOffline, FontIcon } from './components/ReIcon';
-// 全局注册`vue-tippy`
-import 'tippy.js/dist/tippy.css';
-import 'tippy.js/animations/perspective.css';
-import VueTippy from 'vue-tippy';
-
-app.use(VueTippy, {
-  defaultProps: { animation: 'perspective' }
-});
-
-// 自定义指令
-import * as directives from './directives';
-
-const setGlobal = app => {
-  app.config.globalProperties.$hasAuthority = hasAuthority;
-  app.config.globalProperties.$serviceApi = getServiceApi();
-  app.config.globalProperties.$url = getBaseURL();
-};
-
-const setGlobalDirective = app => {
-  Object.keys(directives).forEach(key => {
-    app.directive(key, (directives as { [key: string]: Directive })[key]);
-  });
-};
-
-const init = ({ config, lang, views, env, tableConfig }) => {
-  app.use(router);
-  setRouter(router);
-  setConfig(app, config);
-  setSystemEnv(env);
-  setViews(views);
-  setTableConfig(tableConfig);
-  return new Promise(resolve => {
-    useI18n(app, lang);
-    app.component('IconifyIconOffline', IconifyIconOffline);
-    app.component('FontIcon', FontIcon);
-    // app.component('uAttachment', uAttachment).component('UGrid', UGrid);
-    //   .component('UtDivider', UtDivider)
-    // .component('UtModalForm2', UtModalForm2)
-    // app.component('UtGrid2', UtGrid2);
-    //   .component('UtForm', UtForm)
-    //   .component('UtContent', UtContent)
-    //   .component('UtIconSelect', UtIconSelect)
-    //   .component('UtCountdown', UtCountdown)
-    //   .component('UtCalendar', UtCalendar)
-    //   .component('UtModalGrid', UtModalGrid);
-    app.use(VueViewer, { defaultOptions: { zIndex: 9999 } });
-    setGlobal(app);
-    setGlobalDirective(app);
-    // 全局组件
-    setupStore(app);
-    injectResponsiveStorage(app, config);
-    const result = { app, router };
-    resolve(result);
-  });
-};
-
-export default init;
+/*
+ * @Author: wei.li
+ * @Date: 2022-10-18 18:13:54
+ * @LastEditors: levi7754 levi7754@163.com
+ * @LastEditTime: 2025-07-31 17:17:32
+ * @Description: file content
+ */
+import { createApp, type Directive } from 'vue';
+import App from './App.vue';
+// import router from './router';
+import { setViews } from './router';
+import { setupStore } from './store';
+import { setConfig, setSystemEnv } from './config';
+import { useI18n } from '../src/plugins/i18n';
+import { setTableConfig } from '../src/plugins/vxe-table';
+import { injectResponsiveStorage } from './utils/storage';
+import hasAuthority from './utils/authority';
+import { getServiceApi, getBaseURL, setRouter } from './api';
+
+import 'nprogress/nprogress.css';
+// 一定要在main.ts中导入tailwind.css，防止vite每次hmr都会请求src/style/index.scss整体css文件导致热更新慢的问题
+import './style/tailwind.css';
+// // 引入重置样式
+import './style/reset.scss';
+// 导入公共样式
+import './style/index.scss';
+
+import 'viewerjs/dist/viewer.css';
+
+import VueViewer from 'v-viewer';
+
+// import SuTable from './components/SuTable/SuTable.vue';
+
+import {
+  //   UtButton,
+  // utLov2,
+  // UGrid,
+  //   UtDivider,
+  UtModalForm2,
+  // FormUpload2
+  UtForm2,
+  UtGrid2,
+  //   UtContent,
+  // UtCountdown2,
+  UtUpload2
+  //   UtIconSelect,
+  //   UtCalendar
+  // uAttachment
+} from './components/udp';
+
+const app = createApp(App);
+
+// 全局注册`@iconify/vue`图标库
+import { IconifyIconOffline, FontIcon } from './components/ReIcon';
+// 全局注册`vue-tippy`
+import 'tippy.js/dist/tippy.css';
+import 'tippy.js/animations/perspective.css';
+import VueTippy from 'vue-tippy';
+
+app.use(VueTippy, {
+  defaultProps: { animation: 'perspective' }
+});
+
+// 自定义指令
+import * as directives from './directives';
+
+const setGlobal = app => {
+  app.config.globalProperties.$hasAuthority = hasAuthority;
+  app.config.globalProperties.$serviceApi = getServiceApi();
+  app.config.globalProperties.$url = getBaseURL();
+};
+
+const setGlobalDirective = app => {
+  Object.keys(directives).forEach(key => {
+    app.directive(key, (directives as { [key: string]: Directive })[key]);
+  });
+};
+
+const init = ({ router, config, lang, views, env, tableConfig }) => {
+  setViews(views, router);
+  app.use(router);
+  setRouter(router);
+  setConfig(app, config);
+  setSystemEnv(env);
+  setTableConfig(tableConfig);
+  return new Promise(resolve => {
+    useI18n(app, lang);
+    app.component('IconifyIconOffline', IconifyIconOffline);
+    app.component('FontIcon', FontIcon);
+    // app.component('uAttachment', uAttachment).component('UGrid', UGrid);
+    //   .component('UtDivider', UtDivider)
+    app.component('UtModalForm2', UtModalForm2);
+    app.component('UtGrid2', UtGrid2);
+    app.component('UtForm2', UtForm2);
+    //   .component('UtContent', UtContent)
+    //   .component('UtIconSelect', UtIconSelect)
+    app.component('UtUpload2', UtUpload2);
+    //   .component('UtCalendar', UtCalendar)
+    //   .component('UtModalGrid', UtModalGrid);
+    app.use(VueViewer, { defaultOptions: { zIndex: 9999 } });
+    setGlobal(app);
+    setGlobalDirective(app);
+    // 全局组件
+    setupStore(app);
+    injectResponsiveStorage(app, config);
+    const result = { app, router };
+    resolve(result);
+  });
+};
+
+export default init;

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-21 11:37:34
+ * @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
  */
@@ -10,8 +10,8 @@ import 'xe-utils';
 import { merge } from 'xe-utils';
 import { geti18n, transformI18n } from '../i18n/index';
 // import { storageLocal } from '@utogether/utils';
-// import { VxetableRender } from '@utogether/utils';
-import { VxetableRender } from './render';
+import { VxetableRender } from '@utogether/utils';
+// import { VxetableRender } from './render';
 import { getServiceApi } from '../../api';
 
 import VXETable, { VxeUI } from 'vxe-table';

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;