zmdms-webui 1.9.1 → 1.9.3

package/dist/es/dynamicsetting/dynamicDrawer.js

@@ -97,9 +97,6 @@ var DynamicDrawer = function (props, ref) {
     // 子元素拖拽
     var onChildMoveItem = useCallback(function (pIndex, pKey) {
         return function (dragIndex, hoverIndex) {
-            if (!isDimensionPriority(dragIndex, hoverIndex)) {
-                return;
-            }
             // 由于对于固定列，不能进行拖拽排序，所以需要找出所有包含固定列的属性出来
             setTempDynamicList(function (preDynamicList) {
                 var newDynamicList = preDynamicList.map(function (item) { return (__assign({}, item)); }) || [];

package/dist/es/dynamicsetting/index.css

@@ -1 +1 @@
-.zt-sortable{cursor:move;font-size:13px;line-height:38px;overflow:hidden;text-align:left}.zt-sortable .zt-sortable--item{align-items:center;display:flex;justify-content:space-between;padding:0 16px}.zt-sortable .zt-sortable--children{display:flex}.zt-sortable .zt-sortable--children .zt-sortable{border-bottom:none;padding:0 26px}.zt-sortable.no-move{cursor:no-drop}.zt-sortable .zt-checkbox{font-size:13px}.zt-sortable:hover{background-color:#ebf3fe}.ztxk-dynamic--more{cursor:pointer;height:20px}.ant-dropdown-show-arrow.ztxk-dynamic--more--drop{padding-top:0}.ztxk-dynamic--more--drop.ant-dropdown-placement-bottomRight>.ant-dropdown-arrow{top:-5px}.dynamic-drawer .ant-drawer-header{padding:10px 12px}.dynamic-drawer .ant-drawer-header .ant-drawer-title>div{align-items:center;color:#768696;display:flex;font-size:16px}.dynamic-drawer .ant-drawer-header .ant-drawer-title>div .search-drawer--title-text{font-size:14px;margin-left:10px}.dynamic-drawer .ant-drawer-header .ant-drawer-title>div .search-drawer--title-text>span{font-size:13px}.dynamic-drawer .ant-drawer-body{padding:0}.dynamic-drawer .ant-drawer-body .ant-checkbox-group{width:100%}.dynamic-drawer .ant-drawer-footer{border-top:none;display:flex;justify-content:space-between;padding:0}.dynamic-drawer .ant-drawer-footer>button{border:none;border-radius:0;height:40px;width:33%}.dynamic-drawer-section-title{background:#f5f5f5;border-radius:6px;font-size:14px;font-weight:700;padding:4px}
+.zt-sortable-new{cursor:move;font-size:13px;line-height:1.5;overflow:hidden;padding:8px 0;text-align:left}.zt-sortable-new .zt-sortable--item{align-items:center;display:flex;justify-content:space-between;padding:0 16px}.zt-sortable-new .zt-sortable--children{display:flex}.zt-sortable-new .zt-sortable--children .zt-sortable-new{border-bottom:none;padding:8px 26px}.zt-sortable-new.no-move{cursor:no-drop}.zt-sortable-new .zt-checkbox{font-size:13px}.zt-sortable-new:hover{background-color:#ebf3fe}.ztxk-dynamic--more{cursor:pointer;height:20px}.ant-dropdown-show-arrow.ztxk-dynamic--more--drop{padding-top:0}.ztxk-dynamic--more--drop.ant-dropdown-placement-bottomRight>.ant-dropdown-arrow{top:-5px}.dynamic-drawer .ant-drawer-header{padding:10px 12px}.dynamic-drawer .ant-drawer-header .ant-drawer-title>div{align-items:center;color:#768696;display:flex;font-size:16px}.dynamic-drawer .ant-drawer-header .ant-drawer-title>div .search-drawer--title-text{font-size:14px;margin-left:10px}.dynamic-drawer .ant-drawer-header .ant-drawer-title>div .search-drawer--title-text>span{font-size:13px}.dynamic-drawer .ant-drawer-body{padding:0}.dynamic-drawer .ant-drawer-body .ant-checkbox-group{width:100%}.dynamic-drawer .ant-drawer-footer{border-top:none;display:flex;justify-content:space-between;padding:0}.dynamic-drawer .ant-drawer-footer>button{border:none;border-radius:0;height:40px;width:33%}.dynamic-drawer-section-title{background:#f5f5f5;border-radius:6px;font-size:14px;font-weight:700;padding:4px}

package/dist/es/dynamicsetting/sortable.js

@@ -8,7 +8,7 @@ import { useDrag } from '../node_modules/react-dnd/dist/hooks/useDrag/useDrag.js
 var Sortable = function (_a) {
     var type = _a.type, onMoveItem = _a.onMoveItem, index = _a.index, id = _a.id, children = _a.children, style = _a.style, className = _a.className;
     var ref = useRef(null);
-    var classes = classNames("zt-sortable", className, {});
+    var classes = classNames("zt-sortable-new", className, {});
     /**
      * @description 定义可放置对象
      */

package/dist/es/node_modules/clsx/dist/clsx.m.js

@@ -0,0 +1,3 @@
+function r(e){var t,f,n="";if("string"==typeof e||"number"==typeof e)n+=e;else if("object"==typeof e)if(Array.isArray(e))for(t=0;t<e.length;t++)e[t]&&(f=r(e[t]))&&(n&&(n+=" "),n+=f);else for(t in e)e[t]&&(n&&(n+=" "),n+=t);return n}function clsx(){for(var e,t,f=0,n="";f<arguments.length;)(e=arguments[f++])&&(t=r(e))&&(n&&(n+=" "),n+=t);return n}
+
+export { clsx, clsx as default };

package/dist/es/node_modules/react-contexify/dist/index.js

@@ -0,0 +1,7 @@
+import React__default, { createContext, useReducer, useRef, useState, useEffect, useContext, Children, cloneElement } from 'react';
+import { clsx } from '../../clsx/dist/clsx.m.js';
+import { flushSync } from 'react-dom';
+
+var Y=createContext({}),F=()=>useContext(Y),$=t=>React__default.createElement(Y.Provider,{...t});function le(){let t=new Map;return {on(e,r){return t.has(e)?t.get(e).add(r):t.set(e,new Set([r])),this},off(e,r){return t.has(e)&&t.get(e).delete(r),this},emit(e,r){return t.has(e)&&t.get(e).forEach(f=>{f(r);}),this}}}var R=le();var B=()=>useRef(new Map).current;var z=()=>{},U=["resize","contextmenu","click","scroll","blur"];var A={show({event:t,id:e,props:r,position:f}){t.preventDefault&&t.preventDefault(),R.emit(0).emit(e,{event:t.nativeEvent||t,props:r,position:f});},hideAll(){R.emit(0);}};function Fe(t){return {show(e){A.show({...t,...e});},hideAll(){A.hideAll();}}}function G(){let t=new Map,e,r,f,s,i=!1;function P(n){s=Array.from(n.values()),e=-1,f=!0;}function v(){s[e].node.focus();}let x=()=>e>=0&&s[e].isSubmenu,w=()=>Array.from(s[e].submenuRefTracker.values());function m(){return e===-1?(b(),!1):!0}function b(){e+1<s.length?e++:e+1===s.length&&(e=0),i&&a(),v();}function E(){e===-1||e===0?e=s.length-1:e-1<s.length&&e--,i&&a(),v();}function T(){if(m()&&x()){let n=w(),{node:c,setSubmenuPosition:h}=s[e];return t.set(c,{isRoot:f,focusedIndex:e,parentNode:r||c,items:s}),h(),c.classList.add("contexify_submenu-isOpen"),r=c,n.length>0?(e=0,s=n):i=!0,f=!1,v(),!0}return !1}function a(){if(m()&&!f){let n=t.get(r);r.classList.remove("contexify_submenu-isOpen"),s=n.items,r=n.parentNode,n.isRoot&&(f=!0,t.clear()),i||(e=n.focusedIndex,v());}}function y(n){function c(h){for(let o of h)o.isSubmenu&&o.submenuRefTracker&&c(Array.from(o.submenuRefTracker.values())),o.keyMatcher&&o.keyMatcher(n);}c(s);}return {init:P,moveDown:b,moveUp:E,openSubmenu:T,closeSubmenu:a,matchKeys:y}}function I(t){return typeof t=="function"}function V(t){return typeof t=="string"}function _(t,e){return Children.map(Children.toArray(t).filter(Boolean),r=>cloneElement(r,e))}function J(t){let e={x:t.clientX,y:t.clientY},r=t.changedTouches;return r&&(e.x=r[0].clientX,e.y=r[0].clientY),(!e.x||e.x<0)&&(e.x=0),(!e.y||e.y<0)&&(e.y=0),e}function k(t,e){return I(t)?t(e):t}function be(t,e){return {...t,...I(e)?e(t):e}}var it=({id:t,theme:e,style:r,className:f,children:s,animation:i="fade",preventDefaultOnKeydown:P=!0,disableBoundariesCheck:v=!1,onVisibilityChange:x,...w})=>{let[m,b]=useReducer(be,{x:0,y:0,visible:!1,triggerEvent:{},propsFromTrigger:null,willLeave:!1}),E=useRef(null),T=B(),[a]=useState(()=>G()),y=useRef(),n=useRef();useEffect(()=>(R.on(t,h).on(0,o),()=>{R.off(t,h).off(0,o);}),[t,i,v]),useEffect(()=>{m.visible?a.init(T):T.clear();},[m.visible,a,T]);function c(u,p){if(E.current&&!v){let{innerWidth:d,innerHeight:C}=window,{offsetWidth:K,offsetHeight:O}=E.current;u+K>d&&(u-=u+K-d),p+O>C&&(p-=p+O-C);}return {x:u,y:p}}useEffect(()=>{m.visible&&b(c(m.x,m.y));},[m.visible]),useEffect(()=>{function u(d){P&&d.preventDefault();}function p(d){switch(d.key){case"Enter":case" ":a.openSubmenu()||o();break;case"Escape":o();break;case"ArrowUp":u(d),a.moveUp();break;case"ArrowDown":u(d),a.moveDown();break;case"ArrowRight":u(d),a.openSubmenu();break;case"ArrowLeft":u(d),a.closeSubmenu();break;default:a.matchKeys(d);break}}if(m.visible){window.addEventListener("keydown",p);for(let d of U)window.addEventListener(d,o);}return ()=>{window.removeEventListener("keydown",p);for(let d of U)window.removeEventListener(d,o);}},[m.visible,a,P]);function h({event:u,props:p,position:d}){u.stopPropagation();let C=d||J(u),{x:K,y:O}=c(C.x,C.y);flushSync(()=>{b({visible:!0,willLeave:!1,x:K,y:O,triggerEvent:u,propsFromTrigger:p});}),clearTimeout(n.current),!y.current&&I(x)&&(x(!0),y.current=!0);}function o(u){u!=null&&(u.button===2||u.ctrlKey)&&u.type!=="contextmenu"||(i&&(V(i)||"exit"in i&&i.exit)?b(p=>({willLeave:p.visible})):b(p=>({visible:p.visible?!1:p.visible})),n.current=setTimeout(()=>{I(x)&&x(!1),y.current=!1;}));}function M(){m.willLeave&&m.visible&&flushSync(()=>b({visible:!1,willLeave:!1}));}function S(){return V(i)?clsx({[`${"contexify_willEnter-"}${i}`]:g&&!D,[`${"contexify_willLeave-"}${i} ${"contexify_willLeave-"}'disabled'`]:g&&D}):i&&"enter"in i&&"exit"in i?clsx({[`${"contexify_willEnter-"}${i.enter}`]:i.enter&&g&&!D,[`${"contexify_willLeave-"}${i.exit} ${"contexify_willLeave-"}'disabled'`]:i.exit&&g&&D}):null}let{visible:g,triggerEvent:l,propsFromTrigger:L,x:oe,y:ie,willLeave:D}=m,ae=clsx("contexify",f,{[`${"contexify_theme-"}${e}`]:e},S());return React__default.createElement($,{value:T},g&&React__default.createElement("div",{...w,className:ae,onAnimationEnd:M,style:{...r,left:oe,top:ie,opacity:1},ref:E,role:"menu"},_(s,{propsFromTrigger:L,triggerEvent:l})))};var pt=({id:t,children:e,className:r,style:f,triggerEvent:s,data:i,propsFromTrigger:P,keyMatcher:v,onClick:x=z,disabled:w=!1,hidden:m=!1,closeOnClick:b=!0,handlerEvent:E="onClick",...T})=>{let a=useRef(),y=F(),n={id:t,data:i,triggerEvent:s,props:P},c=k(w,n),h=k(m,n);function o(l){n.event=l,l.stopPropagation(),c||(b?M():x(n));}function M(){let l=a.current;l.focus(),l.addEventListener("animationend",()=>setTimeout(A.hideAll),{once:!0}),l.classList.add("contexify_item-feedback"),x(n);}function S(l){l&&!c&&(a.current=l,y.set(l,{node:l,isSubmenu:!1,keyMatcher:!c&&I(v)&&(L=>{v(L)&&(L.stopPropagation(),L.preventDefault(),n.event=L,M());})}));}function g(l){(l.key==="Enter"||l.key===" ")&&(l.stopPropagation(),n.event=l,M());}return h?null:React__default.createElement("div",{...T,[E]:o,className:clsx("contexify_item",r,{[`${"contexify_item-disabled"}`]:c}),style:f,onKeyDown:g,ref:S,tabIndex:-1,role:"menuitem","aria-disabled":c},React__default.createElement("div",{className:"contexify_itemContent"},e))};
+
+export { pt as Item, it as Menu, A as contextMenu, Fe as useContextMenu };

package/dist/es/table/components/TableMenu.js

@@ -0,0 +1,57 @@
+import { __assign } from '../../_virtual/_tslib.js';
+import { jsx, Fragment } from 'react/jsx-runtime';
+import { useState, useEffect } from 'react';
+import { Menu as it, Item as pt } from '../../node_modules/react-contexify/dist/index.js';
+import screenfull from '../../node_modules/screenfull/index.js';
+import { useLatest } from 'ahooks';
+
+var TableMenu = function (_a) {
+    var menuId = _a.menuId, tableRef = _a.tableRef, isFullscreenHandle = _a.isFullscreenHandle;
+    var _b = useState(false), isFull = _b[0], setIsFull = _b[1];
+    var isFullscreenHandleRef = useLatest(isFullscreenHandle);
+    function onMenuItemClick(e) {
+        var data = e.data;
+        switch (data) {
+            case "fullscreen": {
+                if (screenfull.isEnabled) {
+                    var realScreenFull = screenfull;
+                    if (tableRef === null || tableRef === void 0 ? void 0 : tableRef.current) {
+                        realScreenFull.toggle(tableRef.current);
+                    }
+                    else {
+                        realScreenFull.toggle();
+                    }
+                }
+                break;
+            }
+        }
+    }
+    // 全屏
+    useEffect(function () {
+        if (screenfull.isEnabled) {
+            var realScreenFull_1 = screenfull;
+            var callback_1 = function () {
+                var _a;
+                var isFull = realScreenFull_1.isFullscreen;
+                (_a = isFullscreenHandleRef.current) === null || _a === void 0 ? void 0 : _a.call(isFullscreenHandleRef, isFull);
+                setIsFull(isFull);
+                // 如果是全屏状态，那么修改表格背景
+                if (tableRef && tableRef.current) {
+                    if (isFull) {
+                        tableRef.current.style.backgroundColor = "#fff";
+                    }
+                    else {
+                        tableRef.current.style.removeProperty("background-color");
+                    }
+                }
+            };
+            realScreenFull_1.on("change", callback_1);
+            return function () {
+                realScreenFull_1.off("change", callback_1);
+            };
+        }
+    }, [tableRef, isFullscreenHandleRef]);
+    return (jsx(Fragment, { children: jsx(it, __assign({ id: menuId }, { children: jsx(pt, __assign({ data: "fullscreen", onClick: onMenuItemClick }, { children: isFull ? "退出全屏" : "全屏" })) })) }));
+};
+
+export { TableMenu as default };

package/dist/es/table/excel.js

@@ -3,12 +3,13 @@ import { x as xlsx_minExports } from '../node_modules/xlsx-js-style/dist/xlsx.mi
 import { useMergeKeys } from './hooks.js';
 import { useMemo } from 'react';
 import { useMemoizedFn } from 'ahooks';
-import { MERGE_ROW_SPANS } from './constant.js';
+import { IS_SUMMARY, MERGE_ROW_SPANS } from './constant.js';
 
 /**
  * 导出Excel，支持维度合并和小计
  */
 function exportToExcelWithMerge(records, columns, mergeKeys, summaryKeys, fileName, sheetName, columnHeaders, summaryConfig) {
+    var _a;
     if (fileName === void 0) { fileName = "export.xlsx"; }
     if (sheetName === void 0) { sheetName = "Sheet1"; }
     if (!records || records.length === 0) {
@@ -29,6 +30,8 @@ function exportToExcelWithMerge(records, columns, mergeKeys, summaryKeys, fileNa
             if (col.isSummary) {
                 var total = 0;
                 for (var i = 0; i < processedData.length; i++) {
+                    if (processedData[i][IS_SUMMARY])
+                        continue;
                     var v = processedData[i][key];
                     var n = typeof v === "number" ? v : Number(v);
                     if (!isNaN(n))
@@ -48,7 +51,7 @@ function exportToExcelWithMerge(records, columns, mergeKeys, summaryKeys, fileNa
             return "";
         });
         // 生成用于样式应用的数据（追加一条 __is_summary__ 行）
-        var summaryDataObj_1 = { __is_summary__: true };
+        var summaryDataObj_1 = (_a = {}, _a[IS_SUMMARY] = true, _a);
         Object.keys(sumsByKey_1).forEach(function (k) {
             summaryDataObj_1[k] = sumsByKey_1[k];
         });
@@ -56,6 +59,8 @@ function exportToExcelWithMerge(records, columns, mergeKeys, summaryKeys, fileNa
     }
     // 5. 创建工作表（带末尾合计行）
     var worksheet = createWorksheetWithMerge(__assign(__assign({}, excelData), { summaryRow: summaryRow }), mergeKeys);
+    // 5.1 根据 columns 的 fixed 与表头行数设置冻结窗格（左列 + 表头行）
+    setWorksheetFreeze(worksheet, excelData.leafColumns, excelData.headerRowCount);
     // 6. 添加样式（合计行高亮）
     applyExcelStyles(worksheet, dataForStyles, mergeKeys, summaryKeys, excelData.leafColumns, excelData.headerRowCount);
     // 7. 添加工作表到工作簿
@@ -68,6 +73,44 @@ function exportToExcelWithMerge(records, columns, mergeKeys, summaryKeys, fileNa
         fileName: fileName,
     };
 }
+function setWorksheetFreeze(worksheet, leafColumns, headerRowCount) {
+    try {
+        // 计算左侧固定列数量
+        var leftFrozenCount = leafColumns.filter(function (col) { return (col === null || col === void 0 ? void 0 : col.fixed) === "left"; }).length;
+        var ySplit = headerRowCount || 0;
+        var xSplit = leftFrozenCount || 0;
+        console.log("Freeze info:", {
+            ySplit: ySplit,
+            xSplit: xSplit,
+            headerRowCount: headerRowCount,
+            leftFrozenCount: leftFrozenCount,
+        });
+        if (ySplit > 0 || xSplit > 0) {
+            // 方法1：使用标准的 !freeze 属性（推荐）
+            // worksheet["!freeze"] = {
+            //   xSplit,
+            //   ySplit,
+            // };
+            // 方法2：如果方法1不生效，尝试使用 !panes 属性
+            worksheet["!panes"] = {
+                x: xSplit,
+                y: ySplit,
+                topLeftCell: xlsx_minExports.utils.encode_cell({ r: ySplit, c: xSplit }),
+            };
+            // 方法3：直接设置冻结信息到工作表
+            // if (!worksheet["!freeze"]) {
+            //   worksheet["!freeze"] = {};
+            // }
+            // worksheet["!freeze"].xSplit = xSplit;
+            // worksheet["!freeze"].ySplit = ySplit;
+            console.log("Freeze set:", worksheet["!freeze"]);
+        }
+    }
+    catch (e) {
+        console.error("设置冻结窗格失败:", e);
+        // 不影响导出，继续执行
+    }
+}
 /**
  * 准备Excel数据（支持分组表头，构建多行表头与合并范围）
  */

package/dist/es/table/hooks.js

@@ -33,7 +33,7 @@ function useEditChange(dataSourceRef, onTableChange) {
  * @returns 排序相关方法
  */
 function useMoveRowChange(dataSourceRef, onTableChange, options) {
-    var isMove = options.isMove, refreshScuCell = options.refreshScuCell, currentPage = options.currentPage, extraOnRow = options.extraOnRow, fixedRowsCount = options.fixedRowsCount, fixedRowsConfig = options.fixedRowsConfig;
+    var isMove = options.isMove, refreshScuCell = options.refreshScuCell, currentPage = options.currentPage, extraOnRow = options.extraOnRow, fixedRowsCount = options.fixedRowsCount, fixedRowsConfig = options.fixedRowsConfig, menuShow = options.menuShow;
     var moveRow = useCallback(function (dI, hI) {
         var _a;
         // 内部分页时，获取数据真正的行数
@@ -63,6 +63,14 @@ function useMoveRowChange(dataSourceRef, onTableChange, options) {
             index: index,
             moveRow: moveRow,
         };
+        var defaultOnRow = extraOnRow === null || extraOnRow === void 0 ? void 0 : extraOnRow(record, index);
+        var onContextMenuCapture = function (e) {
+            var _a;
+            (_a = defaultOnRow === null || defaultOnRow === void 0 ? void 0 : defaultOnRow.onContextMenuCapture) === null || _a === void 0 ? void 0 : _a.call(defaultOnRow, e);
+            menuShow === null || menuShow === void 0 ? void 0 : menuShow({
+                event: e,
+            });
+        };
         // 确定固定行数量和行高
         var fixedCount = (fixedRowsConfig === null || fixedRowsConfig === void 0 ? void 0 : fixedRowsConfig.count) || fixedRowsCount;
         var rowHeight = (fixedRowsConfig === null || fixedRowsConfig === void 0 ? void 0 : fixedRowsConfig.rowHeight) || 36; // 默认行高36px
@@ -76,18 +84,25 @@ function useMoveRowChange(dataSourceRef, onTableChange, options) {
                 borderBottom: "1px solid #f0f0f0",
                 zIndex: 10,
             };
-            return __assign(__assign({}, baseProps), { style: customStyle
+            return __assign(__assign(__assign(__assign({}, defaultOnRow), { onContextMenuCapture: onContextMenuCapture }), baseProps), { style: customStyle
                     ? __assign(__assign({}, defaultStyle), customStyle) : defaultStyle });
         }
         return baseProps;
-    }, [moveRow, fixedRowsCount, fixedRowsConfig]);
-    var defaultOnRow = useMemoizedFn(function (record) {
+    }, [moveRow, fixedRowsCount, fixedRowsConfig, menuShow, extraOnRow]);
+    var defaultOnRow = useMemoizedFn(function (record, index) {
         var extra = extraOnRow === null || extraOnRow === void 0 ? void 0 : extraOnRow(record);
+        var onContextMenuCapture = function (e) {
+            var _a;
+            (_a = extra === null || extra === void 0 ? void 0 : extra.onContextMenuCapture) === null || _a === void 0 ? void 0 : _a.call(extra, e);
+            menuShow === null || menuShow === void 0 ? void 0 : menuShow({
+                event: e,
+            });
+        };
         var summaryStyle = __assign({ background: "#ebf3fe", fontWeight: "bold" }, extra === null || extra === void 0 ? void 0 : extra.style);
         if (record[IS_SUMMARY]) {
-            return __assign(__assign({}, extra), { style: summaryStyle });
+            return __assign(__assign({}, extra), { onContextMenuCapture: onContextMenuCapture, style: summaryStyle });
         }
-        return {};
+        return __assign(__assign({}, extra), { onContextMenuCapture: onContextMenuCapture });
     });
     return {
         onRow: isMove || fixedRowsCount || fixedRowsConfig ? onRow : defaultOnRow,
@@ -338,13 +353,31 @@ function useCalcScrollY(isAutoScrollY, subHeight, id) {
     }, [isAutoScrollY, subHeight, id]);
     return tableHeight;
 }
+// 扁平化多级表头，获取叶子列
+function getLeafColumns(columns) {
+    var leafColumns = [];
+    var walk = function (nodes) {
+        var _a;
+        (_a = nodes === null || nodes === void 0 ? void 0 : nodes.forEach) === null || _a === void 0 ? void 0 : _a.call(nodes, function (n) {
+            if (Array.isArray(n === null || n === void 0 ? void 0 : n.children) && n.children.length > 0) {
+                walk(n.children);
+            }
+            else {
+                leafColumns.push(n);
+            }
+        });
+    };
+    walk(columns);
+    return leafColumns;
+}
 /**
  * 获取合并key值
  */
 var useMergeKeys = function (columns, isAutoMerge) {
     var mergeKeys = useMemo(function () {
         if (isAutoMerge) {
-            return Array.from(new Set(columns
+            var leafColumns = getLeafColumns(columns);
+            return Array.from(new Set(leafColumns
                 .filter(function (item) { return item.isMerge && item.key !== MERGE_INDEX; })
                 .map(function (item) { return (item.mergeKey || item.key); })));
         }
@@ -362,11 +395,13 @@ function useAutoMerge(dataSource, columns, _a) {
     var firstMergeKey = mergeKeys === null || mergeKeys === void 0 ? void 0 : mergeKeys[0];
     // 需要合计的字段
     var summaryKeys = useMemo(function () {
-        return columns.filter(function (item) { return item.isSummary; }).map(function (item) { return item.key; });
+        var leafColumns = getLeafColumns(columns);
+        return leafColumns.filter(function (item) { return item.isSummary; }).map(function (item) { return item.key; });
     }, [columns]);
     // 开启维度合并的维度字段
     var dimensionSummaryKeys = useMemo(function () {
-        return columns
+        var leafColumns = getLeafColumns(columns);
+        return leafColumns
             .filter(function (item) { return item.isDimensionSum; })
             .map(function (item) { return item.key; });
     }, [columns]);

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

@@ -497,6 +497,14 @@ interface ITableProps<RecordType> extends Omit<TableProps<RecordType>, "columns"
      * 目前index的话会自动加个序号
      */
     mode?: "index";
+    /**
+     * 是否开启右键功能
+     */
+    isContextMenu?: boolean;
+    /**
+     * 全屏后的一些事件
+     */
+    isFullscreenHandle?: (isFullscreen: boolean) => void;
 }
 interface IFields {
     /**

package/dist/es/table/table.js

@@ -1,6 +1,6 @@
 import { __rest, __assign, __awaiter, __generator } from '../_virtual/_tslib.js';
 import { jsx, jsxs } from 'react/jsx-runtime';
-import { memo, useMemo, useRef, useCallback, useImperativeHandle } from 'react';
+import { memo, useState, useMemo, useRef, useCallback, useImperativeHandle } from 'react';
 import { Table as Table$1 } from 'antd';
 import { BasicBodyRow, MoveBodyRow } from './components/EnhanceBodyRow.js';
 import EnhanceCell from './components/EnhanceBodyCell.js';
@@ -23,6 +23,8 @@ import { VList, scrollTo } from '../node_modules/virtuallist-antd/dist/index.es.
 import useTableValidate, { tableValidate } from './useTableValidate.js';
 import TitleDirectionColumn from './components/TitleDirectionColumn.js';
 import { useExcelExport } from './excel.js';
+import TableMenu from './components/TableMenu.js';
+import { useContextMenu as Fe } from '../node_modules/react-contexify/dist/index.js';
 import DynamicSetting from '../dynamicsetting/dynamicSetting.js';
 import { DndProvider } from '../node_modules/react-dnd/dist/core/DndProvider.js';
 
@@ -39,10 +41,16 @@ import { DndProvider } from '../node_modules/react-dnd/dist/core/DndProvider.js'
 // completed: 实现从execl复制到表格中的功能
 var Table = function (props) {
     // console.log("表格渲染");
-    var className = props.className, _a = props.bordered, bordered = _a === void 0 ? true : _a, _b = props.pagination, pagination = _b === void 0 ? false : _b, isFlex = props.isFlex; props.tablePreferences; var dynamicKey = props.dynamicKey, dynamicVersion = props.dynamicVersion, isRemeberFilter = props.isRemeberFilter, _c = props.isOrderUpdateData, isOrderUpdateData = _c === void 0 ? true : _c, hiddenDynamicIcon = props.hiddenDynamicIcon, _columns = props.columns, dataSource = props.dataSource, onTableChange = props.onTableChange, isEdit = props.isEdit, isMove = props.isMove, isAdd = props.isAdd, hiddenAddBtnHandle = props.hiddenAddBtnHandle, _d = props.isTheadTitleAdd, isTheadTitleAdd = _d === void 0 ? true : _d, addMode = props.addMode, addCallback = props.addCallback, isDel = props.isDel, delPopTitle = props.delPopTitle, hiddenDelBtnHandle = props.hiddenDelBtnHandle, _e = props.isDelAll, isDelAll = _e === void 0 ? true : _e, isAddAndDelAuto = props.isAddAndDelAuto, summaryConfig = props.summaryConfig, _f = props.summaryFixed, summaryFixed = _f === void 0 ? true : _f, isInnerPagination = props.isInnerPagination, _g = props.innerPaginationPageSize, innerPaginationPageSize = _g === void 0 ? 30 : _g, _h = props.innerPaginationPosition, innerPaginationPosition = _h === void 0 ? INNER_TABLE_PAGINATION_POSITION : _h, _j = props.innerPaginationPageSizeOptions, innerPaginationPageSizeOptions = _j === void 0 ? INNER_TABLE_PAGINATION_PAGESIZEOPTIONS : _j, innerPaginationConfig = props.innerPaginationConfig, tableRefHandle = props.tableRefHandle, tableName = props.tableName, serviceOrder = props.serviceOrder, differences = props.differences, virtualKey = props.virtualKey, _k = props.isResizableColumn, isResizableColumn = _k === void 0 ? true : _k, _l = props.isResizableTitleEllipsis, isResizableTitleEllipsis = _l === void 0 ? true : _l, _m = props.isRealTimeValidate, isRealTimeValidate = _m === void 0 ? true : _m, isMarginTop = props.isMarginTop, isMarginBottom = props.isMarginBottom, scroll = props.scroll, addAndDelProps = props.addAndDelProps, _o = props.autoScrollYMarginBottom, autoScrollYMarginBottom = _o === void 0 ? 65 : _o, _p = props.isAutoScrollY, isAutoScrollY = _p === void 0 ? false : _p, tableId = props.tableId, extraOnRow = props.onRow, fixedRowsCount = props.fixedRowsCount, fixedRowsConfig = props.fixedRowsConfig, headerAlign = props.headerAlign, isDimensionDynamic = props.isDimensionDynamic, isAutoMerge = props.isAutoMerge, mode = props.mode, rowSelection = props.rowSelection, resetProps = __rest(props, ["className", "bordered", "pagination", "isFlex", "tablePreferences", "dynamicKey", "dynamicVersion", "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", "isAutoMerge", "mode", "rowSelection"]);
+    var className = props.className, _a = props.bordered, bordered = _a === void 0 ? true : _a, _b = props.pagination, pagination = _b === void 0 ? false : _b, isFlex = props.isFlex; props.tablePreferences; var dynamicKey = props.dynamicKey, dynamicVersion = props.dynamicVersion, isRemeberFilter = props.isRemeberFilter, _c = props.isOrderUpdateData, isOrderUpdateData = _c === void 0 ? true : _c, hiddenDynamicIcon = props.hiddenDynamicIcon, _columns = props.columns, dataSource = props.dataSource, onTableChange = props.onTableChange, isEdit = props.isEdit, isMove = props.isMove, isAdd = props.isAdd, hiddenAddBtnHandle = props.hiddenAddBtnHandle, _d = props.isTheadTitleAdd, isTheadTitleAdd = _d === void 0 ? true : _d, addMode = props.addMode, addCallback = props.addCallback, isDel = props.isDel, delPopTitle = props.delPopTitle, hiddenDelBtnHandle = props.hiddenDelBtnHandle, _e = props.isDelAll, isDelAll = _e === void 0 ? true : _e, isAddAndDelAuto = props.isAddAndDelAuto, summaryConfig = props.summaryConfig, _f = props.summaryFixed, summaryFixed = _f === void 0 ? true : _f, isInnerPagination = props.isInnerPagination, _g = props.innerPaginationPageSize, innerPaginationPageSize = _g === void 0 ? 30 : _g, _h = props.innerPaginationPosition, innerPaginationPosition = _h === void 0 ? INNER_TABLE_PAGINATION_POSITION : _h, _j = props.innerPaginationPageSizeOptions, innerPaginationPageSizeOptions = _j === void 0 ? INNER_TABLE_PAGINATION_PAGESIZEOPTIONS : _j, innerPaginationConfig = props.innerPaginationConfig, tableRefHandle = props.tableRefHandle, tableName = props.tableName, serviceOrder = props.serviceOrder, differences = props.differences, virtualKey = props.virtualKey, _k = props.isResizableColumn, isResizableColumn = _k === void 0 ? true : _k, _l = props.isResizableTitleEllipsis, isResizableTitleEllipsis = _l === void 0 ? true : _l, _m = props.isRealTimeValidate, isRealTimeValidate = _m === void 0 ? true : _m, isMarginTop = props.isMarginTop, isMarginBottom = props.isMarginBottom, scroll = props.scroll, addAndDelProps = props.addAndDelProps, _o = props.autoScrollYMarginBottom, autoScrollYMarginBottom = _o === void 0 ? 65 : _o, _p = props.isAutoScrollY, isAutoScrollY = _p === void 0 ? false : _p, tableId = props.tableId, extraOnRow = props.onRow, fixedRowsCount = props.fixedRowsCount, fixedRowsConfig = props.fixedRowsConfig, headerAlign = props.headerAlign, isDimensionDynamic = props.isDimensionDynamic, isAutoMerge = props.isAutoMerge, mode = props.mode, rowSelection = props.rowSelection, isContextMenu = props.isContextMenu, isFullscreenHandle = props.isFullscreenHandle, resetProps = __rest(props, ["className", "bordered", "pagination", "isFlex", "tablePreferences", "dynamicKey", "dynamicVersion", "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", "isAutoMerge", "mode", "rowSelection", "isContextMenu", "isFullscreenHandle"]);
     var classes = classNames("ztxk-table", className, {
         "ztxk-table--flex": isFlex,
     });
+    var menuId = useState(isContextMenu
+        ? "menuId-" + Math.floor(Math.random() * 100000000)
+        : undefined)[0];
+    var menuShow = Fe({
+        id: menuId,
+    }).show;
     // 针对SCU和增减行 做特殊处理
     var _q = useScuRfresh(), refreshScuCell = _q.refreshScuCell, getRefreshScuCell = _q.getRefreshScuCell;
     // 做一些前置处理
@@ -104,6 +112,7 @@ var Table = function (props) {
         fixedRowsCount: fixedRowsCount,
         fixedRowsConfig: fixedRowsConfig,
         virtualKey: virtualKey,
+        menuShow: menuShow,
     }).onRow;
     // 内部表格新增删除事件
     var onAddAndDel = useAddAndDelChange(dataSourceRef, onTableChange, {
@@ -302,6 +311,8 @@ var Table = function (props) {
                 (_b = (_a = dynamicSettingRef.current) === null || _a === void 0 ? void 0 : _a.updateList) === null || _b === void 0 ? void 0 : _b.call(_a, list);
             },
             exportExcel: exportExcel,
+            /** 获取表格容器 */
+            getContainer: function () { return tableRef.current; },
         };
     });
     // 表格
@@ -325,7 +336,7 @@ var Table = function (props) {
                 overflow: "hidden",
                 marginTop: isMarginTop ? 10 : 0,
                 marginBottom: isMarginBottom ? 10 : 0,
-            }, ref: tableRef, id: tableId }, { children: [isMove ? (jsx(DndProvider, __assign({ backend: HTML5Backend, context: window }, { children: SingleTable }))) : (SingleTable), dynamicKey ? (jsx(DynamicSetting, { parentDynamicKey: TABLE_DYNAMIC_KEY, dynamicKey: dynamicKey, defaultList: defaultDynamicList, onCurrentListChange: onCurrentListChange, ref: dynamicSettingRef, hiddenOperationIcon: true, isMore: true, isFixed: true, isDimensionDynamic: isDimensionDynamic })) : null] })));
+            }, ref: tableRef, id: tableId }, { children: [isMove ? (jsx(DndProvider, __assign({ backend: HTML5Backend, context: window }, { children: SingleTable }))) : (SingleTable), dynamicKey ? (jsx(DynamicSetting, { parentDynamicKey: TABLE_DYNAMIC_KEY, dynamicKey: dynamicKey, defaultList: defaultDynamicList, onCurrentListChange: onCurrentListChange, ref: dynamicSettingRef, hiddenOperationIcon: true, isMore: true, isFixed: true, isDimensionDynamic: isDimensionDynamic })) : null, menuId ? (jsx(TableMenu, { menuId: menuId, tableRef: tableRef, isFullscreenHandle: isFullscreenHandle })) : null] })));
 };
 var MemoTable = memo(Table);
 MemoTable.displayName = "ZTXK_WEBUI_Table";

package/dist/es/table/useSummary.js

@@ -241,7 +241,13 @@ function getSubtotalObj(fields, dataSource) {
     });
     Object.keys(summaryTotalObj).forEach(function (key) {
         if (summaryTotalObj[key] !== undefined) {
-            summaryTotalObj[key] = addThousedSeparator(summaryTotalObj[key]);
+            var value = summaryTotalObj[key];
+            var isNumericLike = function (v) {
+                return typeof v === "number" || (typeof v === "string" && !isNaN(Number(v)));
+            };
+            if (isNumericLike(value)) {
+                summaryTotalObj[key] = addThousedSeparator(value);
+            }
         }
     });
     return {