Browse Source

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	dist/bundle.js
#	dist/bundle.min.js
#	dist/core.js
#	dist/fineui.js
#	dist/fineui.min.js
#	dist/utils.min.js
es6
guy 6 years ago
parent
commit
c50a1f1e3e
  1. 14
      dist/bundle.css
  2. 52168
      dist/bundle.js
  3. 2
      dist/bundle.min.css
  4. 78
      dist/bundle.min.js
  5. 52504
      dist/core.js
  6. 14
      dist/fineui.css
  7. 52168
      dist/fineui.js
  8. 2
      dist/fineui.min.css
  9. 78
      dist/fineui.min.js
  10. 27
      dist/fineui_without_jquery_polyfill.js
  11. 6
      dist/utils.min.js
  12. 14
      dist/widget.css
  13. 2
      dist/widget.js
  14. 11
      src/core/controller/controller.layer.js
  15. 14
      src/core/controller/controller.popover.js
  16. 14
      src/css/widget/singleslider/slider/widget.css
  17. 19
      src/less/widget/singleslider/slider/widget.slider.less
  18. 2
      src/widget/singleslider/button/iconbutton.slider.js

14
dist/bundle.css vendored

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

52168
dist/bundle.js vendored

File diff suppressed because one or more lines are too long

2
dist/bundle.min.css vendored

File diff suppressed because one or more lines are too long

78
dist/bundle.min.js vendored

File diff suppressed because one or more lines are too long

52504
dist/core.js vendored

File diff suppressed because one or more lines are too long

14
dist/fineui.css vendored

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

52168
dist/fineui.js vendored

File diff suppressed because one or more lines are too long

2
dist/fineui.min.css vendored

File diff suppressed because one or more lines are too long

78
dist/fineui.min.js vendored

File diff suppressed because one or more lines are too long

27
dist/fineui_without_jquery_polyfill.js vendored

@ -16557,6 +16557,17 @@ BI.LayerController = BI.inherit(BI.Controller, {
delete this.layerManager[name]; delete this.layerManager[name];
delete this.layouts[name]; delete this.layouts[name];
return this; 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亿层级 * 遮罩面板, z-index在1亿层级
@ -16713,6 +16724,20 @@ BI.PopoverController = BI.inherit(BI.Controller, {
delete this.floatContainer[name]; delete this.floatContainer[name];
delete this.floatOpened[name]; delete this.floatOpened[name];
return this; 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 控制器 * window.resize 控制器
@ -59196,7 +59221,7 @@ BI.SliderIconButton = BI.inherit(BI.Widget, {
el: { el: {
type: "bi.text_button", type: "bi.text_button",
forceNotSelected: true, forceNotSelected: true,
cls: "slider-button bi-list-item-select3", cls: "slider-button bi-list-item-select3 bi-high-light-border",
ref: function () { ref: function () {
self.slider = this; self.slider = this;
} }

6
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 { .bi-single-slider-button .slider-button {
cursor: ew-resize; cursor: ew-resize;
border: 2px solid #3685f2; border-width: 2px;
border-style: solid;
-webkit-border-radius: 8px; -webkit-border-radius: 8px;
-moz-border-radius: 8px; -moz-border-radius: 8px;
border-radius: 8px; border-radius: 8px;
@ -225,6 +226,17 @@
top: 6px; top: 6px;
left: -8px; 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 { .bi-slider-track .gray-track {
background-color: rgba(61, 77, 102, 0.1); background-color: rgba(61, 77, 102, 0.1);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#1a3d4d66,endColorstr=#1a3d4d66); 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: { el: {
type: "bi.text_button", type: "bi.text_button",
forceNotSelected: true, forceNotSelected: true,
cls: "slider-button bi-list-item-select3", cls: "slider-button bi-list-item-select3 bi-high-light-border",
ref: function () { ref: function () {
self.slider = this; self.slider = this;
} }

11
src/core/controller/controller.layer.js

@ -155,5 +155,16 @@ BI.LayerController = BI.inherit(BI.Controller, {
delete this.layerManager[name]; delete this.layerManager[name];
delete this.layouts[name]; delete this.layouts[name];
return this; 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;
} }
}); });

14
src/core/controller/controller.popover.js

@ -138,5 +138,19 @@ BI.PopoverController = BI.inherit(BI.Controller, {
delete this.floatContainer[name]; delete this.floatContainer[name];
delete this.floatOpened[name]; delete this.floatOpened[name];
return this; 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;
} }
}); });

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

@ -1,6 +1,7 @@
.bi-single-slider-button .slider-button { .bi-single-slider-button .slider-button {
cursor: ew-resize; cursor: ew-resize;
border: 2px solid #3685f2; border-width: 2px;
border-style: solid;
-webkit-border-radius: 8px; -webkit-border-radius: 8px;
-moz-border-radius: 8px; -moz-border-radius: 8px;
border-radius: 8px; border-radius: 8px;
@ -32,3 +33,14 @@
top: 6px; top: 6px;
left: -8px; 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 { .bi-single-slider-button {
& .slider-button { & .slider-button {
cursor: ew-resize; cursor: ew-resize;
border: 2px solid @color-bi-border-highlight; border-width: 2px;
border-style: solid;
.border-radius(8px); .border-radius(8px);
background-color: @color-bi-background-default; background-color: @color-bi-background-default;
height: 16px; 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;
}
}
}
}
} }

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

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

Loading…
Cancel
Save