zmdms-webui 2.9.7 → 2.9.9

package/dist/es/table/table.js

@@ -48,8 +48,8 @@ import DynamicSetting from '../dynamicsetting/dynamicSetting.js';
 var Table = function (props) {
     var _a;
     // console.log("表格渲染");
-    var className = props.className, _b = props.bordered, bordered = _b === void 0 ? true : _b, _c = props.pagination, pagination = _c === void 0 ? false : _c, isFlex = props.isFlex; props.tablePreferences; var dynamicKey = props.dynamicKey, dynamicVersion = props.dynamicVersion, customDynamicListHandle = props.customDynamicListHandle, isRemeberFilter = props.isRemeberFilter, _d = props.isOrderUpdateData, isOrderUpdateData = _d === void 0 ? true : _d, hiddenDynamicIcon = props.hiddenDynamicIcon, _columns = props.columns, dataSource = props.dataSource, onTableChange = props.onTableChange, isEdit = props.isEdit, isMove = props.isMove, isAdd = props.isAdd, hiddenAddBtnHandle = props.hiddenAddBtnHandle, _e = props.isTheadTitleAdd, isTheadTitleAdd = _e === void 0 ? true : _e, addMode = props.addMode, addCallback = props.addCallback, isDel = props.isDel, delPopTitle = props.delPopTitle, hiddenDelBtnHandle = props.hiddenDelBtnHandle, _f = props.isDelAll, isDelAll = _f === void 0 ? true : _f, isAddAndDelAuto = props.isAddAndDelAuto, summaryConfig = props.summaryConfig, _g = props.summaryFixed, summaryFixed = _g === void 0 ? true : _g, isInnerPagination = props.isInnerPagination, _h = props.innerPaginationPageSize, innerPaginationPageSize = _h === void 0 ? 30 : _h, _j = props.innerPaginationPosition, innerPaginationPosition = _j === void 0 ? INNER_TABLE_PAGINATION_POSITION : _j, _k = props.innerPaginationPageSizeOptions, innerPaginationPageSizeOptions = _k === void 0 ? INNER_TABLE_PAGINATION_PAGESIZEOPTIONS : _k, innerPaginationConfig = props.innerPaginationConfig, tableRefHandle = props.tableRefHandle, tableName = props.tableName, serviceOrder = props.serviceOrder, differences = props.differences, virtualKey = props.virtualKey, _l = props.isResizableColumn, isResizableColumn = _l === void 0 ? true : _l, _m = props.isResizableTitleEllipsis, isResizableTitleEllipsis = _m === void 0 ? true : _m, _o = props.isRealTimeValidate, isRealTimeValidate = _o === void 0 ? true : _o, isMarginTop = props.isMarginTop, isMarginBottom = props.isMarginBottom, scroll = props.scroll, addAndDelProps = props.addAndDelProps, _p = props.autoScrollYMarginBottom, autoScrollYMarginBottom = _p === void 0 ? 65 : _p, _q = props.isAutoScrollY, isAutoScrollY = _q === void 0 ? false : _q, tableId = props.tableId, extraOnRow = props.onRow, fixedRowsCount = props.fixedRowsCount, fixedRowsConfig = props.fixedRowsConfig, headerAlign = props.headerAlign, isDimensionDynamic = props.isDimensionDynamic, dimensionCustomSumKeys = props.dimensionCustomSumKeys, isAutoMerge = props.isAutoMerge, mode = props.mode, rowSelection = props.rowSelection, isContextMenu = props.isContextMenu, isFullscreenHandle = props.isFullscreenHandle, _r = props.isExportSummary, isExportSummary = _r === void 0 ? true : _r, isAutoMergeAddAndDel = props.isAutoMergeAddAndDel, isDynamicColumnText = props.isDynamicColumnText, isTableSummaryCollapse = props.isTableSummaryCollapse, isTableSummaryDefaultExpand = props.isTableSummaryDefaultExpand, resetProps = __rest(props, ["className", "bordered", "pagination", "isFlex", "tablePreferences", "dynamicKey", "dynamicVersion", "customDynamicListHandle", "isRemeberFilter", "isOrderUpdateData", "hiddenDynamicIcon", "columns", "dataSource", "onTableChange", "isEdit", "isMove", "isAdd", "hiddenAddBtnHandle", "isTheadTitleAdd", "addMode", "addCallback", "isDel", "delPopTitle", "hiddenDelBtnHandle", "isDelAll", "isAddAndDelAuto", "summaryConfig", "summaryFixed", "isInnerPagination", "innerPaginationPageSize", "innerPaginationPosition", "innerPaginationPageSizeOptions", "innerPaginationConfig", "tableRefHandle", "tableName", "serviceOrder", "differences", "virtualKey", "isResizableColumn", "isResizableTitleEllipsis", "isRealTimeValidate", "isMarginTop", "isMarginBottom", "scroll", "addAndDelProps", "autoScrollYMarginBottom", "isAutoScrollY", "tableId", "onRow", "fixedRowsCount", "fixedRowsConfig", "headerAlign", "isDimensionDynamic", "dimensionCustomSumKeys", "isAutoMerge", "mode", "rowSelection", "isContextMenu", "isFullscreenHandle", "isExportSummary", "isAutoMergeAddAndDel", "isDynamicColumnText", "isTableSummaryCollapse", "isTableSummaryDefaultExpand"]);
-    var _s = useBaseContext(), enableDynamicColumnText = _s.enableDynamicColumnText, enableTableSummaryCollapse = _s.enableTableSummaryCollapse, enableTableSummaryDefaultExpand = _s.enableTableSummaryDefaultExpand;
+    var className = props.className, _b = props.bordered, bordered = _b === void 0 ? true : _b, _c = props.pagination, pagination = _c === void 0 ? false : _c, isFlex = props.isFlex; props.tablePreferences; var dynamicKey = props.dynamicKey, dynamicVersion = props.dynamicVersion, customDynamicListHandle = props.customDynamicListHandle, isRemeberFilter = props.isRemeberFilter, _d = props.isOrderUpdateData, isOrderUpdateData = _d === void 0 ? true : _d, hiddenDynamicIcon = props.hiddenDynamicIcon, _columns = props.columns, dataSource = props.dataSource, onTableChange = props.onTableChange, isEdit = props.isEdit, isMove = props.isMove, isAdd = props.isAdd, hiddenAddBtnHandle = props.hiddenAddBtnHandle, _e = props.isTheadTitleAdd, isTheadTitleAdd = _e === void 0 ? true : _e, addMode = props.addMode, addCallback = props.addCallback, isDel = props.isDel, delPopTitle = props.delPopTitle, hiddenDelBtnHandle = props.hiddenDelBtnHandle, _f = props.isDelAll, isDelAll = _f === void 0 ? true : _f, isAddAndDelAuto = props.isAddAndDelAuto, summaryConfig = props.summaryConfig, _g = props.summaryFixed, summaryFixed = _g === void 0 ? true : _g, isInnerPagination = props.isInnerPagination, _h = props.innerPaginationPageSize, innerPaginationPageSize = _h === void 0 ? 30 : _h, _j = props.innerPaginationPosition, innerPaginationPosition = _j === void 0 ? INNER_TABLE_PAGINATION_POSITION : _j, _k = props.innerPaginationPageSizeOptions, innerPaginationPageSizeOptions = _k === void 0 ? INNER_TABLE_PAGINATION_PAGESIZEOPTIONS : _k, innerPaginationConfig = props.innerPaginationConfig, tableRefHandle = props.tableRefHandle, tableName = props.tableName, serviceOrder = props.serviceOrder, differences = props.differences, virtualKey = props.virtualKey, _l = props.isResizableColumn, isResizableColumn = _l === void 0 ? true : _l, _m = props.isResizableTitleEllipsis, isResizableTitleEllipsis = _m === void 0 ? true : _m, _o = props.isRealTimeValidate, isRealTimeValidate = _o === void 0 ? true : _o, isMarginTop = props.isMarginTop, isMarginBottom = props.isMarginBottom, scroll = props.scroll, addAndDelProps = props.addAndDelProps, _p = props.autoScrollYMarginBottom, autoScrollYMarginBottom = _p === void 0 ? 65 : _p, _q = props.isAutoScrollY, isAutoScrollY = _q === void 0 ? false : _q, tableId = props.tableId, extraOnRow = props.onRow, fixedRowsCount = props.fixedRowsCount, fixedRowsConfig = props.fixedRowsConfig, headerAlign = props.headerAlign, isDimensionDynamic = props.isDimensionDynamic, _r = props.isDimensionMergeChildren, isDimensionMergeChildren = _r === void 0 ? true : _r, dimensionCustomSumKeys = props.dimensionCustomSumKeys, isAutoMerge = props.isAutoMerge, mode = props.mode, rowSelection = props.rowSelection, isContextMenu = props.isContextMenu, isFullscreenHandle = props.isFullscreenHandle, _s = props.isExportSummary, isExportSummary = _s === void 0 ? true : _s, isAutoMergeAddAndDel = props.isAutoMergeAddAndDel, isDynamicColumnText = props.isDynamicColumnText, isTableSummaryCollapse = props.isTableSummaryCollapse, isTableSummaryDefaultExpand = props.isTableSummaryDefaultExpand, resetProps = __rest(props, ["className", "bordered", "pagination", "isFlex", "tablePreferences", "dynamicKey", "dynamicVersion", "customDynamicListHandle", "isRemeberFilter", "isOrderUpdateData", "hiddenDynamicIcon", "columns", "dataSource", "onTableChange", "isEdit", "isMove", "isAdd", "hiddenAddBtnHandle", "isTheadTitleAdd", "addMode", "addCallback", "isDel", "delPopTitle", "hiddenDelBtnHandle", "isDelAll", "isAddAndDelAuto", "summaryConfig", "summaryFixed", "isInnerPagination", "innerPaginationPageSize", "innerPaginationPosition", "innerPaginationPageSizeOptions", "innerPaginationConfig", "tableRefHandle", "tableName", "serviceOrder", "differences", "virtualKey", "isResizableColumn", "isResizableTitleEllipsis", "isRealTimeValidate", "isMarginTop", "isMarginBottom", "scroll", "addAndDelProps", "autoScrollYMarginBottom", "isAutoScrollY", "tableId", "onRow", "fixedRowsCount", "fixedRowsConfig", "headerAlign", "isDimensionDynamic", "isDimensionMergeChildren", "dimensionCustomSumKeys", "isAutoMerge", "mode", "rowSelection", "isContextMenu", "isFullscreenHandle", "isExportSummary", "isAutoMergeAddAndDel", "isDynamicColumnText", "isTableSummaryCollapse", "isTableSummaryDefaultExpand"]);
+    var _t = useBaseContext(), enableDynamicColumnText = _t.enableDynamicColumnText, enableTableSummaryCollapse = _t.enableTableSummaryCollapse, enableTableSummaryDefaultExpand = _t.enableTableSummaryDefaultExpand;
     // 表格动态列配置是否显示文字
     var isDynamicColumnTextEnable = getFinalValue(enableDynamicColumnText, isDynamicColumnText);
     // 表格合计是否可以展开收起
@@ -67,25 +67,25 @@ var Table = function (props) {
         id: menuId,
     }).show;
     // 针对SCU和增减行 做特殊处理
