Browse Source

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

master
windy 6 years ago
parent
commit
5160969375
  1. 39
      demo/js/widget/multiselect/demo.multi_select_combo.js
  2. 14
      dist/bundle.css
  3. 2
      dist/bundle.js
  4. 2
      dist/bundle.min.css
  5. 10
      dist/bundle.min.js
  6. 39
      dist/demo.js
  7. 14
      dist/fineui.css
  8. 2
      dist/fineui.js
  9. 2
      dist/fineui.min.css
  10. 10
      dist/fineui.min.js
  11. 27
      dist/fineui_without_jquery_polyfill.js
  12. 2
      dist/utils.min.js
  13. 14
      dist/widget.css
  14. 2
      dist/widget.js
  15. 14
      src/css/widget/singleslider/slider/widget.css
  16. 19
      src/less/widget/singleslider/slider/widget.slider.less
  17. 2
      src/widget/singleslider/button/iconbutton.slider.js

39
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
}]
};
}

14
dist/bundle.css vendored

@ -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);

2
dist/bundle.js vendored

@ -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;
}

2
dist/bundle.min.css vendored

File diff suppressed because one or more lines are too long

10
dist/bundle.min.js vendored

File diff suppressed because one or more lines are too long

39
dist/demo.js vendored

@ -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
}]
};
}

14
dist/fineui.css vendored

@ -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);

2
dist/fineui.js vendored

@ -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;
}

2
dist/fineui.min.css vendored

File diff suppressed because one or more lines are too long

10
dist/fineui.min.js vendored

File diff suppressed because one or more lines are too long

27
dist/fineui_without_jquery_polyfill.js vendored

@ -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;
}

2
dist/utils.min.js vendored

File diff suppressed because one or more lines are too long

14
dist/widget.css vendored

@ -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);

2
dist/widget.js vendored

@ -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;
}

14
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;
}

19
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;
}
}
}
}
}

2
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;
}

Loading…
Cancel
Save