From 9e9bcbf38367ca5d68fd2ca4bd5818fa9a13092b Mon Sep 17 00:00:00 2001 From: Mio Date: Thu, 22 Apr 2021 23:28:31 +0800 Subject: [PATCH] =?UTF-8?q?JSY-4371=20feat:=20=E6=8F=90=E4=BE=9B=E6=9C=80?= =?UTF-8?q?=E5=90=8E=E4=B8=80=E8=A1=8C=E6=9C=80=E5=90=8E=E4=B8=80=E5=88=97?= =?UTF-8?q?=E6=A0=87=E8=AE=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/base/collection/collection.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/base/collection/collection.js b/src/base/collection/collection.js index 404903384..6ef7ed813 100644 --- a/src/base/collection/collection.js +++ b/src/base/collection/collection.js @@ -156,11 +156,13 @@ BI.CollectionView = BI.inherit(BI.Widget, { border[offset] = 0; } }; + var lastDatum = BI.last(BI.sortBy(childrenToDisplay, function (index, child) { + return (child.x + child.width + child.y + child.height); + })); 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; - var lastDatum = childrenToDisplay[len - 1]; if (index >= 0) { if (datum.width !== this.renderedCells[index]._width) { this.renderedCells[index]._width = datum.width; @@ -183,7 +185,7 @@ BI.CollectionView = BI.inherit(BI.Widget, { width: datum.width, height: datum.height }, o.items[datum.index], { - cls: (o.items[datum.index].cls || "") + " collection-cell" + (datum.y === 0 ? " first-row" : "") + (datum.x === 0 ? " first-col" : "") + (datum.row === lastDatum.row ? " last-row" : "") + (datum.col === lastDatum.col ? " last-col" : ""), + cls: (o.items[datum.index].cls || "") + " collection-cell" + (datum.y === 0 ? " first-row" : "") + (datum.x === 0 ? " first-col" : "") + ((datum.height + datum.y) === (lastDatum.height + lastDatum.y) ? " last-row" : "") + ((datum.width + datum.x) === (lastDatum.width + lastDatum.x) ? " last-col" : ""), _left: datum.x, _top: datum.y }));