build: upgrade to v1.7.23 修改宽高默认取元素本身的属性

panyu97py · Apr 23, 2022 · 3d03ca1 · 3d03ca1
1 parent 5a8a73d
commit 3d03ca1
Show file tree

Hide file tree

Showing 10 changed files with 21 additions and 49 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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<string, any>;
  defaultConfig: Record<string, any>;
-} & {}> & {
+} & {
+ width?: string | number | undefined;
+ height?: string | number | undefined;
+}> & {
  onStart?: ((...args: any[]) => any) | undefined;
  onEnd?: ((...args: any[]) => any) | undefined;
  onSuccess?: ((...args: any[]) => any) | undefined;
@@ -65,22 +62,16 @@ declare const _default$3: vue_demi.DefineComponent<{
  blocks: unknown[];
  prizes: unknown[];
  buttons: unknown[];
- width: string | number;
- height: string | number;
  defaultStyle: Record<string, any>;
  defaultConfig: Record<string, any>;
 }>;
 
 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<string, any>;
  activeStyle: Record<string, any>;
  defaultConfig: Record<string, any>;
 } & {
  button?: Record<string, any> | 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<string, any>;
  activeStyle: Record<string, any>;
  defaultConfig: Record<string, any>;
@@ -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<string, any>;
  defaultConfig: Record<string, any>;
-} & {}>, {
+} & {
+ width?: string | number | undefined;
+ height?: string | number | undefined;
+}>, {
  blocks: unknown[];
  slots: unknown[];
  prizes: unknown[];
- width: string | number;
- height: string | number;
  defaultStyle: Record<string, any>;
  defaultConfig: Record<string, any>;
 }>;