@lemon-fe/kits 1.0.0-192 → 1.0.0-194

package/es/components/DataGrid/index.d.ts

@@ -52,7 +52,7 @@ export default class DataGrid<TData extends Record<string, any>> extends Compone
         Text: React.ForwardRefExoticComponent<import("@ag-grid-community/core").ICellEditorParams<any, any, any> & import("./typings").TextEditorParams<any> & React.RefAttributes<import("@ag-grid-community/react").ICellEditorReactComp>>;
         Date: React.ForwardRefExoticComponent<import("@ag-grid-community/core").ICellEditorParams<any, any, any> & import("./typings").DateEditorParams<any> & React.RefAttributes<import("@ag-grid-community/react").ICellEditorReactComp>>;
         Number: React.ForwardRefExoticComponent<import("@ag-grid-community/core").ICellEditorParams<any, any, any> & import("./typings").NumberEditorParams<any> & React.RefAttributes<import("@ag-grid-community/react").ICellEditorReactComp>>;
-        Select: React.ForwardRefExoticComponent<import("@ag-grid-community/core").ICellEditorParams<any, any, any> & Pick<import("antd").SelectProps<any, import("antd/lib/select").BaseOptionType>, "disabled" | "mode" | "virtual" | "allowClear" | "options" | "showSearch" | "listHeight"> & {
+        Select: React.ForwardRefExoticComponent<import("@ag-grid-community/core").ICellEditorParams<any, any, any> & Pick<import("antd").SelectProps<any, import("antd/lib/select").BaseOptionType>, "disabled" | "allowClear" | "mode" | "options" | "virtual" | "showSearch" | "listHeight"> & {
             fieldNames?: {
                 label: string;
                 value: string;
@@ -79,6 +79,7 @@ export default class DataGrid<TData extends Record<string, any>> extends Compone
     private syncSelection;
     private syncRowData;
     private getFieldsSummary;
+    private updateColumnDefs;
     private getColumnDefs;
     private isClientMode;
     private clearReadyQueue;

package/es/components/DataGrid/index.js

@@ -495,7 +495,6 @@ var DataGrid = /*#__PURE__*/function (_Component) {
     });
 
     _this.state = _objectSpread({
-      colDefs: [],
       loading: false
     }, _this.getPagination());
     _this.store = new Store({
@@ -527,9 +526,7 @@ var DataGrid = /*#__PURE__*/function (_Component) {
         this.fields.push(field);
       }
 
-      this.setState({
-        colDefs: this.getColumnDefs()
-      });
+      this.updateColumnDefs(this.columnApi.getColumnState());
     }
   }, {
     key: "getField",
@@ -547,9 +544,7 @@ var DataGrid = /*#__PURE__*/function (_Component) {
 
       if (idx >= 0) {
         this.fields.splice(idx, 1);
-        this.setState({
-          colDefs: this.getColumnDefs()
-        });
+        this.updateColumnDefs(this.columnApi.getColumnState());
       }
     }
   }, {
@@ -592,11 +587,7 @@ var DataGrid = /*#__PURE__*/function (_Component) {
     key: "resetFields",
     value: function resetFields() {
       this.fields = [];
-      var columns = this.getColumnDefs();
-      this.api.setColumnDefs([]);
-      this.setState({
-        colDefs: columns
-      });
+      this.updateColumnDefs();
     }
   }, {
     key: "getPagination",
@@ -644,8 +635,11 @@ var DataGrid = /*#__PURE__*/function (_Component) {
 
       if (columns !== prevProps.columns) {
         this.syncColRender();
-        this.setState({
-          colDefs: this.getColumnDefs()
+        this.updateColumnDefs(this.columnApi.getColumnState());
+        this.api.refreshCells({
+          columns: this.fields.map(function (item) {
+            return item.id;
+          })
         });
       }
 
@@ -673,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) {
@@ -684,13 +676,11 @@ 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 = 19;
@@ -709,46 +699,34 @@ var DataGrid = /*#__PURE__*/function (_Component) {
 
                 if (data) {
                   this.fields = data.fields;
-                  this.afterReady(function () {
-                    _this2.columnApi.applyColumnState({
-                      state: data.columState,
-                      applyOrder: true
-                    });
-
-                    done();
-                  });
+                  state = data.columState;
                 }
 
-                this.setState({
-                  colDefs: this.getColumnDefs()
-                });
-                _context3.next = 16;
+                _context3.next = 15;
                 break;
 
-              case 13:
-                _context3.prev = 13;
+              case 12:
+                _context3.prev = 12;
                 _context3.t0 = _context3["catch"](5);
                 console.log('获取列定制失败', _context3.t0.message);
 
-              case 16:
+              case 15:
+                this.updateColumnDefs(state);
                 this.setState({
                   loading: false
                 });
-                _context3.next = 21;
+                _context3.next = 20;
                 break;
 
               case 19:
-                this.setState({
-                  colDefs: this.getColumnDefs()
-                });
-                done();
+                this.updateColumnDefs();
 
-              case 21:
+              case 20:
               case "end":
                 return _context3.stop();
             }
           }
-        }, _callee3, this, [[5, 13]]);
+        }, _callee3, this, [[5, 12]]);
       }));
 
       function componentDidMount() {
@@ -813,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);
@@ -832,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;
 
