@teamix/pro 1.5.21 → 1.5.23

package/lib/sidebar/index.js

@@ -47,7 +47,7 @@ Object.keys(_utils2).forEach(function (key) {
   });
 });
 var _IconSwitch = _interopRequireDefault(require("./components/tree-node/components/IconSwitch"));
-var _excluded = ["selectedKeys", "checkedKeys", "dataSource", "className", "style", "searchOnChange", "showSearch", "onSelect", "onCheck", "treeProps", "cardProps", "actionRef", "onBeforeRenderNodeEvent", "beforeRenderNode", "url", "method", "params", "data", "extendParams", "beforeRequest", "successMsg", "errorMsg", "formatParams", "formatResult", "onSuccess", "onError", "link", "scrollArea", "onExpandAllChange", "onExpandLevelChange"];
+var _excluded = ["selectedKeys", "checkedKeys", "defaultSelectedKeys", "defaultCheckedKeys", "dataSource", "className", "style", "searchOnChange", "showSearch", "onSelect", "onCheck", "treeProps", "cardProps", "actionRef", "onBeforeRenderNodeEvent", "beforeRenderNode", "url", "method", "params", "data", "extendParams", "beforeRequest", "successMsg", "errorMsg", "formatParams", "formatResult", "onSuccess", "onError", "link", "scrollArea", "onExpandAllChange", "onExpandLevelChange"];
 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; }
@@ -66,6 +66,8 @@ var cls = (0, _utils.usePrefixCls)('teamix-pro-sidebar');
 var ProSidebar = function ProSidebar(props) {
   var selectedKeys = props.selectedKeys,
     checkedKeys = props.checkedKeys,
+    defaultSelectedKeys = props.defaultSelectedKeys,
+    defaultCheckedKeys = props.defaultCheckedKeys,
     dataSourceProp = props.dataSource,
     _props$className = props.className,
     className = _props$className === void 0 ? '' : _props$className,
@@ -217,7 +219,9 @@ var ProSidebar = function ProSidebar(props) {
     beforeRenderNode: beforeRenderNode,
     expandAll: expandAllState,
     expandLevel: expandLevelState,
-    onDataSourceChange: onDataSourceChange
+    onDataSourceChange: onDataSourceChange,
+    defaultSelectedKeys: defaultSelectedKeys,
+    defaultCheckedKeys: defaultCheckedKeys
   }, treeProps))));
 };
 var _default = ProSidebar;

package/lib/sidebar/typing.d.ts

@@ -10,8 +10,12 @@ export declare type ProSidebarProps = {
     dataSource?: ProSidebarDataSource;
     /** 点击的节点 */
     selectedKeys?: TreeProps['selectedKeys'];
+    /** 非受控 默认点击的节点 */
+    defaultSelectedKeys?: TreeProps['defaultSelectedKeys'];
     /** 选中的节点 */
     checkedKeys?: TreeProps['checkedKeys'];
+    /** 非受控 默认选中的节点 */
+    defaultCheckedKeys?: TreeProps['defaultCheckedKeys'];
     /** 节点点击回调 */
     onSelect?: TreeProps['onSelect'];
     /** 节点选中回调 */

package/lib/table/components/Filter/index.js

@@ -11,6 +11,7 @@ var _components = require("@alicloudfe/components");
 var _utils = require("@teamix/utils");
 require("./index.scss");
 var _hooks = require("@teamix/hooks");
+var _field = _interopRequireDefault(require("../../../field"));
 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; }
@@ -166,7 +167,13 @@ var Filter = function Filter(props) {
         onChange: function onChange(check) {
           setSelected([valueStr]);
         }
-      }, label);
+      }, /*#__PURE__*/_react.default.createElement(_field.default, {
+        type: 'text',
+        value: label,
+        render: {
+          ellipsis: true
+        }
+      }));
     });
   };
   // 渲染多选
@@ -188,7 +195,13 @@ var Filter = function Filter(props) {
             }));
           }
         }
-      }, label);
+      }, /*#__PURE__*/_react.default.createElement(_field.default, {
+        type: 'text',
+        value: label,
+        render: {
+          ellipsis: true
+        }
+      }));
     });
   };
   // 渲染选择区域

package/lib/table/components/Pagination/index.d.ts

@@ -3,5 +3,6 @@ import { responsivePaginationType } from '../../typing';
 import './index.scss';
 declare const _default: (props: PaginationProps & {
     responsivePaginationType?: responsivePaginationType;
+    useMaxData?: boolean;
 }) => JSX.Element;
 export default _default;

package/lib/table/components/Pagination/index.js

@@ -10,7 +10,7 @@ var _components = require("@alicloudfe/components");
 var _utils = require("@teamix/utils");
 var _hooks = require("@teamix/hooks");
 require("./index.scss");
-var _excluded = ["className", "onChange", "total", "pageSize", "current", "pageSizeList", "pageSizeSelector", "onPageSizeChange", "responsivePaginationType"];
+var _excluded = ["className", "onChange", "total", "pageSize", "current", "pageSizeList", "pageSizeSelector", "onPageSizeChange", "responsivePaginationType", "useMaxData"];
 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; }
 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; }
