Browse Source

Merge remote-tracking branch 'origin/master'

es6
Young 6 years ago
parent
commit
831592f13b
  1. 13
      dist/base.js
  2. 14
      dist/bundle.css
  3. 52
      dist/bundle.js
  4. 2
      dist/bundle.min.css
  5. 66
      dist/bundle.min.js
  6. 35
      dist/core.js
  7. 14
      dist/fineui.css
  8. 52
      dist/fineui.js
  9. 2
      dist/fineui.min.css
  10. 66
      dist/fineui.min.js
  11. 52
      dist/fineui_without_jquery_polyfill.js
  12. 2
      dist/utils.min.js
  13. 14
      dist/widget.css
  14. 4
      dist/widget.js
  15. 2
      src/base/combination/combo.js
  16. 11
      src/base/layer/layer.popup.js
  17. 11
      src/core/controller/controller.layer.js
  18. 14
      src/core/controller/controller.popover.js
  19. 10
      src/core/wrapper/layout.js
  20. 14
      src/css/widget/singleslider/slider/widget.css
  21. 19
      src/less/widget/singleslider/slider/widget.slider.less
  22. 2
      src/widget/multiselect/multiselect.loader.js
  23. 2
      src/widget/singleslider/button/iconbutton.slider.js

13
dist/base.js vendored

