@kdcloudjs/kdesign 1.3.0 → 1.3.3

package/es/button/group.js

@@ -111,7 +111,8 @@ var InternalButtonGroup = function InternalButtonGroup(props, ref) {
 
   var popperProps = _extends(_extends({
     placement: 'bottomLeft',
-    trigger: 'click'
+    trigger: 'click',
+    gap: 0
   }, buttonGoupProps), {
     prefixCls: btnGroupPrefixCls,
     defaultVisible: optionShow,

package/es/button/style/index.css

@@ -354,35 +354,36 @@
 .kd-btn-group-basic-icon {
   margin-left: 4px;
 }
-.kd-btn-group-trigger .kd-btn-primary {
-  background: var(--kd-c-button-group-trigger-color-background, #4367c1);
+.kd-btn-group-similar .kd-btn-group-trigger .kd-btn {
+  border-top-left-radius: 0;
+  border-bottom-left-radius: 0;
+  margin-left: -1px;
 }
-.kd-btn-group-trigger .kd-btn-primary:hover {
-  background: var(--kd-c-button-group-trigger-color-background-hover, #4c74da);
-  border-color: var(--kd-c-button-group-trigger-color-background-hover, #4c74da);
+.kd-btn-group-similar .kd-btn-group-trigger .kd-btn-primary {
+  background: var(--kd-c-button-group-trigger-color-background, var(--kd-g-color-theme-7, #375cca));
 }
-.kd-btn-group-trigger .kd-btn-primary:active {
-  background: var(--kd-c-button-group-trigger-color-background-active, #3B5AA9);
+.kd-btn-group-similar .kd-btn-group-trigger .kd-btn-primary:hover {
+  background: var(--kd-c-button-group-trigger-color-background-hover, var(--kd-g-color-theme-6, #5582f3));
+  border-color: var(--kd-c-button-group-trigger-color-background-hover, var(--kd-g-color-theme-6, #5582f3));
 }
-.kd-btn-group-trigger .kd-btn-primary:disabled {
-  background: var(--kd-c-button-group-trigger-color-background-disabled, #95a4c8) !important;
+.kd-btn-group-similar .kd-btn-group-trigger .kd-btn-primary:active {
+  background: var(--kd-c-button-group-trigger-color-background-active, var(--kd-g-color-theme-8, #1f3ba1));
 }
-.kd-btn-group-trigger .kd-btn {
-  margin-left: -1px;
+.kd-btn-group-similar .kd-btn-group-trigger .kd-btn-primary:disabled {
+  background: var(--kd-c-button-group-trigger-color-background-disabled, var(--kd-g-color-theme-5, #87adff)) !important;
+}
+.kd-btn-group-similar > .kd-btn:first-child {
+  border-top-right-radius: 0;
+  border-bottom-right-radius: 0;
+}
+.kd-btn-group-similar > .kd-btn:first-child:hover {
+  z-index: 1;
 }
 .kd-btn-group .kd-btn-size-small,
 .kd-btn-group .kd-btn-size-middle,
 .kd-btn-group .kd-btn-size-large {
   min-width: unset;
 }
-.kd-btn-group .kd-btn:first-child {
-  border-top-right-radius: 0;
-  border-bottom-right-radius: 0;
-}
-.kd-btn-group .kd-btn:last-child {
-  border-top-left-radius: 0;
-  border-bottom-left-radius: 0;
-}
 .kd-btn-group .kd-dropdown-menu {
   padding: 0;
 }

package/es/button/style/index.less

@@ -259,25 +259,37 @@
     }
   }
 
-  &-trigger {
-    .@{btn-prefix-cls}-primary {
-      background: @btn-group-trigger-color-background;
-      &:hover {
-        background: @btn-group-trigger-color-background-hover;
-        border-color: @btn-group-trigger-color-background-hover;
-      }
-
-      &:active {
-        background: @btn-group-trigger-color-background-active;
-      }
-
-      &:disabled {
-        background: @btn-group-trigger-color-background-disabled !important;
+  &-similar {
+    .@{btn-prefix-cls}-group-trigger {
+      .@{btn-prefix-cls} {
+        border-top-left-radius: 0;
+        border-bottom-left-radius: 0;
+        margin-left: -1px;
+        &-primary {
+          background: @btn-group-trigger-color-background;
+          &:hover {
+            background: @btn-group-trigger-color-background-hover;
+            border-color: @btn-group-trigger-color-background-hover;
+          }
+  
+          &:active {
+            background: @btn-group-trigger-color-background-active;
+          }
+  
+          &:disabled {
+            background: @btn-group-trigger-color-background-disabled !important;
+          }
+        }
       }
     }
-
-    .@{btn-prefix-cls} {
-      margin-left: -1px;
+    &>.@{btn-prefix-cls} {
+      &:first-child {
+        border-top-right-radius: 0;
+        border-bottom-right-radius: 0;
+        &:hover {
+          z-index: 1;
+        }
+      }
     }
   }
 
@@ -287,16 +299,6 @@
     &-size-large {
       min-width: unset;
     }
-
-    &:first-child {
-      border-top-right-radius: 0;
-      border-bottom-right-radius: 0;
-    }
-
-    &:last-child {
-      border-top-left-radius: 0;
-      border-bottom-left-radius: 0;
-    }
   }
 
   .@{kd-prefix}-dropdown {

package/es/button/style/token.less

@@ -61,10 +61,10 @@
 @btn-group-dropdown-item-border-color: var(~'@{button-custom-prefix}-group-dropdown-item-border-color', #E5E5E5); // 集合按钮 下拉边框颜色
 @btn-group-dropdown-item-color-background-hover: var(~'@{button-custom-prefix}-group-dropdown-item-color-background-hover', #F5F5F5); // 集合按钮 下拉hover背景颜色
 @btn-group-dropdown-color-background: var(~'@{button-custom-prefix}-group-dropdown-color-background', #fff); // 集合按钮 下拉菜单背景颜色
-@btn-group-trigger-color-background: var(~'@{button-custom-prefix}-group-trigger-color-background', #4367c1);
-@btn-group-trigger-color-background-hover: var(~'@{button-custom-prefix}-group-trigger-color-background-hover', #4c74da);
-@btn-group-trigger-color-background-active: var(~'@{button-custom-prefix}-group-trigger-color-background-active', #3B5AA9);
-@btn-group-trigger-color-background-disabled: var(~'@{button-custom-prefix}-group-trigger-color-background-disabled', #95a4c8);
+@btn-group-trigger-color-background: var(~'@{button-custom-prefix}-group-trigger-color-background', @color-theme-7);
+@btn-group-trigger-color-background-hover: var(~'@{button-custom-prefix}-group-trigger-color-background-hover', @color-theme-6);
+@btn-group-trigger-color-background-active: var(~'@{button-custom-prefix}-group-trigger-color-background-active', @color-theme-8);
+@btn-group-trigger-color-background-disabled: var(~'@{button-custom-prefix}-group-trigger-color-background-disabled', @color-theme-5);
 
 // font
 @btn-g-font-weight: var(~'@{button-custom-prefix}-font-weight', @font-weight-light);

package/es/cascader/cascader.d.ts

@@ -14,8 +14,8 @@ declare type FieldNames = {
     value: string;
     children: string;
 };
-export declare const PopupPlacement: ["topLeft", "topRight", "bottomLeft", "bottomRight"];
-export declare type PopupPlacementType = typeof PopupPlacement[number];
+export declare const CascaderPlacement: ["topLeft", "topRight", "bottomLeft", "bottomRight"];
+export declare type CascaderPlacementType = typeof CascaderPlacement[number];
 export declare type CascaderValueType = Array<string | number>;
 export declare type CascaderExpandTrigger = 'click' | 'hover';
 export interface CascaderProps extends PopperProps {
@@ -29,8 +29,10 @@ export interface CascaderProps extends PopperProps {
     allowClear?: boolean;
     placeholder?: string;
     popupVisible?: boolean;
+    popperVisible?: boolean;
     fieldNames?: FieldNames;
     popupClassName?: string;
+    popperClassName?: string;
     changeOnSelect?: boolean;
     notFoundContent?: string;
     value?: CascaderValueType;
@@ -40,10 +42,12 @@ export interface CascaderProps extends PopperProps {
     expandIcon?: React.ReactNode;
     defaultPopupVisible?: boolean;
     defaultValue?: CascaderValueType;
-    popupPlacement?: PopupPlacementType;
+    popupPlacement?: CascaderPlacementType;
+    popperPlacement?: CascaderPlacementType;
     options?: Array<CascaderOptionType>;
     expandTrigger?: CascaderExpandTrigger;
     onPopupVisibleChange?: (visible: boolean) => void;
+    onPopperVisibleChange?: (visible: boolean) => void;
     loadData?: (selectedOptions: CascaderOptionType[]) => void;
     dropdownRender?: (menus: React.ReactNode) => React.ReactNode;
     getPopupContainer?: (triggerNode: HTMLElement) => HTMLElement;

package/es/cascader/cascader.js

@@ -14,7 +14,7 @@ import usePopper from '../_utils/usePopper';
 import Input from '../input';
 import Icon from '../icon';
 import Empty from '../empty';
-export var PopupPlacement = tuple('topLeft', 'topRight', 'bottomLeft', 'bottomRight');
+export var CascaderPlacement = tuple('topLeft', 'topRight', 'bottomLeft', 'bottomRight');
 var Cascader = /*#__PURE__*/React.forwardRef(function (props, ref) {
   var _React$useContext = React.useContext(ConfigContext),
       getPrefixCls = _React$useContext.getPrefixCls,
@@ -39,6 +39,7 @@ var Cascader = /*#__PURE__*/React.forwardRef(function (props, ref) {
       getPopupContainer = allProps.getPopupContainer,
       defaultPopupVisible = allProps.defaultPopupVisible,
       onPopupVisibleChange = allProps.onPopupVisibleChange,
+      onPopperVisibleChange = allProps.onPopperVisibleChange,
       customPrefixcls = allProps.prefixCls; // className前缀
 
   var prefixCls = getPrefixCls(pkgPrefixCls, 'cascader', customPrefixcls);
@@ -46,14 +47,14 @@ var Cascader = /*#__PURE__*/React.forwardRef(function (props, ref) {
   var triggerRef = React.useRef();
   var mergeRef = ref || pickerRef;
 
-  var _React$useState = React.useState(!!props.popupVisible || defaultPopupVisible),
+  var _React$useState = React.useState(!!props.popperVisible || !!props.popupVisible || defaultPopupVisible),
       _React$useState2 = _slicedToArray(_React$useState, 2),
       visible = _React$useState2[0],
       setVisible = _React$useState2[1];
 
   React.useEffect(function () {
-    setVisible(!!props.popupVisible);
-  }, [props.popupVisible]);
+    setVisible(!!props.popperVisible || !!props.popupVisible);
+  }, [props.popperVisible, props.popupVisible]);
 
   var _React$useState3 = React.useState([options]),
       _React$useState4 = _slicedToArray(_React$useState3, 2),
@@ -200,6 +201,7 @@ var Cascader = /*#__PURE__*/React.forwardRef(function (props, ref) {
   var onVisibleChange = function onVisibleChange(visible) {
     setVisible(visible);
     onPopupVisibleChange && onPopupVisibleChange(visible);
+    onPopperVisibleChange && onPopperVisibleChange(visible);
     visible && setSelectedOptions(_sliceInstanceProperty(currentOptions).call(currentOptions, 0));
   };
 
@@ -252,8 +254,8 @@ var Cascader = /*#__PURE__*/React.forwardRef(function (props, ref) {
     trigger: 'click',
     getPopupContainer: getPopupContainer,
     prefixCls: "".concat(prefixCls, "-menus"),
-    placement: allProps.popupPlacement,
-    popperClassName: allProps.popupClassName,
+    placement: allProps.popperPlacement || allProps.popupPlacement,
+    popperClassName: allProps.popperClassName || allProps.popupClassName,
     getTriggerElement: function getTriggerElement() {
       return triggerRef.current;
     }

package/es/checkbox/checkbox.js

@@ -1,7 +1,7 @@
 import _defineProperty from "@babel/runtime-corejs3/helpers/defineProperty";
 import _slicedToArray from "@babel/runtime-corejs3/helpers/slicedToArray";
 import _concatInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/concat";
-import React, { useCallback, useContext, useEffect } from 'react';
+import React, { useCallback, useContext, useEffect, useState, useRef } from 'react';
 import classNames from 'classnames';
 import ConfigContext from '../config-provider/ConfigContext';
 import { getCompProps } from '../_utils';
@@ -39,11 +39,12 @@ var InternalCheckbox = function InternalCheckbox(props, ref) {
     return isBoolean(checked) ? checked : defaultChecked;
   };
 
-  var _React$useState = React.useState(getChecked()),
-      _React$useState2 = _slicedToArray(_React$useState, 2),
-      selected = _React$useState2[0],
-      setSelected = _React$useState2[1];
+  var _useState = useState(getChecked()),
+      _useState2 = _slicedToArray(_useState, 2),
+      selected = _useState2[0],
+      setSelected = _useState2[1];
 
+  var labelRef = useRef(null);
   devWarning(CheckboxTypes.indexOf(checkboxType) === -1, 'checkbox', "cannot found checkbox type '".concat(checkboxType, "'"));
   devWarning(CheckboxSizes.indexOf(size) === -1, 'checkbox', "cannot found size type '".concat(size, "'"));
   var checkboxPrefixCls = getPrefixCls(prefixCls, 'checkbox', customPrefixcls);
@@ -70,14 +71,21 @@ var InternalCheckbox = function InternalCheckbox(props, ref) {
   useEffect(function () {
     isBoolean(checked) && checked !== selected && setSelected(checked);
   }, [checked, selected]);
+  useEffect(function () {
+    var handleRepeatClick = function handleRepeatClick(e) {
+      var element = e.target;
 
-  var handleRepeatClick = function handleRepeatClick(e) {
-    var element = e.target;
+      if (element.tagName !== 'INPUT') {
+        e.stopPropagation();
+      }
+    };
 
-    if (element.tagName !== 'INPUT') {
-      e.stopPropagation();
-    }
-  };
+    labelRef.current.addEventListener('click', handleRepeatClick);
+    return function () {
+      // eslint-disable-next-line react-hooks/exhaustive-deps
+      labelRef.current.removeEventListener('click', handleRepeatClick);
+    };
+  }, []);
 
   var getDefaultCheckbox = function getDefaultCheckbox() {
     var _context19, _context20;
@@ -88,7 +96,7 @@ var InternalCheckbox = function InternalCheckbox(props, ref) {
       React.createElement("label", {
         className: getRootClassName,
         style: style,
-        onClick: handleRepeatClick
+        ref: labelRef
       }, /*#__PURE__*/React.createElement("span", {
         className: checkedWrapperClassName
       }, selected && /*#__PURE__*/React.createElement("span", {

package/es/checkbox/style/index.css

@@ -151,6 +151,10 @@
       -ms-flex-align: center;
           align-items: center;
   z-index: 999;
+  -webkit-user-select: none;
+     -moz-user-select: none;
+      -ms-user-select: none;
+          user-select: none;
 }
 .kd-checkbox-children .kd-input-underline {
   background-color: transparent;
@@ -383,3 +387,6 @@
 .kd-checkbox-default.checked .kd-checkbox-children {
   color: var(--kd-c-checkbox-color-text-primary, #212121);
 }
+.kd-checkbox-default-indeterminate .kd-checkbox-children {
+  color: var(--kd-c-checkbox-color-text-primary, #212121);
+}

package/es/checkbox/style/index.less

@@ -38,6 +38,8 @@
     justify-content: center;
     align-items: center;
     z-index: 999;
+    user-select: none;
+
     .kd-input-underline {
       background-color: transparent;
       border-bottom: none;
@@ -249,4 +251,9 @@
       color: @checkbox-font-color;
     }
   }
+  &-indeterminate {
+    .@{checkbox-prefix-cls}-children {
+      color: @checkbox-font-color;
+    }
+  }
 }

package/es/config-provider/compDefaultProps.d.ts

@@ -132,7 +132,6 @@ declare const compDefaultProps: {
         mode: string;
         defaultOpen: boolean;
         showArrow: boolean;
-        showSearch: boolean;
     };
     Image: {
         preview: boolean;

package/es/config-provider/compDefaultProps.js

@@ -137,8 +137,7 @@ var compDefaultProps = {
     borderType: 'underline',
     mode: 'single',
     defaultOpen: false,
-    showArrow: true,
-    showSearch: false
+    showArrow: true
   },
   Image: {
     preview: true

package/es/form/Field.js

@@ -3,6 +3,7 @@ import _defineProperty from "@babel/runtime-corejs3/helpers/defineProperty";
 import _typeof from "@babel/runtime-corejs3/helpers/typeof";
 import _slicedToArray from "@babel/runtime-corejs3/helpers/slicedToArray";
 import _Object$getOwnPropertySymbols from "@babel/runtime-corejs3/core-js-stable/object/get-own-property-symbols";
+import _filterInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/filter";
 import _concatInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/concat";
 import _mapInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/map";
 import _includesInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/includes";
@@ -52,8 +53,30 @@ var generateEventHandler = function generateEventHandler(handler, validateTrigge
   return eventHandler;
 };
 
+var INNER_VALUE_PROPS_LIST = [{
+  name: 'Radio',
+  propName: 'checked'
+}, {
+  name: 'Checkbox',
+  propName: 'checked'
+}, {
+  name: 'Switch',
+  propName: 'checked'
+}, {
+  name: 'Upload',
+  propName: 'fileList'
+}, {
+  name: 'Transfer',
+  propName: 'targetKey'
+}, {
+  name: 'RangePicker',
+  propName: 'ranges'
+}];
+
 var Field = function Field(props) {
-  var _classnames, _context2;
+  var _classnames;
+
+  var _a;
 
   devwarning(! /*#__PURE__*/React.isValidElement(props.children), 'Form.Item', 'Children of Form.Item is not a valid element');
   devwarning(!props.name, 'Form.Item', 'Form.Item must have a name');
@@ -97,8 +120,29 @@ var Field = function Field(props) {
       wrapperWidth = props.wrapperWidth,
       validateTrigger = props.validateTrigger,
       defaultValue = props.defaultValue,
-      _props$valuePropName = props.valuePropName,
-      valuePropName = _props$valuePropName === void 0 ? 'value' : _props$valuePropName;
+      valuePropName = props.valuePropName;
+  var childrenNode = null;
+  var innerValuePropName = 'value';
+  var childrenArray = toArray(children);
+
+  if (childrenArray.length) {
+    devwarning(childrenArray.length > 1, 'Form.Item', 'Form.Item must have only child');
+    childrenNode = childrenArray[0];
+  }
+
+  var innerDisplayName = (_a = childrenNode === null || childrenNode === void 0 ? void 0 : childrenNode.type) === null || _a === void 0 ? void 0 : _a.displayName;
+
+  if (valuePropName !== undefined) {
+    innerValuePropName = valuePropName;
+  } else if (innerDisplayName) {
+    var filter = _filterInstanceProperty(INNER_VALUE_PROPS_LIST).call(INNER_VALUE_PROPS_LIST, function (item) {
+      return innerDisplayName === item.name;
+    });
+
+    if (filter.length) {
+      innerValuePropName = filter[0].propName;
+    }
+  }
 
   var onStoreChange = function onStoreChange(stores, _namePathList, source) {
     var prev = stores.prev,
@@ -177,8 +221,8 @@ var Field = function Field(props) {
 
     var inputValue;
 
-    if (Object.prototype.hasOwnProperty.call(evt, 'target') && _includesInstanceProperty(FormEventValuePropNames).call(FormEventValuePropNames, valuePropName)) {
-      inputValue = (_a = evt.target) === null || _a === void 0 ? void 0 : _a[valuePropName];
+    if (Object.prototype.hasOwnProperty.call(evt, 'target') && _includesInstanceProperty(FormEventValuePropNames).call(FormEventValuePropNames, innerValuePropName)) {
+      inputValue = (_a = evt.target) === null || _a === void 0 ? void 0 : _a[innerValuePropName];
     } else {
       inputValue = evt;
     }
@@ -216,7 +260,7 @@ var Field = function Field(props) {
 
     var _ch$props = ch.props,
         chChange = _ch$props.onChange,
-        chValue = _ch$props[valuePropName],
+        chValue = _ch$props[innerValuePropName],
         chDisabled = _ch$props.disabled,
         chDefaultValue = _ch$props.defaultValue;
 
@@ -248,7 +292,7 @@ var Field = function Field(props) {
     return _extends(_extends({}, rest), (_extends3 = {
       onChange: onChange,
       defaultValue: defaultValue
-    }, _defineProperty(_extends3, valuePropName, fieldValue), _defineProperty(_extends3, "disabled", chDisabled || faDisabled), _extends3));
+    }, _defineProperty(_extends3, innerValuePropName, fieldValue), _defineProperty(_extends3, "disabled", chDisabled || faDisabled), _extends3));
   };
 
   return /*#__PURE__*/React.createElement("div", {
@@ -261,10 +305,10 @@ var Field = function Field(props) {
   }), /*#__PURE__*/React.createElement(FieldWrapper, {
     width: wrapperWidth,
     validateMessage: validateMessage
-  }, _mapInstanceProperty(_context2 = toArray(children)).call(_context2, function (child, index) {
+  }, _mapInstanceProperty(childrenArray).call(childrenArray, function (child, index) {
     var keys = mergeProps(_extends(_extends(_defineProperty({
       disabled: disabled
-    }, valuePropName, value), trigger), {
+    }, innerValuePropName, value), trigger), {
       key: index
     }), child);
     return child ? /*#__PURE__*/React.cloneElement(child, keys) : child;

package/es/grid/row.d.ts

@@ -1,5 +1,5 @@
 import * as React from 'react';
-declare type Align = 'top' | 'middle' | 'bottom';
+declare type Align = 'top' | 'middle' | 'bottom' | 'stretch';
 declare type Justify = 'start' | 'end' | 'center' | 'space-around' | 'space-between';
 interface gutterObject {
     xs?: number;

package/es/icon/interface.js

@@ -1,5 +1,5 @@
 import _concatInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/concat";
 import { tuple } from '../_utils/type';
 export var BaseIcon = ['arrow-up', 'arrow-down', 'arrow-left', 'arrow-right', 'first', 'last', 'double-arrow-left', 'double-arrow-right', 'push-down', 'put-top', 'put-bottom', 'put-on', 'put-off', 'switch-up', 'switch-down', 'all-border', 'top-border', 'right-border', 'bottom-border', 'left-border', 'left-extension', 'right-extension', 'left-unfold', 'right-unfold', 'unfoldmenu', 'foldmenu', 'enlarge', 'expand', 'close-full-screen', 'split', 'back', 'arrow', 'no-border', 'border', 'rough-border', 'align-left', 'align-right', 'align-center', 'vertical-center', 'delete-indentation', 'equal', 'greater-equal', 'not-equal', 'male', 'female', 'copy', 'print', 'lock', 'scanning', 'like', 'project', 'user-info', 'shutdown', 'image', 'delete-line', 'add-line', 'job-info', 'detect', 'cancel', 'stop', 'cell', 'fixed-shrink', 'attachment', 'location', 'reduce', 'resign-report', 'forbid', 'education', 'unlock', 'contract', 'filter', 'more', 'operating-element', 'fail', 'edit', 'have-attachment', 'hide', 'preview', 'unfold-all', 'wrap', 'filter-switch', 'qualification-info', 'cn', 'en', 'git', 'reset', 'preview-view', 'unfold', 'comment', 'shoppingcart', 'add-child', 'save', 'detail', 'table-setting', 'edit-view', 'edit-border', 'hyperlink', 'code', 'import', 'address', 'analysis', 'share', 'chart', 'fixed-window', 'order', 'phone', 'classify', 'feedback', 'menu', 'voice', 'search-border', 'material', 'finish', 'more-info', 'fixed', 'change', 'copy-code', 'return', 'qrcode', 'counterclockwise', 'list', 'switch', 'task-process', 'add', 'delete', 'add-word', 'two-window', 'spin', 'ordered-list', 'cooperation', 'quit', 'shrink', 'zoom', 'graffiti', 'experience', 'medical-report', 'bankcard', 'yunzhijia', 'customize', 'refresh', 'search', 'loadding', 'loadding-circle', 'right', 'close', 'upload', 'download', 'upload-cloud', 'waiting', 'warning', 'exclamatory', 'tips', 'setting', 'chart-display', 'date', 'more-item', 'international', 'little-k', 'bellOutlined', 'sigma'];
-export var SolidIcon = ['arrow-up-solid', 'arrow-right-solid', 'arrow-down-solid', 'arrow-left-solid', 'left-unfold-solid', 'right-unfold-solid', 'unlock-solid', 'multiply', 'division-solid', 'title-solid', 'communication-solid', 'fixed-solid', 'more-info-solid', 'timezone-solid', 'mosaic-solid', 'strike-solid', 'lock-solid', 'filter-solid', 'person-solid', 'bold-solid', 'delete-solid', 'processing-solid', 'tips-solid', 'quote-solid', 'oblique-solid', 'sun-solid', 'underline-solid', 'font-background-solid', 'eliminate-solid', 'font-color-solid', 'fx', 'refresh-solid', 'right-solid', 'location-solid', 'add-solid', 'warning-solid', 'close-solid', 'right-bold', 'close-bold', 'workbench', 'star', 'notice'];
+export var SolidIcon = ['arrow-up-solid', 'arrow-right-solid', 'arrow-down-solid', 'arrow-left-solid', 'left-unfold-solid', 'right-unfold-solid', 'unlock-solid', 'multiply', 'division-solid', 'title-solid', 'communication-solid', 'fixed-solid', 'more-info-solid', 'timezone-solid', 'mosaic-solid', 'strike-solid', 'lock-solid', 'filter-solid', 'person-solid', 'bold-solid', 'delete-solid', 'processing-solid', 'tips-solid', 'quote-solid', 'oblique-solid', 'sun-solid', 'underline-solid', 'font-background-solid', 'eliminate-solid', 'font-color-solid', 'fx', 'refresh-solid', 'right-solid', 'location-solid', 'add-solid', 'warning-solid', 'close-solid', 'right-bold', 'close-bold', 'workbench', 'star', 'notice', 'dashboard'];
 export var IconTypes = tuple.apply(void 0, _concatInstanceProperty(BaseIcon).call(BaseIcon, SolidIcon));

package/es/menu/menu.d.ts

@@ -1,4 +1,4 @@
-import * as React from 'react';
+import React from 'react';
 import { MenuMode, MenuTheme, TriggerSubMenuAction, SubMenuChangeEventHandler } from './interface';
 import MenuItem from './menuItem';
 import SubMenu from './subMenu';

package/es/menu/menu.js

@@ -1,10 +1,11 @@
 import _defineProperty from "@babel/runtime-corejs3/helpers/defineProperty";
 import _extends from "@babel/runtime-corejs3/helpers/extends";
+import _toConsumableArray from "@babel/runtime-corejs3/helpers/toConsumableArray";
 import _slicedToArray from "@babel/runtime-corejs3/helpers/slicedToArray";
 import _Object$getOwnPropertySymbols from "@babel/runtime-corejs3/core-js-stable/object/get-own-property-symbols";
-import _spliceInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/splice";
-import _concatInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/concat";
+import _Set from "@babel/runtime-corejs3/core-js-stable/set";
 import _mapInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/map";
+import _concatInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/concat";
 
 var __rest = this && this.__rest || function (s, e) {
   var t = {};
@@ -19,7 +20,7 @@ var __rest = this && this.__rest || function (s, e) {
   return t;
 };
 
-import * as React from 'react';
+import React, { useEffect } from 'react';
 import { toArray } from '../_utils/react-children';
 import { ConfigContext } from '../config-provider';
 import { getCompProps } from '../_utils';
@@ -32,6 +33,8 @@ var isFunction = function isFunction(fn) {
   return fn && typeof fn === 'function';
 };
 
+var openSubMenuSet = new _Set();
+
 var Menu = function Menu(props) {
   var _context2, _classNames;
 
@@ -42,6 +45,9 @@ var Menu = function Menu(props) {
       pkgPrefixCls = _React$useContext.prefixCls,
       userDefaultProps = _React$useContext.compDefaultProps;
 
+  var userSelectedKey = props.selectedKey,
+      userOpenKeys = props.openKeys;
+
   var _b = getCompProps('Menu', userDefaultProps, props),
       customPrefixcls = _b.prefixCls,
       mode = _b.mode,
@@ -57,20 +63,35 @@ var Menu = function Menu(props) {
       restProps = __rest(_b, ["prefixCls", "mode", "inlineIndent", "forceSubMenuRender", "additionalTools", "onClick", "onOpenChange", "children", "className", "theme", "collapsed"]);
 
   var prefixCls = getPrefixCls(pkgPrefixCls, 'menu', customPrefixcls);
-  devWarning(['inline', 'vertical', undefined].indexOf(mode) === -1, 'menu', "cannot found menu mode '".concat(mode, "'"));
-  var defaultSelectedKey = ('selectedKey' in restProps ? restProps.selectedKey : restProps.defaultSelectedKey) || '';
-  var defaultOpenKeys = ('openKeys' in restProps ? restProps.openKeys : restProps.defaultOpenKeys) || []; // const [collapsed, setCollapsed] = React.useState<boolean | undefined>(restProps.collapsed)
+  devWarning(['inline', 'vertical', undefined].indexOf(mode) === -1, 'menu', "cannot found menu mode '".concat(mode, "'")); // const [collapsed, setCollapsed] = React.useState<boolean | undefined>(restProps.collapsed)
 
-  var _React$useState = React.useState(defaultSelectedKey),
+  var _React$useState = React.useState(''),
       _React$useState2 = _slicedToArray(_React$useState, 2),
       selectedKey = _React$useState2[0],
       setSelectedKey = _React$useState2[1];
 
-  var _React$useState3 = React.useState(defaultOpenKeys),
+  var _React$useState3 = React.useState([]),
       _React$useState4 = _slicedToArray(_React$useState3, 2),
       openKeys = _React$useState4[0],
-      setOpenKeys = _React$useState4[1]; // triggerSubMenuAction内嵌模式固定为click，即该值设置只对垂直模式有效
+      setOpenKeys = _React$useState4[1];
 
+  useEffect(function () {
+    if (userSelectedKey !== undefined) {
+      setSelectedKey(userSelectedKey);
+    }
+  }, [userSelectedKey]);
+  useEffect(function () {
+    if (userOpenKeys !== undefined) {
+      setOpenKeys(userOpenKeys);
+    }
+  }, [userOpenKeys]);
+  useEffect(function () {
+    if (Array.isArray(userOpenKeys)) {
+      userOpenKeys.forEach(function (d) {
+        openSubMenuSet.add(d);
+      });
+    }
+  }, []); // triggerSubMenuAction内嵌模式固定为click，即该值设置只对垂直模式有效
 
   if (mode === 'inline') {
     restProps.triggerSubMenuAction = 'click';
@@ -80,7 +101,9 @@ var Menu = function Menu(props) {
 
 
   var handleOnClick = function handleOnClick(info) {
-    setSelectedKey(info.key);
+    if (userSelectedKey === undefined) {
+      setSelectedKey(info.key);
+    }
 
     if (mode !== 'inline' && openKeys.length > 0) {
       setOpenKeys([]);
@@ -102,18 +125,24 @@ var Menu = function Menu(props) {
   }; // 子菜单展开关闭的回调
 
 
-  var handleOnOpenChange = function handleOnOpenChange(openKey) {
-    var index = openKeys.indexOf(openKey);
+  var handleOnOpenChange = function handleOnOpenChange(openKey, isAdd) {
+    var clean = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
 
-    if (index > -1) {
-      _spliceInstanceProperty(openKeys).call(openKeys, index, 1);
-
-      setOpenKeys(openKeys);
+    if (clean) {
+      openSubMenuSet.clear();
     } else {
-      setOpenKeys(_concatInstanceProperty(openKeys).call(openKeys, openKey));
+      if (isAdd) {
+        openSubMenuSet.add(openKey);
+      } else {
+        openSubMenuSet.delete(openKey);
+      }
+    }
+
+    if (userOpenKeys === undefined) {
+      setOpenKeys(_toConsumableArray(openSubMenuSet));
     }
 
-    onOpenChange && onOpenChange(openKey);
+    onOpenChange && onOpenChange(_toConsumableArray(openSubMenuSet));
   };
 
   var renderMenu = function renderMenu() {
@@ -129,11 +158,14 @@ var Menu = function Menu(props) {
         mode: mode,
         openKeys: openKeys,
         selectedKey: selectedKey,
+        theme: theme,
         triggerSubMenuAction: restProps.triggerSubMenuAction,
         forceSubMenuRender: forceSubMenuRender,
         handleOnOpenChange: handleOnOpenChange,
         handleOnClick: handleOnClick,
-        inlineIndent: inlineIndent
+        inlineIndent: inlineIndent,
+        userOpenKeys: userOpenKeys,
+        userSelectedKey: userSelectedKey
       });
     }));
   };