@ccs-ui/rc-pro 1.2.0-beta-3 → 1.2.0-beta-6

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";
@@ -17,7 +17,6 @@ import { jsxs as _jsxs } from "react/jsx-runtime";
 import { Fragment as _Fragment } from "react/jsx-runtime";
 /** 操作按钮、查询，重置、列筛选、 */
 function HeadComponent(_ref) {
-  var _formItemsRef$current;
   var form = _ref.form,
     title = _ref.title,
     toolbar = _ref.toolbar,
@@ -30,16 +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({}),
+  var _useState3 = useState('hidden'),
     _useState4 = _slicedToArray(_useState3, 2),
-    update = _useState4[1];
+    visible = _useState4[0],
+    setVisible = _useState4[1];
+  var hasMore = visible === 'more';
   useUpdateEffect(function () {
     setIsExpand(expandForm);
   }, [expandForm]);
@@ -58,11 +58,29 @@ function HeadComponent(_ref) {
   // 查询条件记录数
   var itemLen = allFormItems.length;
   var hasItem = itemLen > 0;
-  var hasMore = (((_formItemsRef$current = formItemsRef.current) === null || _formItemsRef$current === void 0 ? void 0 : _formItemsRef$current.scrollHeight) || 0) > 40;
+
+  // 尺寸变化重设尺寸
+  var resizeFn = _debounce(function (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 ? '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'
@@ -140,16 +158,6 @@ function HeadComponent(_ref) {
       }, item.name);
     });
   };
-
-  // 尺寸变化重设尺寸
-  var resizeFn = _debounce(function () {
-    update({});
-  }, 500);
-
-  // 监听dom尺寸变化
-  var onResize = function onResize() {
-    resizeFn();
-  };
   var formStyles = {
     flexWrap: isExpand ? 'wrap' : 'nowrap'
   };
@@ -161,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/package.json

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