@kdcloudjs/kdesign 1.3.8 → 1.3.9

package/dist/kdesign.js

@@ -1,6 +1,6 @@
 /*!
  * 
- *   @kdcloudjs/kdesign v1.3.7
+ *   @kdcloudjs/kdesign v1.3.8
  * 
  *   Copyright 2020-present, Kingdee, Inc.
  *   All rights reserved.
@@ -7988,7 +7988,8 @@ var compDefaultProps = {
       return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_1__["createElement"](_index__WEBPACK_IMPORTED_MODULE_2__["Icon"], {
         type: "arrow-right-solid"
       });
-    }
+    },
+    estimatedItemSize: 32
   },
   TreeNode: {},
   ToolTip: {
@@ -21676,8 +21677,13 @@ var Menu = function Menu(props) {
 
   var _React$useState3 = react__WEBPACK_IMPORTED_MODULE_18___default.a.useState([]),
       _React$useState4 = _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_8___default()(_React$useState3, 2),
-      openKeys = _React$useState4[0],
-      setOpenKeys = _React$useState4[1];
+      selectedKeyPath = _React$useState4[0],
+      setSelectedKeyPath = _React$useState4[1];
+
+  var _React$useState5 = react__WEBPACK_IMPORTED_MODULE_18___default.a.useState([]),
+      _React$useState6 = _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_8___default()(_React$useState5, 2),
+      openKeys = _React$useState6[0],
+      setOpenKeys = _React$useState6[1];
 
   if (mode === 'inline') {
     restProps.triggerSubMenuAction = 'click';
@@ -21686,6 +21692,7 @@ var Menu = function Menu(props) {
   Object(react__WEBPACK_IMPORTED_MODULE_18__["useEffect"])(function () {
     setOpenKeys([]);
     setSelectedKey('');
+    setSelectedKeyPath([]);
     openSubMenuSet.clear();
   }, [mode]);
   Object(react__WEBPACK_IMPORTED_MODULE_18__["useEffect"])(function () {
@@ -21696,22 +21703,29 @@ var Menu = function Menu(props) {
   Object(react__WEBPACK_IMPORTED_MODULE_18__["useEffect"])(function () {
     if (userOpenKeys !== undefined && Array.isArray(userOpenKeys)) {
       setOpenKeys(userOpenKeys);
-      openSubMenuSet.clear();
-      userOpenKeys.forEach(function (d) {
-        openSubMenuSet.add(d);
+    }
+  }, [userOpenKeys]);
+  Object(react__WEBPACK_IMPORTED_MODULE_18__["useEffect"])(function () {
+    if (userSelectedKey !== undefined && userOpenKeys !== undefined && Array.isArray(userOpenKeys)) {
+      setSelectedKeyPath(userOpenKeys);
+      setTimeout(function () {
+        userOpenKeys.forEach(function (d) {
+          openSubMenuSet.add(d);
+        });
       });
     }
-  }, [userOpenKeys]); // React.useEffect(() => {
-  //   setCollapsed(restProps.collapsed)
-  // }, [restProps.collapsed])
+  }, []);
 
   var handleOnClick = function handleOnClick(info) {
     if (userSelectedKey === undefined) {
       setSelectedKey(info.key);
     }
 
+    setSelectedKeyPath(info.keyPath);
+
     if (mode !== 'inline' && openKeys.length > 0) {
       setOpenKeys([]);
+      openSubMenuSet.clear();
     }
 
     onClick && onClick(info);
@@ -21761,6 +21775,7 @@ var Menu = function Menu(props) {
         mode: mode,
         openKeys: openKeys,
         selectedKey: selectedKey,
+        selectedKeyPath: selectedKeyPath,
         theme: theme,
         triggerSubMenuAction: restProps.triggerSubMenuAction,
         forceSubMenuRender: forceSubMenuRender,
@@ -22028,7 +22043,7 @@ __webpack_require__.r(__webpack_exports__);
 
 
 
-var _excluded = ["prefixCls", "theme", "mode", "title", "icon", "disabled", "children", "collapsed", "keyValue", "selectedKey", "openKeys", "triggerSubMenuAction", "forceSubMenuRender", "inlineIndent", "className", "style", "handleOnOpenChange", "paddingLeft"];
+var _excluded = ["prefixCls", "theme", "mode", "title", "icon", "disabled", "children", "collapsed", "keyValue", "selectedKey", "selectedKeyPath", "openKeys", "triggerSubMenuAction", "forceSubMenuRender", "inlineIndent", "className", "style", "handleOnOpenChange", "paddingLeft"];
 
 
 
@@ -22065,6 +22080,7 @@ var SubMenu = function SubMenu(props) {
       collapsed = _getCompProps.collapsed,
       keyValue = _getCompProps.keyValue,
       selectedKey = _getCompProps.selectedKey,
+      selectedKeyPath = _getCompProps.selectedKeyPath,
       openKeys = _getCompProps.openKeys,
       triggerSubMenuAction = _getCompProps.triggerSubMenuAction,
       forceSubMenuRender = _getCompProps.forceSubMenuRender,
@@ -22295,7 +22311,7 @@ var SubMenu = function SubMenu(props) {
   }; // eslint-disable-next-line react-hooks/rules-of-hooks
 
   var verticalView = Object(_utils_usePopper__WEBPACK_IMPORTED_MODULE_15__["default"])( /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_7___default.a.createElement("li", {
-    className: classnames__WEBPACK_IMPORTED_MODULE_11___default()(prefixCls, className, (_classNames2 = {}, _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0___default()(_classNames2, "light", theme === 'light'), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0___default()(_classNames2, "".concat(prefixCls, "-collapsed"), collapsed), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0___default()(_classNames2, "".concat(prefixCls, "-disabled"), disabled), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0___default()(_classNames2, "".concat(prefixCls, "-hover"), !disabled && visible), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0___default()(_classNames2, "".concat(prefixCls, "-active"), Array.isArray(openKeys) && openKeys.includes(keyValue)), _classNames2)),
+    className: classnames__WEBPACK_IMPORTED_MODULE_11___default()(prefixCls, className, (_classNames2 = {}, _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0___default()(_classNames2, "light", theme === 'light'), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0___default()(_classNames2, "".concat(prefixCls, "-collapsed"), collapsed), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0___default()(_classNames2, "".concat(prefixCls, "-disabled"), disabled), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0___default()(_classNames2, "".concat(prefixCls, "-hover"), !disabled && Array.isArray(openKeys) && openKeys.includes(keyValue)), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0___default()(_classNames2, "".concat(prefixCls, "-active"), Array.isArray(selectedKeyPath) && selectedKeyPath.includes(keyValue)), _classNames2)),
     ref: subMenuVerticalRef,
     key: keyValue // style={Object.assign(style || {}, { display: mode === 'vertical' ? 'list-item' : 'none' })}
     ,
@@ -22339,7 +22355,7 @@ var SubMenu = function SubMenu(props) {
     arrow: false,
     placement: 'rightTop',
     gap: 0,
-    visible: isVertical ? visible : false,
+    visible: isVertical && !disabled ? visible : false,
     disabled: isVertical ? undefined : true,
     prefixCls: 'kd-menu-popper',
     popperClassName: theme === 'light' ? 'light' : ''
@@ -22352,7 +22368,7 @@ var SubMenu = function SubMenu(props) {
 
     return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_7___default.a.createElement("li", _babel_runtime_helpers_extends__WEBPACK_IMPORTED_MODULE_1___default()({
       ref: subMenuRef,
-      className: classnames__WEBPACK_IMPORTED_MODULE_11___default()(prefixCls, className, (_classNames4 = {}, _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0___default()(_classNames4, "".concat(prefixCls, "-collapsed"), collapsed), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0___default()(_classNames4, "".concat(prefixCls, "-disabled"), disabled), _classNames4)),
+      className: classnames__WEBPACK_IMPORTED_MODULE_11___default()(prefixCls, className, (_classNames4 = {}, _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0___default()(_classNames4, "".concat(prefixCls, "-collapsed"), collapsed), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0___default()(_classNames4, "".concat(prefixCls, "-disabled"), disabled), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0___default()(_classNames4, "".concat(prefixCls, "-active"), Array.isArray(selectedKeyPath) && selectedKeyPath.includes(keyValue)), _classNames4)),
       key: keyValue
     }, mouseEvent, {
       style: style
@@ -27615,7 +27631,9 @@ var InternalSelect = function InternalSelect(props, ref) {
       placeholder = selectProps.placeholder,
       dropdownStyle = selectProps.dropdownStyle,
       style = selectProps.style,
-      clearIcon = selectProps.clearIcon;
+      clearIcon = selectProps.clearIcon,
+      _selectProps$popperSt = selectProps.popperStyle,
+      popperStyle = _selectProps$popperSt === void 0 ? {} : _selectProps$popperSt;
   var isMultiple = mode === 'multiple'; // 是否多选
 
   var _useMergedState = Object(_utils_hooks__WEBPACK_IMPORTED_MODULE_19__["useMergedState"])(undefined, {
@@ -27676,7 +27694,7 @@ var InternalSelect = function InternalSelect(props, ref) {
 
   var searchCls = classnames__WEBPACK_IMPORTED_MODULE_20___default()(_babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_8___default()({}, "".concat(selectPrefixCls, "-dropdown-search"), true)); // 下拉子项列表样式
 
-  var dropContentCls = classnames__WEBPACK_IMPORTED_MODULE_20___default()(_babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_8___default()({}, "".concat(selectPrefixCls, "-dropdown-scroll"), isMultiple ? (realChildren === null || realChildren === void 0 ? void 0 : realChildren.length) > 8 : (realChildren === null || realChildren === void 0 ? void 0 : realChildren.length) > 10)); // 多选底部样式
+  var dropContentCls = classnames__WEBPACK_IMPORTED_MODULE_20___default()(_babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_8___default()({}, "".concat(selectPrefixCls, "-dropdown-scroll"), (isMultiple ? (realChildren === null || realChildren === void 0 ? void 0 : realChildren.length) > 8 : (realChildren === null || realChildren === void 0 ? void 0 : realChildren.length) > 10) || selectProps.dropdownRender)); // 多选底部样式
 
   var multipleFooterCls = classnames__WEBPACK_IMPORTED_MODULE_20___default()(_babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_8___default()({}, "".concat(selectPrefixCls, "-multiple-footer"), true)); // 多选，单选公共样式
 
@@ -28222,10 +28240,10 @@ var InternalSelect = function InternalSelect(props, ref) {
       var _selectRef$current$ge = (_selectRef$current = selectRef.current) === null || _selectRef$current === void 0 ? void 0 : _selectRef$current.getBoundingClientRect(),
           width = _selectRef$current$ge.width;
 
-      return {
+      return _objectSpread({
         width: (dropdownStyle === null || dropdownStyle === void 0 ? void 0 : dropdownStyle.width) || (width > 75 ? width : 75),
         zIndex: 1050
-      };
+      }, popperStyle);
     }
   };
 
@@ -31288,6 +31306,8 @@ function Table(props) {
   });
 
   if (footerDataSource) {
+    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+    // @ts-ignore
     pipeline.footerDataSource(footerDataSource);
   }
   /* -------------------------------------------------------------------------- */