-    var _t = useScuRfresh(), refreshScuCell = _t.refreshScuCell, getRefreshScuCell = _t.getRefreshScuCell;
+    var _u = useScuRfresh(), refreshScuCell = _u.refreshScuCell, getRefreshScuCell = _u.getRefreshScuCell;
     // 做一些前置处理
     // 比如过滤某些列 不做展示
     var columns = useParseColumns(_columns);
     // 得到动态列配置信息
-    var _u = useDynamicListByColumns(columns, {
+    var _v = useDynamicListByColumns(columns, {
         dynamicKey: dynamicKey,
         dynamicVersion: dynamicVersion,
         customDynamicListHandle: customDynamicListHandle,
-    }), defaultDynamicList = _u.defaultDynamicList, onCurrentListChange = _u.onCurrentListChange, currentDynamicList = _u.currentDynamicList, dynamicSettingRef = _u.dynamicSettingRef;
+    }), defaultDynamicList = _v.defaultDynamicList, onCurrentListChange = _v.onCurrentListChange, currentDynamicList = _v.currentDynamicList, dynamicSettingRef = _v.dynamicSettingRef;
     // 因为内部分页需要知晓当前页面的数据展示，要不然数据排序就跟内部分页没关系了
     // 自定义排序方法
-    var _v = useCustomSort(dataSource, onTableChange, {
+    var _w = useCustomSort(dataSource, onTableChange, {
         refreshScuCell: refreshScuCell,
         rowKey: props === null || props === void 0 ? void 0 : props.rowKey,
         serviceOrder: serviceOrder,
         isOrderUpdateData: isOrderUpdateData,
         isAutoMerge: isAutoMerge,
-    }), order = _v.order, setOrder = _v.setOrder, customSortHandle = _v.customSortHandle, sortDataSource = _v.sortDataSource;
+    }), order = _w.order, setOrder = _w.setOrder, customSortHandle = _w.customSortHandle, sortDataSource = _w.sortDataSource;
     // 当前表格展示的数据
     // 如果开启了前端排序的话，排序后的数据，可能会影响到很多地方。
     // 所以后续操作的数据 应该用
