@ccs-ui/rc-pro 2.3.6-beta-7 → 2.3.6-beta-8

package/es/dialog/button.d.ts

@@ -16,7 +16,7 @@ export type DialogButtonsProps<T> = Pick<CcsDialogModalProps, 'okText' | 'onClos
 export type DialogButtonRef = {
     onSetButtons: (e: React.ReactElement) => void;
 };
-export declare const DialogButtonHolder: <TParams, TData>({ auth, extraBtn, formRef, request, onOk, onClose, buttonRef, requestFieldNames, formInitialValues, preventRequestHandle, }: Pick<CcsDialogModalProps<TParams, TData>, "auth" | "onClose" | "onOk" | "extraBtn" | "request" | "requestFieldNames" | "preventRequestHandle"> & {
+export declare const DialogButtonHolder: <TParams, TData>({ auth, extraBtn, formRef, request, onOk, onClose, buttonRef, requestFieldNames, formInitialValues, preventRequestHandle, }: Pick<CcsDialogModalProps<TParams, TData>, "auth" | "request" | "onClose" | "onOk" | "extraBtn" | "requestFieldNames" | "preventRequestHandle"> & {
     formRef: React.RefObject<DialogFormRef<TParams>>;
     formInitialValues: FormProps['initialValues'];
     buttonRef: RefObject<DialogButtonRef>;

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

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

package/es/pro-table/head.js

@@ -28,18 +28,21 @@ function HeadComponent(_ref) {
     formInitValues = _ref.formInitValues,
     formItemLabelWidth = _ref.formItemLabelWidth,
     tableOperation = _ref.tableOperation,
-    onSearch = _ref.onSearch,
-    onHeaderResize = _ref.onHeaderResize;
+    onSearch = _ref.onSearch;
   var formItemsRef = useRef(null);
+
+  // 根据位置判断是否换行ref
+  var endItemRef = useRef(null);
+
   // 查询条件是否展开
   var _useState = useState(expandForm),
     _useState2 = _slicedToArray(_useState, 2),
     isExpand = _useState2[0],
     setIsExpand = _useState2[1];
-  var _useState3 = useState('hidden'),
+  var _useState3 = useState(false),
     _useState4 = _slicedToArray(_useState3, 2),
-    visible = _useState4[0],
-    setVisible = _useState4[1];
+    hasMore = _useState4[0],
+    onToggle = _useState4[1];
   useUpdateEffect(function () {
     setIsExpand(expandForm);
   }, [expandForm]);
@@ -55,34 +58,23 @@ function HeadComponent(_ref) {
     return formItems;
   }, [formItems]);
 
-  // 查询条件记录数
-  var itemLen = allFormItems.length;
-  var hasItem = itemLen > 0;
-
-  // 尺寸变化重设尺寸
-  var resizeFn = _debounce(function (hm) {
-    setVisible(hm);
-    onHeaderResize();
-  }, 500);
+  // 判断是否有更多条件无法一行显示
+  var onEventMore = function onEventMore() {
+    var _endItemRef$current, _formItemsRef$current;
+    onToggle(((_endItemRef$current = endItemRef.current) === null || _endItemRef$current === void 0 ? void 0 : _endItemRef$current.getClientRects()[0].top) !== ((_formItemsRef$current = formItemsRef.current) === null || _formItemsRef$current === void 0 ? void 0 : _formItemsRef$current.getClientRects()[0].top));
+  };
 
   // 监听dom尺寸变化
-  var onResize = function onResize() {
-    var _formItemsRef$current;
-    if (visible === 'hidden') return;
-    var scrollHeight = ((_formItemsRef$current = formItemsRef.current) === null || _formItemsRef$current === void 0 ? void 0 : _formItemsRef$current.scrollHeight) || 0;
-    if (scrollHeight === 0) return;
-    var hm = scrollHeight > 40 ? 'more' : 'visible';
-    resizeFn(hm);
+  var resizeFn = function resizeFn() {
+    onEventMore();
   };
+
+  // 监听容器尺寸变化
+  var onResize = _debounce(resizeFn, 500);
   useEffect(function () {
-    var _formItemsRef$current2;
-    var scrollHeight = ((_formItemsRef$current2 = formItemsRef.current) === null || _formItemsRef$current2 === void 0 ? void 0 : _formItemsRef$current2.scrollHeight) || 0;
-    setVisible(scrollHeight > 40 ? 'more' : 'visible');
+    onEventMore();
   }, []);
 
-  // 是否有更多
-  var hasMore = itemLen > 1 && visible === 'more';
-
   // 操作按钮
   var renderSearchBtn = /*#__PURE__*/_jsxs("div", {
     style: {
@@ -172,16 +164,17 @@ function HeadComponent(_ref) {
   // 获取Input的高度
   var token = theme.useToken().token;
   var controlHeight = token.rootValue ? "".concat((token.controlHeight / token.rootValue).toFixed(3), "rem") : token.controlHeight;
+  var adaptationRef = useRef(null);
   return /*#__PURE__*/_jsxs(_Fragment, {
-    children: [hasItem && /*#__PURE__*/_jsxs(_Fragment, {
+    children: [allFormItems.length > 0 && /*#__PURE__*/_jsxs(_Fragment, {
       children: [/*#__PURE__*/_jsx(CcsResizeObserver.Target, {
         targetRef: formItemsRef,
         onResize: onResize
       }), /*#__PURE__*/_jsx(Card, {
+        ref: adaptationRef,
         className: "ccs-pl-adaptation",
         style: {
-          boxShadow: 'none',
-          visibility: visible === 'hidden' ? 'hidden' : 'visible'
+          boxShadow: 'none'
         },
         styles: {
           body: {
@@ -203,7 +196,9 @@ function HeadComponent(_ref) {
             },
             className: "ccs-pl-adaptation-form",
             ref: formItemsRef,
-            children: [renderFormItems(), isExpand && renderSearchBtn]
+            children: [renderFormItems(), /*#__PURE__*/_jsx("div", {
+              ref: endItemRef
+            }), isExpand && renderSearchBtn]
           }), !isExpand && /*#__PURE__*/_jsx("div", {
             style: {
               flex: '0 0 auto'

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

@@ -1,14 +1,9 @@
 import './index.less';
-import { CcsProTableProps, SearchEventType } from './table';
-type TableProps<T> = Omit<CcsProTableProps<T>, 'onSearchAfter' | 'parentFieldName'> & {
-    /** 请求后格式化结果 */
-    onSearchAfter?: (data: any, eventType?: SearchEventType) => any;
-};
-type TableTreeProps<T> = Omit<CcsProTableProps<T>, 'onSearchAfter'> & {
+import { CcsProTableProps } from './table';
+type TableProps<T> = Omit<CcsProTableProps<T>, 'parentFieldName'>;
+type TableTreeProps<T> = CcsProTableProps<T> & {
     /** 父级值字段 */
     parentFieldName: string;
-    /** 请求后格式化结果 */
-    onSearchAfter?: (data: any, eventType?: SearchEventType) => any;
 };
 /**
  * 查询表格组件

package/es/pro-table/index.js

@@ -24,9 +24,7 @@ var ProTable = function ProTable(props) {
  * @returns
  */
 var ProTableTree = function ProTableTree(props) {
-  return /*#__PURE__*/_jsx(InternalProTable, _objectSpread(_objectSpread({}, props), {}, {
-    onSearchAfter: props.onSearchAfter
-  }));
+  return /*#__PURE__*/_jsx(InternalProTable, _objectSpread({}, props));
 };
 ProTable.Tree = ProTableTree;
 export default ProTable;

package/es/pro-table/index.less

@@ -49,6 +49,10 @@
   &-table-content {
     position: relative;
     flex: auto;
+
+    .ant-table-title {
+      padding: 0 !important;
+    }
   }
 
   &-adaptation {
@@ -61,13 +65,14 @@
   &-adaptation-form {
     flex: 1 1 auto;
     display: flex;
+    justify-content: flex-end;
     flex-wrap: wrap;
     gap: 16px 10px;
     overflow: hidden;
 
-    // &::-webkit-scrollbar {
-    //   display: none;
-    // }
+    &::-webkit-scrollbar {
+      display: none;
+    }
   }
 
   .ant-form-item {

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

@@ -13,9 +13,6 @@ export type ShowDependType = {
     value: any;
 };
 export type SearchEventType = 'search' | 'reset' | 'reload' | 'changePage' | 'initSearch';
-type SearchBeforeType = ParamType & {
-    query: ParamType;
-};
 export type TableColumn<RecordType = any> = (Omit<ColumnGroupType<RecordType>, 'ellipsis'> | Omit<ColumnType<RecordType>, 'ellipsis'>) & {
     /** 隐藏列 */
     hidden?: boolean;
@@ -27,10 +24,21 @@ type TableTitleType<T> = {
     data: T[];
     onClear: () => void;
 };
+export type CcsRequestProps = {
+    pageNo?: number;
+    pageSize?: number;
+    query?: Record<string, any>;
+    filters?: Record<string, any>;
+    orderProps?: {
+        prop: string;
+        ascending: boolean;
+    }[];
+    eventType?: SearchEventType;
+};
 export type CcsTableProps<T> = Omit<TableProps<T>, 'columns' | 'title'> & {
     data?: CCS.TableData<T>;
     /** request 方法 */
-    request?: (params: any) => Promise<any>;
+    request?: (params: CcsRequestProps) => Promise<any>;
     /** request 额外参数 dataSource: ['data', 'result']; current: ['data', 'pageNo']; pageSize: ['data', 'pageSize']; total: ['data', 'totalNum'] */
     requestParam?: ParamType;
     /** 接口字段指定,默认： */
@@ -80,12 +88,6 @@ export type CcsProTableProps<RecordType> = Pick<PropsWithCss, 'className'> & Pro
     proRef?: CCS.TableInstanceRef<RecordType>;
     /** 显示序号 */
     showNumber?: boolean;
-    /** 执行search 后回调函数 */
-    searchEvent?: () => void;
-    /** 请求前格式化参数 */
-    onSearchBefore?: (params: SearchBeforeType, eventType?: SearchEventType) => SearchBeforeType;
-    /** 请求后格式化结果 */
-    onSearchAfter?: (result: any, eventType?: SearchEventType) => any;
 };
 export type TableEventType = {
     key: 'columnFilter' | 'fullScreen';

package/es/pro-table/table.js

@@ -17,12 +17,12 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import CcsUtils from '@ccs-ui/utils';
-import { useSize, useUpdateEffect } from 'ahooks';
+import { useUpdateEffect } from 'ahooks';
 import { theme as antTheme, Empty, Form } from 'antd';
 import classNames from 'classnames';
+import _debounce from 'lodash.debounce';
 import React, { useEffect, useImperativeHandle, useMemo, useRef, useState } from 'react';
-import { useAppConfig, useCcsPage } from '..';
-import { onDefaultFormat } from "../config";
+import { CcsResizeObserver, useAppConfig, useCcsPage } from '..';
 import { useProTableFields } from "../hooks/use-app";
 import { getDataFromFields } from "../select";
 import CcsTable from "../table";
@@ -57,7 +57,6 @@ var InternalProTable = function InternalProTable(props) {
     children = props.children,
     className = props.className,
     expandForm = props.expandForm,
-    searchEvent = props.searchEvent,
     toolbarExtra = props.toolbarExtra,
     _props$formItems = props.formItems,
     formItems = _props$formItems === void 0 ? [] : _props$formItems,
@@ -138,8 +137,6 @@ var InternalProTable = function InternalProTable(props) {
   var globalFieldNames = useProTableFields();
   // 接口字段指定
   var fieldNames = _objectSpread(_objectSpread({}, globalFieldNames), (_props$table = props.table) === null || _props$table === void 0 ? void 0 : _props$table.fieldNames);
-  var onSearchBefore = props.onSearchBefore || onDefaultFormat;
-  var onSearchAfter = props.onSearchAfter || onDefaultFormat;
 
   // 暗黑模式
   var isDark = theme === 'dark';
@@ -155,16 +152,6 @@ var InternalProTable = function InternalProTable(props) {
     });
   }, []);
 
-  // 监听容器尺寸变化
-  var size = useSize(containerRef);
-  useEffect(function () {
-    var _table$scroll, _tableContentRef$curr;
-    if ((table === null || table === void 0 || (_table$scroll = table.scroll) === null || _table$scroll === void 0 ? void 0 : _table$scroll.y) === 'auto' && ((_tableContentRef$curr = tableContentRef.current) === null || _tableContentRef$curr === void 0 ? void 0 : _tableContentRef$curr.clientHeight) !== 0) {
-      var _tableRef$current;
-      (_tableRef$current = tableRef.current) === null || _tableRef$current === void 0 || _tableRef$current.onFixedThead();
-    }
-  }, [size === null || size === void 0 ? void 0 : size.height]);
-
   // 获取数据
   var onRequest = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(eventType) {
@@ -190,9 +177,7 @@ var InternalProTable = function InternalProTable(props) {
                 pageValue,
                 params,
                 _treeRef$current,
-                newParams,
                 requestResult,
-                newReqResult,
                 dataSource,
                 _pageSize,
                 current,
@@ -217,9 +202,11 @@ var InternalProTable = function InternalProTable(props) {
                       pageNo: pageNo,
                       pageSize: pageSize
                     };
-                    params = _objectSpread(_objectSpread({
-                      query: _objectSpread(_objectSpread({}, formValues), requestParam)
-                    }, pageValue), filtersRef.current); // 异步树
+                    params = _objectSpread(_objectSpread(_objectSpread({
+                      query: _objectSpread(_objectSpread({}, requestParam), formValues)
+                    }, pageValue), filtersRef.current), {}, {
+                      eventType: eventType
+                    }); // 异步树
                     if (!parentFieldName) {
                       _context.next = 7;
                       break;
@@ -227,29 +214,27 @@ var InternalProTable = function InternalProTable(props) {
                     (_treeRef$current = treeRef.current) === null || _treeRef$current === void 0 || _treeRef$current.onRequestTree(params.query, record);
                     return _context.abrupt("return");
                   case 7:
-                    // onSearchBefore 请求前回传参数，可以在父组件进行修改
-                    newParams = onSearchBefore(params, eventType); // 发起请求
+                    // 发起请求
                     setData(function (d) {
                       return _objectSpread(_objectSpread({}, d), {}, {
                         loading: true
                       });
                     });
-                    _context.next = 11;
-                    return httpRequest(_objectSpread({}, newParams));
-                  case 11:
+                    _context.next = 10;
+                    return httpRequest(params);
+                  case 10:
                     requestResult = _context.sent;
                     if (!requestResult) {
-                      _context.next = 24;
+                      _context.next = 22;
                       break;
                     }
-                    // onSearchAfter 处理请求结果
-                    newReqResult = onSearchAfter(requestResult, eventType); // 获取table数据
-                    dataSource = getDataFromFields(newReqResult, fieldNames.dataSource);
-                    _pageSize = getDataFromFields(newReqResult, fieldNames.pageSize);
-                    current = getDataFromFields(newReqResult, fieldNames.current);
-                    total = getDataFromFields(newReqResult, fieldNames.total);
+                    // 获取table数据
+                    dataSource = getDataFromFields(requestResult, fieldNames.dataSource);
+                    _pageSize = getDataFromFields(requestResult, fieldNames.pageSize);
+                    current = getDataFromFields(requestResult, fieldNames.current);
+                    total = getDataFromFields(requestResult, fieldNames.total);
                     if (!(total === undefined || _pageSize === undefined || current === undefined || dataSource === undefined)) {
-                      _context.next = 21;
+                      _context.next = 19;
                       break;
                     }
                     setData({
@@ -260,7 +245,7 @@ var InternalProTable = function InternalProTable(props) {
                       loading: false
                     });
                     return _context.abrupt("return");
-                  case 21:
+                  case 19:
                     // 当前页无数据，返回上一页
                     if (!dataSource.length && current !== 1 && current !== undefined) {
                       onRequest('reload', current - 1);
@@ -273,15 +258,15 @@ var InternalProTable = function InternalProTable(props) {
                         total: total || 0
                       });
                     }
-                    _context.next = 25;
+                    _context.next = 23;
                     break;
-                  case 24:
+                  case 22:
                     setData(function (d) {
                       return _objectSpread(_objectSpread({}, d), {}, {
                         loading: false
                       });
                     });
-                  case 25:
+                  case 23:
                   case "end":
                     return _context.stop();
                 }
@@ -346,7 +331,6 @@ var InternalProTable = function InternalProTable(props) {
 
   // 查询按钮
   var _onSearch = function onSearch() {
-    if (searchEvent) searchEvent();
     onRequest('search');
   };
 
@@ -526,8 +510,6 @@ var InternalProTable = function InternalProTable(props) {
         sticky: stickyRef.current || true,
         parentFieldName: parentFieldName,
         setData: setData,
-        onSearchAfter: onSearchAfter,
-        onSearchBefore: onSearchBefore,
         handlePageChange: handlePageChange
       });
     }
@@ -582,43 +564,56 @@ var InternalProTable = function InternalProTable(props) {
       style.backgroundColor = 'transparent';
     }
   };
-  return /*#__PURE__*/_jsxs("div", {
-    className: classNames(classPrefix, className, _defineProperty({}, 'dark-table', isDark)),
-    style: _objectSpread(_objectSpread({}, rootStyle), {}, {
-      overflow: (table === null || table === void 0 || (_table$scroll2 = table.scroll) === null || _table$scroll2 === void 0 ? void 0 : _table$scroll2.y) === 'auto' ? 'hidden' : 'unset'
-    }),
-    ref: containerRef,
-    children: [!(!formItems.length && !toolbar) && isAuth && /*#__PURE__*/_jsx(HeadComponent, {
-      form: form,
-      toolbar: newToolbar,
-      formItems: formItems,
-      expandForm: expandForm,
-      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) {
-          return setTableRowSize(e);
-        },
-        tableRowSize: tableRowSize,
-        onReset: _onReset,
-        columns: columns,
-        tableRef: tableRef,
-        onFullScreen: onFullScreen
-      }) : /*#__PURE__*/_jsx(_Fragment, {}),
-      children: newToolbarExtra
+
+  // 尺寸变化重设尺寸
+  var resizeFn = function resizeFn() {
+    var _table$scroll, _tableContentRef$curr;
+    if ((table === null || table === void 0 || (_table$scroll = table.scroll) === null || _table$scroll === void 0 ? void 0 : _table$scroll.y) === 'auto' && ((_tableContentRef$curr = tableContentRef.current) === null || _tableContentRef$curr === void 0 ? void 0 : _tableContentRef$curr.clientHeight) !== 0) {
+      var _tableRef$current;
+      (_tableRef$current = tableRef.current) === null || _tableRef$current === void 0 || _tableRef$current.onFixedThead();
+    }
+  };
+
+  // 监听容器尺寸变化
+  var onResize = _debounce(resizeFn, 500);
+  return /*#__PURE__*/_jsxs(_Fragment, {
+    children: [/*#__PURE__*/_jsx(CcsResizeObserver.Target, {
+      targetRef: tableContentRef,
+      onResize: onResize
     }), /*#__PURE__*/_jsxs("div", {
-      className: "".concat(classPrefix, "-table-content"),
-      style: _objectSpread(_objectSpread({}, styles === null || styles === void 0 ? void 0 : styles.table), {}, {
-        overflow: (table === null || table === void 0 || (_table$scroll3 = table.scroll) === null || _table$scroll3 === void 0 ? void 0 : _table$scroll3.y) === 'auto' ? 'hidden' : 'unset'
+      className: classNames(classPrefix, className, _defineProperty({}, 'dark-table', isDark)),
+      style: _objectSpread(_objectSpread({}, rootStyle), {}, {
+        overflow: (table === null || table === void 0 || (_table$scroll2 = table.scroll) === null || _table$scroll2 === void 0 ? void 0 : _table$scroll2.y) === 'auto' ? 'hidden' : 'unset'
       }),
-      ref: tableContentRef,
-      children: [renderTable(), children]
+      ref: containerRef,
+      children: [!(!formItems.length && !toolbar) && isAuth && /*#__PURE__*/_jsx(HeadComponent, {
+        form: form,
+        toolbar: newToolbar,
+        formItems: formItems,
+        expandForm: expandForm,
+        formInitValues: formInitValues,
+        formItemLabelWidth: props.formItemLabelWidth,
+        onSearch: _onSearch,
+        title: props.title,
+        tableOperation: (table === null || table === void 0 ? void 0 : table.hideOperation) !== true ? /*#__PURE__*/_jsx(TableOperation, {
+          onChangeRowSize: function onChangeRowSize(e) {
+            return setTableRowSize(e);
+          },
+          tableRowSize: tableRowSize,
+          onReset: _onReset,
+          columns: columns,
+          tableRef: tableRef,
+          onFullScreen: onFullScreen
+        }) : /*#__PURE__*/_jsx(_Fragment, {}),
+        children: newToolbarExtra
+      }), /*#__PURE__*/_jsxs("div", {
+        className: "".concat(classPrefix, "-table-content"),
+        style: _objectSpread(_objectSpread({}, styles === null || styles === void 0 ? void 0 : styles.table), {}, {
+          overflow: (table === null || table === void 0 || (_table$scroll3 = table.scroll) === null || _table$scroll3 === void 0 ? void 0 : _table$scroll3.y) === 'auto' ? 'hidden' : 'unset'
+        }),
+        ref: tableContentRef,
+        children: [renderTable(), children]
+      })]
     })]
   });
 };

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

@@ -9,7 +9,7 @@ export type TreeInstance<T> = {
     onRequestTree: (query: any, record: T | any) => void;
     onExpandKeys: (ids: string[]) => void;
 };
-type TreeTableProps<T> = Pick<CcsProTableProps<T>, 'table' | 'onSearchBefore' | 'parentFieldName' | 'onSearchAfter' | 'leafNode'> & {
+type TreeTableProps<T> = Pick<CcsProTableProps<T>, 'table' | 'parentFieldName' | 'leafNode'> & {
     data: CCS.TableData<T>;
     sticky: boolean | TableSticky;
     tableRowSize: TableProps['size'];

package/es/pro-table/tree.js

@@ -34,8 +34,6 @@ var TableTree = function TableTree(props) {
     tableContentRef = props.tableContentRef,
     parentFieldName = props.parentFieldName,
     handlePageChange = props.handlePageChange,
-    onSearchAfter = props.onSearchAfter,
-    onSearchBefore = props.onSearchBefore,
     setData = props.setData;
   // async tree expand key
   var _useState = useState([]),
@@ -60,9 +58,7 @@ var TableTree = function TableTree(props) {
       var query,
         record,
         params,
-        newParams,
         requestResult,
-        newReqResult,
         dataSource,
         _args = arguments;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
@@ -75,8 +71,7 @@ var TableTree = function TableTree(props) {
               params[parentFieldName] = record[rowKey];
             }
 
-            // onSearchBefore 请求前回传参数，可以在父组件进行修改
-            newParams = onSearchBefore(params); // 发起请求
+            // 发起请求
             setData(function (d) {
               return _objectSpread(_objectSpread({}, d), {}, {
                 loading: true
@@ -84,20 +79,19 @@ var TableTree = function TableTree(props) {
             });
             _context.t0 = httpRequest;
             if (!_context.t0) {
-              _context.next = 11;
+              _context.next = 10;
               break;
             }
-            _context.next = 10;
-            return httpRequest(_objectSpread({}, newParams));
-          case 10:
+            _context.next = 9;
+            return httpRequest(params);
+          case 9:
             _context.t0 = _context.sent;
-          case 11:
+          case 10:
             requestResult = _context.t0;
             // 请求结果
             if (requestResult) {
-              // onSearchAfter 处理请求结果
-              newReqResult = onSearchAfter(requestResult); // 获取table数据
-              dataSource = getDataFromFields(newReqResult, fieldNames.dataSource); // 判断非叶子节点，添加children
+              // 获取table数据
+              dataSource = getDataFromFields(requestResult, fieldNames.dataSource); // 判断非叶子节点，添加children
               if (leafNode && dataSource && Array.isArray(dataSource)) {
                 dataSource.forEach(function (d) {
                   if (typeof leafNode === 'string' && !d[leafNode]) {
@@ -132,7 +126,7 @@ var TableTree = function TableTree(props) {
                 });
               });
             }
-          case 13:
+          case 12:
           case "end":
             return _context.stop();
         }

package/es/resize-observer.d.ts

@@ -1,4 +1,4 @@
-/// <reference types="react" />
+import React from 'react';
 type Size = {
     width: number;
     height: number;
@@ -9,7 +9,7 @@ type PropsType = {
 };
 declare function ResizeObserver({ onResize }: Omit<PropsType, 'targetRef'>): import("react/jsx-runtime").JSX.Element;
 declare namespace ResizeObserver {
-    var Target: typeof ResizeObserverTarget;
+    var Target: React.MemoExoticComponent<typeof ResizeObserverTarget>;
 }
 declare function ResizeObserverTarget({ targetRef, onResize }: PropsType): null;
 export default ResizeObserver;

package/es/resize-observer.js

@@ -1,5 +1,5 @@
 import { useSize } from 'ahooks';
-import { useEffect, useRef } from 'react';
+import React, { useEffect, useRef } from 'react';
 import { jsx as _jsx } from "react/jsx-runtime";
 function ResizeObserver(_ref) {
   var onResize = _ref.onResize;
@@ -33,5 +33,5 @@ function ResizeObserverTarget(_ref2) {
   }, [size === null || size === void 0 ? void 0 : size.height, size === null || size === void 0 ? void 0 : size.width]);
   return null;
 }
-ResizeObserver.Target = ResizeObserverTarget;
+ResizeObserver.Target = /*#__PURE__*/React.memo(ResizeObserverTarget);
 export default ResizeObserver;

package/es/table/index.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="react" />
 import { CcsProTableProps, CcsTableProps } from '../pro-table/table';
 import './index.less';
-type TableProps<T> = Omit<CcsTableProps<T>, 'request' | 'requestParam' | 'title'> & Pick<CcsProTableProps<T>, 'showNumber'> & {
+type TableProps<T> = Omit<CcsTableProps<T>, 'request' | 'title'> & Pick<CcsProTableProps<T>, 'showNumber'> & {
     title?: any;
     tableRef?: React.MutableRefObject<TableRefType | undefined>;
     tableContentRef: React.RefObject<HTMLDivElement>;

package/es/table/index.js

@@ -79,34 +79,41 @@ var CustomTable = function CustomTable(props) {
           }
         }
         if (!tableTarget) return;
-        var tableBody = tableTarget.getElementsByClassName('ant-table-body')[0];
-        if (!tableBody) return;
-        var headerHeight = 0,
-          pageHeight = 0,
-          footerHeight = 0,
-          summaryHeight = 0;
+
+        // 容器最大高度
+        var maxHeight = (_tableContentRef$curr = tableContentRef.current) === null || _tableContentRef$curr === void 0 ? void 0 : _tableContentRef$curr.clientHeight;
+
+        // 计算所有dom高度
+        var tableEle = tableTarget.getElementsByClassName('ant-table')[0];
+        var childHeights = [];
+        var antTablebody = undefined;
+        tableEle.childNodes.forEach(function (e) {
+          if (e.classList.contains('ant-table-container')) {
+            e.childNodes.forEach(function (node) {
+              if (node.classList.contains('ant-table-body')) {
+                antTablebody = node;
+              } else {
+                childHeights.push(node.clientHeight || 0);
+              }
+            });
+          } else {
+            childHeights.push(e.clientHeight || 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;
+          childHeights.push(_pagination[0].clientHeight);
         }
 
-        // 计算table数据区高度
-        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");
+        // 计算body滚动高度
+        if (antTablebody) {
+          var scrollHeight = maxHeight - childHeights.reduce(function (c, s) {
+            return c + s;
+          }, 0);
+          antTablebody.style.height = "".concat(scrollHeight, "px");
+        }
       }
     }, {
       wait: 500,

package/es/table/index.less

@@ -133,12 +133,16 @@
 .ccs-tabs-auto-height {
   flex: 1 1 auto;
   overflow: hidden;
+
   > .ant-tabs-content-holder {
     height: 100%;
+
     > .ant-tabs-content {
       height: 100%;
+
       > div {
         height: 100%;
+
         > .ccs-pl {
           height: 100%;
         }

package/package.json

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