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

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

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

package/es/pro-table/head.js

@@ -27,7 +27,6 @@ function HeadComponent(_ref) {
     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),
@@ -169,8 +168,8 @@ function HeadComponent(_ref) {
   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: [allFormItems.length > 0 && /*#__PURE__*/_jsxs(_Fragment, {
+  return /*#__PURE__*/_jsx(_Fragment, {
+    children: allFormItems.length > 0 && /*#__PURE__*/_jsxs(_Fragment, {
       children: [/*#__PURE__*/_jsx(CcsResizeObserver.Target, {
         targetRef: formItemsRef,
         onResize: onResize
@@ -211,7 +210,7 @@ function HeadComponent(_ref) {
           })]
         })
       })]
-    }), children]
+    })
   });
 }
 export default HeadComponent;

package/es/pro-table/table.js

@@ -633,8 +633,7 @@ var InternalProTable = function InternalProTable(props) {
           formItemLabelWidth: props.formItemLabelWidth,
           onSearch: _onSearch,
           title: props.title,
-          tableOperation: renderTableOperation,
-          children: toolbarExtra
+          tableOperation: renderTableOperation
         }), (toolbar || formItems.length === 0 && renderTableOperation) && /*#__PURE__*/_jsxs(Card, {
           styles: {
             cover: {
@@ -652,7 +651,8 @@ var InternalProTable = function InternalProTable(props) {
             borderRadius: 0,
             borderLeft: 0,
             borderBottom: 0,
-            borderRight: 0
+            borderRight: 0,
+            borderTop: formItems.length === 0 ? 0 : undefined
           },
           children: [/*#__PURE__*/_jsx("div", {
             style: {
@@ -665,7 +665,7 @@ var InternalProTable = function InternalProTable(props) {
             },
             children: renderTableOperation
           })]
-        }), children]
+        }), toolbarExtra]
       }), /*#__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-28",
+  "version": "2.3.6-beta-29",
   "description": "",
   "license": "MIT",
   "author": {