Skip to content

Commit 3f06043

Browse files
buuingbuuing
committed
upgrade: 升级 v3.1.3 修复九宫格抽奖按钮合并多个格子的宽高计算问题
1 parent ddc63e7 commit 3f06043

File tree

4 files changed

+26
-22
lines changed

4 files changed

+26
-22
lines changed

‎dist/index.common.js‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4535,12 +4535,12 @@ var component = normalizeComponent(
45354535
)
45364536

45374537
/* harmony default export */ var LuckDraw = (component.exports);
4538-
// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"0ed44288-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./src/components/vue-luck-draw/src/LuckyGrid.vue?vue&type=template&id=14830fb4&
4539-
var LuckyGridvue_type_template_id_14830fb4_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{ref:"luckDraw",staticStyle:{"overflow":"hidden"}},[_c('canvas')])}
4540-
var LuckyGridvue_type_template_id_14830fb4_staticRenderFns = []
4538+
// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"0ed44288-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./src/components/vue-luck-draw/src/LuckyGrid.vue?vue&type=template&id=148c612b&
4539+
var LuckyGridvue_type_template_id_148c612b_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{ref:"luckDraw",staticStyle:{"overflow":"hidden"}},[_c('canvas')])}
4540+
var LuckyGridvue_type_template_id_148c612b_staticRenderFns = []
45414541

45424542

4543-
// CONCATENATED MODULE: ./src/components/vue-luck-draw/src/LuckyGrid.vue?vue&type=template&id=14830fb4&
4543+
// CONCATENATED MODULE: ./src/components/vue-luck-draw/src/LuckyGrid.vue?vue&type=template&id=148c612b&
45444544

45454545
// EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.concat.js
45464546
var es_array_concat = __webpack_require__("99af");
@@ -5405,12 +5405,14 @@ var math_getLinearGradient = function getLinearGradient(ctx, x, y, w, h, backgro
54055405
_this3.demo && _this3.walk(); // 点击按钮开始, 这里不能使用 addEventListener
54065406

54075407
if (_this3.button) canvas.onmousedown = function (e) {
5408-
var _this3$getGeometricPr = _this3.getGeometricProperty([_this3.button.x, _this3.button.y]),
5409-
_this3$getGeometricPr2 = _slicedToArray(_this3$getGeometricPr, 2),
5408+
var _this3$getGeometricPr = _this3.getGeometricProperty([_this3.button.x, _this3.button.y, _this3.button.col || 1, _this3.button.row || 1]),
5409+
_this3$getGeometricPr2 = _slicedToArray(_this3$getGeometricPr, 4),
54105410
x = _this3$getGeometricPr2[0],
5411-
y = _this3$getGeometricPr2[1];
5411+
y = _this3$getGeometricPr2[1],
5412+
width = _this3$getGeometricPr2[2],
5413+
height = _this3$getGeometricPr2[3];
54125414

5413-
if (e.offsetX < x || e.offsetY < y || e.offsetX > x + _this3.cellWidth || e.offsetY > y + _this3.cellWidth) return false;
5415+
if (e.offsetX < x || e.offsetY < y || e.offsetX > x + width || e.offsetY > y + height) return false;
54145416
if (!_this3.canPlay) return false;
54155417

54165418
_this3.$emit('start', e);
@@ -5759,8 +5761,8 @@ var math_getLinearGradient = function getLinearGradient(ctx, x, y, w, h, backgro
57595761

57605762
var LuckyGrid_component = normalizeComponent(
57615763
src_LuckyGridvue_type_script_lang_js_,
5762-
LuckyGridvue_type_template_id_14830fb4_render,
5763-
LuckyGridvue_type_template_id_14830fb4_staticRenderFns,
5764+
LuckyGridvue_type_template_id_148c612b_render,
5765+
LuckyGridvue_type_template_id_148c612b_staticRenderFns,
57645766
false,
57655767
null,
57665768
null,

‎dist/index.umd.js‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4544,12 +4544,12 @@ var component = normalizeComponent(
45444544
)
45454545

45464546
/* harmony default export */ var LuckDraw = (component.exports);
4547-
// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"0ed44288-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./src/components/vue-luck-draw/src/LuckyGrid.vue?vue&type=template&id=14830fb4&
4548-
var LuckyGridvue_type_template_id_14830fb4_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{ref:"luckDraw",staticStyle:{"overflow":"hidden"}},[_c('canvas')])}
4549-
var LuckyGridvue_type_template_id_14830fb4_staticRenderFns = []
4547+
// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"0ed44288-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./src/components/vue-luck-draw/src/LuckyGrid.vue?vue&type=template&id=148c612b&
4548+
var LuckyGridvue_type_template_id_148c612b_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{ref:"luckDraw",staticStyle:{"overflow":"hidden"}},[_c('canvas')])}
4549+
var LuckyGridvue_type_template_id_148c612b_staticRenderFns = []
45504550

45514551

4552-
// CONCATENATED MODULE: ./src/components/vue-luck-draw/src/LuckyGrid.vue?vue&type=template&id=14830fb4&
4552+
// CONCATENATED MODULE: ./src/components/vue-luck-draw/src/LuckyGrid.vue?vue&type=template&id=148c612b&
45534553

45544554
// EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.concat.js
45554555
var es_array_concat = __webpack_require__("99af");
@@ -5414,12 +5414,14 @@ var math_getLinearGradient = function getLinearGradient(ctx, x, y, w, h, backgro
54145414
_this3.demo && _this3.walk(); // 点击按钮开始, 这里不能使用 addEventListener
54155415

54165416
if (_this3.button) canvas.onmousedown = function (e) {
5417-
var _this3$getGeometricPr = _this3.getGeometricProperty([_this3.button.x, _this3.button.y]),
5418-
_this3$getGeometricPr2 = _slicedToArray(_this3$getGeometricPr, 2),
5417+
var _this3$getGeometricPr = _this3.getGeometricProperty([_this3.button.x, _this3.button.y, _this3.button.col || 1, _this3.button.row || 1]),
5418+
_this3$getGeometricPr2 = _slicedToArray(_this3$getGeometricPr, 4),
54195419
x = _this3$getGeometricPr2[0],
5420-
y = _this3$getGeometricPr2[1];
5420+
y = _this3$getGeometricPr2[1],
5421+
width = _this3$getGeometricPr2[2],
5422+
height = _this3$getGeometricPr2[3];
54215423

5422-
if (e.offsetX < x || e.offsetY < y || e.offsetX > x + _this3.cellWidth || e.offsetY > y + _this3.cellWidth) return false;
5424+
if (e.offsetX < x || e.offsetY < y || e.offsetX > x + width || e.offsetY > y + height) return false;
54235425
if (!_this3.canPlay) return false;
54245426

54255427
_this3.$emit('start', e);
@@ -5768,8 +5770,8 @@ var math_getLinearGradient = function getLinearGradient(ctx, x, y, w, h, backgro
57685770

57695771
var LuckyGrid_component = normalizeComponent(
57705772
src_LuckyGridvue_type_script_lang_js_,
5771-
LuckyGridvue_type_template_id_14830fb4_render,
5772-
LuckyGridvue_type_template_id_14830fb4_staticRenderFns,
5773+
LuckyGridvue_type_template_id_148c612b_render,
5774+
LuckyGridvue_type_template_id_148c612b_staticRenderFns,
57735775
false,
57745776
null,
57755777
null,

‎dist/index.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.1.2",
3+
"version": "3.1.3",
44
"description": "",
55
"main": "index.js",
66
"scripts": {

0 commit comments

Comments
 (0)