@ccs-ui/rc-pro 2.3.6-beta-26 → 2.3.6-beta-28

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

@@ -1,16 +1,17 @@
-import { FormInstance } from 'antd/lib/form';
-import { ReactElement } from 'react';
+import { FormInstance } from 'antd';
+import React, { ReactElement } from 'react';
 import { PropsWithElementChildren } from '../ccs';
 import { CcsProTableProps } from './table';
 type PropsType<T> = Pick<CcsProTableProps<T>, 'toolbar' | 'formItems' | 'formInitValues' | 'expandForm' | 'title' | 'formItemLabelWidth'> & PropsWithElementChildren & {
     /** 更多查询条件 */
     hasMore?: boolean;
-    form: FormInstance<any>;
     /** table 操作栏 */
-    tableOperation: ReactElement;
+    tableOperation?: ReactElement;
     /** 查询 */
     onSearch: () => void;
+    /** form */
+    formRef: React.RefObject<FormInstance<any>>;
 };
 /** 操作按钮、查询，重置、列筛选、 */
-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>({ title, toolbar, expandForm, formItems, formInitValues, formItemLabelWidth, tableOperation, formRef, children, onSearch, }: PropsType<T>): import("react/jsx-runtime").JSX.Element;
 export default HeadComponent;

package/es/pro-table/head.js

@@ -8,7 +8,7 @@ import { DownOutlined, UpOutlined } from '@ant-design/icons';
 import { useUpdateEffect } from 'ahooks';
 import { Button, Card, Form, theme } from 'antd';
 import _debounce from 'lodash.debounce';
-import React, { useEffect, useMemo, useRef, useState } from 'react';
+import React, { useEffect, useImperativeHandle, useMemo, useRef, useState } from 'react';
 import { CcsResizeObserver } from '..';
 import { getShowDpends } from "./_utils";
 import HeadFormItem from "./form-item";
@@ -17,10 +17,8 @@ import { jsxs as _jsxs } from "react/jsx-runtime";
 import { Fragment as _Fragment } from "react/jsx-runtime";
 /** 操作按钮、查询，重置、列筛选、 */
 function HeadComponent(_ref) {
-  var form = _ref.form,
-    title = _ref.title,
+  var title = _ref.title,
     toolbar = _ref.toolbar,
-    children = _ref.children,
     _ref$expandForm = _ref.expandForm,
     expandForm = _ref$expandForm === void 0 ? false : _ref$expandForm,
     _ref$formItems = _ref.formItems,
@@ -28,12 +26,15 @@ function HeadComponent(_ref) {
     formInitValues = _ref.formInitValues,
     formItemLabelWidth = _ref.formItemLabelWidth,
     tableOperation = _ref.tableOperation,
+    formRef = _ref.formRef,
+    children = _ref.children,
     onSearch = _ref.onSearch;
+  var _Form$useForm = Form.useForm(),
+    _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
+    form = _Form$useForm2[0];
   var formItemsRef = useRef(null);
-
   // 根据位置判断是否换行ref
   var endItemRef = useRef(null);
-
   // 查询条件是否展开
   var _useState = useState(expandForm),
     _useState2 = _slicedToArray(_useState, 2),
@@ -46,6 +47,9 @@ function HeadComponent(_ref) {
   useUpdateEffect(function () {
     setIsExpand(expandForm);
   }, [expandForm]);
+  useImperativeHandle(formRef, function () {
+    return form;
+  });
 
   // 处理form item 依赖
   var allFormItems = useMemo(function () {
@@ -99,9 +103,6 @@ function HeadComponent(_ref) {
       onClick: function onClick() {
         return form.submit();
       },
-      style: {
-        marginLeft: !hasMore ? 10 : undefined
-      },
       children: "\u67E5\u8BE2"
     }), toolbar ? null : tableOperation]
   });
@@ -210,36 +211,6 @@ function HeadComponent(_ref) {
           })]
         })
       })]