@@ -34,6 +34,7 @@ var _default = function _default(props) {
     pageSizeSelector = props.pageSizeSelector,
     onPageSizeChange = props.onPageSizeChange,
     responsivePaginationType = props.responsivePaginationType,
+    useMaxData = props.useMaxData,
     otherProps = _objectWithoutProperties(props, _excluded);
   var basePrefix = (0, _utils.usePrefixCls)('', {
     base: true
@@ -56,20 +57,44 @@ var _default = function _default(props) {
     _useState4 = _slicedToArray(_useState3, 2),
     currentPage = _useState4[0],
     setCurrentPage = _useState4[1];
+  var maxDataState = (0, _react.useMemo)(function () {
+    return Math.ceil((total !== null && total !== void 0 ? total : 0) / (pageSize !== null && pageSize !== void 0 ? pageSize : 0)) > 100;
+  }, [total, pageSize]);
   var commonPaginationProps = {
     className: className,
     onChange: propsOnChange,
-    total: total,
+    total: useMaxData && maxDataState ? (pageSize !== null && pageSize !== void 0 ? pageSize : 0) * 100 : total,
     pageSize: pageSize,
     current: current,
     shape: 'arrow-only',
     pageSizeList: pageSizeList,
     pageSizeSelector: pageSizeSelector,
     pageSizePosition: 'end',
-    onPageSizeChange: onPageSizeChange
+    onPageSizeChange: onPageSizeChange,
+    // pagination 的渲染函数
+    pageNumberRender: function pageNumberRender(index) {
+      if (useMaxData && maxDataState) {
+        if (index === 100) {
+          return '100+';
+        }
+        return index;
+      }
+      return index;
+    }
   };
+  // 获取总数
+  var getTotalContent = (0, _react.useMemo)(function () {
+    if (useMaxData && maxDataState) {
+      return (0, _utils.getMessage)('total', {
+        total: new Intl.NumberFormat().format((pageSize !== null && pageSize !== void 0 ? pageSize : 0) * 100) + '+'
+      });
+    }
+    return (0, _utils.getMessage)('total', {
+      total: new Intl.NumberFormat().format(total !== null && total !== void 0 ? total : 0)
+    });
+  }, [pageSize, total, maxDataState]);
   // 自定义总数，用于 small、mini
-  var customTotalRender = function customTotalRender(total) {
+  var customTotalRender = function customTotalRender() {
     return /*#__PURE__*/_react.default.createElement(_components.Balloon, {
       visible: visible,
       closable: false,
@@ -86,9 +111,7 @@ var _default = function _default(props) {
         style: {
           lineHeight: '18px'
         }
-      }, (0, _utils.getMessage)('total', {
-        total: new Intl.NumberFormat().format(total)
-      }))
+      }, getTotalContent)
     }, /*#__PURE__*/_react.default.createElement("div", {
       className: prefixCls('custom-total-content')
     }, /*#__PURE__*/_react.default.createElement("div", {
@@ -185,7 +208,7 @@ var _default = function _default(props) {
       } else {
         return /*#__PURE__*/_react.default.createElement("div", {
           className: (0, _utils.cls)(basePrefix('pagination'), prefixCls('custom-mini-pagination'))
-        }, customTotalRender(total), customJumpRender());
+        }, customTotalRender(), customJumpRender());
       }
     }
   };
@@ -193,27 +216,23 @@ var _default = function _default(props) {
     switch (responsivePaginationType || responsiveProps) {
       case 'normal':
         return /*#__PURE__*/_react.default.createElement(_components.Pagination, _objectSpread(_objectSpread({}, commonPaginationProps), {}, {
-          totalRender: function totalRender(total) {
-            return (0, _utils.getMessage)('total', {
-              total: new Intl.NumberFormat().format(total)
-            });
+          totalRender: function totalRender() {
+            return getTotalContent;
           }
         }, otherProps));
       case 'simple':
         return /*#__PURE__*/_react.default.createElement(_components.Pagination, _objectSpread(_objectSpread({}, commonPaginationProps), {}, {
           pageShowCount: 3,
-          totalRender: function totalRender(total) {
-            return (0, _utils.getMessage)('total', {
-              total: new Intl.NumberFormat().format(total)
-            });
+          totalRender: function totalRender() {
+            return getTotalContent;
           }
         }, otherProps));
       case 'small':
         return /*#__PURE__*/_react.default.createElement(_components.Pagination, _objectSpread(_objectSpread({}, commonPaginationProps), {}, {
           pageShowCount: 3,
           pageSizeSelector: false,
-          totalRender: function totalRender(total) {
-            return customTotalRender(total);
+          totalRender: function totalRender() {
+            return customTotalRender();
           }
         }, otherProps));
       case 'mini':

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;
@@ -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) && pageSize > 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) && pageSize > 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 || []);
@@ -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/package.json

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