|
@@ -83,16 +83,20 @@ export default ListModule.action({
|
|
}
|
|
}
|
|
// this.actions.shuffleSelf(arr, canvas.linesCount);
|
|
// this.actions.shuffleSelf(arr, canvas.linesCount);
|
|
|
|
|
|
- //计算总高度
|
|
|
|
|
|
+ //计算总宽度
|
|
let halfOffset = 0;
|
|
let halfOffset = 0;
|
|
arr.forEach((item) => {
|
|
arr.forEach((item) => {
|
|
const w = ((item.w * 1.0) / item.h) * itemOffset;
|
|
const w = ((item.w * 1.0) / item.h) * itemOffset;
|
|
item.offsetX = w + canvas.padding;
|
|
item.offsetX = w + canvas.padding;
|
|
halfOffset += item.offsetX;
|
|
halfOffset += item.offsetX;
|
|
});
|
|
});
|
|
-
|
|
|
|
|
|
+ let repeatArr: any = [];
|
|
|
|
+ const times = Math.ceil((canvas.width * 2) / halfOffset);
|
|
|
|
+ for (let i = 0; i < times; i++) {
|
|
|
|
+ repeatArr = [...repeatArr, ...arr];
|
|
|
|
+ }
|
|
const linesItem = {
|
|
const linesItem = {
|
|
- items: [...arr, ...arr],
|
|
|
|
|
|
+ items: repeatArr,
|
|
offset: 0,
|
|
offset: 0,
|
|
halfOffset: halfOffset,
|
|
halfOffset: halfOffset,
|
|
dragging: false,
|
|
dragging: false,
|