From 3d03ca1965727a6f05de7220563de122d8756b82 Mon Sep 17 00:00:00 2001 From: 404 Date: Sun, 24 Apr 2022 01:05:20 +0800 Subject: [PATCH] =?UTF-8?q?build:=20upgrade=20to=20v1.7.23=20=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E5=AE=BD=E9=AB=98=E9=BB=98=E8=AE=A4=E5=8F=96=E5=85=83?= =?UTF-8?q?=E7=B4=A0=E6=9C=AC=E8=BA=AB=E7=9A=84=E5=B1=9E=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/core/package.json | 2 +- packages/core/src/lib/grid.ts | 4 +-- packages/core/src/lib/slot.ts | 4 +-- packages/core/src/lib/wheel.ts | 4 +-- packages/react/package.json | 4 +-- packages/vue/package.json | 4 +-- packages/vue/src/components/LuckyGrid.ts | 4 --- packages/vue/src/components/LuckyWheel.ts | 4 --- packages/vue/src/components/SlotMachine.ts | 4 --- packages/vue/types/index.d.ts | 36 ++++++---------------- 10 files changed, 21 insertions(+), 49 deletions(-) diff --git a/packages/core/package.json b/packages/core/package.json index fc0d315..c440854 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,6 +1,6 @@ { "name": "lucky-canvas", - "version": "1.7.22", + "version": "1.7.23", "description": "一个基于原生 js 的(大转盘 / 九宫格 / 老虎机)抽奖插件", "main": "dist/index.cjs.js", "module": "dist/index.esm.js", diff --git a/packages/core/src/lib/grid.ts b/packages/core/src/lib/grid.ts index 06e9f5b..6772881 100644 --- a/packages/core/src/lib/grid.ts +++ b/packages/core/src/lib/grid.ts @@ -120,8 +120,8 @@ export default class LuckyGrid extends Lucky { * @param data */ private initData (data: LuckyGridConfig): void { - this.$set(this, 'width', data.width || '300px') - this.$set(this, 'height', data.height || '300px') + this.$set(this, 'width', data.width) + this.$set(this, 'height', data.height) this.$set(this, 'rows', Number(data.rows) || 3) this.$set(this, 'cols', Number(data.cols) || 3) this.$set(this, 'blocks', data.blocks || []) diff --git a/packages/core/src/lib/slot.ts b/packages/core/src/lib/slot.ts index 7d314e9..b904187 100644 --- a/packages/core/src/lib/slot.ts +++ b/packages/core/src/lib/slot.ts @@ -115,8 +115,8 @@ export default class SlotMachine extends Lucky { * @param data */ private initData (data: SlotMachineConfig): void { - this.$set(this, 'width', data.width || '300px') - this.$set(this, 'height', data.height || '300px') + this.$set(this, 'width', data.width) + this.$set(this, 'height', data.height) this.$set(this, 'blocks', data.blocks || []) this.$set(this, 'prizes', data.prizes || []) this.$set(this, 'slots', data.slots || []) diff --git a/packages/core/src/lib/wheel.ts b/packages/core/src/lib/wheel.ts index 315c875..b350e52 100644 --- a/packages/core/src/lib/wheel.ts +++ b/packages/core/src/lib/wheel.ts @@ -106,8 +106,8 @@ export default class LuckyWheel extends Lucky { * @param data */ private initData (data: LuckyWheelConfig): void { - this.$set(this, 'width', data.width || '300px') - this.$set(this, 'height', data.height || '300px') + this.$set(this, 'width', data.width) + this.$set(this, 'height', data.height) this.$set(this, 'blocks', data.blocks || []) this.$set(this, 'prizes', data.prizes || []) this.$set(this, 'buttons', data.buttons || []) diff --git a/packages/react/package.json b/packages/react/package.json index 9d2096a..9f7a3a3 100644 --- a/packages/react/package.json +++ b/packages/react/package.json @@ -1,6 +1,6 @@ { "name": "@lucky-canvas/react", - "version": "0.1.7", + "version": "0.1.10", "description": "react ( 大转盘 / 九宫格 / 老虎机 ) 抽奖插件", "main": "dist/index.cjs.js", "module": "dist/index.esm.js", @@ -45,6 +45,6 @@ "rollup-plugin-terser": "^7.0.2" }, "dependencies": { - "lucky-canvas": "^1.7.21" + "lucky-canvas": "^1.7.23" } } diff --git a/packages/vue/package.json b/packages/vue/package.json index a669551..6bc385a 100644 --- a/packages/vue/package.json +++ b/packages/vue/package.json @@ -1,6 +1,6 @@ { "name": "@lucky-canvas/vue", - "version": "0.1.9", + "version": "0.1.10", "description": "一个支持 vue2 / vue3 的(大转盘 / 九宫格 / 老虎机)luckydraw 抽奖插件", "main": "dist/index.cjs.js", "module": "dist/index.esm.js", @@ -32,7 +32,7 @@ "homepage": "https://100px.net", "dependencies": { "@vue/composition-api": "^1.0.0", - "lucky-canvas": "^1.7.21", + "lucky-canvas": "^1.7.23", "vue-demi": "^0.7.4" }, "peerDependencies": { diff --git a/packages/vue/src/components/LuckyGrid.ts b/packages/vue/src/components/LuckyGrid.ts index f4241bd..74e51a0 100644 --- a/packages/vue/src/components/LuckyGrid.ts +++ b/packages/vue/src/components/LuckyGrid.ts @@ -9,13 +9,9 @@ export default defineComponent({ props: { width: { type: [String, Number], - default: '300px', - require: true }, height: { type: [String, Number], - default: '300px', - require: true }, cols: { type: [String, Number], diff --git a/packages/vue/src/components/LuckyWheel.ts b/packages/vue/src/components/LuckyWheel.ts index 2e60779..7911c0b 100644 --- a/packages/vue/src/components/LuckyWheel.ts +++ b/packages/vue/src/components/LuckyWheel.ts @@ -9,13 +9,9 @@ export default defineComponent({ props: { width: { type: [String, Number], - default: '300px', - require: true }, height: { type: [String, Number], - default: '300px', - require: true }, blocks: { type: Array, diff --git a/packages/vue/src/components/SlotMachine.ts b/packages/vue/src/components/SlotMachine.ts index ef352a1..51daf7e 100644 --- a/packages/vue/src/components/SlotMachine.ts +++ b/packages/vue/src/components/SlotMachine.ts @@ -9,13 +9,9 @@ export default defineComponent({ props: { width: { type: [String, Number], - default: '300px', - require: true }, height: { type: [String, Number], - default: '300px', - require: true }, blocks: { type: Array, diff --git a/packages/vue/types/index.d.ts b/packages/vue/types/index.d.ts index c4e87d6..248721e 100644 --- a/packages/vue/types/index.d.ts +++ b/packages/vue/types/index.d.ts @@ -4,13 +4,9 @@ import { LuckyWheel, LuckyGrid, SlotMachine } from 'lucky-canvas'; declare const _default$3: vue_demi.DefineComponent<{ width: { type: (StringConstructor | NumberConstructor)[]; - default: string; - require: boolean; }; height: { type: (StringConstructor | NumberConstructor)[]; - default: string; - require: boolean; }; blocks: { type: ArrayConstructor; @@ -51,11 +47,12 @@ declare const _default$3: vue_demi.DefineComponent<{ blocks: unknown[]; prizes: unknown[]; buttons: unknown[]; - width: string | number; - height: string | number; defaultStyle: Record; defaultConfig: Record; -} & {}> & { +} & { + width?: string | number | undefined; + height?: string | number | undefined; +}> & { onStart?: ((...args: any[]) => any) | undefined; onEnd?: ((...args: any[]) => any) | undefined; onSuccess?: ((...args: any[]) => any) | undefined; @@ -65,8 +62,6 @@ declare const _default$3: vue_demi.DefineComponent<{ blocks: unknown[]; prizes: unknown[]; buttons: unknown[]; - width: string | number; - height: string | number; defaultStyle: Record; defaultConfig: Record; }>; @@ -74,13 +69,9 @@ declare const _default$3: vue_demi.DefineComponent<{ declare const _default$2: vue_demi.DefineComponent<{ width: { type: (StringConstructor | NumberConstructor)[]; - default: string; - require: boolean; }; height: { type: (StringConstructor | NumberConstructor)[]; - default: string; - require: boolean; }; cols: { type: (StringConstructor | NumberConstructor)[]; @@ -142,13 +133,13 @@ declare const _default$2: vue_demi.DefineComponent<{ blocks: unknown[]; prizes: unknown[]; buttons: unknown[]; - width: string | number; - height: string | number; defaultStyle: Record; activeStyle: Record; defaultConfig: Record; } & { button?: Record | undefined; + width?: string | number | undefined; + height?: string | number | undefined; }> & { onStart?: ((...args: any[]) => any) | undefined; onEnd?: ((...args: any[]) => any) | undefined; @@ -161,8 +152,6 @@ declare const _default$2: vue_demi.DefineComponent<{ blocks: unknown[]; prizes: unknown[]; buttons: unknown[]; - width: string | number; - height: string | number; defaultStyle: Record; activeStyle: Record; defaultConfig: Record; @@ -171,13 +160,9 @@ declare const _default$2: vue_demi.DefineComponent<{ declare const _default$1: vue_demi.DefineComponent<{ width: { type: (StringConstructor | NumberConstructor)[]; - default: string; - require: boolean; }; height: { type: (StringConstructor | NumberConstructor)[]; - default: string; - require: boolean; }; blocks: { type: ArrayConstructor; @@ -218,16 +203,15 @@ declare const _default$1: vue_demi.DefineComponent<{ blocks: unknown[]; slots: unknown[]; prizes: unknown[]; - width: string | number; - height: string | number; defaultStyle: Record; defaultConfig: Record; -} & {}>, { +} & { + width?: string | number | undefined; + height?: string | number | undefined; +}>, { blocks: unknown[]; slots: unknown[]; prizes: unknown[]; - width: string | number; - height: string | number; defaultStyle: Record; defaultConfig: Record; }>;