@lemon-fe/kits 1.0.0-193 → 1.0.0-195

package/es/components/DataGrid/index.js

@@ -667,9 +667,7 @@ var DataGrid = /*#__PURE__*/function (_Component) {
     key: "componentDidMount",
     value: function () {
       var _componentDidMount = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
-        var _this2 = this;
-
-        var _this$props5, customColumnPanelStorage, autoLoad, done, data;
+        var _this$props5, customColumnPanelStorage, autoLoad, state, data;
 
         return _regeneratorRuntime().wrap(function _callee3$(_context3) {
           while (1) {
@@ -678,16 +676,14 @@ var DataGrid = /*#__PURE__*/function (_Component) {
                 window.addEventListener('blur', this.handleFocus);
                 _this$props5 = this.props, customColumnPanelStorage = _this$props5.customColumnPanelStorage, autoLoad = _this$props5.autoLoad;
 
-                done = function done() {
-                  if (_this2.isClientMode()) {
-                    _this2.syncRowData();
-                  } else if (autoLoad) {
-                    _this2.getDataFromServer();
-                  }
-                };
+                if (this.isClientMode()) {
+                  this.syncRowData();
+                } else if (autoLoad) {
+                  this.getDataFromServer();
+                }
 
                 if (!customColumnPanelStorage) {
-                  _context3.next = 18;
+                  _context3.next = 19;
                   break;
                 }
 
@@ -703,11 +699,7 @@ var DataGrid = /*#__PURE__*/function (_Component) {
 
                 if (data) {
                   this.fields = data.fields;
-                  this.afterReady(function () {
-                    _this2.updateColumnDefs(data.columState);
-                  });
-                } else {
-                  this.updateColumnDefs();
+                  state = data.columState;
                 }
 
                 _context3.next = 15;
@@ -719,15 +711,15 @@ var DataGrid = /*#__PURE__*/function (_Component) {
                 console.log('获取列定制失败', _context3.t0.message);
 
               case 15:
+                this.updateColumnDefs(state);
                 this.setState({
                   loading: false
                 });
                 _context3.next = 20;
                 break;
 
-              case 18:
+              case 19:
                 this.updateColumnDefs();
-                done();
 
               case 20:
               case "end":
@@ -799,18 +791,18 @@ var DataGrid = /*#__PURE__*/function (_Component) {
   }, {
     key: "syncSelection",
     value: function syncSelection() {
-      var _this3 = this;
+      var _this2 = this;
 
       this.afterReady(function () {
-        var _this3$props$rowSelec = _this3.props.rowSelection;
-        _this3$props$rowSelec = _this3$props$rowSelec === void 0 ? {} : _this3$props$rowSelec;
-        var selectedRowKeys = _this3$props$rowSelec.selectedRowKeys;
+        var _this2$props$rowSelec = _this2.props.rowSelection;
+        _this2$props$rowSelec = _this2$props$rowSelec === void 0 ? {} : _this2$props$rowSelec;
+        var selectedRowKeys = _this2$props$rowSelec.selectedRowKeys;
 
-        if (selectedRowKeys !== undefined && !_this3.selected.isSameKeys(selectedRowKeys)) {
+        if (selectedRowKeys !== undefined && !_this2.selected.isSameKeys(selectedRowKeys)) {
           var newSelected = new Map();
 
-          _this3.selected.forEach(function (id) {
-            var node = _this3.api.getRowNode(id);
+          _this2.selected.forEach(function (id) {
+            var node = _this2.api.getRowNode(id);
 
             if (node !== undefined) {
               node.setSelected(false, false, true);
@@ -818,7 +810,7 @@ var DataGrid = /*#__PURE__*/function (_Component) {
           });
 
           selectedRowKeys.forEach(function (id) {
-            var node = _this3.api.getRowNode(id);
+            var node = _this2.api.getRowNode(id);
 
             var data;
 
@@ -827,12 +819,12 @@ var DataGrid = /*#__PURE__*/function (_Component) {
               data = node.data;
             }
 
-            newSelected.set(id, data || _this3.selected.get(id) || null);
+            newSelected.set(id, data || _this2.selected.get(id) || null);
           });
 
-          _this3.selected.clone(newSelected);
+          _this2.selected.clone(newSelected);
 
-          _this3.api.dispatchEvent({
+          _this2.api.dispatchEvent({
             type: 'selectionChanged'
           });
         }
@@ -841,7 +833,7 @@ var DataGrid = /*#__PURE__*/function (_Component) {
   }, {
     key: "syncRowData",
     value: function syncRowData() {
-      var _this4 = this;
+      var _this3 = this;
 
       var dataSource = this.props.dataSource;
 
@@ -856,8 +848,8 @@ var DataGrid = /*#__PURE__*/function (_Component) {
           total: dataSource.length,
           page: newPage
         }, function () {
-          if (newPage !== page && _this4.isClientMode()) {
-            _this4.api.paginationGoToPage(newPage - 1);
+          if (newPage !== page && _this3.isClientMode()) {
+            _this3.api.paginationGoToPage(newPage - 1);
           }
         });
       }
@@ -865,36 +857,41 @@ var DataGrid = /*#__PURE__*/function (_Component) {
   }, {
     key: "updateColumnDefs",
     value: function updateColumnDefs(state) {
+      var _this4 = this;
+
       var _this$getColumnDefs = this.getColumnDefs(),
           _this$getColumnDefs2 = _slicedToArray(_this$getColumnDefs, 2),
           defs = _this$getColumnDefs2[0],
           leafColIds = _this$getColumnDefs2[1];
 
-      this.api.setColumnDefs(defs);
+      this.afterReady(function () {
+        _this4.api.setColumnDefs(defs);
 
-      if (state) {
-        var newState = _toConsumableArray(state);
+        if (state) {
+          var newState = _toConsumableArray(state);
 
-        leafColIds.forEach(function (colId, index) {
-          if (!colId) {
-            return;
-          }
+          leafColIds.forEach(function (colId, index) {
+            if (!colId) {
+              return;
+            }
 
-          var idx = state.findIndex(function (item) {
-            return item.colId === colId;
+            var idx = state.findIndex(function (item) {
+              return item.colId === colId;
+            });
+
+            if (idx < 0) {
+              newState.splice(index, 0, {
+                colId: colId
+              });
+            }
           });
 
-          if (idx < 0) {
-            newState.splice(index, 0, {
-              colId: colId
-            });
-          }
-        });
-        this.columnApi.applyColumnState({
-          state: newState,
-          applyOrder: true
-        });
-      }
+          _this4.columnApi.applyColumnState({
+            state: newState,
+            applyOrder: true
+          });
+        }
+      });
     }
   }, {
     key: "getColumnDefs",
@@ -1802,6 +1799,7 @@ var DataGrid = /*#__PURE__*/function (_Component) {
         suppressClipboardPaste: true,
         enableCellEditingOnBackspace: true,
         maintainColumnOrder: true,
+        suppressCsvExport: true,
         noRowsOverlayComponent: this.NoRowsOverlay,
         getMainMenuItems: this.getMainMenuItems,
         rowBuffer: 20,

package/package.json

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