@lemon-fe/kits 1.0.0-196 → 1.0.0-197

package/es/components/DataGrid/index.js

@@ -625,7 +625,8 @@ var DataGrid = /*#__PURE__*/function (_Component) {
   }, {
     key: "componentDidUpdate",
     value: function componentDidUpdate(prevProps) {
-      var _prevProps$rowSelecti;
+      var _this2 = this,
+          _prevProps$rowSelecti;
 
       var _this$props4 = this.props,
           columns = _this$props4.columns,
@@ -633,13 +634,22 @@ var DataGrid = /*#__PURE__*/function (_Component) {
           dataSource = _this$props4.dataSource,
           context = _this$props4.context;
 
+      if (!this.ready) {
+        console.warn('表格初始化尚未完成，但部分属性发生了变化，请检查属性设置是否合理');
+      }
+
       if (columns !== prevProps.columns) {
         this.syncColRender();
-        this.updateColumnDefs(this.columnApi.getColumnState());
-        this.api.refreshCells({
-          columns: this.fields.map(function (item) {
-            return item.id;
-          })
+        this.afterReady(function () {
+          _this2.updateColumnDefs(_this2.columnApi.getColumnState());
+
+          if (_this2.fields.length > 0) {
+            _this2.api.refreshCells({
+              columns: _this2.fields.map(function (item) {
+                return item.id;
+              })
+            });
+          }
         });
       }
 
@@ -791,18 +801,18 @@ var DataGrid = /*#__PURE__*/function (_Component) {
   }, {
     key: "syncSelection",
     value: function syncSelection() {
-      var _this2 = this;
+      var _this3 = this;
 
       this.afterReady(function () {
-        var _this2$props$rowSelec = _this2.props.rowSelection;
-        _this2$props$rowSelec = _this2$props$rowSelec === void 0 ? {} : _this2$props$rowSelec;
-        var selectedRowKeys = _this2$props$rowSelec.selectedRowKeys;
+        var _this3$props$rowSelec = _this3.props.rowSelection;
+        _this3$props$rowSelec = _this3$props$rowSelec === void 0 ? {} : _this3$props$rowSelec;
+        var selectedRowKeys = _this3$props$rowSelec.selectedRowKeys;
 
-        if (selectedRowKeys !== undefined && !_this2.selected.isSameKeys(selectedRowKeys)) {
+        if (selectedRowKeys !== undefined && !_this3.selected.isSameKeys(selectedRowKeys)) {
           var newSelected = new Map();
 
-          _this2.selected.forEach(function (id) {
-            var node = _this2.api.getRowNode(id);
+          _this3.selected.forEach(function (id) {
+            var node = _this3.api.getRowNode(id);
 
             if (node !== undefined) {
               node.setSelected(false, false, true);
@@ -810,7 +820,7 @@ var DataGrid = /*#__PURE__*/function (_Component) {
           });
 
           selectedRowKeys.forEach(function (id) {
-            var node = _this2.api.getRowNode(id);
+            var node = _this3.api.getRowNode(id);
 
             var data;
 
@@ -819,12 +829,12 @@ var DataGrid = /*#__PURE__*/function (_Component) {
               data = node.data;
             }
 
-            newSelected.set(id, data || _this2.selected.get(id) || null);
+            newSelected.set(id, data || _this3.selected.get(id) || null);
           });
 
-          _this2.selected.clone(newSelected);
+          _this3.selected.clone(newSelected);
 
-          _this2.api.dispatchEvent({
+          _this3.api.dispatchEvent({
             type: 'selectionChanged'
           });
         }
@@ -833,7 +843,7 @@ var DataGrid = /*#__PURE__*/function (_Component) {
   }, {
     key: "syncRowData",
     value: function syncRowData() {
-      var _this3 = this;
+      var _this4 = this;
 
       var dataSource = this.props.dataSource;
 
@@ -848,8 +858,8 @@ var DataGrid = /*#__PURE__*/function (_Component) {
           total: dataSource.length,
           page: newPage
         }, function () {
-          if (newPage !== page && _this3.isClientMode()) {
-            _this3.api.paginationGoToPage(newPage - 1);
+          if (newPage !== page && _this4.isClientMode()) {
+            _this4.api.paginationGoToPage(newPage - 1);
           }
         });
       }
@@ -857,7 +867,7 @@ var DataGrid = /*#__PURE__*/function (_Component) {
   }, {
     key: "updateColumnDefs",
     value: function updateColumnDefs(state) {
-      var _this4 = this;
+      var _this5 = this;
 
       var _this$getColumnDefs = this.getColumnDefs(),
           _this$getColumnDefs2 = _slicedToArray(_this$getColumnDefs, 2),
@@ -865,7 +875,7 @@ var DataGrid = /*#__PURE__*/function (_Component) {
           leafColIds = _this$getColumnDefs2[1];
 
       this.afterReady(function () {
-        _this4.api.setColumnDefs(defs);
+        _this5.api.setColumnDefs(defs);
 
         if (state) {
           var newState = _toConsumableArray(state);
@@ -886,7 +896,7 @@ var DataGrid = /*#__PURE__*/function (_Component) {
             }
           });
 
-          _this4.columnApi.applyColumnState({
+          _this5.columnApi.applyColumnState({
             state: newState,
             applyOrder: true
           });
@@ -896,7 +906,7 @@ var DataGrid = /*#__PURE__*/function (_Component) {
   }, {
     key: "getColumnDefs",
     value: function getColumnDefs() {
-      var _this5 = this;
+      var _this6 = this;
 
       var _this$props6 = this.props,
           _this$props6$columns = _this$props6.columns,
@@ -1135,7 +1145,7 @@ var DataGrid = /*#__PURE__*/function (_Component) {
               if (DataGrid.isSummaryRow({
                 node: node
               }) && field.summaryType === 1) {
-                var summary = _this5.getFieldsSummary(_this5.dataSource, _this5.fields);
+                var summary = _this6.getFieldsSummary(_this6.dataSource, _this6.fields);
 
                 return get(summary, field.id);
               }
@@ -1238,7 +1248,7 @@ var DataGrid = /*#__PURE__*/function (_Component) {
           headerClass: prefix('operator-cell'),
           cellRendererParams: {
             render: function render(_, data) {
-              var actions = _this5.props.rowActions;
+              var actions = _this6.props.rowActions;
 
               if (actions !== undefined) {
                 return /*#__PURE__*/React.createElement(Actions, {
@@ -1295,21 +1305,21 @@ var DataGrid = /*#__PURE__*/function (_Component) {
   }, {
     key: "updateRowData",
     value: function updateRowData() {
-      var _this6 = this;
+      var _this7 = this;
 
       var data = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
       this.afterReady(function () {
-        _this6.dataSource = data;
+        _this7.dataSource = data;
 
-        _this6.api.setRowData(data);
+        _this7.api.setRowData(data);
 
-        if (_this6.isPreserveSelected()) {
-          _this6.api.forEachNode(function (node) {
-            if (node.id && _this6.selected.has(node.id)) {
-              var rowData = _this6.selected.get(node.id);
+        if (_this7.isPreserveSelected()) {
+          _this7.api.forEachNode(function (node) {
+            if (node.id && _this7.selected.has(node.id)) {
+              var rowData = _this7.selected.get(node.id);
 
               if (node.data !== undefined && rowData !== node.data) {
-                _this6.selected.set(node.id, node.data);
+                _this7.selected.set(node.id, node.data);
               }
 
               if (!node.isSelected()) {
@@ -1319,20 +1329,20 @@ var DataGrid = /*#__PURE__*/function (_Component) {
           });
         } else {
           var keys = new Map(data.map(function (item) {
-            return [_this6.getRowId({
+            return [_this7.getRowId({
               data: item
             }), item];
           }));
 
-          _this6.selected.forEach(function (id) {
+          _this7.selected.forEach(function (id) {
             if (!keys.has(id)) {
-              _this6.selected.delete(id);
+              _this7.selected.delete(id);
             } else {
-              var node = _this6.api.getRowNode(id);
+              var node = _this7.api.getRowNode(id);
 
               if (node !== undefined) {
-                if (node.data !== undefined && _this6.selected.get(id) !== node.data) {
-                  _this6.selected.set(id, node.data);
+                if (node.data !== undefined && _this7.selected.get(id) !== node.data) {
+                  _this7.selected.set(id, node.data);
                 }
 
                 if (!node.isSelected()) {
@@ -1343,8 +1353,8 @@ var DataGrid = /*#__PURE__*/function (_Component) {
           });
         }
 
-        if (_this6.selected.isDirty()) {
-          _this6.api.dispatchEvent({
+        if (_this7.selected.isDirty()) {
+          _this7.api.dispatchEvent({
             type: 'selectionChanged'
           });
         }
@@ -1378,7 +1388,7 @@ var DataGrid = /*#__PURE__*/function (_Component) {
   }, {
     key: "getDataFromServer",
     value: function getDataFromServer() {
-      var _this7 = this;
+      var _this8 = this;
 
       var _this$props7 = this.props,
           fetch = _this$props7.fetch,
@@ -1389,7 +1399,7 @@ var DataGrid = /*#__PURE__*/function (_Component) {
         if (onLoading) {
           onLoading(flag);
         } else {
-          _this7.setState({
+          _this8.setState({
             loading: flag
           });
         }
@@ -1418,74 +1428,74 @@ var DataGrid = /*#__PURE__*/function (_Component) {
             };
           })
         }).then(function (res) {
-          if (id !== _this7.requestId) {
+          if (id !== _this8.requestId) {
             return;
           }
 
           loadingChange(false);
 
           if (res.total !== undefined) {
-            _this7.setState({
+            _this8.setState({
               page: page,
               pageSize: pageSize,
               total: res.total
             });
           }
 
-          var summary = _this7.props.summary;
+          var summary = _this8.props.summary;
 
-          _this7.updateRowData(res.data);
+          _this8.updateRowData(res.data);
 
-          _this7.api.setPinnedBottomRowData(_this7.getSummaryRowData(summary, res.summary));
+          _this8.api.setPinnedBottomRowData(_this8.getSummaryRowData(summary, res.summary));
 
           if (res.data.length > 0) {
-            _this7.api.ensureIndexVisible(0);
+            _this8.api.ensureIndexVisible(0);
           }
 
           if (onLoad) {
             onLoad(res.extra);
           }
 
-          _this7.store.setState({
+          _this8.store.setState({
             fetchError: undefined
           });
         }).catch(function (err) {
-          _this7.store.setState({
+          _this8.store.setState({
             fetchError: err
           });
 
           loadingChange(false);
           /** 如果当前是在第一页说明根本没有数据，会误杀其他情况，但不重要 */
 
-          _this7.setState(function (prev) {
+          _this8.setState(function (prev) {
             return {
               total: prev.page === 1 ? 0 : prev.total
             };
           });
 
-          _this7.updateRowData([]);
+          _this8.updateRowData([]);
 
-          _this7.api.setPinnedBottomRowData([]);
+          _this8.api.setPinnedBottomRowData([]);
         });
       }
     }
   }, {
     key: "pagination",
     value: function pagination(page, pageSize) {
-      var _this8 = this;
+      var _this9 = this;
 
       this.setState({
         page: page,
         pageSize: pageSize
       }, function () {
-        if (_this8.isClientMode()) {
+        if (_this9.isClientMode()) {
           withSyncRender(function () {
-            _this8.api.paginationGoToPage(page - 1);
+            _this9.api.paginationGoToPage(page - 1);
 
-            _this8.api.paginationSetPageSize(pageSize);
+            _this9.api.paginationSetPageSize(pageSize);
           });
         } else {
-          _this8.getDataFromServer();
+          _this9.getDataFromServer();
         }
       });
     }
@@ -1501,7 +1511,7 @@ var DataGrid = /*#__PURE__*/function (_Component) {
   }, {
     key: "validateRecord",
     value: function validateRecord(record) {
-      var _this9 = this;
+      var _this10 = this;
 
       if (this.validator === null) {
         return;
@@ -1511,7 +1521,7 @@ var DataGrid = /*#__PURE__*/function (_Component) {
         data: record
       });
       return this.validator.validate(record).then(function () {
-        var errors = new Map(_this9.store.getState().errors);
+        var errors = new Map(_this10.store.getState().errors);
         var error = errors.get(rowId);
 
         if (error === undefined) {
@@ -1520,12 +1530,12 @@ var DataGrid = /*#__PURE__*/function (_Component) {
 
         errors.delete(rowId);
 
-        _this9.store.setState({
+        _this10.store.setState({
           errors: errors
         });
       }).catch(function (_ref3) {
         var fields = _ref3.fields;
-        var errors = new Map(_this9.store.getState().errors);
+        var errors = new Map(_this10.store.getState().errors);
         var error = new Map();
         Object.entries(fields).forEach(function (item) {
           error.set(item[0], item[1].map(function (err) {
@@ -1534,7 +1544,7 @@ var DataGrid = /*#__PURE__*/function (_Component) {
         });
         errors.set(rowId, error);
 
-        _this9.store.setState({
+        _this10.store.setState({
           errors: errors
         });
       });
@@ -1543,7 +1553,7 @@ var DataGrid = /*#__PURE__*/function (_Component) {
     key: "validate",
     value: function () {
       var _validate = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
-        var _this10 = this;
+        var _this11 = this;
 
         var promises, result, flag, errors, failed;
         return _regeneratorRuntime().wrap(function _callee4$(_context4) {
@@ -1558,14 +1568,14 @@ var DataGrid = /*#__PURE__*/function (_Component) {
                     return;
                   }
 
-                  var rowId = _this10.getRowId({
+                  var rowId = _this11.getRowId({
                     data: record
                   });
 
-                  if (_this10.validator === null) {
+                  if (_this11.validator === null) {
                     promises.push(Promise.resolve(true));
                   } else {
-                    promises.push(_this10.validator.validate(record).catch(function (_ref4) {
+                    promises.push(_this11.validator.validate(record).catch(function (_ref4) {
                       var fields = _ref4.fields;
                       return Promise.reject({
                         id: rowId,
@@ -1633,13 +1643,13 @@ var DataGrid = /*#__PURE__*/function (_Component) {
   }, {
     key: "fetch",
     value: function fetch(page) {
-      var _this11 = this;
+      var _this12 = this;
 
       var curr = page || 1;
 
       var delay = function delay() {
-        if (_this11.isReady) {
-          _this11.getDataFromServer();
+        if (_this12.isReady) {
+          _this12.getDataFromServer();
         } else {
           requestAnimationFrame(delay);
         }
@@ -1697,7 +1707,7 @@ var DataGrid = /*#__PURE__*/function (_Component) {
   }, {
     key: "render",
     value: function render() {
-      var _this12 = this,
+      var _this13 = this,
           _classNames;
 
       var _this$props8 = this.props,
@@ -1765,7 +1775,7 @@ var DataGrid = /*#__PURE__*/function (_Component) {
           current: page,
           total: total,
           onChange: function onChange(curr, limit) {
-            _this12.pagination(curr, limit);
+            _this13.pagination(curr, limit);
 
             if (mPage.onChange) {
               mPage.onChange(curr, limit);
@@ -1786,7 +1796,7 @@ var DataGrid = /*#__PURE__*/function (_Component) {
             return;
           }
 
-          _this12.handleBlur();
+          _this13.handleBlur();
         },
         onFocus: this.handleFocus
       }, /*#__PURE__*/React.createElement(AgGridReact, _extends({

package/es/components/Icons/Tip.d.ts

@@ -1,5 +1,5 @@
 import Icon from '@ant-design/icons';
 import type { ComponentProps } from 'react';
 export default function Tip(props: {
-    type?: 'success' | 'error' | 'warning' | 'info';
+    type?: 'success' | 'error' | 'warning' | 'info' | 'warn';
 } & ComponentProps<typeof Icon>): JSX.Element;

package/es/components/Icons/Tip.js

@@ -133,6 +133,7 @@ export default function Tip(props) {
 
   switch (type) {
     case 'warning':
+    case 'warn':
       comp = WarningSvg;
       break;
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lemon-fe/kits",
-  "version": "1.0.0-196",
+  "version": "1.0.0-197",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",