Merging in latest from upstream (VISUAL/fineui:refs/heads/es6)

* commit 'b25759f4c8c57ce562c3f4ce1204ef70941a9ee1':
  KERNEL-14022 refact: textitem
  KERNEL-13972 refactor: import不换行
  KERNEL-13972 refactor: base/collection、base/tree es6化和修改bi.xxx
  KERNEL-14022 refact: 按钮干掉 apply

src/base/collection/collection.js

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

src/base/grid/grid.js

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

src/base/index.js

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

src/base/layer/layer.drawer.js

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

src/base/layer/layer.popover.js

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

src/base/layer/layer.popup.js

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

src/base/layer/layer.searcher.js

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

src/base/list/listview.js

@@ -5,7 +5,7 @@
  * @class BI.ListView
  * @extends BI.Widget
  */
-import { Widget, shortcut } from "../../core";
+import { Widget, shortcut, extend, isFunction } from "../../core";
 @shortcut()
 export class ListView extends Widget {
     props() {
@@ -16,9 +16,7 @@ export class ListView extends Widget {
             scrollTop: 0,
             el: {},
             items: [],
-        itemFormatter: (item, index) => {
-            return item;
-        },
+            itemFormatter: (item, index) => item,
         };
     }
 
@@ -34,10 +32,10 @@ export class ListView extends Widget {
 
       return {
           type: "bi.vertical",
-          items: [BI.extend({
+          items: [extend({
               type: "bi.vertical",
               scrolly: false,
-              ref: (_ref) => {
+              ref: _ref => {
                   this.container = _ref;
               },
           }, el)],
@@ -49,11 +47,11 @@ export class ListView extends Widget {
   mounted() {
       const o = 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);
       }) : o.items;
       this._populate();
-    this.element.scroll((e) => {
+      this.element.scroll(e => {
           o.scrollTop = this.element.scrollTop();
           this._calculateBlocksToRender();
       });
@@ -81,19 +79,16 @@ export class ListView extends Widget {
       let cnt = this.renderedIndex + 1;
       let lastHeight;
 
-    const getElementHeight = () => {
-      return this.container.element.height();
-    }
+      const getElementHeight = () => this.container.element.height();
 
       lastHeight = getElementHeight();
       while ((lastHeight) < minContentHeight && index < items.length) {
           const itemsArr = items.slice(index, index + blockSize);
-        this.container.addItems(itemsArr.map((item, i) => {
-            return itemFormatter(item, index + i);
-        }), this);
+          // eslint-disable-next-line no-loop-func
+          this.container.addItems(itemsArr.map((item, i) => itemFormatter(item, index + i)), this);
           const addedHeight = getElementHeight() - lastHeight;
           this.cache[cnt] = {
-            index: index,
+              index,
               scrollTop: lastHeight,
               height: addedHeight,
           };
@@ -144,6 +139,5 @@ export class ListView extends Widget {
       BI.ResizeDetector.removeResizeListener(this);
       this.restore();
   }
-
 }
 

src/base/list/virtualgrouplist.js

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

src/base/list/virtuallist.js

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

src/base/pager/pager.js

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

src/base/single/a/a.js

@@ -6,7 +6,7 @@
  * @extends BI.Text
  * @abstract
  */
-import { shortcut } from "../../../core";
+import { shortcut, extend, createWidget } from "../../../core";
 import { Text } from "../1.text";
 @shortcut()
 export class A extends Text {
@@ -14,8 +14,9 @@ export class A extends Text {
   
   _defaultConfig() {
       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: "",
           target: "_blank",
           el: null,
@@ -24,14 +25,13 @@ export class A extends Text {
   }
 
   render() {
-    const { href, target, el} = this.options;
+      const { href, target, el } = this.options;
       super.render();
       this.element.attr({ href, target });
       if (el) {
-        BI.createWidget(el, {
+          createWidget(el, {
               element: this,
           });
       }
   }
-
 }

src/base/single/button/button.basic.js

@@ -439,7 +439,7 @@ export class BasicButton extends Single {
     }
 
     _setEnable(enable) {
-        super._setEnable.apply(this, arguments);
+        super._setEnable(...arguments);
         if (enable === true) {
             this.element.removeClass("base-disabled disabled");
         } else if (enable === false) {
@@ -454,7 +454,7 @@ export class BasicButton extends Single {
 
     empty() {
         Widget._renderEngine.createElement(document).unbind(`mouseup.${this.getName()}`);
-        super.empty.apply(this, arguments);
+        super.empty(...arguments);
     }
 }
 

src/base/single/button/button.node.js

@@ -27,11 +27,11 @@ export class NodeButton extends BasicButton {
         if (this.isOpened()) {
             this.setOpened(this.isOpened());
         }
-        super._initRef.apply(this, arguments);
+        super._initRef(...arguments);
     }
 
     doClick() {
-        super.doClick.apply(this, arguments);
+        super.doClick(...arguments);
         this.setOpened(!this.isOpened());
     }
 

src/base/single/button/buttons/button.icon.js

@@ -8,7 +8,6 @@ import { shortcut, extend, isNumber, createWidget, isNull } from "../../../../co
  */
 @shortcut()
 export class IconButton extends BasicButton {
-
     static EVENT_CHANGE = "EVENT_CHANGE";
     static xtype = "bi.icon_button";
 
@@ -16,7 +15,7 @@ export class IconButton extends BasicButton {
         const conf = super._defaultConfig(arguments);
 
         return extend(conf, {
-            _baseCls: (conf._baseCls || "") + " bi-icon-button horizon-center",
+            _baseCls: `${conf._baseCls || ""} bi-icon-button horizon-center`,
             hgap: 0,
             vgap: 0,
             tgap: 0,
@@ -68,7 +67,7 @@ export class IconButton extends BasicButton {
     }
 
     doClick() {
-        super.doClick.apply(this, arguments);
+        super.doClick(...arguments);
         if (this.isValid()) {
             this.fireEvent(IconButton.EVENT_CHANGE, this);
         }

src/base/single/button/buttons/button.image.js

@@ -50,12 +50,12 @@ export class ImageButton extends BasicButton {
     }
 
     setWidth(w) {
-        super.setWidth.apply(this, arguments);
+        super.setWidth(...arguments);
         this.options.width = w;
     }
 
     setHeight(h) {
-        super.setHeight.apply(this, arguments);
+        super.setHeight(...arguments);
         this.options.height = h;
     }
 
@@ -85,7 +85,7 @@ export class ImageButton extends BasicButton {
     }
 
     doClick() {
-        super.doClick.apply(this, arguments);
+        super.doClick(...arguments);
         if (this.isValid()) {
             this.fireEvent(ImageButton.EVENT_CHANGE, this);
         }

src/base/single/button/buttons/button.js

@@ -188,14 +188,14 @@ export class Button extends BasicButton {
     }
 
     doClick() {
-        super.doClick.apply(this, arguments);
+        super.doClick(...arguments);
         if (this.isValid()) {
             this.fireEvent(Button.EVENT_CHANGE, this);
         }
     }
 
     _setEnable(enable) {
-        super._setEnable.apply(this, arguments);
+        super._setEnable(...arguments);
         if (enable === true) {
             this.element.attr("tabIndex", 1);
         } else if (enable === false) {
@@ -236,12 +236,12 @@ export class Button extends BasicButton {
     }
 
     setText(text) {
-        super.setText.apply(this, arguments);
+        super.setText(...arguments);
         this.text.setText(text);
     }
 
     setValue(text) {
-        super.setValue.apply(this, arguments);
+        super.setValue(...arguments);
         if (!this.isReadOnly()) {
             this.text.setValue(text);
         }

src/base/single/button/buttons/button.text.js

@@ -1,5 +1,5 @@
 import { BasicButton } from "../button.basic";
-import { shortcut, extend, createWidget } from "../../../../core";
+import { shortcut, extend, createWidget, isArray } from "../../../../core";
 
 /**
  * guy
@@ -53,9 +53,9 @@ export class TextButton extends BasicButton {
     }
 
     doClick() {
-        super.doClick.apply(this, arguments);
+        super.doClick(...arguments);
         if (this.isValid()) {
-            this.fireEvent(BI.TextButton.EVENT_CHANGE, this.getValue(), this);
+            this.fireEvent(TextButton.EVENT_CHANGE, this.getValue(), this);
         }
     }
 
@@ -76,8 +76,8 @@ export class TextButton extends BasicButton {
     }
 
     setText(text) {
-        super.setText.apply(this, arguments);
-        text = BI.isArray(text) ? text.join(",") : text;
+        super.setText(...arguments);
+        text = isArray(text) ? text.join(",") : text;
         this.text.setText(text);
     }
 
@@ -86,9 +86,9 @@ export class TextButton extends BasicButton {
     }
 
     setValue(text) {
-        super.setValue.apply(this, arguments);
+        super.setValue(...arguments);
         if (!this.isReadOnly()) {
-            text = BI.isArray(text) ? text.join(",") : text;
+            text = isArray(text) ? text.join(",") : text;
             this.text.setValue(text);
         }
     }

src/base/single/button/listitem/blankiconicontextitem.js

@@ -1,5 +1,5 @@
 import { BasicButton } from "../button.basic";
-import { shortcut } from "../../../../core";
+import { shortcut, extend } from "../../../../core";
 
 /**
  * 带有一个占位
@@ -16,7 +16,7 @@ export class BlankIconIconTextItem extends BasicButton {
     _defaultConfig() {
         const conf = super._defaultConfig(arguments);
 
-        return BI.extend(conf, {
+        return extend(conf, {
             baseCls: `${conf.baseCls || ""} bi-blank-icon-icon-text-item`,
             iconCls1: "",
             iconCls2: "",
@@ -74,14 +74,14 @@ export class BlankIconIconTextItem extends BasicButton {
     }
 
     doClick() {
-        super.doClick.apply(this, arguments);
+        super.doClick(...arguments);
         if (this.isValid()) {
             this.fireEvent(BlankIconIconTextItem.EVENT_CHANGE, this.getValue(), this);
         }
     }
 
     setSelected(b) {
-        super.setSelected.apply(this, arguments);
+        super.setSelected(...arguments);
         this.icon1.setSelected(b);
         this.icon2.setSelected(b);
     }

src/base/single/button/listitem/blankicontexticonitem.js

@@ -75,7 +75,7 @@ export class BlankIconTextIconItem extends BasicButton {
     }
 
     doClick() {
-        super.doClick.apply(this, arguments);
+        super.doClick(...arguments);
         if (this.isValid()) {
             this.fireEvent(BI.BlankIconTextIconItem.EVENT_CHANGE, this.getValue(), this);
         }

src/base/single/button/listitem/blankicontextitem.js

@@ -67,7 +67,7 @@ export class BlankIconTextItem extends BasicButton {
     }
 
     doClick() {
-        super.doClick.apply(this, arguments);
+        super.doClick(...arguments);
         if (this.isValid()) {
             this.fireEvent(BlankIconTextItem.EVENT_CHANGE, this.getValue(), this);
         }

src/base/single/button/listitem/icontexticonitem.js

@@ -72,7 +72,7 @@ export class IconTextIconItem extends BasicButton {
     }
 
     doClick() {
-        super.doClick.apply(this, arguments);
+        super.doClick(...arguments);
         if (this.isValid()) {
             this.fireEvent(IconTextIconItem.EVENT_CHANGE, this.getValue(), this);
         }

src/base/single/button/listitem/icontextitem.js

@@ -65,9 +65,9 @@ export class IconTextItem extends BasicButton {
     }
 
     doClick() {
-        super.doClick.apply(this, arguments);
+        super.doClick(...arguments);
         if (this.isValid()) {
-            this.fireEvent(BI.IconTextItem.EVENT_CHANGE, this.getValue(), this);
+            this.fireEvent(IconTextItem.EVENT_CHANGE, this.getValue(), this);
         }
     }
 

src/base/single/button/listitem/texticonitem.js

@@ -39,8 +39,8 @@ export class TextIconItem extends BasicButton {
             items: [{
                 el: {
                     type: "bi.label",
-                    ref (_ref) {
-                        self.text = _ref;
+                    ref: _ref => {
+                        this.text = _ref;
                     },
                     cls: "list-item-text",
                     textAlign: "left",
@@ -65,7 +65,7 @@ export class TextIconItem extends BasicButton {
     }
 
     doClick() {
-        super.doClick.apply(this, arguments);
+        super.doClick(...arguments);
         if (this.isValid()) {
             this.fireEvent(TextIconItem.EVENT_CHANGE, this.getValue(), this);
         }

src/base/single/button/listitem/textitem.js

@@ -1,5 +1,5 @@
 import { BasicButton } from "../button.basic";
-import { extend, shortcut } from "../../../../core";
+import { extend, shortcut, createWidget } from "../../../../core";
 
 /**
  * guy
@@ -9,7 +9,7 @@ import { extend, shortcut } from "../../../../core";
  * @class TextItem
  * @extends BasicButton
  */
-@shortcut
+@shortcut()
 export class TextItem extends BasicButton {
     static xtype = "bi.text_item";
     static EVENT_CHANGE = "EVENT_CHANGE";
@@ -30,7 +30,7 @@ export class TextItem extends BasicButton {
 
     render() {
         const o = this.options;
-        this.text = BI.createWidget({
+        this.text = createWidget({
             type: "bi.label",
             element: this,
             textAlign: o.textAlign,
@@ -49,9 +49,9 @@ export class TextItem extends BasicButton {
     }
 
     doClick() {
-        super.doClick.apply(this, arguments);
+        super.doClick(...arguments);
         if (this.isValid()) {
-            this.fireEvent(BI.TextItem.EVENT_CHANGE, this.getValue(), this);
+            this.fireEvent(TextItem.EVENT_CHANGE, this.getValue(), this);
         }
     }
 

src/base/single/button/node/icontexticonnode.js

@@ -69,7 +69,7 @@ export class IconTextIconNode extends NodeButton {
     }
 
     doClick() {
-        super.doClick.apply(this, arguments);
+        super.doClick(...arguments);
         if (this.isValid()) {
             this.fireEvent(IconTextIconNode.EVENT_CHANGE, this.getValue(), this);
         }

src/base/single/button/node/icontextnode.js

@@ -62,9 +62,9 @@ export class IconTextNode extends NodeButton {
     }
 
     doClick() {
-        super.doClick.apply(this, arguments);
+        super.doClick(...arguments);
         if (this.isValid()) {
-            this.fireEvent(BI.IconTextNode.EVENT_CHANGE, this.getValue(), this);
+            this.fireEvent(IconTextNode.EVENT_CHANGE, this.getValue(), this);
         }
     }
 

src/base/single/button/node/texticonnode.js

@@ -61,7 +61,7 @@ export default class TextIconNode extends NodeButton {
     }
 
     doClick() {
-        super.doClick.apply(this, arguments);
+        super.doClick(...arguments);
         if (this.isValid()) {
             this.fireEvent(TextIconNode.EVENT_CHANGE, this.getValue(), this);
         }

src/base/single/button/node/textnode.js

@@ -1,5 +1,5 @@
 import { NodeButton } from "../button.node";
-import { extend, shortcut } from "../../../../core";
+import { extend, shortcut, createWidget } from "../../../../core";
 
 /**
  * guy
@@ -31,7 +31,7 @@ export class TextNode extends NodeButton {
 
     render() {
         const o = this.options;
-        this.text = BI.createWidget({
+        this.text = createWidget({
             type: "bi.label",
             element: this,
             textAlign: o.textAlign,
@@ -50,7 +50,7 @@ export class TextNode extends NodeButton {
     }
 
     doClick() {
-        super.doClick.apply(this, arguments);
+        super.doClick(...arguments);
         if (this.isValid()) {
             this.fireEvent(TextNode.EVENT_CHANGE, this.getValue(), this);
         }

src/base/single/index.js

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

src/base/single/tip/0.tip.js

@@ -8,11 +8,13 @@
  */
 
 import { Single } from "../0.single";
+import { extend } from "../../../core";
 export class Tip extends Single {
     _defaultConfig() {
         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,
         });
     }

src/base/single/tip/tip.toast.js

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

src/base/single/tip/tip.tooltip.js

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

src/base/tree/customtree.js

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

src/case/button/icon/icon.change.js

@@ -45,7 +45,7 @@ export class IconChangeButton extends Single {
         o.iconCls = isFunction(o.iconCls) ? this.__watch(o.iconCls, (context, newValue) => {
             this.setIcon(newValue);
         }) : o.iconCls;
-        super._init.apply(this, arguments);
+        super._init(...arguments);
         this.button = createWidget({
             type: "bi.icon_button",
             element: this,
@@ -69,10 +69,10 @@ export class IconChangeButton extends Single {
         });
 
         this.button.on(Controller.EVENT_CHANGE, (...args) => {
-            this.fireEvent(Controller.EVENT_CHANGE, args);
+            this.fireEvent(Controller.EVENT_CHANGE, ...args);
         });
         this.button.on(IconButton.EVENT_CHANGE, (...args) => {
-            this.fireEvent(IconChangeButton.EVENT_CHANGE, args);
+            this.fireEvent(IconChangeButton.EVENT_CHANGE, ...args);
         });
     }
 

src/case/button/icon/icon.trigger.js

@@ -11,7 +11,7 @@ import { shortcut, extend } from "../../../core";
 @shortcut()
 export class TriggerIconButton extends IconButton {
     static xtype = "bi.trigger_icon_button";
-    EVENT_CHANGE = IconButton.EVENT_CHANGE;
+    static EVENT_CHANGE = IconButton.EVENT_CHANGE;
     
     _defaultConfig() {
         const conf = super._defaultConfig(arguments);

src/case/button/icon/iconhalf/icon.half.js

@@ -38,7 +38,7 @@ export class HalfButton extends BasicButton {
     }
 
     doClick() {
-        super.doClick.apply(this, arguments);
+        super.doClick(...arguments);
         if (this.isValid()) {
             this.fireEvent(HalfButton.EVENT_CHANGE);
         }

src/case/button/item.multiselect.js

@@ -77,14 +77,14 @@ export class MultiSelectItem extends BasicButton {
     }
 
     doClick() {
-        BI.MultiSelectItem.superclass.doClick.apply(this, arguments);
+        super.doClick(...arguments);
         if (this.isValid()) {
-            this.fireEvent(BI.MultiSelectItem.EVENT_CHANGE, this.getValue(), this);
+            this.fireEvent(MultiSelectItem.EVENT_CHANGE, this.getValue(), this);
         }
     }
 
     setSelected(v) {
-        BI.MultiSelectItem.superclass.setSelected.apply(this, arguments);
+        super.setSelected(...arguments);
         this.checkbox.setSelected(v);
     }
 }

src/case/button/item.singleselect.icontext.js

@@ -43,13 +43,13 @@ export class SingleSelectIconTextItem extends Single {
             value: o.value,
             py: o.py,
         });
-        this.text.on(Controller.EVENT_CHANGE, function () {
-            self.fireEvent(Controller.EVENT_CHANGE, arguments);
+        this.text.on(Controller.EVENT_CHANGE, (...args) => {
+            this.fireEvent(Controller.EVENT_CHANGE, ...args);
         });
     }
 
     _setEnable(enable) {
-        super._setEnable.apply(this, arguments);
+        super._setEnable(...arguments);
         if (enable === true) {
             this.element.attr("tabIndex", 1);
         } else if (enable === false) {

src/case/button/item.singleselect.js

@@ -39,7 +39,7 @@ export class SingleSelectItem extends BasicButton {
     }
 
     _setEnable(enable) {
-        super._setEnable.apply(this, arguments);
+        super._setEnable(...arguments);
         if (enable === true) {
             this.element.attr("tabIndex", 1);
         } else if (enable === false) {
@@ -56,14 +56,14 @@ export class SingleSelectItem extends BasicButton {
     }
 
     doClick() {
-        super.doClick.apply(this, arguments);
+        super.doClick(...arguments);
         if (this.isValid()) {
             this.fireEvent(SingleSelectItem.EVENT_CHANGE, this.isSelected(), this);
         }
     }
 
     setSelected(v) {
-        super.setSelected.apply(this, arguments);
+        super.setSelected(...arguments);
     }
 }
 

src/case/button/item.singleselect.radio.js

@@ -62,7 +62,7 @@ export class SingleSelectRadioItem extends BasicButton {
     }
 
     _setEnable(enable) {
-        super._setEnable.apply(this, arguments);
+        super._setEnable(...arguments);
         if (enable === true) {
             this.element.attr("tabIndex", 1);
         } else if (enable === false) {
@@ -79,14 +79,14 @@ export class SingleSelectRadioItem extends BasicButton {
     }
 
     doClick() {
-        BI.SingleSelectRadioItem.superclass.doClick.apply(this, arguments);
+        super.doClick(...arguments);
         if (this.isValid()) {
-            this.fireEvent(BI.SingleSelectRadioItem.EVENT_CHANGE, this.isSelected(), this);
+            this.fireEvent(SingleSelectRadioItem.EVENT_CHANGE, this.isSelected(), this);
         }
     }
 
     setSelected(v) {
-        BI.SingleSelectRadioItem.superclass.setSelected.apply(this, arguments);
+        super.setSelected(...arguments);
         this.radio.setSelected(v);
     }
 }

src/case/button/node/node.arrow.js

@@ -64,17 +64,17 @@ export class ArrowNode extends NodeButton {
     }
 
     doClick() {
-        super.doClick.apply(this, arguments);
+        super.doClick(...arguments);
         this.checkbox.setSelected(this.isOpened());
     }
 
     setText(text) {
-        super.setText.apply(this, arguments);
+        super.setText(...arguments);
         this.text.setText(text);
     }
 
     setOpened(v) {
-        super.setOpened.apply(this, arguments);
+        super.setOpened(...arguments);
         this.checkbox.setSelected(v);
     }
 }

src/case/button/node/node.first.plus.js

@@ -78,12 +78,12 @@ export class FirstPlusGroupNode extends NodeButton {
     }
 
     doClick() {
-        super.doClick.apply(this, arguments);
+        super.doClick(...arguments);
         this.checkbox.setSelected(this.isSelected());
     }
 
     setOpened(v) {
-        super.setOpened.apply(this, arguments);
+        super.setOpened(...arguments);
         if (BI.isNotNull(this.checkbox)) {
             this.checkbox.setSelected(v);
         }

src/case/button/node/node.icon.arrow.js

@@ -1,5 +1,5 @@
 import { NodeButton } from "../../../base/single/button/button.node";
-import { shortcut, extend, createWidget, Controller } from "../../../core";
+import { shortcut, extend, createWidget, Controller, isNotNull } from "../../../core";
 
 /**
  * Created by User on 2016/3/31.
@@ -96,13 +96,13 @@ export class IconArrowNode extends NodeButton {
     }
 
     doClick() {
-        BI.IconArrowNode.superclass.doClick.apply(this, arguments);
+        super.doClick(...arguments);
         this.checkbox.setSelected(this.isSelected());
     }
 
     setOpened(v) {
-        BI.IconArrowNode.superclass.setOpened.apply(this, arguments);
-        if (BI.isNotNull(this.checkbox)) {
+        super.setOpened(...arguments);
+        if (isNotNull(this.checkbox)) {
             this.checkbox.setSelected(v);
         }
     }

src/case/button/node/node.last.plus.js

@@ -1,5 +1,5 @@
 import { NodeButton } from "../../../base/single/button/button.node";
-import { shortcut, extend, createWidget, isNotNull } from "../../../core";
+import { shortcut, extend, createWidget, isNotNull, Controller } from "../../../core";
 
 /**
  * 加号表示的组节点
@@ -46,7 +46,7 @@ export class LastPlusGroupNode extends NodeButton {
             py: o.py,
             keyword: o.keyword,
         });
-        this.checkbox.on(BI.Controller.EVENT_CHANGE, type => {
+        this.checkbox.on(Controller.EVENT_CHANGE, type => {
             if (type === BI.Events.CLICK) {
                 if (this.checkbox.isSelected()) {
                     this.triggerExpand();
@@ -76,12 +76,12 @@ export class LastPlusGroupNode extends NodeButton {
     }
 
     doClick() {
-        super.doClick.apply(this, arguments);
+        super.doClick(...arguments);
         this.checkbox.setSelected(this.isSelected());
     }
 
     setOpened(v) {
-        super.setOpened.apply(this, arguments);
+        super.setOpened(...arguments);
         if (isNotNull(this.checkbox)) {
             this.checkbox.setSelected(v);
         }

src/case/button/node/node.mid.plus.js

@@ -27,7 +27,7 @@ export class MidPlusGroupNode extends NodeButton {
     }
 
     _init() {
-        super._init.apply(this, arguments);
+        super._init(...arguments);
         const o = this.options;
         this.checkbox = createWidget({
             type: "bi.mid_tree_node_checkbox",
@@ -77,12 +77,12 @@ export class MidPlusGroupNode extends NodeButton {
     }
 
     doClick() {
-        super.doClick.apply(this, arguments);
+        super.doClick(...arguments);
         this.checkbox.setSelected(this.isSelected());
     }
 
     setOpened(v) {
-        BI.MidPlusGroupNode.superclass.setOpened.apply(this, arguments);
+        super.setOpened(...arguments);
         if (BI.isNotNull(this.checkbox)) {
             this.checkbox.setSelected(v);
         }

src/case/button/node/node.multilayer.icon.arrow.js

@@ -1,5 +1,5 @@
 import { NodeButton } from "../../../base/single/button/button.node";
-import { shortcut, extend, createWidget, Controller, count } from "../../../core";
+import { shortcut, extend, createWidget, Controller, count, makeArray } from "../../../core";
 
 @shortcut()
 export class MultiLayerIconArrowNode extends NodeButton {
@@ -22,7 +22,7 @@ export class MultiLayerIconArrowNode extends NodeButton {
     }
 
     _init() {
-        super._init.apply(this, arguments);
+        super._init(...arguments);
         const o = this.options;
         this.node = createWidget({
             type: "bi.icon_arrow_node",
@@ -42,7 +42,7 @@ export class MultiLayerIconArrowNode extends NodeButton {
         });
         this.node.on(Controller.EVENT_CHANGE, (...args) => {
             this.setSelected(this.isSelected());
-            this.fireEvent(Controller.EVENT_CHANGE, args);
+            this.fireEvent(Controller.EVENT_CHANGE, ...args);
         });
 
         const items = [];
@@ -57,7 +57,7 @@ export class MultiLayerIconArrowNode extends NodeButton {
         createWidget({
             type: "bi.horizontal_adapt",
             element: this,
-            columnSize: BI.makeArray(o.layer, 15),
+            columnSize: makeArray(o.layer, 15),
             items,
         });
     }
@@ -79,17 +79,17 @@ export class MultiLayerIconArrowNode extends NodeButton {
     }
 
     setSelected(b) {
-        super.setSelected.apply(this, arguments);
+        super.setSelected(...arguments);
         this.node.setSelected(b);
     }
 
     doClick() {
-        super.doClick.apply(this, arguments);
+        super.doClick(...arguments);
         this.node.setSelected(this.isSelected());
     }
 
     setOpened(v) {
-        super.setOpened.apply(this, arguments);
+        super.setOpened(...arguments);
         this.node.setOpened(v);
     }
 }

src/case/button/node/node.plus.js

@@ -73,12 +73,12 @@ export class PlusGroupNode extends NodeButton {
     }
 
     doClick() {
-        super.doClick.apply(this, arguments);
+        super.doClick(...arguments);
         this.checkbox.setSelected(this.isSelected());
     }
 
     setOpened(v) {
-        super.setOpened.apply(this, arguments);
+        super.setOpened(...arguments);
         if (this.checkbox) {
             this.checkbox.setSelected(v);
         }

src/case/button/node/siwtcher.tree.node.js

@@ -46,7 +46,7 @@ export class TreeNodeSwitcher extends NodeButton {
     }
 
     setOpened(b) {
-        super.setOpened.apply(this, arguments);
+        super.setOpened(...arguments);
         const [collapse, expand] = this.getIconCls();
         if (b) {
             this.element.addClass(expand).removeClass(collapse);
@@ -56,7 +56,7 @@ export class TreeNodeSwitcher extends NodeButton {
     }
 
     doClick() {
-        super.doClick.apply(this, arguments);
+        super.doClick(...arguments);
         this.fireEvent(TreeNodeSwitcher.EVENT_CHANGE, this);
     }
 }

src/case/button/node/treenode.js

@@ -28,7 +28,7 @@ export class BasicTreeNode extends NodeButton {
 
         const checkbox = {
             type: "bi.tree_node_switcher",
-            __ref: _ref => {
+            ref: _ref => {
                 this.switcher = _ref;
             },
             iconHeight: o.height,
@@ -97,16 +97,16 @@ export class BasicTreeNode extends NodeButton {
         if (this.options.selectable) {
             return;
         }
-        super.doClick.apply(this, arguments);
+        super.doClick(...arguments);
     }
 
     setOpened(v) {
-        super.setOpened.apply(this, arguments);
+        super.setOpened(...arguments);
         this.switcher.setOpened(v);
     }
 
     setValue() {
-        super.setValue.apply(this, arguments);
+        super.setValue(...arguments);
     }
 }
 

src/case/button/switch.js

@@ -72,7 +72,7 @@ export class Switch extends BasicButton {
     }
 
     _setEnable(enable) {
-        super._setEnable.apply(this, arguments);
+        super._setEnable(...arguments);
         if (enable === true) {
             this.element.attr("tabIndex", 1);
         } else if (enable === false) {
@@ -81,7 +81,7 @@ export class Switch extends BasicButton {
     }
 
     setSelected(v) {
-        super.setSelected.apply(this, arguments);
+        super.setSelected(...arguments);
         this.layout.attr("items")[0].left = v ? 28 : 4;
         this.layout.resize();
         this.options.showTip && this.openTip.setVisible(v);
@@ -89,7 +89,7 @@ export class Switch extends BasicButton {
     }
 
     doClick() {
-        super.doClick.apply(this, arguments);
+        super.doClick(...arguments);
         this.fireEvent(Switch.EVENT_CHANGE, this.isSelected());
     }
 }

src/case/button/treeitem/item.first.treeleaf.js

@@ -19,7 +19,7 @@ export class FirstTreeLeafItem extends BasicButton {
     }
 
     _init() {
-        super._init.apply(this, arguments);
+        super._init(...arguments);
         const o = this.options;
         this.text = createWidget({
             type: "bi.label",
@@ -55,7 +55,7 @@ export class FirstTreeLeafItem extends BasicButton {
         });
         createWidget(extend({
             element: this,
-        }, BI.LogicFactory.createLogic(type, BI.extend(o.logic, {
+        }, BI.LogicFactory.createLogic(type, extend(o.logic, {
             items,
         }))));
     }

src/case/button/treeitem/item.icon.treeleaf.js

@@ -19,7 +19,7 @@ export class IconTreeLeafItem extends BasicButton {
     }
 
     _init() {
-        super._init.apply(this, arguments);
+        super._init(...arguments);
         const o = this.options;
 
         const icon = createWidget({
@@ -52,9 +52,9 @@ export class IconTreeLeafItem extends BasicButton {
         }, {
             el: this.text,
         });
-        createWidget(BI.extend({
+        createWidget(extend({
             element: this,
-        }, BI.LogicFactory.createLogic(type, BI.extend(o.logic, {
+        }, BI.LogicFactory.createLogic(type, extend(o.logic, {
             items,
             hgap: 5,
         }))));

src/case/button/treeitem/item.last.treeleaf.js

@@ -19,7 +19,7 @@ export class LastTreeLeafItem extends BasicButton {
     }
 
     _init() {
-        super._init.apply(this, arguments);
+        super._init(...arguments);
         const o = this.options;
         this.text = createWidget({
             type: "bi.label",
@@ -53,7 +53,7 @@ export class LastTreeLeafItem extends BasicButton {
         }, {
             el: this.text,
         });
-        createWidget(BI.extend({
+        createWidget(extend({
             element: this,
         }, BI.LogicFactory.createLogic(type, extend(o.logic, {
             items,

src/case/button/treeitem/item.mid.treeleaf.js

@@ -19,7 +19,7 @@ export class MidTreeLeafItem extends BasicButton {
     }
 
     _init() {
-        super._init.apply(this, arguments);
+        super._init(...arguments);
         const o = this.options;
         this.text = createWidget({
             type: "bi.label",

src/case/button/treeitem/item.multilayer.icon.treeleaf.js

@@ -1,5 +1,5 @@
 import { BasicButton } from "../../../base/single/button/button.basic";
-import { shortcut, extend, createWidget, Controller, makeArray } from "../../../core";
+import { shortcut, extend, createWidget, Controller, makeArray, count } from "../../../core";
 
 /**
  * @class BI.MultiLayerIconTreeLeafItem
@@ -21,7 +21,7 @@ export class MultiLayerIconTreeLeafItem extends BasicButton {
     }
 
     _init() {
-        super._init.apply(this, arguments);
+        super._init(...arguments);
         const o = this.options;
         this.item = createWidget({
             type: "bi.icon_tree_leaf_item",
@@ -44,11 +44,11 @@ export class MultiLayerIconTreeLeafItem extends BasicButton {
             if (type === BI.Events.CLICK) {// 本身实现click功能
                 return;
             }
-            this.fireEvent(Controller.EVENT_CHANGE, args);
+            this.fireEvent(Controller.EVENT_CHANGE, ...args);
         });
 
         const items = [];
-        BI.count(0, o.layer, () => {
+        count(0, o.layer, () => {
             items.push({
                 type: "bi.layout",
                 width: 15,
@@ -89,12 +89,12 @@ export class MultiLayerIconTreeLeafItem extends BasicButton {
     }
 
     doClick () {
-        BI.MultiLayerIconTreeLeafItem.superclass.doClick.apply(this, arguments);
+        super.doClick(...arguments);
         this.item.setSelected(this.isSelected());
     }
 
     setSelected(v) {
-        BI.MultiLayerIconTreeLeafItem.superclass.setSelected.apply(this, arguments);
+        super.setSelected(...arguments);
         this.item.setSelected(v);
     }
 

src/case/button/treeitem/item.treetextleaf.js

@@ -24,7 +24,7 @@ export class TreeTextLeafItem extends BasicButton {
     }
 
     _init() {
-        super._init.apply(this, arguments);
+        super._init(...arguments);
         const o = this.options;
         this.text = createWidget({
             type: "bi.label",