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

package/es/pro-table/table.js

@@ -27,28 +27,35 @@ 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 _parent$classList, _parent$classList2, _parent$classList3, _parent$classList4, _parent$classList5;
-  var parent = node.parentNode;
-  if (!parent) return false;
-  if (
-  // 通过指定dom吸顶
-  (_parent$classList = parent.classList) !== null && _parent$classList !== void 0 && _parent$classList.contains('ccs-trigger-container') || (_parent$classList2 = parent.classList) !== null && _parent$classList2 !== void 0 && _parent$classList2.contains('ccs-drawer-content') || (_parent$classList3 = parent.classList) !== null && _parent$classList3 !== void 0 && _parent$classList3.contains('ant-drawer-body')) {
-    return {
-      getContainer: function getContainer() {
-        return parent;
-      }
-    };
-  }
-  // 在弹出框中吸顶top
-  if ((_parent$classList4 = parent.classList) !== null && _parent$classList4 !== void 0 && _parent$classList4.contains('ant-modal') || (_parent$classList5 = parent.classList) !== null && _parent$classList5 !== void 0 && _parent$classList5.contains('ant-drawer')) {
-    return {
-      offsetHeader: 0
-    };
-  }
-  return onIsInModalOrDrawer(parent);
-};
+// const onIsInModalOrDrawer = (node: any): boolean | TableSticky => {
+//   const parent = node.parentNode;
+
+//   console.log('parent', parent);
 
+//   if (!parent) return false;
+
+//   if (parent.classList?.contains('ccs-pl-table-content')) {
+//     return { getContainer: () => parent };
+//   }
+
+//   // if (
+//   //   // 通过指定dom吸顶
+//   //   parent.classList?.contains('ccs-trigger-container') ||
+//   //   parent.classList?.contains('ccs-drawer-content') ||
+//   //   parent.classList?.contains('ant-drawer-body')
+//   // ) {
+//   //   return { getContainer: () => parent };
+//   // }
+//   // // 在弹出框中吸顶top
+//   // if (
+//   //   parent.classList?.contains('ant-modal') ||
+//   //   parent.classList?.contains('ant-drawer')
+//   // ) {
+//   //   return { offsetHeader: 0 };
+//   // }
+
+//   return onIsInModalOrDrawer(parent);
+// };
 // 根据ID查找树形节点
 var getDataById = function getDataById(data, rowKey, id) {
   if (!_isArray(data)) return;
@@ -298,9 +305,11 @@ var InternalProTable = function InternalProTable(props) {
 
   useEffect(function () {
     // 判断当前dom所处的滚动区域
-    var inMd = onIsInModalOrDrawer(tableRef.current);
-    if (inMd) stickyRef.current = inMd;
-
+    // const inMd = onIsInModalOrDrawer(tableRef.current);
+    // if (inMd) {
+    //   stickyRef.current = inMd;
+    // } else {
+    // }
     // // 监听resize
     // window.addEventListener('resize', resizeFn);
     // return () => {
@@ -448,7 +457,11 @@ var InternalProTable = function InternalProTable(props) {
         table: table,
         event$: event$,
         treeRef: treeRef,
-        sticky: stickyRef.current || true,
+        sticky: {
+          getContainer: function getContainer() {
+            return tableRef.current;
+          }
+        },
         parentFieldName: parentFieldName,
         setData: setData,
         onSearchAfter: onSearchAfter,
@@ -462,7 +475,11 @@ var InternalProTable = function InternalProTable(props) {
       data: data,
       event$: event$,
       size: isInModalOrDrawer ? 'small' : 'middle',
-      sticky: stickyRef.current || true
+      sticky: {
+        getContainer: function getContainer() {
+          return tableRef.current;
+        }
+      }
     }, table), {}, {
       columns: columns,
       showSorterTooltip: true,

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-1",
+  "description": "修复table双滚动条问题;",
   "license": "MIT",
   "author": {
     "name": "Hong",