diff --git a/package.json b/package.json
index 0bc0946660..da8e8e51f9 100644
--- a/package.json
+++ b/package.json
@@ -72,7 +72,7 @@
     "compile-less-cli": "~1.8.11",
     "husky": "~8.0.0",
     "kkt": "~7.3.0",
-    "lerna": "^6.0.0",
+    "lerna": "~6.0.0",
     "lint-staged": "^13.0.3",
     "prettier": "~2.8.0",
     "react": "~18.2.0",
diff --git a/packages/react-date-picker/src/DatePickerYear.tsx b/packages/react-date-picker/src/DatePickerYear.tsx
index 5f123c1081..ebe955ad25 100644
--- a/packages/react-date-picker/src/DatePickerYear.tsx
+++ b/packages/react-date-picker/src/DatePickerYear.tsx
@@ -23,7 +23,6 @@ export function DatePickerYear(props: DatePickerYearProps) {
       const date = new Date(activeYear!);
       date.setFullYear(year);
       setActiveYear(date);
-      onSelected!(year, true);
     } else {
       onSelected!(year);
     }
diff --git a/packages/react-date-picker/src/index.tsx b/packages/react-date-picker/src/index.tsx
index 4e5852053d..2fad39f8bf 100644
--- a/packages/react-date-picker/src/index.tsx
+++ b/packages/react-date-picker/src/index.tsx
@@ -167,7 +167,7 @@ export default function DatePicker(props: DatePickerProps) {
       {type === 'time' && (
         <TimePickerTime
           date={selectPanelDate}
-          {...showTime}
+          {...(showTime as any)}
           className={`${prefixCls}-timepicker`}
           onSelected={onSelectedTime}
         />
diff --git a/packages/react-overlay-trigger/src/index.tsx b/packages/react-overlay-trigger/src/index.tsx
index 52899dc593..7d52f7a4cd 100644
--- a/packages/react-overlay-trigger/src/index.tsx
+++ b/packages/react-overlay-trigger/src/index.tsx
@@ -251,13 +251,22 @@ export default React.forwardRef<OverlayTriggerRef, OverlayTriggerProps>((props,
 
   function hide() {
     if (!isOpen) return;
-    zIndex.current -= 1;
+    if (zIndex.current <= 999) {
+      zIndex.current = 999;
+    } else {
+      zIndex.current -= 1;
+    }
     setIsOpen(false);
   }
 
   function show() {
     if (isOpen) return;
-    zIndex.current += 1;
+    const nodeIndex = triggerRef.current?.style.zIndex;
+    if (nodeIndex) {
+      zIndex.current = Number(nodeIndex) + 1;
+    } else {
+      zIndex.current += 1;
+    }
     setIsOpen(true);
   }
 
@@ -305,6 +314,7 @@ export default React.forwardRef<OverlayTriggerRef, OverlayTriggerProps>((props,
         Object.assign({}, child.props, {
           ...triggerProps,
           ref: triggerRef,
+          style: { zIndex: zIndex.current },
           className: [child.props.className, disabled ? `${prefixCls}-disabled` : null]
             .filter(Boolean)
             .join(' ')
diff --git a/website/src/layouts/index.module.less b/website/src/layouts/index.module.less
index cb00a69ab5..2714ebfa9d 100755
--- a/website/src/layouts/index.module.less
+++ b/website/src/layouts/index.module.less
@@ -22,6 +22,8 @@
 }
 
 .layoutWrap {
+  position: relative;
+  z-index: 1;
   background-color: #fff;
   min-height: calc(100vh - 53px);
 }