@@ -34131,8 +34151,7 @@ var InternalTree = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_5___default.a.for
       setTreeNodeClassName = _TreeProps$setTreeNod2 === void 0 ? function () {
     return '';
   } : _TreeProps$setTreeNod2,
-      _TreeProps$estimatedI = TreeProps.estimatedItemSize,
-      innerEstimatedItemSize = _TreeProps$estimatedI === void 0 ? 28 : _TreeProps$estimatedI,
+      innerEstimatedItemSize = TreeProps.estimatedItemSize,
       style = TreeProps.style;
   var treePrefixCls = getPrefixCls(prefixCls, 'tree', customPrefixcls); // 树样式前缀
 
@@ -34913,7 +34932,7 @@ var TreeNode = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_11___default.a.forwar
   return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_11___default.a.createElement("div", {
     className: classnames__WEBPACK_IMPORTED_MODULE_12___default()("".concat(treeNodePrefixCls, "-item"), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_8___default()({}, "".concat(treeNodePrefixCls, "-item-hover"), !disabled && selectable), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_8___default()({}, "".concat(treeNodePrefixCls, "-selected"), selected && selectable && !disabled), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_8___default()({}, "".concat(treeNodePrefixCls, "-disabled"), disabled), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_8___default()({}, "".concat(treeNodePrefixCls, "-opened"), expandState), "".concat(treeNodePrefixCls, "-item-").concat(nodeKey), className),
     style: _objectSpread({
-      height: "".concat(estimatedItemSize)
+      height: "".concat(estimatedItemSize, "px")
     }, style),
     onClick: handleClick
   }, renderNode());