@kdcloudjs/table 1.2.0-canary.8 → 1.2.0-canary.9

package/dist/@kdcloudjs/table.css

@@ -1,6 +1,6 @@
 /*!
  * 
- *   @kdcloudjs/table v1.2.0-canary.7
+ *   @kdcloudjs/table v1.2.0-canary.8
  * 
  *   Copyright 2020-present, Kingdee, Inc.
  *   All rights reserved.

package/dist/@kdcloudjs/table.js

@@ -1,6 +1,6 @@
 /*!
  * 
- *   @kdcloudjs/table v1.2.0-canary.7
+ *   @kdcloudjs/table v1.2.0-canary.8
  * 
  *   Copyright 2020-present, Kingdee, Inc.
  *   All rights reserved.
@@ -6032,7 +6032,7 @@ function filter() {
         var filterActive = filterable && (inputFiltersMap === null || inputFiltersMap === void 0 ? void 0 : (_inputFiltersMap$get = inputFiltersMap.get(col.code)) === null || _inputFiltersMap$get === void 0 ? void 0 : (_inputFiltersMap$get$ = _inputFiltersMap$get.filter) === null || _inputFiltersMap$get$ === void 0 ? void 0 : _inputFiltersMap$get$.length) > 0;
 
         if (filterable) {
-          var _col$features2, _col$features$filterI, _col$features3, _result$title, _cx;
+          var _col$features2, _col$features$filterI, _col$features3, _cx;
 
           var handleFilterChanged = function handleFilterChanged(filterItem) {
             var nextFiltersMap = new Map(inputFiltersMap);
@@ -6066,7 +6066,8 @@ function filter() {
 
           var filterPanel = (_col$features2 = col.features) === null || _col$features2 === void 0 ? void 0 : _col$features2.filterPanel;
           var colFilterIcon = (_col$features$filterI = (_col$features3 = col.features) === null || _col$features3 === void 0 ? void 0 : _col$features3.filterIcon) !== null && _col$features$filterI !== void 0 ? _col$features$filterI : filterIcon;
-          result.title = [].concat(_babel_runtime_helpers_toConsumableArray__WEBPACK_IMPORTED_MODULE_4___default()([].concat((_result$title = result.title) !== null && _result$title !== void 0 ? _result$title : [_internals__WEBPACK_IMPORTED_MODULE_19__["internals"].safeRenderHeader(_objectSpread({}, col))])), [/*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_17___default.a.createElement(_filter__WEBPACK_IMPORTED_MODULE_21__["Filter"], {
+
+          var _Filter = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_17___default.a.createElement(_filter__WEBPACK_IMPORTED_MODULE_21__["Filter"], {
             key: "filter",
             FilterPanelContent: filterPanel,
             filterIcon: colFilterIcon,
@@ -6080,11 +6081,20 @@ function filter() {
             hideFilterPopupHeader: hideFilterPopupHeader,
             getPopupParent: getPopupParent,
             localeText: localeText
-          })]); // result.headerCellProps = mergeCellProps(col.headerCellProps, {
+          });
+
+          if (col.renderHeader) {
+            result.title = col.renderHeader(result.title, _Filter);
+          } else {
+            var _result$title;
+
+            result.title = [].concat(_babel_runtime_helpers_toConsumableArray__WEBPACK_IMPORTED_MODULE_4___default()([].concat((_result$title = result.title) !== null && _result$title !== void 0 ? _result$title : [_internals__WEBPACK_IMPORTED_MODULE_19__["internals"].safeRenderHeader(_objectSpread({}, col))])), [_Filter]);
+          } // result.headerCellProps = mergeCellProps(col.headerCellProps, {
           //   style: {
           //     paddingRight: '18px'
           //   }
           // })
+
         }
 
         if (!Object(_utils__WEBPACK_IMPORTED_MODULE_20__["isLeafNode"])(col)) {
@@ -10117,10 +10127,29 @@ function sort() {
             title: col.title && col.title[0] ? col.title[0] : col.title
           })));
 
-          if (result.title && result.title[0]) {
-            result.title[0] = sortNode;
+          var _sortNodeWithoutTitle = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_23___default.a.createElement(SortHeaderCell, {
+            onToggle: function onToggle(e) {
+              if (stopClickEventPropagation) {
+                e.stopPropagation();
+              }
+
+              toggle(col.code);
+            },
+            sortOrder: sortOrder,
+            column: col,
+            sortIndex: sortIndex,
+            sortOptions: sortOptions
+          }); // 开启标题行高自适应后，修改表头的渲染结构
+
+
+          if (col.renderHeader) {
+            result.title = col.renderHeader(result.title, _sortNodeWithoutTitle);
           } else {
-            result.title = sortNode;
+            if (result.title && result.title[0]) {
+              result.title[0] = sortNode;
+            } else {
+              result.title = sortNode;
+            }
           }
         }