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

package/es/dialog/HookModal.d.ts

@@ -2,7 +2,7 @@
 import { FormProps } from 'antd';
 import { DialogFormRef } from './form';
 import { CcsDialogModal, CcsDialogModalProps } from './hook';
-export declare const DialogSelfButton: ({ auth, formRef, formInitialValues, request, onCancel, onRequestBefore, }: Pick<CcsDialogModalProps, "request" | "auth" | "onRequestBefore" | "onCancel"> & {
+export declare const DialogSelfButton: ({ auth, formRef, formInitialValues, request, onCancel, onRequestBefore, }: Pick<CcsDialogModalProps, "auth" | "request" | "onRequestBefore" | "onCancel"> & {
     formRef: React.RefObject<DialogFormRef>;
     formInitialValues: FormProps['initialValues'];
 }) => import("react/jsx-runtime").JSX.Element;

package/es/keep-alive-tabs/page.js

@@ -20,17 +20,18 @@ export default /*#__PURE__*/memo(function (props) {
       }
     },
     children: /*#__PURE__*/_jsx("div", {
+      id: id,
       style: {
         display: active ? 'block' : 'none'
       },
       className: "ccs-tab-item",
-      id: id,
       "data-display": active,
       children: /*#__PURE__*/_jsx(Scrollbars, {
         style: {
           display: active ? 'block' : 'none'
         },
         autoHide: true,
+        className: "ccs-table-item-scroll",
         children: /*#__PURE__*/_jsx("div", {
           style: {
             margin: 16

package/es/pro-table/search.js

@@ -438,15 +438,17 @@ function SearchComponent(_ref) {
   var hasBorder = titleBordered === true;
   return /*#__PURE__*/_jsx(_Fragment, {
     children: /*#__PURE__*/_jsxs(Card, {
-      bodyStyle: {
-        padding: 16
-      },
       style: _objectSpread({
         borderRadius: 0,
         boxShadow: 'none'
       }, hasBorder ? {
         borderBottom: 0
       } : {}),
+      styles: {
+        body: {
+          padding: 16
+        }
+      },
       bordered: hasBorder,
       title: title,
       children: [(onHasMore() || expandForm) && renderMoreForm(), /*#__PURE__*/_jsxs("div", {

package/es/pro-table/table.js

@@ -48,6 +48,22 @@ var onTableInModalOrDrawer = function onTableInModalOrDrawer(node) {
   }
   return onTableInModalOrDrawer(parent);
 };
+var onTableInTabItem = function onTableInTabItem(node) {
+  var _parent$classList6;
+  var parent = node.parentNode;
+  if (!parent) return false;
+  if ( // 通过指定dom吸顶
+  (_parent$classList6 = parent.classList) !== null && _parent$classList6 !== void 0 && _parent$classList6.contains('ccs-table-item-scroll')) {
+    return {
+      getContainer: function getContainer() {
+        return parent;
+      }
+    };
+  }
+  return onTableInTabItem(parent);
+};
+
+// ccs-table-item-scroll
 
 // 根据ID查找树形节点
 var getDataById = function getDataById(data, rowKey, id) {
@@ -297,18 +313,18 @@ var InternalProTable = function InternalProTable(props) {
   // }, 200);
 
   useEffect(function () {
-    // 判断当前dom所处的滚动区域
+    // 判断是否在弹出框中
     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;
-        }
-      };
+      return;
+    }
+
+    // 判断在tab中
+    var inTab = onTableInTabItem(tableRef.current);
+    if (inTab) {
+      stickyRef.current = inTab;
+      return;
     }
 
     // // 监听resize
@@ -458,7 +474,7 @@ var InternalProTable = function InternalProTable(props) {
         table: table,
         event$: event$,
         treeRef: treeRef,
-        sticky: stickyRef.current,
+        sticky: stickyRef.current || true,
         parentFieldName: parentFieldName,
         setData: setData,
         onSearchAfter: onSearchAfter,
@@ -472,7 +488,7 @@ var InternalProTable = function InternalProTable(props) {
       data: data,
       event$: event$,
       size: isInModalOrDrawer ? 'small' : 'middle',
-      sticky: stickyRef.current
+      sticky: stickyRef.current || true
     }, table), {}, {
       columns: columns,
       showSorterTooltip: true,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ccs-ui/rc-pro",
-  "version": "1.1.24-beta-2",
+  "version": "1.1.24-beta-4",
   "description": "修复table双滚动条问题;",
   "license": "MIT",
   "author": {
@@ -54,7 +54,7 @@
     "@ant-design/compatible": "^5.1.2",
     "@ant-design/icons": "^5.1.4",
     "ahooks": "^3.7.7",
-    "antd": "^5.11.0",
+    "antd": "^5.16.2",
     "antd-img-crop": "^4.12.2",
     "classnames": "^2.3.2",
     "dayjs": "^1.11.7",