@utogether/udp-core 1.0.1-beta.16 → 1.0.1-beta.18

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

@@ -2,16 +2,16 @@
  * @Author: levi7754 levi7754@163.com
  * @Date: 2024-06-05 14:32:03
  * @LastEditors: levi7754 levi7754@163.com
- * @LastEditTime: 2025-08-18 22:04:11
+ * @LastEditTime: 2025-10-29 16:32:37
  * @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 } from '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 { VxetableRender } from '@utogether/utils';
+import { VxetableRender } from './render';
 import { getServiceApi } from '../../api';
 
 import VXETable, { VxeUI } from 'vxe-table';
@@ -19,6 +19,7 @@ import VXETable, { VxeUI } from 'vxe-table';
 
 // const dict = storageLocal.getItem('kLov');
 VxetableRender(VXETable, { serviceApi: getServiceApi(), i18n: transformI18n });
+setCommands();
 
 // 全局默认参数
 const defaultConfig = {
@@ -51,3 +52,65 @@ 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/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-08-17 19:04:49
+ * @LastEditTime: 2025-10-29 16:48:47
  * @Description: file content
  */
 
@@ -251,17 +251,15 @@ export const VxetableRender = (VXETable, { serviceApi, i18n }) => {
     renderTableEdit(renderOpts: VxeColumnPropTypes.EditRender, params) {
       const { row, column } = params;
       const { options, props, optionProps = {}, events } = renderOpts;
-      const { label = 'label', value = 'value', extLabel } = optionProps;
-      const { mapField } = props;
-
+      const { label = 'label', value = 'value' } = optionProps;
+      const { mapField, multiple } = props;
+      console.log('ssssss');
       const componentHook = useComponent();
 
-      if (props.multiple && row[column.field] && !isArray(row[column.field])) {
-        row[column.field].split(',').forEach(dv => {
-          const isExit = options.some(option => option[label] === dv);
-          !isExit && options.push({ [value]: dv, [label]: dv });
-        });
-      }
+      // 多选时
+      const modelField = multiple ? `_${column.field}` : column.field;
+      // 默认值
+      componentHook.setDefaultValue(props, row, column.field);
 
       function onChange(val) {
         componentHook.selectChange(val, row, column.field, renderOpts, {
@@ -276,22 +274,17 @@ export const VxetableRender = (VXETable, { serviceApi, i18n }) => {
 
       return [
         <el-select
-          v-model={row[column.field]}
+          v-model={row[modelField]}
           filterable
           clearable
           {...props}
           style="width: 100%"
+          class="udp-select-wrapper"
           onChange={v => onChange(v)}
           onClear={() => onClear()}
         >
           {options.map(item => {
-            return (
-              <el-option
-                key={item[value]}
-                label={extLabel && item[extLabel] ? item[value] : item[label]}
-                value={item[value]}
-              ></el-option>
-            );
+            return <el-option key={item[value]} label={item[label]} value={item[value]}></el-option>;
           })}
         </el-select>
       ];
@@ -301,16 +294,11 @@ export const VxetableRender = (VXETable, { serviceApi, i18n }) => {
       const { options, props, optionProps = {}, events } = renderOpts;
       const { label = 'label', value = 'value', extLabel } = optionProps;
       const { mapField } = props;
-
-      const componentHook = useComponent();
-
-      if (props.multiple && row[column.field] && !isArray(row[column.field])) {
-        row[column.field].split(',').forEach(dv => {
-          const isExit = options.some(option => option[label] === dv);
-          !isExit && options.push({ [value]: dv, [label]: dv });
-        });
-      }
-
+      console.log('defaultParams');
+      // 多选时
+      const modelField = multiple ? `_${column.field}` : column.field;
+      // 默认值
+      componentHook.setDefaultValue(props, row, column.field);
       function onChange(val) {
         componentHook.selectChange(val, row, column.field, renderOpts, {
           column,
@@ -324,7 +312,7 @@ export const VxetableRender = (VXETable, { serviceApi, i18n }) => {
 
       return [
         <el-select
-          v-model={row[column.field]}
+          v-model={row[modelField]}
           filterable
           clearable
           {...props}
@@ -350,6 +338,7 @@ export const VxetableRender = (VXETable, { serviceApi, i18n }) => {
       const { props, options, optionProps } = renderOpts;
       // @ts-ignore
       const { label = 'label', value = 'value', extLabel } = optionProps;
+      console.log('defaultParams');
       const { textValue } = props;
       let val = row[column.field];
       const item = options.find(opt => opt[value] === val);

package/src/router/index.ts

@@ -1,177 +1,186 @@
-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 });
+//         }
+//       }
+//     });
+//   }
+// });
+
+/** 记录已经加载的页面路径 */
+const loadedPaths = new Set<string>();
+
+/** 重置已加载页面记录 */
+export function resetLoadedPaths() {
+  loadedPaths.clear();
+}
+
+/** 重置路由 */
+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();
+  resetLoadedPaths();
+}
+
+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;