@teamix/pro 1.5.7-beta.0 → 1.5.7

package/lib/table/index.js

@@ -36,7 +36,8 @@ Object.keys(_typing).forEach(function (key) {
     }
   });
 });
-var _excluded = ["header", "className", "tableClassName", "mainAction", "extra", "dataFilter", "afterDataFilter", "toolBar", "columns", "useRowSelection", "rowSelection", "onChangeRowSelection", "getRowSelection", "primaryKey", "footerAction", "footer", "url", "pageKey", "pageSizeKey", "method", "params", "formatSort", "formatParams", "formatResult", "requestConfig", "requestWhenMount", "showPagination", "pageSizeList", "responsivePaginationType", "showSkeleton", "skeletonSize", "actionRef", "dataSource", "filterDebounce", "footerSuction", "autoRefresh", "customRequest", "filterColumnType", "defaultFilterParams", "reserveSelectedRecords", "size", "disableSelectAll", "context", "fixedTableBody", "isTree", "toolBarAutoWidth", "data-teamix-spm", "switchCardView", "cardViewProps", "defaultView"];
+var _excluded = ["header", "className", "tableClassName", "mainAction", "extra", "dataFilter", "afterDataFilter", "toolBar", "columns", "useRowSelection", "rowSelection", "onChangeRowSelection", "getRowSelection", "primaryKey", "footerAction", "footer", "url", "pageKey", "pageSizeKey", "method", "params", "formatSort", "formatParams", "formatResult", "requestConfig", "requestWhenMount", "showPagination", "pageSizeList", "responsivePaginationType", "showSkeleton", "skeletonSize", "actionRef", "dataSource", "filterDebounce", "footerSuction", "autoRefresh", "customRequest", "filterColumnType", "defaultFilterParams", "reserveSelectedRecords", "size", "disableSelectAll", "context", "fixedTableBody", "isTree", "toolBarAutoWidth", "data-teamix-spm", "switchCardView", "cardViewProps", "defaultView"],
+  _excluded2 = ["onChange"];
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -142,7 +143,7 @@ var ProTable = function ProTable(props) {
     pageSizeList = _props$pageSizeList === void 0 ? [5, 10, 20, 50, 100] : _props$pageSizeList,
     responsivePaginationType = props.responsivePaginationType,
     _props$showSkeleton = props.showSkeleton,
-    propsShowSkeleton = _props$showSkeleton === void 0 ? true : _props$showSkeleton,
+    propsShowSkeleton = _props$showSkeleton === void 0 ? false : _props$showSkeleton,
     _props$skeletonSize = props.skeletonSize,
     skeletonSize = _props$skeletonSize === void 0 ? 5 : _props$skeletonSize,
     propsActionRef = props.actionRef,
@@ -244,6 +245,13 @@ var ProTable = function ProTable(props) {
   // 存储定时器 id
   var autoRefreshTimerRef = (0, _react.useRef)();
   var onResize = null;
+  (0, _react.useEffect)(function () {
+    setShowSkeleton(propsShowSkeleton);
+  }, [propsShowSkeleton]);
+  // useEffect(() => {
+  //   console.log('传入的props变化', propsLoading);
+  //   setShowLoading(propsLoading ?? false);
+  // }, [propsLoading]);
   (0, _react.useEffect)(function () {
     var _propsDataFilter$sche, _propsDataFilter$sche2;
     getHeaderHeight(fullscreenState);
@@ -576,9 +584,13 @@ var ProTable = function ProTable(props) {
       setCurrentPage(1);
     },
     nextPage: function nextPage() {
+      var _props$paginationProp, _props$paginationProp2;
       var newCurrentPage = currentPage + 1;
       setCurrentPage(newCurrentPage);
-      _request(_defineProperty({}, targetPageKey, newCurrentPage));
+      props === null || props === void 0 ? void 0 : (_props$paginationProp = props.paginationProps) === null || _props$paginationProp === void 0 ? void 0 : (_props$paginationProp2 = _props$paginationProp.onChange) === null || _props$paginationProp2 === void 0 ? void 0 : _props$paginationProp2.call(_props$paginationProp, newCurrentPage, {});
+      if (!propsDataSource) {
+        _request(_defineProperty({}, targetPageKey, newCurrentPage));
+      }
     },
     rowSelection: rowSelection,
     clearRowSelection: function clearRowSelection() {
@@ -607,17 +619,24 @@ var ProTable = function ProTable(props) {
     },
     switchView: function switchView(view) {
       setSwitchViewState(view);
-      setShowSkeleton(true);
-      setCurrentPage(1);
+      if (!propsDataSource) {
+        setCurrentPage(1);
+      }
       if (view === 'table') {
-        var _request4;
         setPageSize(pageSize !== null && pageSize !== void 0 ? pageSize : 20);
-        _request((_request4 = {}, _defineProperty(_request4, targetPageSizeKey, pageSize !== null && pageSize !== void 0 ? pageSize : 20), _defineProperty(_request4, targetPageKey, 1), _request4));
+        if (!propsDataSource) {
+          var _request4;
+          setShowSkeleton(true);
+          _request((_request4 = {}, _defineProperty(_request4, targetPageSizeKey, pageSize !== null && pageSize !== void 0 ? pageSize : 20), _defineProperty(_request4, targetPageKey, 1), _request4));
+        }
       }
       if (view === 'card') {
-        var _cardViewProps$pageSi, _cardViewProps$pageSi2, _request5;
+        var _cardViewProps$pageSi;
         setPageSize((_cardViewProps$pageSi = cardViewProps === null || cardViewProps === void 0 ? void 0 : cardViewProps.pageSize) !== null && _cardViewProps$pageSi !== void 0 ? _cardViewProps$pageSi : 12);
-        _request((_request5 = {}, _defineProperty(_request5, targetPageSizeKey, (_cardViewProps$pageSi2 = cardViewProps === null || cardViewProps === void 0 ? void 0 : cardViewProps.pageSize) !== null && _cardViewProps$pageSi2 !== void 0 ? _cardViewProps$pageSi2 : 12), _defineProperty(_request5, targetPageKey, 1), _request5));
+        if (!propsDataSource) {
+          var _cardViewProps$pageSi2, _request5;
+          _request((_request5 = {}, _defineProperty(_request5, targetPageSizeKey, (_cardViewProps$pageSi2 = cardViewProps === null || cardViewProps === void 0 ? void 0 : cardViewProps.pageSize) !== null && _cardViewProps$pageSi2 !== void 0 ? _cardViewProps$pageSi2 : 12), _defineProperty(_request5, targetPageKey, 1), _request5));
+        }
       }
       getHeaderHeight(fullscreenState);
     }
@@ -974,7 +993,11 @@ var ProTable = function ProTable(props) {
         }
       }
     }
-    if (showPagination && switchViewState === 'table') {
+    if (showPagination && switchViewState === 'table' || (cardViewProps === null || cardViewProps === void 0 ? void 0 : cardViewProps.useTablePagination) && switchViewState === 'card') {
+      var _props$paginationProp3;
+      var _ref6 = (_props$paginationProp3 = props === null || props === void 0 ? void 0 : props.paginationProps) !== null && _props$paginationProp3 !== void 0 ? _props$paginationProp3 : {},
+        onPaginationPropsChange = _ref6.onChange,
+        othersPaginationProps = _objectWithoutProperties(_ref6, _excluded2);
       return /*#__PURE__*/_react.default.createElement("div", {
         className: cls('footer', {
           'footer-has-rowSelection': rowSelection,
@@ -984,8 +1007,9 @@ var ProTable = function ProTable(props) {
         className: cls('footer-right-wrapper')
       }, showSkeleton ? /*#__PURE__*/_react.default.createElement(_skeleton.ProSkeletonRaw.Footer.Pagination, null) : /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, data.length > 0 && /*#__PURE__*/_react.default.createElement(_Pagination.default, _objectSpread({
         className: cls('pagination'),
-        onChange: function onChange(number) {
-          return onChangePagination(number);
+        onChange: function onChange(number, e) {
+          onChangePagination(number);
+          onPaginationPropsChange === null || onPaginationPropsChange === void 0 ? void 0 : onPaginationPropsChange(number, e);
         },
         total: total,
         responsivePaginationType: responsivePaginationType,
@@ -1004,7 +1028,7 @@ var ProTable = function ProTable(props) {
         onPageSizeChange: function onPageSizeChange(number) {
           return onChangePaginationSize(number);
         }
-      }, props.paginationProps)))));
+      }, othersPaginationProps)))));
     } else if (!showPagination && (footerAction || rowSelection || useRowSelection)) {
       return /*#__PURE__*/_react.default.createElement("div", {
         className: cls('footer', {

package/lib/table/typing.d.ts

@@ -341,6 +341,17 @@ export declare type ProTableCardProps = {
     scrollDom?: HTMLElement;
     /** 触底事件 **/
     onScrollBottom?: () => void;
+    /** 使用表格分页 **/
+    useTablePagination?: boolean;
+    /** 使用响应式 **/
+    cardResponsiveProps?: {
+        xxs?: number;
+        xs?: number;
+        s?: number;
+        m?: number;
+        l?: number;
+        xl?: number;
+    };
     /** 卡片配置 **/
     cardProps?: {
         [key in keyof ProCardProps]?: ProCardProps[key] | ((index: number, record: any) => ProCardProps[key]);
@@ -367,5 +378,7 @@ export declare type ProTableCardViewProps = {
     showSkeleton?: boolean;
     /** ProCard 卡片配置 **/
     cardProps?: ProTableCardProps['cardProps'];
+    /** 表格分页器参数 **/
+    tablePaginationProps?: PaginationProps;
 };
 export {};

package/lib/utils/useRealHistory.js

@@ -27,8 +27,14 @@ var useRealHistory = function useRealHistory() {
       history = window.HistoryLibrary.createBrowserHistory();
       var oldPush = history.push;
       history.push = function (p) {
-        var _window$ICESTARK;
-        oldPush(path.join(((_window$ICESTARK = window.ICESTARK) === null || _window$ICESTARK === void 0 ? void 0 : _window$ICESTARK.basename) || '/', p));
+        if (typeof p === 'string') {
+          var _window$ICESTARK;
+          oldPush(path.join(((_window$ICESTARK = window.ICESTARK) === null || _window$ICESTARK === void 0 ? void 0 : _window$ICESTARK.basename) || '/', p));
+        } else {
+          var _window$ICESTARK2;
+          p.pathname = path.join(((_window$ICESTARK2 = window.ICESTARK) === null || _window$ICESTARK2 === void 0 ? void 0 : _window$ICESTARK2.basename) || '/', p.pathname);
+          oldPush(p);
+        }
       };
       setRealHistory(history);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@teamix/pro",
-  "version": "1.5.7-beta.0",
+  "version": "1.5.7",
   "description": "TeamixPro大包",
   "keywords": [
     "aliyun",