@ccs-ui/rc-pro 1.2.0-beta-9 → 1.2.0-beta-11

package/es/pro-table/head.js

@@ -102,6 +102,9 @@ function HeadComponent(_ref) {
       onClick: function onClick() {
         return form.submit();
       },
+      style: {
+        marginLeft: !hasMore ? 10 : undefined
+      },
       children: "\u67E5\u8BE2"
     }), toolbar ? null : tableOperation]
   });
@@ -201,8 +204,7 @@ function HeadComponent(_ref) {
             children: [renderFormItems(), isExpand && renderSearchBtn]
           }), !isExpand && /*#__PURE__*/_jsx("div", {
             style: {
-              flex: '0 0 auto',
-              paddingLeft: 10
+              flex: '0 0 auto'
             },
             children: renderSearchBtn
           })]

package/es/pro-table/table.js

@@ -14,7 +14,7 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import CcsUtils from '@ccs-ui/utils';
-import { useUpdateEffect } from 'ahooks';
+import { useSize, useUpdateEffect } from 'ahooks';
 import { Empty, Form, theme } from 'antd';
 import classNames from 'classnames';
 import React, { useEffect, useImperativeHandle, useMemo, useRef, useState } from 'react';
@@ -80,6 +80,8 @@ var InternalProTable = function InternalProTable(props) {
   var filtersRef = useRef({});
   // table content
   var tableContentRef = useRef(null);
+  // container
+  var containerRef = useRef(null);
   // table ref
   var tableRef = useRef();
   // 查询form
@@ -121,6 +123,13 @@ var InternalProTable = function InternalProTable(props) {
     });
   }, []);
 
+  // 监听容器尺寸变化
+  var size = useSize(containerRef);
+  useEffect(function () {
+    var _table$scroll, _tableRef$current;
+    if ((table === null || table === void 0 || (_table$scroll = table.scroll) === null || _table$scroll === void 0 ? void 0 : _table$scroll.y) === 'auto') (_tableRef$current = tableRef.current) === null || _tableRef$current === void 0 || _tableRef$current.onFixedThead();
+  }, [size === null || size === void 0 ? void 0 : size.height]);
+
   // 获取数据
   var onRequest = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(eventType) {
@@ -151,7 +160,7 @@ var InternalProTable = function InternalProTable(props) {
                 newRequestResult,
                 _newRequestResult$dat,
                 totalNum,
-                size,
+                _size,
                 no,
                 result,
                 _args = arguments;
@@ -201,7 +210,7 @@ var InternalProTable = function InternalProTable(props) {
                     }
                     // onSearchAfter 处理请求结果
                     newRequestResult = onSearchAfter ? onSearchAfter(requestResult, eventType) : requestResult;
-                    _newRequestResult$dat = newRequestResult.data, totalNum = _newRequestResult$dat.totalNum, size = _newRequestResult$dat.pageSize, no = _newRequestResult$dat.pageNo, result = _newRequestResult$dat.result;
+                    _newRequestResult$dat = newRequestResult.data, totalNum = _newRequestResult$dat.totalNum, _size = _newRequestResult$dat.pageSize, no = _newRequestResult$dat.pageNo, result = _newRequestResult$dat.result;
                     if (!(totalNum === undefined || pageSize === undefined || no === undefined || result === undefined)) {
                       _context.next = 19;
                       break;
@@ -218,7 +227,7 @@ var InternalProTable = function InternalProTable(props) {
                     } else {
                       setData({
                         pageNo: no,
-                        pageSize: size,
+                        pageSize: _size,
                         loading: false,
                         result: result,
                         totalNum: totalNum || 0
@@ -265,12 +274,6 @@ var InternalProTable = function InternalProTable(props) {
     (_treeRef$current2 = treeRef.current) === null || _treeRef$current2 === void 0 || _treeRef$current2.onExpandKeys(ids);
     (_treeRef$current3 = treeRef.current) === null || _treeRef$current3 === void 0 || _treeRef$current3.onRequestTree({}, treeNode);
   };
-
-  // 尺寸变化重设尺寸
-  // const resizeFn = _debounce(() => {
-  //   // console.log('resizeFn...');
-  // }, 200);
-
   useEffect(function () {
     // 判断是否在弹出框中
     var inMd = onTableInModalOrDrawer(tableContentRef.current);
@@ -287,12 +290,6 @@ var InternalProTable = function InternalProTable(props) {
       stickyRef.current = inTab;
       return;
     }
-
-    // // 监听resize
-    // window.addEventListener('resize', resizeFn);
-    // return () => {
-    //   window.removeEventListener('resize', resizeFn);
-    // };
   }, []);
 
   // size参数变化
@@ -520,6 +517,7 @@ var InternalProTable = function InternalProTable(props) {
   var render = /*#__PURE__*/_jsxs("div", {
     className: classNames(classPrefix, className, _defineProperty({}, 'dark-table', isDark)),
     style: rootStyle,
+    ref: containerRef,
     children: [!(!formItems.length && !toolbar) && isAuth && props.formItemLayout !== 'adaptation' ? /*#__PURE__*/_jsx(SearchComponent, {
       form: form,
       title: title,

package/es/table/index.d.ts

@@ -6,8 +6,12 @@ type TableProps<T> = Omit<CcsTableProps<T>, 'request' | 'requestParam' | 'title'
     tableRef?: React.MutableRefObject<TableRefType | undefined>;
 };
 export type TableRefType = {
+    /** 列筛选 */
     onColumnFilter: (e: any) => void;
+    /** 全屏 */
     onFullScreen: () => void;
+    /** 计算固定表头宽度 */
+    onFixedThead: () => void;
 };
 declare const CustomTable: <T extends object = any>(props: TableProps<T>) => import("react/jsx-runtime").JSX.Element;
 export default CustomTable;

package/es/table/index.js

@@ -8,10 +8,10 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
-import { useDebounceFn, useEventListener, useUpdate, useUpdateEffect } from 'ahooks';
+import { useDebounceFn, useEventListener, useUpdate } from 'ahooks';
 import { Table, Tooltip, theme } from 'antd';
 import classNames from 'classnames';
-import { useImperativeHandle, useRef } from 'react';
+import { useEffect, useImperativeHandle, useRef } from 'react';
 import { Resizable } from 'react-resizable';
 import "./index.less";
 import { jsx as _jsx } from "react/jsx-runtime";
@@ -99,7 +99,7 @@ var CustomTable = function CustomTable(props) {
       leading: true
     }),
     onFixedThead = _useDebounceFn.run;
-  useUpdateEffect(function () {
+  useEffect(function () {
     onFixedThead();
   }, [totalNum]);
 
@@ -117,7 +117,8 @@ var CustomTable = function CustomTable(props) {
         });
         update();
       },
-      onFullScreen: onFixedThead
+      onFullScreen: onFixedThead,
+      onFixedThead: onFixedThead
     };
   });
 

package/package.json

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