@kdcloudjs/kdesign 1.7.21 → 1.7.22

package/lib/menu/menu.js

@@ -41,10 +41,10 @@ var openSubMenuSet = new _set.default();
 var Menu = function Menu(props) {
   var _context2, _classNames;
   var _a;
-  var _React$useContext = _react.default.useContext(_configProvider.ConfigContext),
-    getPrefixCls = _React$useContext.getPrefixCls,
-    pkgPrefixCls = _React$useContext.prefixCls,
-    userDefaultProps = _React$useContext.compDefaultProps;
+  var _useContext = (0, _react.useContext)(_configProvider.ConfigContext),
+    getPrefixCls = _useContext.getPrefixCls,
+    pkgPrefixCls = _useContext.prefixCls,
+    userDefaultProps = _useContext.compDefaultProps;
   var userSelectedKey = props.selectedKey,
     userOpenKeys = props.openKeys;
   var _b = (0, _utils.getCompProps)('Menu', userDefaultProps, props),
@@ -60,22 +60,23 @@ var Menu = function Menu(props) {
     theme = _b.theme,
     collapsed = _b.collapsed,
     accordion = _b.accordion,
-    restProps = __rest(_b, ["prefixCls", "mode", "inlineIndent", "forceSubMenuRender", "additionalTools", "onClick", "onOpenChange", "children", "className", "theme", "collapsed", "accordion"]);
+    defaultOpenKeys = _b.defaultOpenKeys,
+    restProps = __rest(_b, ["prefixCls", "mode", "inlineIndent", "forceSubMenuRender", "additionalTools", "onClick", "onOpenChange", "children", "className", "theme", "collapsed", "accordion", "defaultOpenKeys"]);
   var prefixCls = getPrefixCls(pkgPrefixCls, 'menu', customPrefixcls);
   (0, _devwarning.default)(['inline', 'vertical', undefined].indexOf(mode) === -1, 'menu', "cannot found menu mode '".concat(mode, "'"));
   (0, _devwarning.default)(mode !== 'inline' && accordion !== undefined, 'menu', "'accordion' is valid only in mode='inline'");
-  var _React$useState = _react.default.useState(''),
-    _React$useState2 = (0, _slicedToArray2.default)(_React$useState, 2),
-    selectedKey = _React$useState2[0],
-    setSelectedKey = _React$useState2[1];
-  var _React$useState3 = _react.default.useState([]),
-    _React$useState4 = (0, _slicedToArray2.default)(_React$useState3, 2),
-    selectedKeyPath = _React$useState4[0],
-    setSelectedKeyPath = _React$useState4[1];
-  var _React$useState5 = _react.default.useState([]),
-    _React$useState6 = (0, _slicedToArray2.default)(_React$useState5, 2),
-    openKeys = _React$useState6[0],
-    setOpenKeys = _React$useState6[1];
+  var _useState = (0, _react.useState)(''),
+    _useState2 = (0, _slicedToArray2.default)(_useState, 2),
+    selectedKey = _useState2[0],
+    setSelectedKey = _useState2[1];
+  var _useState3 = (0, _react.useState)([]),
+    _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
+    selectedKeyPath = _useState4[0],
+    setSelectedKeyPath = _useState4[1];
+  var _useState5 = (0, _react.useState)([]),
+    _useState6 = (0, _slicedToArray2.default)(_useState5, 2),
+    openKeys = _useState6[0],
+    setOpenKeys = _useState6[1];
   if (mode === 'inline') {
     restProps.triggerSubMenuAction = 'click';
   }
@@ -90,6 +91,14 @@ var Menu = function Menu(props) {
       setSelectedKey(userSelectedKey);
     }
   }, [userSelectedKey]);
