@teamix/pro 1.5.22 → 1.5.24

package/lib/table/index.js

@@ -38,7 +38,7 @@ 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", "autoRefreshProps", "customRequest", "filterColumnType", "defaultFilterParams", "reserveSelectedRecords", "size", "disableSelectAll", "context", "fixedTableBody", "isTree", "toolBarAutoWidth", "data-teamix-spm", "switchCardView", "cardViewProps", "defaultView", "emptyProps", "bindUrlProps", "bindUrl"],
+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", "autoRefreshProps", "customRequest", "filterColumnType", "defaultFilterParams", "reserveSelectedRecords", "size", "disableSelectAll", "context", "fixedTableBody", "isTree", "toolBarAutoWidth", "data-teamix-spm", "switchCardView", "cardViewProps", "defaultView", "emptyProps", "bindUrlProps", "bindUrl", "autoRedirect", "useMaxData"],
   _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); }
@@ -181,6 +181,9 @@ var ProTable = function ProTable(props) {
     emptyProps = props.emptyProps,
     bindUrlProps = props.bindUrlProps,
     bindUrl = props.bindUrl,
+    _props$autoRedirect = props.autoRedirect,
+    autoRedirect = _props$autoRedirect === void 0 ? true : _props$autoRedirect,
+    useMaxData = props.useMaxData,
     otherProps = _objectWithoutProperties(props, _excluded);
   var targetPageKey = pageKey || globalPageKey;
   var targetPageSizeKey = pageSizeKey || globalPageSizeKey;
@@ -209,7 +212,7 @@ var ProTable = function ProTable(props) {
     _useState10 = _slicedToArray(_useState9, 2),
     sort = _useState10[0],
     setSort = _useState10[1];
-  var _useState11 = (0, _react.useState)(!propsDataSource && requestWhenMount && propsShowSkeleton && !!url),
+  var _useState11 = (0, _react.useState)(!propsDataSource && requestWhenMount && propsShowSkeleton),
     _useState12 = _slicedToArray(_useState11, 2),
     showSkeleton = _useState12[0],
     setShowSkeleton = _useState12[1]; // 首次加载，渲染骨架屏
@@ -398,6 +401,11 @@ var ProTable = function ProTable(props) {
     fullscreen: false,
     normal: true
   });
+  // 全局状态 ： 大数据截断
+  var globalUseMaxData = (0, _react.useMemo)(function () {
+    var _getGlobalConfig2;
+    return (_getGlobalConfig2 = (0, _utils.getGlobalConfig)('ProTable')) === null || _getGlobalConfig2 === void 0 ? void 0 : _getGlobalConfig2.useMaxData;
+  }, []);
   // 非全屏状态下的
   var normalDataFilterFormRef = (0, _react.useRef)();
   var fullscreenDataFilterFormRef = (0, _react.useRef)();
@@ -687,6 +695,17 @@ var ProTable = function ProTable(props) {
   }
   function onFormatResult(next) {
     props.onFormatResult && props.onFormatResult(next);
+    // 如果开启了 autoRedirect 当当前页数不为1，并且data为空的时候，重定向到第一页
+    if (autoRedirect) {
+      var _next$data;
+      if (!(next === null || next === void 0 ? void 0 : (_next$data = next.data) === null || _next$data === void 0 ? void 0 : _next$data.length) && currentPage > 1) {
+        setCurrentPage(1);
+        setShowLoading(true);
+        setTimeout(function () {
+          _request(_defineProperty({}, targetPageKey, 1));
+        });
+      }
+    }
     var time = 0;
     if (autoRefresh) {
       time = 60 * 1000;
@@ -703,14 +722,14 @@ var ProTable = function ProTable(props) {
     }
     // 设置 dataSource、total
     if (switchViewState === 'table' || currentPage === 1 || (cardViewProps === null || cardViewProps === void 0 ? void 0 : cardViewProps.useTablePagination)) {
-      var _next$data;
+      var _next$data2;
       _setData(next.data || []);
-      setTotal(next.total || ((_next$data = next.data) === null || _next$data === void 0 ? void 0 : _next$data.length));
+      setTotal(next.total || ((_next$data2 = next.data) === null || _next$data2 === void 0 ? void 0 : _next$data2.length));
     }
     if (switchViewState === 'card' && currentPage !== 1 && !(cardViewProps === null || cardViewProps === void 0 ? void 0 : cardViewProps.useTablePagination)) {
-      var _next$data2;
+      var _next$data3;
       _setData([].concat(_toConsumableArray(data), _toConsumableArray(next.data || [])));
-      setTotal(total + (next.total || ((_next$data2 = next.data) === null || _next$data2 === void 0 ? void 0 : _next$data2.length)));
+      setTotal(total + (next.total || ((_next$data3 = next.data) === null || _next$data3 === void 0 ? void 0 : _next$data3.length)));
     }
     setShowSkeleton(false);
   }
@@ -840,6 +859,16 @@ var ProTable = function ProTable(props) {
             totalRes = res.total,
             success = res.success;
           if (success === true) {
+            // 如果开启了 autoRedirect 当当前页数不为1，并且data为空的时候，重定向到第一页
+            if (autoRedirect) {
+              if (!(dataRes === null || dataRes === void 0 ? void 0 : dataRes.length) && currentPage > 1) {
+                setCurrentPage(1);
+                setShowLoading(true);
+                setTimeout(function () {
+                  _request(_defineProperty({}, targetPageKey, 1));
+                });
+              }
+            }
             // 设置 dataSource、total
             if (switchViewState === 'table' || params[targetPageKey] === 1 || isReset || (cardViewProps === null || cardViewProps === void 0 ? void 0 : cardViewProps.useTablePagination)) {
               _setData(dataRes || []);
@@ -865,7 +894,7 @@ var ProTable = function ProTable(props) {
             time = 60 * 1000;
           }
           if (autoRefresh && typeof autoRefresh !== 'boolean') {
-            time = autoRefresh ? autoRefresh(data) : 0;
+            time = autoRefresh ? autoRefresh(dataRes) : 0;
           }
           if (Number.isInteger(time) && time >= 1000) {
             autoRefreshTimerRef.current = setTimeout(function () {
@@ -935,10 +964,7 @@ var ProTable = function ProTable(props) {
   var renderTable = function renderTable(isFullScreen) {
     if (propsColumns) {
       return /*#__PURE__*/_react.default.createElement("div", {
-        className: (0, _classnames.default)('teamix-pro-table-container', className, 'teamix-test-request'),
-        "data-teamix-test-request": "url=".concat(url, "&formatResult=").concat(!!formatResult),
-        "data-teamix-test-params": (0, _utils.getTestRequestParams)(propsParams),
-        "data-teamix-test-data": (0, _utils.getTestRequestData)(propsColumns),
+        className: (0, _classnames.default)('teamix-pro-table-container', className),
         "data-teamix-spm": dataTeamixSpm
       }, /*#__PURE__*/_react.default.createElement(_Layout.default, {
         header: header,
@@ -1037,7 +1063,7 @@ var ProTable = function ProTable(props) {
       _request(_objectSpread(_defineProperty({}, targetPageKey, currentPage), params));
     }
     function onChangePaginationSize(currentPageSize) {
-      var _request8;
+      var _request10;
       // 翻页默认清空选择
       if (!reserveSelectedRecords) {
         var _actionRef$current9, _actionRef$current9$c;
@@ -1045,7 +1071,7 @@ var ProTable = function ProTable(props) {
       }
       setPageSize(currentPageSize);
       setCurrentPage(1);
-      _request((_request8 = {}, _defineProperty(_request8, targetPageSizeKey, currentPageSize), _defineProperty(_request8, targetPageKey, 1), _request8));
+      _request((_request10 = {}, _defineProperty(_request10, targetPageSizeKey, currentPageSize), _defineProperty(_request10, targetPageKey, 1), _request10));
     }
     function renderRowSelection() {
       if (rowSelection) {
@@ -1098,11 +1124,6 @@ var ProTable = function ProTable(props) {
         responsivePaginationType: responsivePaginationType,
         // shape="arrow-only"
         // pageSizePosition="end"
-        totalRender: function totalRender(total) {
-          return (0, _utils.getMessage)('total', {
-            total: new Intl.NumberFormat().format(total)
-          });
-        },
         pageSize: pageSize,
         current: currentPage,
         pageSizeList: pageSizeList,
@@ -1110,7 +1131,8 @@ var ProTable = function ProTable(props) {
         type: total / pageSize <= 2 ? 'simple' : 'normal',
         onPageSizeChange: function onPageSizeChange(number) {
           return onChangePaginationSize(number);
-        }
+        },
+        useMaxData: globalUseMaxData !== null && globalUseMaxData !== void 0 ? globalUseMaxData : useMaxData
       }, othersPaginationProps)))));
     } else if (!showPagination && (footerAction || rowSelection || useRowSelection)) {
       return /*#__PURE__*/_react.default.createElement("div", {

package/lib/table/typing.d.ts

@@ -172,6 +172,10 @@ export declare type ProTableProps = {
     bindUrl?: boolean;
     /** 绑定 url 配置 **/
     bindUrlProps?: ProTableBindUrlProps;
+    /** 当前页数据被删除完后，是否跳转回第一页 **/
+    autoRedirect?: boolean;
+    /** 使用超大数据模式 **/
+    useMaxData?: boolean;
 } & Omit<TableProps, 'columns'> & ProTableTopAreaProps;
 export declare type rowSelectionType = {
     getProps?: (record: any, index: number) => any;

package/lib/xconsole.scss

@@ -1,4 +1,5 @@
 .theme-xconsole {
+  --tab-item-padding-lr-size-m: var(--s-4, 16px);
   --color-event-p9: rgba(121, 197, 224, 1);
   --color-event-p10: rgba(175, 222, 240, 1);
   --color-event-p8: rgba(73, 173, 209, 1);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@teamix/pro",
-  "version": "1.5.22",
+  "version": "1.5.24",
   "description": "TeamixPro大包",
   "keywords": [
     "aliyun",