Skip to content

Commit 9c80fbb

Browse files
committed
upgrade: 升级 v3.3.9 完善响应式机制, 九宫格增加兼容, 背景色默认改为透明, 并且透明色不再渲染, 不再拦截必填属性
1 parent 1eb7418 commit 9c80fbb

File tree

10 files changed

+86
-2066
lines changed

10 files changed

+86
-2066
lines changed

dist/vue-luck-draw.common.js

Lines changed: 16 additions & 397 deletions
Large diffs are not rendered by default.

dist/vue-luck-draw.umd.js

Lines changed: 16 additions & 397 deletions
Large diffs are not rendered by default.

dist/vue-luck-draw.umd.min.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "vue-luck-draw",
3-
"version": "3.3.8",
3+
"version": "3.3.9",
44
"description": "一个支持 vue2 / vue3 的(大转盘抽奖 / 九宫格抽奖)luckydraw 插件",
55
"main": "index.js",
66
"keywords": [
@@ -22,6 +22,6 @@
2222
],
2323
"homepage": "https://100px.net",
2424
"dependencies": {
25-
"lucky-canvas": "^1.2.9"
25+
"lucky-canvas": "^1.3.3"
2626
}
2727
}

src/LuckyGrid.vue

Lines changed: 11 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -5,73 +5,19 @@
55
<script>
66
import { name, version } from '../package.json'
77
import { LuckyGrid } from 'lucky-canvas'
8-
import { paramsValidator } from '../utils/index.js'
98
export default {
109
props: {
11-
width: {
12-
type: [String, Number],
13-
default: ''
14-
},
15-
height: {
16-
type: [String, Number],
17-
default: ''
18-
},
19-
cols: {
20-
type: [String, Number],
21-
default: 3
22-
},
23-
rows: {
24-
type: [String, Number],
25-
default: 3
26-
},
27-
prizes: {
28-
type: Array,
29-
validator (data) {
30-
return paramsValidator({ prizes: data }, {
31-
prizes: { x: 1, y: 1, imgs: { src: 1 }, fonts: { text: 1 } }
32-
})
33-
},
34-
default: () => []
35-
},
36-
button: {
37-
type: Object,
38-
validator (data) {
39-
return paramsValidator({ button: [data] }, {
40-
button: { x: 1, y: 1, imgs: { src: 1 }, fonts: { text: 1 } }
41-
})
42-
},
43-
},
44-
blocks: {
45-
type: Array,
46-
validator (data) {
47-
return paramsValidator({ blocks: data }, {
48-
blocks: { padding: 1, background: 1 }
49-
})
50-
},
51-
default: () => []
52-
},
53-
defaultStyle: {
54-
type: Object,
55-
default () {
56-
return {}
57-
}
58-
},
59-
activeStyle: {
60-
type: Object,
61-
default () {
62-
return {}
63-
}
64-
},
65-
defaultConfig: {
66-
type: Object,
67-
default: () => {
68-
return {}
69-
}
70-
},
71-
demo: { // demo演示开启中奖标识自动游走
72-
type: Boolean,
73-
default: false
74-
},
10+
width: { type: [String, Number], default: '' },
11+
height: { type: [String, Number], default: '' },
12+
cols: { type: [String, Number], default: 3 },
13+
rows: { type: [String, Number], default: 3 },
14+
prizes: { type: Array, default: () => [] },
15+
button: { type: Object },
16+
blocks: { type: Array, default: () => [] },
17+
defaultStyle: { type: Object, default () { return {} } },
18+
activeStyle: { type: Object, default () { return {} } },
19+
defaultConfig: { type: Object, default: () => { return {} } },
20+
demo: { type: Boolean, default: false },
7521
},
7622
data () {
7723
return {

src/LuckyWheel.vue

Lines changed: 7 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -5,56 +5,15 @@
55
<script>
66
import { name, version } from '../package.json'
77
import { LuckyWheel } from 'lucky-canvas'
8-
import { paramsValidator } from '../utils/index.js'
98
export default {
109
props: {
11-
width: {
12-
type: [String, Number],
13-
default: ''
14-
},
15-
height: {
16-
type: [String, Number],
17-
default: ''
18-
},
19-
blocks: {
20-
type: Array,
21-
validator (data) {
22-
return paramsValidator({ blocks: data }, {
23-
blocks: { padding: 1, background: 1 }
24-
})
25-
},
26-
default: () => []
27-
},
28-
prizes: {
29-
type: Array,
30-
validator (data) {
31-
return paramsValidator({ prizes: data }, {
32-
prizes: { fonts: { text: 1 }, imgs: { src: 1 } }
33-
})
34-
},
35-
default: () => []
36-
},
37-
buttons: {
38-
type: Array,
39-
validator (data) {
40-
return paramsValidator({ buttons: data }, {
41-
buttons: { fonts: { text: 1 }, imgs: { src: 1 } }
42-
})
43-
},
44-
default: () => []
45-
},
46-
defaultStyle: {
47-
type: Object,
48-
default: () => {
49-
return {}
50-
}
51-
},
52-
defaultConfig: {
53-
type: Object,
54-
default: () => {
55-
return {}
56-
}
57-
},
10+
width: { type: [String, Number], default: '' },
11+
height: {type: [String, Number],default: ''},
12+
blocks: { type: Array, default: () => [] },
13+
prizes: { type: Array, default: () => [] },
14+
buttons: { type: Array, default: () => [] },
15+
defaultStyle: { type: Object, default: () => { return {} } },
16+
defaultConfig: { type: Object, default: () => { return {} } },
5817
},
5918
data () {
6019
return {

utils/index.js

Lines changed: 0 additions & 27 deletions
This file was deleted.

0 commit comments

Comments
 (0)