diff --git a/src/core/wrapper/layout/sticky/sticky.horizontal.js b/src/core/wrapper/layout/sticky/sticky.horizontal.js
index a59dd6edf..afdf955aa 100644
--- a/src/core/wrapper/layout/sticky/sticky.horizontal.js
+++ b/src/core/wrapper/layout/sticky/sticky.horizontal.js
@@ -21,13 +21,29 @@ BI.HorizontalStickyLayout = BI.inherit(BI.FlexHorizontalLayout, {
             }
         }
         if (columnSize !== "fill") {
-            var firstItemFill = o.columnSize[0] === "fill" || o.items[0].width === "fill";
-            w.element.css({
-                position: "sticky",
-                zIndex: 1,
-                left: firstItemFill ? "" : 0,
-                right: firstItemFill ? 0 : ""
+            var fillIndex;
+            BI.count(0, o.items.length - 1, index => {
+                if (BI.isNotNull(fillIndex)) {
+                    return;
+                }
+                if ((o.columnSize[index] === "fill" || o.items[index].width === "fill")) {
+                    fillIndex = index;
+                }
             });
+
+            if (fillIndex > i) {
+                w.element.css({
+                    position: "sticky",
+                    zIndex: 1,
+                    left: 0,
+                });
+            } else {
+                w.element.css({
+                    position: "sticky",
+                    zIndex: 1,
+                    right: 0
+                });
+            }
         } else {
             w.element.css({
                 overflow: ""
diff --git a/src/core/wrapper/layout/sticky/sticky.vertical.js b/src/core/wrapper/layout/sticky/sticky.vertical.js
index 970d84eef..beb0e9d43 100644
--- a/src/core/wrapper/layout/sticky/sticky.vertical.js
+++ b/src/core/wrapper/layout/sticky/sticky.vertical.js
@@ -21,13 +21,29 @@ BI.VerticalStickyLayout = BI.inherit(BI.FlexVerticalLayout, {
             }
         }
         if (rowSize !== "fill") {
-            var firstItemFill = o.rowSize[0] === "fill" || o.items[0].height === "fill";
-            w.element.css({
-                position: "sticky",
-                zIndex: 1,
-                top: firstItemFill ? "" : 0,
-                bottom: firstItemFill ? 0 : ""
+            var fillIndex;
+            BI.count(0, o.items.length - 1, index => {
+                if (BI.isNotNull(fillIndex)) {
+                    return;
+                }
+                if ((o.rowSize[index] === "fill" || o.items[index].height === "fill")) {
+                    fillIndex = index;
+                }
             });
+
+            if (fillIndex > i) {
+                w.element.css({
+                    position: "sticky",
+                    zIndex: 1,
+                    top: 0,
+                });
+            } else {
+                w.element.css({
+                    position: "sticky",
+                    zIndex: 1,
+                    bottom: 0
+                });
+            }
         } else {
             w.element.css({
                 overflow: ""
diff --git a/src/less/base/single/input/checkbox.less b/src/less/base/single/input/checkbox.less
index 7141d75a9..9b1d66917 100644
--- a/src/less/base/single/input/checkbox.less
+++ b/src/less/base/single/input/checkbox.less
@@ -9,17 +9,16 @@
     &:after {
       position: absolute;
       display: table;
-      // 百分比会出现像素误差
-      top: 6px;
-      left: 2px;
+      top: 45%;
+      left: 20%;
       border: 2px solid transparent;
       border-top: 0;
       border-left: 0;
-      width: 6px;
-      height: 9px;
+      width: 50%;
+      height: 75%;
       .box-sizing(border-box);
       .transform(rotate(45deg) scale(1) translate(-50%, -50%));
-      @transition: all .1s cubic-bezier(.71,-.46,.88,.6),opacity .1s;
+      @transition: all .1s cubic-bezier(.71, -.46, .88, .6), opacity .1s;
       .transition(@transition);
       content: '';
     }
diff --git a/src/less/core/utils/common.less b/src/less/core/utils/common.less
index d4b0d3bcd..7e0d85ff0 100644
--- a/src/less/core/utils/common.less
+++ b/src/less/core/utils/common.less
@@ -74,9 +74,10 @@
     border-color: @color-bi-border-highlight;
   }
   // ie下不支持focus-within， 和上面写在一起会导致ie下:hover不生效
-  &:focus-within{
+  &:focus-within {
     border-color: @color-bi-border-highlight;
   }
+
   &.disabled {
     &:hover {
       border-color: @border-color-line;
@@ -84,6 +85,14 @@
   }
 }
 
+.base-disabled {
+  .bi-focus-shadow {
+    &:hover {
+      border-color: @border-color-line;
+    }
+  }
+}
+
 .bi-theme-dark {
   .bi-focus-shadow {
     &.disabled {
@@ -94,6 +103,16 @@
   }
 }
 
+.bi-theme-dark {
+  .base-disabled {
+    .bi-focus-shadow {
+      &:hover {
+        border-color: @border-color-line-theme-dark;
+      }
+    }
+  }
+}
+
 .clearfix {
   .clearfix();
 }
@@ -102,6 +121,7 @@
 .bi-background {
   background-color: @color-bi-background-normal;
   color: @color-bi-text-background;
+
   & .bi-input {
     color: @color-bi-text-background;
   }