@utogether/udp-core 1.0.1-beta.12 → 1.0.1-beta.13

package/dist/{utogether-C2KGHvut.js → utogether-N0mpFm7j.js}

@@ -1,6 +1,6 @@
 import { computed as W, ref as L } from "vue";
 import { useGlobal as g, storageLocal as u, deviceDetection as H, cookies as C, storageSession as M } from "@utogether/utils";
-import { y as P, j as E, s as j, g as h, v as d, z as J, l as K, m as R, n as V, u as S, r as G, o as O, A as x, B as Z } from "./index-BAkwQh8m.js";
+import { y as P, j as E, s as j, g as h, v as d, z as J, l as K, m as R, n as V, u as S, r as G, o as O, A as x, B as Z } from "./index-ChmJT--N.js";
 import { useI18n as f } from "vue-i18n";
 import { defineStore as v } from "pinia";
 function I() {

package/package.json

@@ -1,18 +1,18 @@
-{
-  "name": "@utogether/udp-core",
-  "private": false,
-  "version": "1.0.1-beta.12",
-  "description": "",
-  "type": "module",
-  "main1": "index.ts",
-  "main": "dist/core.es.js",
-  "scripts": {
-    "dev": "vite",
-    "build": "vite build",
-    "preview:build": "pnpm build && vite preview",
-    "report": "rimraf dist && vite build"
-  },
-  "keywords": [],
-  "author": "",
-  "license": "ISC"
-}
+{
+  "name": "@utogether/udp-core",
+  "private": false,
+  "version": "1.0.1-beta.13",
+  "description": "",
+  "type": "module",
+  "main1": "index.ts",
+  "main": "dist/core.es.js",
+  "scripts": {
+    "dev": "vite",
+    "build": "vite build",
+    "preview:build": "pnpm build && vite preview",
+    "report": "rimraf dist && vite build"
+  },
+  "keywords": [],
+  "author": "",
+  "license": "ISC"
+}

package/src/api/http.ts

@@ -26,10 +26,7 @@ export const getPrintTemp = (printPosition, query?) => {
   const organizationId = useSystemStoreHook().getOrganizationId;
   const orgId = useSystemStoreHook().getOrgId;
   const url = '/upms/v1/printTemplateConfig/ogn';
-  const param = Object.assign(
-    { pageSize: 100, pageNum: 1, orgId, organizationId, printPosition },
-    query || {}
-  );
+  const param = Object.assign({ pageSize: 100, pageNum: 1, orgId, organizationId, printPosition }, query || {});
   return new Promise(reslove => {
     http.get(`${getBaseURL()}${url}`, param).then(async (res: IResponseData) => {
       const templateCode = res.list

package/src/api/index.ts

@@ -1,31 +1,33 @@
-/*
- * @Author: wei.li
- * @Date: 2021-11-17 16:24:43
- * @LastEditors: levi7754 levi7754@163.com
- * @LastEditTime: 2024-11-23 10:13:07
- * @Description: API封装
- */
-// import { http } from '@utogether/utils';
-import { http } from '../utils/udp/http';
-import { getEnv } from '../config';
-
-// 路由相关服务
-export const getServiceApi = () => {
-  return {
-    post: (url: string, data: object, config?) => http.post(`${getBaseURL()}${url}`, data, config),
-    get: (url: string, params: object, config?) => http.get(`${getBaseURL()}${url}`, params, config),
-    put: (url: string, params: object) => http.put(`${getBaseURL()}${url}`, params),
-    delete: (url: string, params: object) => http.delete(`${getBaseURL()}${url}`, params)
-  };
-};
-
-export const setRouter = router => {
-  http.setRouter(router);
-  // http.setBaseUrl(getBaseURL());
-};
-
-const origin = window.location.origin + '/gateway';
-
-export const getBaseURL = () => {
-  return getEnv().VITE_BASE_URL === 'origin' ? origin : getEnv().VITE_BASE_URL;
-};
+/*
+ * @Author: wei.li
+ * @Date: 2021-11-17 16:24:43
+ * @LastEditors: levi7754 levi7754@163.com
+ * @LastEditTime: 2025-09-05 11:53:29
+ * @Description: API封装
+ */
+import { http } from '@utogether/utils';
+// import { http } from '../utils/udp/http';
+import { getEnv } from '../config';
+
+// 路由相关服务
+export const getServiceApi = () => {
+  return {
+    post: (url: string, data: object, config?) => http.post(`${getBaseURL()}${url}`, data, config),
+    get: (url: string, params: object, config?) => http.get(`${getBaseURL()}${url}`, params, config),
+    put: (url: string, params: object) => http.put(`${getBaseURL()}${url}`, params),
+    delete: (url: string, params: object) => http.delete(`${getBaseURL()}${url}`, params)
+  };
+};
+
+export const setRouter = router => {
+  http.setRouter(router);
+};
+export const setBaseUrl = router => {
+  http.setBaseUrl(router);
+};
+
+const origin = window.location.origin + '/gateway';
+
+export const getBaseURL = () => {
+  return getEnv().VITE_BASE_URL === 'origin' ? origin : getEnv().VITE_BASE_URL;
+};

package/src/api/user.ts

@@ -2,13 +2,13 @@
  * @Author: wei.li
  * @Date: 2021-11-17 16:02:30
  * @LastEditors: levi7754 levi7754@163.com
- * @LastEditTime: 2024-06-06 16:29:39
+ * @LastEditTime: 2025-09-05 12:33:08
  * @Description: file content
  */
 import { http } from '@utogether/utils';
+// import { http } from '../utils/udp/http';
 import { getBaseURL } from './';
 
-http.setBaseUrl(getBaseURL());
 // 私钥
 export const getPublicKey = () => http.get(`${getBaseURL()}/public/request`);
 // 获取验证码

package/src/main.ts

@@ -2,17 +2,10 @@
  * @Author: levi7754 levi7754@163.com
  * @Date: 2025-07-25 13:38:20
  * @LastEditors: levi7754 levi7754@163.com
- * @LastEditTime: 2025-08-21 17:15:41
+ * @LastEditTime: 2025-09-05 13:48:25
  * @FilePath: \udp-front\packages\udp-core\src\main.ts
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
-/*
- * @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';
@@ -23,7 +16,7 @@ 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 { getServiceApi, getBaseURL, setRouter, setBaseUrl } from './api';
 
 import 'nprogress/nprogress.css';
 // 一定要在main.ts中导入tailwind.css，防止vite每次hmr都会请求src/style/index.scss整体css文件导致热更新慢的问题
@@ -107,6 +100,7 @@ const init = ({ router, config, lang, views, env, tableConfig }) => {
     //   .component('UtModalGrid', UtModalGrid);
     app.use(VueViewer, { defaultOptions: { zIndex: 9999 } });
     setGlobal(app);
+    setBaseUrl(getBaseURL());
     setGlobalDirective(app);
     // 全局组件
     setupStore(app);

package/src/router/index.ts

@@ -1,177 +1,177 @@
-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;
+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/style/vxetable.scss

@@ -47,7 +47,7 @@ html[data-vxe-ui-theme='light'] {
     background-color: #fffbdf;
   }
 
-  .el-select__wrapper:not(:disabled) {
+  .el-select__wrapper:not(.is-disabled) {
     background-color: #fffbdf;
   }
 

package/src/utils/propTypes.ts

@@ -1,42 +1,42 @@
-/*
- * @Author: levi7754 levi7754@163.com
- * @Date: 2023-06-19 09:14:18
- * @LastEditors: wei.li
- * @LastEditTime: 2024-07-02 08:57:49
- * @FilePath: /sitzone-mes/src/utils/propTypes.ts
- * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
- */
-import type { CSSProperties, VNodeChild } from 'vue';
-import { createTypes, toValidableType, type VueTypesInterface, type VueTypeValidableDef } from 'vue-types';
-
-export type VueNode = VNodeChild | JSX.Element;
-
-type PropTypes = VueTypesInterface & {
-  readonly style: VueTypeValidableDef<CSSProperties>;
-  readonly VNodeChild: VueTypeValidableDef<VueNode>;
-};
-
-const newPropTypes = createTypes({
-  func: undefined,
-  bool: undefined,
-  string: undefined,
-  number: undefined,
-  object: undefined,
-  integer: undefined
-}) as PropTypes;
-
-// 从 vue-types v5.0 开始，extend()方法已经废弃，当前已改为官方推荐的ES6+方法 https://dwightjack.github.io/vue-types/advanced/extending-vue-types.html#the-extend-method
-export default class propTypes extends newPropTypes {
-  // a native-like validator that supports the `.validable` method
-  static get style() {
-    return toValidableType('style', {
-      type: [String, Object]
-    });
-  }
-
-  static get VNodeChild() {
-    return toValidableType('VNodeChild', {
-      type: undefined
-    });
-  }
-}
+/*
+ * @Author: levi7754 levi7754@163.com
+ * @Date: 2023-06-19 09:14:18
+ * @LastEditors: wei.li
+ * @LastEditTime: 2024-07-02 08:57:49
+ * @FilePath: /sitzone-mes/src/utils/propTypes.ts
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+ */
+import type { CSSProperties, VNodeChild } from 'vue';
+import { createTypes, toValidableType, type VueTypesInterface, type VueTypeValidableDef } from 'vue-types';
+
+export type VueNode = VNodeChild | JSX.Element;
+
+type PropTypes = VueTypesInterface & {
+  readonly style: VueTypeValidableDef<CSSProperties>;
+  readonly VNodeChild: VueTypeValidableDef<VueNode>;
+};
+
+const newPropTypes = createTypes({
+  func: undefined,
+  bool: undefined,
+  string: undefined,
+  number: undefined,
+  object: undefined,
+  integer: undefined
+}) as PropTypes;
+
+// 从 vue-types v5.0 开始，extend()方法已经废弃，当前已改为官方推荐的ES6+方法 https://dwightjack.github.io/vue-types/advanced/extending-vue-types.html#the-extend-method
+export default class propTypes extends newPropTypes {
+  // a native-like validator that supports the `.validable` method
+  static get style() {
+    return toValidableType('style', {
+      type: [String, Object]
+    });
+  }
+
+  static get VNodeChild() {
+    return toValidableType('VNodeChild', {
+      type: undefined
+    });
+  }
+}