Merge pull request #638 in VISUAL/fineui from ~WINDY/fineui:master to master

* commit '99b385eebc62bdc51ccc1533a685f08946e55b66':
  update
  BI-31041 slider样式随主题色适应

dist/bundle.css

@@ -3703,7 +3703,8 @@ ul.ztree.zTreeDragUL {
 }
 .bi-single-slider-button .slider-button {
   cursor: ew-resize;
-  border: 2px solid #3685f2;
+  border-width: 2px;
+  border-style: solid;
   -webkit-border-radius: 8px;
   -moz-border-radius: 8px;
   border-radius: 8px;
@@ -3735,6 +3736,17 @@ ul.ztree.zTreeDragUL {
   top: 6px;
   left: -8px;
 }
+.bi-theme-dark .bi-single-slider-button .slider-button {
+  background-color: #242640;
+}
+.bi-theme-dark .bi-single-slider-button .slider-button:hover,
+.bi-theme-dark .bi-single-slider-button .slider-button.hover {
+  background-color: #191B2B;
+}
+.bi-theme-dark .bi-single-slider-button .slider-button.disabled:hover,
+.bi-theme-dark .bi-single-slider-button .slider-button.disabled.hover {
+  background-color: #191B2B;
+}
 .bi-slider-track .gray-track {
   background-color: rgba(61, 77, 102, 0.1);
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#1a3d4d66,endColorstr=#1a3d4d66);

dist/bundle.js

@@ -76051,7 +76051,7 @@ BI.SliderIconButton = BI.inherit(BI.Widget, {
                 el: {
                     type: "bi.text_button",
                     forceNotSelected: true,
-                    cls: "slider-button bi-list-item-select3",
+                    cls: "slider-button bi-list-item-select3 bi-high-light-border",
                     ref: function () {
                         self.slider = this;
                     }

dist/fineui.css

@@ -3703,7 +3703,8 @@ ul.ztree.zTreeDragUL {
 }
 .bi-single-slider-button .slider-button {
   cursor: ew-resize;
-  border: 2px solid #3685f2;
+  border-width: 2px;
+  border-style: solid;
   -webkit-border-radius: 8px;
   -moz-border-radius: 8px;
   border-radius: 8px;
@@ -3735,6 +3736,17 @@ ul.ztree.zTreeDragUL {
   top: 6px;
   left: -8px;
 }
+.bi-theme-dark .bi-single-slider-button .slider-button {
+  background-color: #242640;
+}
+.bi-theme-dark .bi-single-slider-button .slider-button:hover,
+.bi-theme-dark .bi-single-slider-button .slider-button.hover {
+  background-color: #191B2B;
+}
+.bi-theme-dark .bi-single-slider-button .slider-button.disabled:hover,
+.bi-theme-dark .bi-single-slider-button .slider-button.disabled.hover {
+  background-color: #191B2B;
+}
 .bi-slider-track .gray-track {
   background-color: rgba(61, 77, 102, 0.1);
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#1a3d4d66,endColorstr=#1a3d4d66);

dist/fineui.js

@@ -76292,7 +76292,7 @@ BI.SliderIconButton = BI.inherit(BI.Widget, {
                 el: {
                     type: "bi.text_button",
                     forceNotSelected: true,
-                    cls: "slider-button bi-list-item-select3",
+                    cls: "slider-button bi-list-item-select3 bi-high-light-border",
                     ref: function () {
                         self.slider = this;
                     }

dist/fineui_without_jquery_polyfill.js

@@ -16918,6 +16918,17 @@ BI.LayerController = BI.inherit(BI.Controller, {
         delete this.layerManager[name];
         delete this.layouts[name];
         return this;
+    },
+
+    removeAll: function () {
+        var self = this;
+        BI.each(BI.keys(this.layerManager), function (index, name) {
+            self.layerManager[name].destroy();
+            self.layouts[name].destroy();
+        });
+        this.layerManager = {};
+        this.layouts = {};
+        return this;
     }
 });/**
  * 遮罩面板, z-index在1亿层级
@@ -17074,6 +17085,20 @@ BI.PopoverController = BI.inherit(BI.Controller, {
         delete this.floatContainer[name];
         delete this.floatOpened[name];
         return this;
+    },
+
+    removeAll: function () {
+        var self = this;
+        BI.each(this.floatContainer, function (name, container) {
+            container.destroy();
+            self.modal && self.floatContainer[name].element.__releaseZIndexMask__(self.zindexMap[name]);
+        });
+        this.floatManager = {};
+        this.floatLayer = {};
+        this.floatContainer = {};
+        this.floatOpened = {};
+        this.zindexMap = {};
+        return this;
     }
 });/**
  * window.resize 控制器
@@ -59848,7 +59873,7 @@ BI.SliderIconButton = BI.inherit(BI.Widget, {
                 el: {
                     type: "bi.text_button",
                     forceNotSelected: true,
-                    cls: "slider-button bi-list-item-select3",
+                    cls: "slider-button bi-list-item-select3 bi-high-light-border",
                     ref: function () {
                         self.slider = this;
                     }

dist/widget.css

@@ -193,7 +193,8 @@
 }
 .bi-single-slider-button .slider-button {
   cursor: ew-resize;
-  border: 2px solid #3685f2;
+  border-width: 2px;
+  border-style: solid;
   -webkit-border-radius: 8px;
   -moz-border-radius: 8px;
   border-radius: 8px;
@@ -225,6 +226,17 @@
   top: 6px;
   left: -8px;
 }
+.bi-theme-dark .bi-single-slider-button .slider-button {
+  background-color: #242640;
+}
+.bi-theme-dark .bi-single-slider-button .slider-button:hover,
+.bi-theme-dark .bi-single-slider-button .slider-button.hover {
+  background-color: #191B2B;
+}
+.bi-theme-dark .bi-single-slider-button .slider-button.disabled:hover,
+.bi-theme-dark .bi-single-slider-button .slider-button.disabled.hover {
+  background-color: #191B2B;
+}
 .bi-slider-track .gray-track {
   background-color: rgba(61, 77, 102, 0.1);
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#1a3d4d66,endColorstr=#1a3d4d66);

dist/widget.js

@@ -17646,7 +17646,7 @@ BI.SliderIconButton = BI.inherit(BI.Widget, {
                 el: {
                     type: "bi.text_button",
                     forceNotSelected: true,
-                    cls: "slider-button bi-list-item-select3",
+                    cls: "slider-button bi-list-item-select3 bi-high-light-border",
                     ref: function () {
                         self.slider = this;
                     }

src/css/widget/singleslider/slider/widget.css

@@ -1,6 +1,7 @@
 .bi-single-slider-button .slider-button {
   cursor: ew-resize;
-  border: 2px solid #3685f2;
+  border-width: 2px;
+  border-style: solid;
   -webkit-border-radius: 8px;
   -moz-border-radius: 8px;
   border-radius: 8px;
@@ -32,3 +33,14 @@
   top: 6px;
   left: -8px;
 }
+.bi-theme-dark .bi-single-slider-button .slider-button {
+  background-color: #242640;
+}
+.bi-theme-dark .bi-single-slider-button .slider-button:hover,
+.bi-theme-dark .bi-single-slider-button .slider-button.hover {
+  background-color: #191B2B;
+}
+.bi-theme-dark .bi-single-slider-button .slider-button.disabled:hover,
+.bi-theme-dark .bi-single-slider-button .slider-button.disabled.hover {
+  background-color: #191B2B;
+}

src/less/widget/singleslider/slider/widget.slider.less

@@ -3,7 +3,8 @@
 .bi-single-slider-button {
   & .slider-button {
     cursor: ew-resize;
-    border: 2px solid @color-bi-border-highlight;
+    border-width: 2px;
+    border-style: solid;
     .border-radius(8px);
     background-color: @color-bi-background-default;
     height: 16px;
@@ -29,4 +30,20 @@
       }
     }
   }
+}
+
+.bi-theme-dark {
+  .bi-single-slider-button {
+    & .slider-button {
+      background-color: @color-bi-background-default-theme-dark;
+      &:hover, &.hover {
+        background-color: @color-bi-background-normal-theme-dark;
+      }
+      &.disabled {
+        &:hover, &.hover {
+          background-color: @color-bi-background-normal-theme-dark;
+        }
+      }
+    }
+  }
 }

src/widget/singleslider/button/iconbutton.slider.js

@@ -25,7 +25,7 @@ BI.SliderIconButton = BI.inherit(BI.Widget, {
                 el: {
                     type: "bi.text_button",
                     forceNotSelected: true,
-                    cls: "slider-button bi-list-item-select3",
+                    cls: "slider-button bi-list-item-select3 bi-high-light-border",
                     ref: function () {
                         self.slider = this;
                     }