@chaoswise/ui 3.1.9 → 3.1.11

package/lib/CWRadioTabs/index.js

@@ -12,13 +12,13 @@ function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" !=
 function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
 function _objectWithoutProperties(e, t) { if (null == e) return {}; var o, r, i = _objectWithoutPropertiesLoose(e, t); if (Object.getOwnPropertySymbols) { var n = Object.getOwnPropertySymbols(e); for (r = 0; r < n.length; r++) o = n[r], -1 === t.indexOf(o) && {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]); } return i; }
 function _objectWithoutPropertiesLoose(r, e) { if (null == r) return {}; var t = {}; for (var n in r) if ({}.hasOwnProperty.call(r, n)) { if (-1 !== e.indexOf(n)) continue; t[n] = r[n]; } return t; }
-import React, { forwardRef, useState, useEffect, useMemo } from "react";
+import React, { useState, useEffect } from "react";
 import { EllipsisOutlined } from "@ant-design/icons";
 import PropTypes from "prop-types";
 import classnames from "classnames";
 import useConfigContext from "../useConfigContext";
 import useStyle from "./index.style";
-var CWRadioTabs = /*#__PURE__*/forwardRef(function (props, ref) {
+var CWRadioTabs = function CWRadioTabs(props) {
   var _dataSource$find;
   var _props$dataSource = props.dataSource,
     dataSource = _props$dataSource === void 0 ? [] : _props$dataSource,
@@ -102,9 +102,6 @@ var CWRadioTabs = /*#__PURE__*/forwardRef(function (props, ref) {
   }, dropdownOption), /*#__PURE__*/React.createElement(_Radio.Button, {
     value: "more"
   }, /*#__PURE__*/React.createElement(EllipsisOutlined, null)))), props.children));
-});
-CWRadioTabs.defaultProps = {
-  size: "default"
 };
 CWRadioTabs.propTypes = {
   /**

package/lib/CWRangePicker/Refresh/index.js

@@ -1,4 +1,5 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+import _Space from "@chaoswise/ui/lib/Space";
 import _Tooltip from "@chaoswise/ui/lib/Tooltip";
 import _Button from "@chaoswise/ui/lib/Button";
 var _excluded = ["value", "key"];
@@ -143,7 +144,7 @@ var Refresh = /*#__PURE__*/forwardRef(function (props, ref) {
       onAutoRefresh: onAutoRefresh
     };
   });
