@ccs-ui/rc-pro 1.1.15 → 1.1.17

package/es/keep-alive-tabs/page.js

@@ -23,8 +23,7 @@ export default /*#__PURE__*/memo(function (props) {
       style: {
         flex: '1 1 auto',
         display: active ? 'block' : 'none',
-        position: 'relative',
-        padding: 16
+        position: 'relative'
       },
       id: id,
       "data-display": active,
@@ -33,7 +32,12 @@ export default /*#__PURE__*/memo(function (props) {
           display: active ? 'block' : 'none'
         },
         autoHide: true,
-        children: children
+        children: /*#__PURE__*/_jsx("div", {
+          style: {
+            margin: 16
+          },
+          children: children
+        })
       })
     })
   });

package/es/pro-grid/index.d.ts

@@ -6,10 +6,7 @@ type ClassProps = {
     style?: CSSProperties;
 };
 type CcsProGridProps = ClassProps & {
-    title?: string;
-    titleExtra?: ReactNode;
     bordered?: boolean;
-    hideTitle?: boolean;
     children?: ReactNode;
 };
 type ColProps = CardProps & {

package/es/pro-grid/index.js

@@ -1,6 +1,6 @@
 function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 var _excluded = ["colSpan", "colClassName", "colStyle"],
-  _excluded2 = ["title", "titleExtra", "hideTitle", "bordered", "children"];
+  _excluded2 = ["bordered", "children"];
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
@@ -13,7 +13,6 @@ import classNames from 'classnames';
 import "./index.less";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { Fragment as _Fragment } from "react/jsx-runtime";
-import { jsxs as _jsxs } from "react/jsx-runtime";
 var GridCol = function GridCol(_ref) {
   var colSpan = _ref.colSpan,
     colClassName = _ref.colClassName,
@@ -40,36 +39,17 @@ var GridCol = function GridCol(_ref) {
   });
 };
 var Grid = function Grid(_ref2) {
-  var title = _ref2.title,
-    titleExtra = _ref2.titleExtra,
-    hideTitle = _ref2.hideTitle,
-    bordered = _ref2.bordered,
+  var bordered = _ref2.bordered,
     children = _ref2.children,
     restProps = _objectWithoutProperties(_ref2, _excluded2);
-  return /*#__PURE__*/_jsxs("div", _objectSpread(_objectSpread({}, restProps), {}, {
+  return /*#__PURE__*/_jsx("div", _objectSpread(_objectSpread({}, restProps), {}, {
     className: classNames({
       'ccs-pg-border': bordered
     }),
-    children: [!hideTitle && title ? /*#__PURE__*/_jsx(Card, {
-      title: title,
-      extra: titleExtra,
-      bordered: false,
-      style: {
-        borderRadius: 0
-      },
-      bodyStyle: {
-        padding: 0
-      }
-    }) : null, /*#__PURE__*/_jsx("div", {
+    children: /*#__PURE__*/_jsx("div", {
       className: "ccs-pl-table-content",
-      children: /*#__PURE__*/_jsx("div", {
-        style: {
-          display: 'flex',
-          padding: 10
-        },
-        children: children
-      })
-    })]
+      children: children
+    })
   }));
 };
 var ProGrid = Grid;

package/es/pro-table/search.js

@@ -82,19 +82,17 @@ function SearchComponent(_ref) {
     _useState8 = _slicedToArray(_useState7, 2),
     colSpan = _useState8[0],
     setColSpan = _useState8[1];
-  var _useState9 = useState(function () {
-      var hasMain = formItems.filter(function (f) {
-        return f.isMain;
-      });
+  var onHasMore = function onHasMore() {
+    var hasMain = formItems.filter(function (f) {
+      return f.isMain;
+    });
 
-      // 所有都是主条件
-      if (hasMain.length === formItems.length) return false;
+    // 所有都是主条件
+    if (hasMain.length === formItems.length) return false;
 
-      // 条件数大于1,有更多
-      return formItems.length > 1;
-    }),
-    _useState10 = _slicedToArray(_useState9, 1),
-    hasMore = _useState10[0];
+    // 条件数大于1,有更多
+    return formItems.length > 1;
+  };
 
   // 处理form item 依赖
   var allFormItems = useMemo(function () {
@@ -119,14 +117,14 @@ function SearchComponent(_ref) {
       return c.hidden;
     }));
   };
-  var _useState11 = useState(true),
+  var _useState9 = useState(true),
+    _useState10 = _slicedToArray(_useState9, 2),
+    isCheckAll = _useState10[0],
+    setIsCheckAll = _useState10[1];
+  var _useState11 = useState(getHalfCheckState),
     _useState12 = _slicedToArray(_useState11, 2),
-    isCheckAll = _useState12[0],
-    setIsCheckAll = _useState12[1];
-  var _useState13 = useState(getHalfCheckState),
-    _useState14 = _slicedToArray(_useState13, 2),
-    isHalfCheck = _useState14[0],
-    setIsHalfCheck = _useState14[1];
+    isHalfCheck = _useState12[0],
+    setIsHalfCheck = _useState12[1];
 
   // 列选中事件
   var onCheckChange = function onCheckChange(checked, index) {
@@ -213,7 +211,7 @@ function SearchComponent(_ref) {
   // 操作按钮
   var renderOperation = /*#__PURE__*/_jsxs("div", {
     className: "".concat(classPrefix, "-header-buttons"),
-    children: [hasMore && !disableCollapseForm && /*#__PURE__*/_jsx(Button, {
+    children: [onHasMore() && !disableCollapseForm && /*#__PURE__*/_jsx(Button, {
       onClick: function onClick() {
         return setIsShowMore(!isShowMore);
       },
@@ -451,7 +449,7 @@ function SearchComponent(_ref) {
       } : {}),
       bordered: hasBorder,
       title: title,
-      children: [(hasMore || expandForm) && renderMoreForm(), /*#__PURE__*/_jsxs("div", {
+      children: [(onHasMore() || expandForm) && renderMoreForm(), /*#__PURE__*/_jsxs("div", {
         className: "".concat(classPrefix, "-header"),
         children: [/*#__PURE__*/_jsx("div", {
           className: "".concat(classPrefix, "-toolbar"),

package/es/pro-table/table.js

@@ -16,7 +16,6 @@ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" =
 import { useEventEmitter } from 'ahooks';
 import { Empty, Form, theme } from 'antd';
 import classNames from 'classnames';
-import _debounce from 'lodash/debounce';
 import _isArray from 'lodash/isArray';
 import React, { useEffect, useImperativeHandle, useMemo, useRef, useState } from 'react';
 import { CcsUtils, CcsWaterMark } from '..';
@@ -293,19 +292,20 @@ var InternalProTable = function InternalProTable(props) {
   };
 
   // 尺寸变化重设尺寸
-  var resizeFn = _debounce(function () {
-    // console.log('resizeFn...');
-  }, 200);
+  // const resizeFn = _debounce(() => {
+  //   // console.log('resizeFn...');
+  // }, 200);
+
   useEffect(function () {
     // 判断当前dom所处的滚动区域
     var inMd = onIsInModalOrDrawer(tableRef.current);
     if (inMd) stickyRef.current = inMd;
 
-    // 监听resize
-    window.addEventListener('resize', resizeFn);
-    return function () {
-      window.removeEventListener('resize', resizeFn);
-    };
+    // // 监听resize
+    // window.addEventListener('resize', resizeFn);
+    // return () => {
+    //   window.removeEventListener('resize', resizeFn);
+    // };
   }, []);
 
   // 初始查询

package/es/table/index.js

@@ -60,7 +60,7 @@ var CustomTable = function CustomTable(props) {
         if (_pagination && _pagination.length > 0) {
           pageHeight = _pagination[0].clientHeight;
         }
-        var scrollHeight = bodyHeight - top - 32 - theadHeight - pageHeight - (restProps.title ? 46 : 0) - (restProps.footer ? 46 : 0);
+        var scrollHeight = bodyHeight - top - 16 - theadHeight - pageHeight - (restProps.title ? 46 : 0) - (restProps.footer ? 46 : 0);
 
         // 固定tbody高度
         var tbody = (_ref$current4 = ref.current) === null || _ref$current4 === void 0 ? void 0 : _ref$current4.getElementsByClassName('ant-table-body');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ccs-ui/rc-pro",
-  "version": "1.1.15",
+  "version": "1.1.17",
   "description": "A react pro components",
   "license": "MIT",
   "module": "es/index.js",