@ccs-ui/rc-pro 1.2.0-beta-4 → 1.2.0-beta-7

package/es/dialog/DialogRequestButton.d.ts

@@ -1,7 +1,7 @@
 import { FormProps } from 'antd';
 import { DialogFormRef } from './form';
 import { CcsDialogModalProps } from './hook';
-declare const DialogRequestButton: ({ auth, formRef, extraBtn, formInitialValues, request, onCancel, onRequestBefore, }: Pick<CcsDialogModalProps, "auth" | "onCancel" | "extraBtn" | "request" | "onRequestBefore"> & {
+declare const DialogRequestButton: ({ auth, formRef, extraBtn, formInitialValues, request, onCancel, onRequestBefore, }: Pick<CcsDialogModalProps, "onCancel" | "auth" | "request" | "extraBtn" | "onRequestBefore"> & {
     formRef: React.RefObject<DialogFormRef>;
     formInitialValues: FormProps['initialValues'];
 }) => import("react/jsx-runtime").JSX.Element;

package/es/dialog/DialogSelfOkButton.d.ts

@@ -1,7 +1,7 @@
 import { FormProps } from 'antd';
 import { DialogFormRef } from './form';
 import { CcsDialogModalProps } from './hook';
-declare const DialogSelfOkButton: ({ auth, formRef, extraBtn, formInitialValues, onCancel, onOk, }: Pick<CcsDialogModalProps, "auth" | "onOk" | "onCancel" | "extraBtn"> & {
+declare const DialogSelfOkButton: ({ auth, formRef, extraBtn, formInitialValues, onCancel, onOk, }: Pick<CcsDialogModalProps, "onCancel" | "auth" | "onOk" | "extraBtn"> & {
     formRef: React.RefObject<DialogFormRef>;
     formInitialValues: FormProps['initialValues'];
 }) => import("react/jsx-runtime").JSX.Element;

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 } from 'antd';
 import _debounce from 'lodash.debounce';
-import React, { useMemo, useRef, useState } from 'react';
+import React, { useEffect, useMemo, useRef, useState } from 'react';
 import { CcsResizeObserver } from '..';
 import { getShowDpends } from "./_utils";
 import HeadFormItem from "./form-item";
@@ -29,17 +29,17 @@ function HeadComponent(_ref) {
     formItemLabelWidth = _ref.formItemLabelWidth,
     tableOperation = _ref.tableOperation,
     onSearch = _ref.onSearch;
-  var searchBtnRef = useRef(null);
   var formItemsRef = useRef(null);
   // 查询条件是否展开
   var _useState = useState(expandForm),
     _useState2 = _slicedToArray(_useState, 2),
     isExpand = _useState2[0],
     setIsExpand = _useState2[1];
-  var _useState3 = useState(false),
+  var _useState3 = useState('hidden'),
     _useState4 = _slicedToArray(_useState3, 2),
-    hasMore = _useState4[0],
-    setHasMore = _useState4[1];
+    visible = _useState4[0],
+    setVisible = _useState4[1];
+  var hasMore = visible === 'more';
   useUpdateEffect(function () {
     setIsExpand(expandForm);
   }, [expandForm]);
@@ -61,21 +61,26 @@ function HeadComponent(_ref) {
 
   // 尺寸变化重设尺寸
   var resizeFn = _debounce(function (hm) {
-    setHasMore(hm);
+    setVisible(hm);
   }, 500);
 
   // 监听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;
-    if (hm !== hasMore) resizeFn(hm);
+    var hm = scrollHeight > 40 ? 'more' : 'visible';
+    resizeFn(hm);
   };
+  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');
+  }, []);
 
   // 操作按钮
   var renderSearchBtn = /*#__PURE__*/_jsxs("div", {
-    ref: searchBtnRef,
     style: {
       textAlign: 'right',
       flex: isExpand && hasMore ? '1 1 auto' : '0 0 auto'
@@ -164,7 +169,8 @@ function HeadComponent(_ref) {
       }), /*#__PURE__*/_jsx(Card, {
         className: "ccs-pl-adaptation",
         style: {
-          boxShadow: 'none'
+          boxShadow: 'none',
+          visibility: visible === 'hidden' ? 'hidden' : 'visible'
         },
         styles: {
           body: {

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

@@ -35,6 +35,7 @@ export type CcsTableProps<T> = Omit<TableProps<T>, 'columns' | 'title'> & {
     className?: string;
     /** style */
     style?: CSSProperties;
+    isEnableToolbar?: boolean;
     /** 列配置 */
     columns?: TableColumns<T>;
     /** table title  */

package/es/pro-table/table.js

@@ -30,6 +30,7 @@ import TableTree from "./tree";
 
 // 同 antd FormLayout; adaptation为自适应布局
 import { jsx as _jsx } from "react/jsx-runtime";
+import { Fragment as _Fragment } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 export var classPrefix = 'ccs-pl';
 export var TableSelectionContext = /*#__PURE__*/React.createContext({
@@ -531,7 +532,7 @@ var InternalProTable = function InternalProTable(props) {
       formItemLayout: props.formItemLayout,
       formItemCol: props.formItemCol,
       onSearch: _onSearch,
-      tableOperation: /*#__PURE__*/_jsx(TableOperation, {
+      tableOperation: (table === null || table === void 0 ? void 0 : table.isEnableToolbar) !== false ? /*#__PURE__*/_jsx(TableOperation, {
         tableRowSize: tableRowSize,
         columns: columns,
         tableRef: tableRef,
@@ -540,7 +541,7 @@ var InternalProTable = function InternalProTable(props) {
         onChangeRowSize: function onChangeRowSize(e) {
           return setTableRowSize(e);
         }
-      }),
+      }) : /*#__PURE__*/_jsx(_Fragment, {}),
       children: newToolbarExtra
     }) : /*#__PURE__*/_jsx(HeadComponent, {
       form: form,
@@ -550,7 +551,7 @@ var InternalProTable = function InternalProTable(props) {
       formInitValues: formInitValues,
       formItemLabelWidth: props.formItemLabelWidth,
       onSearch: _onSearch,
-      tableOperation: /*#__PURE__*/_jsx(TableOperation, {
+      tableOperation: (table === null || table === void 0 ? void 0 : table.isEnableToolbar) !== false ? /*#__PURE__*/_jsx(TableOperation, {
         isInModalOrDrawer: isInModalOrDrawer,
         onChangeRowSize: function onChangeRowSize(e) {
           return setTableRowSize(e);
@@ -559,7 +560,7 @@ var InternalProTable = function InternalProTable(props) {
         onReset: _onReset,
         columns: columns,
         tableRef: tableRef
-      }),
+      }) : /*#__PURE__*/_jsx(_Fragment, {}),
       children: newToolbarExtra
     }), /*#__PURE__*/_jsxs("div", {
       className: "".concat(classPrefix, "-table-content ").concat(props.formItemLayout),

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@ccs-ui/rc-pro",
-  "version": "1.2.0-beta-4",
-  "description": "验证码组件兼容暗黑模式;proTable封装rowselection代码;proTable添加自适应布局模式;CcsDialog不适应contextHolder也能打开;移除utils,独立存在@ccs-ui/utils。",
+  "version": "1.2.0-beta-7",
+  "description": "验证码组件兼容暗黑模式;proTable封装rowselection代码;proTable添加自适应布局模式;CcsDialog不适应contextHolder也能打开;移除utils,独立存在@ccs-ui/utils;添加属性isEnableToolbar，table可以隐藏toolbar; ",
   "license": "MIT",
   "author": {
     "name": "Hong",