-  return wrapCSSVar((showRefresh || showAutoRefresh) && /*#__PURE__*/React.createElement(_Button.Group, {
+  return wrapCSSVar((showRefresh || showAutoRefresh) && /*#__PURE__*/React.createElement(_Space.Compact, {
     className: classnames(hashId, cssVarCls, "".concat(prefixCls, "-cw-range-picker-refresh-wrapper"))
   }, showRefresh && /*#__PURE__*/React.createElement(_Tooltip, {
     title: intl.get("1d0f3c0c-188f-4f83-bff0-2792dffcdc2d").d("刷新")

package/lib/CWRangePicker/TimeSpan/index.js

@@ -1,3 +1,4 @@
+import _Space from "@chaoswise/ui/lib/Space";
 import _Tooltip from "@chaoswise/ui/lib/Tooltip";
 import _Button from "@chaoswise/ui/lib/Button";
 function _slicedToArray(r, e) { return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _nonIterableRest(); }
@@ -71,7 +72,7 @@ var TimeSpan = function TimeSpan(props) {
     }
   };
   var showTimeSpan = showForwardBtn || showBackwardBtn || showEnlargeBtn;
-  return wrapCSSVar(isHasDate && showTimeSpan && /*#__PURE__*/React.createElement(_Button.Group, {
+  return wrapCSSVar(isHasDate && showTimeSpan && /*#__PURE__*/React.createElement(_Space.Compact, {
     className: classnames(hashId, cssVarCls, "".concat(prefixCls, "-cw-range-picker-time-span-wrapper"))
   }, /*#__PURE__*/React.createElement(_Tooltip, {
     title: forwardTitle

package/lib/CWRangePicker/index.js

@@ -686,11 +686,6 @@ var CWRangePicker = /*#__PURE__*/forwardRef(function (props, ref) {
     ref: refreshRef
   }))));
 });
-CWRangePicker.defaultProps = {
-  moreItemDropdownPosition: "left",
-  format: "YYYY/MM/DD HH:mm:ss",
-  rangePickerFormat: "YYYY/MM/DD"
-};
 CWRangePicker.propTypes = {
   /**
    * 默认value

package/lib/CWSelect/index.js

@@ -26,7 +26,6 @@ import { DndProvider } from "react-dnd";
 import { cloneComProps } from "../utils";
 import update from "immutability-helper";
 import PropTypes from "prop-types";
-import { useIntl } from "../locales";
 import useStyle from "./index.style";
 
 /**
@@ -73,7 +72,6 @@ var CWSelect = /*#__PURE__*/forwardRef(function (props, ref) {
     children = props.children,
     maxCount = props.maxCount,
     rest = _objectWithoutProperties(props, _excluded);
-  var intl = useIntl();
   var _useConfigContext = useConfigContext(),
     getPrefixCls = _useConfigContext.getPrefixCls;
   var prefixCls = getPrefixCls("select");
@@ -341,9 +339,9 @@ var CWSelect = /*#__PURE__*/forwardRef(function (props, ref) {
     menuItemSelectedIcon: null,
     onSelect: onSelect,
     onDeselect: onDeselect,
-    dropdownRender: dropdownRender,
     labelInValue: labelInValue,
-    maxCount: maxCount
+    maxCount: maxCount,
+    popupRender: dropdownRender
   }, rest), children)));
 });
 

package/lib/CWTable/CWTable.js

@@ -26,21 +26,24 @@ function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" !=
 function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
 function _objectWithoutProperties(e, t) { if (null == e) return {}; var o, r, i = _objectWithoutPropertiesLoose(e, t); if (Object.getOwnPropertySymbols) { var n = Object.getOwnPropertySymbols(e); for (r = 0; r < n.length; r++) o = n[r], -1 === t.indexOf(o) && {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]); } return i; }
 function _objectWithoutPropertiesLoose(r, e) { if (null == r) return {}; var t = {}; for (var n in r) if ({}.hasOwnProperty.call(r, n)) { if (-1 !== e.indexOf(n)) continue; t[n] = r[n]; } return t; }
-import React, { useState, useEffect, useRef, useMemo, forwardRef } from "react";
+import React, { useState, useEffect, useRef, useMemo, useCallback, forwardRef } from "react";
 import Icon, { LoadingOutlined, DownOutlined, RightOutlined } from "@ant-design/icons";
 import classnames from "classnames";
 import ResizeObserver from "resize-observer-polyfill";
 import { merge } from "lodash-es";
 import { HeaderCell } from "./header";
 import useStyle from "./index.style";
+// 在组件外部定义默认数组，确保引用稳定
+var DEFAULT_DATA_SOURCE = [];
+var DEFAULT_COLUMNS = [];
 var CWTable = function CWTable(_ref, ref) {
   var _ref$columns = _ref.columns,
-    columns = _ref$columns === void 0 ? [] : _ref$columns,
+    columns = _ref$columns === void 0 ? DEFAULT_COLUMNS : _ref$columns,
     _ref$lazyLoading = _ref.lazyLoading,
     lazyLoading = _ref$lazyLoading === void 0 ? false : _ref$lazyLoading,
     loadData = _ref.loadData,
     _ref$dataSource = _ref.dataSource,
-    dataSource = _ref$dataSource === void 0 ? [] : _ref$dataSource,
+    dataSource = _ref$dataSource === void 0 ? DEFAULT_DATA_SOURCE : _ref$dataSource,
     rowSelection = _ref.rowSelection,
     _ref$pagination = _ref.pagination,
     pagination = _ref$pagination === void 0 ? false : _ref$pagination,
@@ -159,20 +162,28 @@ var CWTable = function CWTable(_ref, ref) {
     colsFilterTitle = columnFilter.colsFilterTitle,
     _columnFilter$isShowS = columnFilter.isShowSelectAll,
     isShowSelectAll = _columnFilter$isShowS === void 0 ? false : _columnFilter$isShowS;
-  var getDataSource = function getDataSource() {
-    var _dataSource = _toConsumableArray(dataSource);
-    if (frontPagination) {
-      var _current = pagination.current,
-        _pageSize = pagination.pageSize,
-        _total = pagination.total;
-      var current = _current || pageInfo.current;
-      var pageSize = _pageSize || pageInfo.pageSize;
-      var total = _total || dataSource.length;
-      _dataSource = _dataSource.slice((current - 1) * pageSize, current * pageSize > total ? total : current * pageSize);
+  var getDataSource = useCallback(function () {
+    // 如果不是前端分页，直接使用原数据
+    if (!frontPagination) {
+      setFinalDataSource(_toConsumableArray(dataSource));
+      return;
     }
-    setFinalDataSource(_dataSource);
-  };
-  useEffect(getDataSource, [frontPagination, pagination, pageInfo, dataSource]);
+
+    // 前端分页逻辑
+    var _ref2 = pagination || {},
+      paginationCurrent = _ref2.current,
+      paginationPageSize = _ref2.pageSize,
+      paginationTotal = _ref2.total;
+    var current = paginationCurrent || pageInfo.current;
+    var pageSize = paginationPageSize || pageInfo.pageSize;
+    var total = paginationTotal || dataSource.length;
+
+    // 计算分页范围
+    var startIndex = (current - 1) * pageSize;
+    var endIndex = Math.min(startIndex + pageSize, total);
+    setFinalDataSource(dataSource.slice(startIndex, endIndex));
+  }, [frontPagination, pagination, pageInfo, dataSource]);
+  useEffect(getDataSource, [getDataSource]);
   useEffect(function () {
     if (!autoHeight) {
       return;
@@ -380,8 +391,8 @@ var CWTable = function CWTable(_ref, ref) {
     });
   };
   var handleResize = function handleResize(index) {
-    return function (e, _ref2, isDragEnd) {
-      var size = _ref2.size;
+    return function (e, _ref3, isDragEnd) {
+      var size = _ref3.size;
       var nextColumns = _toConsumableArray(resizeColsRef.current);
       nextColumns[index] = _objectSpread(_objectSpread({}, nextColumns[index]), {}, {
         width: size.width

package/lib/CWTable/index.js

@@ -202,16 +202,4 @@ Table.propTypes = {
    */
   onColumnsResizeEnd: PropTypes.func
 };
-Table.defaultProps = {
-  autoHeight: false,
-  lazyLoading: false,
-  dataSource: [],
-  pagination: false,
-  showHeader: true,
-  bordered: false,
-  size: "default",
-  columnFilter: false,
-  frontPagination: false,
-  tableHeader: null
-};
 export default Table;