Merge remote-tracking branch 'origin/master'

examples/响应式布局.html

@@ -53,13 +53,13 @@
         box-shadow: 0 2px 5px rgb(0 0 0 / 16%), 0 2px 10px rgb(0 0 0 / 12%);
       }
       .nav-logo {
-        background-image: url(https://qn.wangchuan.cc/pullrequest-logo.svg);
+        background-image: url(http://qn.wangchuan.cc/pullrequest-logo.svg);
         background-repeat: no-repeat;
         background-position: 50%;
         background-size: contain;
       }
       .image {
-        background-image: url(https://qn.wangchuan.cc/hero-graphic.png);
+        background-image: url(http://qn.wangchuan.cc/hero-graphic.png);
         background-repeat: no-repeat;
         background-size: contain;
       }
@@ -79,7 +79,7 @@
         border: 1px solid #4aa4e0;
       }
       .wave {
-        background-image: url(https://qn.wangchuan.cc/wave.png);
+        background-image: url(http://qn.wangchuan.cc/wave.png);
         background-size: cover;
         background-repeat: repeat-x;
       }
@@ -205,7 +205,7 @@
                                       maxWidth: "100%",
                                       maxHeight: "100%",
                                     },
-                                    src: "https://qn.wangchuan.cc/hero-graphic.png",
+                                    src: "http://qn.wangchuan.cc/hero-graphic.png",
                                     width: "auto",
                                     height: "auto",
                                   },
@@ -318,7 +318,7 @@
                                       maxWidth: "100%",
                                       maxHeight: "100%",
                                     },
-                                    src: "https://qn.wangchuan.cc/velocity.png",
+                                    src: "http://qn.wangchuan.cc/velocity.png",
                                     width: "auto",
                                     height: "auto",
                                   },
@@ -358,7 +358,7 @@
                                       maxWidth: "100%",
                                       maxHeight: "100%",
                                     },
-                                    src: "https://qn.wangchuan.cc/secure.png",
+                                    src: "http://qn.wangchuan.cc/secure.png",
                                     width: "auto",
                                     height: "auto",
                                   },

src/base/combination/combo.js

@@ -48,11 +48,6 @@
             });
         },
 
-        // 复写visual相关代码，让其通过class实现显隐藏
-        __setElementVisible: function (visible) {
-            this.element[visible ?  "removeClass" : "addClass"]("bi-combo-hidden");
-        },
-
         render: function () {
             var self = this, o = this.options;
             this._initCombo();

src/less/base/combo/combo.less

@@ -21,9 +21,6 @@
       }
     }
   }
-  &.bi-combo-hidden:not(.bi-combo-popup) {
-    display: none !important;
-  }
 
   &.bi-combo-popup, &.bi-combo-hover, &:hover {
     &.bi-border, &.bi-border-bottom {

src/less/core/utils/common.less

@@ -570,7 +570,7 @@
 
 // hover-visible的原子化形式
 .bi-hover-visible-container {
-  &:where(:not(&:hover)) .bi-hover-visible-item {
+  &:where(:not(&:hover)) .bi-hover-visible-item:not(.bi-combo-popup) {
     display: none;
   }
 
@@ -591,11 +591,11 @@
   //  }
   //}
 
-  & .bi-hover-visible-item {
+  & .bi-hover-visible-item:not(.bi-combo-popup) {
     visibility: hidden;
   }
 
-  &:hover .bi-hover-visible-item {
+  &:hover .bi-hover-visible-item:not(.bi-combo-popup) {
     visibility: visible;
   }
 }

src/less/core/wrapper/inline.less

@@ -15,10 +15,4 @@
       display: inline-block !important;
     }
   }
-
-  & > .bi-combo {
-    &.bi-combo-popup {
-      display: inline-block !important;
-    }
-  }
 }

src/less/core/wrapper/inline.old.less

@@ -14,12 +14,6 @@
       display: inline-block !important;
     }
   }
-
-  & > .bi-combo {
-    &.bi-combo-popup {
-      display: inline-block !important;
-    }
-  }
 }
 
 .bi-inline-horizontal-adapt-layout {
@@ -38,12 +32,6 @@
       display: inline-block !important;
     }
   }
-
-  & > .bi-combo {
-    &.bi-combo-popup {
-      display: inline-block !important;
-    }
-  }
 }
 
 .bi-inline-vertical-adapt-layout {
@@ -62,10 +50,4 @@
       display: inline-block !important;
     }
   }
-
-  & > .bi-combo {
-    &.bi-combo-popup {
-      display: inline-block !important;
-    }
-  }
 }