@utogether/udp-core 2.0.0-beta.26 → 2.0.0-beta.28

package/src/main.ts

@@ -1,109 +1,111 @@
-/*
- * @Author: levi7754 levi7754@163.com
- * @Date: 2025-07-25 13:38:20
- * @LastEditors: levi7754 levi7754@163.com
- * @LastEditTime: 2026-04-16 10:12:13
- * @FilePath: \udp-front\packages\udp-core\src\main.ts
- * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
- */
-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, transformI18n } 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, setBaseUrl, getDebugBaseURL } 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 {
-  UtLov2,
-  //   UtDivider,
-  // UtModalForm2
-  FormUpload2,
-  // UtForm2,
-  UtGrid2,
-  UtContent2,
-  UtStampBadge2,
-  // UtModalGrid2
-  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.$debuggerApi = getDebugBaseURL();
-  app.config.globalProperties.$url = getBaseURL();
-  window.$i18n = transformI18n;
-};
-
-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('UtUpload2', UtUpload2);
-    // app.component('UtModalGrid2', UtModalGrid2);
-    //   .component('UtIconSelect', UtIconSelect)
-    app.component('FormUpload2', FormUpload2).component('UtLov2', UtLov2);
-    app.component('UtContent2', UtContent2);
-    app.component('UtStampBadge2', UtStampBadge2);
-    //   .component('UtModalGrid', UtModalGrid);
-    // app.use(VueViewer, { defaultOptions: { zIndex: 9999 } });
-    setGlobal(app);
-    setBaseUrl(getBaseURL());
-    setGlobalDirective(app);
-    // 全局组件
-    setupStore(app);
-    injectResponsiveStorage(app, config);
-    const result = { app, router };
-    resolve(result);
-  });
-};
-
-export default init;
+/*
+ * @Author: levi7754 levi7754@163.com
+ * @Date: 2025-07-25 13:38:20
+ * @LastEditors: levi7754 levi7754@163.com
+ * @LastEditTime: 2026-09-09 11:32:07
+ * @FilePath: \udp-front\packages\udp-core\src\main.ts
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+ */
+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, transformI18n } from '../src/plugins/i18n';
+import { setTableConfig } from '../src/plugins/vxe-table';
+import { injectResponsiveStorage } from './utils/storage';
+import { hasAuthority, isViewonly } from './utils/authority';
+import { getServiceApi, getBaseURL, setRouter, setBaseUrl, getDebugBaseURL } 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 {
+  // UtLov2,
+  //   UtDivider,
+  // UtModalForm2,
+  // FormUpload2,
+  // UtForm2,
+  // UtGrid2
+  // UtContent2,
+  // UtStampBadge2,
+  // UtModalGrid2
+  // UtUpload2
+  //   UtIconSelect,
+  //   UtCalendar
+  // uAttachment
+// } from './components/udp';
+
+const app = createApp(App);
+
+// 全局注册`@iconify/vue`图标库
+import { IconifyIconOffline, FontIcon } from './components/ReIcon';
+
+// 全局注册`vue-tippy`
+import VueTippy from 'vue-tippy';
+import 'tippy.js/dist/tippy.css';
+import 'tippy.js/animations/perspective.css';
+
+app.use(VueTippy, {
+  defaultProps: { animation: 'perspective' }
+});
+
+// 自定义指令
+import * as directives from './directives';
+
+const setGlobal = app => {
+  app.config.globalProperties.$hasAuthority = hasAuthority;
+  app.config.globalProperties.$isViewonly = isViewonly;
+  app.config.globalProperties.$serviceApi = getServiceApi();
+  app.config.globalProperties.$debuggerApi = getDebugBaseURL();
+  app.config.globalProperties.$url = getBaseURL();
+  window.$i18n = transformI18n;
+};
+
+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('UtUpload2', UtUpload2);
+    // app.component('UtModalGrid2', UtModalGrid2);
+    //   .component('UtIconSelect', UtIconSelect)
+    // app.component('FormUpload2', FormUpload2).component('UtLov2', UtLov2);
+    // app.component('UtContent2', UtContent2);
+    // app.component('UtStampBadge2', UtStampBadge2);
+    //   .component('UtModalGrid', UtModalGrid);
+    // app.use(VueViewer, { defaultOptions: { zIndex: 9999 } });
+    setGlobal(app);
+    setBaseUrl(getBaseURL());
+    setGlobalDirective(app);
+    // 全局组件
+    setupStore(app);
+    injectResponsiveStorage(app, config);
+    const result = { app, router };
+    resolve(result);
+  });
+};
+
+export default init;

