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

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

@@ -8,8 +8,11 @@ type PropsType<T> = Pick<CcsProTableProps<T>, 'toolbar' | 'formItems' | 'formIni
     form: FormInstance<any>;
     /** table 操作栏 */
     tableOperation: ReactElement;
+    /** 查询 */
     onSearch: () => void;
+    /** header 高度改变 */
+    onHeaderResize: () => void;
 };
 /** 操作按钮、查询，重置、列筛选、 */
-declare function HeadComponent<T>({ form, title, toolbar, children, expandForm, formItems, formInitValues, formItemLabelWidth, tableOperation, onSearch, }: PropsType<T>): import("react/jsx-runtime").JSX.Element;
+declare function HeadComponent<T>({ form, title, toolbar, children, expandForm, formItems, formInitValues, formItemLabelWidth, tableOperation, onSearch, onHeaderResize, }: PropsType<T>): import("react/jsx-runtime").JSX.Element;
 export default HeadComponent;

package/es/pro-table/head.js

@@ -28,7 +28,8 @@ function HeadComponent(_ref) {
     formInitValues = _ref.formInitValues,
     formItemLabelWidth = _ref.formItemLabelWidth,
     tableOperation = _ref.tableOperation,
-    onSearch = _ref.onSearch;
+    onSearch = _ref.onSearch,
+    onHeaderResize = _ref.onHeaderResize;
   var formItemsRef = useRef(null);
   // 查询条件是否展开
   var _useState = useState(expandForm),
@@ -61,6 +62,7 @@ function HeadComponent(_ref) {
   // 尺寸变化重设尺寸
   var resizeFn = _debounce(function (hm) {
     setVisible(hm);
+    onHeaderResize();
   }, 500);
 
   // 监听dom尺寸变化

package/es/pro-table/table.js

@@ -596,6 +596,10 @@ var InternalProTable = function InternalProTable(props) {
       formInitValues: formInitValues,
       formItemLabelWidth: props.formItemLabelWidth,
       onSearch: _onSearch,
+      onHeaderResize: function onHeaderResize() {
+        var _tableRef$current2;
+        return (_tableRef$current2 = tableRef.current) === null || _tableRef$current2 === void 0 ? void 0 : _tableRef$current2.onFixedThead();
+      },
       title: props.title,
       tableOperation: (table === null || table === void 0 ? void 0 : table.hideOperation) !== true ? /*#__PURE__*/_jsx(TableOperation, {
         onChangeRowSize: function onChangeRowSize(e) {

package/es/table/index.js

@@ -82,22 +82,27 @@ var CustomTable = function CustomTable(props) {
         if (!tableBody) return;
         var headerHeight = 0,
           pageHeight = 0,
-          footerHeight = 0;
+          footerHeight = 0,
+          summaryHeight = 0;
         var _pagination = tableTarget.getElementsByClassName('ant-pagination');
         if (_pagination && _pagination.length > 0) {
           pageHeight = _pagination[0].clientHeight;
         }
         var header = tableTarget.getElementsByClassName('ant-table-header');
         var footer = tableTarget.getElementsByClassName('ant-table-footer');
+        var summary = tableTarget.getElementsByClassName('ant-table-summary');
         if (footer && footer.length > 0) {
           footerHeight = footer[0].clientHeight;
         }
         if (header && header.length > 0) {
           headerHeight = header[0].clientHeight;
         }
+        if (summary && summary.length > 0) {
+          summaryHeight = summary[0].clientHeight;
+        }
 
         // 计算table数据区高度
-        var scrollHeight = (((_tableContentRef$curr = tableContentRef.current) === null || _tableContentRef$curr === void 0 ? void 0 : _tableContentRef$curr.clientHeight) || 0) - headerHeight - pageHeight - footerHeight;
+        var scrollHeight = (((_tableContentRef$curr = tableContentRef.current) === null || _tableContentRef$curr === void 0 ? void 0 : _tableContentRef$curr.clientHeight) || 0) - headerHeight - pageHeight - footerHeight - summaryHeight;
 
         // 固定tbody高度
         tableBody.style.height = "".concat(scrollHeight, "px");

package/es/table/index.less

@@ -174,6 +174,7 @@
 
 .ccs-tabs-auto-height {
   flex: 1 1 auto;
+  overflow: hidden;
   > .ant-tabs-content-holder {
     height: 100%;
     > .ant-tabs-content {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ccs-ui/rc-pro",
-  "version": "2.3.6-beta-2",
+  "version": "2.3.6-beta-4",
   "description": "",
   "license": "MIT",
   "author": {