@@ -112,12 +112,12 @@ var Table = function (props) {
         return scroll || {};
     }, [scroll, currentTableDataSource, virtualKey, scrolly, isAutoScrollY]);
     // 内部分页相关配置
-    var _w = useInnerPagination(isInnerPagination, innerPaginationPageSize, {
+    var _x = useInnerPagination(isInnerPagination, innerPaginationPageSize, {
         innerPaginationPosition: innerPaginationPosition,
         innerPaginationPageSizeOptions: innerPaginationPageSizeOptions,
         innerPaginationConfig: innerPaginationConfig,
         dataSource: currentTableDataSource,
-    }), paginationConfig = _w.paginationConfig, currentPage = _w.currentPage, setCurrent = _w.setCurrent, pageSize = _w.pageSize;
+    }), paginationConfig = _x.paginationConfig, currentPage = _x.currentPage, setCurrent = _x.setCurrent, pageSize = _x.pageSize;
     // 内部表格编辑事件
     var onEditableSave = useEditChange(dataSourceRef, onTableChange);
     // 记录表头过滤的一些配置（通过ref记录，key => filter） 复制整列、过滤后修改数据，需要先走过滤
@@ -145,9 +145,9 @@ var Table = function (props) {
         filterConfigRef: filterConfigRef,
     });
     // 表格内部自定义处理过滤，不走antd内部
