@lemon-fe/components 1.4.21 → 1.4.22-alpha.1

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

@@ -81,7 +81,7 @@ declare class InternalDataGrid<TData extends Record<string, any>> extends Compon
      */
     private loadingChange;
     private getDataFromServer;
-    private pagination;
+    pagination(page: number, pageSize: number): void;
     private init;
     private NoRowsOverlay;
     private getMainMenuItems;

package/es/data-grid/index.js

@@ -712,15 +712,11 @@ var InternalDataGrid = /*#__PURE__*/function (_Component) {
       var enable = false;
       if (_typeof(pagination) === 'object') {
         enable = true;
-        pageSize = pagination.defaultPageSize || pagination.pageSize || 20;
+        pageSize = pagination.defaultPageSize || pagination.pageSize || 50;
         page = pagination.defaultCurrent || pagination.current || 1;
         total = pagination.total || 0;
-      } else if (pagination === true) {
-        enable = true;
-      } else if (pagination === false) {
-        enable = false;
-        total = Number.MAX_SAFE_INTEGER;
-        pageSize = Number.MAX_SAFE_INTEGER;
+      } else if (typeof pagination === 'boolean') {
+        enable = pagination;
       } else if (fetch !== undefined) {
         enable = true;
       }
@@ -739,12 +735,19 @@ var InternalDataGrid = /*#__PURE__*/function (_Component) {
         columns = _this$props6.columns,
         rowSelection = _this$props6.rowSelection,
         dataSource = _this$props6.dataSource,
-        context = _this$props6.context;
+        context = _this$props6.context,
+        pagination = _this$props6.pagination;
       if (!shallowEqual(context, prevProps.context)) {
         this.store.setState({
           context: context
         });
       }
+      if (!shallowEqual(pagination, prevProps.pagination)) {
+        var pageData = this.getPagination();
+        this.setState({
+          pagination: pageData.pagination
+        });
+      }
       if (!this.isReady) {
         return;
       }
@@ -1482,13 +1485,20 @@ var InternalDataGrid = /*#__PURE__*/function (_Component) {
         }
         var _this$state2 = this.state,
           page = _this$state2.page,
-          pageSize = _this$state2.pageSize;
+          pageSize = _this$state2.pageSize,
+          pagination = _this$state2.pagination;
         var columnState = this.columnApi.getColumnState();
         var id = this.requestId;
         this.loadingChange(true);
-        fetch({
+        var pageParams = {
           current: page,
-          pageSize: pageSize,
+          pageSize: pageSize
+        };
+        if (!pagination) {
+          pageParams.current = 1;
+          pageParams.pageSize = Number.MAX_SAFE_INTEGER;
+        }
+        fetch(_objectSpread(_objectSpread({}, pageParams), {}, {
           sort: columnState.filter(function (item) {
             return item.sort !== undefined && item.sort !== null;
           }).map(function (item) {
@@ -1497,7 +1507,7 @@ var InternalDataGrid = /*#__PURE__*/function (_Component) {
               order: item.sort
             };
           })
-        }).then(function (res) {
+        })).then(function (res) {
           if (id !== _this6.requestId) {
             return;
           }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lemon-fe/components",
-  "version": "1.4.21",
+  "version": "1.4.22-alpha.1",
   "description": "> TODO: description",
   "homepage": "",
   "license": "MIT",
@@ -58,5 +58,5 @@
   "publishConfig": {
     "registry": "https://registry.npmjs.org"
   },
-  "gitHead": "15b71c17c9ced5731fb27139384c10ad063929d6"
+  "gitHead": "cd26a96e874a81673af79672cb2d3cc06ae48069"
 }