Skip to content

Commit 8516b2d

Browse files
buuingbuuing
committed
upgrade: 升级 v3.2.1 规范旋转时间的变量名
1 parent c39d7e7 commit 8516b2d

File tree

9 files changed

+63
-63
lines changed

9 files changed

+63
-63
lines changed

‎dist/luckdraw.common.js‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5259,8 +5259,8 @@ var easeOut = function easeOut(t, b, c, d) {
52595259
var config = {
52605260
gutter: 5,
52615261
speed: 20,
5262-
rotateTime: 2500,
5263-
stopTime: 2500
5262+
accelerationTime: 2500,
5263+
decelerationTime: 2500
52645264
};
52655265

52665266
for (var key in this.defaultConfig) {
@@ -5670,7 +5670,7 @@ var easeOut = function easeOut(t, b, c, d) {
56705670
_defaultConfig = this._defaultConfig;
56715671
var interval = Date.now() - startTime; // 先完全旋转, 再停止
56725672

5673-
if (interval >= _defaultConfig.rotateTime && prizeFlag !== undefined) {
5673+
if (interval >= _defaultConfig.accelerationTime && prizeFlag !== undefined) {
56745674
// 记录开始停止的时间戳
56755675
this.endTime = Date.now(); // 记录开始停止的索引
56765676

@@ -5681,7 +5681,7 @@ var easeOut = function easeOut(t, b, c, d) {
56815681
return this.slowDown();
56825682
}
56835683

5684-
this.currIndex = (currIndex + easeIn(interval, 0.1, _defaultConfig.speed, _defaultConfig.rotateTime)) % prizes.length;
5684+
this.currIndex = (currIndex + easeIn(interval, 0.1, _defaultConfig.speed, _defaultConfig.accelerationTime)) % prizes.length;
56855685
this.draw();
56865686
this.animationId = window.requestAnimationFrame(this.run);
56875687
},
@@ -5694,15 +5694,15 @@ var easeOut = function easeOut(t, b, c, d) {
56945694
_defaultConfig = this._defaultConfig;
56955695
var interval = Date.now() - this.endTime;
56965696

5697-
if (interval > _defaultConfig.stopTime) {
5697+
if (interval > _defaultConfig.decelerationTime) {
56985698
this.startTime = 0;
56995699
this.$emit('end', _objectSpread2({}, prizes.find(function (prize, index) {
57005700
return index === prizeFlag;
57015701
})));
57025702
return cancelAnimationFrame(this.animationId);
57035703
}
57045704

5705-
this.currIndex = easeOut(interval, stopIndex, endIndex, _defaultConfig.stopTime) % prizes.length;
5705+
this.currIndex = easeOut(interval, stopIndex, endIndex, _defaultConfig.decelerationTime) % prizes.length;
57065706
this.draw();
57075707
this.animationId = window.requestAnimationFrame(this.slowDown);
57085708
},
@@ -6000,8 +6000,8 @@ var LuckyWheelvue_type_script_lang_js_easeOut = function easeOut(t, b, c, d) {
60006000
gutter: '0px',
60016001
offsetDegree: 0,
60026002
speed: 20,
6003-
rotateTime: 2500,
6004-
stopTime: 2500
6003+
accelerationTime: 2500,
6004+
decelerationTime: 2500
60056005
};
60066006

60076007
for (var key in this.defaultConfig) {
@@ -6387,7 +6387,7 @@ var LuckyWheelvue_type_script_lang_js_easeOut = function easeOut(t, b, c, d) {
63876387
_defaultConfig = this._defaultConfig;
63886388
var interval = Date.now() - this.startTime; // 先完全旋转, 再停止
63896389

6390-
if (interval >= _defaultConfig.rotateTime && prizeFlag !== undefined) {
6390+
if (interval >= _defaultConfig.accelerationTime && prizeFlag !== undefined) {
63916391
// 记录开始停止的时间戳
63926392
this.endTime = Date.now(); // 记录开始停止的位置
63936393

@@ -6398,7 +6398,7 @@ var LuckyWheelvue_type_script_lang_js_easeOut = function easeOut(t, b, c, d) {
63986398
return this.slowDown();
63996399
}
64006400

6401-
this.rotateDeg = (rotateDeg + LuckyWheelvue_type_script_lang_js_easeIn(interval, 0, _defaultConfig.speed, _defaultConfig.rotateTime)) % 360;
6401+
this.rotateDeg = (rotateDeg + LuckyWheelvue_type_script_lang_js_easeIn(interval, 0, _defaultConfig.speed, _defaultConfig.accelerationTime)) % 360;
64026402
this.draw();
64036403
this.animationId = window.requestAnimationFrame(this.run);
64046404
},
@@ -6411,15 +6411,15 @@ var LuckyWheelvue_type_script_lang_js_easeOut = function easeOut(t, b, c, d) {
64116411
_defaultConfig = this._defaultConfig;
64126412
var interval = Date.now() - this.endTime;
64136413

6414-
if (interval >= _defaultConfig.stopTime) {
6414+
if (interval >= _defaultConfig.decelerationTime) {
64156415
this.startTime = 0;
64166416
this.$emit('end', _objectSpread2({}, prizes.find(function (prize, index) {
64176417
return index === prizeFlag;
64186418
})));
64196419
return cancelAnimationFrame(this.animationId);
64206420
}
64216421

6422-
this.rotateDeg = LuckyWheelvue_type_script_lang_js_easeOut(interval, stopDeg, endDeg, _defaultConfig.stopTime) % 360;
6422+
this.rotateDeg = LuckyWheelvue_type_script_lang_js_easeOut(interval, stopDeg, endDeg, _defaultConfig.decelerationTime) % 360;
64236423
this.draw();
64246424
this.animationId = window.requestAnimationFrame(this.slowDown);
64256425
},

‎dist/luckdraw.umd.js‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5268,8 +5268,8 @@ var easeOut = function easeOut(t, b, c, d) {
52685268
var config = {
52695269
gutter: 5,
52705270
speed: 20,
5271-
rotateTime: 2500,
5272-
stopTime: 2500
5271+
accelerationTime: 2500,
5272+
decelerationTime: 2500
52735273
};
52745274

52755275
for (var key in this.defaultConfig) {
@@ -5679,7 +5679,7 @@ var easeOut = function easeOut(t, b, c, d) {
56795679
_defaultConfig = this._defaultConfig;
56805680
var interval = Date.now() - startTime; // 先完全旋转, 再停止
56815681

5682-
if (interval >= _defaultConfig.rotateTime && prizeFlag !== undefined) {
5682+
if (interval >= _defaultConfig.accelerationTime && prizeFlag !== undefined) {
56835683
// 记录开始停止的时间戳
56845684
this.endTime = Date.now(); // 记录开始停止的索引
56855685

@@ -5690,7 +5690,7 @@ var easeOut = function easeOut(t, b, c, d) {
56905690
return this.slowDown();
56915691
}
56925692

5693-
this.currIndex = (currIndex + easeIn(interval, 0.1, _defaultConfig.speed, _defaultConfig.rotateTime)) % prizes.length;
5693+
this.currIndex = (currIndex + easeIn(interval, 0.1, _defaultConfig.speed, _defaultConfig.accelerationTime)) % prizes.length;
56945694
this.draw();
56955695
this.animationId = window.requestAnimationFrame(this.run);
56965696
},
@@ -5703,15 +5703,15 @@ var easeOut = function easeOut(t, b, c, d) {
57035703
_defaultConfig = this._defaultConfig;
57045704
var interval = Date.now() - this.endTime;
57055705

5706-
if (interval > _defaultConfig.stopTime) {
5706+
if (interval > _defaultConfig.decelerationTime) {
57075707
this.startTime = 0;
57085708
this.$emit('end', _objectSpread2({}, prizes.find(function (prize, index) {
57095709
return index === prizeFlag;
57105710
})));
57115711
return cancelAnimationFrame(this.animationId);
57125712
}
57135713

5714-
this.currIndex = easeOut(interval, stopIndex, endIndex, _defaultConfig.stopTime) % prizes.length;
5714+
this.currIndex = easeOut(interval, stopIndex, endIndex, _defaultConfig.decelerationTime) % prizes.length;
57155715
this.draw();
57165716
this.animationId = window.requestAnimationFrame(this.slowDown);
57175717
},
@@ -6009,8 +6009,8 @@ var LuckyWheelvue_type_script_lang_js_easeOut = function easeOut(t, b, c, d) {
60096009
gutter: '0px',
60106010
offsetDegree: 0,
60116011
speed: 20,
6012-
rotateTime: 2500,
6013-
stopTime: 2500
6012+
accelerationTime: 2500,
6013+
decelerationTime: 2500
60146014
};
60156015

60166016
for (var key in this.defaultConfig) {
@@ -6396,7 +6396,7 @@ var LuckyWheelvue_type_script_lang_js_easeOut = function easeOut(t, b, c, d) {
63966396
_defaultConfig = this._defaultConfig;
63976397
var interval = Date.now() - this.startTime; // 先完全旋转, 再停止
63986398

6399-
if (interval >= _defaultConfig.rotateTime && prizeFlag !== undefined) {
6399+
if (interval >= _defaultConfig.accelerationTime && prizeFlag !== undefined) {
64006400
// 记录开始停止的时间戳
64016401
this.endTime = Date.now(); // 记录开始停止的位置
64026402

@@ -6407,7 +6407,7 @@ var LuckyWheelvue_type_script_lang_js_easeOut = function easeOut(t, b, c, d) {
64076407
return this.slowDown();
64086408
}
64096409

6410-
this.rotateDeg = (rotateDeg + LuckyWheelvue_type_script_lang_js_easeIn(interval, 0, _defaultConfig.speed, _defaultConfig.rotateTime)) % 360;
6410+
this.rotateDeg = (rotateDeg + LuckyWheelvue_type_script_lang_js_easeIn(interval, 0, _defaultConfig.speed, _defaultConfig.accelerationTime)) % 360;
64116411
this.draw();
64126412
this.animationId = window.requestAnimationFrame(this.run);
64136413
},
@@ -6420,15 +6420,15 @@ var LuckyWheelvue_type_script_lang_js_easeOut = function easeOut(t, b, c, d) {
64206420
_defaultConfig = this._defaultConfig;
64216421
var interval = Date.now() - this.endTime;
64226422

6423-
if (interval >= _defaultConfig.stopTime) {
6423+
if (interval >= _defaultConfig.decelerationTime) {
64246424
this.startTime = 0;
64256425
this.$emit('end', _objectSpread2({}, prizes.find(function (prize, index) {
64266426
return index === prizeFlag;
64276427
})));
64286428
return cancelAnimationFrame(this.animationId);
64296429
}
64306430

6431-
this.rotateDeg = LuckyWheelvue_type_script_lang_js_easeOut(interval, stopDeg, endDeg, _defaultConfig.stopTime) % 360;
6431+
this.rotateDeg = LuckyWheelvue_type_script_lang_js_easeOut(interval, stopDeg, endDeg, _defaultConfig.decelerationTime) % 360;
64326432
this.draw();
64336433
this.animationId = window.requestAnimationFrame(this.slowDown);
64346434
},

‎dist/luckdraw.umd.min.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "vue-luck-draw",
3-
"version": "3.2.0",
3+
"version": "3.2.1",
44
"description": "一个支持 vue2 / vue3 的（大转盘抽奖 / 九宫格抽奖）luckydraw 插件",
55
"main": "index.js",
66
"keywords": ["vue3抽奖", "大转盘抽奖", "九宫格抽奖", "抽奖插件", "web抽奖", "移动端抽奖", "canvas抽奖"],

‎src/LuckyGrid.vue‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -142,8 +142,8 @@ export default {
142142
const config = {
143143
gutter: 5,
144144
speed: 20,
145-
rotateTime: 2500,
146-
stopTime: 2500,
145+
accelerationTime: 2500,
146+
decelerationTime: 2500,
147147
}
148148
for (let key in this.defaultConfig) {
149149
config[key] = this.defaultConfig[key]
@@ -488,7 +488,7 @@ export default {
488488
const { currIndex, prizes, prizeFlag, startTime, _defaultConfig } = this
489489
let interval = Date.now() - startTime
490490
// 先完全旋转, 再停止
491-
if (interval >= _defaultConfig.rotateTime && prizeFlag !== undefined) {
491+
if (interval >= _defaultConfig.accelerationTime && prizeFlag !== undefined) {
492492
// 记录开始停止的时间戳
493493
this.endTime = Date.now()
494494
// 记录开始停止的索引
@@ -498,20 +498,20 @@ export default {
498498
cancelAnimationFrame(this.animationId)
499499
return this.slowDown()
500500
}
501-
this.currIndex = (currIndex + easeIn(interval, 0.1, _defaultConfig.speed, _defaultConfig.rotateTime)) % prizes.length
501+
this.currIndex = (currIndex + easeIn(interval, 0.1, _defaultConfig.speed, _defaultConfig.accelerationTime)) % prizes.length
502502
this.draw()
503503
this.animationId = window.requestAnimationFrame(this.run)
504504
},
505505
// 缓慢停止的方法
506506
slowDown () {
507507
const { prizes, prizeFlag, stopIndex, endIndex, _defaultConfig } = this
508508
let interval = Date.now() - this.endTime
509-
if (interval > _defaultConfig.stopTime) {
509+
if (interval > _defaultConfig.decelerationTime) {
510510
this.startTime = 0
511511
this.$emit('end', {...prizes.find((prize, index) => index === prizeFlag)})
512512
return cancelAnimationFrame(this.animationId)
513513
}
514-
this.currIndex = easeOut(interval, stopIndex, endIndex, _defaultConfig.stopTime) % prizes.length
514+
this.currIndex = easeOut(interval, stopIndex, endIndex, _defaultConfig.decelerationTime) % prizes.length
515515
this.draw()
516516
this.animationId = window.requestAnimationFrame(this.slowDown)
517517
},

‎src/LuckyWheel.vue‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -105,8 +105,8 @@ export default {
105105
gutter: '0px',
106106
offsetDegree: 0,
107107
speed: 20,
108-
rotateTime: 2500,
109-
stopTime: 2500,
108+
accelerationTime: 2500,
109+
decelerationTime: 2500,
110110
}
111111
for (let key in this.defaultConfig) {
112112
config[key] = this.defaultConfig[key]
@@ -451,7 +451,7 @@ export default {
451451
const { prizeFlag, prizeDeg, rotateDeg, _defaultConfig } = this
452452
let interval = Date.now() - this.startTime
453453
// 先完全旋转, 再停止
454-
if (interval >= _defaultConfig.rotateTime && prizeFlag !== undefined) {
454+
if (interval >= _defaultConfig.accelerationTime && prizeFlag !== undefined) {
455455
// 记录开始停止的时间戳
456456
this.endTime = Date.now()
457457
// 记录开始停止的位置
@@ -461,20 +461,20 @@ export default {
461461
cancelAnimationFrame(this.animationId)
462462
return this.slowDown()
463463
}
464-
this.rotateDeg = (rotateDeg + easeIn(interval, 0, _defaultConfig.speed, _defaultConfig.rotateTime)) % 360
464+
this.rotateDeg = (rotateDeg + easeIn(interval, 0, _defaultConfig.speed, _defaultConfig.accelerationTime)) % 360
465465
this.draw()
466466
this.animationId = window.requestAnimationFrame(this.run)
467467
},
468468
// 缓慢停止的方法
469469
slowDown () {
470470
const { prizes, prizeFlag, stopDeg, endDeg, _defaultConfig } = this
471471
let interval = Date.now() - this.endTime
472-
if (interval >= _defaultConfig.stopTime) {
472+
if (interval >= _defaultConfig.decelerationTime) {
473473
this.startTime = 0
474474
this.$emit('end', {...prizes.find((prize, index) => index === prizeFlag)})
475475
return cancelAnimationFrame(this.animationId)
476476
}
477-
this.rotateDeg = easeOut(interval, stopDeg, endDeg, _defaultConfig.stopTime) % 360
477+
this.rotateDeg = easeOut(interval, stopDeg, endDeg, _defaultConfig.decelerationTime) % 360
478478
this.draw()
479479
this.animationId = window.requestAnimationFrame(this.slowDown)
480480
},

‎vue3/luckdraw.common.js‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5181,8 +5181,8 @@ var easeOut = function easeOut(t, b, c, d) {
51815181
var config = {
51825182
gutter: 5,
51835183
speed: 20,
5184-
rotateTime: 2500,
5185-
stopTime: 2500
5184+
accelerationTime: 2500,
5185+
decelerationTime: 2500
51865186
};
51875187

51885188
for (var key in this.defaultConfig) {
@@ -5592,7 +5592,7 @@ var easeOut = function easeOut(t, b, c, d) {
55925592
_defaultConfig = this._defaultConfig;
55935593
var interval = Date.now() - startTime; // 先完全旋转, 再停止
55945594

5595-
if (interval >= _defaultConfig.rotateTime && prizeFlag !== undefined) {
5595+
if (interval >= _defaultConfig.accelerationTime && prizeFlag !== undefined) {
55965596
// 记录开始停止的时间戳
55975597
this.endTime = Date.now(); // 记录开始停止的索引
55985598

@@ -5603,7 +5603,7 @@ var easeOut = function easeOut(t, b, c, d) {
56035603
return this.slowDown();
56045604
}
56055605

5606-
this.currIndex = (currIndex + easeIn(interval, 0.1, _defaultConfig.speed, _defaultConfig.rotateTime)) % prizes.length;
5606+
this.currIndex = (currIndex + easeIn(interval, 0.1, _defaultConfig.speed, _defaultConfig.accelerationTime)) % prizes.length;
56075607
this.draw();
56085608
this.animationId = window.requestAnimationFrame(this.run);
56095609
},
@@ -5616,15 +5616,15 @@ var easeOut = function easeOut(t, b, c, d) {
56165616
_defaultConfig = this._defaultConfig;
56175617
var interval = Date.now() - this.endTime;
56185618

5619-
if (interval > _defaultConfig.stopTime) {
5619+
if (interval > _defaultConfig.decelerationTime) {
56205620
this.startTime = 0;
56215621
this.$emit('end', _objectSpread2({}, prizes.find(function (prize, index) {
56225622
return index === prizeFlag;
56235623
})));
56245624
return cancelAnimationFrame(this.animationId);
56255625
}
56265626

5627-
this.currIndex = easeOut(interval, stopIndex, endIndex, _defaultConfig.stopTime) % prizes.length;
5627+
this.currIndex = easeOut(interval, stopIndex, endIndex, _defaultConfig.decelerationTime) % prizes.length;
56285628
this.draw();
56295629
this.animationId = window.requestAnimationFrame(this.slowDown);
56305630
},
@@ -5912,8 +5912,8 @@ var LuckyWheelvue_type_script_lang_js_easeOut = function easeOut(t, b, c, d) {
59125912
gutter: '0px',
59135913
offsetDegree: 0,
59145914
speed: 20,
5915-
rotateTime: 2500,
5916-
stopTime: 2500
5915+
accelerationTime: 2500,
5916+
decelerationTime: 2500
59175917
};
59185918

59195919
for (var key in this.defaultConfig) {
@@ -6299,7 +6299,7 @@ var LuckyWheelvue_type_script_lang_js_easeOut = function easeOut(t, b, c, d) {
62996299
_defaultConfig = this._defaultConfig;
63006300
var interval = Date.now() - this.startTime; // 先完全旋转, 再停止
63016301

6302-
if (interval >= _defaultConfig.rotateTime && prizeFlag !== undefined) {
6302+
if (interval >= _defaultConfig.accelerationTime && prizeFlag !== undefined) {
63036303
// 记录开始停止的时间戳
63046304
this.endTime = Date.now(); // 记录开始停止的位置
63056305

@@ -6310,7 +6310,7 @@ var LuckyWheelvue_type_script_lang_js_easeOut = function easeOut(t, b, c, d) {
63106310
return this.slowDown();
63116311
}
63126312

6313-
this.rotateDeg = (rotateDeg + LuckyWheelvue_type_script_lang_js_easeIn(interval, 0, _defaultConfig.speed, _defaultConfig.rotateTime)) % 360;
6313+
this.rotateDeg = (rotateDeg + LuckyWheelvue_type_script_lang_js_easeIn(interval, 0, _defaultConfig.speed, _defaultConfig.accelerationTime)) % 360;
63146314
this.draw();
63156315
this.animationId = window.requestAnimationFrame(this.run);
63166316
},
@@ -6323,15 +6323,15 @@ var LuckyWheelvue_type_script_lang_js_easeOut = function easeOut(t, b, c, d) {
63236323
_defaultConfig = this._defaultConfig;
63246324
var interval = Date.now() - this.endTime;
63256325

6326-
if (interval >= _defaultConfig.stopTime) {
6326+
if (interval >= _defaultConfig.decelerationTime) {
63276327
this.startTime = 0;
63286328
this.$emit('end', _objectSpread2({}, prizes.find(function (prize, index) {
63296329
return index === prizeFlag;
63306330
})));
63316331
return cancelAnimationFrame(this.animationId);
63326332
}
63336333

6334-
this.rotateDeg = LuckyWheelvue_type_script_lang_js_easeOut(interval, stopDeg, endDeg, _defaultConfig.stopTime) % 360;
6334+
this.rotateDeg = LuckyWheelvue_type_script_lang_js_easeOut(interval, stopDeg, endDeg, _defaultConfig.decelerationTime) % 360;
63356335
this.draw();
63366336
this.animationId = window.requestAnimationFrame(this.slowDown);
63376337
},

0 commit comments

Comments
 (0)