@ -3154,7 +3154,7 @@ BI.Combo = BI.inherit(BI.Widget, {
// return; // return;
// } // }
// BI-10290 公式combo双击公式内容会收起 // BI-10290 公式combo双击公式内容会收起
if ((this.element.find(e.target).length > 0 && e.type !== "mousewheel") if ((this.element.find(e.target).length > 0)
|| (this.popupView && this.popupView.element.find(e.target).length > 0) || (this.popupView && this.popupView.element.find(e.target).length > 0)
|| e.target.className === "CodeMirror-cursor" || BI.Widget._renderEngine.createElement(e.target).closest(".CodeMirror-hints").length > 0) {// BI-9887 CodeMirror的公式弹框需要特殊处理下 || e.target.className === "CodeMirror-cursor" || BI.Widget._renderEngine.createElement(e.target).closest(".CodeMirror-hints").length > 0) {// BI-9887 CodeMirror的公式弹框需要特殊处理下
return; return;
@ -5863,7 +5863,7 @@ BI.PopupView = BI.inherit(BI.Widget, {
maxWidth: "auto", maxWidth: "auto",
minWidth: 100, minWidth: 100,
// maxHeight: 200, // maxHeight: 200,
minHeight: 25, minHeight: 24,
lgap: 0, lgap: 0,
rgap: 0, rgap: 0,
tgap: 0, tgap: 0,
@ -6007,10 +6007,11 @@ BI.PopupView = BI.inherit(BI.Widget, {
resetHeight: function (h) { resetHeight: function (h) {
var tbHeight = this.toolbar ? (this.toolbar.attr("height") || 24) : 0, var tbHeight = this.toolbar ? (this.toolbar.attr("height") || 24) : 0,
tabHeight = this.tab ? (this.tab.attr("height") || 25) : 0, tabHeight = this.tab ? (this.tab.attr("height") || 24) : 0,
toolHeight = ((this.tool && this.tool.attr("height")) || 25) * ((this.tool && this.tool.isVisible()) ? 1 : 0); toolHeight = ((this.tool && this.tool.attr("height")) || 24) * ((this.tool && this.tool.isVisible()) ? 1 : 0);
this.view.resetHeight ? this.view.resetHeight(h - tbHeight - tabHeight - toolHeight - 2) : var resetHeight = h - tbHeight - tabHeight - toolHeight - 2 * this.options.innerVGap - 2;
this.view.element.css({"max-height": (h - tbHeight - tabHeight - toolHeight - 2) + "px"}); this.view.resetHeight ? this.view.resetHeight(resetHeight) :
this.view.element.css({"max-height": resetHeight + "px"});
}, },
setValue: function (selectedValues) { setValue: function (selectedValues) {

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

52
dist/bundle.js vendored

@ -24785,7 +24785,7 @@ BI.Layout = BI.inherit(BI.Widget, {
this._children = {}; this._children = {};
BI.each(newCh, function (i, child) { BI.each(newCh, function (i, child) {
var node = self._getOptions(child); var node = self._getOptions(child);
var key = node.key == null ? i : node.key; var key = node.key == null ? self._getChildName(i) : node.key;
children[key]._mount(); children[key]._mount();
self._children[self._getChildName(i)] = children[key]; self._children[self._getChildName(i)] = children[key];
}); });
@ -24803,7 +24803,7 @@ BI.Layout = BI.inherit(BI.Widget, {
function addNode (vnode, index) { function addNode (vnode, index) {
var opt = self._getOptions(vnode); var opt = self._getOptions(vnode);
var key = opt.key == null ? index : opt.key; var key = opt.key == null ? self._getChildName(index) : opt.key;
return children[key] = self._addElement(key, vnode); return children[key] = self._addElement(key, vnode);
} }
@ -24817,7 +24817,7 @@ BI.Layout = BI.inherit(BI.Widget, {
function removeVnodes (vnodes, startIdx, endIdx) { function removeVnodes (vnodes, startIdx, endIdx) {
for (; startIdx <= endIdx; ++startIdx) { for (; startIdx <= endIdx; ++startIdx) {
var node = self._getOptions(vnodes[startIdx]); var node = self._getOptions(vnodes[startIdx]);
var key = node.key == null ? startIdx : node.key; var key = node.key == null ? self._getChildName(startIdx) : node.key;
children[key]._destroy(); children[key]._destroy();
} }
} }
@ -24825,9 +24825,9 @@ BI.Layout = BI.inherit(BI.Widget, {
function insertBefore (insert, before, isNext, index) { function insertBefore (insert, before, isNext, index) {
insert = self._getOptions(insert); insert = self._getOptions(insert);
before = before && self._getOptions(before); before = before && self._getOptions(before);
var insertKey = BI.isKey(insert.key) ? insert.key : index; var insertKey = BI.isKey(insert.key) ? insert.key : self._getChildName(index);
if (before && children[before.key]) { if (before && children[before.key]) {
var beforeKey = BI.isKey(before.key) ? before.key : index; var beforeKey = BI.isKey(before.key) ? before.key : self._getChildName(index);
var next; var next;
if (isNext) { if (isNext) {
next = children[beforeKey].element.next(); next = children[beforeKey].element.next();
@ -26533,6 +26533,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亿层级
@ -26689,6 +26700,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 控制器
@ -38384,7 +38409,7 @@ BI.Combo = BI.inherit(BI.Widget, {
// return; // return;
// } // }
// BI-10290 公式combo双击公式内容会收起 // BI-10290 公式combo双击公式内容会收起
if ((this.element.find(e.target).length > 0 && e.type !== "mousewheel") if ((this.element.find(e.target).length > 0)
|| (this.popupView && this.popupView.element.find(e.target).length > 0) || (this.popupView && this.popupView.element.find(e.target).length > 0)
|| e.target.className === "CodeMirror-cursor" || BI.Widget._renderEngine.createElement(e.target).closest(".CodeMirror-hints").length > 0) {// BI-9887 CodeMirror的公式弹框需要特殊处理下 || e.target.className === "CodeMirror-cursor" || BI.Widget._renderEngine.createElement(e.target).closest(".CodeMirror-hints").length > 0) {// BI-9887 CodeMirror的公式弹框需要特殊处理下
return; return;
@ -41093,7 +41118,7 @@ BI.PopupView = BI.inherit(BI.Widget, {
maxWidth: "auto", maxWidth: "auto",
minWidth: 100, minWidth: 100,
// maxHeight: 200, // maxHeight: 200,
minHeight: 25, minHeight: 24,
lgap: 0, lgap: 0,
rgap: 0, rgap: 0,
tgap: 0, tgap: 0,
@ -41237,10 +41262,11 @@ BI.PopupView = BI.inherit(BI.Widget, {
resetHeight: function (h) { resetHeight: function (h) {
var tbHeight = this.toolbar ? (this.toolbar.attr("height") || 24) : 0, var tbHeight = this.toolbar ? (this.toolbar.attr("height") || 24) : 0,
tabHeight = this.tab ? (this.tab.attr("height") || 25) : 0, tabHeight = this.tab ? (this.tab.attr("height") || 24) : 0,
toolHeight = ((this.tool && this.tool.attr("height")) || 25) * ((this.tool && this.tool.isVisible()) ? 1 : 0); toolHeight = ((this.tool && this.tool.attr("height")) || 24) * ((this.tool && this.tool.isVisible()) ? 1 : 0);
this.view.resetHeight ? this.view.resetHeight(h - tbHeight - tabHeight - toolHeight - 2) : var resetHeight = h - tbHeight - tabHeight - toolHeight - 2 * this.options.innerVGap - 2;
this.view.element.css({"max-height": (h - tbHeight - tabHeight - toolHeight - 2) + "px"}); this.view.resetHeight ? this.view.resetHeight(resetHeight) :
this.view.element.css({"max-height": resetHeight + "px"});
}, },
setValue: function (selectedValues) { setValue: function (selectedValues) {
@ -68012,7 +68038,7 @@ BI.MultiSelectLoader = BI.inherit(BI.Widget, {
}, },
resetHeight: function (h) { resetHeight: function (h) {
this.button_group.resetHeight(h); this.button_group.resetHeight(h - 10);
}, },
resetWidth: function (w) { resetWidth: function (w) {
@ -76025,7 +76051,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;
} }

2
dist/bundle.min.css vendored

File diff suppressed because one or more lines are too long

66
dist/bundle.min.js vendored

File diff suppressed because one or more lines are too long

35
dist/core.js vendored

@ -24785,7 +24785,7 @@ BI.Layout = BI.inherit(BI.Widget, {
this._children = {}; this._children = {};
BI.each(newCh, function (i, child) { BI.each(newCh, function (i, child) {
var node = self._getOptions(child); var node = self._getOptions(child);
var key = node.key == null ? i : node.key; var key = node.key == null ? self._getChildName(i) : node.key;
children[key]._mount(); children[key]._mount();
self._children[self._getChildName(i)] = children[key]; self._children[self._getChildName(i)] = children[key];
}); });
@ -24803,7 +24803,7 @@ BI.Layout = BI.inherit(BI.Widget, {
function addNode (vnode, index) { function addNode (vnode, index) {
var opt = self._getOptions(vnode); var opt = self._getOptions(vnode);
var key = opt.key == null ? index : opt.key; var key = opt.key == null ? self._getChildName(index) : opt.key;
return children[key] = self._addElement(key, vnode); return children[key] = self._addElement(key, vnode);
} }
@ -24817,7 +24817,7 @@ BI.Layout = BI.inherit(BI.Widget, {
function removeVnodes (vnodes, startIdx, endIdx) { function removeVnodes (vnodes, startIdx, endIdx) {
for (; startIdx <= endIdx; ++startIdx) { for (; startIdx <= endIdx; ++startIdx) {
var node = self._getOptions(vnodes[startIdx]); var node = self._getOptions(vnodes[startIdx]);
var key = node.key == null ? startIdx : node.key; var key = node.key == null ? self._getChildName(startIdx) : node.key;
children[key]._destroy(); children[key]._destroy();
} }
} }
@ -24825,9 +24825,9 @@ BI.Layout = BI.inherit(BI.Widget, {
function insertBefore (insert, before, isNext, index) { function insertBefore (insert, before, isNext, index) {
insert = self._getOptions(insert); insert = self._getOptions(insert);
before = before && self._getOptions(before); before = before && self._getOptions(before);
var insertKey = BI.isKey(insert.key) ? insert.key : index; var insertKey = BI.isKey(insert.key) ? insert.key : self._getChildName(index);
if (before && children[before.key]) { if (before && children[before.key]) {
var beforeKey = BI.isKey(before.key) ? before.key : index; var beforeKey = BI.isKey(before.key) ? before.key : self._getChildName(index);
var next; var next;
if (isNext) { if (isNext) {
next = children[beforeKey].element.next(); next = children[beforeKey].element.next();
@ -26533,6 +26533,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亿层级
@ -26689,6 +26700,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 控制器

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

52
dist/fineui.js vendored

@ -25026,7 +25026,7 @@ BI.Layout = BI.inherit(BI.Widget, {
this._children = {}; this._children = {};
BI.each(newCh, function (i, child) { BI.each(newCh, function (i, child) {
var node = self._getOptions(child); var node = self._getOptions(child);
var key = node.key == null ? i : node.key; var key = node.key == null ? self._getChildName(i) : node.key;
children[key]._mount(); children[key]._mount();
self._children[self._getChildName(i)] = children[key]; self._children[self._getChildName(i)] = children[key];
}); });
@ -25044,7 +25044,7 @@ BI.Layout = BI.inherit(BI.Widget, {
function addNode (vnode, index) { function addNode (vnode, index) {
var opt = self._getOptions(vnode); var opt = self._getOptions(vnode);
var key = opt.key == null ? index : opt.key; var key = opt.key == null ? self._getChildName(index) : opt.key;
return children[key] = self._addElement(key, vnode); return children[key] = self._addElement(key, vnode);
} }
@ -25058,7 +25058,7 @@ BI.Layout = BI.inherit(BI.Widget, {
function removeVnodes (vnodes, startIdx, endIdx) { function removeVnodes (vnodes, startIdx, endIdx) {
for (; startIdx <= endIdx; ++startIdx) { for (; startIdx <= endIdx; ++startIdx) {
var node = self._getOptions(vnodes[startIdx]); var node = self._getOptions(vnodes[startIdx]);
var key = node.key == null ? startIdx : node.key; var key = node.key == null ? self._getChildName(startIdx) : node.key;
children[key]._destroy(); children[key]._destroy();
} }
} }
@ -25066,9 +25066,9 @@ BI.Layout = BI.inherit(BI.Widget, {
function insertBefore (insert, before, isNext, index) { function insertBefore (insert, before, isNext, index) {
insert = self._getOptions(insert); insert = self._getOptions(insert);
before = before && self._getOptions(before); before = before && self._getOptions(before);
var insertKey = BI.isKey(insert.key) ? insert.key : index; var insertKey = BI.isKey(insert.key) ? insert.key : self._getChildName(index);
if (before && children[before.key]) { if (before && children[before.key]) {
var beforeKey = BI.isKey(before.key) ? before.key : index; var beforeKey = BI.isKey(before.key) ? before.key : self._getChildName(index);
var next; var next;
if (isNext) { if (isNext) {
next = children[beforeKey].element.next(); next = children[beforeKey].element.next();
@ -26774,6 +26774,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亿层级
@ -26930,6 +26941,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 控制器
@ -38625,7 +38650,7 @@ BI.Combo = BI.inherit(BI.Widget, {
// return; // return;
// } // }
// BI-10290 公式combo双击公式内容会收起 // BI-10290 公式combo双击公式内容会收起
if ((this.element.find(e.target).length > 0 && e.type !== "mousewheel") if ((this.element.find(e.target).length > 0)
|| (this.popupView && this.popupView.element.find(e.target).length > 0) || (this.popupView && this.popupView.element.find(e.target).length > 0)
|| e.target.className === "CodeMirror-cursor" || BI.Widget._renderEngine.createElement(e.target).closest(".CodeMirror-hints").length > 0) {// BI-9887 CodeMirror的公式弹框需要特殊处理下 || e.target.className === "CodeMirror-cursor" || BI.Widget._renderEngine.createElement(e.target).closest(".CodeMirror-hints").length > 0) {// BI-9887 CodeMirror的公式弹框需要特殊处理下
return; return;
@ -41334,7 +41359,7 @@ BI.PopupView = BI.inherit(BI.Widget, {
maxWidth: "auto", maxWidth: "auto",
minWidth: 100, minWidth: 100,
// maxHeight: 200, // maxHeight: 200,
minHeight: 25, minHeight: 24,
lgap: 0, lgap: 0,
rgap: 0, rgap: 0,
tgap: 0, tgap: 0,
@ -41478,10 +41503,11 @@ BI.PopupView = BI.inherit(BI.Widget, {
resetHeight: function (h) { resetHeight: function (h) {
var tbHeight = this.toolbar ? (this.toolbar.attr("height") || 24) : 0, var tbHeight = this.toolbar ? (this.toolbar.attr("height") || 24) : 0,
tabHeight = this.tab ? (this.tab.attr("height") || 25) : 0, tabHeight = this.tab ? (this.tab.attr("height") || 24) : 0,
toolHeight = ((this.tool && this.tool.attr("height")) || 25) * ((this.tool && this.tool.isVisible()) ? 1 : 0); toolHeight = ((this.tool && this.tool.attr("height")) || 24) * ((this.tool && this.tool.isVisible()) ? 1 : 0);
this.view.resetHeight ? this.view.resetHeight(h - tbHeight - tabHeight - toolHeight - 2) : var resetHeight = h - tbHeight - tabHeight - toolHeight - 2 * this.options.innerVGap - 2;
this.view.element.css({"max-height": (h - tbHeight - tabHeight - toolHeight - 2) + "px"}); this.view.resetHeight ? this.view.resetHeight(resetHeight) :
this.view.element.css({"max-height": resetHeight + "px"});
}, },
setValue: function (selectedValues) { setValue: function (selectedValues) {
@ -68253,7 +68279,7 @@ BI.MultiSelectLoader = BI.inherit(BI.Widget, {
}, },
resetHeight: function (h) { resetHeight: function (h) {
this.button_group.resetHeight(h); this.button_group.resetHeight(h - 10);
}, },
resetWidth: function (w) { resetWidth: function (w) {
@ -76266,7 +76292,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;
} }

2
dist/fineui.min.css vendored

File diff suppressed because one or more lines are too long

66
dist/fineui.min.js vendored

File diff suppressed because one or more lines are too long

52
dist/fineui_without_jquery_polyfill.js vendored

@ -15170,7 +15170,7 @@ BI.Layout = BI.inherit(BI.Widget, {
this._children = {}; this._children = {};
BI.each(newCh, function (i, child) { BI.each(newCh, function (i, child) {
var node = self._getOptions(child); var node = self._getOptions(child);
var key = node.key == null ? i : node.key; var key = node.key == null ? self._getChildName(i) : node.key;
children[key]._mount(); children[key]._mount();
self._children[self._getChildName(i)] = children[key]; self._children[self._getChildName(i)] = children[key];
}); });
@ -15188,7 +15188,7 @@ BI.Layout = BI.inherit(BI.Widget, {
function addNode (vnode, index) { function addNode (vnode, index) {
var opt = self._getOptions(vnode); var opt = self._getOptions(vnode);
var key = opt.key == null ? index : opt.key; var key = opt.key == null ? self._getChildName(index) : opt.key;
return children[key] = self._addElement(key, vnode); return children[key] = self._addElement(key, vnode);
} }
@ -15202,7 +15202,7 @@ BI.Layout = BI.inherit(BI.Widget, {
function removeVnodes (vnodes, startIdx, endIdx) { function removeVnodes (vnodes, startIdx, endIdx) {
for (; startIdx <= endIdx; ++startIdx) { for (; startIdx <= endIdx; ++startIdx) {
var node = self._getOptions(vnodes[startIdx]); var node = self._getOptions(vnodes[startIdx]);
var key = node.key == null ? startIdx : node.key; var key = node.key == null ? self._getChildName(startIdx) : node.key;
children[key]._destroy(); children[key]._destroy();
} }
} }
@ -15210,9 +15210,9 @@ BI.Layout = BI.inherit(BI.Widget, {
function insertBefore (insert, before, isNext, index) { function insertBefore (insert, before, isNext, index) {
insert = self._getOptions(insert); insert = self._getOptions(insert);
before = before && self._getOptions(before); before = before && self._getOptions(before);
var insertKey = BI.isKey(insert.key) ? insert.key : index; var insertKey = BI.isKey(insert.key) ? insert.key : self._getChildName(index);
if (before && children[before.key]) { if (before && children[before.key]) {
var beforeKey = BI.isKey(before.key) ? before.key : index; var beforeKey = BI.isKey(before.key) ? before.key : self._getChildName(index);
var next; var next;
if (isNext) { if (isNext) {
next = children[beforeKey].element.next(); next = children[beforeKey].element.next();
@ -16918,6 +16918,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亿层级
@ -17074,6 +17085,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 控制器
@ -27010,7 +27035,7 @@ BI.Combo = BI.inherit(BI.Widget, {
// return; // return;
// } // }
// BI-10290 公式combo双击公式内容会收起 // BI-10290 公式combo双击公式内容会收起
if ((this.element.find(e.target).length > 0 && e.type !== "mousewheel") if ((this.element.find(e.target).length > 0)
|| (this.popupView && this.popupView.element.find(e.target).length > 0) || (this.popupView && this.popupView.element.find(e.target).length > 0)
|| e.target.className === "CodeMirror-cursor" || BI.Widget._renderEngine.createElement(e.target).closest(".CodeMirror-hints").length > 0) {// BI-9887 CodeMirror的公式弹框需要特殊处理下 || e.target.className === "CodeMirror-cursor" || BI.Widget._renderEngine.createElement(e.target).closest(".CodeMirror-hints").length > 0) {// BI-9887 CodeMirror的公式弹框需要特殊处理下
return; return;
@ -29719,7 +29744,7 @@ BI.PopupView = BI.inherit(BI.Widget, {
maxWidth: "auto", maxWidth: "auto",
minWidth: 100, minWidth: 100,
// maxHeight: 200, // maxHeight: 200,
minHeight: 25, minHeight: 24,
lgap: 0, lgap: 0,
rgap: 0, rgap: 0,
tgap: 0, tgap: 0,
@ -29863,10 +29888,11 @@ BI.PopupView = BI.inherit(BI.Widget, {
resetHeight: function (h) { resetHeight: function (h) {
var tbHeight = this.toolbar ? (this.toolbar.attr("height") || 24) : 0, var tbHeight = this.toolbar ? (this.toolbar.attr("height") || 24) : 0,
tabHeight = this.tab ? (this.tab.attr("height") || 25) : 0, tabHeight = this.tab ? (this.tab.attr("height") || 24) : 0,
toolHeight = ((this.tool && this.tool.attr("height")) || 25) * ((this.tool && this.tool.isVisible()) ? 1 : 0); toolHeight = ((this.tool && this.tool.attr("height")) || 24) * ((this.tool && this.tool.isVisible()) ? 1 : 0);
this.view.resetHeight ? this.view.resetHeight(h - tbHeight - tabHeight - toolHeight - 2) : var resetHeight = h - tbHeight - tabHeight - toolHeight - 2 * this.options.innerVGap - 2;
this.view.element.css({"max-height": (h - tbHeight - tabHeight - toolHeight - 2) + "px"}); this.view.resetHeight ? this.view.resetHeight(resetHeight) :
this.view.element.css({"max-height": resetHeight + "px"});
}, },
setValue: function (selectedValues) { setValue: function (selectedValues) {
@ -51834,7 +51860,7 @@ BI.MultiSelectLoader = BI.inherit(BI.Widget, {
}, },
resetHeight: function (h) { resetHeight: function (h) {
this.button_group.resetHeight(h); this.button_group.resetHeight(h - 10);
}, },
resetWidth: function (w) { resetWidth: function (w) {
@ -59847,7 +59873,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;
} }

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 { .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);

4
dist/widget.js vendored

@ -9633,7 +9633,7 @@ BI.MultiSelectLoader = BI.inherit(BI.Widget, {
}, },
resetHeight: function (h) { resetHeight: function (h) {
this.button_group.resetHeight(h); this.button_group.resetHeight(h - 10);
}, },
resetWidth: function (w) { resetWidth: function (w) {
@ -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;
} }

2
src/base/combination/combo.js

@ -261,7 +261,7 @@ BI.Combo = BI.inherit(BI.Widget, {
// return; // return;
// } // }
// BI-10290 公式combo双击公式内容会收起 // BI-10290 公式combo双击公式内容会收起
if ((this.element.find(e.target).length > 0 && e.type !== "mousewheel") if ((this.element.find(e.target).length > 0)
|| (this.popupView && this.popupView.element.find(e.target).length > 0) || (this.popupView && this.popupView.element.find(e.target).length > 0)
|| e.target.className === "CodeMirror-cursor" || BI.Widget._renderEngine.createElement(e.target).closest(".CodeMirror-hints").length > 0) {// BI-9887 CodeMirror的公式弹框需要特殊处理下 || e.target.className === "CodeMirror-cursor" || BI.Widget._renderEngine.createElement(e.target).closest(".CodeMirror-hints").length > 0) {// BI-9887 CodeMirror的公式弹框需要特殊处理下
return; return;

11
src/base/layer/layer.popup.js

@ -10,7 +10,7 @@ BI.PopupView = BI.inherit(BI.Widget, {
maxWidth: "auto", maxWidth: "auto",
minWidth: 100, minWidth: 100,
// maxHeight: 200, // maxHeight: 200,
minHeight: 25, minHeight: 24,
lgap: 0, lgap: 0,
rgap: 0, rgap: 0,
tgap: 0, tgap: 0,
@ -154,10 +154,11 @@ BI.PopupView = BI.inherit(BI.Widget, {
resetHeight: function (h) { resetHeight: function (h) {
var tbHeight = this.toolbar ? (this.toolbar.attr("height") || 24) : 0, var tbHeight = this.toolbar ? (this.toolbar.attr("height") || 24) : 0,
tabHeight = this.tab ? (this.tab.attr("height") || 25) : 0, tabHeight = this.tab ? (this.tab.attr("height") || 24) : 0,
toolHeight = ((this.tool && this.tool.attr("height")) || 25) * ((this.tool && this.tool.isVisible()) ? 1 : 0); toolHeight = ((this.tool && this.tool.attr("height")) || 24) * ((this.tool && this.tool.isVisible()) ? 1 : 0);
this.view.resetHeight ? this.view.resetHeight(h - tbHeight - tabHeight - toolHeight - 2) : var resetHeight = h - tbHeight - tabHeight - toolHeight - 2 * this.options.innerVGap - 2;
this.view.element.css({"max-height": (h - tbHeight - tabHeight - toolHeight - 2) + "px"}); this.view.resetHeight ? this.view.resetHeight(resetHeight) :
this.view.element.css({"max-height": resetHeight + "px"});
}, },
setValue: function (selectedValues) { setValue: function (selectedValues) {

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

10
src/core/wrapper/layout.js

@ -432,7 +432,7 @@ BI.Layout = BI.inherit(BI.Widget, {
this._children = {}; this._children = {};
BI.each(newCh, function (i, child) { BI.each(newCh, function (i, child) {
var node = self._getOptions(child); var node = self._getOptions(child);
var key = node.key == null ? i : node.key; var key = node.key == null ? self._getChildName(i) : node.key;
children[key]._mount(); children[key]._mount();
self._children[self._getChildName(i)] = children[key]; self._children[self._getChildName(i)] = children[key];
}); });
@ -450,7 +450,7 @@ BI.Layout = BI.inherit(BI.Widget, {
function addNode (vnode, index) { function addNode (vnode, index) {
var opt = self._getOptions(vnode); var opt = self._getOptions(vnode);
var key = opt.key == null ? index : opt.key; var key = opt.key == null ? self._getChildName(index) : opt.key;
return children[key] = self._addElement(key, vnode); return children[key] = self._addElement(key, vnode);
} }
@ -464,7 +464,7 @@ BI.Layout = BI.inherit(BI.Widget, {
function removeVnodes (vnodes, startIdx, endIdx) { function removeVnodes (vnodes, startIdx, endIdx) {
for (; startIdx <= endIdx; ++startIdx) { for (; startIdx <= endIdx; ++startIdx) {
var node = self._getOptions(vnodes[startIdx]); var node = self._getOptions(vnodes[startIdx]);
var key = node.key == null ? startIdx : node.key; var key = node.key == null ? self._getChildName(startIdx) : node.key;
children[key]._destroy(); children[key]._destroy();
} }
} }
@ -472,9 +472,9 @@ BI.Layout = BI.inherit(BI.Widget, {
function insertBefore (insert, before, isNext, index) { function insertBefore (insert, before, isNext, index) {
insert = self._getOptions(insert); insert = self._getOptions(insert);
before = before && self._getOptions(before); before = before && self._getOptions(before);
var insertKey = BI.isKey(insert.key) ? insert.key : index; var insertKey = BI.isKey(insert.key) ? insert.key : self._getChildName(index);
if (before && children[before.key]) { if (before && children[before.key]) {
var beforeKey = BI.isKey(before.key) ? before.key : index; var beforeKey = BI.isKey(before.key) ? before.key : self._getChildName(index);
var next; var next;
if (isNext) { if (isNext) {
next = children[beforeKey].element.next(); next = children[beforeKey].element.next();

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;
@ -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/multiselect/multiselect.loader.js

@ -176,7 +176,7 @@ BI.MultiSelectLoader = BI.inherit(BI.Widget, {
}, },
resetHeight: function (h) { resetHeight: function (h) {
this.button_group.resetHeight(h); this.button_group.resetHeight(h - 10);
}, },
resetWidth: function (w) { resetWidth: function (w) {

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