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

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' | '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>({ 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

@@ -6,7 +6,7 @@ function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" !=
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { DownOutlined, UpOutlined } from '@ant-design/icons';
 import { useUpdateEffect } from 'ahooks';
-import { Button, Card, Form, theme } from 'antd';
+import { Button, Form, theme } from 'antd';
 import _debounce from 'lodash.debounce';
 import React, { useEffect, useImperativeHandle, useMemo, useRef, useState } from 'react';
 import { CcsResizeObserver } from '..';
@@ -17,8 +17,7 @@ import { jsxs as _jsxs } from "react/jsx-runtime";
 import { Fragment as _Fragment } from "react/jsx-runtime";
 /** 操作按钮、查询，重置、列筛选、 */
 function HeadComponent(_ref) {
-  var title = _ref.title,
-    toolbar = _ref.toolbar,
+  var toolbar = _ref.toolbar,
     _ref$expandForm = _ref.expandForm,
     expandForm = _ref$expandForm === void 0 ? false : _ref$expandForm,
     _ref$formItems = _ref.formItems,
@@ -27,7 +26,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),
@@ -168,50 +166,35 @@ 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: [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
-      }), /*#__PURE__*/_jsx(Card, {
-        ref: adaptationRef,
-        className: "ccs-pl-adaptation",
-        style: {
-          boxShadow: 'none'
-        },
-        styles: {
-          body: {
-            padding: 16
-          }
-        },
-        bordered: false,
-        title: title,
-        children: /*#__PURE__*/_jsxs(Form, {
-          initialValues: formInitValues,
-          form: form,
-          onFinish: onSearch,
-          layout: "inline",
-          style: formStyles,
-          children: [/*#__PURE__*/_jsxs("div", {
-            style: {
-              justifyContent: isExpand && hasMore ? 'flex-start' : 'flex-end',
-              height: isExpand ? 'auto' : controlHeight
-            },
-            className: "ccs-pl-adaptation-form",
-            ref: formItemsRef,
-            children: [renderFormItems(), /*#__PURE__*/_jsx("div", {
-              ref: endItemRef
-            }), isExpand && renderSearchBtn]
-          }), !isExpand && /*#__PURE__*/_jsx("div", {
-            style: {
-              flex: '0 0 auto'
-            },
-            children: renderSearchBtn
-          })]
-        })
+      }), /*#__PURE__*/_jsxs(Form, {
+        initialValues: formInitValues,
+        form: form,
+        onFinish: onSearch,
+        layout: "inline",
+        style: formStyles,
+        children: [/*#__PURE__*/_jsxs("div", {
+          style: {
+            justifyContent: isExpand && hasMore ? 'flex-start' : 'flex-end',
+            height: isExpand ? 'auto' : controlHeight
+          },
+          className: "ccs-pl-adaptation-form",
+          ref: formItemsRef,
+          children: [renderFormItems(), /*#__PURE__*/_jsx("div", {
+            ref: endItemRef
+          }), isExpand && renderSearchBtn]
+        }), !isExpand && /*#__PURE__*/_jsx("div", {
+          style: {
+            flex: '0 0 auto'
+          },
+          children: renderSearchBtn
+        })]
       })]
-    }), children]
+    })
   });
 }
 export default HeadComponent;

package/es/pro-table/table.js

@@ -610,6 +610,7 @@ var InternalProTable = function InternalProTable(props) {
     tableRef: tableRef,
     onFullScreen: onFullScreen
   }) : undefined;
+  var hasFormItem = formItems.length > 0;
   return /*#__PURE__*/_jsxs(_Fragment, {
     children: [/*#__PURE__*/_jsx(CcsResizeObserver.Target, {
       targetRef: tableContentRef,
@@ -620,22 +621,33 @@ 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: [isAuth && /*#__PURE__*/_jsxs(TableSelectionContext.Provider, {
+      children: [/*#__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,
+        children: [/*#__PURE__*/_jsx(Card, {
+          className: "ccs-pl-adaptation",
+          style: {
+            boxShadow: 'none'
+          },
+          styles: {
+            body: {
+              padding: hasFormItem ? 16 : 0
+            }
+          },
+          bordered: false,
           title: props.title,
-          tableOperation: renderTableOperation,
-          children: toolbarExtra
-        }), (toolbar || formItems.length === 0 && renderTableOperation) && /*#__PURE__*/_jsxs(Card, {
+          children: hasFormItem && /*#__PURE__*/_jsx(HeadComponent, {
+            formRef: formRef,
+            toolbar: toolbar,
+            formItems: formItems,
+            expandForm: expandForm,
+            formInitValues: formInitValues,
+            formItemLabelWidth: props.formItemLabelWidth,
+            onSearch: _onSearch,
+            tableOperation: renderTableOperation
+          })
+        }), (toolbar || !hasFormItem && renderTableOperation) && /*#__PURE__*/_jsxs(Card, {
           styles: {
             cover: {
               borderRadius: 0
@@ -652,7 +664,8 @@ var InternalProTable = function InternalProTable(props) {
             borderRadius: 0,
             borderLeft: 0,
             borderBottom: 0,
-            borderRight: 0
+            borderRight: 0,
+            borderTop: !hasFormItem ? 0 : undefined
           },
           children: [/*#__PURE__*/_jsx("div", {
             style: {
@@ -665,7 +678,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-30",
   "description": "",
   "license": "MIT",
   "author": {