@kdcloudjs/kdesign 1.0.2 → 1.1.0

package/lib/date-picker/style/mixin.less

@@ -1,22 +1,24 @@
+@import './token.less';
+
 .input-wrapper() {
   display: inline-flex;
-  border: 1px solid @strong-border-color;
-  border-radius: @radius-size;
+  border: 1px solid @date-input-color-border;
+  border-radius: @date-input-border-radius;
   box-sizing: border-box;
-  background-color: @date-background-color;
+  background-color: @date-input-color-background;
   &-borderless {
     border: 0;
   }
   &-underline {
     border: none;
-    border-bottom: 1px solid @input-color;
+    border-bottom: 1px solid @date-input-underline-color;
     border-radius: 0;
     padding-left: 0;
   }
   &-disabled {
-    background-color: @disabled-contain-bg !important;
-    border-color: @strong-border-color !important;
-    color: @disabled-color !important;
+    background-color: @date-input-color-background-disabled !important;
+    border-color: @date-input-color-border !important;
+    color: @date-input-color-disabled !important;
     cursor: not-allowed !important;
     input {
       cursor: not-allowed !important;
@@ -24,48 +26,48 @@
   }
   &-underline&-disabled,
   &-borderless&-disabled {
-    background-color: @date-background-color;
-    border-color: @strong-border-color;
+    background-color: @date-input-color-background;
+    border-color: @date-input-color-border;
   }
 
   &-focused {
     box-shadow: none;
     outline: none;
-    border-color: @theme-color;
+    border-color: @date-color-background-checked;
   }
 
   &:hover {
-    border-color: @theme-color;
+    border-color: @date-color-background-checked;
   }
 
   &:not(&-disabled) input:focus {
-    color: @date-focus-color;
+    color: @date-input-color-focus;
   }
 }
 
 .input() {
   width: 100%;
   min-width: 0;
-  color: @date-font-color;
+  color: @date-input-color;
   &::-webkit-input-placeholder {
-    color: @date-placeholder-color;
+    color: @date-input-color-placeholder;
   }
   &::-moz-input-placeholder {
-    color: @date-placeholder-color;
+    color: @date-input-color-placeholder;
   }
   &::-ms-input-placeholder {
-    color: @date-placeholder-color;
+    color: @date-input-color-placeholder;
   }
   &:focus {
     box-shadow: none;
     outline: none;
-    border-color: @theme-color;
+    border-color: @date-color-background-checked;
   }
 }
 
 .input-size(@height, @fonSize, @padding-vertical, @padding-horizontal) {
   height: @height;
-  line-height: @height - (@padding-vertical * 2) - (@input-border-width * 2);
+  line-height: calc(@height - (@padding-vertical * 2) - 2);
   font-size: @fonSize;
   padding: @padding-vertical @padding-horizontal;
 }

package/lib/date-picker/style/token.less

@@ -0,0 +1,71 @@
+@import '../../style/themes/token.less';
+
+@date-picker-custom-prefix: ~'--@{kd-prefix}-c-date-picker';
+
+// shadow
+// color
+@date-color-background-checked: var(~'@{date-picker-custom-prefix}-color-background-checked', @color-theme);
+@date-wrapper-color-background: var(~'@{date-picker-custom-prefix}-wrapper-color-background', @color-background);
+@date-input-color: var(~'@{date-picker-custom-prefix}-input-color', @color-text-secondary);
+@date-input-color-placeholder: var(~'@{date-picker-custom-prefix}-input-color-placeholder', @color-text-secondary);
+@date-input-underline-color: var(~'@{date-picker-custom-prefix}-input-underline-color', #999);
+@date-input-color-border: var(~'@{date-picker-custom-prefix}-input-color-border', @color-border-strong);
+@date-input-color-disabled: var(~'@{date-picker-custom-prefix}-input-color-disabled', @color-disabled);
+@date-input-color-background: var(~'@{date-picker-custom-prefix}-input-color-background', @color-white);
+@date-input-color-background-disabled: var(~'@{date-picker-custom-prefix}-input-color-background-disabled', @color-background-contain-disabled);
+@date-input-color-focus: var(~'@{date-picker-custom-prefix}-input-color-focused', @color-text-primary);
+
+@date-icon-color: var(~'@{date-picker-custom-prefix}-icon-color', @color-disabled);
+@date-clear-background-color: var(~'@{date-picker-custom-prefix}-clear-color-background', @color-background);
+@date-clear-background-color-hover: var(~'@{date-picker-custom-prefix}-clear-color-background-hover', @color-theme-5);
+@date-clear-background-color-focused: var(~'@{date-picker-custom-prefix}-clear-color-background-focused', @color-theme);
+@date-container-color: var(~'@{date-picker-custom-prefix}-container-color', @color-text-primary);
+@date-container-color-border: var(~'@{date-picker-custom-prefix}-container-color-border', @color-border-weak);
+@date-container-color-background: var(~'@{date-picker-custom-prefix}-container-color-background', @color-background-2);
+
+@date-footer-color-background: var(~'@{date-picker-custom-prefix}-footer-color-background', @color-background);
+
+// sizing
+@date-width: var(~'@{date-picker-custom-prefix}-sizing-width', 230px);
+@date-large-height: var(~'@{date-picker-custom-prefix}-large-sizing-height', 36px); // 大号 高度
+@date-middle-height: var(~'@{date-picker-custom-prefix}-middle-sizing-height', 30px); // 中号 高度
+@date-small-height: var(~'@{date-picker-custom-prefix}-small-sizing-height', 20px); // 小号 高度
+@date-panel-header-height: var(~'@{date-picker-custom-prefix}-panel-header-sizing-height', 36px);
+
+// spacing
+@date-small-padding-vertical: var(~'@{date-picker-custom-prefix}-small-spacing-padding-vertical', 4px); // 小号 内间距 纵向
+@date-small-padding-horizontal: var(~'@{date-picker-custom-prefix}-small-spacing-padding-horizontal', 9px); // 小号 内间距 横向
+@date-middle-padding-vertical: var(~'@{date-picker-custom-prefix}-middle-spacing-padding-vertical', 5px); // 中号 内间距 纵向
+@date-middle-padding-horizontal: var(~'@{date-picker-custom-prefix}-middle-spacing-padding-horizontal', 9px); // 中号 内间距 纵向
+@date-large-padding-vertical: var(~'@{date-picker-custom-prefix}-large-spacing-padding-vertical', 8px); // 大号 内间距 纵向
+@date-large-padding-horizontal: var(~'@{date-picker-custom-prefix}-large-spacing-padding-horizontal', 9px); // 大号 内间距 横向
+@date-suffix-spacing-margin-left: var(~'@{date-picker-custom-prefix}-suffix-spacing-margin-left', 10px);
+
+
+// motion
+// font
+@date-container-font-size: var(~'@{date-picker-custom-prefix}-container-font-size', @font-size-small);
+@date-panel-font-size: var(~'@{date-picker-custom-prefix}-panel-font-size', @font-size-middle);
+@date-small-font-size: var(~'@{date-picker-custom-prefix}-small-font-size', @font-size-small); // 小号 文字大小
+@date-middle-font-size: var(~'@{date-picker-custom-prefix}-middle-font-size', @font-size-middle); // 中号 文字大小
+@date-large-font-size: var(~'@{date-picker-custom-prefix}-large-font-size', @font-size-large); // 大号 文字大小
+
+// radius
+@date-input-border-radius: var(~'@{date-picker-custom-prefix}-input-radius-border', @radius-border);
+@date-panel-border-radius: var(~'@{date-picker-custom-prefix}-panel-radius-border', @radius-border);
+
+// line-height
+// z-index
+
+
+
+
+
+
+
+
+
+
+
+
+

package/lib/drawer/drawer.d.ts

@@ -21,7 +21,6 @@ export interface IDrawerProps {
     getContainer?: (() => Element | CSSSelector | false | null) | Element | false;
     headerStyle?: CSSProperties;
     headerClassName?: string;
-    height?: string | number;
     keyboard?: boolean;
     mask?: boolean;
     maskClassName?: string;

package/lib/drawer/drawer.js

@@ -100,7 +100,6 @@ var InternalDrawer = function InternalDrawer(props, ref) {
       footerClassName = drawerProps.footerClassName,
       visible = drawerProps.visible,
       width = drawerProps.width,
-      height = drawerProps.height,
       headerStyle = drawerProps.headerStyle,
       headerClassName = drawerProps.headerClassName,
       zindex = drawerProps.zIndex,
@@ -118,12 +117,7 @@ var InternalDrawer = function InternalDrawer(props, ref) {
   var _useState3 = (0, _react.useState)(width),
       _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
       currentWidth = _useState4[0],
-      setCurrentWidth = _useState4[1];
-
-  var _useState5 = (0, _react.useState)(height),
-      _useState6 = (0, _slicedToArray2.default)(_useState5, 2),
-      currentHeight = _useState6[0],
-      setCurrentHeight = _useState6[1]; // const previousWidthRef = usePrevious(currentWidth)
+      setCurrentWidth = _useState4[1]; // const previousWidthRef = usePrevious(currentWidth)
   // const previousHeightRef = usePrevious(currentHeight)
 
 
@@ -162,9 +156,8 @@ var InternalDrawer = function InternalDrawer(props, ref) {
     }
   }, [drawerContainer, isBody, isAtOriginalPlace, containerRef]);
   var handleContainerResize = (0, _react.useCallback)(function (_ref) {
-    var containerWidth = _ref.width,
-        containerHeight = _ref.height;
-    if (!visible && width === currentWidth && height === currentHeight) return;
+    var containerWidth = _ref.width;
+    if (!visible && width === currentWidth) return;
 
     if (containerWidth < currentWidth) {
       // 这里改成操作DOM？
@@ -174,13 +167,7 @@ var InternalDrawer = function InternalDrawer(props, ref) {
     } else {
       setCurrentWidth(width);
     }
-
-    if (containerHeight < currentHeight) {
-      setCurrentHeight(containerHeight);
-    } else {
-      setCurrentHeight(height);
-    }
-  }, [width, height, visible, currentWidth, currentHeight]);
+  }, [width, visible, currentWidth]);
   (0, _hooks.useResizeObserver)(function () {
     var _a;
 
@@ -191,9 +178,6 @@ var InternalDrawer = function InternalDrawer(props, ref) {
   (0, _react.useEffect)(function () {
     setCurrentWidth(width);
   }, [width]);
-  (0, _react.useEffect)(function () {
-    setCurrentHeight(height);
-  }, [height]);
   var closeDrawer = (0, _react.useCallback)(function () {
     onClose && onClose();
     destroyOnClose && setShowChildren(false);
@@ -225,10 +209,7 @@ var InternalDrawer = function InternalDrawer(props, ref) {
   var containerStyle = (0, _extends3.default)((0, _defineProperty2.default)({}, placement, 0), (0, _includes.default)(horizontalPlacements).call(horizontalPlacements, placement) ? {
     width: currentWidth,
     transform: "translateX(".concat(visible ? 0 : transformSize(currentWidth, placement), ")")
-  } : {
-    height: currentHeight,
-    transform: "translateY(".concat(visible ? 0 : transformSize(currentHeight, placement), ")")
-  });
+  } : {});
 
   var container = /*#__PURE__*/_react.default.createElement("div", {
     className: (0, _classnames.default)((_classNames2 = {}, (0, _defineProperty2.default)(_classNames2, "".concat(drawerPrefixCls, "-container-box"), true), (0, _defineProperty2.default)(_classNames2, "".concat(drawerPrefixCls, "-has-container-box"), drawerContainer), (0, _defineProperty2.default)(_classNames2, (0, _concat.default)(_context2 = "".concat(drawerPrefixCls, "-container-")).call(_context2, placement), true), _classNames2)),
@@ -259,8 +240,7 @@ var InternalDrawer = function InternalDrawer(props, ref) {
     return p !== placement;
   })[0] : '';
   var noneMaskStyle = !mask ? {
-    width: containerStyle.width,
-    height: containerStyle.height
+    width: containerStyle.width
   } : {};
 
   var comp = /*#__PURE__*/_react.default.createElement("div", {

package/lib/drawer/style/index.css

@@ -106,11 +106,20 @@
   top: 0;
   bottom: 0;
 }
+/* -----------  motion  ——————---- start */
+/* -----------  motion  ——————---- end */
+/* -----------  transition  ——————---- start */
+/* -----------  transition  ——————---- end */
+/* -----------  zIndex  ——————---- start */
+/*
+    普通组件内部自身层级应设置在0-100间
+*/
+/* -----------  zIndex  ——————---- end */
 .kd-drawer {
   display: -webkit-box;
   display: -ms-flexbox;
   display: flex;
-  z-index: 1050;
+  z-index: var(--kd-g-z-index-dialog, 1050);
   position: fixed;
   left: 0;
   right: 0;
@@ -120,13 +129,13 @@
 .kd-drawer-active .kd-drawer-mask {
   opacity: 1;
   visibility: visible;
-  -webkit-transition: all calc(0.3s - 0.1s) cubic-bezier(0, 0.4, 0.4, 1);
-  transition: all calc(0.3s - 0.1s) cubic-bezier(0, 0.4, 0.4, 1);
+  -webkit-transition: all calc(var(--kd-g-duration, 0.3s) - 0.1s) var(--kd-g-ease-out, cubic-bezier(0, 0.4, 0.4, 1));
+  transition: all calc(var(--kd-g-duration, 0.3s) - 0.1s) var(--kd-g-ease-out, cubic-bezier(0, 0.4, 0.4, 1));
 }
 .kd-drawer-hide {
   visibility: hidden;
-  -webkit-transition: visibility calc(0.3s - 0.1s) cubic-bezier(0, 0.4, 0.4, 1);
-  transition: visibility calc(0.3s - 0.1s) cubic-bezier(0, 0.4, 0.4, 1);
+  -webkit-transition: visibility calc(var(--kd-g-duration, 0.3s) - 0.1s) var(--kd-g-ease-out, cubic-bezier(0, 0.4, 0.4, 1));
+  transition: visibility calc(var(--kd-g-duration, 0.3s) - 0.1s) var(--kd-g-ease-out, cubic-bezier(0, 0.4, 0.4, 1));
 }
 .kd-drawer-mask {
   position: fixed;
@@ -137,8 +146,8 @@
   top: 0;
   bottom: 0;
   opacity: 0;
-  -webkit-transition: opacity calc(0.3s - 0.1s) cubic-bezier(0, 0.4, 0.4, 1);
-  transition: opacity calc(0.3s - 0.1s) cubic-bezier(0, 0.4, 0.4, 1);
+  -webkit-transition: opacity calc(var(--kd-g-duration, 0.3s) - 0.1s) var(--kd-g-ease-out, cubic-bezier(0, 0.4, 0.4, 1));
+  transition: opacity calc(var(--kd-g-duration, 0.3s) - 0.1s) var(--kd-g-ease-out, cubic-bezier(0, 0.4, 0.4, 1));
 }
 .kd-drawer-not-at-body {
   position: absolute;
@@ -146,22 +155,21 @@
 .kd-drawer-not-at-body .kd-drawer-mask {
   position: absolute;
 }
-.kd-drawer-container-left {
-  top: 0;
-  bottom: 0;
-}
+.kd-drawer-container-left,
 .kd-drawer-container-right {
   top: 0;
   bottom: 0;
 }
-.kd-drawer-container-top {
-  left: 0;
-  right: 0;
-}
+.kd-drawer-container-top,
 .kd-drawer-container-bottom {
   left: 0;
   right: 0;
 }
+.kd-drawer-container-top .kd-drawer-body,
+.kd-drawer-container-bottom .kd-drawer-body {
+  max-height: var(--kd-c-drawer-body-max-height-vertical, 470px);
+  overflow-y: auto;
+}
 .kd-drawer-container-box {
   display: -webkit-box;
   display: -ms-flexbox;
@@ -171,11 +179,11 @@
   -webkit-box-direction: normal;
       -ms-flex-direction: column;
           flex-direction: column;
-  background: #fff;
+  background: var(--kd-c-drawer-color-background, var(--kd-g-color-background, #fff));
   -webkit-box-shadow: -4px 0 10px 0 rgba(0, 0, 0, 0.1);
           box-shadow: -4px 0 10px 0 rgba(0, 0, 0, 0.1);
-  -webkit-transition: all calc(0.3s - 0.1s) cubic-bezier(0, 0.4, 0.4, 1);
-  transition: all calc(0.3s - 0.1s) cubic-bezier(0, 0.4, 0.4, 1);
+  -webkit-transition: all calc(var(--kd-g-duration, 0.3s) - 0.1s) var(--kd-g-ease-out, cubic-bezier(0, 0.4, 0.4, 1));
+  transition: all calc(var(--kd-g-duration, 0.3s) - 0.1s) var(--kd-g-ease-out, cubic-bezier(0, 0.4, 0.4, 1));
 }
 .kd-drawer-container-box .kd-drawer-header {
   display: -webkit-box;
@@ -187,24 +195,21 @@
   -webkit-box-align: center;
       -ms-flex-align: center;
           align-items: center;
-  border-bottom: 1px solid #cccccc;
-  min-height: 50px;
-  background: #fff;
-  font-size: 18px;
-  color: #333333;
+  padding: var(--kd-c-drawer-header-sizing-padding-vertical, 12px) var(--kd-c-drawer-header-sizing-padding-horizontal, 16px);
+  border-bottom: var(--kd-c-drawer-dividing-sizing-width, 1px) solid var(--kd-c-drawer-dividing-color-border, var(--kd-g-color-border-disabled, #ccc));
 }
 .kd-drawer-container-box .kd-drawer-header .kd-drawer-title {
-  margin-left: 20px;
-  font-size: 18px;
   letter-spacing: 0;
   line-height: 26px;
+  font-size: var(--kd-c-drawer-title-font-size, var(--kd-g-font-size-x-large, 18px));
+  color: var(--kd-c-drawer-title-color-text, var(--kd-g-color-text-primary, #212121));
 }
 .kd-drawer-container-box .kd-drawer-header .kd-drawer-close-icon {
-  margin-right: 10px;
   cursor: pointer;
 }
 .kd-drawer-container-box .kd-drawer-header .kd-drawer-close-icon i {
-  font-size: 26px;
+  color: var(--kd-c-drawer-close-icon-color-text, var(--kd-g-color-text-secondary, #666));
+  font-size: var(--kd-c-drawer-close-icon-font-size, var(--kd-g-font-size-large, 16px));
 }
 .kd-drawer-container-box .kd-drawer-body {
   display: -webkit-box;
@@ -217,14 +222,15 @@
   -webkit-box-direction: normal;
       -ms-flex-direction: column;
           flex-direction: column;
-  font-size: 14px;
-  color: #333333;
+  padding: var(--kd-c-drawer-body-sizing-padding, 16px);
+  font-size: var(--kd-g-font-size-middle, 14px);
+  color: var(--kd-g-color-text-primary, #212121);
 }
 .kd-drawer-container-box .kd-drawer-footer {
   display: -webkit-box;
   display: -ms-flexbox;
   display: flex;
   min-height: 40px;
-  font-size: 12px;
-  color: #333333;
+  font-size: var(--kd-g-font-size-small, 12px);
+  color: var(--kd-g-color-text-primary, #212121);
 }

package/lib/drawer/style/index.less

@@ -1,43 +1,30 @@
 @import '../../style/themes/index';
 @import './mixin.less';
 @import '../../style/mixins/overlay';
+@import './token.less';
 
 @drawer-prefix-cls: ~'@{kd-prefix}-drawer';
 
-@placement-left: left;
-@placement-right: right;
-@placement-top: top;
-@placement-bottom: bottom;
-
-@drawer-title-font-size: 18px;
-@drawer-title-font-color: #333333;
-@drawer-dividing-width: 1px;
-@drawer-dividing-color: #cccccc;
-@drawer-body-font-size: 14px;
-@drawer-body-font-color: #333333;
-@drawer-footer-font-size: 12px;
-@drawer-footer-font-color: #333333;
-
 .@{drawer-prefix-cls} {
   display: flex;
-  z-index: @zIndex-dialog;
+  z-index: @z-index-dialog;
   &-active {
     .@{drawer-prefix-cls}-mask {
       opacity: 1;
       visibility: visible;
-      transition: all calc(@transition-duration - 0.1s) @ease-out;
+      transition: all calc(@duration-promptly - 0.1s) @motion-ease-out;
     }
   }
   &-hide {
     visibility: hidden;
-    transition: visibility calc(@transition-duration - 0.1s) @ease-out;
+    transition: visibility calc(@duration-promptly - 0.1s) @motion-ease-out;
   }
   position: fixed;
   .overall-postion();
   &-mask {
     .overlay(rgba(55, 55, 55, 0.5), 0);
     opacity: 0;
-    transition: opacity calc(@transition-duration - 0.1s) @ease-out;
+    transition: opacity calc(@duration-promptly - 0.1s) @motion-ease-out;
   }
   &-not-at-body {
     position: absolute;
@@ -45,46 +32,43 @@
       position: absolute;
     }
   }
-  &-container-left {
-    .drawer-container-placement-horizontal();
-  }
+  &-container-left,
   &-container-right {
     .drawer-container-placement-horizontal();
   }
-  &-container-top {
-    .drawer-container-placement-vertical();
-  }
+  &-container-top,
   &-container-bottom {
     .drawer-container-placement-vertical();
+    .@{drawer-prefix-cls}-body {
+      max-height: @drawer-body-max-height-vertical;
+      overflow-y: auto;
+    }
   }
 
   &-container-box {
     display: flex;
     position: absolute;
     flex-direction: column;
-    background: @bg;
+    background: @drawer-bg;
     box-shadow: -4px 0 10px 0 rgba(0, 0, 0, 0.1);
-    transition: all calc(@transition-duration - 0.1s) @ease-out;
+    transition: all calc(@duration-promptly - 0.1s) @motion-ease-out;
     .@{drawer-prefix-cls}-header {
       display: flex;
       justify-content: space-between;
       align-items: center;
-      border-bottom: 1px solid @drawer-dividing-color;
-      min-height: 50px;
-      background: @bg;
-      font-size: @drawer-title-font-size;
-      color: @drawer-title-font-color;
+      padding: @drawer-header-padding-vertical @drawer-header-padding-horizontal;
+      border-bottom: @drawer-dividing-width solid @drawer-dividing-color;
       .@{drawer-prefix-cls}-title {
-        margin-left: 20px;
-        font-size: @drawer-title-font-size;
         letter-spacing: 0;
         line-height: 26px;
+        font-size: @drawer-title-font-size;
+        color: @drawer-title-font-color;
       }
       .@{drawer-prefix-cls}-close-icon {
         i {
-          font-size: 26px;
+          color: @drawer-close-icon-color;
+          font-size: @drawer-close-icon-font-size;
         }
-        margin-right: 10px;
         cursor: pointer;
       }
     }
@@ -92,14 +76,15 @@
       display: flex;
       flex-grow: 1;
       flex-direction: column;
-      font-size: @drawer-body-font-size;
-      color: @drawer-body-font-color;
+      padding: @drawer-body-padding;
+      font-size: @font-size-middle;
+      color: @color-text-primary;
     }
     .@{drawer-prefix-cls}-footer {
       display: flex;
       min-height: 40px;
-      font-size: @drawer-footer-font-size;
-      color: @drawer-footer-font-color;
+      font-size: @font-size-small;
+      color: @color-text-primary;
     }
   }
 }

package/lib/drawer/style/token.less

@@ -0,0 +1,23 @@
+
+@import '../../style/themes/token.less';
+
+@drawer-custom-prefix: ~'--@{kd-prefix}-c-drawer';
+
+// color
+@drawer-bg: var(~'@{drawer-custom-prefix}-color-background', @color-background);
+@drawer-title-font-color: var(~'@{drawer-custom-prefix}-title-color-text', @color-text-primary);
+@drawer-dividing-color: var(~'@{drawer-custom-prefix}-dividing-color-border', @color-border-disabled);
+@drawer-close-icon-color: var(~'@{drawer-custom-prefix}-close-icon-color-text', @color-text-secondary);
+
+// font
+@drawer-title-font-size: var(~'@{drawer-custom-prefix}-title-font-size', @font-size-x-large);
+@drawer-close-icon-font-size: var(~'@{drawer-custom-prefix}-close-icon-font-size', @font-size-large);
+
+// sizing
+@drawer-body-max-height-vertical: var(~'@{drawer-custom-prefix}-body-max-height-vertical', 470px);
+@drawer-dividing-width: var(~'@{drawer-custom-prefix}-dividing-sizing-width', 1px);
+
+// spacing
+@drawer-header-padding-vertical: var(~'@{drawer-custom-prefix}-header-sizing-padding-vertical', 12px);
+@drawer-header-padding-horizontal: var(~'@{drawer-custom-prefix}-header-sizing-padding-horizontal', 16px);
+@drawer-body-padding: var(~'@{drawer-custom-prefix}-body-sizing-padding', 16px);

package/lib/dropdown/dropdown.d.ts

@@ -12,6 +12,7 @@ declare type MenuItem = {
 };
 export interface DropDownProps extends PopperProps {
     defaultKey?: string;
+    selectedKey?: string;
     selectable?: boolean;
     children?: React.ReactNode;
     onItemClick?: (key: string) => void;

package/lib/dropdown/dropdown.js

@@ -72,32 +72,37 @@ var Dropdown = /*#__PURE__*/React.forwardRef(function (props, ref) {
   });
   var isMenu = menu.type === _menu.Menu;
 
-  var _React$useState3 = React.useState(((_a = menu.props) === null || _a === void 0 ? void 0 : _a.defaultKey) || props.defaultKey || ''),
+  var _React$useState3 = React.useState(props.selectedKey || ((_a = menu.props) === null || _a === void 0 ? void 0 : _a.defaultKey) || props.defaultKey || ''),
       _React$useState4 = (0, _slicedToArray2.default)(_React$useState3, 2),
-      defaultKey = _React$useState4[0],
-      setKeyValue = _React$useState4[1];
+      selectedKey = _React$useState4[0],
+      setSelectedKey = _React$useState4[1];
 
+  React.useEffect(function () {
+    setSelectedKey(props.selectedKey);
+  }, [props.selectedKey]);
   var menuSelectable = ((_b = menu.props) === null || _b === void 0 ? void 0 : _b.selectable) === undefined ? selectable : (_c = menu.props) === null || _c === void 0 ? void 0 : _c.selectable;
 
   var handleItemClick = function handleItemClick(e) {
     var _a, _b;
 
-    var key = ((_a = e.target.dataset) === null || _a === void 0 ? void 0 : _a.key) || ((_b = e.target.parentNode.dataset) === null || _b === void 0 ? void 0 : _b.key);
+    var currentTarget = e.target;
+    var parentTarget = currentTarget.parentNode;
+    var key = ((_a = currentTarget.dataset) === null || _a === void 0 ? void 0 : _a.key) || ((_b = currentTarget.parentNode.dataset) === null || _b === void 0 ? void 0 : _b.key);
 
-    if (e.target.className.indexOf('disabled') === -1 && key) {
+    if (currentTarget.className.indexOf('disabled') === -1 && parentTarget.className.indexOf('disabled') === -1 && key) {
       if (isMenu && menu.props.onClick) {
         menu.props.onClick(key);
       } else if (onItemClick) {
         onItemClick(key);
       }
 
-      menuSelectable && setKeyValue(key);
+      menuSelectable && setSelectedKey(key);
       props.visible === undefined && setVisible(false);
     }
   };
 
   var menuElement = isMenu ? /*#__PURE__*/React.cloneElement(menu, {
-    defaultKey: defaultKey,
+    selectedKey: selectedKey,
     onClick: handleItemClick,
     selectable: menuSelectable
   }) : /*#__PURE__*/React.createElement("ul", {
@@ -117,7 +122,7 @@ var Dropdown = /*#__PURE__*/React.forwardRef(function (props, ref) {
       rel: 'noopener noreferrer'
     };
     var key = itemKey || label;
-    var selected = selectable && String(defaultKey) === String(key);
+    var selected = selectable && String(selectedKey) === String(key);
     return /*#__PURE__*/React.createElement("li", {
       title: label,
       key: key,

package/lib/dropdown/menu.d.ts

@@ -1,6 +1,6 @@
 import * as React from 'react';
 export interface MenuProps {
-    defaultKey?: string;
+    selectedKey?: string;
     className?: string;
     selectable?: boolean;
     style?: React.CSSProperties;

package/lib/dropdown/menu.js

@@ -57,16 +57,16 @@ var Menu = /*#__PURE__*/React.forwardRef(function (props, ref) {
       customPrefixcls = _a.prefixCls,
       children = _a.children,
       selectable = _a.selectable,
-      defaultKey = _a.defaultKey,
+      selectedKey = _a.selectedKey,
       className = _a.className,
-      restProps = __rest(_a, ["prefixCls", "children", "selectable", "defaultKey", "className"]); // className前缀
+      restProps = __rest(_a, ["prefixCls", "children", "selectable", "selectedKey", "className"]); // className前缀
 
 
   var prefixCls = getPrefixCls(pkgPrefixCls, 'dropdown-menu', customPrefixcls);
 
   var cloneItem = function cloneItem(item, index) {
     var key = item.key || index;
-    var selected = selectable && String(defaultKey) === String(key);
+    var selected = selectable && String(selectedKey) === String(key);
     return /*#__PURE__*/React.cloneElement(item, {
       key: key,
       selected: selected,