-    }), toolbar && /*#__PURE__*/_jsxs(Card, {
-      styles: {
-        cover: {
-          borderRadius: 0
-        },
-        body: {
-          display: 'flex',
-          justifyContent: 'space-between',
-          width: '100%',
-          padding: '12px 16px',
-          alignContent: 'center'
-        }
-      },
-      style: {
-        borderRadius: 0,
-        borderLeft: 0,
-        borderBottom: 0,
-        borderRight: 0
-      },
-      children: [/*#__PURE__*/_jsx("div", {
-        style: {
-          flex: '1 1 auto'
-        },
-        children: toolbar
-      }), /*#__PURE__*/_jsx("div", {
-        style: {
-          flex: '0 0 auto'
-        },
-        children: tableOperation
-      })]
     }), children]
   });
 }

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

@@ -73,6 +73,8 @@ export type CcsProTableProps<RecordType> = Pick<PropsWithCss, 'className'> & Pro
     toolbar?: ReactElement;
     /** 操作按钮扩展 */
     toolbarExtra?: ReactElement;
+    /** 边框 */
+    bordered?: boolean;
     /** 展开查询条件，默认false */
     expandForm?: boolean;
     /** table 数据区域 */

package/es/pro-table/table.js

@@ -18,7 +18,7 @@ function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" !=
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import CcsUtils from '@ccs-ui/utils';
 import { useUpdateEffect } from 'ahooks';
-import { theme as antTheme, Empty, Form } from 'antd';
+import { theme as antTheme, Card, Empty } from 'antd';
 import classNames from 'classnames';
 import _debounce from 'lodash.debounce';
 import React, { useEffect, useImperativeHandle, useMemo, useRef, useState } from 'react';
@@ -32,8 +32,8 @@ import "./index.less";
 import TableOperation from "./operation";
 import TableTree from "./tree";
 import { jsx as _jsx } from "react/jsx-runtime";
