|
|
|
|
@ -19464,7 +19464,7 @@ BI.ResizeController = BI.inherit(BI.Controller, {
|
|
|
|
|
|
|
|
|
|
_resize: function (ev) { |
|
|
|
|
BI.each(this.resizerManger, function (key, resizer) { |
|
|
|
|
if (resizer instanceof $) { |
|
|
|
|
if (resizer instanceof BI.$) { |
|
|
|
|
if (resizer.is(":visible")) { |
|
|
|
|
resizer.trigger("__resize__"); |
|
|
|
|
} |
|
|
|
|
@ -21790,7 +21790,7 @@ BI.prepares.push(function () {
|
|
|
|
|
BI.extend(BI.DOM, { |
|
|
|
|
|
|
|
|
|
patchProps: function (fromElement, toElement) { |
|
|
|
|
var elemData = jQuery._data(fromElement[0]); |
|
|
|
|
var elemData = BI.jQuery._data(fromElement[0]); |
|
|
|
|
var events = elemData.events; |
|
|
|
|
BI.each(events, function (eventKey, event) { |
|
|
|
|
BI.each(event, function (i, handler) { |
|
|
|
|
@ -21802,7 +21802,7 @@ BI.prepares.push(function () {
|
|
|
|
|
throw new Error("不匹配"); |
|
|
|
|
} |
|
|
|
|
BI.each(fromChildren, function (i, child) { |
|
|
|
|
BI.DOM.patchProps(jQuery(child), jQuery(toChildren[i])); |
|
|
|
|
BI.DOM.patchProps(BI.jQuery(child), BI.jQuery(toChildren[i])); |
|
|
|
|
}); |
|
|
|
|
BI.each(fromElement.data("__widgets"), function (i, widget) { |
|
|
|
|
widget.element = toElement; |
|
|
|
|
@ -21819,7 +21819,7 @@ BI.prepares.push(function () {
|
|
|
|
|
var frag = BI.Widget._renderEngine.createFragment(); |
|
|
|
|
BI.each(doms, function (i, dom) { |
|
|
|
|
dom instanceof BI.Widget && (dom = dom.element); |
|
|
|
|
dom instanceof $ && dom[0] && frag.appendChild(dom[0]); |
|
|
|
|
dom instanceof BI.$ && dom[0] && frag.appendChild(dom[0]); |
|
|
|
|
}); |
|
|
|
|
return frag; |
|
|
|
|
}, |
|
|
|
|
@ -38339,8 +38339,12 @@ BI.Single = BI.inherit(BI.Widget, {
|
|
|
|
|
clearTimeout(self.hideTimeout); |
|
|
|
|
self.hideTimeout = null; |
|
|
|
|
} |
|
|
|
|
// CHART-10611 在拖拽的情况下, 鼠标拖拽着元素离开了拖拽元素的容器，但是子元素在dom结构上仍然属于容器
|
|
|
|
|
// 这样会认为鼠标仍然在容器中, 500ms内放开的话，会在容器之外显示鼠标停留处显示容器的title
|
|
|
|
|
if (self.element.__isMouseInBounds__(self._e || e)) { |
|
|
|
|
self._showToolTip(self._e || e, opt); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
}, 500); |
|
|
|
|
|
|
|
|
|
}); |
|
|
|
|
@ -38803,6 +38807,8 @@ BI.BasicButton = BI.inherit(BI.Single, {
|
|
|
|
|
el: { |
|
|
|
|
type: "bi.bubble_combo", |
|
|
|
|
trigger: "", |
|
|
|
|
// bubble的提示不需要一直存在在界面上
|
|
|
|
|
destroyWhenHide: true, |
|
|
|
|
ref: function () { |
|
|
|
|
self.combo = this; |
|
|
|
|
}, |
|
|
|
|
@ -44041,7 +44047,7 @@ BI.Popover = BI.inherit(BI.Widget, {
|
|
|
|
|
|
|
|
|
|
_defaultConfig: function () { |
|
|
|
|
return BI.extend(BI.Popover.superclass._defaultConfig.apply(this, arguments), { |
|
|
|
|
baseCls: "bi-popover bi-card", |
|
|
|
|
baseCls: "bi-popover bi-card bi-border-radius", |
|
|
|
|
// width: 600,
|
|
|
|
|
// height: 500,
|
|
|
|
|
size: "normal", // small, normal, big
|
|
|
|
|
@ -44089,6 +44095,7 @@ BI.Popover = BI.inherit(BI.Widget, {
|
|
|
|
|
cls: "bi-font-bold", |
|
|
|
|
height: this._constant.HEADER_HEIGHT, |
|
|
|
|
text: o.header, |
|
|
|
|
title: o.header, |
|
|
|
|
textAlign: "left" |
|
|
|
|
}, |
|
|
|
|
left: 20, |
|
|
|
|
@ -44633,8 +44640,16 @@ BI.ListView = BI.inherit(BI.Widget, {
|
|
|
|
|
o.scrollTop = self.element.scrollTop(); |
|
|
|
|
self._calculateBlocksToRender(); |
|
|
|
|
}); |
|
|
|
|
var lastWidth = this.element.width(), |
|
|
|
|
lastHeight = this.element.height(); |
|
|
|
|
BI.ResizeDetector.addResizeListener(this, function () { |
|
|
|
|
var width = self.element.width(), |
|
|
|
|
height = self.element.height(); |
|
|
|
|
if (width !== lastWidth || height !== lastHeight) { |
|
|
|
|
lastWidth = width; |
|
|
|
|
lastHeight = height; |
|
|
|
|
self._calculateBlocksToRender(); |
|
|
|
|
} |
|
|
|
|
}); |
|
|
|
|
}, |
|
|
|
|
|
|
|
|
|
@ -54271,7 +54286,8 @@ BI.ColorChooser = BI.inherit(BI.Widget, {
|
|
|
|
|
_defaultConfig: function () { |
|
|
|
|
return BI.extend(BI.ColorChooser.superclass._defaultConfig.apply(this, arguments), { |
|
|
|
|
baseCls: "bi-color-chooser", |
|
|
|
|
value: "" |
|
|
|
|
value: "", |
|
|
|
|
height: 24 |
|
|
|
|
}); |
|
|
|
|
}, |
|
|
|
|
|
|
|
|
|
@ -54291,8 +54307,8 @@ BI.ColorChooser = BI.inherit(BI.Widget, {
|
|
|
|
|
ref: function (_ref) { |
|
|
|
|
self.trigger = _ref; |
|
|
|
|
}, |
|
|
|
|
width: o.width, |
|
|
|
|
height: o.height |
|
|
|
|
width: o.width - 2, |
|
|
|
|
height: o.height - 2 |
|
|
|
|
}, o.el), |
|
|
|
|
popup: { |
|
|
|
|
el: BI.extend({ |
|
|
|
|
@ -54705,7 +54721,7 @@ BI.ColorChooserTrigger = BI.inherit(BI.Trigger, {
|
|
|
|
|
var conf = BI.ColorChooserTrigger.superclass._defaultConfig.apply(this, arguments); |
|
|
|
|
return BI.extend(conf, { |
|
|
|
|
baseCls: (conf.baseCls || "") + " bi-color-chooser-trigger bi-border", |
|
|
|
|
height: 24 |
|
|
|
|
height: 22 |
|
|
|
|
}); |
|
|
|
|
}, |
|
|
|
|
|
|
|
|
|
@ -54769,7 +54785,7 @@ BI.LongColorChooserTrigger = BI.inherit(BI.Trigger, {
|
|
|
|
|
var conf = BI.LongColorChooserTrigger.superclass._defaultConfig.apply(this, arguments); |
|
|
|
|
return BI.extend(conf, { |
|
|
|
|
baseCls: (conf.baseCls || "") + " bi-color-chooser-trigger bi-border", |
|
|
|
|
height: 24 |
|
|
|
|
height: 22 |
|
|
|
|
}); |
|
|
|
|
}, |
|
|
|
|
|
|
|
|
|
@ -56074,9 +56090,11 @@ BI.TextBubblePopupBarView = BI.inherit(BI.Widget, {
|
|
|
|
|
buttons: [{ |
|
|
|
|
level: "ignore", |
|
|
|
|
value: false, |
|
|
|
|
stopPropagation: true, |
|
|
|
|
text: BI.i18nText("BI-Basic_Cancel") |
|
|
|
|
}, { |
|
|
|
|
value: true, |
|
|
|
|
stopPropagation: true, |
|
|
|
|
text: BI.i18nText("BI-Basic_Sure") |
|
|
|
|
}] |
|
|
|
|
}; |
|
|
|
|
@ -62967,6 +62985,7 @@ BI.shortcut("bi.static_date_pane_card", BI.StaticDatePaneCard);BI.DynamicDatePan
|
|
|
|
|
default: |
|
|
|
|
break; |
|
|
|
|
} |
|
|
|
|
self.fireEvent("EVENT_CHANGE"); |
|
|
|
|
} |
|
|
|
|
}], |
|
|
|
|
ref: function () { |
|
|
|
|
@ -74533,6 +74552,7 @@ BI.MultiSelectInsertList = BI.inherit(BI.Single, {
|
|
|
|
|
self.adapter.setValue(self.storeValue); |
|
|
|
|
assertShowValue(); |
|
|
|
|
} |
|
|
|
|
self.fireEvent(BI.MultiSelectInsertList.EVENT_CHANGE); |
|
|
|
|
}); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
@ -74869,6 +74889,7 @@ BI.MultiSelectInsertNoBarList = BI.inherit(BI.Single, {
|
|
|
|
|
self.adapter.setValue(self.storeValue); |
|
|
|
|
assertShowValue(); |
|
|
|
|
} |
|
|
|
|
self.fireEvent(BI.MultiSelectInsertNoBarList.EVENT_CHANGE); |
|
|
|
|
}); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
@ -75188,6 +75209,7 @@ BI.MultiSelectList = BI.inherit(BI.Widget, {
|
|
|
|
|
self.adapter.setValue(self.storeValue); |
|
|
|
|
assertShowValue(); |
|
|
|
|
} |
|
|
|
|
self.fireEvent(BI.MultiSelectList.EVENT_CHANGE); |
|
|
|
|
}); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
@ -87278,7 +87300,7 @@ BI.AbstractTreeValueChooser = BI.inherit(BI.Widget, {
|
|
|
|
|
path.push(split); |
|
|
|
|
childrenCount.push(expanded.length); |
|
|
|
|
// 如果只有一个值且取消的就是这个值
|
|
|
|
|
if (i === parents.length - 1 && expanded.length === 1 && expanded[0] === notSelectedValue) { |
|
|
|
|
if (i === parents.length - 1 && expanded.length === 1 && expanded[0].value === notSelectedValue) { |
|
|
|
|
for (var j = childrenCount.length - 1; j >= 0; j--) { |
|
|
|
|
if (childrenCount[j] === 1) { |
|
|
|
|
self._deleteNode(selectedValues, path[j]); |
|
|
|
|
|
guy
5 years ago