zmdms-webui 2.2.7 → 2.2.9

package/dist/es/table/hooks.js

@@ -490,7 +490,7 @@ function useMergeAddAndDel(_a) {
      */
     var newRowSelection = useMemo(function () {
         if (isAutoMerge && rowSelection && isAutoMergeAddAndDel) {
-            return __assign(__assign({}, rowSelection), { 
+            var rows = __assign(__assign({}, rowSelection), { 
                 // 关键：合并行时，勾选框只显示在rowSpan>0的单元格
                 renderCell: function (_v, record, _i, originNode) {
                     var _a;
@@ -501,6 +501,7 @@ function useMergeAddAndDel(_a) {
                         children: originNode,
                     };
                 } });
+            return rows;
         }
         return rowSelection;
     }, [rowSelection, isAutoMerge, firstMergeKey, isAutoMergeAddAndDel]);

package/dist/es/table/table.js

@@ -11,7 +11,7 @@ import './components/ColumnAddDel.js';
 import './components/TitleOperation.js';
 import { IS_SUMMARY, TABLE_DYNAMIC_KEY, INNER_TABLE_PAGINATION_POSITION, INNER_TABLE_PAGINATION_PAGESIZEOPTIONS } from './constant.js';
 import './components/PopoverIcon.js';
-import { useLatest } from 'ahooks';
+import { useLatest, useMemoizedFn } from 'ahooks';
 import { useParseColumns } from './useParseColumns.js';
 import { useColumns } from './useColumns.js';
 import { useDynamicListByColumns } from './useDynamicListByColumns.js';
@@ -328,12 +328,22 @@ var Table = function (props) {
             toggleFullScreen: function () { var _a; return (_a = tableMenuRef.current) === null || _a === void 0 ? void 0 : _a.toggleFullscreen(); },
         };
     });
+    // 全屏的一些方法
+    var _z = useState(false), isFull = _z[0], setIsFull = _z[1];
+    var fullscreenHandle = useMemoizedFn(function (isFull) {
+        isFullscreenHandle === null || isFullscreenHandle === void 0 ? void 0 : isFullscreenHandle(isFull);
+        setIsFull(isFull);
+    });
     // 表格
     var SingleTable = (jsx(Table$1, __assign({ className: classes, bordered: bordered, dataSource: newDataSource, columns: newColumns, components: componentsMemo, onRow: onRow, summary: getSummaryHandle, rowSelection: newRowSelection, pagination: isInnerPagination
             ? pagination
                 ? pagination
                 : paginationConfig
-            : pagination, rowClassName: rowClassName, scroll: proxyScroll }, resetProps)));
+            : pagination, rowClassName: rowClassName, scroll: proxyScroll, getPopupContainer: isFull
+            ? function () {
+                return document.querySelector(".ztxk-table--fullscreen") || document.body;
+            }
+            : undefined }, resetProps)));
     return (jsxs("div", __assign({ style: isFlex
             ? {
                 position: "relative",
@@ -349,7 +359,7 @@ var Table = function (props) {
                 overflow: "hidden",
                 marginTop: isMarginTop ? 10 : 0,
                 marginBottom: isMarginBottom ? 10 : 0,
-            }, ref: tableRef, id: tableId, className: "ztxk-table--wrapper-container" }, { 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, tableMenuRef: tableMenuRef })) : null] })));
+            }, ref: tableRef, id: tableId, className: "ztxk-table--wrapper-container" }, { 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: fullscreenHandle, tableMenuRef: tableMenuRef })) : null] })));
 };
 var MemoTable = memo(Table);
 MemoTable.displayName = "ZTXK_WEBUI_Table";