zmdms-webui 3.4.3 → 3.4.5

package/dist/es/applayoutsider/menu/hook.js

@@ -1,3 +1,4 @@
+import { __spreadArray } from '../../_virtual/_tslib.js';
 import { useRef, useState, useEffect, useCallback } from 'react';
 import isEqual from 'lodash/isEqual';
 
@@ -161,80 +162,46 @@ function useSubMenuOpenKeys(userSubMenus, activeTab, options) {
             }
             return;
         }
-        var _loop_1 = function (key, value) {
-            if (!Array.isArray(value)) {
-                return "continue";
-            }
-            // 存放当前二级菜单的值
-            // 20240327 这里有一个问题，就是开发可能会再A系统配置B系统的菜单；
-            // 这个时候这个菜单的path 就会带上B系统的前缀；这里再去做拼接的话，就会比对不上activeTab当前选中的tab。所以这里要做下判断 如果当前菜单的path有前缀的话，那么不再做前缀的拼接
-            // let currentSubMenu: any = null;
-            var result = value.find(function (subMenuVal) {
-                var system = subMenuVal.system;
+        // 20250204 菜单逻辑修改
+        // 遍历二级菜单（支持无限层级递归）
+        // 递归查找 activeTab 对应的菜单，返回需要展开的祖先 id 链（不含命中节点本身）
+        var findMenuAndAncestors = function (menus, ancestors) {
+            if (ancestors === void 0) { ancestors = []; }
+            for (var _i = 0, menus_1 = menus; _i < menus_1.length; _i++) {
+                var menu = menus_1[_i];
+                var system = menu.system;
                 var prefix = getPrefixByAppId(system);
-                // 二级菜单如果没有配置路由的 不需要跳转
-                // const newPath =
-                //   path === "/" ? "/" : prefix ? `/${prefix}${path}` : path;
-                var newPath = getNewPath(subMenuVal, prefix);
-                // 如果值相等的话，说明这个就是目标值
-                // 即父级就是当前选中项
+                var newPath = getNewPath(menu, prefix);
                 if (newPath === activeTab) {
-                    // currentSubMenu = { ...subMenuVal };
-                    // 这里可能有点问题  应该是当前的id
-                    // 默认展开所有菜单
-                    // setOpenKeys([subMenuVal.parentId]);
-                    if (Array.isArray(value)) {
-                        // 要先过滤掉没有子级的菜单，因为没有子级的菜单不需要展开
-                        setOpenKeys(value
-                            .filter(function (i) {
-                            return Array.isArray(i.children) && i.children.length > 0;
-                        })
-                            .map(function (i) { return i.id; }));
-                    }
-                    return true;
+                    return ancestors;
                 }
-                // 如果没有子元素，或者子元素不是数组 直接下一轮遍历
-                if (!subMenuVal.children || !Array.isArray(subMenuVal.children)) {
-                    return false;
-                }
-                return subMenuVal.children.find(function (item) {
-                    var system = item.system;
-                    var prefix = getPrefixByAppId(system);
-                    // 二级菜单如果没有配置路由的 不需要跳转
-                    // const newPath =
-                    //   path === "/" ? "/" : prefix ? `/${prefix}${path}` : path;
-                    var newPath = getNewPath(item, prefix);
-                    if (newPath === activeTab) {
-                        // currentSubMenu = { ...item };
-                        // 只打开当前级
-                        // setOpenKeys([item.parentId]);
-                        // 默认展开所有菜单
-                        if (Array.isArray(value)) {
-                            setOpenKeys(value
-                                .filter(function (i) {
-                                return Array.isArray(i.children) && i.children.length > 0;
-                            })
-                                .map(function (i) { return i.id; }));
-                        }
-                        return true;
+                if (Array.isArray(menu.children) && menu.children.length > 0) {
+                    var result = findMenuAndAncestors(menu.children, __spreadArray(__spreadArray([], ancestors, true), [
+                        menu.id,
+                    ], false));
+                    if (result) {
+                        return result;
                     }
-                    return false;
-                });
-            });
-            // 找到当前路由 对应的二级菜单 提前结束循环
-            if (result) {
-                // 设置一级菜单选中的key
-                setMainMenuSelectedKeys && setMainMenuSelectedKeys([key]);
-                return "break";
+                }
             }
+            return null;
         };
-        // 20250204 菜单逻辑修改
-        // 遍历二级菜单
         for (var _i = 0, _a = Object.entries(userSubMenus); _i < _a.length; _i++) {
             var _b = _a[_i], key = _b[0], value = _b[1];
-            var state_1 = _loop_1(key, value);
-            if (state_1 === "break")
+            if (!Array.isArray(value)) {
+                continue;
+            }
+            var ancestorIds = findMenuAndAncestors(value);
+            if (ancestorIds) {
+                // 顶层菜单全部展开（保持原有行为）+ 命中项的祖先链展开，保证深层菜单可见
+                var topLevelIds = value
+                    .filter(function (i) { return Array.isArray(i.children) && i.children.length > 0; })
+                    .map(function (i) { return i.id; });
+                setOpenKeys(Array.from(new Set(__spreadArray(__spreadArray([], topLevelIds, true), ancestorIds, true))));
+                // 设置一级菜单选中的key
+                setMainMenuSelectedKeys && setMainMenuSelectedKeys([key]);
                 break;
+            }
         }
     }, [
         userSubMenus,

package/dist/es/table/excel.js

@@ -9,6 +9,22 @@ import dayjs from 'dayjs';
 // 内部常量，用于标记父数据
 var IS_PARENT = "__is_parent__";
 var PARENT_LEVEL = "__parent_level__";
+/**
+ * 只保留父行数据（剥离子数据），并标记为父数据。
+ * 用于“按收起导出”：仅导出顶层汇总行，不导出子行明细。
+ * @param records 原始数据数组
+ * @param childrenColumnName 子节点字段名
+ */
+function flattenParentOnly(records, childrenColumnName) {
+    if (!Array.isArray(records) || records.length === 0) {
+        return records;
+    }
+    return records.map(function (item) {
+        var _a;
+        var _b = item, _c = childrenColumnName; _b[_c]; var itemWithoutChildren = __rest(_b, [typeof _c === "symbol" ? _c : _c + ""]);
+        return __assign(__assign({}, itemWithoutChildren), (_a = {}, _a[IS_PARENT] = true, _a[PARENT_LEVEL] = 0, _a));
+    });
+}
 /**
  * 扁平化树形数据
  * @param records 原始数据数组
@@ -48,18 +64,22 @@ function flattenTreeData(records, childrenColumnName) {
 /**
  * 使用 ExcelJS + 后处理添加批注
  * 导出Excel，支持维度合并和小计，以及批注功能
+ * @param flatChildren 是否展开子行：true(默认)父子全量平铺；false 只导出父行（收起态）
  */
-function exportToExcelWithMergeAndComments(records, columns, mergeKeys, numKeys, dateKeys, fileName, sheetName, columnHeaders, summaryConfig, topDescription, topDescriptionRowHeight, childrenColumnName) {
+function exportToExcelWithMergeAndComments(records, columns, mergeKeys, numKeys, dateKeys, fileName, sheetName, columnHeaders, summaryConfig, topDescription, topDescriptionRowHeight, childrenColumnName, flatChildren) {
     var _a;
     var _this = this;
     if (fileName === void 0) { fileName = "export.xlsx"; }
     if (sheetName === void 0) { sheetName = "Sheet1"; }
     if (childrenColumnName === void 0) { childrenColumnName = "children"; }
+    if (flatChildren === void 0) { flatChildren = true; }
     if (!records || records.length === 0) {
         throw new Error("没有数据可导出");
     }
-    // 扁平化树形数据
-    var flattenedRecords = flattenTreeData(records, childrenColumnName);
+    // 扁平化树形数据：flatChildren=false 时只保留父行（收起态导出）
+    var flattenedRecords = flatChildren
+        ? flattenTreeData(records, childrenColumnName)
+        : flattenParentOnly(records, childrenColumnName);
     var processedData = applyPrecisionToRecords(flattenedRecords, columns);
     // 准备Excel数据
     var excelData = prepareExcelData(processedData, columns, columnHeaders, topDescription);
@@ -662,28 +682,30 @@ function applyExcelStyles(worksheet, data, numKeys, dateKeys, columns, headerRow
 /**
  * 主要的导出函数，使用改进的批注功能
  */
-function exportToExcelWithMerge(records, columns, mergeKeys, numKeys, dateKeys, fileName, sheetName, columnHeaders, summaryConfig, topDescription, topDescriptionRowHeight, childrenColumnName) {
+function exportToExcelWithMerge(records, columns, mergeKeys, numKeys, dateKeys, fileName, sheetName, columnHeaders, summaryConfig, topDescription, topDescriptionRowHeight, childrenColumnName, flatChildren) {
     if (fileName === void 0) { fileName = "export.xlsx"; }
     if (sheetName === void 0) { sheetName = "Sheet1"; }
     if (childrenColumnName === void 0) { childrenColumnName = "children"; }
-    return exportToExcelWithMergeAndComments(records, columns, mergeKeys, numKeys, dateKeys, fileName, sheetName, columnHeaders, summaryConfig, topDescription, topDescriptionRowHeight, childrenColumnName);
+    if (flatChildren === void 0) { flatChildren = true; }
+    return exportToExcelWithMergeAndComments(records, columns, mergeKeys, numKeys, dateKeys, fileName, sheetName, columnHeaders, summaryConfig, topDescription, topDescriptionRowHeight, childrenColumnName, flatChildren);
 }
 /**
  * 简化版本的导出函数
  */
 function exportToExcelSimple(records, config) {
-    return exportToExcelWithMerge(records, config.columns || [], config.mergeKeys, config.numKeys || [], config.dateKeys, config.fileName || "export.xlsx", config.sheetName || "Sheet1", config.columnHeaders, config.summaryConfig, config.topDescription, config.topDescriptionRowHeight, config.childrenColumnName || "children");
+    return exportToExcelWithMerge(records, config.columns || [], config.mergeKeys, config.numKeys || [], config.dateKeys, config.fileName || "export.xlsx", config.sheetName || "Sheet1", config.columnHeaders, config.summaryConfig, config.topDescription, config.topDescriptionRowHeight, config.childrenColumnName || "children", config.flatChildren !== false);
 }
 /**
  * Hook 版本，支持选择导出方式
+ * flatChildren 可在 config 中配置默认值，也可在调用 exportExcel(fileName, options) 时通过 options 覆盖。
  */
 function useExcelExport(records, config) {
-    var columns = config.columns, isAutoMerge = config.isAutoMerge, columnHeaders = config.columnHeaders, summaryConfig = config.summaryConfig, childrenColumnName = config.childrenColumnName;
+    var columns = config.columns, isAutoMerge = config.isAutoMerge, columnHeaders = config.columnHeaders, summaryConfig = config.summaryConfig, childrenColumnName = config.childrenColumnName, _a = config.flatChildren, defaultFlatChildren = _a === void 0 ? true : _a;
     var mergeKeys = useMergeKeys(columns, isAutoMerge);
     var numKeys = useNumKeys(columns);
     var dateKeys = useDateKeys(columns);
     var exportFunction = useMemoizedFn(function (fileName, options) {
-        var _a = options || {}, topDescription = _a.topDescription, topDescriptionRowHeight = _a.topDescriptionRowHeight, time = _a.time;
+        var _a = options || {}, topDescription = _a.topDescription, topDescriptionRowHeight = _a.topDescriptionRowHeight, time = _a.time, _b = _a.flatChildren, flatChildren = _b === void 0 ? defaultFlatChildren : _b;
         if (!fileName.includes(".xlsx")) {
             fileName = fileName + ".xlsx";
         }
@@ -701,6 +723,7 @@ function useExcelExport(records, config) {
             topDescription: topDescription,
             topDescriptionRowHeight: topDescriptionRowHeight,
             childrenColumnName: childrenColumnName,
+            flatChildren: flatChildren,
         });
     });
     return exportFunction;

package/dist/es/table/interface.d.ts

@@ -335,11 +335,14 @@ interface ITableRefHandel {
     onResetDynamicList?: () => void;
     /**
      * 导出excel
+     * config.flatChildren: 是否展开子行，默认 true（父子全量平铺）；false 时只导出父行（收起态汇总）
      */
     exportExcel?: (fileName: string, config?: {
         topDescription?: string;
         time?: string;
         topDescriptionRowHeight?: number;
+        /** 是否展开子行，默认 true。false 时只导出父行（收起态） */
+        flatChildren?: boolean;
     }) => void;
 }
 interface ITableProps<RecordType> extends Omit<TableProps<RecordType>, "columns"> {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zmdms-webui",
-  "version": "3.4.3",
+  "version": "3.4.5",
   "private": false,
   "main": "dist/index.es.js",
   "module": "dist/index.es.js",