BI-31041 slider样式随主题色适应

6 years ago · 5160969375
17 changed files with 185 additions and 29 deletions
--- a/demo/js/widget/multiselect/demo.multi_select_combo.js
+++ b/demo/js/widget/multiselect/demo.multi_select_combo.js
@ -10,7 +10,7 @@ Demo.MultiSelectCombo = BI.inherit(BI.Widget, {
        var self = this;
        var widget = BI.createWidget({
            type: "bi.multi_select_insert_combo",
-            itemsCreator: BI.bind(this._itemsCreator, this),
+            //itemsCreator: BI.bind(this._itemsCreator, this),
            width: 200,
            value: {
                type: 1,
@ -72,14 +72,47 @@ Demo.MultiSelectCombo = BI.inherit(BI.Widget, {
        }, 1000);
    },

+    _createTreeCombo: function () {
+        var items = BI.deepClone(Demo.CONSTANTS.TREE);
+        return {
+            type: "bi.multi_tree_combo",
+            itemsCreator: function (options, callback) {
+                // 根据不同的类型处理相应的结果
+                switch (options.type) {
+                    case BI.TreeView.REQ_TYPE_INIT_DATA:
+                        break;
+                    case BI.TreeView.REQ_TYPE_ADJUST_DATA:
+                        break;
+                    case BI.TreeView.REQ_TYPE_SELECT_DATA:
+                        break;
+                    case BI.TreeView.REQ_TYPE_GET_SELECTED_DATA:
+                        break;
+                    default :
+                        break;
+                }
+                callback({
+                    items: items
+                });
+            },
+            width: 200,
+            value: {
+                "根目录": {}
+            }
+        };
+    },
+
    render: function () {
        return {
            type: "bi.absolute",
            scrolly: false,
            items: [{
                el: this._createMultiSelectCombo(),
-                right: "50%",
-                top: 10
+                right: "40%",
+                top: 200
+            }, {
+                el: this._createTreeCombo(),
+                right: "60%",
+                top: 200
            }]
        };
    }
--- a/dist/bundle.css
+++ b/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);
--- a/dist/bundle.js
+++ b/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;
                    }
--- a/dist/bundle.min.css
+++ b/dist/bundle.min.css
--- a/dist/bundle.min.js
+++ b/dist/bundle.min.js
--- a/dist/demo.js
+++ b/dist/demo.js
@ -10682,7 +10682,7 @@ Demo.MultiSelectCombo = BI.inherit(BI.Widget, {
        var self = this;
        var widget = BI.createWidget({
            type: "bi.multi_select_insert_combo",
-            itemsCreator: BI.bind(this._itemsCreator, this),
+            //itemsCreator: BI.bind(this._itemsCreator, this),
            width: 200,
            value: {
                type: 1,
@ -10744,14 +10744,47 @@ Demo.MultiSelectCombo = BI.inherit(BI.Widget, {
        }, 1000);
    },

+    _createTreeCombo: function () {
+        var items = BI.deepClone(Demo.CONSTANTS.TREE);
+        return {
+            type: "bi.multi_tree_combo",
+            itemsCreator: function (options, callback) {
+                // 根据不同的类型处理相应的结果
+                switch (options.type) {
+                    case BI.TreeView.REQ_TYPE_INIT_DATA:
+                        break;
+                    case BI.TreeView.REQ_TYPE_ADJUST_DATA:
+                        break;
+                    case BI.TreeView.REQ_TYPE_SELECT_DATA:
+                        break;
+                    case BI.TreeView.REQ_TYPE_GET_SELECTED_DATA:
+                        break;
+                    default :
+                        break;
+                }
+                callback({
+                    items: items
+                });
+            },
+            width: 200,
+            value: {
+                "根目录": {}
+            }
+        };
+    },
+
    render: function () {
        return {
            type: "bi.absolute",
            scrolly: false,
            items: [{
                el: this._createMultiSelectCombo(),
-                right: "50%",
-                top: 10
+                right: "40%",
+                top: 200
+            }, {
+                el: this._createTreeCombo(),
+                right: "60%",
+                top: 200
            }]
        };
    }
--- a/dist/fineui.css
+++ b/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);
--- a/dist/fineui.js
+++ b/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;
                    }
--- a/dist/fineui.min.css
+++ b/dist/fineui.min.css
--- a/dist/fineui.min.js
+++ b/dist/fineui.min.js
--- a/dist/fineui_without_jquery_polyfill.js
+++ b/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;
                    }
--- a/dist/utils.min.js
+++ b/dist/utils.min.js
--- a/dist/widget.css
+++ b/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);
--- a/dist/widget.js
+++ b/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;
                    }
--- a/src/css/widget/singleslider/slider/widget.css
+++ b/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;
+}
--- a/src/less/widget/singleslider/slider/widget.slider.less
+++ b/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;
@ -30,3 +31,19 @@
    }
  }
 }
+
+.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;
+        }
+      }
+    }
+  }
+}
--- a/src/widget/singleslider/button/iconbutton.slider.js
+++ b/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;
                    }