+  (0, _react.useEffect)(function () {
+    if (Array.isArray(defaultOpenKeys)) {
+      setOpenKeys(defaultOpenKeys);
+      defaultOpenKeys.forEach(function (d) {
+        openSubMenuSet.add(d);
+      });
+    }
+  }, []);
   (0, _react.useEffect)(function () {
     if (userOpenKeys !== undefined && Array.isArray(userOpenKeys)) {
       setOpenKeys(userOpenKeys);

package/lib/menu/style/index.css

@@ -107,6 +107,7 @@
 /* 单行显示省略号 */
 /** 浮层箭头样式 **/
 .menu-hidden {
+  display: none;
   opacity: 0;
   visibility: hidden;
   -webkit-animation: kdZoomTopLeftOut calc(var(--kd-c-menu-motion-duration, var(--kd-g-duration, 0.3s)) - 0.1s) cubic-bezier(0, 0.4, 0.4, 1) forwards;
@@ -534,6 +535,7 @@
   color: var(--kd-c-menu-sub-color-text-hover, var(--kd-g-color-white, #fff));
 }
 .kd-menu-popper.hidden {
+  display: none;
   opacity: 0;
   visibility: hidden;
   -webkit-animation: kdZoomTopLeftOut calc(var(--kd-c-menu-motion-duration, var(--kd-g-duration, 0.3s)) - 0.1s) cubic-bezier(0, 0.4, 0.4, 1) forwards;
@@ -575,6 +577,7 @@
           transition-timing-function: cubic-bezier(0.4, 0, 0.6, 1);
 }
 .kd-menu-popper .kd-menu-submenu-sub-hide {
+  display: none;
   opacity: 0;
   visibility: hidden;
   -webkit-animation: kdZoomTopLeftOut calc(var(--kd-c-menu-motion-duration, var(--kd-g-duration, 0.3s)) - 0.1s) cubic-bezier(0, 0.4, 0.4, 1) forwards;

package/lib/menu/style/mixin.less

@@ -79,6 +79,7 @@
 }
 
 .menu-hidden {
+  display: none;
   opacity: 0;
   visibility: hidden;
   animation: kdZoomTopLeftOut calc(@menu-motion-duration - 0.1s) cubic-bezier(0, .4, .4, 1) forwards;

package/lib/select/select.js

@@ -85,8 +85,7 @@ var InternalSelect = function InternalSelect(props, ref) {
     initValue = _useMergedState2[0],
     setInitValue = _useMergedState2[1];
   var realChildren = Array.isArray(options) ? options : (0, _reactChildren.toArray)(children); // options配置项和默认children
-  var innerRef = (0, _react.useRef)();
-  var selectRef = ref || innerRef;
+  var selectRef = (0, _react.useRef)();
   var searchRef = (0, _react.useRef)(null); // 搜索框ref
   var selectionRef = (0, _react.useRef)(null);
   var dropDownRef = (0, _react.useRef)(null);
@@ -754,6 +753,21 @@ var InternalSelect = function InternalSelect(props, ref) {
       (_a = clearRef.current) === null || _a === void 0 ? void 0 : _a.removeEventListener('mouseup', fn);
     };
   }, [singleVal, mulOptions]);
+  (0, _react.useImperativeHandle)(ref, function () {
+    return {
+      select: selectRef.current,
+      focus: function focus() {
+        var _a;
+        setFocusd(true);
+        (_a = searchRef.current) === null || _a === void 0 ? void 0 : _a.focus();
+      },
+      blur: function blur() {
+        var _a;
+        setFocusd(false);
+        (_a = searchRef.current) === null || _a === void 0 ? void 0 : _a.blur();
+      }
+    };
+  });
   var _useState13 = (0, _react.useState)(isShowSearch ? getActiveIndex(0) : -1),
     _useState14 = (0, _slicedToArray2.default)(_useState13, 2),
     activeIndex = _useState14[0],

package/lib/timeline/TimelineItem.js

@@ -55,6 +55,7 @@ var TimelineItem = function TimelineItem(props) {
   var labelStyle = mode !== 'alternate' ? (0, _defineProperty2.default)({
     width: "".concat(labelWidth, "px")
   }, (0, _concat.default)(_context = "margin".concat(mode === null || mode === void 0 ? void 0 : mode.substring(0, 1).toUpperCase())).call(_context, mode === null || mode === void 0 ? void 0 : mode.substring(1)), "-".concat(labelWidth, "px")) : {};
+  var marginDistance = pending ? Math.round(lineHeight / 2 + 12 / 2 + 2) : Math.round(lineHeight / 2 + 9 / 2 + 2);
   return /*#__PURE__*/React.createElement("li", (0, _extends2.default)({}, restProps, {
     className: itemClassName
   }), label && /*#__PURE__*/React.createElement("div", {
@@ -65,7 +66,7 @@ var TimelineItem = function TimelineItem(props) {
   }, label), /*#__PURE__*/React.createElement("div", {
     className: "".concat(prefixCls, "-tail"),
     style: {
-      marginTop: lineHeight - 2
+      marginTop: marginDistance
     }
   }), /*#__PURE__*/React.createElement("div", {
     className: dotClassName,

package/lib/timeline/style/index.css

@@ -297,16 +297,15 @@
 .kd-timeline.pending .kd-timeline-item.last .kd-timeline-item-tail {
   display: block;
   height: calc(100% - 14px);
-  border-left: 2px dotted var(--kd-c-timeline-line-color, var(--kd-g-color-border-weak, #e5e5e5));
+  border-left: 1px dotted var(--kd-c-timeline-line-color, var(--kd-g-color-border-weak, #e5e5e5));
 }
 .kd-timeline.reverse .kd-timeline-item.last .kd-timeline-item-tail {
   display: none;
 }
 .kd-timeline.reverse .kd-timeline-item.pending .kd-timeline-item-tail {
-  top: 15px;
   display: block;
   height: calc(100% - 15px);
-  border-left: 2px dotted var(--kd-c-timeline-line-color, var(--kd-g-color-border-weak, #e5e5e5));
+  border-left: 1px dotted var(--kd-c-timeline-line-color, var(--kd-g-color-border-weak, #e5e5e5));
 }
 .kd-timeline.reverse .kd-timeline-item.pending .kd-timeline-item-content {
   min-height: 48px;

package/lib/timeline/style/index.less

@@ -241,7 +241,7 @@
   &.pending .@{timeline-item-prefix-cls}.last .@{timeline-item-prefix-cls}-tail {
     display: block;
     height: calc(100% - 14px);
-    border-left: 2px dotted @timeline-line-color;
+    border-left: 1px dotted @timeline-line-color;
   }
 
   &.reverse .@{timeline-item-prefix-cls}.last .@{timeline-item-prefix-cls}-tail {
@@ -250,10 +250,9 @@
 
   &.reverse .@{timeline-item-prefix-cls}.pending {
     .@{timeline-item-prefix-cls}-tail {
-      top: 15px;
       display: block;
       height: calc(100% - 15px);
-      border-left: 2px dotted @timeline-line-color;
+      border-left: 1px dotted @timeline-line-color;
     }
     .@{timeline-item-prefix-cls}-content {
       min-height: 48px;

package/lib/tooltip/tooltip.js

@@ -11,6 +11,7 @@ exports.default = void 0;
 var _extends2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/extends"));
 var _react = _interopRequireWildcard(require("react"));
 var _utils = require("../_utils");
+var _reactNode = require("../_utils/reactNode");
 var _configProvider = require("../config-provider");
 var _usePopper = _interopRequireDefault(require("../_utils/usePopper"));
 function _getRequireWildcardCache(nodeInterop) { if (typeof _WeakMap !== "function") return null; var cacheBabelInterop = new _WeakMap(); var cacheNodeInterop = new _WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
@@ -28,8 +29,8 @@ var Tooltip = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
     customPrefixcls = allProps.prefixCls;
   // className前缀
   var prefixCls = getPrefixCls(pkgPrefixCls, 'tooltip', customPrefixcls);
-  var tiplocator = /*#__PURE__*/_react.default.cloneElement(_react.default.Children.count(children) === 1 && children.type ? children : /*#__PURE__*/_react.default.createElement("span", null, children), {
-    ref: children.ref || ref
+  var tiplocator = /*#__PURE__*/_react.default.cloneElement( /*#__PURE__*/_react.default.isValidElement(children) && !(0, _reactNode.isFragment)(children) ? children : /*#__PURE__*/_react.default.createElement("span", null, children), {
+    ref: /*#__PURE__*/_react.default.isValidElement(children) && !(0, _reactNode.isFragment)(children) && children.ref ? children.ref : ref
   });
   var onVisibleChange = function onVisibleChange(v) {
     if (status.current === v && allProps.visible === undefined) return;

package/lib/tree/tree.js

@@ -438,7 +438,14 @@ var InternalTree = /*#__PURE__*/_react.default.forwardRef(function (props, ref)
       return item === null || item === void 0 ? void 0 : item.key;
     },
     height: height,
-    itemHeight: estimatedItemSize
+    itemHeight: estimatedItemSize,
+    outerStyle: {
+      overflow: 'unset'
+    },
+    innerStyle: {
+      minWidth: '100%',
+      width: 'max-contnet'
+    }
   }, renderTreeNode) : (0, _map.default)(filterData).call(filterData, renderTreeNode)));
 });
 var Tree = InternalTree;

package/lib/virtual-list/Filler.d.ts

@@ -3,6 +3,7 @@ interface FillerProps {
     height: number;
     offset?: number;
     outerStyle?: React.CSSProperties;
+    innerStyle?: React.CSSProperties;
     children: React.ReactNode;
 }
 declare const Filler: React.FC<FillerProps>;

package/lib/virtual-list/Filler.js

@@ -16,7 +16,8 @@ var Filler = function Filler(_ref) {
   var height = _ref.height,
     offset = _ref.offset,
     children = _ref.children,
-    propsOuterStyle = _ref.outerStyle;
+    propsOuterStyle = _ref.outerStyle,
+    propsInnerStyle = _ref.innerStyle;
   var outerStyle = {};
   var innerStyle = {
     display: 'flex',
@@ -29,13 +30,13 @@ var Filler = function Filler(_ref) {
       overflow: 'hidden',
       zIndex: 0
     }, propsOuterStyle);
-    innerStyle = (0, _extends2.default)((0, _extends2.default)({}, innerStyle), {
+    innerStyle = (0, _extends2.default)((0, _extends2.default)((0, _extends2.default)({}, innerStyle), {
       transform: "translateY(".concat(offset, "px)"),
       position: 'absolute',
       left: 0,
       right: 0,
       top: 0
-    });
+    }), propsInnerStyle);
   }
   return /*#__PURE__*/React.createElement("div", {
     style: outerStyle

package/lib/virtual-list/virtual-list.d.ts

@@ -17,6 +17,7 @@ export interface VirtualListProps<T> extends Omit<React.HTMLAttributes<any>, 'ch
     scrollOptions?: ScrollIntoViewOptions;
     needFiller?: boolean;
     outerStyle?: CSSProperties;
+    innerStyle?: CSSProperties;
     onScroll?: React.UIEventHandler<HTMLElement>;
 }
 export declare type AvailableVirtualListProps = Pick<VirtualListProps<any>, 'height' | 'itemHeight' | 'threshold' | 'isStaticItemHeight' | 'scrollOptions'>;

package/lib/virtual-list/virtual-list.js

@@ -88,7 +88,7 @@ var VirtualList = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
     _props$wrapper = props.wrapper,
     WrapperTagName = _props$wrapper === void 0 ? 'div' : _props$wrapper,
     _props$height = props.height,
-    propHeight = _props$height === void 0 ? 300 : _props$height,
+    propHeight = _props$height === void 0 ? '100%' : _props$height,
     _props$isStaticItemHe = props.isStaticItemHeight,
     isStaticItemHeight = _props$isStaticItemHe === void 0 ? true : _props$isStaticItemHe,
     propItemHeight = props.itemHeight,
@@ -98,7 +98,8 @@ var VirtualList = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
     _props$needFiller = props.needFiller,
     needFiller = _props$needFiller === void 0 ? true : _props$needFiller,
     outerStyle = props.outerStyle,
-    restProps = __rest(props, ["style", "className", "children", "data", "itemKey", "threshold", "wrapper", "height", "isStaticItemHeight", "itemHeight", "measureLongestItem", "scrollOptions", "onScroll", "needFiller", "outerStyle"]);
+    innerStyle = props.innerStyle,
+    restProps = __rest(props, ["style", "className", "children", "data", "itemKey", "threshold", "wrapper", "height", "isStaticItemHeight", "itemHeight", "measureLongestItem", "scrollOptions", "onScroll", "needFiller", "outerStyle", "innerStyle"]);
   var styleListMaxHeight = style && style.maxHeight || propHeight;
   var refItemHeightMap = (0, _react.useRef)({});
   var _useState = (0, _react.useState)(200),
@@ -521,7 +522,8 @@ var VirtualList = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
   }, restProps), isVirtual ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_Filler.default, {
     height: itemTotalHeight,
     offset: state.status === 'MEASURE_DONE' ? state.startItemTop : 0,
-    outerStyle: outerStyle
+    outerStyle: outerStyle,
+    innerStyle: innerStyle
   }, renderChildren((0, _slice.default)(data).call(data, state.startIndex, state.endIndex + 1), state.startIndex)), renderLongestItem()) : needFiller ? /*#__PURE__*/_react.default.createElement(_Filler.default, {
     height: viewportHeight
   }, renderChildren(data, 0)) : renderChildren(data, 0)));

package/package.json

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