@ccs-ui/rc-pro 1.1.25-beta-11 → 1.1.25-beta-12

package/es/pro-table/form-item.js

@@ -1,8 +1,10 @@
 import { Form } from 'antd';
-import ResizeObserver from 'rc-resize-observer';
 import { cloneElement, useEffect, useRef } from 'react';
+import ResizeDom from "./size";
 import { classPrefix } from "./table";
 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 default function HeadFormItem(_ref) {
   var label = _ref.label,
     name = _ref.name,
@@ -44,10 +46,15 @@ export default function HeadFormItem(_ref) {
       onSetShowNum();
     }
   };
-  return /*#__PURE__*/_jsx(ResizeObserver, {
-    onResize: onResize,
-    children: /*#__PURE__*/_jsx("div", {
+  return /*#__PURE__*/_jsxs(_Fragment, {
+    children: [/*#__PURE__*/_jsx(ResizeDom, {
+      targetRef: ref,
+      onResize: onResize
+    }), /*#__PURE__*/_jsx("div", {
       ref: ref,
+      style: {
+        paddingRight: 10
+      },
       children: /*#__PURE__*/_jsx(Form.Item, {
         name: name,
         rules: rules,
@@ -60,6 +67,6 @@ export default function HeadFormItem(_ref) {
         }) : label,
         children: dependParam ? /*#__PURE__*/cloneElement(value, dependParam) : value
       })
-    })
+    })]
   });
 }

package/es/pro-table/head.js

@@ -14,10 +14,10 @@ import { DownOutlined, UpOutlined } from '@ant-design/icons';
 import { useUpdateEffect } from 'ahooks';
 import { Button, Card, Form } from 'antd';
 import _debounce from 'lodash/debounce';
-import ResizeObserver from 'rc-resize-observer';
 import React, { useEffect, useMemo, useRef, useState } from 'react';
 import { getShowDpends } from "./_utils";
 import HeadFormItem from "./form-item";
+import ResizeDom from "./size";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 import { Fragment as _Fragment } from "react/jsx-runtime";
@@ -198,7 +198,7 @@ function HeadComponent(_ref) {
   // table是否有边框
   var hasBorder = titleBordered === true;
   var formStyles = {
-    gap: 16
+    gap: '16px 0'
   };
   // 单行条件右对齐
   if (!isExpand && (hasMore || formItemsRef.current.length - 1 === showNum)) {
@@ -206,9 +206,9 @@ function HeadComponent(_ref) {
   }
   return /*#__PURE__*/_jsxs(_Fragment, {
     children: [hasItem && /*#__PURE__*/_jsxs(_Fragment, {
-      children: [/*#__PURE__*/_jsx(ResizeObserver, {
-        onResize: onResize,
-        children: /*#__PURE__*/_jsx("div", {})
+      children: [/*#__PURE__*/_jsx(ResizeDom, {
+        targetRef: cardRef,
+        onResize: onResize
       }), /*#__PURE__*/_jsx(Card, {
         className: "ccs-pl-adaptation",
         style: _objectSpread({
@@ -220,7 +220,7 @@ function HeadComponent(_ref) {
         styles: {
           body: {
             padding: 16,
-            height: isExpand ? 'auto' : 64
+            height: hasMore && !isExpand ? 64 : 'auto'
           }
         },
         bordered: hasBorder,

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

@@ -0,0 +1,10 @@
+/// <reference types="react" />
+type Size = {
+    width: number;
+    height: number;
+};
+export default function ResizeDom({ targetRef, onResize, }: {
+    targetRef: React.RefObject<HTMLDivElement>;
+    onResize: (size: Size) => void;
+}): null;
+export {};

package/es/pro-table/size.js

@@ -0,0 +1,17 @@
+import { useSize } from 'ahooks';
+import { useEffect, useRef } from 'react';
+export default function ResizeDom(_ref) {
+  var targetRef = _ref.targetRef,
+    onResize = _ref.onResize;
+  var sizeRef = useRef();
+  var size = useSize(targetRef);
+  useEffect(function () {
+    if (size) {
+      if (sizeRef.current) {
+        onResize(size);
+      }
+      sizeRef.current = size;
+    }
+  }, [size === null || size === void 0 ? void 0 : size.height, size === null || size === void 0 ? void 0 : size.width]);
+  return null;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ccs-ui/rc-pro",
-  "version": "1.1.25-beta-11",
+  "version": "1.1.25-beta-12",
   "description": "验证码组件兼容暗黑模式;proTable封装rowselection代码;proTable添加自适应布局模式;",
   "license": "MIT",
   "author": {