caoww
/
fineui
forked from fanruan/fineui
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

KERNEL-13972 refactor: base/collection、base/tree es6化和修改bi.xxx

es6
Joker.Wang-王顺 2 years ago
parent
d911498fb7
commit
50db461708
21 changed files with 1704 additions and 1722 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 339
      src/base/collection/collection.js
  2. 88
      src/base/grid/grid.js
  3. 12
      src/base/index.js
  4. 19
      src/base/layer/layer.drawer.js
  5. 38
      src/base/layer/layer.popover.js
  6. 61
      src/base/layer/layer.popup.js
  7. 41
      src/base/layer/layer.searcher.js
  8. 26
      src/base/list/listview.js
  9. 35
      src/base/list/virtualgrouplist.js
  10. 45
      src/base/list/virtuallist.js
  11. 73
      src/base/pager/pager.js
  12. 10
      src/base/single/a/a.js
  13. 2
      src/base/single/index.js
  14. 6
      src/base/single/tip/0.tip.js
  15. 25
      src/base/single/tip/tip.toast.js
  16. 25
      src/base/single/tip/tip.tooltip.js
  17. 137
      src/base/tree/customtree.js

339
src/base/collection/collection.js
Unescape View File

@ -5,9 +5,12 @@
* @class BI.CollectionView * @class BI.CollectionView
* @extends BI.Widget * @extends BI.Widget
*/ */
BI.CollectionView = BI.inherit(BI.Widget, { import { Widget, shortcut, extend, emptyFn, debounce, _lazyCreateWidget, isFunction, SectionManager,
_defaultConfig: function () { isNull, each, clamp, toArray, invert, min, max, nextTick } from "../../core";
return BI.extend(BI.CollectionView.superclass._defaultConfig.apply(this, arguments), { @shortcut()
export class CollectionView extends Widget {
_defaultConfig() {
return extend(super._defaultConfig(...arguments), {
baseCls: "bi-collection", baseCls: "bi-collection",
// width: 400, //必设 // width: 400, //必设
// height: 300, //必设 // height: 300, //必设
@ -17,97 +20,100 @@ BI.CollectionView = BI.inherit(BI.Widget, {
overflowX: true, overflowX: true,
overflowY: true, overflowY: true,
el: { el: {
type: "bi.vertical" type: "bi.vertical",
}, },
cellSizeAndPositionGetter: BI.emptyFn, cellSizeAndPositionGetter: emptyFn,
horizontalOverscanSize: 0, horizontalOverscanSize: 0,
verticalOverscanSize: 0, verticalOverscanSize: 0,
scrollLeft: 0, scrollLeft: 0,
scrollTop: 0, scrollTop: 0,
items: [], items: [],
itemFormatter: function (item, index) { itemFormatter: (item, index) => item,
return item;
},
}); });
}, }
render: function () { static EVENT_SCROLL = "EVENT_SCROLL";
var self = this, o = this.options; static xtype = "bi.collection_view";
render() {
const o = this.options;
const { overflowX, overflowY, el } = this.options;
this.renderedCells = []; this.renderedCells = [];
this.renderedKeys = []; this.renderedKeys = [];
this.renderRange = {}; this.renderRange = {};
this._scrollLock = false; this._scrollLock = false;
this._debounceRelease = BI.debounce(function () { this._debounceRelease = debounce(() => {
self._scrollLock = false; this._scrollLock = false;
}, 1000 / 60); }, 1000 / 60);
this.container = BI._lazyCreateWidget({ this.container = _lazyCreateWidget({
type: "bi.absolute", type: "bi.absolute",
}); });
this.element.scroll(function () { this.element.scroll(() => {
if (self._scrollLock === true) { if (this._scrollLock === true) {
return; return;
} }
o.scrollLeft = self.element.scrollLeft(); o.scrollLeft = this.element.scrollLeft();
o.scrollTop = self.element.scrollTop(); o.scrollTop = this.element.scrollTop();
self._calculateChildrenToRender(); this._calculateChildrenToRender();
self.fireEvent(BI.CollectionView.EVENT_SCROLL, { this.fireEvent(CollectionView.EVENT_SCROLL, {
scrollLeft: o.scrollLeft, scrollLeft: o.scrollLeft,
scrollTop: o.scrollTop, scrollTop: o.scrollTop,
}); });
}); });
// 兼容一下 // 兼容一下
var scrollable = o.scrollable, scrollx = o.scrollx, scrolly = o.scrolly; let scrollable = o.scrollable;
if (o.overflowX === false) { const scrollx = o.scrollx, scrolly = o.scrolly;
if (o.overflowY === false) { if (overflowX === false) {
if (overflowY === false) {
scrollable = false; scrollable = false;
} else { } else {
scrollable = "y"; scrollable = "y";
} }
} else { } else {
if (o.overflowY === false) { if (overflowY === false) {
scrollable = "x"; scrollable = "x";
} }
} }
BI._lazyCreateWidget(o.el, { _lazyCreateWidget(el, {
type: "bi.vertical", type: "bi.vertical",
element: this, element: this,
scrollable: scrollable, scrollable,
scrolly: scrolly, scrolly,
scrollx: scrollx, scrollx,
items: [this.container], items: [this.container],
}); });
o.items = BI.isFunction(o.items) ? this.__watch(o.items, function (context, newValue) { o.items = isFunction(o.items) ? this.__watch(o.items, (context, newValue) => {
self.populate(newValue); this.populate(newValue);
}) : o.items; }) : o.items;
if (o.items.length > 0) { if (o.items.length > 0) {
this._calculateSizeAndPositionData(); this._calculateSizeAndPositionData();
this._populate(); this._populate();
} }
}, }
// mounted之后绑定事件 // mounted之后绑定事件
mounted: function () { mounted() {
var o = this.options; const { scrollLeft, scrollTop } = this.options;
if (o.scrollLeft !== 0 || o.scrollTop !== 0) { if (scrollLeft !== 0 || scrollTop !== 0) {
this.element.scrollTop(o.scrollTop); this.element.scrollTop(scrollTop);
this.element.scrollLeft(o.scrollLeft); this.element.scrollLeft(scrollLeft);
}
} }
},
_calculateSizeAndPositionData: function () { _calculateSizeAndPositionData() {
var o = this.options; const { items, cellSizeAndPositionGetter } = this.options;
var cellMetadata = []; const cellMetadata = [];
var sectionManager = new BI.SectionManager(); const sectionManager = new SectionManager();
var height = 0; let height = 0;
var width = 0; let width = 0;
for (var index = 0, len = o.items.length; index < len; index++) { for (let index = 0, len = items.length; index < len; index++) {
var cellMetadatum = o.cellSizeAndPositionGetter(index); const cellMetadatum = cellSizeAndPositionGetter(index);
if (BI.isNull(cellMetadatum.height) || isNaN(cellMetadatum.height) || if (isNull(cellMetadatum.height) || isNaN(cellMetadatum.height) ||
BI.isNull(cellMetadatum.width) || isNaN(cellMetadatum.width) || isNull(cellMetadatum.width) || isNaN(cellMetadatum.width) ||
BI.isNull(cellMetadatum.x) || isNaN(cellMetadatum.x) || isNull(cellMetadatum.x) || isNaN(cellMetadatum.x) ||
BI.isNull(cellMetadatum.y) || isNaN(cellMetadatum.y)) { isNull(cellMetadatum.y) || isNaN(cellMetadatum.y)) {
throw Error(); throw Error();
} }
@ -123,110 +129,110 @@ BI.CollectionView = BI.inherit(BI.Widget, {
this._sectionManager = sectionManager; this._sectionManager = sectionManager;
this._height = height; this._height = height;
this._width = width; this._width = width;
}, }
_cellRenderers: function (height, width, x, y) { _cellRenderers(height, width, x, y) {
this._lastRenderedCellIndices = this._sectionManager.getCellIndices(height, width, x, y); this._lastRenderedCellIndices = this._sectionManager.getCellIndices(height, width, x, y);
return this._cellGroupRenderer(); return this._cellGroupRenderer();
}, }
_cellGroupRenderer: function () { _cellGroupRenderer() {
var self = this; const rendered = [];
var rendered = []; each(this._lastRenderedCellIndices, (i, index) => {
BI.each(this._lastRenderedCellIndices, function (i, index) { const cellMetadata = this._sectionManager.getCellMetadata(index);
var cellMetadata = self._sectionManager.getCellMetadata(index);
rendered.push(cellMetadata); rendered.push(cellMetadata);
}); });
return rendered; return rendered;
}, }
_calculateChildrenToRender: function () { _calculateChildrenToRender() {
var self = this, o = this.options; const o = this.options;
var scrollLeft = BI.clamp(o.scrollLeft, 0, this._getMaxScrollLeft()); const { horizontalOverscanSize, verticalOverscanSize, width, height, itemFormatter, items } = this.options;
var scrollTop = BI.clamp(o.scrollTop, 0, this._getMaxScrollTop()); const scrollLeft = clamp(o.scrollLeft, 0, this._getMaxScrollLeft());
var left = Math.max(0, scrollLeft - o.horizontalOverscanSize); const scrollTop = clamp(o.scrollTop, 0, this._getMaxScrollTop());
var top = Math.max(0, scrollTop - o.verticalOverscanSize); const left = Math.max(0, scrollLeft - horizontalOverscanSize);
var right = Math.min(this._width, scrollLeft + o.width + o.horizontalOverscanSize); const top = Math.max(0, scrollTop - verticalOverscanSize);
var bottom = Math.min(this._height, scrollTop + o.height + o.verticalOverscanSize); const right = Math.min(this._width, scrollLeft + width + horizontalOverscanSize);
const bottom = Math.min(this._height, scrollTop + height + verticalOverscanSize);
if (right > 0 && bottom > 0) { if (right > 0 && bottom > 0) {
// 如果滚动的区间并没有超出渲染的范围 // 如果滚动的区间并没有超出渲染的范围
if (top >= this.renderRange.minY && bottom <= this.renderRange.maxY && left >= this.renderRange.minX && right <= this.renderRange.maxX) { if (top >= this.renderRange.minY && bottom <= this.renderRange.maxY && left >= this.renderRange.minX && right <= this.renderRange.maxX) {
return; return;
} }
var childrenToDisplay = this._cellRenderers(bottom - top, right - left, left, top); const childrenToDisplay = this._cellRenderers(bottom - top, right - left, left, top);
var renderedCells = [], renderedKeys = {}, renderedWidgets = {}; const renderedCells = [], renderedKeys = {}, renderedWidgets = {};
// 存储所有的left和top // 存储所有的left和top
var lefts = {}, tops = {}; let lefts = {}, tops = {};
for (var i = 0, len = childrenToDisplay.length; i < len; i++) { for (let i = 0, len = childrenToDisplay.length; i < len; i++) {
var datum = childrenToDisplay[i]; const datum = childrenToDisplay[i];
lefts[datum.x] = datum.x; lefts[datum.x] = datum.x;
lefts[datum.x + datum.width] = datum.x + datum.width; lefts[datum.x + datum.width] = datum.x + datum.width;
tops[datum.y] = datum.y; tops[datum.y] = datum.y;
tops[datum.y + datum.height] = datum.y + datum.height; tops[datum.y + datum.height] = datum.y + datum.height;
} }
lefts = BI.toArray(lefts); lefts = toArray(lefts);
tops = BI.toArray(tops); tops = toArray(tops);
var leftMap = BI.invert(lefts); const leftMap = invert(lefts);
var topMap = BI.invert(tops); const topMap = invert(tops);
// 存储上下左右四个边界 // 存储上下左右四个边界
var leftBorder = {}, rightBorder = {}, topBorder = {}, bottomBorder = {}; const leftBorder = {}, rightBorder = {}, topBorder = {}, bottomBorder = {};
function assertMinBorder(border, offset) { function assertMinBorder(border, offset) {
if (BI.isNull(border[offset])) { if (isNull(border[offset])) {
border[offset] = Number.MAX_VALUE; border[offset] = Number.MAX_VALUE;
} }
} }
function assertMaxBorder(border, offset) { function assertMaxBorder(border, offset) {
if (BI.isNull(border[offset])) { if (isNull(border[offset])) {
border[offset] = 0; border[offset] = 0;
} }
} }
for (var i = 0, len = childrenToDisplay.length; i < len; i++) { for (let i = 0, len = childrenToDisplay.length; i < len; i++) {
var datum = childrenToDisplay[i]; const datum = childrenToDisplay[i];
var index = this.renderedKeys[datum.index] && this.renderedKeys[datum.index][1]; const index = this.renderedKeys[datum.index] && this.renderedKeys[datum.index][1];
var child; let child;
if (index >= 0) { if (index >= 0) {
this.renderedCells[index].el.setWidth(datum.width); this.renderedCells[index].el.setWidth(datum.width);
this.renderedCells[index].el.setHeight(datum.height); this.renderedCells[index].el.setHeight(datum.height);
// 这里只使用px // 这里只使用px
this.renderedCells[index].el.element.css("left", datum.x + "px"); this.renderedCells[index].el.element.css("left", `${datum.x}px`);
this.renderedCells[index].el.element.css("top", datum.y + "px"); this.renderedCells[index].el.element.css("top", `${datum.y}px`);
renderedCells.push(child = this.renderedCells[index]); renderedCells.push(child = this.renderedCells[index]);
} else { } else {
var item = o.itemFormatter(o.items[datum.index], datum.index); const item = itemFormatter(items[datum.index], datum.index);
child = BI._lazyCreateWidget(BI.extend({ child = _lazyCreateWidget(extend({
type: "bi.label", type: "bi.label",
width: datum.width, width: datum.width,
height: datum.height, height: datum.height,
}, item, { }, item, {
cls: (item.cls || "") + " collection-cell" + (datum.y === 0 ? " first-row" : "") + (datum.x === 0 ? " first-col" : ""), cls: `${item.cls || ""} collection-cell${datum.y === 0 ? " first-row" : ""}${datum.x === 0 ? " first-col" : ""}`,
_left: datum.x, _left: datum.x,
_top: datum.y, _top: datum.y,
})); }));
renderedCells.push({ renderedCells.push({
el: child, el: child,
left: datum.x + "px", left: `${datum.x}px`,
top: datum.y + "px", top: `${datum.y}px`,
_left: datum.x, _left: datum.x,
_top: datum.y, _top: datum.y,
// _width: datum.width, // _width: datum.width,
// _height: datum.height // _height: datum.height
}); });
} }
var startTopIndex = topMap[datum.y] | 0; const startTopIndex = topMap[datum.y] | 0;
var endTopIndex = topMap[datum.y + datum.height] | 0; const endTopIndex = topMap[datum.y + datum.height] | 0;
for (var k = startTopIndex; k <= endTopIndex; k++) { for (let k = startTopIndex; k <= endTopIndex; k++) {
var t = tops[k]; const t = tops[k];
assertMinBorder(leftBorder, t); assertMinBorder(leftBorder, t);
assertMaxBorder(rightBorder, t); assertMaxBorder(rightBorder, t);
leftBorder[t] = Math.min(leftBorder[t], datum.x); leftBorder[t] = Math.min(leftBorder[t], datum.x);
rightBorder[t] = Math.max(rightBorder[t], datum.x + datum.width); rightBorder[t] = Math.max(rightBorder[t], datum.x + datum.width);
} }
var startLeftIndex = leftMap[datum.x] | 0; const startLeftIndex = leftMap[datum.x] | 0;
var endLeftIndex = leftMap[datum.x + datum.width] | 0; const endLeftIndex = leftMap[datum.x + datum.width] | 0;
for (var k = startLeftIndex; k <= endLeftIndex; k++) { for (let k = startLeftIndex; k <= endLeftIndex; k++) {
var l = lefts[k]; const l = lefts[k];
assertMinBorder(topBorder, l); assertMinBorder(topBorder, l);
assertMaxBorder(bottomBorder, l); assertMaxBorder(bottomBorder, l);
topBorder[l] = Math.min(topBorder[l], datum.y); topBorder[l] = Math.min(topBorder[l], datum.y);
@ -237,15 +243,15 @@ BI.CollectionView = BI.inherit(BI.Widget, {
renderedWidgets[i] = child; renderedWidgets[i] = child;
} }
// 已存在的， 需要添加的和需要删除的 // 已存在的， 需要添加的和需要删除的
var existSet = {}, addSet = {}, deleteArray = []; const existSet = {}, addSet = {}, deleteArray = [];
BI.each(renderedKeys, function (i, key) { each(renderedKeys, (i, key) => {
if (self.renderedKeys[i]) { if (this.renderedKeys[i]) {
existSet[i] = key; existSet[i] = key;
} else { } else {
addSet[i] = key; addSet[i] = key;
} }
}); });
BI.each(this.renderedKeys, function (i, key) { each(this.renderedKeys, (i, key) => {
if (existSet[i]) { if (existSet[i]) {
return; return;
} }
@ -254,12 +260,12 @@ BI.CollectionView = BI.inherit(BI.Widget, {
} }
deleteArray.push(key[1]); deleteArray.push(key[1]);
}); });
BI.each(deleteArray, function (i, index) { each(deleteArray, (i, index) => {
// 性能优化，不调用destroy方法防止触发destroy事件 // 性能优化，不调用destroy方法防止触发destroy事件
self.renderedCells[index].el._destroy(); this.renderedCells[index].el._destroy();
}); });
var addedItems = []; const addedItems = [];
BI.each(addSet, function (index, key) { each(addSet, (index, key) => {
addedItems.push(renderedCells[key[1]]); addedItems.push(renderedCells[key[1]]);
}); });
this.container.addItems(addedItems); this.container.addItems(addedItems);
@ -270,21 +276,22 @@ BI.CollectionView = BI.inherit(BI.Widget, {
this.renderedKeys = renderedKeys; this.renderedKeys = renderedKeys;
// Todo 左右比较特殊 // Todo 左右比较特殊
var minX = BI.min(leftBorder); const minX = min(leftBorder);
var maxX = BI.max(rightBorder); const maxX = max(rightBorder);
var minY = BI.max(topBorder); const minY = max(topBorder);
var maxY = BI.min(bottomBorder); const maxY = min(bottomBorder);
this.renderRange = { minX: minX, minY: minY, maxX: maxX, maxY: maxY }; this.renderRange = { minX, minY, maxX, maxY };
}
} }
},
_isOverflowX: function () { _isOverflowX() {
var o = this.options; const o = this.options;
const { overflowX } = this.options;
// 兼容一下 // 兼容一下
var scrollable = o.scrollable, scrollx = o.scrollx; const scrollable = o.scrollable, scrollx = o.scrollx;
if (o.overflowX === false) { if (overflowX === false) {
return false; return false;
} }
if (scrollx) { if (scrollx) {
@ -293,14 +300,16 @@ BI.CollectionView = BI.inherit(BI.Widget, {
if (scrollable === true || scrollable === "xy" || scrollable === "x") { if (scrollable === true || scrollable === "xy" || scrollable === "x") {
return true; return true;
} }
return false; return false;
}, }
_isOverflowY: function () { _isOverflowY() {
var o = this.options; const o = this.options;
const { overflowX } = this.options;
// 兼容一下 // 兼容一下
var scrollable = o.scrollable, scrolly = o.scrolly; const scrollable = o.scrollable, scrolly = o.scrolly;
if (o.overflowX === false) { if (overflowX === false) {
return false; return false;
} }
if (scrolly) { if (scrolly) {
@ -309,19 +318,20 @@ BI.CollectionView = BI.inherit(BI.Widget, {
if (scrollable === true || scrollable === "xy" || scrollable === "y") { if (scrollable === true || scrollable === "xy" || scrollable === "y") {
return true; return true;
} }
return false; return false;
}, }
_getMaxScrollLeft: function () { _getMaxScrollLeft() {
return Math.max(0, this._width - this.options.width + (this._isOverflowX() ? BI.DOM.getScrollWidth() : 0)); return Math.max(0, this._width - this.options.width + (this._isOverflowX() ? BI.DOM.getScrollWidth() : 0));
}, }
_getMaxScrollTop: function () { _getMaxScrollTop() {
return Math.max(0, this._height - this.options.height + (this._isOverflowY() ? BI.DOM.getScrollWidth() : 0)); return Math.max(0, this._height - this.options.height + (this._isOverflowY() ? BI.DOM.getScrollWidth() : 0));
}, }
_populate: function (items) { _populate(items) {
var o = this.options; const { scrollTop, scrollLeft } = this.options;
this._reRange(); this._reRange();
if (items && items !== this.options.items) { if (items && items !== this.options.items) {
this.options.items = items; this.options.items = items;
@ -333,83 +343,80 @@ BI.CollectionView = BI.inherit(BI.Widget, {
this._debounceRelease(); this._debounceRelease();
// 元素未挂载时不能设置scrollTop // 元素未挂载时不能设置scrollTop
try { try {
this.element.scrollTop(o.scrollTop); this.element.scrollTop(scrollTop);
this.element.scrollLeft(o.scrollLeft); this.element.scrollLeft(scrollLeft);
} catch (e) { } catch (e) {
} }
this._calculateChildrenToRender(); this._calculateChildrenToRender();
}, }
setScrollLeft(scrollLeft) {
setScrollLeft: function (scrollLeft) {
if (this.options.scrollLeft === scrollLeft) { if (this.options.scrollLeft === scrollLeft) {
return; return;
} }
this._scrollLock = true; this._scrollLock = true;
this.options.scrollLeft = BI.clamp(scrollLeft || 0, 0, this._getMaxScrollLeft()); this.options.scrollLeft = clamp(scrollLeft || 0, 0, this._getMaxScrollLeft());
this._debounceRelease(); this._debounceRelease();
this.element.scrollLeft(this.options.scrollLeft); this.element.scrollLeft(this.options.scrollLeft);
this._calculateChildrenToRender(); this._calculateChildrenToRender();
}, }
setScrollTop: function (scrollTop) { setScrollTop(scrollTop) {
if (this.options.scrollTop === scrollTop) { if (this.options.scrollTop === scrollTop) {
return; return;
} }
this._scrollLock = true; this._scrollLock = true;
this.options.scrollTop = BI.clamp(scrollTop || 0, 0, this._getMaxScrollTop()); this.options.scrollTop = clamp(scrollTop || 0, 0, this._getMaxScrollTop());
this._debounceRelease(); this._debounceRelease();
this.element.scrollTop(this.options.scrollTop); this.element.scrollTop(this.options.scrollTop);
this._calculateChildrenToRender(); this._calculateChildrenToRender();
}, }
setOverflowX: function (b) { setOverflowX(b) {
var self = this;
if (this.options.overflowX !== !!b) { if (this.options.overflowX !== !!b) {
this.options.overflowX = !!b; this.options.overflowX = !!b;
BI.nextTick(function () { nextTick(() => {
self.element.css({ overflowX: b ? "auto" : "hidden" }); this.element.css({ overflowX: b ? "auto" : "hidden" });
}); });
} }
}, }
setOverflowY: function (b) { setOverflowY(b) {
var self = this;
if (this.options.overflowY !== !!b) { if (this.options.overflowY !== !!b) {
this.options.overflowY = !!b; this.options.overflowY = !!b;
BI.nextTick(function () { nextTick(() => {
self.element.css({ overflowY: b ? "auto" : "hidden" }); this.element.css({ overflowY: b ? "auto" : "hidden" });
}); });
} }
}, }
getScrollLeft: function () { getScrollLeft() {
return this.options.scrollLeft; return this.options.scrollLeft;
}, }
getScrollTop: function () { getScrollTop() {
return this.options.scrollTop; return this.options.scrollTop;
}, }
getMaxScrollLeft: function () { getMaxScrollLeft() {
return this._getMaxScrollLeft(); return this._getMaxScrollLeft();
}, }
getMaxScrollTop: function () { getMaxScrollTop() {
return this._getMaxScrollTop(); return this._getMaxScrollTop();
}, }
// 重新计算children // 重新计算children
_reRange: function () { _reRange() {
this.renderRange = {}; this.renderRange = {};
}, }
_clearChildren: function () { _clearChildren() {
this.container._children = {}; this.container._children = {};
this.container.attr("items", []); this.container.attr("items", []);
}, }
restore: function () { restore() {
BI.each(this.renderedCells, function (i, cell) { each(this.renderedCells, (i, cell) => {
cell.el._destroy(); cell.el._destroy();
}); });
this._clearChildren(); this._clearChildren();
@ -417,14 +424,12 @@ BI.CollectionView = BI.inherit(BI.Widget, {
this.renderedKeys = []; this.renderedKeys = [];
this.renderRange = {}; this.renderRange = {};
this._scrollLock = false; this._scrollLock = false;
}, }
populate: function (items) { populate(items) {
if (items && items !== this.options.items) { if (items && items !== this.options.items) {
this.restore(); this.restore();
} }
this._populate(items); this._populate(items);
}, }
}); }
BI.CollectionView.EVENT_SCROLL = "EVENT_SCROLL";
BI.shortcut("bi.collection_view", BI.CollectionView);

88
src/base/grid/grid.js
Unescape View File

@ -5,11 +5,12 @@
* @class BI.GridView * @class BI.GridView
* @extends BI.Widget * @extends BI.Widget
*/ */
import { Widget, shortcut } from "../../core"; import { Widget, shortcut, extend, emptyFn, debounce, _lazyCreateWidget,
isFunction, each, isNumber, ScalingCellSizeAndPositionManager, clamp, isEmpty, nextTick } from "../../core";
@shortcut() @shortcut()
export default class GridView extends Widget { export class GridView extends Widget {
_defaultConfig() { _defaultConfig() {
return BI.extend(super._defaultConfig(arguments), { return extend(super._defaultConfig(...arguments), {
baseCls: "bi-grid-view", baseCls: "bi-grid-view",
// width: 400, //必设 // width: 400, //必设
// height: 300, //必设 // height: 300, //必设
@ -19,20 +20,18 @@ export default class GridView extends Widget {
overflowX: true, overflowX: true,
overflowY: true, overflowY: true,
el: { el: {
type: "bi.vertical" type: "bi.vertical",
}, },
overscanColumnCount: 0, overscanColumnCount: 0,
overscanRowCount: 0, overscanRowCount: 0,
rowHeightGetter: BI.emptyFn, // number类型或function类型 rowHeightGetter: emptyFn, // number类型或function类型
columnWidthGetter: BI.emptyFn, // number类型或function类型 columnWidthGetter: emptyFn, // number类型或function类型
// estimatedColumnSize: 100, //columnWidthGetter为function时必设 // estimatedColumnSize: 100, //columnWidthGetter为function时必设
// estimatedRowSize: 30, //rowHeightGetter为function时必设 // estimatedRowSize: 30, //rowHeightGetter为function时必设
scrollLeft: 0, scrollLeft: 0,
scrollTop: 0, scrollTop: 0,
items: [], items: [],
itemFormatter: (item, row, col) => { itemFormatter: (item, row, col) => item,
return item;
},
}); });
} }
@ -46,10 +45,10 @@ export default class GridView extends Widget {
this.renderedKeys = []; this.renderedKeys = [];
this.renderRange = {}; this.renderRange = {};
this._scrollLock = false; this._scrollLock = false;
this._debounceRelease = BI.debounce(() => { this._debounceRelease = debounce(() => {
this._scrollLock = false; this._scrollLock = false;
}, 1000 / 60); }, 1000 / 60);
this.container = BI._lazyCreateWidget({ this.container = _lazyCreateWidget({
type: "bi.absolute", type: "bi.absolute",
}); });
this.element.scroll(() => { this.element.scroll(() => {
@ -65,7 +64,8 @@ export default class GridView extends Widget {
}); });
}); });
// 兼容一下 // 兼容一下
let scrollable = o.scrollable, scrollx = o.scrollx, scrolly = o.scrolly; let scrollable = o.scrollable;
const scrollx = o.scrollx, scrolly = o.scrolly;
if (overflowX === false) { if (overflowX === false) {
if (overflowY === false) { if (overflowY === false) {
scrollable = false; scrollable = false;
@ -77,15 +77,15 @@ export default class GridView extends Widget {
scrollable = "x"; scrollable = "x";
} }
} }
BI._lazyCreateWidget(el, { _lazyCreateWidget(el, {
type: "bi.vertical", type: "bi.vertical",
element: this, element: this,
scrollable: scrollable, scrollable,
scrolly: scrolly, scrolly,
scrollx: scrollx, scrollx,
items: [this.container], items: [this.container],
}); });
o.items = BI.isFunction(o.items) ? this.__watch(o.items, (context, newValue) => { o.items = isFunction(o.items) ? this.__watch(o.items, (context, newValue) => {
this.populate(newValue); this.populate(newValue);
}) : o.items; }) : o.items;
if (o.items.length > 0) { if (o.items.length > 0) {
@ -104,27 +104,27 @@ export default class GridView extends Widget {
} }
destroyed() { destroyed() {
BI.each(this.renderedCells, (i, cell) => { each(this.renderedCells, (i, cell) => {
cell.el._destroy(); cell.el._destroy();
}) });
} }
_calculateSizeAndPositionData() { _calculateSizeAndPositionData() {
const { columnCount, items, rowCount, columnWidthGetter, estimatedColumnSize, rowHeightGetter, estimatedRowSize } = this.options; const { columnCount, items, rowCount, columnWidthGetter, estimatedColumnSize, rowHeightGetter, estimatedRowSize } = this.options;
this.rowCount = 0; this.rowCount = 0;
this.columnCount = 0; this.columnCount = 0;
if (BI.isNumber(columnCount)) { if (isNumber(columnCount)) {
this.columnCount = columnCount; this.columnCount = columnCount;
} else if (items.length > 0) { } else if (items.length > 0) {
this.columnCount = items[0].length; this.columnCount = items[0].length;
} }
if (BI.isNumber(rowCount)) { if (isNumber(rowCount)) {
this.rowCount = rowCount; this.rowCount = rowCount;
} else { } else {
this.rowCount = items.length; this.rowCount = items.length;
} }
this._columnSizeAndPositionManager = new BI.ScalingCellSizeAndPositionManager(this.columnCount, columnWidthGetter, estimatedColumnSize); this._columnSizeAndPositionManager = new ScalingCellSizeAndPositionManager(this.columnCount, columnWidthGetter, estimatedColumnSize);
this._rowSizeAndPositionManager = new BI.ScalingCellSizeAndPositionManager(this.rowCount, rowHeightGetter, estimatedRowSize); this._rowSizeAndPositionManager = new ScalingCellSizeAndPositionManager(this.rowCount, rowHeightGetter, estimatedRowSize);
} }
_getOverscanIndices(cellCount, overscanCellsCount, startIndex, stopIndex) { _getOverscanIndices(cellCount, overscanCellsCount, startIndex, stopIndex) {
@ -139,8 +139,8 @@ export default class GridView extends Widget {
const { itemFormatter, items } = this.options; const { itemFormatter, items } = this.options;
const width = o.width, height = o.height, scrollLeft = BI.clamp(o.scrollLeft, 0, this._getMaxScrollLeft()), const width = o.width, height = o.height, scrollLeft = clamp(o.scrollLeft, 0, this._getMaxScrollLeft()),
scrollTop = BI.clamp(o.scrollTop, 0, this._getMaxScrollTop()), scrollTop = clamp(o.scrollTop, 0, this._getMaxScrollTop()),
overscanColumnCount = o.overscanColumnCount, overscanRowCount = o.overscanRowCount; overscanColumnCount = o.overscanColumnCount, overscanRowCount = o.overscanRowCount;
if (height > 0 && width > 0) { if (height > 0 && width > 0) {
@ -150,7 +150,7 @@ export default class GridView extends Widget {
const renderedCells = [], renderedKeys = {}, renderedWidgets = {}; const renderedCells = [], renderedKeys = {}, renderedWidgets = {};
let minX = this._getMaxScrollLeft(), minY = this._getMaxScrollTop(), maxX = 0, maxY = 0; let minX = this._getMaxScrollLeft(), minY = this._getMaxScrollTop(), maxX = 0, maxY = 0;
// 没有可见的单元格就干掉所有渲染过的 // 没有可见的单元格就干掉所有渲染过的
if (!BI.isEmpty(visibleColumnIndices) && !BI.isEmpty(visibleRowIndices)) { if (!isEmpty(visibleColumnIndices) && !isEmpty(visibleRowIndices)) {
const horizontalOffsetAdjustment = this._columnSizeAndPositionManager.getOffsetAdjustment(width, scrollLeft); const horizontalOffsetAdjustment = this._columnSizeAndPositionManager.getOffsetAdjustment(width, scrollLeft);
const verticalOffsetAdjustment = this._rowSizeAndPositionManager.getOffsetAdjustment(height, scrollTop); const verticalOffsetAdjustment = this._rowSizeAndPositionManager.getOffsetAdjustment(height, scrollTop);
@ -187,7 +187,7 @@ export default class GridView extends Widget {
const rowDatum = this._rowSizeAndPositionManager.getSizeAndPositionOfCell(rowIndex); const rowDatum = this._rowSizeAndPositionManager.getSizeAndPositionOfCell(rowIndex);
for (let columnIndex = columnStartIndex; columnIndex <= columnStopIndex; columnIndex++) { for (let columnIndex = columnStartIndex; columnIndex <= columnStopIndex; columnIndex++) {
const key = rowIndex + "-" + columnIndex; const key = `${rowIndex}-${columnIndex}`;
const columnDatum = this._columnSizeAndPositionManager.getSizeAndPositionOfCell(columnIndex); const columnDatum = this._columnSizeAndPositionManager.getSizeAndPositionOfCell(columnIndex);
const index = this.renderedKeys[key] && this.renderedKeys[key][2]; const index = this.renderedKeys[key] && this.renderedKeys[key][2];
@ -196,18 +196,18 @@ export default class GridView extends Widget {
this.renderedCells[index].el.setWidth(columnDatum.size); this.renderedCells[index].el.setWidth(columnDatum.size);
this.renderedCells[index].el.setHeight(rowDatum.size); this.renderedCells[index].el.setHeight(rowDatum.size);
// 这里只使用px // 这里只使用px
this.renderedCells[index].el.element.css("left", columnDatum.offset + horizontalOffsetAdjustment + "px"); this.renderedCells[index].el.element.css("left", `${columnDatum.offset + horizontalOffsetAdjustment}px`);
this.renderedCells[index].el.element.css("top", rowDatum.offset + verticalOffsetAdjustment + "px"); this.renderedCells[index].el.element.css("top", `${rowDatum.offset + verticalOffsetAdjustment}px`);
child = this.renderedCells[index].el; child = this.renderedCells[index].el;
renderedCells.push(this.renderedCells[index]); renderedCells.push(this.renderedCells[index]);
} else { } else {
const item = itemFormatter(items[rowIndex][columnIndex], rowIndex, columnIndex); const item = itemFormatter(items[rowIndex][columnIndex], rowIndex, columnIndex);
child = BI._lazyCreateWidget(BI.extend({ child = _lazyCreateWidget(extend({
type: "bi.label", type: "bi.label",
width: columnDatum.size, width: columnDatum.size,
height: rowDatum.size, height: rowDatum.size,
}, item, { }, item, {
cls: (item.cls || "") + " grid-cell" + (rowIndex === 0 ? " first-row" : "") + (columnIndex === 0 ? " first-col" : ""), cls: `${item.cls || ""} grid-cell${rowIndex === 0 ? " first-row" : ""}${columnIndex === 0 ? " first-col" : ""}`,
_rowIndex: rowIndex, _rowIndex: rowIndex,
_columnIndex: columnIndex, _columnIndex: columnIndex,
_left: columnDatum.offset + horizontalOffsetAdjustment, _left: columnDatum.offset + horizontalOffsetAdjustment,
@ -215,8 +215,8 @@ export default class GridView extends Widget {
}), this); }), this);
renderedCells.push({ renderedCells.push({
el: child, el: child,
left: columnDatum.offset + horizontalOffsetAdjustment + "px", left: `${columnDatum.offset + horizontalOffsetAdjustment}px`,
top: rowDatum.offset + verticalOffsetAdjustment + "px", top: `${rowDatum.offset + verticalOffsetAdjustment}px`,
_left: columnDatum.offset + horizontalOffsetAdjustment, _left: columnDatum.offset + horizontalOffsetAdjustment,
_top: rowDatum.offset + verticalOffsetAdjustment, _top: rowDatum.offset + verticalOffsetAdjustment,
// _width: columnDatum.size, // _width: columnDatum.size,
@ -235,14 +235,14 @@ export default class GridView extends Widget {
} }
// 已存在的， 需要添加的和需要删除的 // 已存在的， 需要添加的和需要删除的
const existSet = {}, addSet = {}, deleteArray = []; const existSet = {}, addSet = {}, deleteArray = [];
BI.each(renderedKeys, (i, key) => { each(renderedKeys, (i, key) => {
if (this.renderedKeys[i]) { if (this.renderedKeys[i]) {
existSet[i] = key; existSet[i] = key;
} else { } else {
addSet[i] = key; addSet[i] = key;
} }
}); });
BI.each(this.renderedKeys, (i, key) => { each(this.renderedKeys, (i, key) => {
if (existSet[i]) { if (existSet[i]) {
return; return;
} }
@ -251,12 +251,12 @@ export default class GridView extends Widget {
} }
deleteArray.push(key[2]); deleteArray.push(key[2]);
}); });
BI.each(deleteArray, (i, index) => { each(deleteArray, (i, index) => {
// 性能优化，不调用destroy方法防止触发destroy事件 // 性能优化，不调用destroy方法防止触发destroy事件
this.renderedCells[index].el._destroy(); this.renderedCells[index].el._destroy();
}); });
const addedItems = []; const addedItems = [];
BI.each(addSet, (index, key) => { each(addSet, (index, key) => {
addedItems.push(renderedCells[key[2]]); addedItems.push(renderedCells[key[2]]);
}); });
// 与listview一样, 给上下文 // 与listview一样, 给上下文
@ -266,7 +266,7 @@ export default class GridView extends Widget {
this.container.attr("items", renderedCells); this.container.attr("items", renderedCells);
this.renderedCells = renderedCells; this.renderedCells = renderedCells;
this.renderedKeys = renderedKeys; this.renderedKeys = renderedKeys;
this.renderRange = { minX: minX, minY: minY, maxX: maxX, maxY: maxY }; this.renderRange = { minX, minY, maxX, maxY };
} }
} }
@ -282,6 +282,7 @@ export default class GridView extends Widget {
if (scrollable === true || scrollable === "xy" || scrollable === "x") { if (scrollable === true || scrollable === "xy" || scrollable === "x") {
return true; return true;
} }
return false; return false;
} }
@ -298,6 +299,7 @@ export default class GridView extends Widget {
if (scrollable === true || scrollable === "xy" || scrollable === "y") { if (scrollable === true || scrollable === "xy" || scrollable === "y") {
return true; return true;
} }
return false; return false;
} }
@ -342,7 +344,7 @@ export default class GridView extends Widget {
return; return;
} }
this._scrollLock = true; this._scrollLock = true;
this.options.scrollLeft = BI.clamp(scrollLeft || 0, 0, this._getMaxScrollLeft()); this.options.scrollLeft = clamp(scrollLeft || 0, 0, this._getMaxScrollLeft());
this._debounceRelease(); this._debounceRelease();
this.element.scrollLeft(this.options.scrollLeft); this.element.scrollLeft(this.options.scrollLeft);
this._calculateChildrenToRender(); this._calculateChildrenToRender();
@ -353,7 +355,7 @@ export default class GridView extends Widget {
return; return;
} }
this._scrollLock = true; this._scrollLock = true;
this.options.scrollTop = BI.clamp(scrollTop || 0, 0, this._getMaxScrollTop()); this.options.scrollTop = clamp(scrollTop || 0, 0, this._getMaxScrollTop());
this._debounceRelease(); this._debounceRelease();
this.element.scrollTop(this.options.scrollTop); this.element.scrollTop(this.options.scrollTop);
this._calculateChildrenToRender(); this._calculateChildrenToRender();
@ -370,7 +372,7 @@ export default class GridView extends Widget {
setOverflowX(b) { setOverflowX(b) {
if (this.options.overflowX !== !!b) { if (this.options.overflowX !== !!b) {
this.options.overflowX = !!b; this.options.overflowX = !!b;
BI.nextTick(() => { nextTick(() => {
this.element.css({ overflowX: b ? "auto" : "hidden" }); this.element.css({ overflowX: b ? "auto" : "hidden" });
}); });
} }
@ -379,7 +381,7 @@ export default class GridView extends Widget {
setOverflowY(b) { setOverflowY(b) {
if (this.options.overflowY !== !!b) { if (this.options.overflowY !== !!b) {
this.options.overflowY = !!b; this.options.overflowY = !!b;
BI.nextTick(() => { nextTick(() => {
this.element.css({ overflowY: b ? "auto" : "hidden" }); this.element.css({ overflowY: b ? "auto" : "hidden" });
}); });
} }
@ -418,7 +420,7 @@ export default class GridView extends Widget {
} }
restore() { restore() {
BI.each(this.renderedCells, (i, cell) => { each(this.renderedCells, (i, cell) => {
cell.el._destroy(); cell.el._destroy();
}); });
this._clearChildren(); this._clearChildren();

12
src/base/index.js
Unescape View File

@ -2,11 +2,13 @@ import { Pane } from "./1.pane";
import * as single from "./single"; import * as single from "./single";
import * as layer from "./layer"; import * as layer from "./layer";
import * as list from "./list"; import * as list from "./list";
import GridView from "./grid/grid"; import { GridView } from "./grid/grid";
import Pager from "./pager/pager"; import { Pager } from "./pager/pager";
import * as combination from "./combination"; import * as combination from "./combination";
import { Msg } from "./foundation/message"; import { Msg } from "./foundation/message";
import * as base from "./0.base"; import * as base from "./0.base";
import { CollectionView } from "./collection/collection";
import { CustomTree } from "./tree/customtree";
Object.assign(BI, { Object.assign(BI, {
Pane, Pane,
@ -18,6 +20,8 @@ Object.assign(BI, {
...combination, ...combination,
Msg, Msg,
...base, ...base,
CollectionView,
CustomTree,
}); });
export * from "./0.base"; export * from "./0.base";
@ -30,4 +34,6 @@ export {
GridView, GridView,
Pager, Pager,
Msg, Msg,
} CollectionView,
CustomTree
};

19
src/base/layer/layer.drawer.js
Unescape View File

@ -4,7 +4,7 @@
* @extends BI.Widget * @extends BI.Widget
*/ */
import { Widget, shortcut } from "../../core"; import { Widget, shortcut, isPlainObject, extend } from "../../core";
@shortcut() @shortcut()
export class Drawer extends Widget { export class Drawer extends Widget {
SIZE = { SIZE = {
@ -62,7 +62,7 @@ export class Drawer extends Widget {
items: [{ items: [{
type: "bi.absolute", type: "bi.absolute",
items: [{ items: [{
el: BI.isPlainObject(header) ? BI.extend({}, header, { el: isPlainObject(header) ? extend({}, header, {
extraCls: "bi-font-bold", extraCls: "bi-font-bold",
}) : { }) : {
type: "bi.label", type: "bi.label",
@ -98,7 +98,7 @@ export class Drawer extends Widget {
type: "bi.vertical", type: "bi.vertical",
scrolly: true, scrolly: true,
cls: "drawer-body", cls: "drawer-body",
ref: (_ref) => { ref: _ref => {
this.body = _ref; this.body = _ref;
}, },
items: [{ items: [{
@ -110,9 +110,9 @@ export class Drawer extends Widget {
bgap: bodyBgap, bgap: bodyBgap,
}]; }];
return BI.extend({ return extend({
type: "bi.vtape", type: "bi.vtape",
items: items, items,
}, this._getSuitableSize()); }, this._getSuitableSize());
} }
mounted() { mounted() {
@ -158,22 +158,22 @@ export class Drawer extends Widget {
switch (placement) { switch (placement) {
case "right": case "right":
this.element.css({ this.element.css({
left: "calc(100% - " + size.width + "px)", left: `calc(100% - ${size.width}px)`,
}); });
break; break;
case "left": case "left":
this.element.css({ this.element.css({
right: "calc(100% - " + size.width + "px)", right: `calc(100% - ${size.width}px)`,
}); });
break; break;
case "top": case "top":
this.element.css({ this.element.css({
bottom: "calc(100% - " + size.height + "px)", bottom: `calc(100% - ${size.height}px)`,
}); });
break; break;
case "bottom": case "bottom":
this.element.css({ this.element.css({
top: "calc(100% - " + size.height + "px)", top: `calc(100% - ${size.height}px)`,
}); });
break; break;
default: default:
@ -232,6 +232,5 @@ export class Drawer extends Widget {
destroyed() { destroyed() {
} }
} }

38
src/base/layer/layer.popover.js
Unescape View File

@ -4,7 +4,7 @@
* @extends BI.Widget * @extends BI.Widget
*/ */
import { Widget, shortcut } from "../../core"; import { Widget, shortcut, clamp, isPlainObject, extend, isNotNull } from "../../core";
@shortcut() @shortcut()
export class Popover extends Widget { export class Popover extends Widget {
_constant = { _constant = {
@ -48,13 +48,13 @@ export class Popover extends Widget {
this.startY = 0; this.startY = 0;
const size = this._calculateSize(); const size = this._calculateSize();
this.tracker = new BI.MouseMoveTracker((deltaX, deltaY) => { this.tracker = new BI.MouseMoveTracker((deltaX, deltaY) => {
const W = BI.Widget._renderEngine.createElement("body").width(); const W = Widget._renderEngine.createElement("body").width();
const H = BI.Widget._renderEngine.createElement("body").height(); const H = Widget._renderEngine.createElement("body").height();
this.startX += deltaX; this.startX += deltaX;
this.startY += deltaY; this.startY += deltaY;
this.element.css({ this.element.css({
left: BI.clamp(this.startX, 0, W - this.element.width()) + "px", left: `${clamp(this.startX, 0, W - this.element.width())}px`,
top: BI.clamp(this.startY, 0, H - this.element.height()) + "px", top: `${clamp(this.startY, 0, H - this.element.height())}px`,
}); });
// BI-12134 没有什么特别好的方法 // BI-12134 没有什么特别好的方法
BI.Resizers._resize({ BI.Resizers._resize({
@ -70,11 +70,11 @@ export class Popover extends Widget {
items: [{ items: [{
el: { el: {
type: "bi.absolute", type: "bi.absolute",
ref: (_ref) => { ref: _ref => {
this.dragger = _ref; this.dragger = _ref;
}, },
items: [{ items: [{
el: BI.isPlainObject(header) ? BI.extend({}, header, { el: isPlainObject(header) ? extend({}, header, {
extraCls: "bi-font-bold", extraCls: "bi-font-bold",
}) : { }) : {
type: "bi.label", type: "bi.label",
@ -109,7 +109,7 @@ export class Popover extends Widget {
type: "bi.vertical", type: "bi.vertical",
scrolly: true, scrolly: true,
cls: "popover-body", cls: "popover-body",
ref: (_ref) => { ref: _ref => {
this.body = _ref; this.body = _ref;
}, },
css: { css: {
@ -151,8 +151,8 @@ export class Popover extends Widget {
}); });
} }
return BI.extend({ return extend({
items: items, items,
width: this._getSuitableWidth(size.width), width: this._getSuitableWidth(size.width),
}, logic.dynamic ? { }, logic.dynamic ? {
type: "bi.vertical", type: "bi.vertical",
@ -164,7 +164,7 @@ export class Popover extends Widget {
} }
// mounted之后绑定事件 // mounted之后绑定事件
mounted() { mounted() {
this.dragger.element.mousedown((e) => { this.dragger.element.mousedown(e => {
if (this.options.draggable !== false) { if (this.options.draggable !== false) {
this.startX = this.element[0].offsetLeft; this.startX = this.element[0].offsetLeft;
this.startY = this.element[0].offsetTop; this.startY = this.element[0].offsetTop;
@ -176,21 +176,21 @@ export class Popover extends Widget {
_getSuitableBodyHeight(height) { _getSuitableBodyHeight(height) {
const { headerHeight, footer, footerHeight, bodyTgap } = this.options; const { headerHeight, footer, footerHeight, bodyTgap } = this.options;
return BI.clamp(height, 0, BI.Widget._renderEngine.createElement("body")[0].clientHeight - headerHeight - (footer ? footerHeight : 0) - bodyTgap); return clamp(height, 0, Widget._renderEngine.createElement("body")[0].clientHeight - headerHeight - (footer ? footerHeight : 0) - bodyTgap);
} }
_getSuitableHeight(height) { _getSuitableHeight(height) {
return BI.clamp(height, 0, BI.Widget._renderEngine.createElement("body")[0].clientHeight); return clamp(height, 0, Widget._renderEngine.createElement("body")[0].clientHeight);
} }
_getSuitableWidth(width) { _getSuitableWidth(width) {
return BI.clamp(width, 0, BI.Widget._renderEngine.createElement("body").width()); return clamp(width, 0, Widget._renderEngine.createElement("body").width());
} }
_calculateSize() { _calculateSize() {
const { size, width, height } = this.options; const { size, width, height } = this.options;
const sizeValue = {}; const sizeValue = {};
if (BI.isNotNull(size)) { if (isNotNull(size)) {
switch (size) { switch (size) {
case this._constant.SIZE.SMALL: case this._constant.SIZE.SMALL:
sizeValue.width = 450; sizeValue.width = 450;
@ -243,7 +243,7 @@ export class BarPopover extends Popover {
static xtype = "bi.bar_popover"; static xtype = "bi.bar_popover";
_defaultConfig() { _defaultConfig() {
return BI.extend(super._defaultConfig(arguments), { return extend(super._defaultConfig(arguments), {
btns: [BI.i18nText("BI-Basic_OK"), BI.i18nText("BI-Basic_Cancel")], btns: [BI.i18nText("BI-Basic_OK"), BI.i18nText("BI-Basic_Cancel")],
}); });
} }
@ -258,16 +258,16 @@ export class BarPopover extends Popover {
text: this.options.btns[1], text: this.options.btns[1],
value: 1, value: 1,
level: "ignore", level: "ignore",
handler: (v) => { handler: v => {
this.fireEvent(Popover.EVENT_CANCEL, v); this.fireEvent(Popover.EVENT_CANCEL, v);
this.close(v); this.close(v);
}, },
}, { }, {
type: "bi.button", type: "bi.button",
text: this.options.btns[0], text: this.options.btns[0],
warningTitle: warningTitle, warningTitle,
value: 0, value: 0,
handler: (v) => { handler: v => {
this.fireEvent(Popover.EVENT_CONFIRM, v); this.fireEvent(Popover.EVENT_CONFIRM, v);
this.close(v); this.close(v);
}, },

61
src/base/layer/layer.popup.js
Unescape View File

@ -4,7 +4,7 @@
* @extends BI.Widget * @extends BI.Widget
*/ */
import { Widget, shortcut } from "../../core"; import { Widget, shortcut, extend, Controller, createWidget, createItems, clamp } from "../../core";
@shortcut() @shortcut()
export class PopupView extends Widget { export class PopupView extends Widget {
_const = { _const = {
@ -15,8 +15,8 @@ export class PopupView extends Widget {
static EVENT_CHANGE = "EVENT_CHANGE"; static EVENT_CHANGE = "EVENT_CHANGE";
_defaultConfig(props) { _defaultConfig(props) {
return BI.extend(super._defaultConfig(arguments), { return extend(super._defaultConfig(arguments), {
_baseCls: "bi-popup-view" + (props.primary ? " bi-primary" : ""), _baseCls: `bi-popup-view${props.primary ? " bi-primary" : ""}`,
// 品牌色 // 品牌色
primary: false, primary: false,
maxWidth: "auto", maxWidth: "auto",
@ -80,16 +80,16 @@ export class PopupView extends Widget {
this.view = this._createView(); this.view = this._createView();
this.toolbar = this._createToolBar(); this.toolbar = this._createToolBar();
this.view.on(BI.Controller.EVENT_CHANGE, (type, ...args) => { this.view.on(Controller.EVENT_CHANGE, (type, ...args) => {
this.fireEvent.apply(this, [BI.Controller.EVENT_CHANGE, type, ...args]); this.fireEvent(Controller.EVENT_CHANGE, type, ...args);
if (type === BI.Events.CLICK) { if (type === BI.Events.CLICK) {
this.fireEvent(PopupView.EVENT_CHANGE); this.fireEvent(PopupView.EVENT_CHANGE);
} }
}); });
BI.createWidget(BI.extend({ createWidget(extend({
element: this, element: this,
}, BI.LogicFactory.createLogic(BI.LogicFactory.createLogicTypeByDirection(direction), BI.extend({}, logic, { }, BI.LogicFactory.createLogic(BI.LogicFactory.createLogicTypeByDirection(direction), extend({}, logic, {
scrolly: false, scrolly: false,
lgap, lgap,
rgap, rgap,
@ -97,15 +97,15 @@ export class PopupView extends Widget {
bgap, bgap,
vgap, vgap,
hgap, hgap,
items: BI.LogicFactory.createLogicItemsByDirection(direction, BI.extend({ items: BI.LogicFactory.createLogicItemsByDirection(direction, extend({
cls: "list-view-outer bi-card list-view-shadow" + (primary ? " bi-primary" : ""), cls: `list-view-outer bi-card list-view-shadow${primary ? " bi-primary" : ""}`,
}, BI.LogicFactory.createLogic(BI.LogicFactory.createLogicTypeByDirection(direction), BI.extend({}, logic, { }, BI.LogicFactory.createLogic(BI.LogicFactory.createLogicTypeByDirection(direction), extend({}, logic, {
items: BI.LogicFactory.createLogicItemsByDirection(direction, this.tool, this.tab, this.view, this.toolbar), items: BI.LogicFactory.createLogicItemsByDirection(direction, this.tool, this.tab, this.view, this.toolbar),
}))) })))
), ),
})))); }))));
if (showArrow) { if (showArrow) {
this.arrow = BI.createWidget({ this.arrow = createWidget({
type: "bi.absolute", type: "bi.absolute",
cls: "bi-bubble-arrow", cls: "bi-bubble-arrow",
items: [{ items: [{
@ -113,7 +113,7 @@ export class PopupView extends Widget {
cls: "bubble-arrow", cls: "bubble-arrow",
}], }],
}); });
this.arrowWrapper = BI.createWidget({ this.arrowWrapper = createWidget({
type: "bi.absolute", type: "bi.absolute",
cls: "bi-bubble-arrow-wrapper", cls: "bi-bubble-arrow-wrapper",
items: [{ items: [{
@ -121,10 +121,10 @@ export class PopupView extends Widget {
}], }],
}); });
// 因为三角符号的原因位置变大了，需要占位 // 因为三角符号的原因位置变大了，需要占位
this.placeholder = BI.createWidget({ this.placeholder = createWidget({
type: "bi.layout", type: "bi.layout",
}); });
BI.createWidget({ createWidget({
type: "bi.absolute", type: "bi.absolute",
element: this, element: this,
items: [{ items: [{
@ -139,7 +139,7 @@ export class PopupView extends Widget {
} }
_createView() { _createView() {
const { el, value, minHeight, innerVgap, innerHgap } = this.options; const { el, value, minHeight, innerVgap, innerHgap } = this.options;
this.button_group = BI.createWidget(el, { type: "bi.button_group", value: value }); this.button_group = createWidget(el, { type: "bi.button_group", value });
this.button_group.element.css({ this.button_group.element.css({
"min-height": BI.pixFormat(minHeight), "min-height": BI.pixFormat(minHeight),
"padding-top": BI.pixFormat(innerVgap), "padding-top": BI.pixFormat(innerVgap),
@ -157,7 +157,7 @@ export class PopupView extends Widget {
return; return;
} }
return BI.createWidget(tool); return createWidget(tool);
} }
_createTab() { _createTab() {
@ -166,12 +166,12 @@ export class PopupView extends Widget {
return; return;
} }
return BI.createWidget({ return createWidget({
type: "bi.center", type: "bi.center",
cls: "list-view-tab", cls: "list-view-tab",
height: 25, height: 25,
items: tabs, items: tabs,
value: value, value,
}); });
} }
@ -181,11 +181,11 @@ export class PopupView extends Widget {
return; return;
} }
return BI.createWidget({ return createWidget({
type: "bi.center", type: "bi.center",
cls: "list-view-toolbar bi-high-light bi-split-top", cls: "list-view-toolbar bi-high-light bi-split-top",
height: 24, height: 24,
items: BI.createItems(buttons, { items: createItems(buttons, {
once: false, once: false,
shadow: true, shadow: true,
isShadowShowingOnSelected: true, isShadowShowingOnSelected: true,
@ -199,7 +199,7 @@ export class PopupView extends Widget {
let style = {}, wrapperStyle = {}, placeholderStyle = {}; let style = {}, wrapperStyle = {}, placeholderStyle = {};
const adjustXOffset = position.adjustXOffset || 0; const adjustXOffset = position.adjustXOffset || 0;
const adjustYOffset = position.adjustYOffset || 0; const adjustYOffset = position.adjustYOffset || 0;
const bodyBounds = BI.Widget._renderEngine.createElement("body").bounds(); const bodyBounds = Widget._renderEngine.createElement("body").bounds();
const bodyWidth = bodyBounds.width; const bodyWidth = bodyBounds.width;
const bodyHeight = bodyBounds.height; const bodyHeight = bodyBounds.height;
const popupWidth = this.element.outerWidth(); const popupWidth = this.element.outerWidth();
@ -223,7 +223,7 @@ export class PopupView extends Widget {
direction = "bottom"; direction = "bottom";
style = { style = {
// 5表示留出一定的空间 // 5表示留出一定的空间
left: BI.clamp(((middle ? popupWidth : position.width) - adjustXOffset) / 2 - 8, minLeft, maxLeft), left: clamp(((middle ? popupWidth : position.width) - adjustXOffset) / 2 - 8, minLeft, maxLeft),
}; };
wrapperStyle = { wrapperStyle = {
top: tgap + vgap, top: tgap + vgap,
@ -242,7 +242,7 @@ export class PopupView extends Widget {
case "bottom,left": case "bottom,left":
direction = "bottom"; direction = "bottom";
style = { style = {
right: BI.clamp(((middle ? popupWidth : position.width) + adjustXOffset) / 2 - 8, minRight, maxRight), right: clamp(((middle ? popupWidth : position.width) + adjustXOffset) / 2 - 8, minRight, maxRight),
}; };
wrapperStyle = { wrapperStyle = {
top: bgap + vgap, top: bgap + vgap,
@ -262,7 +262,7 @@ export class PopupView extends Widget {
case "top,right": case "top,right":
direction = "top"; direction = "top";
style = { style = {
left: BI.clamp(((middle ? popupWidth : position.width) - adjustXOffset) / 2 - 8, minLeft, maxLeft), left: clamp(((middle ? popupWidth : position.width) - adjustXOffset) / 2 - 8, minLeft, maxLeft),
}; };
wrapperStyle = { wrapperStyle = {
bottom: bgap + vgap, bottom: bgap + vgap,
@ -281,7 +281,7 @@ export class PopupView extends Widget {
case "top,left": case "top,left":
direction = "top"; direction = "top";
style = { style = {
right: BI.clamp(((middle ? popupWidth : position.width) + adjustXOffset) / 2 - 8, minRight, maxRight), right: clamp(((middle ? popupWidth : position.width) + adjustXOffset) / 2 - 8, minRight, maxRight),
}; };
wrapperStyle = { wrapperStyle = {
bottom: bgap + vgap, bottom: bgap + vgap,
@ -301,7 +301,7 @@ export class PopupView extends Widget {
case "left,bottom": case "left,bottom":
direction = "left"; direction = "left";
style = { style = {
top: BI.clamp(((middle ? popupHeight : position.height) - adjustYOffset) / 2 - 8, minTop, maxTop), top: clamp(((middle ? popupHeight : position.height) - adjustYOffset) / 2 - 8, minTop, maxTop),
}; };
wrapperStyle = { wrapperStyle = {
right: rgap + hgap, right: rgap + hgap,
@ -320,7 +320,7 @@ export class PopupView extends Widget {
case "left,top": case "left,top":
direction = "left"; direction = "left";
style = { style = {
bottom: BI.clamp(((middle ? popupHeight : position.height) + adjustYOffset) / 2 - 8, minBottom, maxBottom), bottom: clamp(((middle ? popupHeight : position.height) + adjustYOffset) / 2 - 8, minBottom, maxBottom),
}; };
wrapperStyle = { wrapperStyle = {
right: rgap + hgap, right: rgap + hgap,
@ -340,7 +340,7 @@ export class PopupView extends Widget {
case "right,bottom": case "right,bottom":
direction = "right"; direction = "right";
style = { style = {
top: BI.clamp(((middle ? popupHeight : position.height) - adjustYOffset) / 2 - 8, minTop, maxTop), top: clamp(((middle ? popupHeight : position.height) - adjustYOffset) / 2 - 8, minTop, maxTop),
}; };
wrapperStyle = { wrapperStyle = {
left: lgap + hgap, left: lgap + hgap,
@ -359,7 +359,7 @@ export class PopupView extends Widget {
case "right,top": case "right,top":
direction = "right"; direction = "right";
style = { style = {
bottom: BI.clamp(((middle ? popupHeight : position.height) + adjustYOffset) / 2 - 8, minBottom, maxBottom), bottom: clamp(((middle ? popupHeight : position.height) + adjustYOffset) / 2 - 8, minBottom, maxBottom),
}; };
wrapperStyle = { wrapperStyle = {
left: lgap + hgap, left: lgap + hgap,
@ -403,7 +403,7 @@ export class PopupView extends Widget {
} }
populate(items) { populate(items) {
this.view.populate.apply(this.view, arguments); this.view.populate(...arguments);
} }
resetWidth(w) { resetWidth(w) {
@ -428,6 +428,5 @@ export class PopupView extends Widget {
getValue() { getValue() {
return this.view.getValue(); return this.view.getValue();
} }
} }

41
src/base/layer/layer.searcher.js
Unescape View File

@ -6,29 +6,26 @@
* @extends BI.Pane * @extends BI.Pane
*/ */
import { shortcut } from "../../core"; import { shortcut, extend, createWidget, Controller, isNotEmptyArray } from "../../core";
import { Pane } from "../1.pane"; import { Pane } from "../1.pane";
@shortcut() @shortcut()
export class SearcherView extends Pane { export class SearcherView extends Pane {
static xtype = "bi.searcher_view"; static xtype = "bi.searcher_view";
static EVENT_CHANGE = "EVENT_CHANGE"; static EVENT_CHANGE = "EVENT_CHANGE";
_defaultConfig() { _defaultConfig() {
const conf = super._defaultConfig(arguments); const conf = super._defaultConfig(arguments);
return BI.extend(conf, { return extend(conf, {
baseCls: (conf.baseCls || "") + " bi-searcher-view bi-card", baseCls: `${conf.baseCls || ""} bi-searcher-view bi-card`,
tipText: BI.i18nText("BI-No_Select"), tipText: BI.i18nText("BI-No_Select"),
chooseType: BI.Selection.Single, chooseType: BI.Selection.Single,
matcher: { // 完全匹配的构造器 matcher: { // 完全匹配的构造器
type: "bi.button_group", type: "bi.button_group",
behaviors: { behaviors: {
redmark: () => { redmark: () => true,
return true;
},
}, },
items: [], items: [],
layouts: [{ layouts: [{
@ -38,9 +35,7 @@ export class SearcherView extends Pane {
searcher: { searcher: {
type: "bi.button_group", type: "bi.button_group",
behaviors: { behaviors: {
redmark: () => { redmark: () => true,
return true;
},
}, },
items: [], items: [],
layouts: [{ layouts: [{
@ -52,26 +47,24 @@ export class SearcherView extends Pane {
render() { render() {
const { matcher, chooseType, value, searcher } = this.options; const { matcher, chooseType, value, searcher } = this.options;
this.matcher = BI.createWidget(matcher, { this.matcher = createWidget(matcher, {
type: "bi.button_group", type: "bi.button_group",
chooseType, chooseType,
behaviors: { behaviors: {
redmark: () => { redmark: () => true,
return true;
},
}, },
layouts: [{ layouts: [{
type: "bi.vertical", type: "bi.vertical",
}], }],
value, value,
}); });
this.matcher.on(BI.Controller.EVENT_CHANGE, (type, val, ob, ...args) => { this.matcher.on(Controller.EVENT_CHANGE, (type, val, ob, ...args) => {
this.fireEvent.apply(this, [BI.Controller.EVENT_CHANGE, type, val, ob, ...args]); this.fireEvent(Controller.EVENT_CHANGE, type, val, ob, ...args);
if (type === BI.Events.CLICK) { if (type === BI.Events.CLICK) {
this.fireEvent(SearcherView.EVENT_CHANGE, val, ob); this.fireEvent(SearcherView.EVENT_CHANGE, val, ob);
} }
}); });
this.spliter = BI.createWidget({ this.spliter = createWidget({
type: "bi.vertical", type: "bi.vertical",
height: 1, height: 1,
hgap: 10, hgap: 10,
@ -81,27 +74,25 @@ export class SearcherView extends Pane {
cls: "searcher-view-spliter bi-background", cls: "searcher-view-spliter bi-background",
}], }],
}); });
this.searcher = BI.createWidget(searcher, { this.searcher = createWidget(searcher, {
type: "bi.button_group", type: "bi.button_group",
chooseType, chooseType,
behaviors: { behaviors: {
redmark: () => { redmark: () => true,
return true;
},
}, },
layouts: [{ layouts: [{
type: "bi.vertical", type: "bi.vertical",
}], }],
value, value,
}); });
this.searcher.on(BI.Controller.EVENT_CHANGE, (type, val, ob, ...args) => { this.searcher.on(Controller.EVENT_CHANGE, (type, val, ob, ...args) => {
this.fireEvent.apply(this, [BI.Controller.EVENT_CHANGE, type, val, ob, ...args]); this.fireEvent(Controller.EVENT_CHANGE, type, val, ob, ...args);
if (type === BI.Events.CLICK) { if (type === BI.Events.CLICK) {
this.fireEvent(BI.SearcherView.EVENT_CHANGE, val, ob); this.fireEvent(BI.SearcherView.EVENT_CHANGE, val, ob);
} }
}); });
BI.createWidget({ createWidget({
type: "bi.vertical", type: "bi.vertical",
element: this, element: this,
items: [this.matcher, this.spliter, this.searcher], items: [this.matcher, this.spliter, this.searcher],
@ -129,7 +120,7 @@ export class SearcherView extends Pane {
searchResult || (searchResult = []); searchResult || (searchResult = []);
matchResult || (matchResult = []); matchResult || (matchResult = []);
this.setTipVisible(searchResult.length + matchResult.length === 0); this.setTipVisible(searchResult.length + matchResult.length === 0);
this.spliter.setVisible(BI.isNotEmptyArray(matchResult) && BI.isNotEmptyArray(searchResult)); this.spliter.setVisible(isNotEmptyArray(matchResult) && isNotEmptyArray(searchResult));
this.matcher.populate(matchResult, keyword); this.matcher.populate(matchResult, keyword);
this.searcher.populate(searchResult, keyword); this.searcher.populate(searchResult, keyword);
} }

26
src/base/list/listview.js
Unescape View File

@ -5,7 +5,7 @@
* @class BI.ListView * @class BI.ListView
* @extends BI.Widget * @extends BI.Widget
*/ */
import { Widget, shortcut } from "../../core"; import { Widget, shortcut, extend, isFunction } from "../../core";
@shortcut() @shortcut()
export class ListView extends Widget { export class ListView extends Widget {
props() { props() {
@ -16,9 +16,7 @@ export class ListView extends Widget {
scrollTop: 0, scrollTop: 0,
el: {}, el: {},
items: [], items: [],
itemFormatter: (item, index) => { itemFormatter: (item, index) => item,
return item;
},
}; };
} }
@ -34,10 +32,10 @@ export class ListView extends Widget {
return { return {
type: "bi.vertical", type: "bi.vertical",
items: [BI.extend({ items: [extend({
type: "bi.vertical", type: "bi.vertical",
scrolly: false, scrolly: false,
ref: (_ref) => { ref: _ref => {
this.container = _ref; this.container = _ref;
}, },
}, el)], }, el)],
@ -49,11 +47,11 @@ export class ListView extends Widget {
mounted() { mounted() {
const o = this.options; const o = this.options;
// 这里无法进行结构，因为存在赋值操作，如果使用结构则this.options的值不会跟随变化 // 这里无法进行结构，因为存在赋值操作，如果使用结构则this.options的值不会跟随变化
o.items = BI.isFunction(o.items) ? this.__watch(o.items, (context, newValue) => { o.items = isFunction(o.items) ? this.__watch(o.items, (context, newValue) => {
this.populate(newValue); this.populate(newValue);
}) : o.items; }) : o.items;
this._populate(); this._populate();
this.element.scroll((e) => { this.element.scroll(e => {
o.scrollTop = this.element.scrollTop(); o.scrollTop = this.element.scrollTop();
this._calculateBlocksToRender(); this._calculateBlocksToRender();
}); });
@ -81,19 +79,16 @@ export class ListView extends Widget {
let cnt = this.renderedIndex + 1; let cnt = this.renderedIndex + 1;
let lastHeight; let lastHeight;
const getElementHeight = () => { const getElementHeight = () => this.container.element.height();
return this.container.element.height();
}
lastHeight = getElementHeight(); lastHeight = getElementHeight();
while ((lastHeight) < minContentHeight && index < items.length) { while ((lastHeight) < minContentHeight && index < items.length) {
const itemsArr = items.slice(index, index + blockSize); const itemsArr = items.slice(index, index + blockSize);
this.container.addItems(itemsArr.map((item, i) => { // eslint-disable-next-line no-loop-func
return itemFormatter(item, index + i); this.container.addItems(itemsArr.map((item, i) => itemFormatter(item, index + i)), this);
}), this);
const addedHeight = getElementHeight() - lastHeight; const addedHeight = getElementHeight() - lastHeight;
this.cache[cnt] = { this.cache[cnt] = {
index: index, index,
scrollTop: lastHeight, scrollTop: lastHeight,
height: addedHeight, height: addedHeight,
}; };
@ -144,6 +139,5 @@ export class ListView extends Widget {
BI.ResizeDetector.removeResizeListener(this); BI.ResizeDetector.removeResizeListener(this);
this.restore(); this.restore();
} }
} }

35
src/base/list/virtualgrouplist.js
Unescape View File

@ -6,7 +6,7 @@
* @extends BI.Widget * @extends BI.Widget
*/ */
import { Widget, shortcut } from "../../core"; import { Widget, shortcut, extend, isFunction, isNumber, PrefixIntervalTree } from "../../core";
@shortcut() @shortcut()
export class VirtualGroupList extends Widget { export class VirtualGroupList extends Widget {
props() { props() {
@ -18,9 +18,7 @@ export class VirtualGroupList extends Widget {
rowHeight: "auto", rowHeight: "auto",
items: [], items: [],
el: {}, el: {},
itemFormatter: (item, index) => { itemFormatter: (item, index) => item,
return item;
},
}; };
} }
@ -46,7 +44,7 @@ export class VirtualGroupList extends Widget {
ref: () => { ref: () => {
this.container = this; this.container = this;
}, },
layouts: [BI.extend({ layouts: [extend({
type: "bi.vertical", type: "bi.vertical",
scrolly: false, scrolly: false,
}, el)], }, el)],
@ -63,7 +61,7 @@ export class VirtualGroupList extends Widget {
mounted() { mounted() {
// 这里无法进行结构，因为存在赋值操作，如果使用结构则this.options的值不会跟随变化 // 这里无法进行结构，因为存在赋值操作，如果使用结构则this.options的值不会跟随变化
const o = this.options; const o = this.options;
o.items = BI.isFunction(o.items) ? this.__watch(o.items, (context, newValue) => { o.items = isFunction(o.items) ? this.__watch(o.items, (context, newValue) => {
this.populate(newValue); this.populate(newValue);
}) : o.items; }) : o.items;
this._populate(); this._populate();
@ -86,7 +84,7 @@ export class VirtualGroupList extends Widget {
} }
_isAutoHeight() { _isAutoHeight() {
return !BI.isNumber(this.options.rowHeight); return !isNumber(this.options.rowHeight);
} }
_renderMoreIf() { _renderMoreIf() {
@ -95,15 +93,12 @@ export class VirtualGroupList extends Widget {
const minContentHeight = scrollTop + height + overscanHeight; const minContentHeight = scrollTop + height + overscanHeight;
let index = (this.renderedIndex + 1) * blockSize, cnt = this.renderedIndex + 1; let index = (this.renderedIndex + 1) * blockSize, cnt = this.renderedIndex + 1;
let lastHeight; let lastHeight;
const getElementHeight = () => { const getElementHeight = () => this.container.element.height() + this.topBlank.element.height() + this.bottomBlank.element.height();
return this.container.element.height() + this.topBlank.element.height() + this.bottomBlank.element.height();
}
lastHeight = this.renderedIndex === -1 ? 0 : getElementHeight(); lastHeight = this.renderedIndex === -1 ? 0 : getElementHeight();
while (lastHeight < minContentHeight && index < items.length) { while (lastHeight < minContentHeight && index < items.length) {
const itemsArr = items.slice(index, index + blockSize); const itemsArr = items.slice(index, index + blockSize);
this.container[this.renderedIndex === -1 ? "populate" : "addItems"](itemsArr.map((item, i) => { // eslint-disable-next-line no-loop-func
return itemFormatter(item, index + i); this.container[this.renderedIndex === -1 ? "populate" : "addItems"](itemsArr.map((item, i) => itemFormatter(item, index + i)), this);
}), this);
const elementHeight = getElementHeight(); const elementHeight = getElementHeight();
const addedHeight = elementHeight - lastHeight; const addedHeight = elementHeight - lastHeight;
this.tree.set(cnt, addedHeight); this.tree.set(cnt, addedHeight);
@ -129,7 +124,7 @@ export class VirtualGroupList extends Widget {
const end = this.tree.leastUpperBound(minContentHeightTo); const end = this.tree.leastUpperBound(minContentHeightTo);
const itemsArr = []; const itemsArr = [];
const topHeight = this.tree.sumTo(Math.max(-1, start - 1)); const topHeight = this.tree.sumTo(Math.max(-1, start - 1));
this.topBlank.setHeight(topHeight + "px"); this.topBlank.setHeight(`${topHeight}px`);
if (this._isAutoHeight()) { if (this._isAutoHeight()) {
for (let i = (start < 0 ? 0 : start); i <= end && i <= this.renderedIndex; i++) { for (let i = (start < 0 ? 0 : start); i <= end && i <= this.renderedIndex; i++) {
const index = i * blockSize; const index = i * blockSize;
@ -137,10 +132,8 @@ export class VirtualGroupList extends Widget {
itemsArr.push(items[j]); itemsArr.push(items[j]);
} }
} }
this.bottomBlank.setHeight(this.tree.sumTo(this.renderedIndex) - this.tree.sumTo(Math.min(end, this.renderedIndex)) + "px"); this.bottomBlank.setHeight(`${this.tree.sumTo(this.renderedIndex) - this.tree.sumTo(Math.min(end, this.renderedIndex))}px`);
this.container.populate(itemsArr.map((item, i) => { this.container.populate(itemsArr.map((item, i) => itemFormatter(item, (start < 0 ? 0 : start) * blockSize + i)));
return itemFormatter(item, (start < 0 ? 0 : start) * blockSize + i);
}));
} else { } else {
for (let i = (start < 0 ? 0 : start); i <= end; i++) { for (let i = (start < 0 ? 0 : start); i <= end; i++) {
const index = i * blockSize; const index = i * blockSize;
@ -149,9 +142,7 @@ export class VirtualGroupList extends Widget {
} }
} }
this.container.element.height(rowHeight * items.length - topHeight); this.container.element.height(rowHeight * items.length - topHeight);
this.container.populate(itemsArr.map((item, i) => { this.container.populate(itemsArr.map((item, i) => itemFormatter(item, (start < 0 ? 0 : start) * blockSize + i)));
return itemFormatter(item, (start < 0 ? 0 : start) * blockSize + i);
}));
} }
} }
_populate(items) { _populate(items) {
@ -161,7 +152,7 @@ export class VirtualGroupList extends Widget {
this.options.items = items; this.options.items = items;
this._restore(); this._restore();
} }
this.tree = BI.PrefixIntervalTree.uniform(Math.ceil(this.options.items.length / blockSize), this._isAutoHeight() ? 0 : rowHeight * blockSize); this.tree = PrefixIntervalTree.uniform(Math.ceil(this.options.items.length / blockSize), this._isAutoHeight() ? 0 : rowHeight * blockSize);
this._calculateBlocksToRender(); this._calculateBlocksToRender();
try { try {

45
src/base/list/virtuallist.js
Unescape View File

@ -6,7 +6,7 @@
* @extends BI.Widget * @extends BI.Widget
*/ */
import { Widget, shortcut } from "../../core"; import { Widget, shortcut, isFunction, each, PrefixIntervalTree } from "../../core";
@shortcut() @shortcut()
export class VirtualList extends Widget { export class VirtualList extends Widget {
props() { props() {
@ -16,9 +16,7 @@ export class VirtualList extends Widget {
blockSize: 10, blockSize: 10,
scrollTop: 0, scrollTop: 0,
items: [], items: [],
itemFormatter: (item, index) => { itemFormatter: (item, index) => item,
return item;
},
}; };
} }
@ -34,18 +32,18 @@ export class VirtualList extends Widget {
type: "bi.vertical", type: "bi.vertical",
items: [{ items: [{
type: "bi.layout", type: "bi.layout",
ref: (_ref) => { ref: _ref => {
this.topBlank = _ref; this.topBlank = _ref;
}, },
}, { }, {
type: "bi.vertical", type: "bi.vertical",
scrolly: false, scrolly: false,
ref: (_ref) => { ref: _ref => {
this.container = _ref; this.container = _ref;
}, },
}, { }, {
type: "bi.layout", type: "bi.layout",
ref: (_ref) => { ref: _ref => {
this.bottomBlank = _ref; this.bottomBlank = _ref;
}, },
}], }],
@ -55,11 +53,11 @@ export class VirtualList extends Widget {
mounted() { mounted() {
// 这里无法进行结构，因为存在赋值操作，如果使用结构则this.options的值不会跟随变化 // 这里无法进行结构，因为存在赋值操作，如果使用结构则this.options的值不会跟随变化
const o = this.options; const o = this.options;
o.items = BI.isFunction(o.items) ? this.__watch(o.items, (context, newValue) => { o.items = isFunction(o.items) ? this.__watch(o.items, (context, newValue) => {
this.populate(newValue); this.populate(newValue);
}) : o.items; }) : o.items;
this._populate(); this._populate();
this.element.scroll((e) => { this.element.scroll(e => {
o.scrollTop = this.element.scrollTop(); o.scrollTop = this.element.scrollTop();
this._calculateBlocksToRender(); this._calculateBlocksToRender();
}); });
@ -76,15 +74,12 @@ export class VirtualList extends Widget {
const minContentHeight = scrollTop + height + overscanHeight; const minContentHeight = scrollTop + height + overscanHeight;
let index = (this.renderedIndex + 1) * blockSize, cnt = this.renderedIndex + 1; let index = (this.renderedIndex + 1) * blockSize, cnt = this.renderedIndex + 1;
let lastHeight; let lastHeight;
const getElementHeight = () => { const getElementHeight = () => this.container.element.height() + this.topBlank.element.height() + this.bottomBlank.element.height();
return this.container.element.height() + this.topBlank.element.height() + this.bottomBlank.element.height();
}
lastHeight = getElementHeight(); lastHeight = getElementHeight();
while (lastHeight < minContentHeight && index < items.length) { while (lastHeight < minContentHeight && index < items.length) {
const itemsArr = items.slice(index, index + blockSize); const itemsArr = items.slice(index, index + blockSize);
this.container.addItems(itemsArr.map((item, i) => { // eslint-disable-next-line no-loop-func
return itemFormatter(item, index + i); this.container.addItems(itemsArr.map((item, i) => itemFormatter(item, index + i)), this);
}), this);
const addedHeight = getElementHeight() - lastHeight; const addedHeight = getElementHeight() - lastHeight;
this.tree.set(cnt, addedHeight); this.tree.set(cnt, addedHeight);
this.renderedIndex = cnt; this.renderedIndex = cnt;
@ -109,7 +104,7 @@ export class VirtualList extends Widget {
const end = this.tree.leastUpperBound(minContentHeightTo); const end = this.tree.leastUpperBound(minContentHeightTo);
const needDestroyed = [], needMount = []; const needDestroyed = [], needMount = [];
for (let i = 0; i < start; i++) { for (let i = 0; i < start; i++) {
let index = i * blockSize; const index = i * blockSize;
if (!this.cache[i]) { if (!this.cache[i]) {
this.cache[i] = {}; this.cache[i] = {};
} }
@ -122,7 +117,7 @@ export class VirtualList extends Widget {
} }
} }
for (let i = end + 1; i <= this.renderedIndex; i++) { for (let i = end + 1; i <= this.renderedIndex; i++) {
let index = i * blockSize; const index = i * blockSize;
if (!this.cache[i]) { if (!this.cache[i]) {
this.cache[i] = {}; this.cache[i] = {};
} }
@ -134,8 +129,8 @@ export class VirtualList extends Widget {
this.cache[i].destroyed = true; this.cache[i].destroyed = true;
} }
} }
const firstFragment = BI.Widget._renderEngine.createFragment(), const firstFragment = Widget._renderEngine.createFragment(),
lastFragment = BI.Widget._renderEngine.createFragment(); lastFragment = Widget._renderEngine.createFragment();
let currentFragment = firstFragment; let currentFragment = firstFragment;
for (let i = (start < 0 ? 0 : start); i <= end && i <= this.renderedIndex; i++) { for (let i = (start < 0 ? 0 : start); i <= end && i <= this.renderedIndex; i++) {
const index = i * blockSize; const index = i * blockSize;
@ -156,12 +151,12 @@ export class VirtualList extends Widget {
} }
this.container.element.prepend(firstFragment); this.container.element.prepend(firstFragment);
this.container.element.append(lastFragment); this.container.element.append(lastFragment);
this.topBlank.setHeight(this.tree.sumTo(Math.max(-1, start - 1)) + "px"); this.topBlank.setHeight(`${this.tree.sumTo(Math.max(-1, start - 1))}px`);
this.bottomBlank.setHeight(this.tree.sumTo(this.renderedIndex) - this.tree.sumTo(Math.min(end, this.renderedIndex)) + "px"); this.bottomBlank.setHeight(`${this.tree.sumTo(this.renderedIndex) - this.tree.sumTo(Math.min(end, this.renderedIndex))}px`);
BI.each(needMount, (i, child) => { each(needMount, (i, child) => {
child && child._mount(); child && child._mount();
}); });
BI.each(needDestroyed, (i, child) => { each(needDestroyed, (i, child) => {
child && child._destroy(); child && child._destroy();
}); });
} }
@ -170,7 +165,7 @@ export class VirtualList extends Widget {
if (items && this.options.items !== items) { if (items && this.options.items !== items) {
this.options.items = items; this.options.items = items;
} }
this.tree = BI.PrefixIntervalTree.empty(Math.ceil(this.options.items.length / blockSize)); this.tree = PrefixIntervalTree.empty(Math.ceil(this.options.items.length / blockSize));
this._calculateBlocksToRender(); this._calculateBlocksToRender();
try { try {
@ -180,7 +175,7 @@ export class VirtualList extends Widget {
} }
_clearChildren() { _clearChildren() {
BI.each(this.container._children, (i, cell) => { each(this.container._children, (i, cell) => {
cell && cell._destroy(); cell && cell._destroy();
}); });
this.container._children = {}; this.container._children = {};

73
src/base/pager/pager.js
Unescape View File

@ -5,11 +5,11 @@
* @class BI.Pager * @class BI.Pager
* @extends BI.Widget * @extends BI.Widget
*/ */
import { Widget, shortcut } from "../../core"; import { Widget, shortcut, extend, emptyFn, result, isKey, createWidget, map, stripEL, formatEL, Controller } from "../../core";
@shortcut() @shortcut()
export default class Pager extends Widget { export class Pager extends Widget {
_defaultConfig() { _defaultConfig() {
return BI.extend(super._defaultConfig(arguments), { return extend(super._defaultConfig(...arguments), {
baseCls: "bi-pager", baseCls: "bi-pager",
behaviors: {}, behaviors: {},
layouts: [{ layouts: [{
@ -23,22 +23,19 @@ export default class Pager extends Widget {
dynamicShowFirstLast: false, // 是否动态显示首页、尾页 dynamicShowFirstLast: false, // 是否动态显示首页、尾页
dynamicShowPrevNext: false, // 是否动态显示上一页、下一页 dynamicShowPrevNext: false, // 是否动态显示上一页、下一页
pages: false, // 总页数 pages: false, // 总页数
curr: () => { curr: () => 1, // 初始化当前页
return 1;
}, // 初始化当前页
groups: 0, // 连续显示分页数 groups: 0, // 连续显示分页数
jump: BI.emptyFn, // 分页的回调函数 jump: emptyFn, // 分页的回调函数
first: false, // 是否显示首页 first: false, // 是否显示首页
last: false, // 是否显示尾页 last: false, // 是否显示尾页
prev: "上一页", prev: "上一页",
next: "下一页", next: "下一页",
firstPage: 1, firstPage: 1,
lastPage: () => { // 在万不得已时才会调用这个函数获取最后一页的页码, 主要作用于setValue方法 lastPage: () => // 在万不得已时才会调用这个函数获取最后一页的页码, 主要作用于setValue方法
return 1; 1,
}, hasPrev: emptyFn, // pages不可用时有效
hasPrev: BI.emptyFn, // pages不可用时有效 hasNext: emptyFn, // pages不可用时有效
hasNext: BI.emptyFn, // pages不可用时有效
}); });
} }
@ -46,7 +43,7 @@ export default class Pager extends Widget {
static EVENT_CHANGE = "EVENT_CHANGE"; static EVENT_CHANGE = "EVENT_CHANGE";
static EVENT_AFTER_POPULATE = "EVENT_AFTER_POPULATE"; static EVENT_AFTER_POPULATE = "EVENT_AFTER_POPULATE";
render() { render() {
this.currPage = BI.result(this.options, "curr"); this.currPage = result(this.options, "curr");
// 翻页太灵敏 // 翻页太灵敏
// this._lock = false; // this._lock = false;
// this._debouce = BI.debounce(function () { // this._debouce = BI.debounce(function () {
@ -59,13 +56,13 @@ export default class Pager extends Widget {
const o = this.options, view = [], dict = {}; const o = this.options, view = [], dict = {};
const { dynamicShow, dynamicShowPrevNext, hasPrev, dynamicShowFirstLast, hasNext, behaviors, layouts, jump } = this.options; const { dynamicShow, dynamicShowPrevNext, hasPrev, dynamicShowFirstLast, hasNext, behaviors, layouts, jump } = this.options;
this.empty(); this.empty();
const pages = BI.result(o, "pages"); const pages = result(o, "pages");
const curr = BI.result(this, "currPage"); const curr = result(this, "currPage");
let groups = BI.result(o, "groups"); let groups = result(o, "groups");
let first = BI.result(o, "first"); let first = result(o, "first");
let last = BI.result(o, "last"); let last = result(o, "last");
const prev = BI.result(o, "prev"); const prev = result(o, "prev");
const next = BI.result(o, "next"); const next = result(o, "next");
if (pages === false) { if (pages === false) {
groups = 0; groups = 0;
@ -80,7 +77,7 @@ export default class Pager extends Widget {
// 当前页非首页，则输出上一页 // 当前页非首页，则输出上一页
if (((!dynamicShow && !dynamicShowPrevNext) || curr > 1) && prev !== false) { if (((!dynamicShow && !dynamicShowPrevNext) || curr > 1) && prev !== false) {
if (BI.isKey(prev)) { if (isKey(prev)) {
view.push({ view.push({
text: prev, text: prev,
value: "prev", value: "prev",
@ -88,7 +85,7 @@ export default class Pager extends Widget {
}); });
} else { } else {
view.push({ view.push({
el: BI.extend({ el: extend({
disabled: pages === false ? hasPrev(curr) === false : !(curr > 1 && prev !== false), disabled: pages === false ? hasPrev(curr) === false : !(curr > 1 && prev !== false),
}, prev), }, prev),
}); });
@ -162,7 +159,7 @@ export default class Pager extends Widget {
dict.flow = !prev && groups === 0; dict.flow = !prev && groups === 0;
if (((!dynamicShow && !dynamicShowPrevNext) && next) || (curr !== pages && next || dict.flow)) { if (((!dynamicShow && !dynamicShowPrevNext) && next) || (curr !== pages && next || dict.flow)) {
view.push((function () { view.push((function () {
if (BI.isKey(next)) { if (isKey(next)) {
if (pages === false) { if (pages === false) {
return { text: next, value: "next", disabled: hasNext(curr) === false }; return { text: next, value: "next", disabled: hasNext(curr) === false };
} }
@ -175,37 +172,37 @@ export default class Pager extends Widget {
} }
return { return {
el: BI.extend({ el: extend({
disabled: pages === false ? hasNext(curr) === false : !(curr !== pages && next || dict.flow), disabled: pages === false ? hasNext(curr) === false : !(curr !== pages && next || dict.flow),
}, next), }, next),
}; };
}())); }()));
} }
this.button_group = BI.createWidget({ this.button_group = createWidget({
type: "bi.button_group", type: "bi.button_group",
element: this, element: this,
items: BI.map(view, (idx, v) => { items: map(view, (idx, v) => {
v = BI.extend({ v = extend({
cls: "bi-list-item-select bi-border-radius", cls: "bi-list-item-select bi-border-radius",
height: 23, height: 23,
hgap: v.el ? 0 : 10, hgap: v.el ? 0 : 10,
stopPropagation: true, stopPropagation: true,
}, BI.stripEL(v)); }, stripEL(v));
return BI.formatEL(v); return formatEL(v);
}), }),
behaviors, behaviors,
layouts, layouts,
}); });
this.button_group.on(BI.Controller.EVENT_CHANGE, (type, value, obj, ...args) => { this.button_group.on(Controller.EVENT_CHANGE, (type, value, obj, ...args) => {
// if (self._lock === true) { // if (self._lock === true) {
// return; // return;
// } // }
// self._lock = true; // self._lock = true;
// self._debouce(); // self._debouce();
if (type === BI.Events.CLICK) { if (type === BI.Events.CLICK) {
var v = this.button_group.getValue()[0]; const v = this.button_group.getValue()[0];
switch (v) { switch (v) {
case "first": case "first":
this.currPage = 1; this.currPage = 1;
@ -224,13 +221,13 @@ export default class Pager extends Widget {
break; break;
} }
jump.apply(this, [{ jump.apply(this, [{
pages: pages, pages,
curr: this.currPage, curr: this.currPage,
}]); }]);
this._populate(); this._populate();
this.fireEvent(Pager.EVENT_CHANGE, obj); this.fireEvent(Pager.EVENT_CHANGE, obj);
} }
this.fireEvent.apply(this, [BI.Controller.EVENT_CHANGE, type, value, obj, ...args]); this.fireEvent(Controller.EVENT_CHANGE, type, value, obj, ...args);
}); });
this.fireEvent(Pager.EVENT_AFTER_POPULATE); this.fireEvent(Pager.EVENT_AFTER_POPULATE);
} }
@ -254,6 +251,7 @@ export default class Pager extends Widget {
hasNext(v) { hasNext(v) {
v || (v = 1); v || (v = 1);
const { pages, hasNext } = this.options; const { pages, hasNext } = this.options;
return pages === false ? hasNext(v) : v < pages; return pages === false ? hasNext(v) : v < pages;
} }
@ -263,8 +261,9 @@ export default class Pager extends Widget {
v = v || 0; v = v || 0;
v = v < 1 ? 1 : v; v = v < 1 ? 1 : v;
if (pages === false) { if (pages === false) {
var lastPage = BI.result(o, "lastPage"), firstPage = 1; const lastPage = result(o, "lastPage");
this.currPage = v > lastPage ? lastPage : ((firstPage = BI.result(o, "firstPage")), (v < firstPage ? firstPage : v)); let firstPage = 1;
this.currPage = v > lastPage ? lastPage : ((firstPage = result(o, "firstPage")), (v < firstPage ? firstPage : v));
} else { } else {
v = v > pages ? pages : v; v = v > pages ? pages : v;
this.currPage = v; this.currPage = v;
@ -289,9 +288,9 @@ export default class Pager extends Widget {
} }
attr(key, value) { attr(key, value) {
super.attr(arguments); super.attr(...arguments);
if (key === "curr") { if (key === "curr") {
this.currPage = BI.result(this.options, "curr"); this.currPage = result(this.options, "curr");
} }
} }

10
src/base/single/a/a.js
Unescape View File

@ -6,7 +6,7 @@
* @extends BI.Text * @extends BI.Text
* @abstract * @abstract
*/ */
import { shortcut } from "../../../core"; import { shortcut, extend, createWidget } from "../../../core";
import { Text } from "../1.text"; import { Text } from "../1.text";
@shortcut() @shortcut()
export class A extends Text { export class A extends Text {
@ -14,8 +14,9 @@ export class A extends Text {
_defaultConfig() { _defaultConfig() {
const conf = super._defaultConfig(arguments); const conf = super._defaultConfig(arguments);
return BI.extend(conf, {
baseCls: (conf.baseCls || "") + " bi-a display-block", return extend(conf, {
baseCls: `${conf.baseCls || ""} bi-a display-block`,
href: "", href: "",
target: "_blank", target: "_blank",
el: null, el: null,
@ -28,10 +29,9 @@ export class A extends Text {
super.render(); super.render();
this.element.attr({ href, target }); this.element.attr({ href, target });
if (el) { if (el) {
BI.createWidget(el, { createWidget(el, {
element: this, element: this,
}); });
} }
} }
} }

2
src/base/single/index.js
Unescape View File

@ -8,4 +8,4 @@ export * from "./tip";
export * from "./label"; export * from "./label";
export * from "./input"; export * from "./input";
export * from "./editor"; export * from "./editor";
export * from "./button" export * from "./button";

6
src/base/single/tip/0.tip.js
Unescape View File

@ -8,11 +8,13 @@
*/ */
import { Single } from "../0.single"; import { Single } from "../0.single";
import { extend } from "../../../core";
export class Tip extends Single { export class Tip extends Single {
_defaultConfig() { _defaultConfig() {
const conf = super._defaultConfig(arguments); const conf = super._defaultConfig(arguments);
return BI.extend(conf, {
_baseCls: (conf._baseCls || "") + " bi-tip", return extend(conf, {
_baseCls: `${conf._baseCls || ""} bi-tip`,
zIndex: BI.zIndex_tip, zIndex: BI.zIndex_tip,
}); });
} }

25
src/base/single/tip/tip.toast.js
Unescape View File

@ -6,7 +6,7 @@
* @extends BI.Tip * @extends BI.Tip
*/ */
import { shortcut } from "../../../core"; import { shortcut, extend, isPlainObject } from "../../../core";
import { Tip } from "./0.tip"; import { Tip } from "./0.tip";
@shortcut() @shortcut()
export class Toast extends Tip { export class Toast extends Tip {
@ -21,7 +21,7 @@ export class Toast extends Tip {
static xtype = "bi.toast"; static xtype = "bi.toast";
_defaultConfig() { _defaultConfig() {
return BI.extend(super._defaultConfig(arguments), { return extend(super._defaultConfig(arguments), {
extraCls: "bi-toast", extraCls: "bi-toast",
text: "", text: "",
level: "success", // success或warning level: "success", // success或warning
@ -41,7 +41,7 @@ export class Toast extends Tip {
minWidth: BI.pixFormat(closable ? closableMinWidth : minWidth), minWidth: BI.pixFormat(closable ? closableMinWidth : minWidth),
maxWidth: BI.pixFormat(closable ? closableMaxWidth : maxWidth), maxWidth: BI.pixFormat(closable ? closableMaxWidth : maxWidth),
}); });
this.element.addClass("toast-" + level); this.element.addClass(`toast-${level}`);
function fn(e) { function fn(e) {
e.stopPropagation(); e.stopPropagation();
e.stopEvent(); e.stopEvent();
@ -82,14 +82,14 @@ export class Toast extends Tip {
} }
const items = [{ const items = [{
type: "bi.icon_label", type: "bi.icon_label",
cls: cls + " toast-icon", cls: `${cls} toast-icon`,
height: textHeight, height: textHeight,
}, { }, {
el: BI.isPlainObject(text) ? text : { el: isPlainObject(text) ? text : {
type: "bi.label", type: "bi.label",
whiteSpace: "normal", whiteSpace: "normal",
text: text, text,
textHeight: textHeight, textHeight,
textAlign: "left", textAlign: "left",
}, },
}]; }];
@ -111,17 +111,16 @@ export class Toast extends Tip {
return { return {
type: "bi.horizontal", type: "bi.horizontal",
horizontalAlign: BI.HorizontalAlign.Stretch, horizontalAlign: BI.HorizontalAlign.Stretch,
items: items, items,
hgap: hgap, hgap,
vgap: vgap, vgap,
innerHgap: innerHgap, innerHgap,
columnSize: columnSize, columnSize,
}; };
} }
beforeDestroy() { beforeDestroy() {
this.fireEvent(Toast.EVENT_DESTORY); this.fireEvent(Toast.EVENT_DESTORY);
} }
} }

25
src/base/single/tip/tip.tooltip.js
Unescape View File

@ -6,7 +6,7 @@
* @extends BI.Tip * @extends BI.Tip
*/ */
import { shortcut } from "../../../core"; import { shortcut, extend, createWidget, map } from "../../../core";
import { Tip } from "./0.tip"; import { Tip } from "./0.tip";
@shortcut() @shortcut()
export class Tooltip extends Tip { export class Tooltip extends Tip {
@ -17,7 +17,7 @@ export class Tooltip extends Tip {
static xtype = "bi.tooltip"; static xtype = "bi.tooltip";
_defaultConfig() { _defaultConfig() {
return BI.extend(super._defaultConfig(arguments), { return extend(super._defaultConfig(arguments), {
extraCls: "bi-tooltip", extraCls: "bi-tooltip",
text: "", text: "",
level: "success", // success或warning level: "success", // success或warning
@ -29,7 +29,7 @@ export class Tooltip extends Tip {
render () { render () {
const { level, stopPropagation, stopEvent, text, textAlign } = this.options; const { level, stopPropagation, stopEvent, text, textAlign } = this.options;
this.element.addClass("tooltip-" + level); this.element.addClass(`tooltip-${level}`);
function fn(e) { function fn(e) {
stopPropagation && e.stopPropagation(); stopPropagation && e.stopPropagation();
stopEvent && e.stopEvent(); stopEvent && e.stopEvent();
@ -44,31 +44,31 @@ export class Tooltip extends Tip {
mousemove: fn, mousemove: fn,
}); });
const texts = (text + "").split("\n"); const texts = (`${text}`).split("\n");
if (texts.length > 1) { if (texts.length > 1) {
BI.createWidget({ createWidget({
type: "bi.vertical", type: "bi.vertical",
element: this, element: this,
hgap: this._const.hgap, hgap: this._const.hgap,
innerVgap: this._const.vgap, innerVgap: this._const.vgap,
items: BI.map(texts, (i, text) => { items: map(texts, (i, text) => {
return { return {
type: "bi.label", type: "bi.label",
textAlign: textAlign, textAlign,
whiteSpace: "normal", whiteSpace: "normal",
text: text, text,
textHeight: 18, textHeight: 18,
title: null, title: null,
}; };
}), }),
}); });
} else { } else {
this.text = BI.createWidget({ this.text = createWidget({
type: "bi.label", type: "bi.label",
element: this, element: this,
textAlign: textAlign, textAlign,
whiteSpace: "normal", whiteSpace: "normal",
text: text, text,
title: null, title: null,
textHeight: 18, textHeight: 18,
hgap: this._const.hgap, hgap: this._const.hgap,
@ -87,7 +87,6 @@ export class Tooltip extends Tip {
setLevel(level) { setLevel(level) {
this.element.removeClass("tooltip-success").removeClass("tooltip-warning"); this.element.removeClass("tooltip-success").removeClass("tooltip-warning");
this.element.addClass("tooltip-" + level); this.element.addClass(`tooltip-${level}`);
} }
} }

137
src/base/tree/customtree.js
Unescape View File

@ -6,9 +6,15 @@
* @class BI.CustomTree * @class BI.CustomTree
* @extends BI.Single * @extends BI.Single
*/ */
BI.CustomTree = BI.inherit(BI.Widget, { import { Widget, shortcut, extend, emptyFn, Tree, each, isNotEmptyArray, deepClone, stripEL, isWidget,
_defaultConfig: function () { clone, isNotNull, isNull, createWidget, Controller } from "../../core";
return BI.extend(BI.CustomTree.superclass._defaultConfig.apply(this, arguments), { @shortcut()
export class CustomTree extends Widget {
static xtype = "bi.custom_tree";
static EVENT_CHANGE = "EVENT_CHANGE";
_defaultConfig() {
return extend(super._defaultConfig(...arguments), {
baseCls: "bi-custom-tree", baseCls: "bi-custom-tree",
expander: { expander: {
el: {}, el: {},
@ -18,7 +24,7 @@ BI.CustomTree = BI.inherit(BI.Widget, {
}, },
items: [], items: [],
itemsCreator: BI.emptyFn, itemsCreator: emptyFn,
el: { el: {
type: "bi.button_tree", type: "bi.button_tree",
@ -28,50 +34,49 @@ BI.CustomTree = BI.inherit(BI.Widget, {
}], }],
}, },
}); });
}, }
_init() {
_init: function () { super._init(...arguments);
BI.CustomTree.superclass._init.apply(this, arguments);
this.initTree(this.options.items); this.initTree(this.options.items);
}, }
_formatItems: function (nodes) { _formatItems(nodes) {
var self = this, o = this.options; const { expander, itemsCreator } = this.options;
nodes = BI.Tree.transformToTreeFormat(nodes); nodes = Tree.transformToTreeFormat(nodes);
var items = []; const items = [];
BI.each(nodes, function (i, node) { each(nodes, (i, node) => {
if (BI.isNotEmptyArray(node.children) || node.isParent === true) { if (isNotEmptyArray(node.children) || node.isParent === true) {
var item = BI.extend({ const item = extend({
type: "bi.expander", type: "bi.expander",
el: { el: {
value: node.value, value: node.value,
}, },
popup: { type: "bi.custom_tree" }, popup: { type: "bi.custom_tree" },
}, BI.deepClone(o.expander), { }, deepClone(expander), {
id: node.id, id: node.id,
pId: node.pId, pId: node.pId,
}); });
var el = BI.stripEL(node); let el = stripEL(node);
if (!BI.isWidget(el)) { if (!isWidget(el)) {
el = BI.clone(el); el = clone(el);
delete el.children; delete el.children;
BI.extend(item.el, el); extend(item.el, el);
} else { } else {
item.el = el; item.el = el;
} }
item.popup.expander = BI.deepClone(o.expander); item.popup.expander = deepClone(expander);
item.items = item.popup.items = node.children; item.items = item.popup.items = node.children;
item.itemsCreator = item.popup.itemsCreator = function (op) { item.itemsCreator = item.popup.itemsCreator = (op, ...arg) => {
if (BI.isNotNull(op.node)) {// 从子节点传过来的itemsCreator直接向上传递 if (isNotNull(op.node)) {// 从子节点传过来的itemsCreator直接向上传递
return o.itemsCreator.apply(self, arguments); return itemsCreator(op, ...arg);
} }
var args = Array.prototype.slice.call(arguments, 0); const args = Array.prototype.slice.call([op, ...arg], 0);
args[0].node = node; args[0].node = node;
return o.itemsCreator.apply(self, args); return itemsCreator.apply(this, args);
}; };
BI.isNull(item.popup.el) && (item.popup.el = BI.deepClone(o.el)); isNull(item.popup.el) && (item.popup.el = deepClone(this.options.el));
items.push(item); items.push(item);
} else { } else {
items.push(node); items.push(node);
@ -79,72 +84,68 @@ BI.CustomTree = BI.inherit(BI.Widget, {
}); });
return items; return items;
}, }
// 构造树结构， // 构造树结构，
initTree: function (nodes) { initTree(nodes) {
var self = this, o = this.options; const { el, itemsCreator, value } = this.options;
this.tree = BI.createWidget(o.el, { this.tree = createWidget(el, {
element: this, element: this,
items: this._formatItems(nodes), items: this._formatItems(nodes),
itemsCreator: function (op, callback) { itemsCreator: (op, callback) => {
o.itemsCreator.apply(this, [op, function (items) { itemsCreator.apply(this, [op, items => {
var args = Array.prototype.slice.call(arguments, 0); const args = Array.prototype.slice.call(arguments, 0);
args[0] = self._formatItems(items); args[0] = this._formatItems(items);
callback.apply(null, args); callback(...args);
}]); }]);
}, },
value: o.value, value,
}); });
this.tree.on(BI.Controller.EVENT_CHANGE, function (type, val, obj) { this.tree.on(Controller.EVENT_CHANGE, (type, val, obj, ...args) => {
self.fireEvent(BI.Controller.EVENT_CHANGE, arguments); this.fireEvent(Controller.EVENT_CHANGE, type, val, obj, ...args);
if (type === BI.Events.CLICK) { if (type === BI.Events.CLICK) {
self.fireEvent(BI.CustomTree.EVENT_CHANGE, val, obj); this.fireEvent(CustomTree.EVENT_CHANGE, val, obj);
} }
}); });
}, }
// 生成树方法 // 生成树方法
stroke: function (nodes) { stroke(nodes) {
this.populate.apply(this, arguments); this.populate(...arguments);
}, }
populate: function (nodes) { populate(nodes) {
var args = Array.prototype.slice.call(arguments, 0); const args = Array.prototype.slice.call(arguments, 0);
if (arguments.length > 0) { if (arguments.length > 0) {
args[0] = this._formatItems(nodes); args[0] = this._formatItems(nodes);
} }
this.tree.populate.apply(this.tree, args); this.tree.populate(...args);
}, }
setValue: function (v) { setValue(v) {
this.tree && this.tree.setValue(v); this.tree && this.tree.setValue(v);
}, }
getValue: function () { getValue() {
return this.tree ? this.tree.getValue() : []; return this.tree ? this.tree.getValue() : [];
}, }
getAllButtons: function () { getAllButtons() {
return this.tree ? this.tree.getAllButtons() : []; return this.tree ? this.tree.getAllButtons() : [];
}, }
getAllLeaves: function () { getAllLeaves() {
return this.tree ? this.tree.getAllLeaves() : []; return this.tree ? this.tree.getAllLeaves() : [];
}, }
getNodeById: function (id) { getNodeById(id) {
return this.tree && this.tree.getNodeById(id); return this.tree && this.tree.getNodeById(id);
}, }
getNodeByValue: function (id) { getNodeByValue(id) {
return this.tree && this.tree.getNodeByValue(id); return this.tree && this.tree.getNodeByValue(id);
}, }
empty: function () { empty() {
this.tree.empty(); this.tree.empty();
}, }
}); }
BI.CustomTree.EVENT_CHANGE = "EVENT_CHANGE";
BI.shortcut("bi.custom_tree", BI.CustomTree);

Write Preview
Loading…
Cancel
Save