diff --git a/package.json b/package.json index 246f71a..216c6a9 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "qrcode.vue", - "version": "3.5.0", + "version": "3.5.1", "description": "A Vue.js component to generate QRCode. Both support Vue 2 and Vue 3", "type": "module", "main": "./dist/qrcode.vue.cjs.js", diff --git a/src/index.ts b/src/index.ts index 530117a..b79abf3 100644 --- a/src/index.ts +++ b/src/index.ts @@ -187,7 +187,9 @@ export const QrcodeSvg = defineComponent({ let imageProps: { x: number, y: number, width: number, height: number } const generate = () => { - const { value, level, margin } = props + const { value, level: _level, margin: _margin } = props + const margin = _margin >>> 0 + const level = validErrorCorrectLevel(_level) ? _level : defaultErrorCorrectLevel let cells = QR.QrCode.encodeText(value, ErrorCorrectLevelMap[level]).getModules() numCells.value = cells.length + margin * 2 @@ -253,7 +255,9 @@ export const QrcodeCanvas = defineComponent({ const imageRef = ref(null) const generate = () => { - const { value, level, size, margin, background, foreground } = props + const { value, level: _level, size, margin: _margin, background, foreground } = props + const margin = _margin >>> 0 + const level = validErrorCorrectLevel(_level) ? _level : defaultErrorCorrectLevel const canvas = canvasEl.value @@ -355,16 +359,13 @@ const QrcodeVue = defineComponent({ const { renderAs, value, - size: _size, - margin: _margin, - level: _level, + size, + margin, + level, background, foreground, imageSettings, } = this.$props - const size = _size >>> 0 - const margin = _margin >>> 0 - const level = validErrorCorrectLevel(_level) ? _level : defaultErrorCorrectLevel return h( renderAs === 'svg' ? QrcodeSvg : QrcodeCanvas,