package/src/plugins/i18n/zh.ts

@@ -57,6 +57,7 @@ export default {
     ip: 'ip地址',
     browserVersion: '浏览器版本',
     browser: '浏览器',
+
     dictCode: '字典编码',
     dictName: '字典名称',
     dictDesc: '字典描述',
@@ -73,6 +74,7 @@ export default {
     currentValue: '当前值',
     haveBeenUsed: '使用中',
     description: '描述',
+    continuousAddition: '连续添加',
 
     unitName: '单位名称',
     unitCode: '单位编码',
@@ -114,6 +116,7 @@ export default {
 
     organizationName: '组织名称',
     organizationCode: '组织编码',
+
     appupper: '已上架',
     applower: '已下架',
     isApprovalPage: '审批页面',
@@ -368,7 +371,8 @@ export default {
     updatenow: '立即更新',
     newVersion: '检测到新版本',
     updateLater: '稍后更新',
-    confirmResetPassword: '确认重置密码吗?'
+    confirmResetPassword: '确认重置密码吗?',
+    dialog2Level: '弹框层级只支持2级'
   },
   title: {
     employeeInfo: '员工信息',

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

@@ -1,116 +1,116 @@
-/*
- * @Author: levi7754 levi7754@163.com
- * @Date: 2024-06-05 14:32:03
- * @LastEditors: levi7754 levi7754@163.com
- * @LastEditTime: 2026-04-07 13:43:12
- * @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
- */
-import 'xe-utils';
-import { merge, toDateString, getWhatDay } from 'xe-utils';
-import { geti18n, transformI18n } from '../i18n/index';
-// import { storageLocal } from '@utogether/utils';
-import { VxetableRender } from '@utogether/utils';
-// import { VxetableRender } from './render';
-import { getServiceApi } from '../../api';
-
-import VXETable, { VxeUI } from 'vxe-table';
-// import './render.tsx';
-
-// const dict = storageLocal.getItem('kLov');
-VxetableRender(VXETable, { serviceApi: getServiceApi(), i18n: transformI18n });
-setCommands();
-
-// 全局默认参数
-const defaultConfig = {
-  // 对组件内置的提示语进行国际化翻译
-  // @ts-ignore
-  i18n: (key, args) => geti18n().global.t(key, args),
-  // 可选，对参数中的列头、校验提示..等进行自动翻译（只对支持国际化的有效）
-  translate(key) {
-    // 例如，只翻译 "message." 开头的键值
-    const NAMESPACED = ['message.', 'el.'];
-    if (key && NAMESPACED.findIndex(v => key.includes(v)) !== -1) {
-      return geti18n().global.t.call(geti18n().global.locale, key);
-    }
-    return key;
-  }
-};
-
-export function setTableConfig(config = {}) {
-  VXETable.setConfig(merge(defaultConfig, config));
-
-  VxeUI.interceptor.add('event.clearEdit', {
-    tableInterceptorMethod(params) {
-      const { $event } = params;
-      if ($event.target.className.indexOf('vxe-table--ignore-clear') > -1) return false;
-    }
-  });
-}
-
-export function setTheme(theme) {
-  // 切换为暗黑主题
-  VxeUI.setTheme(theme);
-}
-
-function setCommands() {
-  // 定义选中日期今天指令
-  VxeUI.commands.add('utTodyay', {
-    dateRangePickerCommandMethod({ $dateRangePicker }) {
-      const startDate = toDateString(new Date(), 'yyyy-MM-dd 00:00:00');
-      const endDate = toDateString(new Date(), 'yyyy-MM-dd 23:59:59');
-      $dateRangePicker.setModelValue(startDate, endDate);
-    }
-  });
-  // 定义选中日期昨天指令
-  VxeUI.commands.add('utYesterDay', {
-    dateRangePickerCommandMethod({ $dateRangePicker }) {
-      const startDate = toDateString(getWhatDay(new Date(), -1), 'yyyy-MM-dd 00:00:00');
-      const endDate = toDateString(getWhatDay(new Date(), -1), 'yyyy-MM-dd 23:59:59');
-      $dateRangePicker.setModelValue(startDate, endDate);
-    }
-  });
-  // 定义选中日期最近一周指令
-  VxeUI.commands.add('utRecentWeek', {
-    dateRangePickerCommandMethod({ $dateRangePicker }) {
-      const startDate = toDateString(getWhatDay(new Date(), -7), 'yyyy-MM-dd 00:00:00');
-      const endDate = toDateString(new Date(), 'yyyy-MM-dd 23:59:59');
-      $dateRangePicker.setModelValue(startDate, endDate);
-    }
-  });
-
-  // 定义选中日期最近一个月指令
-  VxeUI.commands.add('utRecentMonth', {
-    dateRangePickerCommandMethod({ $dateRangePicker }) {
-      const startDate = toDateString(getWhatDay(new Date(), -30), 'yyyy-MM-dd 00:00:00');
-      const endDate = toDateString(new Date(), 'yyyy-MM-dd 23:59:59');
-      $dateRangePicker.setModelValue(startDate, endDate);
-    }
-  });
-
-  // 定义选中日期最近三个月指令
-  VxeUI.commands.add('utRecentThreeMonth', {
-    dateRangePickerCommandMethod({ $dateRangePicker }) {
-      const startDate = toDateString(getWhatDay(new Date(), -90), 'yyyy-MM-dd 00:00:00');
-      const endDate = toDateString(new Date(), 'yyyy-MM-dd 23:59:59');
-      $dateRangePicker.setModelValue(startDate, endDate);
-    }
-  });
-
-  // 定义选中日期最近半年指令
-  VxeUI.commands.add('utRecentHalfYear', {
-    dateRangePickerCommandMethod({ $dateRangePicker }) {
-      const startDate = toDateString(getWhatDay(new Date(), -180), 'yyyy-MM-dd 00:00:00');
-      const endDate = toDateString(new Date(), 'yyyy-MM-dd 23:59:59');
-      $dateRangePicker.setModelValue(startDate, endDate);
-    }
-  });
-  // 定义选中日期最近半年指令
-  VxeUI.commands.add('utRecentYear', {
-    dateRangePickerCommandMethod({ $dateRangePicker }) {
-      const startDate = toDateString(getWhatDay(new Date(), -365), 'yyyy-MM-dd 00:00:00');
-      const endDate = toDateString(new Date(), 'yyyy-MM-dd 23:59:59');
-      $dateRangePicker.setModelValue(startDate, endDate);
-    }
-  });
-}
+/*
+ * @Author: levi7754 levi7754@163.com
+ * @Date: 2024-06-05 14:32:03
+ * @LastEditors: levi7754 levi7754@163.com
+ * @LastEditTime: 2026-04-07 13:43:12
+ * @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
+ */
+import 'xe-utils';
+import { merge, toDateString, getWhatDay } from 'xe-utils';
+import { geti18n, transformI18n } from '../i18n/index';
+// import { storageLocal } from '@utogether/utils';
+import { VxetableRender } from '@utogether/utils';
+// import { VxetableRender } from './render';
+import { getServiceApi } from '../../api';
+
+import VXETable, { VxeUI } from 'vxe-table';
+// import './render.tsx';
+
+// const dict = storageLocal.getItem('kLov');
+VxetableRender(VXETable, { serviceApi: getServiceApi(), i18n: transformI18n });
+setCommands();
+
+// 全局默认参数
+const defaultConfig = {
+  // 对组件内置的提示语进行国际化翻译
+  // @ts-ignore
+  i18n: (key, args) => geti18n().global.t(key, args),
+  // 可选，对参数中的列头、校验提示..等进行自动翻译（只对支持国际化的有效）
+  translate(key) {
+    // 例如，只翻译 "message." 开头的键值
+    const NAMESPACED = ['message.', 'el.'];
+    if (key && NAMESPACED.findIndex(v => key.includes(v)) !== -1) {
+      return geti18n().global.t.call(geti18n().global.locale, key);
+    }
+    return key;
+  }
+};
+
+export function setTableConfig(config = {}) {
+  VXETable.setConfig(merge(defaultConfig, config));
+
+  VxeUI.interceptor.add('event.clearEdit', {
+    tableInterceptorMethod(params) {
+      const { $event } = params;
+      if ($event.target.className.indexOf('vxe-table--ignore-clear') > -1) return false;
+    }
+  });
+}
+
+export function setTheme(theme) {
+  // 切换为暗黑主题
+  VxeUI.setTheme(theme);
+}
+
+function setCommands() {
+  // 定义选中日期今天指令
+  VxeUI.commands.add('utTodyay', {
+    dateRangePickerCommandMethod({ $dateRangePicker }) {
+      const startDate = toDateString(new Date(), 'yyyy-MM-dd 00:00:00');
+      const endDate = toDateString(new Date(), 'yyyy-MM-dd 23:59:59');
+      $dateRangePicker.setModelValue(startDate, endDate);
+    }
+  });
+  // 定义选中日期昨天指令
+  VxeUI.commands.add('utYesterDay', {
+    dateRangePickerCommandMethod({ $dateRangePicker }) {
+      const startDate = toDateString(getWhatDay(new Date(), -1), 'yyyy-MM-dd 00:00:00');
+      const endDate = toDateString(getWhatDay(new Date(), -1), 'yyyy-MM-dd 23:59:59');
+      $dateRangePicker.setModelValue(startDate, endDate);
+    }
+  });
+  // 定义选中日期最近一周指令
+  VxeUI.commands.add('utRecentWeek', {
+    dateRangePickerCommandMethod({ $dateRangePicker }) {
+      const startDate = toDateString(getWhatDay(new Date(), -7), 'yyyy-MM-dd 00:00:00');
+      const endDate = toDateString(new Date(), 'yyyy-MM-dd 23:59:59');
+      $dateRangePicker.setModelValue(startDate, endDate);
+    }
+  });
+
+  // 定义选中日期最近一个月指令
+  VxeUI.commands.add('utRecentMonth', {
+    dateRangePickerCommandMethod({ $dateRangePicker }) {
+      const startDate = toDateString(getWhatDay(new Date(), -30), 'yyyy-MM-dd 00:00:00');
+      const endDate = toDateString(new Date(), 'yyyy-MM-dd 23:59:59');
+      $dateRangePicker.setModelValue(startDate, endDate);
+    }
+  });
+
+  // 定义选中日期最近三个月指令
+  VxeUI.commands.add('utRecentThreeMonth', {
+    dateRangePickerCommandMethod({ $dateRangePicker }) {
+      const startDate = toDateString(getWhatDay(new Date(), -90), 'yyyy-MM-dd 00:00:00');
+      const endDate = toDateString(new Date(), 'yyyy-MM-dd 23:59:59');
+      $dateRangePicker.setModelValue(startDate, endDate);
+    }
+  });
+
+  // 定义选中日期最近半年指令
+  VxeUI.commands.add('utRecentHalfYear', {
+    dateRangePickerCommandMethod({ $dateRangePicker }) {
+      const startDate = toDateString(getWhatDay(new Date(), -180), 'yyyy-MM-dd 00:00:00');
+      const endDate = toDateString(new Date(), 'yyyy-MM-dd 23:59:59');
+      $dateRangePicker.setModelValue(startDate, endDate);
+    }
+  });
+  // 定义选中日期最近半年指令
+  VxeUI.commands.add('utRecentYear', {
+    dateRangePickerCommandMethod({ $dateRangePicker }) {
+      const startDate = toDateString(getWhatDay(new Date(), -365), 'yyyy-MM-dd 00:00:00');
+      const endDate = toDateString(new Date(), 'yyyy-MM-dd 23:59:59');
+      $dateRangePicker.setModelValue(startDate, endDate);
+    }
+  });
+}

package/src/router/index.ts

@@ -94,38 +94,8 @@ export function getViews() {
 
 /** 路由白名单 */
 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) => {
+export const routerBefore = (to, _from) => {
+  console.log('to', to);
   // TODO  无权限跳转403页面
   // if (to.meta?.roles && !isOneOfArray(to.meta?.roles, userInfo?.roles)) {
   //   next({ path: "/error/403" });
@@ -134,7 +104,7 @@ export const routerBefore = (to, _from, next) => {
   const externalLink = isUrl(to?.name as string);
   /** 如果已经登录并存在登录信息后不能跳转到路由白名单，而是继续保持在当前页面 */
   function toCorrectRoute() {
-    whiteList.includes(to.fullPath) ? next(_from.fullPath) : next();
+    return whiteList.includes(to.fullPath) ? _from.fullPath : undefined;
   }
   if (_from?.name && _from?.name !== 'login') {
     // m.name === to.name 判断param路由跳转
@@ -146,9 +116,10 @@ export const routerBefore = (to, _from, next) => {
     } else if (cmp?.default || to.name === 'redirect') {
       toCorrectRoute();
     } else {
-      next({ path: '/error/404' });
+      return { path: '/error/404' };
     }
   } else {
+    console.log('routerBefore', to);
     // 刷新
     if (usePermissionStoreHook().wholeMenus.length === 0) {
       initRouter(userName).then((router: Router) => {