diff --git a/_mobile/date.i18n.cn.js b/_mobile/date.i18n.cn.js
deleted file mode 100644
index 79e294934..000000000
--- a/_mobile/date.i18n.cn.js
+++ /dev/null
@@ -1,67 +0,0 @@
-/**
- * Created by astronaut007 on 2018/8/8
- */
-// 牵扯到国际化这些常量在页面加载后再生效
-// full day names
-BI.Date = BI.Date || {};
-BI.Date._DN = ["星期日",
- "星期一",
- "星期二",
- "星期三",
- "星期四",
- "星期五",
- "星期六",
- "星期日"];
-
-// short day names
-BI.Date._SDN = ["日",
- "一",
- "二",
- "三",
- "四",
- "五",
- "六",
- "日"];
-
-// Monday first, etc.
-BI.Date._FD = 1;
-
-// full month namesdat
-BI.Date._MN = [
- "一月",
- "二月",
- "三月",
- "四月",
- "五月",
- "六月",
- "七月",
- "八月",
- "九月",
- "十月",
- "十一月",
- "十二月"];
-
-// short month names
-BI.Date._SMN = [0,
- 1,
- 2,
- 3,
- 4,
- 5,
- 6,
- 7,
- 8,
- 9,
- 10,
- 11];
-
-BI.Date._QN = ["", "第1季度",
- "第2季度",
- "第3季度",
- "第4季度"];
-
-/** Adds the number of days array to the Date object. */
-BI.Date._MD = [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31];
-
-// 实际上无论周几作为一周的第一天，周初周末都是在-6-0间做偏移，用一个数组就可以
-BI.Date._OFFSET = [0, -1, -2, -3, -4, -5, -6];
diff --git a/examples/响应式布局.html b/examples/响应式布局.html
index b0148d2b4..72a71951f 100644
--- a/examples/响应式布局.html
+++ b/examples/响应式布局.html
@@ -53,13 +53,13 @@
box-shadow: 0 2px 5px rgb(0 0 0 / 16%), 0 2px 10px rgb(0 0 0 / 12%);
}
.nav-logo {
- background-image: url(https://qn.wangchuan.cc/pullrequest-logo.svg);
+ background-image: url(http://qn.wangchuan.cc/pullrequest-logo.svg);
background-repeat: no-repeat;
background-position: 50%;
background-size: contain;
}
.image {
- background-image: url(https://qn.wangchuan.cc/hero-graphic.png);
+ background-image: url(http://qn.wangchuan.cc/hero-graphic.png);
background-repeat: no-repeat;
background-size: contain;
}
@@ -79,7 +79,7 @@
border: 1px solid #4aa4e0;
}
.wave {
- background-image: url(https://qn.wangchuan.cc/wave.png);
+ background-image: url(http://qn.wangchuan.cc/wave.png);
background-size: cover;
background-repeat: repeat-x;
}
@@ -205,7 +205,7 @@
maxWidth: "100%",
maxHeight: "100%",
},
- src: "https://qn.wangchuan.cc/hero-graphic.png",
+ src: "http://qn.wangchuan.cc/hero-graphic.png",
width: "auto",
height: "auto",
},
@@ -318,7 +318,7 @@
maxWidth: "100%",
maxHeight: "100%",
},
- src: "https://qn.wangchuan.cc/velocity.png",
+ src: "http://qn.wangchuan.cc/velocity.png",
width: "auto",
height: "auto",
},
@@ -358,7 +358,7 @@
maxWidth: "100%",
maxHeight: "100%",
},
- src: "https://qn.wangchuan.cc/secure.png",
+ src: "http://qn.wangchuan.cc/secure.png",
width: "auto",
height: "auto",
},
diff --git a/package.json b/package.json
index b1083bcdc..fa1c5ba6f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "fineui",
- "version": "2.0.20221017122609",
+ "version": "2.0.20221018171414",
"description": "fineui",
"main": "dist/fineui_without_conflict.min.js",
"types": "dist/lib/index.d.ts",
diff --git a/src/base/combination/bubble.js b/src/base/combination/bubble.js
index d3bc2975a..1af43b79c 100644
--- a/src/base/combination/bubble.js
+++ b/src/base/combination/bubble.js
@@ -12,7 +12,7 @@
attributes: {
tabIndex: -1,
},
- trigger: "click", // click || hover || click-hover || ""
+ trigger: "click", // click || hover || click-hover || "hover-click" || ""
toggle: true,
direction: "",
placement: "bottom-start", // top-start/top/top-end/bottom-start/bottom/bottom-end/left-start/left/left-end/right-start/right/right-end
@@ -219,6 +219,15 @@
}
});
break;
+ case "hover-click":
+ self.element.on("mouseenter." + self.getName(), function (e) {
+ if (self.isEnabled() && self.isValid() && self.combo.isEnabled() && self.combo.isValid()) {
+ self._popupView(e);
+ self.fireEvent(BI.Controller.EVENT_CHANGE, BI.Events.EXPAND, "", self.combo);
+ self.fireEvent(BI.Bubble.EVENT_EXPAND);
+ }
+ });
+ break;
default:
break;
}
diff --git a/src/base/list/listview.js b/src/base/list/listview.js
index 7028132bc..9939adfbb 100644
--- a/src/base/list/listview.js
+++ b/src/base/list/listview.js
@@ -128,7 +128,8 @@ BI.ListView = BI.inherit(BI.Widget, {
this._populate(items);
},
- destroyed: function () {
+ beforeDestroy: function () {
+ BI.ResizeDetector.removeResizeListener(this);
this.restore();
},
});
diff --git a/src/base/list/virtualgrouplist.js b/src/base/list/virtualgrouplist.js
index 34b11e800..d32dc3a58 100644
--- a/src/base/list/virtualgrouplist.js
+++ b/src/base/list/virtualgrouplist.js
@@ -181,6 +181,11 @@ BI.VirtualGroupList = BI.inherit(BI.Widget, {
populate: function (items) {
this._populate(items);
},
+
+ beforeDestroy: function () {
+ BI.ResizeDetector.removeResizeListener(this);
+ this.restore();
+ }
});
BI.shortcut("bi.virtual_group_list", BI.VirtualGroupList);
diff --git a/src/base/list/virtuallist.js b/src/base/list/virtuallist.js
index 2715008cb..3c110b637 100644
--- a/src/base/list/virtuallist.js
+++ b/src/base/list/virtuallist.js
@@ -201,10 +201,10 @@ BI.VirtualList = BI.inherit(BI.Widget, {
this._populate(items);
},
- destroyed: function () {
- this.cache = {};
- this.renderedIndex = -1;
- },
+ beforeDestroy: function () {
+ BI.ResizeDetector.removeResizeListener(this);
+ this.restore();
+ }
});
BI.shortcut("bi.virtual_list", BI.VirtualList);
diff --git a/src/case/calendar/calendar.js b/src/case/calendar/calendar.js
index f5a99e37d..5c5026d8f 100644
--- a/src/case/calendar/calendar.js
+++ b/src/case/calendar/calendar.js
@@ -120,7 +120,7 @@ BI.Calendar = BI.inherit(BI.Widget, {
_getWeekLabel: function () {
return BI.map(BI.range(0, 7), function (idx, v) {
- return BI.Date._SDN[(v + BI.StartOfWeek) % 7];
+ return BI.getShortDayName((v + BI.StartOfWeek) % 7);
});
},
diff --git a/src/core/3.ob.js b/src/core/3.ob.js
index a9019c3a8..100fcac17 100644
--- a/src/core/3.ob.js
+++ b/src/core/3.ob.js
@@ -33,7 +33,9 @@
};
BI._.extend(OB.prototype, {
props: {},
+
init: null,
+
destroyed: null,
_constructor: function (config) {
@@ -71,6 +73,12 @@
self.on(eventName, lis);
return;
}
+ if (BI._.isArray(lis)) {
+ BI._.each(lis, function (l) {
+ self.on(eventName, l);
+ });
+ return;
+ }
(lis.target ? lis.target : self)[lis.once ? "once" : "on"](lis.eventName, BI._.bind(lis.action, self));
});
delete this.options.listeners;
@@ -140,6 +148,7 @@
};
this.on(eventName, proxy);
},
+
/**
* 解除观察者绑定的指定事件
* @param {String} eventName 要解除绑定事件的名字
@@ -164,6 +173,7 @@
}
}
},
+
/**
* 清除观察者的所有事件绑定
*/
@@ -171,6 +181,7 @@
/* alex:清空events*/
this.events = {};
},
+
/**
* 触发绑定过的事件
*
diff --git a/src/core/4.widget.js b/src/core/4.widget.js
index 5af118dd5..49c1238cc 100644
--- a/src/core/4.widget.js
+++ b/src/core/4.widget.js
@@ -308,7 +308,7 @@
}) : o.invisible;
if (invisible) {
// 用display属性做显示和隐藏，否则jquery会在显示时将display设为block会覆盖掉display:flex属性
- this.element.css("display", "none");
+ this.__setElementVisible(false);
}
}
},
@@ -513,13 +513,17 @@
}
},
+ __setElementVisible: function (visible) {
+ this.element.css("display", visible ? "" : "none");
+ },
+
_innerSetVisible: function (visible) {
var self = this, o = this.options;
var lastVisible = !o.invisible;
this._setVisible(visible);
if (visible === true) {
// 用this.element.show()会把display属性改成block
- this.element.css("display", "");
+ this.__setElementVisible(true);
this._mount();
if (o.animation && !lastVisible) {
this.element.removeClass(o.animation + "-leave").removeClass(o.animation + "-leave-active").addClass(o.animation + "-enter");
@@ -552,10 +556,10 @@
}
this._animationDuring = setTimeout(function () {
self.element.removeClass(o.animation + "-leave").removeClass(o.animation + "-leave-active");
- self.element.css("display", "none");
+ self.__setElementVisible(false);
}, o.animationDuring);
} else {
- this.element.css("display", "none");
+ this.__setElementVisible(false);
}
}
},
diff --git a/src/core/5.inject.js b/src/core/5.inject.js
index 0554740f7..9602deed9 100644
--- a/src/core/5.inject.js
+++ b/src/core/5.inject.js
@@ -449,7 +449,7 @@
} else if (item.el && (item.el.type || options.type)) {
el = BI.extend({}, options, item.el);
}
-
+
if (el) {
var elType = (el.type && el.type.xtype) || el.type;
runConfigFunction(elType);
@@ -471,12 +471,20 @@
var wType = (w.type && w.type.xtype) || w.type;
if (wType === elType) {
if (BI.Plugin.hasObject(elType)) {
- w.listeners = (w.listeners || []).concat([{
- eventName: BI.Events.MOUNT,
- action: function () {
- BI.Plugin.getObject(elType, this);
- }
- }]);
+ if (!w.listeners || BI.isArray(w.listeners)) {
+ w.listeners = (w.listeners || []).concat([{
+ eventName: BI.Events.MOUNT,
+ action: function () {
+ BI.Plugin.getObject(elType, this);
+ }
+ }]);
+ } else {
+ w.listeners[BI.Events.MOUNT] = [
+ function () {
+ BI.Plugin.getObject(elType, this);
+ }
+ ].concat(w.listeners[BI.Events.MOUNT] || []);
+ }
}
return createWidget(w, context, lazy);
}
diff --git a/src/core/constant/date.i18n.js b/src/core/constant/date.i18n.js
deleted file mode 100644
index 67f8c93d0..000000000
--- a/src/core/constant/date.i18n.js
+++ /dev/null
@@ -1,66 +0,0 @@
-BI.prepares.push(function () {
- BI.Date = BI.Date || {};
- // 牵扯到国际化这些常量在页面加载后再生效
- // full day names
- BI.Date._DN = [BI.i18nText("BI-Basic_Sunday"),
- BI.i18nText("BI-Basic_Monday"),
- BI.i18nText("BI-Basic_Tuesday"),
- BI.i18nText("BI-Basic_Wednesday"),
- BI.i18nText("BI-Basic_Thursday"),
- BI.i18nText("BI-Basic_Friday"),
- BI.i18nText("BI-Basic_Saturday"),
- BI.i18nText("BI-Basic_Sunday")];
-
- // short day names
- BI.Date._SDN = [BI.i18nText("BI-Basic_Simple_Sunday"),
- BI.i18nText("BI-Basic_Simple_Monday"),
- BI.i18nText("BI-Basic_Simple_Tuesday"),
- BI.i18nText("BI-Basic_Simple_Wednesday"),
- BI.i18nText("BI-Basic_Simple_Thursday"),
- BI.i18nText("BI-Basic_Simple_Friday"),
- BI.i18nText("BI-Basic_Simple_Saturday"),
- BI.i18nText("BI-Basic_Simple_Sunday")];
-
- // Monday first, etc.
- BI.Date._FD = 1;
-
- // full month namesdat
- BI.Date._MN = [
- BI.i18nText("BI-Basic_January"),
- BI.i18nText("BI-Basic_February"),
- BI.i18nText("BI-Basic_March"),
- BI.i18nText("BI-Basic_April"),
- BI.i18nText("BI-Basic_May"),
- BI.i18nText("BI-Basic_June"),
- BI.i18nText("BI-Basic_July"),
- BI.i18nText("BI-Basic_August"),
- BI.i18nText("BI-Basic_September"),
- BI.i18nText("BI-Basic_October"),
- BI.i18nText("BI-Basic_November"),
- BI.i18nText("BI-Basic_December")];
-
- // short month names
- BI.Date._SMN = [0,
- 1,
- 2,
- 3,
- 4,
- 5,
- 6,
- 7,
- 8,
- 9,
- 10,
- 11];
-
- BI.Date._QN = ["", BI.i18nText("BI-Quarter_1"),
- BI.i18nText("BI-Quarter_2"),
- BI.i18nText("BI-Quarter_3"),
- BI.i18nText("BI-Quarter_4")];
-
- /** Adds the number of days array to the Date object. */
- BI.Date._MD = [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31];
-
- // 实际上无论周几作为一周的第一天，周初周末都是在-6-0间做偏移，用一个数组就可以
- BI.Date._OFFSET = [0, -1, -2, -3, -4, -5, -6];
-});
\ No newline at end of file
diff --git a/src/core/func/alias.js b/src/core/func/alias.js
index e30d88c24..0dca26ca6 100644
--- a/src/core/func/alias.js
+++ b/src/core/func/alias.js
@@ -804,7 +804,7 @@
var str = jfmt.str, len = jfmt.len, ch = jfmt["char"];
switch (ch) {
case "E": // 星期
- str = BI.Date._DN[date.getDay()];
+ str = BI.getFullDayName(date.getDay());
break;
case "y": // 年
if (len <= 3) {
diff --git a/src/core/func/date.js b/src/core/func/date.js
index 74bf3bea7..d603d235c 100644
--- a/src/core/func/date.js
+++ b/src/core/func/date.js
@@ -6,6 +6,29 @@ BI.Date.HOUR = 60 * BI.Date.MINUTE;
BI.Date.DAY = 24 * BI.Date.HOUR;
BI.Date.WEEK = 7 * BI.Date.DAY;
+// Monday first, etc.
+BI.Date._FD = 1;
+
+// short month names
+BI.Date._SMN = [0,
+ 1,
+ 2,
+ 3,
+ 4,
+ 5,
+ 6,
+ 7,
+ 8,
+ 9,
+ 10,
+ 11];
+
+/** Adds the number of days array to the Date object. */
+BI.Date._MD = [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31];
+
+// 实际上无论周几作为一周的第一天，周初周末都是在-6-0间做偏移，用一个数组就可以
+BI.Date._OFFSET = [0, -1, -2, -3, -4, -5, -6];
+
BI._.extend(BI, {
/**
* 获取时区
@@ -136,6 +159,50 @@ BI._.extend(BI, {
return BI.getOffsetDate(date, BI.Date._OFFSET[w < startOfWeek ? (7 + w - startOfWeek) : (w - startOfWeek)] + 6);
},
+ getFullDayName: function (index) {
+ return [BI.i18nText("BI-Basic_Sunday"),
+ BI.i18nText("BI-Basic_Monday"),
+ BI.i18nText("BI-Basic_Tuesday"),
+ BI.i18nText("BI-Basic_Wednesday"),
+ BI.i18nText("BI-Basic_Thursday"),
+ BI.i18nText("BI-Basic_Friday"),
+ BI.i18nText("BI-Basic_Saturday"),
+ BI.i18nText("BI-Basic_Sunday")][index];
+ },
+
+ getShortDayName: function (index) {
+ return [BI.i18nText("BI-Basic_Simple_Sunday"),
+ BI.i18nText("BI-Basic_Simple_Monday"),
+ BI.i18nText("BI-Basic_Simple_Tuesday"),
+ BI.i18nText("BI-Basic_Simple_Wednesday"),
+ BI.i18nText("BI-Basic_Simple_Thursday"),
+ BI.i18nText("BI-Basic_Simple_Friday"),
+ BI.i18nText("BI-Basic_Simple_Saturday"),
+ BI.i18nText("BI-Basic_Simple_Sunday")][index];
+ },
+
+ getMonthName: function (index) {
+ return [BI.i18nText("BI-Basic_January"),
+ BI.i18nText("BI-Basic_February"),
+ BI.i18nText("BI-Basic_March"),
+ BI.i18nText("BI-Basic_April"),
+ BI.i18nText("BI-Basic_May"),
+ BI.i18nText("BI-Basic_June"),
+ BI.i18nText("BI-Basic_July"),
+ BI.i18nText("BI-Basic_August"),
+ BI.i18nText("BI-Basic_September"),
+ BI.i18nText("BI-Basic_October"),
+ BI.i18nText("BI-Basic_November"),
+ BI.i18nText("BI-Basic_December")][index]
+ },
+
+ getQuarterName: function (index) {
+ return ["", BI.i18nText("BI-Quarter_1"),
+ BI.i18nText("BI-Quarter_2"),
+ BI.i18nText("BI-Quarter_3"),
+ BI.i18nText("BI-Quarter_4")][index];
+ },
+
// 格式化打印日期
print: function (date, str) {
var m = date.getMonth();
@@ -158,10 +225,10 @@ BI._.extend(BI, {
}
var min = date.getMinutes();
var sec = date.getSeconds();
- s["%a"] = BI.Date._SDN[w]; // abbreviated weekday name [FIXME: I18N]
- s["%A"] = BI.Date._DN[w]; // full weekday name
+ s["%a"] = BI.getShortDayName(w); // abbreviated weekday name [FIXME: I18N]
+ s["%A"] = BI.getFullDayName(w); // full weekday name
s["%b"] = BI.Date._SMN[m]; // abbreviated month name [FIXME: I18N]
- s["%B"] = BI.Date._MN[m]; // full month name
+ s["%B"] = BI.getMonthName(m); // full month name
// FIXME: %c : preferred date and time representation for the current locale
s["%C"] = 1 + Math.floor(y / 100); // the century number
s["%d"] = (d < 10) ? ("0" + d) : d; // the day of the month (range 01 to 31)
diff --git a/src/core/platform/web/detectElementResize.js b/src/core/platform/web/detectElementResize.js
index 7137bb50c..357e938a7 100644
--- a/src/core/platform/web/detectElementResize.js
+++ b/src/core/platform/web/detectElementResize.js
@@ -1,120 +1,557 @@
/**
* Detect Element Resize.
- * Forked in order to guard against unsafe 'window' and 'document' references.
- *
- * https://github.com/sdecima/javascript-detect-element-resize
- * Sebastian Decima
- *
- * version: 0.5.3
+ * A minimal library which polyfills the ResizeObserver API and is entirely based on the latest Draft Specification.
+ * https://github.com/juggle/resize-observer
+ * version: 3.4.0
**/
-!(function () {
- var attachEvent = _global.document && _global.document.attachEvent,
- stylesCreated = false;
-
- if (_global.document && !attachEvent) {
- var requestFrame = (function () {
- var raf = _global.requestAnimationFrame || _global.mozRequestAnimationFrame || _global.webkitRequestAnimationFrame ||
- function (fn) { return _global.setTimeout(fn, 20); };
- return function (fn) { return raf(fn); };
- })();
-
- var cancelFrame = (function () {
- var cancel = _global.cancelAnimationFrame || _global.mozCancelAnimationFrame || _global.webkitCancelAnimationFrame ||
- _global.clearTimeout;
- return function (id) { return cancel(id); };
- })();
-
- var resetTriggers = function (element) {
- var triggers = element.__resizeTriggers__,
- expand = triggers.firstElementChild,
- contract = triggers.lastElementChild,
- expandChild = expand.firstElementChild;
- contract.scrollLeft = contract.scrollWidth;
- contract.scrollTop = contract.scrollHeight;
- expandChild.style.width = expand.offsetWidth + 1 + "px";
- expandChild.style.height = expand.offsetHeight + 1 + "px";
- expand.scrollLeft = expand.scrollWidth;
- expand.scrollTop = expand.scrollHeight;
- };
-
- var checkTriggers = function (element) {
- return element.offsetWidth !== element.__resizeLast__.width ||
- element.offsetHeight !== element.__resizeLast__.height;
- };
-
- var scrollListener = function (e) {
- var element = this;
- resetTriggers(this);
- if (this.__resizeRAF__) cancelFrame(this.__resizeRAF__);
- this.__resizeRAF__ = requestFrame(function () {
- if (checkTriggers(element)) {
- element.__resizeLast__.width = element.offsetWidth;
- element.__resizeLast__.height = element.offsetHeight;
- element.__resizeListeners__.forEach(function (fn) {
- fn.call(element, e);
- });
- }
+var ResizeObserverPolyfill = (function (exports) {
+ 'use strict';
+
+ var resizeObservers = [];
+
+ var hasActiveObservations = function () {
+ return resizeObservers.some(function (ro) {
+ return ro.activeTargets.length > 0;
+ });
+ };
+
+ var hasSkippedObservations = function () {
+ return resizeObservers.some(function (ro) {
+ return ro.skippedTargets.length > 0;
+ });
+ };
+
+ var msg = 'ResizeObserver loop completed with undelivered notifications.';
+ var deliverResizeLoopError = function () {
+ var event;
+ if (typeof ErrorEvent === 'function') {
+ event = new ErrorEvent('error', {
+ message: msg
});
+ } else {
+ event = document.createEvent('Event');
+ event.initEvent('error', false, false);
+ event.message = msg;
+ }
+ window.dispatchEvent(event);
+ };
+
+ var ResizeObserverBoxOptions;
+ (function (ResizeObserverBoxOptions) {
+ ResizeObserverBoxOptions["BORDER_BOX"] = "border-box";
+ ResizeObserverBoxOptions["CONTENT_BOX"] = "content-box";
+ ResizeObserverBoxOptions["DEVICE_PIXEL_CONTENT_BOX"] = "device-pixel-content-box";
+ })(ResizeObserverBoxOptions || (ResizeObserverBoxOptions = {}));
+
+ var freeze = function (obj) {
+ return Object.freeze(obj);
+ };
+
+ var ResizeObserverSize = (function () {
+ function ResizeObserverSize(inlineSize, blockSize) {
+ this.inlineSize = inlineSize;
+ this.blockSize = blockSize;
+ freeze(this);
+ }
+
+ return ResizeObserverSize;
+ }());
+
+ var DOMRectReadOnly = (function () {
+ function DOMRectReadOnly(x, y, width, height) {
+ this.x = x;
+ this.y = y;
+ this.width = width;
+ this.height = height;
+ this.top = this.y;
+ this.left = this.x;
+ this.bottom = this.top + this.height;
+ this.right = this.left + this.width;
+ return freeze(this);
+ }
+
+ DOMRectReadOnly.prototype.toJSON = function () {
+ var _a = this, x = _a.x, y = _a.y, top = _a.top, right = _a.right, bottom = _a.bottom, left = _a.left,
+ width = _a.width, height = _a.height;
+ return { x: x, y: y, top: top, right: right, bottom: bottom, left: left, width: width, height: height };
};
+ DOMRectReadOnly.fromRect = function (rectangle) {
+ return new DOMRectReadOnly(rectangle.x, rectangle.y, rectangle.width, rectangle.height);
+ };
+ return DOMRectReadOnly;
+ }());
- /* Detect CSS Animations support to detect element display/re-attach */
- var animation = false,
- animationstring = "animation",
- keyframeprefix = "",
- animationstartevent = "animationstart",
- domPrefixes = "Webkit Moz O ms".split(" "),
- startEvents = "webkitAnimationStart animationstart oAnimationStart MSAnimationStart".split(" "),
- pfx = "";
- {
- var elm = document.createElement("fakeelement");
- if (elm.style.animationName !== undefined) {
- animation = true;
- }
-
- if (animation === false) {
- for (var i = 0; i < domPrefixes.length; i++) {
- if (elm.style[domPrefixes[i] + "AnimationName"] !== undefined) {
- pfx = domPrefixes[i];
- animationstring = pfx + "Animation";
- keyframeprefix = "-" + pfx.toLowerCase() + "-";
- animationstartevent = startEvents[i];
- animation = true;
- break;
- }
+ var isSVG = function (target) {
+ return target instanceof SVGElement && 'getBBox' in target;
+ };
+ var isHidden = function (target) {
+ if (isSVG(target)) {
+ var _a = target.getBBox(), width = _a.width, height = _a.height;
+ return !width && !height;
+ }
+ var _b = target, offsetWidth = _b.offsetWidth, offsetHeight = _b.offsetHeight;
+ return !(offsetWidth || offsetHeight || target.getClientRects().length);
+ };
+ var isElement = function (obj) {
+ var _a;
+ if (obj instanceof Element) {
+ return true;
+ }
+ var scope = (_a = obj === null || obj === void 0 ? void 0 : obj.ownerDocument) === null || _a === void 0 ? void 0 : _a.defaultView;
+ return !!(scope && obj instanceof scope.Element);
+ };
+ var isReplacedElement = function (target) {
+ switch (target.tagName) {
+ case 'INPUT':
+ if (target.type !== 'image') {
+ break;
}
+ case 'VIDEO':
+ case 'AUDIO':
+ case 'EMBED':
+ case 'OBJECT':
+ case 'CANVAS':
+ case 'IFRAME':
+ case 'IMG':
+ return true;
+ }
+ return false;
+ };
+
+ var global = typeof window !== 'undefined' ? window : {};
+
+ var cache = new WeakMap();
+ var scrollRegexp = /auto|scroll/;
+ var verticalRegexp = /^tb|vertical/;
+ var IE = (/msie|trident/i).test(global.navigator && global.navigator.userAgent);
+ var parseDimension = function (pixel) {
+ return parseFloat(pixel || '0');
+ };
+ var size = function (inlineSize, blockSize, switchSizes) {
+ if (inlineSize === void 0) {
+ inlineSize = 0;
+ }
+ if (blockSize === void 0) {
+ blockSize = 0;
+ }
+ if (switchSizes === void 0) {
+ switchSizes = false;
+ }
+ return new ResizeObserverSize((switchSizes ? blockSize : inlineSize) || 0, (switchSizes ? inlineSize : blockSize) || 0);
+ };
+ var zeroBoxes = freeze({
+ devicePixelContentBoxSize: size(),
+ borderBoxSize: size(),
+ contentBoxSize: size(),
+ contentRect: new DOMRectReadOnly(0, 0, 0, 0)
+ });
+ var calculateBoxSizes = function (target, forceRecalculation) {
+ if (forceRecalculation === void 0) {
+ forceRecalculation = false;
+ }
+ if (cache.has(target) && !forceRecalculation) {
+ return cache.get(target);
+ }
+ if (isHidden(target)) {
+ cache.set(target, zeroBoxes);
+ return zeroBoxes;
+ }
+ var cs = getComputedStyle(target);
+ var svg = isSVG(target) && target.ownerSVGElement && target.getBBox();
+ var removePadding = !IE && cs.boxSizing === 'border-box';
+ var switchSizes = verticalRegexp.test(cs.writingMode || '');
+ var canScrollVertically = !svg && scrollRegexp.test(cs.overflowY || '');
+ var canScrollHorizontally = !svg && scrollRegexp.test(cs.overflowX || '');
+ var paddingTop = svg ? 0 : parseDimension(cs.paddingTop);
+ var paddingRight = svg ? 0 : parseDimension(cs.paddingRight);
+ var paddingBottom = svg ? 0 : parseDimension(cs.paddingBottom);
+ var paddingLeft = svg ? 0 : parseDimension(cs.paddingLeft);
+ var borderTop = svg ? 0 : parseDimension(cs.borderTopWidth);
+ var borderRight = svg ? 0 : parseDimension(cs.borderRightWidth);
+ var borderBottom = svg ? 0 : parseDimension(cs.borderBottomWidth);
+ var borderLeft = svg ? 0 : parseDimension(cs.borderLeftWidth);
+ var horizontalPadding = paddingLeft + paddingRight;
+ var verticalPadding = paddingTop + paddingBottom;
+ var horizontalBorderArea = borderLeft + borderRight;
+ var verticalBorderArea = borderTop + borderBottom;
+ var horizontalScrollbarThickness = !canScrollHorizontally ? 0 : target.offsetHeight - verticalBorderArea - target.clientHeight;
+ var verticalScrollbarThickness = !canScrollVertically ? 0 : target.offsetWidth - horizontalBorderArea - target.clientWidth;
+ var widthReduction = removePadding ? horizontalPadding + horizontalBorderArea : 0;
+ var heightReduction = removePadding ? verticalPadding + verticalBorderArea : 0;
+ var contentWidth = svg ? svg.width : parseDimension(cs.width) - widthReduction - verticalScrollbarThickness;
+ var contentHeight = svg ? svg.height : parseDimension(cs.height) - heightReduction - horizontalScrollbarThickness;
+ var borderBoxWidth = contentWidth + horizontalPadding + verticalScrollbarThickness + horizontalBorderArea;
+ var borderBoxHeight = contentHeight + verticalPadding + horizontalScrollbarThickness + verticalBorderArea;
+ var boxes = freeze({
+ devicePixelContentBoxSize: size(Math.round(contentWidth * devicePixelRatio), Math.round(contentHeight * devicePixelRatio), switchSizes),
+ borderBoxSize: size(borderBoxWidth, borderBoxHeight, switchSizes),
+ contentBoxSize: size(contentWidth, contentHeight, switchSizes),
+ contentRect: new DOMRectReadOnly(paddingLeft, paddingTop, contentWidth, contentHeight)
+ });
+ cache.set(target, boxes);
+ return boxes;
+ };
+ var calculateBoxSize = function (target, observedBox, forceRecalculation) {
+ var _a = calculateBoxSizes(target, forceRecalculation), borderBoxSize = _a.borderBoxSize,
+ contentBoxSize = _a.contentBoxSize, devicePixelContentBoxSize = _a.devicePixelContentBoxSize;
+ switch (observedBox) {
+ case ResizeObserverBoxOptions.DEVICE_PIXEL_CONTENT_BOX:
+ return devicePixelContentBoxSize;
+ case ResizeObserverBoxOptions.BORDER_BOX:
+ return borderBoxSize;
+ default:
+ return contentBoxSize;
+ }
+ };
+
+ var ResizeObserverEntry = (function () {
+ function ResizeObserverEntry(target) {
+ var boxes = calculateBoxSizes(target);
+ this.target = target;
+ this.contentRect = boxes.contentRect;
+ this.borderBoxSize = freeze([boxes.borderBoxSize]);
+ this.contentBoxSize = freeze([boxes.contentBoxSize]);
+ this.devicePixelContentBoxSize = freeze([boxes.devicePixelContentBoxSize]);
+ }
+
+ return ResizeObserverEntry;
+ }());
+
+ var calculateDepthForNode = function (node) {
+ if (isHidden(node)) {
+ return Infinity;
+ }
+ var depth = 0;
+ var parent = node.parentNode;
+ while (parent) {
+ depth += 1;
+ parent = parent.parentNode;
+ }
+ return depth;
+ };
+
+ var broadcastActiveObservations = function () {
+ var shallowestDepth = Infinity;
+ var callbacks = [];
+ resizeObservers.forEach(function processObserver(ro) {
+ if (ro.activeTargets.length === 0) {
+ return;
}
+ var entries = [];
+ ro.activeTargets.forEach(function processTarget(ot) {
+ var entry = new ResizeObserverEntry(ot.target);
+ var targetDepth = calculateDepthForNode(ot.target);
+ entries.push(entry);
+ ot.lastReportedSize = calculateBoxSize(ot.target, ot.observedBox);
+ if (targetDepth < shallowestDepth) {
+ shallowestDepth = targetDepth;
+ }
+ });
+ callbacks.push(function resizeObserverCallback() {
+ ro.callback.call(ro.observer, entries, ro.observer);
+ });
+ ro.activeTargets.splice(0, ro.activeTargets.length);
+ });
+ for (var _i = 0, callbacks_1 = callbacks; _i < callbacks_1.length; _i++) {
+ var callback = callbacks_1[_i];
+ callback();
+ }
+ return shallowestDepth;
+ };
+
+ var gatherActiveObservationsAtDepth = function (depth) {
+ resizeObservers.forEach(function processObserver(ro) {
+ ro.activeTargets.splice(0, ro.activeTargets.length);
+ ro.skippedTargets.splice(0, ro.skippedTargets.length);
+ ro.observationTargets.forEach(function processTarget(ot) {
+ if (ot.isActive()) {
+ if (calculateDepthForNode(ot.target) > depth) {
+ ro.activeTargets.push(ot);
+ } else {
+ ro.skippedTargets.push(ot);
+ }
+ }
+ });
+ });
+ };
+
+ var process = function () {
+ var depth = 0;
+ gatherActiveObservationsAtDepth(depth);
+ while (hasActiveObservations()) {
+ depth = broadcastActiveObservations();
+ gatherActiveObservationsAtDepth(depth);
+ }
+ if (hasSkippedObservations()) {
+ deliverResizeLoopError();
+ }
+ return depth > 0;
+ };
+
+ var trigger;
+ var callbacks = [];
+ var notify = function () {
+ return callbacks.splice(0).forEach(function (cb) {
+ return cb();
+ });
+ };
+ var queueMicroTask = function (callback) {
+ if (!trigger) {
+ var toggle_1 = 0;
+ var el_1 = document.createTextNode('');
+ var config = { characterData: true };
+ new MutationObserver(function () {
+ return notify();
+ }).observe(el_1, config);
+ trigger = function () {
+ el_1.textContent = "".concat(toggle_1 ? toggle_1-- : toggle_1++);
+ };
+ }
+ callbacks.push(callback);
+ trigger();
+ };
+
+ var queueResizeObserver = function (cb) {
+ queueMicroTask(function ResizeObserver() {
+ requestAnimationFrame(cb);
+ });
+ };
+
+ var watching = 0;
+ var isWatching = function () {
+ return !!watching;
+ };
+ var CATCH_PERIOD = 250;
+ var observerConfig = { attributes: true, characterData: true, childList: true, subtree: true };
+ var events = ['resize', 'load', 'transitionend', 'animationend', 'animationstart', 'animationiteration', 'keyup', 'keydown', 'mouseup', 'mousedown', 'mouseover', 'mouseout', 'blur', 'focus'];
+ var time = function (timeout) {
+ if (timeout === void 0) {
+ timeout = 0;
+ }
+ return Date.now() + timeout;
+ };
+ var scheduled = false;
+ var Scheduler = (function () {
+ function Scheduler() {
+ var _this = this;
+ this.stopped = true;
+ this.listener = function () {
+ return _this.schedule();
+ };
}
- var animationName = "resizeanim";
- var animationKeyframes = "@" + keyframeprefix + "keyframes " + animationName + " { from { opacity: 0; } to { opacity: 0; } } ";
- var animationStyle = keyframeprefix + "animation: 1ms " + animationName + "; ";
- }
+ Scheduler.prototype.run = function (timeout) {
+ var _this = this;
+ if (timeout === void 0) {
+ timeout = CATCH_PERIOD;
+ }
+ if (scheduled) {
+ return;
+ }
+ scheduled = true;
+ var until = time(timeout);
+ queueResizeObserver(function () {
+ var elementsHaveResized = false;
+ try {
+ elementsHaveResized = process();
+ } finally {
+ scheduled = false;
+ timeout = until - time();
+ if (!isWatching()) {
+ return;
+ }
+ if (elementsHaveResized) {
+ _this.run(1000);
+ } else if (timeout > 0) {
+ _this.run(timeout);
+ } else {
+ _this.start();
+ }
+ }
+ });
+ };
+ Scheduler.prototype.schedule = function () {
+ this.stop();
+ this.run();
+ };
+ Scheduler.prototype.observe = function () {
+ var _this = this;
+ var cb = function () {
+ return _this.observer && _this.observer.observe(document.body, observerConfig);
+ };
+ document.body ? cb() : global.addEventListener('DOMContentLoaded', cb);
+ };
+ Scheduler.prototype.start = function () {
+ var _this = this;
+ if (this.stopped) {
+ this.stopped = false;
+ this.observer = new MutationObserver(this.listener);
+ this.observe();
+ events.forEach(function (name) {
+ return global.addEventListener(name, _this.listener, true);
+ });
+ }
+ };
+ Scheduler.prototype.stop = function () {
+ var _this = this;
+ if (!this.stopped) {
+ this.observer && this.observer.disconnect();
+ events.forEach(function (name) {
+ return global.removeEventListener(name, _this.listener, true);
+ });
+ this.stopped = true;
+ }
+ };
+ return Scheduler;
+ }());
+ var scheduler = new Scheduler();
+ var updateCount = function (n) {
+ !watching && n > 0 && scheduler.start();
+ watching += n;
+ !watching && scheduler.stop();
+ };
- var createStyles = function () {
- if (!stylesCreated) {
- // opacity:0 works around a chrome bug https://code.google.com/p/chromium/issues/detail?id=286360
- var css = (animationKeyframes ? animationKeyframes : "") +
- ".resize-triggers { " + (animationStyle ? animationStyle : "") + "visibility: hidden; opacity: 0; } " +
- ".resize-triggers, .resize-triggers > div, .contract-trigger:before { content: \" \"; display: block; position: absolute; top: 0; left: 0; height: 100%; width: 100%; overflow: hidden; } .resize-triggers > div { background: #eee; overflow: auto; } .contract-trigger:before { width: 200%; height: 200%; }",
- head = document.head || document.getElementsByTagName("head")[0],
- style = document.createElement("style");
+ var skipNotifyOnElement = function (target) {
+ return !isSVG(target) && !isReplacedElement(target) && getComputedStyle(target).display === 'inline';
+ };
+ var ResizeObservation = (function () {
+ function ResizeObservation(target, observedBox) {
+ this.target = target;
+ this.observedBox = observedBox || ResizeObserverBoxOptions.CONTENT_BOX;
+ this.lastReportedSize = {
+ inlineSize: -1, blockSize: -1
+ };
+ }
- style.type = "text/css";
- if (style.styleSheet) {
- style.styleSheet.cssText = css;
- } else {
- style.appendChild(document.createTextNode(css));
+ ResizeObservation.prototype.isActive = function () {
+ var size = calculateBoxSize(this.target, this.observedBox, true);
+ if (skipNotifyOnElement(this.target)) {
+ this.lastReportedSize = size;
+ }
+ if (this.lastReportedSize.inlineSize !== size.inlineSize || this.lastReportedSize.blockSize !== size.blockSize) {
+ return true;
}
+ return false;
+ };
+ return ResizeObservation;
+ }());
+
+ var ResizeObserverDetail = (function () {
+ function ResizeObserverDetail(resizeObserver, callback) {
+ this.activeTargets = [];
+ this.skippedTargets = [];
+ this.observationTargets = [];
+ this.observer = resizeObserver;
+ this.callback = callback;
+ }
- head.appendChild(style);
- stylesCreated = true;
+ return ResizeObserverDetail;
+ }());
+
+ var observerMap = new WeakMap();
+ var getObservationIndex = function (observationTargets, target) {
+ for (var i = 0; i < observationTargets.length; i += 1) {
+ if (observationTargets[i].target === target) {
+ return i;
+ }
}
+ return -1;
};
+ var ResizeObserverController = (function () {
+ function ResizeObserverController() {
+ }
+
+ ResizeObserverController.connect = function (resizeObserver, callback) {
+ var detail = new ResizeObserverDetail(resizeObserver, callback);
+ observerMap.set(resizeObserver, detail);
+ };
+ ResizeObserverController.observe = function (resizeObserver, target, options) {
+ var detail = observerMap.get(resizeObserver);
+ var firstObservation = detail.observationTargets.length === 0;
+ if (getObservationIndex(detail.observationTargets, target) < 0) {
+ firstObservation && resizeObservers.push(detail);
+ detail.observationTargets.push(new ResizeObservation(target, options && options.box));
+ updateCount(1);
+ scheduler.schedule();
+ }
+ };
+ ResizeObserverController.unobserve = function (resizeObserver, target) {
+ var detail = observerMap.get(resizeObserver);
+ var index = getObservationIndex(detail.observationTargets, target);
+ var lastObservation = detail.observationTargets.length === 1;
+ if (index >= 0) {
+ lastObservation && resizeObservers.splice(resizeObservers.indexOf(detail), 1);
+ detail.observationTargets.splice(index, 1);
+ updateCount(-1);
+ }
+ };
+ ResizeObserverController.disconnect = function (resizeObserver) {
+ var _this = this;
+ var detail = observerMap.get(resizeObserver);
+ detail.observationTargets.slice().forEach(function (ot) {
+ return _this.unobserve(resizeObserver, ot.target);
+ });
+ detail.activeTargets.splice(0, detail.activeTargets.length);
+ };
+ return ResizeObserverController;
+ }());
+
+ var ResizeObserver = (function () {
+ function ResizeObserver(callback) {
+ if (arguments.length === 0) {
+ throw new TypeError("Failed to construct 'ResizeObserver': 1 argument required, but only 0 present.");
+ }
+ if (typeof callback !== 'function') {
+ throw new TypeError("Failed to construct 'ResizeObserver': The callback provided as parameter 1 is not a function.");
+ }
+ ResizeObserverController.connect(this, callback);
+ }
+
+ ResizeObserver.prototype.observe = function (target, options) {
+ if (arguments.length === 0) {
+ throw new TypeError("Failed to execute 'observe' on 'ResizeObserver': 1 argument required, but only 0 present.");
+ }
+ if (!isElement(target)) {
+ throw new TypeError("Failed to execute 'observe' on 'ResizeObserver': parameter 1 is not of type 'Element");
+ }
+ ResizeObserverController.observe(this, target, options);
+ };
+ ResizeObserver.prototype.unobserve = function (target) {
+ if (arguments.length === 0) {
+ throw new TypeError("Failed to execute 'unobserve' on 'ResizeObserver': 1 argument required, but only 0 present.");
+ }
+ if (!isElement(target)) {
+ throw new TypeError("Failed to execute 'unobserve' on 'ResizeObserver': parameter 1 is not of type 'Element");
+ }
+ ResizeObserverController.unobserve(this, target);
+ };
+ ResizeObserver.prototype.disconnect = function () {
+ ResizeObserverController.disconnect(this);
+ };
+ ResizeObserver.toString = function () {
+ return 'function ResizeObserver () { [polyfill code] }';
+ };
+ return ResizeObserver;
+ }());
+
+ exports.ResizeObserver = ResizeObserver;
+ exports.ResizeObserverEntry = ResizeObserverEntry;
+ exports.ResizeObserverSize = ResizeObserverSize;
+
+ Object.defineProperty(exports, '__esModule', { value: true });
+
+ return exports;
+
+})({});
+
+var ResizeObserver = window.ResizeObserver || ResizeObserverPolyfill.ResizeObserver;
+
+!(function () {
var addResizeListener = function (element, fn) {
- if (window.ResizeObserver) {
+ if (ResizeObserver) {
if (!element.__resizeObserver__) {
- var resizeObserver = new window.ResizeObserver(function () {
+ var resizeObserver = new ResizeObserver(function () {
element.__resizeListeners__.forEach(function (listener) {
listener();
});
@@ -126,47 +563,24 @@
element.__resizeListeners__ = [];
}
element.__resizeListeners__.push(fn);
- } else if (attachEvent) {
- element.attachEvent("onresize", fn);
- BI.nextTick(fn);
- } else {
- if (!element.__resizeTriggers__) {
- if (getComputedStyle(element).position === "static") element.style.position = "relative";
- createStyles();
- element.__resizeLast__ = {};
- element.__resizeListeners__ = [];
- (element.__resizeTriggers__ = document.createElement("div")).className = "resize-triggers";
- element.__resizeTriggers__.innerHTML = "" +
- "";
- element.appendChild(element.__resizeTriggers__);
- resetTriggers(element);
- element.addEventListener("scroll", scrollListener, true);
-
- /* Listen for a css animation to detect element display/re-attach */
- animationstartevent && element.__resizeTriggers__.addEventListener(animationstartevent, function (e) {
- if (e.animationName === animationName) {resetTriggers(element);}
- });
- }
- element.__resizeListeners__.push(fn);
}
};
var removeResizeListener = function (element, fn) {
- if (window.ResizeObserver) {
+ if (ResizeObserver) {
+ if (BI.isNull(fn)) {
+ element.__resizeListeners__ = [];
+ element.__resizeObserver__ && element.__resizeObserver__.unobserve(element);
+ element.__resizeObserver__ = null;
+ return;
+ }
var index = element.__resizeListeners__.indexOf(fn);
if (index >= 0) {
element.__resizeListeners__.splice(index, 1);
if (!element.__resizeListeners__.length) {
element.__resizeObserver__ && element.__resizeObserver__.unobserve(element);
+ element.__resizeObserver__ = null;
}
}
- } else if (attachEvent) {
- element.detachEvent("onresize", fn);
- } else {
- element.__resizeListeners__.splice(element.__resizeListeners__.indexOf(fn), 1);
- if (!element.__resizeListeners__.length) {
- element.removeEventListener("scroll", scrollListener);
- element.__resizeTriggers__ = !element.removeChild(element.__resizeTriggers__);
- }
}
};
@@ -176,8 +590,7 @@
return function () {
removeResizeListener(widget.element[0], fn);
};
- },
- removeResizeListener: function (widget, fn) {
+ }, removeResizeListener: function (widget, fn) {
removeResizeListener(widget.element[0], fn);
}
};
diff --git a/src/less/base/combo/combo.less b/src/less/base/combo/combo.less
index 206953d4b..b6e9d2e00 100644
--- a/src/less/base/combo/combo.less
+++ b/src/less/base/combo/combo.less
@@ -12,9 +12,6 @@
}
&.bi-combo-popup {
- display: block !important;
- visibility: visible !important;
-
& > .bi-trigger {
& .bi-trigger-icon-button {
& .x-icon {
diff --git a/src/less/core/utils/common.less b/src/less/core/utils/common.less
index 0a0b0e53b..d4b0d3bcd 100644
--- a/src/less/core/utils/common.less
+++ b/src/less/core/utils/common.less
@@ -570,7 +570,7 @@
// hover-visible的原子化形式
.bi-hover-visible-container {
- &:where(:not(&:hover)) .bi-hover-visible-item {
+ &:where(:not(&:hover)) .bi-hover-visible-item:not(.bi-combo-popup) {
display: none;
}
@@ -591,11 +591,11 @@
// }
//}
- & .bi-hover-visible-item {
+ & .bi-hover-visible-item:not(.bi-combo-popup) {
visibility: hidden;
}
- &:hover .bi-hover-visible-item {
+ &:hover .bi-hover-visible-item:not(.bi-combo-popup) {
visibility: visible;
}
}
diff --git a/src/less/core/wrapper/inline.less b/src/less/core/wrapper/inline.less
index f87f98c8a..804586e81 100644
--- a/src/less/core/wrapper/inline.less
+++ b/src/less/core/wrapper/inline.less
@@ -15,10 +15,4 @@
display: inline-block !important;
}
}
-
- & > .bi-combo {
- &.bi-combo-popup {
- display: inline-block !important;
- }
- }
}
diff --git a/src/less/core/wrapper/inline.old.less b/src/less/core/wrapper/inline.old.less
index 6d6b1b4a5..8c9ef9584 100644
--- a/src/less/core/wrapper/inline.old.less
+++ b/src/less/core/wrapper/inline.old.less
@@ -14,12 +14,6 @@
display: inline-block !important;
}
}
-
- & > .bi-combo {
- &.bi-combo-popup {
- display: inline-block !important;
- }
- }
}
.bi-inline-horizontal-adapt-layout {
@@ -38,12 +32,6 @@
display: inline-block !important;
}
}
-
- & > .bi-combo {
- &.bi-combo-popup {
- display: inline-block !important;
- }
- }
}
.bi-inline-vertical-adapt-layout {
@@ -62,10 +50,4 @@
display: inline-block !important;
}
}
-
- & > .bi-combo {
- &.bi-combo-popup {
- display: inline-block !important;
- }
- }
}
diff --git a/src/widget/multiselect/check/multiselect.display.js b/src/widget/multiselect/check/multiselect.display.js
index 337afd59f..b5b4f76e8 100644
--- a/src/widget/multiselect/check/multiselect.display.js
+++ b/src/widget/multiselect/check/multiselect.display.js
@@ -26,6 +26,7 @@ BI.DisplaySelectedList = BI.inherit(BI.Pane, {
var self = this, opts = this.options;
this.hasNext = false;
+ var cacheItems = [];
this.button_group = BI.createWidget({
type: "bi.list_pane",
@@ -45,10 +46,29 @@ BI.DisplaySelectedList = BI.inherit(BI.Pane, {
}]
},
itemsCreator: function (options, callback) {
+ if (options.times === 1) {
+ cacheItems = [];
+ }
+
+ if (cacheItems.length > 0) {
+ var renderedItems = cacheItems.slice(0, 100);
+ cacheItems = cacheItems.slice(100);
+ self.hasNext = true;
+ if (cacheItems.length === 0) {
+ self.hasNext = false;
+ }
+ callback(self._createItems(renderedItems));
+ return;
+ }
opts.itemsCreator(options, function (ob) {
self.hasNext = !!ob.hasNext;
- callback(self._createItems(ob.items));
+ var firstItemsCount = 100 + ob.items.length % 100;
+ if (ob.items.length > 100) {
+ cacheItems = ob.items.slice(100 + ob.items.length % 100);
+ self.hasNext = true;
+ }
+ callback(self._createItems(ob.items.slice(0, firstItemsCount)));
});
},
hasNext: function () {
diff --git a/src/widget/multiselect/loader.js b/src/widget/multiselect/loader.js
index 47f34a729..c2c2d8de7 100644
--- a/src/widget/multiselect/loader.js
+++ b/src/widget/multiselect/loader.js
@@ -167,7 +167,7 @@ BI.MultiSelectInnerLoader = BI.inherit(BI.Widget, {
}]);
return false;
}
- this.options.items = (items || []).slice(0, 100);
+ this.options.items = (items || []).slice(0, 100 + (items || []).length % 100);
this.times = 1;
this.count = 0;
this.count += items.length;
@@ -184,14 +184,15 @@ BI.MultiSelectInnerLoader = BI.inherit(BI.Widget, {
populate: function (items, keyword) {
if (this._populate.apply(this, arguments)) {
this.cachItems = [];
- if (items.length > 100) {
- this.cachItems = items.slice(100);
+ var firstItemsCount = 100 + items.length % 100;
+ if (items.length > firstItemsCount) {
+ this.cachItems = items.slice(firstItemsCount);
}
var renderEngine = BI.Widget._renderEngine;
BI.Widget.registerRenderEngine(BI.Element.renderEngine);
this.cachGroup.populate.call(this.cachGroup, items, keyword);
BI.Widget.registerRenderEngine(renderEngine);
- this.button_group.populate.call(this.button_group, items.slice(0, 100), keyword);
+ this.button_group.populate.call(this.button_group, items.slice(0, firstItemsCount), keyword);
}
},
diff --git a/src/widget/yearquarter/card.static.yearquarter.js b/src/widget/yearquarter/card.static.yearquarter.js
index 78cdb518c..cf54c6fcf 100644
--- a/src/widget/yearquarter/card.static.yearquarter.js
+++ b/src/widget/yearquarter/card.static.yearquarter.js
@@ -8,16 +8,16 @@ BI.StaticYearQuarterCard = BI.inherit(BI.Widget, {
_createQuarter: function () {
var self = this;
var items = [{
- text: BI.Date._QN[1],
+ text: BI.getQuarterName(1),
value: 1
}, {
- text: BI.Date._QN[2],
+ text: BI.getQuarterName(2),
value: 2
}, {
- text: BI.Date._QN[3],
+ text: BI.getQuarterName(3),
value: 3
}, {
- text: BI.Date._QN[4],
+ text: BI.getQuarterName(4),
value: 4
}];
return BI.map(items, function (j, item) {
diff --git a/typescript/core/platform/web/detectElementResize.ts b/typescript/core/platform/web/detectElementResize.ts
index c0ba6e28d..8e1566ce9 100644
--- a/typescript/core/platform/web/detectElementResize.ts
+++ b/typescript/core/platform/web/detectElementResize.ts
@@ -2,5 +2,5 @@ import { Widget } from "../../../core/widget";
export type _DetectElementResize = {
addResizeListener: (widget: Widget, fn: Function) => Function
- removeResizeListener: (widget: Widget, fn: Function) => void
-}
\ No newline at end of file
+ removeResizeListener: (widget: Widget, fn?: Function) => void
+}