diff --git a/components/date-picker/datePicker.vue b/components/date-picker/datePicker.vue
index c2ec4d57..08b9a7ee 100644
--- a/components/date-picker/datePicker.vue
+++ b/components/date-picker/datePicker.vue
@@ -4,7 +4,7 @@
         :disabled="disabled"
         :appendToContainer="appendToContainer"
         :getContainer="getContainer"
-        :popperClass="popperClass"
+        :popperClass="[popperClass, `${prefixCls}-popper`]"
         trigger="click"
         :hideAfter="0"
         placement="bottom-start"
diff --git a/components/date-picker/style/index.less b/components/date-picker/style/index.less
index 3e05b653..06dcf497 100644
--- a/components/date-picker/style/index.less
+++ b/components/date-picker/style/index.less
@@ -9,6 +9,10 @@
     display: inline-block;
     width: 100%;
     vertical-align: middle;
+
+    &-popper {
+        overflow: hidden;
+    }
 }
 
 @calendars-prefix-cls: ~'@{cls-prefix}-calendars';
diff --git a/components/input/inputInner.vue b/components/input/inputInner.vue
index f35355b1..4a659517 100644
--- a/components/input/inputInner.vue
+++ b/components/input/inputInner.vue
@@ -6,7 +6,6 @@
             (focused || innerIsFocus) && `${prefixCls}-focus`,
             disabled && `${prefixCls}-disabled`,
         ]"
-        :tabindex="!disabled ? 0 : undefined"
         @mousedown="handleMousedown"
         @mouseenter="onMouseEnter"
         @mouseleave="onMouseLeave"
@@ -17,7 +16,7 @@
         </span>
         <input
             ref="inputRefEl"
-            :tabindex="!disabled ? -1 : undefined"
+            :tabindex="!disabled ? 0 : undefined"
             :value="currentValue"
             :maxlength="maxlength"
             :type="