@lemon-fe/components 1.5.7-alpha.2 → 1.5.7-alpha.4

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

@@ -17,7 +17,7 @@ declare const Editors: {
     Text: React.ForwardRefExoticComponent<import("ag-grid-community").ICellEditorParams<any, any, any> & import("..").TextEditorParams<any> & React.RefAttributes<import("ag-grid-react").ICellEditorReactComp>>;
     Date: React.ForwardRefExoticComponent<import("ag-grid-community").ICellEditorParams<any, any, any> & import("..").DateEditorParams<any> & React.RefAttributes<import("ag-grid-react").ICellEditorReactComp>>;
     Number: React.ForwardRefExoticComponent<import("ag-grid-community").ICellEditorParams<any, any, any> & import("..").NumberEditorParams<any> & React.RefAttributes<import("ag-grid-react").ICellEditorReactComp>>;
-    Select: React.ForwardRefExoticComponent<import("ag-grid-community").ICellEditorParams<any, any, any> & Pick<import("antd").SelectProps<any, import("antd/lib/select").BaseOptionType>, "disabled" | "allowClear" | "mode" | "showSearch" | "virtual" | "optionFilterProp" | "options" | "listHeight"> & {
+    Select: React.ForwardRefExoticComponent<import("ag-grid-community").ICellEditorParams<any, any, any> & Pick<import("antd").SelectProps<any, import("antd/lib/select").BaseOptionType>, "disabled" | "mode" | "virtual" | "allowClear" | "showSearch" | "optionFilterProp" | "options" | "listHeight"> & {
         fieldNames?: {
             label: string;
             value: string;

package/es/data-grid/index.js

@@ -1021,26 +1021,25 @@ var InternalDataGrid = /*#__PURE__*/function (_Component) {
   }, {
     key: "getFullColumnDef",
     value: function getFullColumnDef(col) {
-      if (col.type === undefined) {
-        return _objectSpread({}, col);
-      }
       var _this$props7 = this.props,
         mColumnTypes = _this$props7.columnTypes,
         mDefaultColDef = _this$props7.defaultColDef;
-      var colTypes = this.getMemoizedColumnTypes(mColumnTypes);
       var result = {};
-      var types;
-      if (typeof col.type === 'string') {
-        types = [col.type];
-      } else {
-        types = col.type;
-      }
-      types.forEach(function (type) {
-        var colType = colTypes[type];
-        if (colType !== undefined) {
-          Object.assign(result, colType);
+      if (col.type !== undefined) {
+        var colTypes = this.getMemoizedColumnTypes(mColumnTypes);
+        var types;
+        if (typeof col.type === 'string') {
+          types = [col.type];
+        } else {
+          types = col.type;
         }
-      });
+        types.forEach(function (type) {
+          var colType = colTypes[type];
+          if (colType !== undefined) {
+            Object.assign(result, colType);
+          }
+        });
+      }
       Object.assign(result, mDefaultColDef);
       return _objectSpread(_objectSpread({}, result), col);
     }
@@ -1062,6 +1061,7 @@ var InternalDataGrid = /*#__PURE__*/function (_Component) {
       var map = function map(cols) {
         return cols.map(function (item) {
           if (isColumn(item)) {
+            var _opts$headerName, _opts$sortable;
             var title = item.title,
               dataIndex = item.dataIndex,
               render = item.render,
@@ -1094,9 +1094,6 @@ var InternalDataGrid = /*#__PURE__*/function (_Component) {
             } else if (title !== undefined) {
               opts.headerName = title.toString();
             }
-            if (enableEstimateInitialColumnWidth && opts.headerName && !keepInitialWidthWhenEstimate) {
-              opts.initialWidth = Math.min(getTextWidth(opts.headerName) * 14 + 36 + (opts.headerComponentParams !== undefined ? 24 : 0), ESTIMATE_INITIAL_COLUMN_MAX_WIDTH);
-            }
 
             // render
             if (render !== undefined) {
@@ -1123,6 +1120,11 @@ var InternalDataGrid = /*#__PURE__*/function (_Component) {
                 opts.sortable = sorter;
               }
             }
+            var headerName = (_opts$headerName = opts.headerName) !== null && _opts$headerName !== void 0 ? _opts$headerName : def.headerName;
+            var sortable = (_opts$sortable = opts.sortable) !== null && _opts$sortable !== void 0 ? _opts$sortable : def.sortable;
+            if (enableEstimateInitialColumnWidth && headerName && !keepInitialWidthWhenEstimate) {
+              opts.initialWidth = Math.min(getTextWidth(headerName) * 14 + 36 + (sortable ? 10 : 0) + (opts.headerComponentParams !== undefined ? 24 : 0), ESTIMATE_INITIAL_COLUMN_MAX_WIDTH);
+            }
 
             // editable
             if (_typeof(editable) === 'object') {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lemon-fe/components",
-  "version": "1.5.7-alpha.2",
+  "version": "1.5.7-alpha.4",
   "description": "> TODO: description",
   "homepage": "",
   "license": "MIT",
@@ -58,5 +58,5 @@
   "publishConfig": {
     "registry": "https://registry.npmjs.org"
   },
-  "gitHead": "f4344479e739f297b7901b3ed3f3d91e45b5074a"
+  "gitHead": "90aec9c179f56f47c778bf38e663ccc7fedb2889"
 }