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

package/es/data-grid/index.js

@@ -1022,7 +1022,7 @@ var InternalDataGrid = /*#__PURE__*/function (_Component) {
     key: "getFullColumnDef",
     value: function getFullColumnDef(col) {
       if (col.type === undefined) {
-        return _objectSpread({}, col);
+        return col;
       }
       var _this$props7 = this.props,
         mColumnTypes = _this$props7.columnTypes,
@@ -1062,6 +1062,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 +1095,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 +1121,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.3",
   "description": "> TODO: description",
   "homepage": "",
   "license": "MIT",
@@ -58,5 +58,5 @@
   "publishConfig": {
     "registry": "https://registry.npmjs.org"
   },
-  "gitHead": "f4344479e739f297b7901b3ed3f3d91e45b5074a"
+  "gitHead": "2ac91e3697f76af6883a124f78461e3e119da69f"
 }