-import { Fragment as _Fragment } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
+import { Fragment as _Fragment } from "react/jsx-runtime";
 function onSetObj(target, paths, value) {
   while (paths.length > 0) {
     var path = paths.shift();
@@ -75,6 +75,7 @@ var InternalProTable = function InternalProTable(props) {
     _props$formItems = props.formItems,
     formItems = _props$formItems === void 0 ? [] : _props$formItems,
     leafNode = props.leafNode,
+    bordered = props.bordered,
     parentFieldName = props.parentFieldName,
     _props$formInitValues = props.formInitValues,
     formInitValues = _props$formInitValues === void 0 ? {} : _props$formInitValues;
@@ -122,9 +123,7 @@ var InternalProTable = function InternalProTable(props) {
   // table ref
   var tableRef = useRef();
   // 查询form
-  var _Form$useForm = Form.useForm(),
-    _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
-    form = _Form$useForm2[0];
+  var formRef = useRef(null);
   // table data
   var _useState = useState({
       total: 0,
@@ -166,157 +165,150 @@ var InternalProTable = function InternalProTable(props) {
 
   // 获取数据
   var onRequest = /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(eventType) {
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(eventType) {
+      var _formRef$current, _props$table;
       var pageNo,
         pageSize,
         record,
-        _args2 = arguments;
-      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-        while (1) switch (_context2.prev = _context2.next) {
+        formValues,
+        fieldNames,
+        _fieldNames$requestPa,
+        _fieldNames$requestPa2,
+        fsFilters,
+        _fieldNames$requestPa3,
+        fsPageNo,
+        _fieldNames$requestPa4,
+        fsPageSize,
+        _fieldNames$requestPa5,
+        fsOrderProps,
+        fsQuery,
+        params,
+        _filtersRef$current,
+        filters,
+        orderProps,
+        _treeRef$current,
+        requestResult,
+        dataSource,
+        total,
+        _args = arguments;
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
           case 0:
-            pageNo = _args2.length > 1 && _args2[1] !== undefined ? _args2[1] : 1;
-            pageSize = _args2.length > 2 && _args2[2] !== undefined ? _args2[2] : (pagination ? pagination.defaultPageSize : 10) || 10;
-            record = _args2.length > 3 ? _args2[3] : undefined;
+            pageNo = _args.length > 1 && _args[1] !== undefined ? _args[1] : 1;
+            pageSize = _args.length > 2 && _args[2] !== undefined ? _args[2] : (pagination ? pagination.defaultPageSize : 10) || 10;
+            record = _args.length > 3 ? _args[3] : undefined;
             if (!(!isAuth || !httpRequest)) {
-              _context2.next = 5;
+              _context.next = 5;
               break;
             }
-            return _context2.abrupt("return");
+            return _context.abrupt("return");
           case 5:
-            // 构建查询条件:表单数据、请求额外参数、分页参数、其他参数
-            form.validateFields().then( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-              var _props$table;
-              var formValues,
-                fieldNames,
-                _fieldNames$requestPa,
-                _fieldNames$requestPa2,
-                fsFilters,
-                _fieldNames$requestPa3,
-                fsPageNo,
-                _fieldNames$requestPa4,
-                fsPageSize,
-                _fieldNames$requestPa5,
-                fsOrderProps,
-                fsQuery,
-                params,
-                _filtersRef$current,
-                filters,
-                orderProps,
-                _treeRef$current,
-                requestResult,
-                dataSource,
-                total,
-                _args = arguments;
-              return _regeneratorRuntime().wrap(function _callee$(_context) {
-                while (1) switch (_context.prev = _context.next) {
-                  case 0:
-                    formValues = _args.length > 0 && _args[0] !== undefined ? _args[0] : {};
-                    // 接口字段指定
-                    fieldNames = _objectSpread(_objectSpread({}, globalFieldNames), (_props$table = props.table) === null || _props$table === void 0 ? void 0 : _props$table.fieldNames); // 格式化条件
-                    if (formatFormItems.length) {
-                      Object.keys(formValues).forEach(function (k) {
-                        if (formValues[k] !== undefined) {
-                          var s = formatFormItems.find(function (f) {
-                            return f.name === k;
-                          });
-                          if (s) formValues[k] = s.onFormat && s.onFormat(formValues[k]);
-                        }
-                      });
-                    }
-                    _fieldNames$requestPa = fieldNames.requestParam, _fieldNames$requestPa2 = _fieldNames$requestPa.filters, fsFilters = _fieldNames$requestPa2 === void 0 ? ['filters'] : _fieldNames$requestPa2, _fieldNames$requestPa3 = _fieldNames$requestPa.pageNo, fsPageNo = _fieldNames$requestPa3 === void 0 ? ['pageNo'] : _fieldNames$requestPa3, _fieldNames$requestPa4 = _fieldNames$requestPa.pageSize, fsPageSize = _fieldNames$requestPa4 === void 0 ? ['pageSize'] : _fieldNames$requestPa4, _fieldNames$requestPa5 = _fieldNames$requestPa.orderProps, fsOrderProps = _fieldNames$requestPa5 === void 0 ? ['orderProps'] : _fieldNames$requestPa5, fsQuery = _fieldNames$requestPa.query; // 构建请求参数
-                    params = {
-                      eventType: eventType
-                    };
-                    if (fsQuery && fsQuery.length > 0) {
-                      onSetObj(params, fsQuery, _objectSpread(_objectSpread({}, requestParam), formValues));
-                    } else {
-                      params = _objectSpread(_objectSpread({}, requestParam), formValues);
-                    }
+            _context.next = 7;
+            return (_formRef$current = formRef.current) === null || _formRef$current === void 0 ? void 0 : _formRef$current.validateFields();
+          case 7:
+            formValues = _context.sent;
+            // 接口字段指定
+            fieldNames = _objectSpread(_objectSpread({}, globalFieldNames), (_props$table = props.table) === null || _props$table === void 0 ? void 0 : _props$table.fieldNames); // 格式化条件
+            if (formatFormItems.length) {
+              Object.keys(formValues).forEach(function (k) {
+                if (formValues[k] !== undefined) {
+                  var s = formatFormItems.find(function (f) {
+                    return f.name === k;
+                  });
+                  if (s) formValues[k] = s.onFormat && s.onFormat(formValues[k]);
+                }
+              });
+            }
 
-                    // 分页
-                    if (pagination !== false) {
-                      onSetObj(params, fsPageNo, pageNo);
-                      onSetObj(params, fsPageSize, pageSize);
-                    }
+            // 请求字段
+            _fieldNames$requestPa = fieldNames.requestParam, _fieldNames$requestPa2 = _fieldNames$requestPa.filters, fsFilters = _fieldNames$requestPa2 === void 0 ? ['filters'] : _fieldNames$requestPa2, _fieldNames$requestPa3 = _fieldNames$requestPa.pageNo, fsPageNo = _fieldNames$requestPa3 === void 0 ? ['pageNo'] : _fieldNames$requestPa3, _fieldNames$requestPa4 = _fieldNames$requestPa.pageSize, fsPageSize = _fieldNames$requestPa4 === void 0 ? ['pageSize'] : _fieldNames$requestPa4, _fieldNames$requestPa5 = _fieldNames$requestPa.orderProps, fsOrderProps = _fieldNames$requestPa5 === void 0 ? ['orderProps'] : _fieldNames$requestPa5, fsQuery = _fieldNames$requestPa.query; // 构建请求参数
+            params = {
+              eventType: eventType
+            };
+            if (fsQuery && fsQuery.length > 0) {
+              onSetObj(params, fsQuery, _objectSpread(_objectSpread(_objectSpread({}, requestParam), formInitValues), formValues));
+            } else {
+              params = _objectSpread(_objectSpread({}, requestParam), formValues);
+            }
 
-                    // 列过滤或排序参数
-                    _filtersRef$current = filtersRef.current, filters = _filtersRef$current.filters, orderProps = _filtersRef$current.orderProps;
-                    if (Object.keys(filters).length > 0) {
-                      onSetObj(params, fsFilters, filters);
-                    }
-                    if (orderProps.length > 0) {
-                      onSetObj(params, fsOrderProps, orderProps);
-                    }
+            // 分页
+            if (pagination !== false) {
+              onSetObj(params, fsPageNo, pageNo);
+              onSetObj(params, fsPageSize, pageSize);
+            }
 
-                    // 异步树
-                    if (!parentFieldName) {
-                      _context.next = 13;
-                      break;
-                    }
-                    (_treeRef$current = treeRef.current) === null || _treeRef$current === void 0 || _treeRef$current.onRequestTree(params.query, record);
-                    return _context.abrupt("return");
-                  case 13:
-                    // 发起请求
-                    setData(function (d) {
-                      return _objectSpread(_objectSpread({}, d), {}, {
-                        loading: true
-                      });
-                    });
-                    _context.next = 16;
-                    return httpRequest(params);
-                  case 16:
-                    requestResult = _context.sent;
-                    if (!requestResult) {
-                      _context.next = 26;
-                      break;
-                    }
-                    // 获取table数据
-                    dataSource = getDataFromFields(requestResult, fieldNames.dataSource);
-                    total = getDataFromFields(requestResult, fieldNames.total);
-                    if (!(total === undefined || dataSource === undefined)) {
-                      _context.next = 23;
-                      break;
-                    }
-                    setData({
-                      dataSource: dataSource,
-                      pageSize: pageSize,
-                      current: pageNo,
-                      total: total,
-                      loading: false
-                    });
-                    return _context.abrupt("return");
-                  case 23:
-                    // 当前页无数据，返回上一页
-                    if (!dataSource.length && pageNo !== 1) {
-                      onRequest('reload', pageNo - 1);
-                    } else {
-                      setData({
-                        current: pageNo,
-                        pageSize: pageSize,
-                        loading: false,
-                        dataSource: dataSource,
-                        total: total || 0
-                      });
-                    }
-                    _context.next = 27;
-                    break;
-                  case 26:
-                    setData(function (d) {
-                      return _objectSpread(_objectSpread({}, d), {}, {
-                        loading: false
-                      });
-                    });
-                  case 27:
-                  case "end":
-                    return _context.stop();
-                }
-              }, _callee);
-            }))).catch(function () {});
-          case 6:
+            // 列过滤或排序参数
+            _filtersRef$current = filtersRef.current, filters = _filtersRef$current.filters, orderProps = _filtersRef$current.orderProps;
+            if (Object.keys(filters).length > 0) {
+              onSetObj(params, fsFilters, filters);
+            }
+            if (orderProps.length > 0) {
+              onSetObj(params, fsOrderProps, orderProps);
+            }
+
+            // 异步树
+            if (!parentFieldName) {
+              _context.next = 20;
+              break;
+            }
+            (_treeRef$current = treeRef.current) === null || _treeRef$current === void 0 || _treeRef$current.onRequestTree(params.query, record);
+            return _context.abrupt("return");
+          case 20:
+            // 发起请求
+            setData(function (d) {
+              return _objectSpread(_objectSpread({}, d), {}, {
+                loading: true
+              });
+            });
+            _context.next = 23;
+            return httpRequest(params);
+          case 23:
+            requestResult = _context.sent;
+            if (!requestResult) {
+              _context.next = 33;
+              break;
+            }
+            // 获取table数据
+            dataSource = getDataFromFields(requestResult, fieldNames.dataSource);
+            total = getDataFromFields(requestResult, fieldNames.total);
+            if (!(total === undefined || dataSource === undefined)) {
+              _context.next = 30;
+              break;
+            }
+            setData({
+              dataSource: dataSource,
+              pageSize: pageSize,
+              current: pageNo,
+              total: total,
+              loading: false
+            });
+            return _context.abrupt("return");
+          case 30:
+            // 当前页无数据，返回上一页
+            if (!dataSource.length && pageNo !== 1) {
+              onRequest('reload', pageNo - 1);
+            } else {
+              setData({
+                current: pageNo,
+                pageSize: pageSize,
+                loading: false,
+                dataSource: dataSource,
+                total: total || 0
+              });
+            }
+            _context.next = 34;
+            break;
+          case 33:
+            setData(function (d) {
+              return _objectSpread(_objectSpread({}, d), {}, {
+                loading: false
+              });
+            });
+          case 34:
           case "end":
-            return _context2.stop();
+            return _context.stop();
         }
-      }, _callee2);
+      }, _callee);
     }));
     return function onRequest(_x) {
       return _ref2.apply(this, arguments);
@@ -376,8 +368,9 @@ var InternalProTable = function InternalProTable(props) {
 
   // 重置
   var _onReset = function onReset() {
+    var _formRef$current2;
     if (selectedRows.length > 0) setSelectedRows([]);
-    form === null || form === void 0 || form.resetFields();
+    (_formRef$current2 = formRef.current) === null || _formRef$current2 === void 0 || _formRef$current2.resetFields();
     // 清空columns显示filter和sort值
     columns === null || columns === void 0 || columns.forEach(function (c) {
       if (c.filterDropdown || c.filters) {
@@ -400,10 +393,11 @@ var InternalProTable = function InternalProTable(props) {
 
   // form 数据 查询，重载，重置方法
   useImperativeHandle(proRef, function () {
+    var _formRef$current3;
     return {
       data: data,
       selectedRows: selectedRows,
-      formValues: _objectSpread(_objectSpread({}, form.getFieldsValue()), filtersRef.current),
+      formValues: _objectSpread(_objectSpread({}, (_formRef$current3 = formRef.current) === null || _formRef$current3 === void 0 ? void 0 : _formRef$current3.getFieldsValue()), filtersRef.current),
       onSearch: function onSearch() {
         _onSearch();
       },
@@ -507,10 +501,10 @@ var InternalProTable = function InternalProTable(props) {
     }
 
     // 选择,只传入一个type参数或不传，封装选择行为
-    var _ref4 = table.rowSelection || {},
-      _ref4$type = _ref4.type,
-      type = _ref4$type === void 0 ? 'checkbox' : _ref4$type,
-      restSelection = _objectWithoutProperties(_ref4, _excluded);
+    var _ref3 = table.rowSelection || {},
+      _ref3$type = _ref3.type,
+      type = _ref3$type === void 0 ? 'checkbox' : _ref3$type,
+      restSelection = _objectWithoutProperties(_ref3, _excluded);
     var hasSelection = table.rowSelection && CcsUtils.isEmpty(restSelection);
     var rowSelection = hasSelection ? {
       type: type,
@@ -571,31 +565,19 @@ var InternalProTable = function InternalProTable(props) {
       } : undefined
     }));
   };
-  var newToolbar = toolbar && /*#__PURE__*/_jsx(TableSelectionContext.Provider, {
-    value: {
-      selectedRows: selectedRows
-    },
-    children: toolbar
-  });
-  var newToolbarExtra = /*#__PURE__*/_jsx(TableSelectionContext.Provider, {
-    value: {
-      selectedRows: selectedRows
-    },
-    children: toolbarExtra
-  });
   var _antTheme$useToken = antTheme.useToken(),
     token = _antTheme$useToken.token;
   var rootStyle = styles.root || {};
-  if (table !== null && table !== void 0 && table.bordered) {
+  if (bordered) {
     rootStyle = _objectSpread({
       border: "1px solid ".concat(token.colorBorderSecondary),
       borderRadius: 4
     }, rootStyle);
   }
   var onFullScreen = function onFullScreen(isFull) {
-    var _ref5 = containerRef.current || {},
-      classList = _ref5.classList,
-      style = _ref5.style;
+    var _ref4 = containerRef.current || {},
+      classList = _ref4.classList,
+      style = _ref4.style;
     if (isFull) {
       classList === null || classList === void 0 || classList.add('css-table-full');
       style.backgroundColor = token.colorBgContainer;
@@ -616,6 +598,18 @@ var InternalProTable = function InternalProTable(props) {
 
   // 监听容器尺寸变化
   var onResize = _debounce(resizeFn, 500);
+
+  // table 操作按钮
+  var renderTableOperation = (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
+  }) : undefined;
   return /*#__PURE__*/_jsxs(_Fragment, {
     children: [/*#__PURE__*/_jsx(CcsResizeObserver.Target, {
       targetRef: tableContentRef,
@@ -626,26 +620,52 @@ var InternalProTable = function InternalProTable(props) {
         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,
-        title: props.title,
-        tableOperation: (table === null || table === void 0 ? void 0 : table.hideOperation) !== true ? /*#__PURE__*/_jsx(TableOperation, {
-          onChangeRowSize: function onChangeRowSize(e) {
-            return setTableRowSize(e);
+      children: [isAuth && /*#__PURE__*/_jsxs(TableSelectionContext.Provider, {
+        value: {
+          selectedRows: selectedRows
+        },
+        children: [/*#__PURE__*/_jsx(HeadComponent, {
+          formRef: formRef,
+          toolbar: toolbar,
+          formItems: formItems,
+          expandForm: expandForm,
+          formInitValues: formInitValues,
+          formItemLabelWidth: props.formItemLabelWidth,
+          onSearch: _onSearch,
+          title: props.title,
+          tableOperation: renderTableOperation,
+          children: toolbarExtra
+        }), (toolbar || formItems.length === 0 && renderTableOperation) && /*#__PURE__*/_jsxs(Card, {
+          styles: {
+            cover: {
+              borderRadius: 0
+            },
+            body: {
+              display: 'flex',
+              justifyContent: 'space-between',
+              width: '100%',
+              padding: '12px 16px',
+              alignContent: 'center'
+            }
+          },
+          style: {
+            borderRadius: 0,
+            borderLeft: 0,
+            borderBottom: 0,
+            borderRight: 0
           },
-          tableRowSize: tableRowSize,
-          onReset: _onReset,
-          columns: columns,
-          tableRef: tableRef,
-          onFullScreen: onFullScreen
-        }) : /*#__PURE__*/_jsx(_Fragment, {}),
-        children: newToolbarExtra
+          children: [/*#__PURE__*/_jsx("div", {
+            style: {
+              flex: '1 1 auto'
+            },
+            children: toolbar
+          }), /*#__PURE__*/_jsx("div", {
+            style: {
+              flex: '0 0 auto'
+            },
+            children: renderTableOperation
+          })]
+        }), children]
       }), /*#__PURE__*/_jsxs("div", {
         className: "".concat(classPrefix, "-table-content"),
         style: _objectSpread(_objectSpread({}, styles === null || styles === void 0 ? void 0 : styles.table), {}, {

package/package.json

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