@ccs-ui/rc-pro 1.1.23 → 1.1.24-beta-2

package/es/pro-table/table.js

@@ -27,7 +27,7 @@ import TableTree from "./tree";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 // 判断组件所处dom
-var onIsInModalOrDrawer = function onIsInModalOrDrawer(node) {
+var onTableInModalOrDrawer = function onTableInModalOrDrawer(node) {
   var _parent$classList, _parent$classList2, _parent$classList3, _parent$classList4, _parent$classList5;
   var parent = node.parentNode;
   if (!parent) return false;
@@ -46,7 +46,7 @@ var onIsInModalOrDrawer = function onIsInModalOrDrawer(node) {
       offsetHeader: 0
     };
   }
-  return onIsInModalOrDrawer(parent);
+  return onTableInModalOrDrawer(parent);
 };
 
 // 根据ID查找树形节点
@@ -298,8 +298,18 @@ var InternalProTable = function InternalProTable(props) {
 
   useEffect(function () {
     // 判断当前dom所处的滚动区域
-    var inMd = onIsInModalOrDrawer(tableRef.current);
-    if (inMd) stickyRef.current = inMd;
+    var inMd = onTableInModalOrDrawer(tableRef.current);
+    if (inMd) {
+      stickyRef.current = inMd;
+    } else {
+      var _parentNode;
+      var node = (_parentNode = tableRef.current.parentNode) === null || _parentNode === void 0 ? void 0 : _parentNode.parentNode;
+      stickyRef.current = {
+        getContainer: function getContainer() {
+          return watermark ? node.parentNode : node;
+        }
+      };
+    }
 
     // // 监听resize
     // window.addEventListener('resize', resizeFn);
@@ -448,7 +458,7 @@ var InternalProTable = function InternalProTable(props) {
         table: table,
         event$: event$,
         treeRef: treeRef,
-        sticky: stickyRef.current || true,
+        sticky: stickyRef.current,
         parentFieldName: parentFieldName,
         setData: setData,
         onSearchAfter: onSearchAfter,
@@ -462,7 +472,7 @@ var InternalProTable = function InternalProTable(props) {
       data: data,
       event$: event$,
       size: isInModalOrDrawer ? 'small' : 'middle',
-      sticky: stickyRef.current || true
+      sticky: stickyRef.current
     }, table), {}, {
       columns: columns,
       showSorterTooltip: true,

package/es/pro-table/tree.d.ts

@@ -15,7 +15,7 @@ type TreeTableProps<T> = Pick<CcsProTableProps<T>, 'table' | 'onSearchBefore' |
     }>;
     treeRef: RefObject<TreeInstance<T>>;
     isInModalOrDrawer: boolean;
-    sticky: true | TableSticky;
+    sticky: boolean | TableSticky;
     setData: React.Dispatch<React.SetStateAction<CCS.TableData<T>>>;
     handlePageChange: any;
     onSearchAfter: (data: HttpResult<T[]>, eventType?: SearchEventType) => HttpResult<(T & {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@ccs-ui/rc-pro",
-  "version": "1.1.23",
-  "description": "删除IsTabsPage参数;添加colorful主题;修复Table固定高度无法滚动问题;",
+  "version": "1.1.24-beta-2",
+  "description": "修复table双滚动条问题;",
   "license": "MIT",
   "author": {
     "name": "Hong",