@kdcloudjs/kdesign 1.3.8 → 1.4.1

package/lib/menu/style/mixin.less

@@ -20,12 +20,16 @@
   cursor: pointer;
 
   &-title {
-    .menuItemTitle();
-  }
+    display: flex;
+    align-items: center;
+    height: 50px;
+    .ellipsis();
 
-  &-title > span {
-    opacity: 1;
-    transition: opacity calc(@menu-motion-duration - 0.1s) cubic-bezier(0,.4,.4,1);
+    & > span {
+      .ellipsis();
+      opacity: 1;
+      transition: opacity calc(@menu-motion-duration - 0.1s) cubic-bezier(0, .4, .4, 1);
+    }
   }
 
   &-collapsed {
@@ -42,7 +46,7 @@
 
       & > span {
         opacity: 0;
-        transition: opacity calc(@menu-motion-duration - 0.1s) cubic-bezier(0,.4,.4,1);
+        transition: opacity calc(@menu-motion-duration - 0.1s) cubic-bezier(0, .4, .4, 1);
       }
     }
   }
@@ -55,75 +59,88 @@
   &-disabled {
     cursor: not-allowed;
     color: @menu-color-disabled;
-  }
-
-  &-active {
-    .hover();
+    background-color: @menu-color-background;
   }
 
   &-arrow {
     margin-left: auto;
     font-size: 16px;
+
     &-up {
       transform: rotate(180deg);
-      transition: transform calc(@menu-motion-duration - 0.1s) cubic-bezier(0,.4,.4,1);
+      transition: transform calc(@menu-motion-duration - 0.1s) cubic-bezier(0, .4, .4, 1);
     }
 
     &-down {
       transform: rotate(0deg);
-      transition: transform calc(@menu-motion-duration - 0.1s) cubic-bezier(0.4,0,0.6,1);
+      transition: transform calc(@menu-motion-duration - 0.1s) cubic-bezier(0.4, 0, 0.6, 1);
     }
   }
 }
 