-    var _x = useCustomFilter(currentTableDataSource, columns), filterDataSource = _x[0], handleFilterConfigChange = _x[1];
+    var _y = useCustomFilter(currentTableDataSource, columns), filterDataSource = _y[0], handleFilterConfigChange = _y[1];
     // 处理列配置信息 得到新的列配置信息
-    var _y = useColumns(columns, {
+    var _z = useColumns(columns, {
         // 动态列配置相关信息
         dynamicKey: dynamicKey,
         isRemeberFilter: isRemeberFilter,
@@ -191,18 +191,19 @@ var Table = function (props) {
         handleFilterConfigChange: handleFilterConfigChange,
         isAutoMergeAddAndDel: isAutoMergeAddAndDel,
         isDynamicColumnTextEnable: isDynamicColumnTextEnable,
-    }), _newColumns = _y.newColumns, newRowSelection = _y.rowSelection;
+    }), _newColumns = _z.newColumns, newRowSelection = _z.rowSelection;
     // 处理表格合并和维度
-    var _z = useAutoMerge(filterDataSource, _newColumns, {
+    var _0 = useAutoMerge(filterDataSource, _newColumns, {
         isAutoMerge: isAutoMerge,
         isDimensionDynamic: isDimensionDynamic,
+        isDimensionMergeChildren: isDimensionMergeChildren,
         order: order,
         dimensionCustomSumKeys: dimensionCustomSumKeys,
-    }), newDataSource = _z[0], newColumns = _z[1];
+    }), newDataSource = _0[0], newColumns = _0[1];
     // 表格验证
-    var _0 = useTableValidate(), tableRef = _0.tableRef, getCurrentTable = _0.getCurrentTable, clearErrorClass = _0.clearErrorClass;
+    var _1 = useTableValidate(), tableRef = _1.tableRef, getCurrentTable = _1.getCurrentTable, clearErrorClass = _1.clearErrorClass;
     // 内部表格总结栏
-    var _1 = useTableSummaryCollapse(tableRef, isTableSummaryDefaultExpandEnable, isTableSummaryCollapseEnable), showSummary = _1.showSummary, renderTableSummaryCollapse = _1.renderTableSummaryCollapse;
+    var _2 = useTableSummaryCollapse(tableRef, isTableSummaryDefaultExpandEnable, isTableSummaryCollapseEnable), showSummary = _2.showSummary, renderTableSummaryCollapse = _2.renderTableSummaryCollapse;
     var getSummaryHandle = useSummary(summaryConfig, newColumns, {
         summaryFixed: summaryFixed,
         rowSelection: props.rowSelection,
@@ -423,7 +424,7 @@ var Table = function (props) {
         };
     });
     // 全屏的一些方法
-    var _2 = useState(false), isFull = _2[0], setIsFull = _2[1];
+    var _3 = useState(false), isFull = _3[0], setIsFull = _3[1];
     var fullscreenHandle = useMemoizedFn(function (isFull) {
         isFullscreenHandle === null || isFullscreenHandle === void 0 ? void 0 : isFullscreenHandle(isFull);
         setIsFull(isFull);

package/dist/es/table/useTableSummaryCollapse.js

@@ -34,9 +34,10 @@ function useTableSummaryCollapse(tableRef, isDefaultShow, isCollapseEnable) {
         }
         var tableWidth = tableWidthRef.current || window.innerWidth;
         return (jsx(Table.Summary.Row, __assign({ className: "ztxk-table-summary-collapse", 
-            // 这里不能设置高度，当表格属性 有 tableLayout: 'auto'时，宽度会有问题
+            // 这里不能设置宽度，当表格属性 有 tableLayout: 'auto'时，宽度会有问题
+            // 使用sticky定位在safari浏览器下会有问题
             // style={{ width: `${tableWidth - 15}px` }}
-            style: { left: tableWidth / 2 - 80 } }, { children: jsx("td", __assign({ style: { height: "20px", border: "none" } }, { children: jsxs("div", __assign({ className: "ztxk-table-summary-collapse-title", onClick: function () {
+            style: { left: tableWidth / 2 - 38 } }, { children: jsx("td", __assign({ style: { height: "20px", border: "none" } }, { children: jsxs("div", __assign({ className: "ztxk-table-summary-collapse-title", onClick: function () {
                         setShowSummary(!showSummary);
                     } }, { children: ["\u7EDF\u8BA1", jsx(IconFont, { type: "icon-a-lujingbiankuang", style: {
                                 fontSize: 14,

package/dist/es/table/utils.js

@@ -448,9 +448,14 @@ function startColumnInsertTableData(options) {
  * @param dimensionSummaryKeys 维度合计字段
  * @param summaryKeys 合计字段
  * @param isDimensionDynamic 维度合并
+ * @param order 排序配置
+ * @param dimensionCustomSumKeys 自定义合计字段
+ * @param columns 列配置
+ * @param isDimensionMergeChildren 是否合并子数据，默认为true
  */
-function flattenRecordsOptimized(records, mergeKeys, dimensionSummaryKeys, summaryKeys, isDimensionDynamic, order, dimensionCustomSumKeys, columns) {
+function flattenRecordsOptimized(records, mergeKeys, dimensionSummaryKeys, summaryKeys, isDimensionDynamic, order, dimensionCustomSumKeys, columns, isDimensionMergeChildren) {
     var _a;
+    if (isDimensionMergeChildren === void 0) { isDimensionMergeChildren = true; }
     if (!records ||
         records.length === 0 ||
         !mergeKeys ||
@@ -468,7 +473,7 @@ function flattenRecordsOptimized(records, mergeKeys, dimensionSummaryKeys, summa
         result = __spreadArray([], records, true);
     }
     // 1. 如果开启了维度合并，按所有 mergeKeys 的组合来计算合计值
-    if (isDimensionDynamic && mergeKeys.length > 0) {
+    if (isDimensionDynamic && isDimensionMergeChildren && mergeKeys.length > 0) {
         var groupedResult = groupByLastMergeKey(result, mergeKeys, summaryKeys, dimensionCustomSumKeys);
         result = groupedResult;
     }
@@ -941,6 +946,7 @@ function hasParentGroupChanged(records, currentIndex, mergeKeys, currentKeyIndex
 /**
  * 按所有合并键的组合进行分组并计算合计值
  * 确保相同维度组合的记录被正确分组
+ * @param isDimensionMergeChildren 是否合并子数据，默认为true。为false时返回所有原始记录
  */
 function groupByLastMergeKey(records, mergeKeys, // 改为传入所有合并键
 summaryKeys, dimensionCustomSumKeys) {