@kdcloudjs/kdesign 1.3.3 → 1.3.6

package/es/table/table.js

@@ -17,6 +17,7 @@ import useTreeMode from './feature/treeMode';
 import useColumnResize from './feature/columnResize';
 import useColumnDrag from './feature/columnDrag';
 import useContextMenu from './feature/contextMenu';
+import useRangeSelection from './feature/useRangeSelection';
 import devWarning from '../_utils/devwarning';
 
 function Table(props) {
@@ -46,6 +47,7 @@ function Table(props) {
       getRowProps = props.getRowProps,
       getTableProps = props.getTableProps,
       contextMenu = props.contextMenu,
+      rangeSelection = props.rangeSelection,
       cssVariables = props.cssVariables;
 
   var _useContext = useContext(ConfigContext),
@@ -56,19 +58,24 @@ function Table(props) {
   var tableCls = classNames(tablePrefixCls, className);
   var pipeline = useTablePipeline({
     components: {
-      Checkbox: Checkbox,
-      Radio: Radio
+      Checkbox: (components === null || components === void 0 ? void 0 : components.Checkbox) || Checkbox,
+      Radio: (components === null || components === void 0 ? void 0 : components.Radio) || Radio
     }
   }).primaryKey(primaryKey === undefined ? '' : primaryKey).input({
     columns: columns,
     dataSource: dataSource
   });
+
+  if (footerDataSource) {
+    pipeline.footerDataSource(footerDataSource);
+  }
   /* -------------------------------------------------------------------------- */
 
   /* features                                                                   */
 
   /* -------------------------------------------------------------------------- */
 
+
   useRowSelection(pipeline, rowSelection);
   useRowDetail(pipeline, rowDetail);
   useFilter(pipeline, filter);
@@ -78,6 +85,7 @@ function Table(props) {
   useColumnResize(pipeline, columnResize);
   useColumnDrag(pipeline, columnDrag);
   useContextMenu(pipeline, contextMenu);
+  useRangeSelection(pipeline, rangeSelection);
   /* -------------------------------------------------------------------------- */
 
   /* after useTablePipeline, merge pipeline.getProps result                     */
@@ -101,18 +109,17 @@ function Table(props) {
     className: tableCls,
     style: style,
     isLoading: isLoading,
-    components: _extends({
-      LoadingIcon: function LoadingIcon() {
+    components: {
+      LoadingIcon: (components === null || components === void 0 ? void 0 : components.LoadingIcon) || function () {
         return /*#__PURE__*/React.createElement(Spin, {
           type: "container"
         });
       },
-      EmptyContent: function EmptyContent() {
+      EmptyContent: (components === null || components === void 0 ? void 0 : components.EmptyContent) || function () {
         return /*#__PURE__*/React.createElement(Empty, null);
       }
-    }, components),
+    },
     useVirtual: useVirtual,
-    footerDataSource: footerDataSource,
     estimatedRowHeight: estimatedRowHeight,
     emptyCellHeight: emptyCellHeight,
     hasHeader: hasHeader,

package/lib/_utils/usePopper.d.ts

@@ -15,6 +15,7 @@ export interface PopperProps {
     mouseEnterDelay?: number;
     mouseLeaveDelay?: number;
     defaultVisible?: boolean;
+    autoPlacement?: boolean;
     popperClassName?: string;
     placement?: PlacementType;
     popperStyle?: React.CSSProperties;

package/lib/_utils/usePopper.js

@@ -186,6 +186,8 @@ function usePopper(locatorElement, popperElement, props) {
       mouseLeaveDelay = _props$mouseLeaveDela === void 0 ? 0.1 : _props$mouseLeaveDela,
       _props$defaultVisible = props.defaultVisible,
       defaultVisible = _props$defaultVisible === void 0 ? false : _props$defaultVisible,
+      _props$autoPlacement = props.autoPlacement,
+      autoPlacement = _props$autoPlacement === void 0 ? true : _props$autoPlacement,
       _props$getTriggerElem = props.getTriggerElement,
       getTriggerElement = _props$getTriggerElem === void 0 ? function (locatorNode) {
     return locatorNode;
@@ -323,36 +325,38 @@ function usePopper(locatorElement, popperElement, props) {
       var currentPos = trigger === 'contextMenu' ? mousePos : locatorPos;
       var _currentPlacement = placement;
 
-      if (top - gap - popperHeight <= 5 && bottom + gap + popperHeight < document.body.clientHeight - 5) {
-        _currentPlacement = _currentPlacement.replace('top', 'bottom');
-      }
+      if (autoPlacement) {
+        if (top - gap - popperHeight <= 5 && bottom + gap + popperHeight < document.body.clientHeight - 5) {
+          _currentPlacement = _currentPlacement.replace('top', 'bottom');
+        }
 
-      if (bottom + gap + popperHeight >= document.body.clientHeight - 5 && top - gap - popperHeight > 5) {
-        _currentPlacement = _currentPlacement.replace('bottom', 'top');
-      }
+        if (bottom + gap + popperHeight >= document.body.clientHeight - 5 && top - gap - popperHeight > 5) {
+          _currentPlacement = _currentPlacement.replace('bottom', 'top');
+        }
 
-      if (left + popperWidth >= document.body.clientWidth - 5 && right - popperWidth > 5) {
-        _currentPlacement = _currentPlacement.replace('Left', 'Right');
-      }
+        if (left + popperWidth >= document.body.clientWidth - 5 && right - popperWidth > 5) {
+          _currentPlacement = _currentPlacement.replace('Left', 'Right');
+        }
 
-      if (right - popperWidth <= 5 && left + popperWidth < document.body.clientWidth - 5) {
-        _currentPlacement = _currentPlacement.replace('Right', 'Left');
-      }
+        if (right - popperWidth <= 5 && left + popperWidth < document.body.clientWidth - 5) {
+          _currentPlacement = _currentPlacement.replace('Right', 'Left');
+        }
 
-      if (top + popperHeight >= document.body.clientHeight - 5 && bottom - popperHeight > 5) {
-        _currentPlacement = _currentPlacement.replace('Top', 'Bottom');
-      }
+        if (top + popperHeight >= document.body.clientHeight - 5 && bottom - popperHeight > 5) {
+          _currentPlacement = _currentPlacement.replace('Top', 'Bottom');
+        }
 
-      if (bottom - popperHeight <= 5 && top + popperHeight < document.body.clientHeight - 5) {
-        _currentPlacement = _currentPlacement.replace('Bottom', 'Top');
-      }
+        if (bottom - popperHeight <= 5 && top + popperHeight < document.body.clientHeight - 5) {
+          _currentPlacement = _currentPlacement.replace('Bottom', 'Top');
+        }
 
-      if (left - gap - popperWidth <= 5 && right + gap + popperWidth < document.body.clientWidth - 5) {
-        _currentPlacement = _currentPlacement.replace('left', 'right');
-      }
+        if (left - gap - popperWidth <= 5 && right + gap + popperWidth < document.body.clientWidth - 5) {
+          _currentPlacement = _currentPlacement.replace('left', 'right');
+        }
 
-      if (right + gap + popperWidth >= document.body.clientWidth - 5 && left - gap - popperWidth > 5) {
-        _currentPlacement = _currentPlacement.replace('right', 'left');
+        if (right + gap + popperWidth >= document.body.clientWidth - 5 && left - gap - popperWidth > 5) {
+          _currentPlacement = _currentPlacement.replace('right', 'left');
+        }
       }
 
       var leftLeft = currentPos.left - popperWidth - gap;
@@ -465,7 +469,7 @@ function usePopper(locatorElement, popperElement, props) {
       setArrowPos(_arrowPos);
       setCurrentPlacement(_currentPlacement);
     }
-  }, [locatorRef, popperRef, container, trigger, mousePos, placement, gap, arrowOffset, arrowSize, arrowWidth]);
+  }, [locatorRef, popperRef, container, trigger, mousePos, placement, gap, arrowOffset, arrowSize, arrowWidth, autoPlacement]);
   (0, _react.useEffect)(function () {
     if (canAlign) {
       alignPopper();
@@ -479,7 +483,7 @@ function usePopper(locatorElement, popperElement, props) {
   if (arrowPos.left) arrowStyle["--arrowLeft"] = arrowPos.left + 'px';
   var popperContainerStyle = (0, _extends2.default)((0, _extends2.default)((0, _extends2.default)({
     position: 'absolute'
-  }, popperStyle), align), arrow ? arrowStyle : {});
+  }, align), arrow ? arrowStyle : {}), popperStyle);
   var popperProps = {
     ref: popperRef,
     style: popperContainerStyle,

package/lib/anchor/anchor.js

@@ -367,7 +367,9 @@ var InternalAnchor = function InternalAnchor(props, ref) {
     !isLocked && setOptionShow(visible);
   };
 
-  var popperProps = (0, _extends2.default)((0, _extends2.default)({}, anchorProps), {
+  var popperProps = (0, _extends2.default)((0, _extends2.default)({
+    autoPlacement: false
+  }, anchorProps), {
     prefixCls: anchorPrefixCls,
     defaultVisible: optionShow,
     visible: optionShow,
@@ -375,6 +377,22 @@ var InternalAnchor = function InternalAnchor(props, ref) {
     onVisibleChange: handleVisibleChange
   });
 
+  var fixedRef = _react.default.useRef(null);
+
+  if (type === 'advanced' && isLocked) {
+    if (fixedRef.current) {
+      var _fixedRef$current$get = fixedRef.current.getBoundingClientRect(),
+          left = _fixedRef$current$get.left,
+          top = _fixedRef$current$get.top;
+
+      popperProps.popperStyle = {
+        position: 'fixed',
+        left: left,
+        top: top
+      };
+    }
+  }
+
   var addChildrenProps = function addChildrenProps(linksChildren) {
     var _context4;
 
@@ -504,6 +522,7 @@ var InternalAnchor = function InternalAnchor(props, ref) {
     });
 
     return /*#__PURE__*/_react.default.createElement("div", {
+      ref: fixedRef,
       className: anchorAdvancedClass,
       style: dropdownStyle
     }, lockedIcon !== false && /*#__PURE__*/_react.default.createElement("span", {

package/lib/base-data/style/index.css

@@ -222,6 +222,7 @@
 }
 .kd-baseData-dropdown-options {
   height: var(--kd-c-base-data-dropdown-options-sizing-height, 32px);
+  cursor: pointer;
 }
 .kd-baseData-dropdown-options:hover {
   background: var(--kd-c-base-data-color-background-hover, var(--kd-g-color-hover, #f5f5f5));

package/lib/base-data/style/index.less

@@ -115,6 +115,7 @@
 
     &-options {
       height: @base-data-dropdown-options-height;
+      cursor: pointer;
 
       &:hover {
         background: @base-data-hover-bg;

package/lib/form/Field.js

@@ -137,7 +137,8 @@ var Field = function Field(props) {
       getInternalHooks = fieldContext.getInternalHooks,
       vertical = fieldContext.vertical,
       getDefaultValue = fieldContext.getDefaultValue,
-      local = fieldContext.local;
+      local = fieldContext.local,
+      formDisabled = fieldContext.disabled;
 
   var _getInternalHooks = getInternalHooks(_useForm.INTERNAL_HOOK_KEY),
       registerField = _getInternalHooks.registerField,
@@ -305,17 +306,17 @@ var Field = function Field(props) {
         chDisabled = _ch$props.disabled,
         chDefaultValue = _ch$props.defaultValue;
 
-    var onChange = function onChange(evt) {
+    var onChange = function onChange() {
       if (chValue === undefined) {
-        setFieldValue(getInputValueFormProp(evt));
+        setFieldValue(getInputValueFormProp(arguments.length <= 0 ? undefined : arguments[0]));
       }
 
       if (typeof faChange === 'function') {
-        faChange(evt);
+        faChange.apply(void 0, arguments);
       }
 
       if (typeof chChange === 'function') {
-        chChange(evt);
+        chChange.apply(void 0, arguments);
       }
     };
 
@@ -333,7 +334,7 @@ var Field = function Field(props) {
     return (0, _extends5.default)((0, _extends5.default)({}, rest), (_extends3 = {
       onChange: onChange,
       defaultValue: defaultValue
-    }, (0, _defineProperty2.default)(_extends3, innerValuePropName, fieldValue), (0, _defineProperty2.default)(_extends3, "disabled", chDisabled || faDisabled), _extends3));
+    }, (0, _defineProperty2.default)(_extends3, innerValuePropName, fieldValue), (0, _defineProperty2.default)(_extends3, "disabled", chDisabled !== undefined ? chDisabled : faDisabled !== undefined ? faDisabled : formDisabled), _extends3));
   };
 
   return /*#__PURE__*/_react.default.createElement("div", {

package/lib/form/Form.d.ts

@@ -4,6 +4,7 @@ declare type BaseFormProps = Omit<React.FormHTMLAttributes<HTMLFormElement>, 'on
 export interface FormProps<Values = any> extends BaseFormProps {
     children?: React.ReactNode;
     defaultValues?: Store;
+    disabled?: boolean;
     className?: string;
     form?: FormInstance<Values>;
     labelAlign?: LabelAlign;

package/lib/form/Form.js

@@ -81,7 +81,8 @@ var Form = function Form(props, ref) {
       onFinish = formProps.onFinish,
       onFinishFailed = formProps.onFinishFailed,
       onValuesChange = formProps.onValuesChange,
-      restProps = __rest(formProps, ["children", "defaultValues", "className", "form", "labelAlign", "labelWidth", "layout", "name", "prefixCls", "wrapperWidth", "onFinish", "onFinishFailed", "onValuesChange"]);
+      disabled = formProps.disabled,
+      restProps = __rest(formProps, ["children", "defaultValues", "className", "form", "labelAlign", "labelWidth", "layout", "name", "prefixCls", "wrapperWidth", "onFinish", "onFinishFailed", "onValuesChange", "disabled"]);
 
   var formPrefixCls = getPrefixCls(prefixCls, 'form', customizePrefixCls);
   var formClassName = (0, _classnames2.default)((_classnames = {}, (0, _defineProperty2.default)(_classnames, "".concat(formPrefixCls), true), (0, _defineProperty2.default)(_classnames, (0, _concat.default)(_context = "".concat(formPrefixCls, "-")).call(_context, layout), true), _classnames), className);
@@ -121,6 +122,7 @@ var Form = function Form(props, ref) {
       labelWidth: labelWidth,
       wrapperWidth: wrapperWidth,
       local: formLang,
+      disabled: disabled,
       vertical: layout === 'vertical'
     });
   }, [formInstance, labelAlign, labelWidth, wrapperWidth, layout, formLang]);

package/lib/form/interface.d.ts

@@ -34,6 +34,7 @@ export interface InternalFormInstance extends FormInstance {
     labelAlign?: LabelAlign;
     wrapperWidth?: string | number;
     vertical?: boolean;
+    disabled?: boolean;
     local?: InnerLocale;
     getInternalHooks: (key: string) => InternalHooks | null;
 }

package/lib/menu/menu.js

@@ -108,31 +108,32 @@ var Menu = function Menu(props) {
       openKeys = _React$useState4[0],
       setOpenKeys = _React$useState4[1];
 
+  if (mode === 'inline') {
+    restProps.triggerSubMenuAction = 'click';
+  }
+
+  (0, _react.useEffect)(function () {
+    setOpenKeys([]);
+    setSelectedKey('');
+    openSubMenuSet.clear();
+  }, [mode]);
   (0, _react.useEffect)(function () {
     if (userSelectedKey !== undefined) {
       setSelectedKey(userSelectedKey);
     }
   }, [userSelectedKey]);
   (0, _react.useEffect)(function () {
-    if (userOpenKeys !== undefined) {
+    if (userOpenKeys !== undefined && Array.isArray(userOpenKeys)) {
       setOpenKeys(userOpenKeys);
-    }
-  }, [userOpenKeys]);
-  (0, _react.useEffect)(function () {
-    if (Array.isArray(userOpenKeys)) {
+      openSubMenuSet.clear();
       userOpenKeys.forEach(function (d) {
         openSubMenuSet.add(d);
       });
     }
-  }, []); // triggerSubMenuAction内嵌模式固定为click，即该值设置只对垂直模式有效
-
-  if (mode === 'inline') {
-    restProps.triggerSubMenuAction = 'click';
-  } // React.useEffect(() => {
+  }, [userOpenKeys]); // React.useEffect(() => {
   //   setCollapsed(restProps.collapsed)
   // }, [restProps.collapsed])
 
-
   var handleOnClick = function handleOnClick(info) {
     if (userSelectedKey === undefined) {
       setSelectedKey(info.key);

package/lib/menu/subMenu.js

@@ -55,7 +55,7 @@ var __rest = void 0 && (void 0).__rest || function (s, e) {
 };
 
 var SubMenu = function SubMenu(props) {
-  var _classNames3, _classNames4, _context5;
+  var _classNames2, _classNames3, _context4;
 
   var _React$useContext = _react.default.useContext(_configProvider.ConfigContext),
       getPrefixCls = _React$useContext.getPrefixCls,
@@ -83,8 +83,9 @@ 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"]); // 初始化level
+      restProps = __rest(_a, ["prefixCls", "theme", "mode", "title", "icon", "disabled", "children", "collapsed", "keyValue", "selectedKey", "openKeys", "triggerSubMenuAction", "forceSubMenuRender", "inlineIndent", "className", "style", "handleOnOpenChange", "paddingLeft"]);
 
+  var isVertical = mode === 'vertical'; // 初始化level
 
   if (!restProps.level) {
     restProps.level = 1;
@@ -110,7 +111,7 @@ var SubMenu = function SubMenu(props) {
   var visible = Array.isArray(openKeys) && (0, _includes.default)(openKeys).call(openKeys, keyValue);
 
   _react.default.useEffect(function () {
-    if (!visible) return;
+    if (!visible || isVertical) return;
     var subMenuWrapperEle = subMenuWrapperRef.current;
     var subMenuEle = subMenuRef.current;
 
@@ -216,11 +217,10 @@ 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();
-  }
+  }); // // 缩略模式自动关闭子菜单
+  // if (triggerSubMenuAction === 'click' && mode === 'vertical' && collapsed) {
+  //   closeSubMenu()
+  // }
 
   var handleMouseEvent = function handleMouseEvent(status) {
     if (disabled || triggerSubMenuAction === 'click') return;
@@ -241,7 +241,7 @@ var SubMenu = function SubMenu(props) {
     // 保存路径
     info.keyPath = (0, _concat.default)(_context = info.keyPath).call(_context, [keyValue]);
 
-    if (triggerSubMenuAction === 'click' && mode === 'vertical') {
+    if (triggerSubMenuAction === 'click' && isVertical) {
       closeSubMenu();
     }
 
@@ -314,53 +314,12 @@ var SubMenu = function SubMenu(props) {
   var titleStyle = {
     paddingRight: "".concat(curPaddingRight, "px"),
     paddingLeft: "".concat(curPaddingLeft, "px")
-  };
-
-  if (mode !== 'vertical') {
-    var _classNames2, _context4;
-
-    return /*#__PURE__*/_react.default.createElement("li", (0, _extends2.default)({
-      ref: subMenuRef,
-      className: (0, _classnames.default)(prefixCls, className, (_classNames2 = {}, (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)),
-      key: keyValue
-    }, mouseEvent, {
-      style: style
-    }), /*#__PURE__*/_react.default.createElement("div", {
-      className: (0, _classnames.default)("".concat(prefixCls, "-title")),
-      style: titleStyle
-    }, icon && /*#__PURE__*/_react.default.cloneElement((0, _util.renderReactNodeFunction)(icon), {
-      className: (0, _classnames.default)("".concat(prefixCls, "-icon"))
-    }), renderItemTitle(), renderItemArrow()), /*#__PURE__*/_react.default.createElement("div", {
-      style: getCurrentStyle(),
-      ref: subMenuWrapperRef
-    }, /*#__PURE__*/_react.default.createElement("ul", {
-      className: (0, _classnames.default)("".concat(prefixCls, "-sub"), restProps.popupClassName)
-    }, (0, _map.default)(_context4 = (0, _reactChildren.toArray)(children)).call(_context4, function (item, index) {
-      var key = item.key || index;
-      return /*#__PURE__*/_react.default.cloneElement(item, {
-        key: key,
-        level: restProps.level + 1,
-        keyValue: key,
-        collapsed: collapsed,
-        mode: mode,
-        selectedKey: selectedKey,
-        openKeys: openKeys,
-        forceSubMenuRender: forceSubMenuRender,
-        triggerSubMenuAction: triggerSubMenuAction,
-        handleOnOpenChange: handleOnOpenChange,
-        handleOnClick: handleOnClick,
-        inlineIndent: inlineIndent,
-        paddingLeft: curPaddingLeft
-      });
-    }))));
-  } // eslint-disable-next-line react-hooks/rules-of-hooks
+  }; // eslint-disable-next-line react-hooks/rules-of-hooks
 
-
-  return (0, _usePopper.default)( /*#__PURE__*/_react.default.createElement("li", (0, _extends2.default)({
-    className: (0, _classnames.default)(prefixCls, className, (_classNames3 = {}, (0, _defineProperty2.default)(_classNames3, "light", theme === 'light'), (0, _defineProperty2.default)(_classNames3, "".concat(prefixCls, "-collapsed"), collapsed), (0, _defineProperty2.default)(_classNames3, "".concat(prefixCls, "-disabled"), disabled), (0, _defineProperty2.default)(_classNames3, "".concat(prefixCls, "-hover"), !disabled && visible), (0, _defineProperty2.default)(_classNames3, "".concat(prefixCls, "-active"), Array.isArray(openKeys) && (0, _includes.default)(openKeys).call(openKeys, keyValue)), _classNames3)),
+  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)),
     ref: subMenuVerticalRef,
-    key: keyValue,
-    style: style
+    key: keyValue
   }, {
     onMouseLeave: handleOnMouseLeave,
     onMouseEnter: handleOnMouseEnter,
@@ -379,8 +338,8 @@ var SubMenu = function SubMenu(props) {
       handleOnMouseEnter();
     }
   }, /*#__PURE__*/_react.default.createElement("ul", {
-    className: (0, _classnames.default)("".concat(prefixCls, "-sub"), restProps.popupClassName, (_classNames4 = {}, (0, _defineProperty2.default)(_classNames4, "".concat(prefixCls, "-sub-second"), restProps.level === 1), (0, _defineProperty2.default)(_classNames4, "".concat(prefixCls, "-sub-third"), restProps.level === 2), _classNames4))
-  }, (0, _map.default)(_context5 = (0, _reactChildren.toArray)(children)).call(_context5, function (item, index) {
+    className: (0, _classnames.default)("".concat(prefixCls, "-sub"), restProps.popupClassName, (_classNames3 = {}, (0, _defineProperty2.default)(_classNames3, "".concat(prefixCls, "-sub-second"), restProps.level === 1), (0, _defineProperty2.default)(_classNames3, "".concat(prefixCls, "-sub-third"), restProps.level === 2), _classNames3))
+  }, (0, _map.default)(_context4 = (0, _reactChildren.toArray)(children)).call(_context4, function (item, index) {
     var key = item.key || index;
     return /*#__PURE__*/_react.default.cloneElement(item, {
       key: key,
@@ -402,10 +361,52 @@ var SubMenu = function SubMenu(props) {
     arrow: false,
     placement: 'rightTop',
     gap: 0,
-    visible: visible,
+    visible: isVertical ? visible : false,
+    disabled: isVertical ? undefined : true,
     prefixCls: 'kd-menu-popper',
     popperClassName: theme === 'light' ? 'light' : ''
   });
+
+  if (isVertical) {
+    return verticalView;
+  } else {
+    var _classNames4, _context5;
+
+    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)),
+      key: keyValue
+    }, mouseEvent, {
+      style: style
+    }), /*#__PURE__*/_react.default.createElement("div", {
+      className: (0, _classnames.default)("".concat(prefixCls, "-title")),
+      style: titleStyle
+    }, icon && /*#__PURE__*/_react.default.cloneElement((0, _util.renderReactNodeFunction)(icon), {
+      className: (0, _classnames.default)("".concat(prefixCls, "-icon"))
+    }), renderItemTitle(), renderItemArrow()), /*#__PURE__*/_react.default.createElement("div", {
+      style: getCurrentStyle(),
+      ref: subMenuWrapperRef
+    }, /*#__PURE__*/_react.default.createElement("ul", {
+      className: (0, _classnames.default)("".concat(prefixCls, "-sub"), restProps.popupClassName)
+    }, (0, _map.default)(_context5 = (0, _reactChildren.toArray)(children)).call(_context5, function (item, index) {
+      var key = item.key || index;
+      return /*#__PURE__*/_react.default.cloneElement(item, {
+        key: key,
+        level: restProps.level + 1,
+        keyValue: key,
+        collapsed: collapsed,
+        mode: mode,
+        selectedKey: selectedKey,
+        openKeys: openKeys,
+        forceSubMenuRender: forceSubMenuRender,
+        triggerSubMenuAction: triggerSubMenuAction,
+        handleOnOpenChange: handleOnOpenChange,
+        handleOnClick: handleOnClick,
+        inlineIndent: inlineIndent,
+        paddingLeft: curPaddingLeft
+      });
+    }))));
+  }
 };
 
 SubMenu.displayName = 'SubMenu';

package/lib/select/select.js

@@ -103,7 +103,6 @@ var InternalSelect = function InternalSelect(props, ref) {
       setInitValue = _useMergedState2[1];
 
   var realChildren = Array.isArray(options) ? options : (0, _reactChildren.toArray)(children); // options配置项和默认children
-  // console.log('real', realChildren)
 
   var innerRef = _react.default.useRef();
 
@@ -288,6 +287,7 @@ var InternalSelect = function InternalSelect(props, ref) {
         return (child === null || child === void 0 ? void 0 : child.value) === key;
       }
     })) || {};
+    var optionsObj = obj.props ? obj.props : obj || {};
 
     if (value !== undefined) {
       // onChange && onChange(labelInValue ? { value: key, label } : key)
@@ -304,13 +304,13 @@ var InternalSelect = function InternalSelect(props, ref) {
           (0, _splice.default)(optsArr).call(optsArr, idx, 1);
         } else {
           valArr.push(key);
-          optsArr.push({
+          optsArr.push((0, _extends2.default)((0, _extends2.default)({}, optionsObj), {
             value: key,
             label: obj.props ? (_a = obj.props) === null || _a === void 0 ? void 0 : _a.children : obj.label || key
-          });
+          }));
         }
 
-        onChange && onChange(labelInValue ? optsArr : valArr);
+        onChange && onChange(labelInValue ? optsArr : valArr, optsArr);
 
         if (!isSelected) {
           onDeselect && onDeselect(key); // 下拉项取消选中时调用，参数为选中项的value,多选模式下生效
@@ -320,7 +320,10 @@ var InternalSelect = function InternalSelect(props, ref) {
         onChange && onChange(labelInValue ? {
           value: key,
           label: label
-        } : key);
+        } : key, (0, _extends2.default)((0, _extends2.default)({}, optionsObj), {
+          value: key,
+          label: label
+        }));
       }
 
       onSelect && onSelect(key);
@@ -336,7 +339,10 @@ var InternalSelect = function InternalSelect(props, ref) {
       onChange && onChange(labelInValue ? {
         value: key,
         label: label
-      } : key);
+      } : key, (0, _extends2.default)((0, _extends2.default)({}, optionsObj), {
+        value: key,
+        label: label
+      }));
     } else {
       var _multipleRef$current2 = multipleRef.current,
           _selectedVal = _multipleRef$current2.selectedVal,
@@ -350,15 +356,15 @@ var InternalSelect = function InternalSelect(props, ref) {
       } else {
         _selectedVal.push(key);
 
-        _selectMulOpts.push({
+        _selectMulOpts.push((0, _extends2.default)((0, _extends2.default)({}, optionsObj), {
           value: key,
           label: obj.props ? (_c = obj.props) === null || _c === void 0 ? void 0 : _c.children : obj.label || key
-        });
+        }));
       } // setInitValue([...selectedVal])
 
 
       setMulOptions((0, _toConsumableArray2.default)(_selectMulOpts));
-      onChange && onChange(labelInValue ? _selectMulOpts : _selectedVal);
+      onChange && onChange(labelInValue ? _selectMulOpts : _selectedVal, _selectMulOpts);
 
       if (!isSelected) {
         onDeselect && onDeselect(key); // 下拉项取消选中时调用，参数为选中项的value,多选模式下生效
@@ -379,9 +385,9 @@ var InternalSelect = function InternalSelect(props, ref) {
 
     if ((realChildren === null || realChildren === void 0 ? void 0 : realChildren.length) !== selectedVal.length) {
       (0, _map.default)(realChildren).call(realChildren, function (child) {
-        var _child$props = child.props,
-            value = _child$props.value,
-            children = _child$props.children;
+        var _ref = child.props || child,
+            value = _ref.value,
+            children = _ref.children;
 
         if (!(0, _includes.default)(selectedVal).call(selectedVal, value)) {
           selectedVal.push(value);
@@ -393,12 +399,12 @@ var InternalSelect = function InternalSelect(props, ref) {
       });
       setMulOptions((0, _toConsumableArray2.default)(selectMulOpts));
     } else {
-      multipleRef.current.selectedVal = [];
-      multipleRef.current.selectMulOpts = [];
+      multipleRef.current.selectedVal = selectedVal = [];
+      multipleRef.current.selectMulOpts = selectMulOpts = [];
       setMulOptions([]);
     }
 
-    onChange && onChange(labelInValue ? selectMulOpts : selectedVal);
+    onChange && onChange(labelInValue ? selectMulOpts : selectedVal, selectMulOpts);
   }; // 筛选内容 ---可以优化，抽成hook
 
 
@@ -456,7 +462,7 @@ var InternalSelect = function InternalSelect(props, ref) {
     (0, _splice.default)(selectedVal).call(selectedVal, idx, 1);
     (0, _splice.default)(selectMulOpts).call(selectMulOpts, idx, 1);
     setMulOptions((0, _toConsumableArray2.default)(selectMulOpts));
-    onChange && onChange(labelInValue ? selectMulOpts : selectedVal);
+    onChange && onChange(labelInValue ? selectMulOpts : selectedVal, selectMulOpts);
     e.stopPropagation();
   }; // 渲染后缀图标
 
@@ -686,8 +692,8 @@ var InternalSelect = function InternalSelect(props, ref) {
     var _a;
 
     if (selectRef === null || selectRef === void 0 ? void 0 : selectRef.current) {
-      var _ref = (_a = selectRef.current) === null || _a === void 0 ? void 0 : _a.getBoundingClientRect(),
-          width = _ref.width;
+      var _ref2 = (_a = selectRef.current) === null || _a === void 0 ? void 0 : _a.getBoundingClientRect(),
+          width = _ref2.width;
 
       return {
         width: (dropdownStyle === null || dropdownStyle === void 0 ? void 0 : dropdownStyle.width) || (width > 75 ? width : 75),