@@ -841,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'
           });
         }
@@ -855,7 +833,7 @@ var DataGrid = /*#__PURE__*/function (_Component) {
   }, {
     key: "syncRowData",
     value: function syncRowData() {
-      var _this4 = this;
+      var _this3 = this;
 
       var dataSource = this.props.dataSource;
 
@@ -870,12 +848,51 @@ 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);
           }
         });
       }
     }
+  }, {
+    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.afterReady(function () {
+        _this4.api.setColumnDefs(defs);
+
+        if (state) {
+          var newState = _toConsumableArray(state);
+
+          leafColIds.forEach(function (colId, index) {
+            if (!colId) {
+              return;
+            }
+
+            var idx = state.findIndex(function (item) {
+              return item.colId === colId;
+            });
+
+            if (idx < 0) {
+              newState.splice(index, 0, {
+                colId: colId
+              });
+            }
+          });
+
+          _this4.columnApi.applyColumnState({
+            state: newState,
+            applyOrder: true
+          });
+        }
+      });
+    }
   }, {
     key: "getColumnDefs",
     value: function getColumnDefs() {
@@ -888,6 +905,7 @@ var DataGrid = /*#__PURE__*/function (_Component) {
           rowSelection = _this$props6.rowSelection,
           columnTypesProp = _this$props6.columnTypes;
       var colTypes = this.getMemoizedColumnTypes(columnTypesProp);
+      var leafColIds = [];
 
       var map = function map(cols) {
         return cols.map(function (item) {
@@ -930,6 +948,7 @@ var DataGrid = /*#__PURE__*/function (_Component) {
               }
             }
 
+            leafColIds.push(colId);
             var _opts = {
               cellClass: className,
               lockPinned: true,
@@ -1100,6 +1119,7 @@ var DataGrid = /*#__PURE__*/function (_Component) {
 
           return match;
         });
+        leafColIds.push(field.id);
         var code = parse(expression).compile();
         result.push({
           colId: field.id,
@@ -1160,8 +1180,8 @@ var DataGrid = /*#__PURE__*/function (_Component) {
               try {
                 return code.evaluate(scope);
               } catch (err) {
-                console.error(err);
-                return NaN;
+                console.warn('DataGrid field evaluate', err);
+                return null;
               }
             }
 
@@ -1189,10 +1209,12 @@ var DataGrid = /*#__PURE__*/function (_Component) {
             sortable: false,
             suppressAutoSize: true,
             suppressMovable: true,
+            suppressMenu: true,
             lockPinned: true,
             lockVisible: true,
             suppressColumnsToolPanel: true,
             cellClass: prefix('cell-selection'),
+            headerClass: prefix('cell-selection'),
             pinned: rowSelection.fixed
           });
         }
@@ -1231,7 +1253,7 @@ var DataGrid = /*#__PURE__*/function (_Component) {
         });
       }
 
-      return result;
+      return [result, leafColIds];
     }
   }, {
     key: "isClientMode",
@@ -1701,7 +1723,6 @@ var DataGrid = /*#__PURE__*/function (_Component) {
           restProps = _objectWithoutProperties(_this$props8, _excluded4);
 
       var _this$state3 = this.state,
-          colDefs = _this$state3.colDefs,
           enablePagination = _this$state3.pagination,
           page = _this$state3.page,
           pageSize = _this$state3.pageSize,
@@ -1794,7 +1815,6 @@ var DataGrid = /*#__PURE__*/function (_Component) {
         onCellFocused: this.cellFocused,
         pagination: enablePagination,
         paginationPageSize: pageSize,
-        columnDefs: colDefs,
         getRowId: this.getRowId,
         onGridReady: this.init,
         context: context,

package/es/components/DataGrid/typings.d.ts

@@ -85,7 +85,6 @@ export declare type SortType = {
     order: SortOrder;
 };
 export declare type DataGridState<TData> = {
-    colDefs: (ColDef<TData> | ColGroupDef<TData>)[];
     pagination: boolean;
     page: number;
     pageSize: number;

package/es/components/FormLayout/index.less

@@ -1,6 +1,6 @@
 @spaceX: 16px;
 @spaceY: 8px;
-@labelWidth: 94px;
+@labelWidth: 92px;
 @minWidth: (1366px - 160px - 4 * @space-h + @spaceX) / 4;
 @maxWidth: (1920px - 200px - 4 * @space-h + @spaceX) / 5;
 
@@ -49,7 +49,7 @@
 
       &-required::before {
         position: absolute;
-        left: -11px;
+        left: -8px;
       }
 
       &-with-help &-explain {

package/package.json

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