-.hover {
+
+.menu-dark-hover {
   background-color: @menu-sub-color-background;
   color: @menu-sub-color-hover;
 }
 
-.light-hover {
-  background-color: @menu-light-color-background-hover;
-  color: @menu-light-color-hover;
+.menu-dark-active {
+  background-color: @menu-sub-color-background;
+  color: @menu-sub-color-hover;
 }
 
-.light-active {
-  background-color: @menu-light-color-background-active;
-  color: @menu-light-color-active;
+.menu-dark-active-inline-title {
+  color: @menu-sub-color-hover;
+  background: @menu-color-background;
+  border: none;
 }
 
-.light-default {
-  color: @menu-light-color;
-  background: #ffffff;
-}
+.menu-light-base {
+  .menu-light-default();
 
-.menuItemTitle() {
-  display: flex;
-  align-items: center;
-  height: 50px;
-  .ellipsis();
-  & > span {
-    .ellipsis();
+  .@{menuitem-prefix-cls}-disabled, .@{submenu-prefix-cls}-disabled {
+    background-color: #fff;
   }
-}
-
 
-.light {
-  .light-default();
-
-  .@{submenu-prefix-cls}-hover,
   .@{submenu-prefix-cls}-sub {
-    .light-default();
+    color: @menu-light-color;
+    background: #fafafa;
   }
 
-  .@{submenu-prefix-cls}-title:hover {
-    color: @menu-light-color-hover;
+  .@{menuitem-prefix-cls}:not(.@{menuitem-prefix-cls}-disabled):not(.@{menuitem-prefix-cls}-active):hover {
+    .menu-light-hover();
   }
 
-  .@{submenu-prefix-cls}:not(.@{submenu-prefix-cls}-disabled):hover {
-    .light-hover();
+  .@{menuitem-prefix-cls}-hover, .@{submenu-prefix-cls}-hover {
+    .menu-light-hover();
   }
 
-  .@{menuitem-prefix-cls}:not(.@{menuitem-prefix-cls}-disabled):hover {
-    .light-hover();
+  .@{menuitem-prefix-cls}-active, .@{submenu-prefix-cls}-active {
+    .menu-light-active();
   }
 }
+
+.menu-light-default {
+  color: @menu-light-color;
+  background: #ffffff;
+}
+
+.menu-light-hover {
+  background-color: @menu-light-color-background-hover;
+  color: @menu-light-color-hover;
+  border: none;
+}
+
+.menu-light-active {
+  background-color: @menu-light-color-background-active;
+  color: @menu-light-color-active;
+  border: none;
+}
+
+.menu-light-active-inline-title {
+  color: @menu-light-color-active;
+  background: #ffffff;
+  border: none;
+}
+
+

package/lib/menu/subMenu.js

@@ -11,12 +11,14 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime-corejs3/he
 
 var _extends2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/extends"));
 
-var _getOwnPropertySymbols = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/object/get-own-property-symbols"));
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/toConsumableArray"));
 
-var _includes = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/includes"));
+var _getOwnPropertySymbols = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/object/get-own-property-symbols"));
 
 var _concat = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/concat"));
 
+var _includes = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/includes"));
+
 var _map = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/map"));
 
 var _react = _interopRequireDefault(require("react"));
@@ -74,6 +76,8 @@ var SubMenu = function SubMenu(props) {
       collapsed = _a.collapsed,
       keyValue = _a.keyValue,
       selectedKey = _a.selectedKey,
+      selectedKeyPath = _a.selectedKeyPath,
+      setSelectedKeyPath = _a.setSelectedKeyPath,
       openKeys = _a.openKeys,
       triggerSubMenuAction = _a.triggerSubMenuAction,
       forceSubMenuRender = _a.forceSubMenuRender,
@@ -83,7 +87,7 @@ var SubMenu = function SubMenu(props) {
       handleOnOpenChange = _a.handleOnOpenChange,
       _a$paddingLeft = _a.paddingLeft,
       paddingLeft = _a$paddingLeft === void 0 ? 0 : _a$paddingLeft,
-      restProps = __rest(_a, ["prefixCls", "theme", "mode", "title", "icon", "disabled", "children", "collapsed", "keyValue", "selectedKey", "openKeys", "triggerSubMenuAction", "forceSubMenuRender", "inlineIndent", "className", "style", "handleOnOpenChange", "paddingLeft"]);
+      restProps = __rest(_a, ["prefixCls", "theme", "mode", "title", "icon", "disabled", "children", "collapsed", "keyValue", "selectedKey", "selectedKeyPath", "setSelectedKeyPath", "openKeys", "triggerSubMenuAction", "forceSubMenuRender", "inlineIndent", "className", "style", "handleOnOpenChange", "paddingLeft"]);
 
   var isVertical = mode === 'vertical'; // 初始化level
 
@@ -91,6 +95,14 @@ var SubMenu = function SubMenu(props) {
     restProps.level = 1;
   }
 
+  if (Array.isArray(restProps.parentPath)) {
+    var _context;
+
+    restProps.parentPath = (0, _concat.default)(_context = []).call(_context, (0, _toConsumableArray2.default)(restProps.parentPath), [keyValue]);
+  } else {
+    restProps.parentPath = [keyValue];
+  }
+
   if (mode === 'inline') {
     restProps.subMenuMode = 'vertical';
     restProps.popupOffset = [];
@@ -217,10 +229,7 @@ var SubMenu = function SubMenu(props) {
     if (!(0, _includes.default)(className).call(className, _menuItem.MENU_ITEM_CONTAINER_NAME)) {
       closeSubMenu();
     }
-  }); // // 缩略模式自动关闭子菜单
-  // if (triggerSubMenuAction === 'click' && mode === 'vertical' && collapsed) {
-  //   closeSubMenu()
-  // }
+  });
 
   var handleMouseEvent = function handleMouseEvent(status) {
     if (disabled || triggerSubMenuAction === 'click') return;
@@ -236,11 +245,6 @@ var SubMenu = function SubMenu(props) {
   };
 
   var handleOnClick = function handleOnClick(info) {
-    var _context;
-
-    // 保存路径
-    info.keyPath = (0, _concat.default)(_context = info.keyPath).call(_context, [keyValue]);
-
     if (triggerSubMenuAction === 'click' && isVertical) {
       closeSubMenu();
     }
@@ -317,7 +321,7 @@ var SubMenu = function SubMenu(props) {
   }; // eslint-disable-next-line react-hooks/rules-of-hooks
 
   var verticalView = (0, _usePopper.default)( /*#__PURE__*/_react.default.createElement("li", (0, _extends2.default)({
-    className: (0, _classnames.default)(prefixCls, className, (_classNames2 = {}, (0, _defineProperty2.default)(_classNames2, "light", theme === 'light'), (0, _defineProperty2.default)(_classNames2, "".concat(prefixCls, "-collapsed"), collapsed), (0, _defineProperty2.default)(_classNames2, "".concat(prefixCls, "-disabled"), disabled), (0, _defineProperty2.default)(_classNames2, "".concat(prefixCls, "-hover"), !disabled && visible), (0, _defineProperty2.default)(_classNames2, "".concat(prefixCls, "-active"), Array.isArray(openKeys) && (0, _includes.default)(openKeys).call(openKeys, keyValue)), _classNames2)),
+    className: (0, _classnames.default)(prefixCls, className, (_classNames2 = {}, (0, _defineProperty2.default)(_classNames2, "light", theme === 'light'), (0, _defineProperty2.default)(_classNames2, "".concat(prefixCls, "-collapsed"), collapsed), (0, _defineProperty2.default)(_classNames2, "".concat(prefixCls, "-disabled"), disabled), (0, _defineProperty2.default)(_classNames2, "".concat(prefixCls, "-hover"), !disabled && Array.isArray(openKeys) && (0, _includes.default)(openKeys).call(openKeys, keyValue)), (0, _defineProperty2.default)(_classNames2, "".concat(prefixCls, "-active"), Array.isArray(selectedKeyPath) && (0, _includes.default)(selectedKeyPath).call(selectedKeyPath, keyValue)), _classNames2)),
     ref: subMenuVerticalRef,
     key: keyValue
   }, {
@@ -349,19 +353,21 @@ var SubMenu = function SubMenu(props) {
       mode: mode,
       theme: theme,
       selectedKey: selectedKey,
+      setSelectedKeyPath: setSelectedKeyPath,
       openKeys: openKeys,
       forceSubMenuRender: forceSubMenuRender,
       triggerSubMenuAction: triggerSubMenuAction,
       handleOnOpenChange: handleOnOpenChange,
       handleOnClick: handleOnClick,
       inlineIndent: inlineIndent,
-      paddingLeft: curPaddingLeft
+      paddingLeft: curPaddingLeft,
+      parentPath: restProps.parentPath
     });
   }))), {
     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' : ''
@@ -374,7 +380,7 @@ var SubMenu = function SubMenu(props) {
 
     return /*#__PURE__*/_react.default.createElement("li", (0, _extends2.default)({
       ref: subMenuRef,
-      className: (0, _classnames.default)(prefixCls, className, (_classNames4 = {}, (0, _defineProperty2.default)(_classNames4, "".concat(prefixCls, "-collapsed"), collapsed), (0, _defineProperty2.default)(_classNames4, "".concat(prefixCls, "-disabled"), disabled), _classNames4)),
+      className: (0, _classnames.default)(prefixCls, className, (_classNames4 = {}, (0, _defineProperty2.default)(_classNames4, "".concat(prefixCls, "-collapsed"), collapsed), (0, _defineProperty2.default)(_classNames4, "".concat(prefixCls, "-disabled"), disabled), (0, _defineProperty2.default)(_classNames4, "".concat(prefixCls, "-active"), Array.isArray(selectedKeyPath) && (0, _includes.default)(selectedKeyPath).call(selectedKeyPath, keyValue)), _classNames4)),
       key: keyValue
     }, mouseEvent, {
       style: style
@@ -397,13 +403,15 @@ var SubMenu = function SubMenu(props) {
         collapsed: collapsed,
         mode: mode,
         selectedKey: selectedKey,
+        setSelectedKeyPath: setSelectedKeyPath,
         openKeys: openKeys,
         forceSubMenuRender: forceSubMenuRender,
         triggerSubMenuAction: triggerSubMenuAction,
         handleOnOpenChange: handleOnOpenChange,
         handleOnClick: handleOnClick,
         inlineIndent: inlineIndent,
-        paddingLeft: curPaddingLeft
+        paddingLeft: curPaddingLeft,
+        parentPath: restProps.parentPath
       });
     }))));
   }

package/lib/select/select.js

@@ -91,7 +91,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 = (0, _hooks.useMergedState)(undefined, {
@@ -153,7 +155,7 @@ var InternalSelect = function InternalSelect(props, ref) {
 
   var searchCls = (0, _classnames.default)((0, _defineProperty2.default)({}, "".concat(selectPrefixCls, "-dropdown-search"), true)); // 下拉子项列表样式
 
-  var dropContentCls = (0, _classnames.default)((0, _defineProperty2.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 = (0, _classnames.default)((0, _defineProperty2.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 = (0, _classnames.default)((0, _defineProperty2.default)({}, "".concat(selectPrefixCls, "-multiple-footer"), true)); // 多选，单选公共样式
 
@@ -695,10 +697,10 @@ var InternalSelect = function InternalSelect(props, ref) {
       var _ref2 = (_a = selectRef.current) === null || _a === void 0 ? void 0 : _a.getBoundingClientRect(),
           width = _ref2.width;
 
-      return {
+      return (0, _extends2.default)({
         width: (dropdownStyle === null || dropdownStyle === void 0 ? void 0 : dropdownStyle.width) || (width > 75 ? width : 75),
         zIndex: 1050
-      };
+      }, popperStyle);
     }
   };
 

package/lib/table/table.js

@@ -106,6 +106,8 @@ function Table(props) {
   });
 
   if (footerDataSource) {
+    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+    // @ts-ignore
     pipeline.footerDataSource(footerDataSource);
   }
   /* -------------------------------------------------------------------------- */

package/lib/tree/style/index.css

@@ -140,7 +140,6 @@
   pointer-events: none;
 }
 .kd-tree-node-item {
-  height: var(--kd-c-tree-node-sizing-height, 32px);
   display: -webkit-box;
   display: -ms-flexbox;
   display: flex;
@@ -167,7 +166,7 @@
   border-right: 10px;
   border-color: white;
   border-style: solid;
-  height: var(--kd-c-tree-node-sizing-height, 32px);
+  height: 100%;
   cursor: default;
   opacity: 0;
 }

package/lib/tree/style/index.less

@@ -33,7 +33,6 @@
     pointer-events: none;
   }
   &-item {
-    height: @tree-node-height;
     display: flex;
     align-items: center;
   }
@@ -54,7 +53,7 @@
     border-right: 10px;
     border-color: white;
     border-style: solid;
-    height: @tree-node-height;
+    height: 100%;
     cursor: default;
     opacity: 0;
   }

package/lib/tree/style/token.less

@@ -13,7 +13,6 @@
 @tree-node-icon-color-text: var(~'@{tree-prefix}-node-icon-color-text', #666666);
 
 // sizing
-@tree-node-height: var(~'@{tree-prefix}-node-sizing-height', 32px);
 @tree-expand-icon-height: var(~'@{tree-prefix}-expand-icon-sizing-height', 22px);
 @tree-expand-icon-width: var(~'@{tree-prefix}-expand-icon-sizing-width', 22px);
 @tree-node-icon-height: var(~'@{tree-prefix}-node-icon-sizing-height', 20px);

package/lib/tree/tree.js

@@ -89,8 +89,7 @@ var InternalTree = /*#__PURE__*/_react.default.forwardRef(function (props, ref)
       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); // 树样式前缀
 

package/lib/tree/treeNode.js

@@ -363,7 +363,7 @@ var TreeNode = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
   return /*#__PURE__*/_react.default.createElement("div", {
     className: (0, _classnames.default)("".concat(treeNodePrefixCls, "-item"), (0, _defineProperty2.default)({}, "".concat(treeNodePrefixCls, "-item-hover"), !disabled && selectable), (0, _defineProperty2.default)({}, "".concat(treeNodePrefixCls, "-selected"), selected && selectable && !disabled), (0, _defineProperty2.default)({}, "".concat(treeNodePrefixCls, "-disabled"), disabled), (0, _defineProperty2.default)({}, "".concat(treeNodePrefixCls, "-opened"), expandState), (0, _concat.default)(_context = "".concat(treeNodePrefixCls, "-item-")).call(_context, nodeKey), className),
     style: (0, _extends2.default)({
-      height: "".concat(estimatedItemSize)
+      height: "".concat(estimatedItemSize, "px")
     }, style),
     onClick: handleClick
   }, renderNode());

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kdcloudjs/kdesign",
-  "version": "1.3.8",
+  "version": "1.4.1",
   "description": "KDesign 金蝶前端react 组件库",
   "title": "kdesign",
   "keywords": [