@kdcloudjs/table 1.1.5-canary.2 → 1.1.5-canary.4

package/dist/@kdcloudjs/table.css

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

package/dist/@kdcloudjs/table.js

@@ -1,6 +1,6 @@
 /*!
  * 
- *   @kdcloudjs/table v1.1.5-canary.1
+ *   @kdcloudjs/table v1.1.5-canary.3
  * 
  *   Copyright 2020-present, Kingdee, Inc.
  *   All rights reserved.
@@ -5274,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,
@@ -5287,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;
@@ -5840,7 +5842,9 @@ function filter() {
         mode = opts.mode,
         filterIcon = opts.filterIcon,
         stopClickEventPropagation = opts.stopClickEventPropagation,
-        hideFilterPopupHeader = opts.hideFilterPopupHeader;
+        stopESCKeyDownEventPropagation = opts.stopESCKeyDownEventPropagation,
+        hideFilterPopupHeader = opts.hideFilterPopupHeader,
+        getPopupParent = opts.getPopupParent;
     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;
     var inputFiltersMap = new Map(inputFilters.map(function (filterItem) {
@@ -5903,7 +5907,9 @@ 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,
-            hideFilterPopupHeader: hideFilterPopupHeader
+            stopESCKeyDownEventPropagation: stopESCKeyDownEventPropagation,
+            hideFilterPopupHeader: hideFilterPopupHeader,
+            getPopupParent: getPopupParent
           })]); // result.headerCellProps = mergeCellProps(col.headerCellProps, {
           //   style: {
           //     paddingRight: '18px'
@@ -7136,10 +7142,11 @@ function Panel(_ref) {
       filterIcon = _ref.filterIcon,
       hidePanel = _ref.hidePanel,
       renderPanelContent = _ref.renderPanelContent,
-      hideFilterPopupHeader = _ref.hideFilterPopupHeader;
+      hideFilterPopupHeader = _ref.hideFilterPopupHeader,
+      popupParent = _ref.popupParent;
   var filterPanelRef = react__WEBPACK_IMPORTED_MODULE_3___default.a.useRef(null);
 
-  var _React$useState = react__WEBPACK_IMPORTED_MODULE_3___default.a.useState(Object(_utils__WEBPACK_IMPORTED_MODULE_11__["calculatePopupRelative"])(ele, document.body, _getPanelOffset(ele, hideFilterPopupHeader))),
+  var _React$useState = react__WEBPACK_IMPORTED_MODULE_3___default.a.useState(Object(_utils__WEBPACK_IMPORTED_MODULE_11__["calculatePopupRelative"])(ele, popupParent, _getPanelOffset(ele, hideFilterPopupHeader))),
       _React$useState2 = _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_1___default()(_React$useState, 2),
       position = _React$useState2[0],
       setPosition = _React$useState2[1];
@@ -7150,7 +7157,7 @@ function Panel(_ref) {
   };
 
   var handleFilterPanelResize = function handleFilterPanelResize(resize) {
-    setPosition(Object(_utils__WEBPACK_IMPORTED_MODULE_11__["calculatePopupRelative"])(ele, document.body, _getPanelOffset(ele, hideFilterPopupHeader)));
+    setPosition(Object(_utils__WEBPACK_IMPORTED_MODULE_11__["calculatePopupRelative"])(ele, popupParent, _getPanelOffset(ele, hideFilterPopupHeader)));
   };
 
   Object(react__WEBPACK_IMPORTED_MODULE_3__["useEffect"])(function () {
@@ -7184,7 +7191,9 @@ function Filter(_ref2) {
       filterModel = _ref2.filterModel,
       isFilterActive = _ref2.isFilterActive,
       stopClickEventPropagation = _ref2.stopClickEventPropagation,
-      hideFilterPopupHeader = _ref2.hideFilterPopupHeader;
+      stopESCKeyDownEventPropagation = _ref2.stopESCKeyDownEventPropagation,
+      hideFilterPopupHeader = _ref2.hideFilterPopupHeader,
+      getPopupParent = _ref2.getPopupParent;
 
   var _React$useState3 = react__WEBPACK_IMPORTED_MODULE_3___default.a.useState(false),
       _React$useState4 = _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_1___default()(_React$useState3, 2),
@@ -7219,25 +7228,30 @@ 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();
+      }
     }
   };
 
   var iconClassName = classnames__WEBPACK_IMPORTED_MODULE_6___default()((_cx = {}, _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0___default()(_cx, className, true), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0___default()(_cx, 'filter-panel-open', showPanel), _cx));
   var displayFilterIcon = typeof filterIcon === 'function' ? filterIcon(isFilterActive) : filterIcon;
+  var popupParent = (getPopupParent === null || getPopupParent === void 0 ? void 0 : getPopupParent(iconWrapRef.current)) || document.body;
   return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement(FilterIconSpanStyle, {
     style: style,
     className: iconClassName,
@@ -7256,8 +7270,9 @@ function Filter(_ref2) {
     filterIcon: displayFilterIcon,
     hidePanel: hidePanel,
     renderPanelContent: renderPanelContent,
-    hideFilterPopupHeader: hideFilterPopupHeader
-  }), document.body));
+    hideFilterPopupHeader: hideFilterPopupHeader,
+    popupParent: popupParent
+  }), popupParent));
 }
 
 function _getPanelOffset(ele, hideFilterPopupHeader) {