@kdcloudjs/table 1.1.5-canary.1 → 1.1.5-canary.3

package/dist/@kdcloudjs/table.css

@@ -1,6 +1,6 @@
 /*!
  * 
- *   @kdcloudjs/table v1.1.4-canary.2
+ *   @kdcloudjs/table v1.1.5-canary.2
  * 
  *   Copyright 2020-present, Kingdee, Inc.
  *   All rights reserved.

package/dist/@kdcloudjs/table.js

@@ -1,6 +1,6 @@
 /*!
  * 
- *   @kdcloudjs/table v1.1.4-canary.2
+ *   @kdcloudjs/table v1.1.5-canary.2
  * 
  *   Copyright 2020-present, Kingdee, Inc.
  *   All rights reserved.
@@ -3981,7 +3981,7 @@ var BaseTable = /*#__PURE__*/function (_React$Component) {
   }, {
     key: "componentDidMount",
     value: function componentDidMount() {
-      var _this$props$setTableW2, _this$props9, _this$props$setTableD, _this$props10;
+      var _this$props$setTableW2, _this$props9, _this$props$setTableD, _this$props10, _this$props$setRowHei, _this$props11;
 
       // console.log('did mount start')
       // console.log('update dom helper start')
@@ -4002,6 +4002,7 @@ var BaseTable = /*#__PURE__*/function (_React$Component) {
       });
       (_this$props$setTableW2 = (_this$props9 = this.props).setTableWidth) === null || _this$props$setTableW2 === void 0 ? void 0 : _this$props$setTableW2.call(_this$props9, this.domHelper.tableBody.clientWidth);
       (_this$props$setTableD = (_this$props10 = this.props).setTableDomHelper) === null || _this$props$setTableD === void 0 ? void 0 : _this$props$setTableD.call(_this$props10, this.domHelper);
+      (_this$props$setRowHei = (_this$props11 = this.props).setRowHeightManager) === null || _this$props$setRowHei === void 0 ? void 0 : _this$props$setRowHei.call(_this$props11, this.rowHeightManager);
     }
   }, {
     key: "componentDidUpdate",
@@ -5273,11 +5274,13 @@ var colGroupExtendable = function colGroupExtendable() {
       var addIcon = function addIcon(col) {
         var result = _objectSpread({}, col);
 
+        var curColState = curState[col.code];
+        var displaycolExtendIcon = typeof opts.extendIcon === 'function' ? opts.extendIcon(curColState) : opts.extendIcon;
         var addIconNode = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_10___default.a.createElement(react__WEBPACK_IMPORTED_MODULE_10___default.a.Fragment, null, _internals__WEBPACK_IMPORTED_MODULE_12__["internals"].safeRenderHeader(_objectSpread({}, col)), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_10___default.a.createElement(ExtendIconStyle, {
           onClick: function onClick() {
             toggle(col);
           }
-        }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_10___default.a.createElement(ExpandIcon, {
+        }, displaycolExtendIcon || /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_10___default.a.createElement(ExpandIcon, {
           style: {
             userSelect: 'none',
             marginLeft: 2,
@@ -5286,8 +5289,8 @@ var colGroupExtendable = function colGroupExtendable() {
             verticalAlign: 'middle'
           },
           className: classnames__WEBPACK_IMPORTED_MODULE_14___default()(_babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_7___default()({}, _base_styles__WEBPACK_IMPORTED_MODULE_15__["Classes"].tableExtendIcon, true)),
-          size: 16,
-          isExtend: curState[col.code]
+          size: 14,
+          isExtend: curColState
         })));
         result.title = addIconNode;
         return result;
@@ -5839,6 +5842,7 @@ function filter() {
         mode = opts.mode,
         filterIcon = opts.filterIcon,
         stopClickEventPropagation = opts.stopClickEventPropagation,
+        stopESCKeyDownEventPropagation = opts.stopESCKeyDownEventPropagation,
         hideFilterPopupHeader = opts.hideFilterPopupHeader;
     var inputFilters = (_ref = (_ref2 = filters !== null && filters !== void 0 ? filters : pipeline.getStateAtKey(stateKey)) !== null && _ref2 !== void 0 ? _ref2 : defaultFilters) !== null && _ref !== void 0 ? _ref : [];
     inputFilters = mode === 'single' ? inputFilters.slice(0, 1) : inputFilters;
@@ -5902,6 +5906,7 @@ function filter() {
             isFilterActive: filterActive,
             className: classnames__WEBPACK_IMPORTED_MODULE_18___default()((_cx = {}, _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_5___default()(_cx, _base_styles__WEBPACK_IMPORTED_MODULE_22__["Classes"].tableFilterTrigger, true), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_5___default()(_cx, "active", filterActive), _cx)),
             stopClickEventPropagation: stopClickEventPropagation,
+            stopESCKeyDownEventPropagation: stopESCKeyDownEventPropagation,
             hideFilterPopupHeader: hideFilterPopupHeader
           })]); // result.headerCellProps = mergeCellProps(col.headerCellProps, {
           //   style: {
@@ -7183,6 +7188,7 @@ function Filter(_ref2) {
       filterModel = _ref2.filterModel,
       isFilterActive = _ref2.isFilterActive,
       stopClickEventPropagation = _ref2.stopClickEventPropagation,
+      stopESCKeyDownEventPropagation = _ref2.stopESCKeyDownEventPropagation,
       hideFilterPopupHeader = _ref2.hideFilterPopupHeader;
 
   var _React$useState3 = react__WEBPACK_IMPORTED_MODULE_3___default.a.useState(false),
@@ -7218,20 +7224,24 @@ function Filter(_ref2) {
   var handleIconClick = function handleIconClick(e) {
     // 只有当icon区域点击会触发面板展开
     // 防止 createPortal 区域的点击触发该事件
-    if (!e.currentTarget.contains(e.target)) {
-      return;
+    if (e.currentTarget.contains(e.target)) {
+      setShowPanel(true);
     }
 
     if (stopClickEventPropagation) {
       e.stopPropagation();
     }
-
-    setShowPanel(true);
   };
 
   var handleKeyDown = function handleKeyDown(e) {
-    if (e.currentTarget.contains(e.target) && e.keyCode === _utils_keyCode__WEBPACK_IMPORTED_MODULE_13__["default"].ESC) {
-      setShowPanel(false);
+    if (e.keyCode === _utils_keyCode__WEBPACK_IMPORTED_MODULE_13__["default"].ESC) {
+      if (e.currentTarget.contains(e.target)) {
+        setShowPanel(false);
+      }
+
+      if (stopESCKeyDownEventPropagation) {
+        e.stopPropagation();
+      }
     }
   };
 
@@ -10391,7 +10401,6 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_15___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_15__);
 /* harmony import */ var _utils__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(/*! ../utils */ "./components/table/utils/index.tsx");
 /* harmony import */ var _features_autoFill__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(/*! ./features/autoFill */ "./components/table/pipeline/features/autoFill.tsx");
-/* harmony import */ var _features_rangeSelection__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(/*! ./features/rangeSelection */ "./components/table/pipeline/features/rangeSelection.tsx");
 
 
 
@@ -10416,7 +10425,6 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 
 
 
-
 /**
  * 表格数据处理流水线。TablePipeline 提供了表格数据处理过程中的一些上下方与工具方法，包括……
  *
@@ -10699,16 +10707,11 @@ var TablePipeline = /*#__PURE__*/function () {
         _this2.ref.current.domHelper = domHelper;
       };
 
-      return result;
-    }
-    /**
-     * 清除范围选中内容
-     */
+      result.setRowHeightManager = function (rowHeightManager) {
+        _this2.ref.current.rowHeightManager = rowHeightManager;
+      };
 
-  }, {
-    key: "clearRangeSelection",
-    value: function clearRangeSelection() {
-      this.setStateAtKey(_features_rangeSelection__WEBPACK_IMPORTED_MODULE_18__["rangeSelectionKey"], null);
+      return result;
     }
   }]);