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

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

@@ -6,12 +6,12 @@ type PropsType<T> = Pick<CcsProTableProps<T>, 'toolbar' | 'formItems' | 'formIni
     /** 更多查询条件 */
     hasMore?: boolean;
     /** table 操作栏 */
-    tableOperation: ReactElement;
+    tableOperation?: ReactElement;
     /** 查询 */
     onSearch: () => void;
     /** form */
     formRef: React.RefObject<FormInstance<any>>;
 };
 /** 操作按钮、查询，重置、列筛选、 */
-declare function HeadComponent<T>({ title, toolbar, expandForm, formItems, formInitValues, formItemLabelWidth, tableOperation, formRef, 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

@@ -27,15 +27,14 @@ 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),
     form = _Form$useForm2[0];
   var formItemsRef = useRef(null);
-
   // 根据位置判断是否换行ref
   var endItemRef = useRef(null);
-
   // 查询条件是否展开
   var _useState = useState(expandForm),
     _useState2 = _slicedToArray(_useState, 2),
@@ -170,8 +169,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__*/_jsx(_Fragment, {
-    children: allFormItems.length > 0 && /*#__PURE__*/_jsxs(_Fragment, {
+  return /*#__PURE__*/_jsxs(_Fragment, {
+    children: [allFormItems.length > 0 && /*#__PURE__*/_jsxs(_Fragment, {
       children: [/*#__PURE__*/_jsx(CcsResizeObserver.Target, {
         targetRef: formItemsRef,
         onResize: onResize
@@ -212,7 +211,7 @@ function HeadComponent(_ref) {
           })]
         })
       })]
-    })
+    }), children]
   });
 }
 export default HeadComponent;

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

@@ -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;
@@ -567,7 +568,7 @@ var InternalProTable = function InternalProTable(props) {
   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
@@ -608,7 +609,7 @@ var InternalProTable = function InternalProTable(props) {
     columns: columns,
     tableRef: tableRef,
     onFullScreen: onFullScreen
-  }) : /*#__PURE__*/_jsx(_Fragment, {});
+  }) : undefined;
   return /*#__PURE__*/_jsxs(_Fragment, {
     children: [/*#__PURE__*/_jsx(CcsResizeObserver.Target, {
       targetRef: tableContentRef,
@@ -619,7 +620,7 @@ 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__*/_jsxs(TableSelectionContext.Provider, {
+      children: [isAuth && /*#__PURE__*/_jsxs(TableSelectionContext.Provider, {
         value: {
           selectedRows: selectedRows
         },
@@ -634,7 +635,7 @@ var InternalProTable = function InternalProTable(props) {
           title: props.title,
           tableOperation: renderTableOperation,
           children: toolbarExtra
-        }), toolbar && /*#__PURE__*/_jsxs(Card, {
+        }), (toolbar || formItems.length === 0 && renderTableOperation) && /*#__PURE__*/_jsxs(Card, {
           styles: {
             cover: {
               borderRadius: 0

package/package.json

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