@lemon-fe/kits 1.0.5-0 → 1.0.5-2

package/es/components/DataGrid/index.js

@@ -391,6 +391,22 @@ var DataGrid = /*#__PURE__*/function (_Component) {
           data.push(rowNode.data);
         }
       });
+
+      if (_this.isClientMode()) {
+        var _this$state = _this.state,
+            page = _this$state.page,
+            pageSize = _this$state.pageSize;
+        var totalPages = Math.ceil(data.length / pageSize) || 1;
+        var newPage = page > totalPages ? totalPages : page;
+
+        if (newPage !== page) {
+          _this.api.paginationGoToPage(newPage - 1);
+        }
+
+        _this.setState({
+          total: data.length
+        });
+      }
       /**
        * 浅比较是为了防止通过设置props.dataSource触发onDataSourceChange
        */
@@ -874,48 +890,31 @@ var DataGrid = /*#__PURE__*/function (_Component) {
   }, {
     key: "syncRowData",
     value: function syncRowData() {
-      var _this4 = this;
-
       var dataSource = this.props.dataSource;
 
       if (dataSource !== undefined && dataSource !== this.dataSource) {
         this.updateRowData(dataSource);
-        var _this$state = this.state,
-            page = _this$state.page,
-            pageSize = _this$state.pageSize;
-        var totalPages = Math.ceil(dataSource.length / pageSize) || 1;
-        var newPage = page > totalPages ? totalPages : page;
-
-        if (newPage !== page && this.isClientMode()) {
-          this.afterReady(function () {
-            _this4.api.paginationGoToPage(newPage - 1);
-          });
-        }
-
-        this.setState({
-          total: dataSource.length
-        });
       }
     }
   }, {
     key: "updateColumnDefs",
     value: function updateColumnDefs(state) {
-      var _this5 = this;
+      var _this4 = this;
 
       var allState = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
       this.afterReady(function () {
-        var _this5$getColumnDefs = _this5.getColumnDefs(),
-            _this5$getColumnDefs2 = _slicedToArray(_this5$getColumnDefs, 2),
-            defs = _this5$getColumnDefs2[0],
-            leafColIds = _this5$getColumnDefs2[1];
+        var _this4$getColumnDefs = _this4.getColumnDefs(),
+            _this4$getColumnDefs2 = _slicedToArray(_this4$getColumnDefs, 2),
+            defs = _this4$getColumnDefs2[0],
+            leafColIds = _this4$getColumnDefs2[1];
 
-        _this5.api.setColumnDefs(defs);
+        _this4.api.setColumnDefs(defs);
 
         if (state) {
           /**
            * 表格初始化列抖动问题：先调用setColumnDefs，后applyColumnState，会产生列移动动画，所以先禁用列移动的动画
            */
-          _this5.api.__setProperty('suppressColumnMoveAnimation', true);
+          _this4.api.__setProperty('suppressColumnMoveAnimation', true);
 
           var newState = _toConsumableArray(state);
 
@@ -938,7 +937,7 @@ var DataGrid = /*#__PURE__*/function (_Component) {
            * 初始化的时候，需要使用存储的columnState，不仅仅是顺序，其他情况由于在defs里已经有列的状态控制了
            */
 
-          _this5.columnApi.applyColumnState({
+          _this4.columnApi.applyColumnState({
             state: allState ? newState : newState.map(function (item) {
               return {
                 colId: item.colId
@@ -947,7 +946,7 @@ var DataGrid = /*#__PURE__*/function (_Component) {
             applyOrder: true
           });
 
-          _this5.api.__setProperty('suppressColumnMoveAnimation', !!_this5.props.suppressColumnMoveAnimation);
+          _this4.api.__setProperty('suppressColumnMoveAnimation', !!_this4.props.suppressColumnMoveAnimation);
         }
       });
     }
@@ -984,7 +983,7 @@ var DataGrid = /*#__PURE__*/function (_Component) {
   }, {
     key: "getColumnDefs",
     value: function getColumnDefs() {
-      var _this6 = this,
+      var _this5 = this,
           _this$props$customCol;
 
       var _this$props7 = this.props,
@@ -1014,7 +1013,7 @@ var DataGrid = /*#__PURE__*/function (_Component) {
               opts.field = getColField(item);
             }
 
-            var def = _this6.getFullColumnDef(opts);
+            var def = _this5.getFullColumnDef(opts);
             /** 部分列由于使用type 可能存在colId以及field都不存在, maintainColumnOrder下updateColumnDefs有问题，故从merge后的def中提取field或者colId */
 
 
@@ -1242,7 +1241,7 @@ var DataGrid = /*#__PURE__*/function (_Component) {
               if (DataGrid.isSummaryRow({
                 node: node
               }) && field.summaryType === 1) {
-                var summary = _this6.getFieldsSummary(_this6.dataSource, _this6.fields);
+                var summary = _this5.getFieldsSummary(_this5.dataSource, _this5.fields);
 
                 return get(summary, field.id);
               }
@@ -1387,21 +1386,21 @@ var DataGrid = /*#__PURE__*/function (_Component) {
   }, {
     key: "updateRowData",
     value: function updateRowData() {
-      var _this7 = this;
+      var _this6 = this;
 
       var data = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
       this.afterReady(function () {
-        _this7.dataSource = data;
+        _this6.dataSource = data;
 
-        _this7.api.setRowData(data);
+        _this6.api.setRowData(data);
 
-        if (_this7.isPreserveSelected()) {
-          _this7.api.forEachNode(function (node) {
-            if (node.id && _this7.selected.has(node.id)) {
-              var rowData = _this7.selected.get(node.id);
+        if (_this6.isPreserveSelected()) {
+          _this6.api.forEachNode(function (node) {
+            if (node.id && _this6.selected.has(node.id)) {
+              var rowData = _this6.selected.get(node.id);
 
               if (node.data !== undefined && rowData !== node.data) {
-                _this7.selected.set(node.id, node.data);
+                _this6.selected.set(node.id, node.data);
               }
 
               if (!node.isSelected()) {
@@ -1411,20 +1410,20 @@ var DataGrid = /*#__PURE__*/function (_Component) {
           });
         } else {
           var keys = new Map(data.map(function (item) {
-            return [_this7.getRowId({
+            return [_this6.getRowId({
               data: item
             }), item];
           }));
 
-          _this7.selected.forEach(function (id) {
+          _this6.selected.forEach(function (id) {
             if (!keys.has(id)) {
-              _this7.selected.delete(id);
+              _this6.selected.delete(id);
             } else {
-              var node = _this7.api.getRowNode(id);
+              var node = _this6.api.getRowNode(id);
 
               if (node !== undefined) {
-                if (node.data !== undefined && _this7.selected.get(id) !== node.data) {
-                  _this7.selected.set(id, node.data);
+                if (node.data !== undefined && _this6.selected.get(id) !== node.data) {
+                  _this6.selected.set(id, node.data);
                 }
 
                 if (!node.isSelected()) {
@@ -1435,8 +1434,8 @@ var DataGrid = /*#__PURE__*/function (_Component) {
           });
         }
 
-        if (_this7.selected.isDirty()) {
-          _this7.api.dispatchEvent({
+        if (_this6.selected.isDirty()) {
+          _this6.api.dispatchEvent({
             type: 'selectionChanged'
           });
         }
@@ -1470,36 +1469,36 @@ var DataGrid = /*#__PURE__*/function (_Component) {
   }, {
     key: "getDataFromServer",
     value: function getDataFromServer() {
-      var _this8 = this;
+      var _this7 = this;
 
       this.afterReady(function () {
-        var _this8$props = _this8.props,
-            fetch = _this8$props.fetch,
-            onLoading = _this8$props.onLoading,
-            onLoad = _this8$props.onLoad;
+        var _this7$props = _this7.props,
+            fetch = _this7$props.fetch,
+            onLoading = _this7$props.onLoading,
+            onLoad = _this7$props.onLoad;
 
         var loadingChange = function loadingChange(flag) {
           if (onLoading) {
             onLoading(flag);
           } else {
-            _this8.setState({
+            _this7.setState({
               loading: flag
             });
           }
         };
 
         if (typeof fetch === 'function') {
-          if (_this8.requestId < Number.MAX_SAFE_INTEGER) {
-            _this8.requestId += 1;
+          if (_this7.requestId < Number.MAX_SAFE_INTEGER) {
+            _this7.requestId += 1;
           }
 
-          var _this8$state = _this8.state,
-              page = _this8$state.page,
-              pageSize = _this8$state.pageSize;
+          var _this7$state = _this7.state,
+              page = _this7$state.page,
+              pageSize = _this7$state.pageSize;
 
-          var columnState = _this8.columnApi.getColumnState();
+          var columnState = _this7.columnApi.getColumnState();
 
-          var id = _this8.requestId;
+          var id = _this7.requestId;
           loadingChange(true);
           fetch({
             current: page,
@@ -1513,54 +1512,54 @@ var DataGrid = /*#__PURE__*/function (_Component) {
               };
             })
           }).then(function (res) {
-            if (id !== _this8.requestId) {
+            if (id !== _this7.requestId) {
               return;
             }
 
             loadingChange(false);
 
             if (res.total !== undefined) {
-              _this8.setState({
+              _this7.setState({
                 page: page,
                 pageSize: pageSize,
                 total: res.total
               });
             }
 
-            var summary = _this8.props.summary;
+            var summary = _this7.props.summary;
 
-            _this8.updateRowData(res.data);
+            _this7.updateRowData(res.data);
 
-            _this8.api.setPinnedBottomRowData(_this8.getSummaryRowData(summary, res.summary));
+            _this7.api.setPinnedBottomRowData(_this7.getSummaryRowData(summary, res.summary));
 
             if (res.data.length > 0) {
-              _this8.api.ensureIndexVisible(0);
+              _this7.api.ensureIndexVisible(0);
             }
 
             if (onLoad) {
               onLoad(res.extra);
             }
 
-            _this8.store.setState({
+            _this7.store.setState({
               fetchError: undefined
             });
           }).catch(function (err) {
-            _this8.store.setState({
+            _this7.store.setState({
               fetchError: err
             });
 
             loadingChange(false);
             /** 如果当前是在第一页说明根本没有数据，会误杀其他情况，但不重要 */
 
-            _this8.setState(function (prev) {
+            _this7.setState(function (prev) {
               return {
                 total: prev.page === 1 ? 0 : prev.total
               };
             });
 
-            _this8.updateRowData([]);
+            _this7.updateRowData([]);
 
-            _this8.api.setPinnedBottomRowData([]);
+            _this7.api.setPinnedBottomRowData([]);
           });
         }
       });
@@ -1568,20 +1567,20 @@ var DataGrid = /*#__PURE__*/function (_Component) {
   }, {
     key: "pagination",
     value: function pagination(page, pageSize) {
-      var _this9 = this;
+      var _this8 = this;
 
       this.setState({
         page: page,
         pageSize: pageSize
       }, function () {
-        if (_this9.isClientMode()) {
+        if (_this8.isClientMode()) {
           withSyncRender(function () {
-            _this9.api.paginationGoToPage(page - 1);
+            _this8.api.paginationGoToPage(page - 1);
 
-            _this9.api.paginationSetPageSize(pageSize);
+            _this8.api.paginationSetPageSize(pageSize);
           });
         } else {
-          _this9.getDataFromServer();
+          _this8.getDataFromServer();
         }
       });
     }
@@ -1597,7 +1596,7 @@ var DataGrid = /*#__PURE__*/function (_Component) {
   }, {
     key: "validateRecord",
     value: function validateRecord(record) {
-      var _this10 = this;
+      var _this9 = this;
 
       if (this.validator === null) {
         return;
@@ -1607,7 +1606,7 @@ var DataGrid = /*#__PURE__*/function (_Component) {
         data: record
       });
       return this.validator.validate(record).then(function () {
-        var errors = new Map(_this10.store.getState().errors);
+        var errors = new Map(_this9.store.getState().errors);
         var error = errors.get(rowId);
 
         if (error === undefined) {
@@ -1616,12 +1615,12 @@ var DataGrid = /*#__PURE__*/function (_Component) {
 
         errors.delete(rowId);
 
-        _this10.store.setState({
+        _this9.store.setState({
           errors: errors
         });
       }).catch(function (_ref7) {
         var fields = _ref7.fields;
-        var errors = new Map(_this10.store.getState().errors);
+        var errors = new Map(_this9.store.getState().errors);
         var error = new Map();
         Object.entries(fields).forEach(function (item) {
           error.set(item[0], item[1].map(function (err) {
@@ -1630,7 +1629,7 @@ var DataGrid = /*#__PURE__*/function (_Component) {
         });
         errors.set(rowId, error);
 
-        _this10.store.setState({
+        _this9.store.setState({
           errors: errors
         });
       });
@@ -1639,7 +1638,7 @@ var DataGrid = /*#__PURE__*/function (_Component) {
     key: "validate",
     value: function () {
       var _validate = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
-        var _this11 = this;
+        var _this10 = this;
 
         var promises, result, flag, errors, failed;
         return _regeneratorRuntime().wrap(function _callee4$(_context4) {
@@ -1654,14 +1653,14 @@ var DataGrid = /*#__PURE__*/function (_Component) {
                     return;
                   }
 
-                  var rowId = _this11.getRowId({
+                  var rowId = _this10.getRowId({
                     data: record
                   });
 
-                  if (_this11.validator === null) {
+                  if (_this10.validator === null) {
                     promises.push(Promise.resolve(true));
                   } else {
-                    promises.push(_this11.validator.validate(record).catch(function (_ref8) {
+                    promises.push(_this10.validator.validate(record).catch(function (_ref8) {
                       var fields = _ref8.fields;
                       return Promise.reject({
                         id: rowId,
@@ -1729,13 +1728,13 @@ var DataGrid = /*#__PURE__*/function (_Component) {
   }, {
     key: "fetch",
     value: function fetch(page) {
-      var _this12 = this;
+      var _this11 = this;
 
       var curr = page || 1;
       this.setState({
         page: curr
       }, function () {
-        _this12.getDataFromServer();
+        _this11.getDataFromServer();
       });
     }
   }, {
@@ -1786,7 +1785,7 @@ var DataGrid = /*#__PURE__*/function (_Component) {
   }, {
     key: "render",
     value: function render() {
-      var _this13 = this,
+      var _this12 = this,
           _classNames;
 
       var _this$props8 = this.props,
@@ -1860,7 +1859,7 @@ var DataGrid = /*#__PURE__*/function (_Component) {
           current: page,
           total: total,
           onChange: function onChange(curr, limit) {
-            _this13.pagination(curr, limit);
+            _this12.pagination(curr, limit);
 
             if (mPage.onChange) {
               mPage.onChange(curr, limit);
@@ -1881,7 +1880,7 @@ var DataGrid = /*#__PURE__*/function (_Component) {
             return;
           }
 
-          _this13.handleBlur();
+          _this12.handleBlur();
         },
         onFocus: this.handleFocus
       }, /*#__PURE__*/React.createElement(AgGridReact, _extends({

package/es/styles/overrides.less

@@ -333,3 +333,15 @@ span.@{ant-prefix}-radio + * {
     line-height: 20px;
   }
 }
+
+/** alert **/
+@alert-padding-vertical: @padding-xs - 2;
+
+.@{ant-prefix}-alert {
+  align-items: flex-start;
+
+  &-icon {
+    padding: 2px 0;
+    font-size: 18px;
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lemon-fe/kits",
-  "version": "1.0.5-0",
+  "version": "1.0.5-2",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",