Skip to content

Commit 3208666

Browse files
committed
chore(docs): opt example.
1 parent 0a4ef95 commit 3208666

File tree

8 files changed

+256
-182
lines changed

8 files changed

+256
-182
lines changed

README-ja.md

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,16 +72,34 @@ Vue 3で`TypeScript`を使用する場合:
7272

7373
```html
7474
<template>
75-
<qrcode-vue :value="value" :level="level" :render-as="renderAs" />
75+
<qrcode-vue
76+
:value="value"
77+
:level="level"
78+
:render-as="renderAs"
79+
:background="background"
80+
:foreground='foreground'
81+
:image-settings='imageSettings'
82+
/>
7683
</template>
7784
<script setup lang="ts">
7885
import { ref } from 'vue'
7986
import QrcodeVue from 'qrcode.vue'
80-
import type { Level, RenderAs } from 'qrcode.vue'
87+
import type { Level, RenderAs, ImageSettings } from 'qrcode.vue'
8188
8289
const value = ref('qrcode')
8390
const level = ref<Level>('M')
8491
const renderAs = ref<RenderAs>('svg')
92+
const background = ref('#ffffff')
93+
const foreground = ref('#000000')
94+
const margin = ref(0)
95+
const imageSettings = ref<ImageSettings>({
96+
src: 'https://github.com/scopewu.png',
97+
width: 30,
98+
height: 30,
99+
// x: 10,
100+
// y: 10,
101+
excavate: true,
102+
})
85103
</script>
86104
```
87105

README-zh_cn.md

Lines changed: 22 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -70,17 +70,34 @@ createApp({
7070

7171
```html
7272
<template>
73-
<qrcode-vue :value="value" :level="level" :render-as="renderAs" />
73+
<qrcode-vue
74+
:value="value"
75+
:level="level"
76+
:render-as="renderAs"
77+
:background="background"
78+
:foreground='foreground'
79+
:image-settings='imageSettings'
80+
/>
7481
</template>
75-
7682
<script setup lang="ts">
7783
import { ref } from 'vue'
7884
import QrcodeVue from 'qrcode.vue'
79-
import type { Level, RenderAs } from 'qrcode.vue'
80-
81-
const value = ref<String>('qrcode')
85+
import type { Level, RenderAs, ImageSettings } from 'qrcode.vue'
86+
87+
const value = ref('qrcode')
8288
const level = ref<Level>('M')
8389
const renderAs = ref<RenderAs>('svg')
90+
const background = ref('#ffffff')
91+
const foreground = ref('#000000')
92+
const margin = ref(0)
93+
const imageSettings = ref<ImageSettings>({
94+
src: 'https://github.com/scopewu.png',
95+
width: 30,
96+
height: 30,
97+
// x: 10,
98+
// y: 10,
99+
excavate: true,
100+
})
84101
</script>
85102
```
86103

README.md

Lines changed: 26 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,12 @@ Or single-file components with a `*.vue` extension:
4949

5050
```html
5151
<template>
52-
<qrcode-vue :value="value" :size="size" level="H" />
52+
<qrcode-vue :value="value" :size="size" level="H" render-as="svg" />
53+
<qrcode-canvas :value="QRCODE.VUE 😄" :size="size" level="H" />
54+
<qrcode-svg value="QRCODE.VUE 😄" level="H" />
5355
</template>
5456
<script>
55-
import QrcodeVue from 'qrcode.vue'
57+
import QrcodeVue, { QrcodeCanvas, QrcodeSvg } from 'qrcode.vue'
5658
5759
export default {
5860
data() {
@@ -63,6 +65,8 @@ Or single-file components with a `*.vue` extension:
6365
},
6466
components: {
6567
QrcodeVue,
68+
QrcodeCanvas,
69+
QrcodeSvg,
6670
},
6771
}
6872
</script>
@@ -72,16 +76,34 @@ When you use the component with Vue 3 with `TypeScript`:
7276

7377
```html
7478
<template>
75-
<qrcode-vue :value="value" :level="level" :render-as="renderAs" />
79+
<qrcode-vue
80+
:value="value"
81+
:level="level"
82+
:render-as="renderAs"
83+
:background="background"
84+
:foreground='foreground'
85+
:image-settings='imageSettings'
86+
/>
7687
</template>
7788
<script setup lang="ts">
7889
import { ref } from 'vue'
7990
import QrcodeVue from 'qrcode.vue'
80-
import type { Level, RenderAs } from 'qrcode.vue'
91+
import type { Level, RenderAs, ImageSettings } from 'qrcode.vue'
8192
8293
const value = ref('qrcode')
8394
const level = ref<Level>('M')
8495
const renderAs = ref<RenderAs>('svg')
96+
const background = ref('#ffffff')
97+
const foreground = ref('#000000')
98+
const margin = ref(0)
99+
const imageSettings = ref<ImageSettings>({
100+
src: 'https://github.com/scopewu.png',
101+
width: 30,
102+
height: 30,
103+
// x: 10,
104+
// y: 10,
105+
excavate: true,
106+
})
85107
</script>
86108
```
87109

example/webpack.html

Lines changed: 23 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@
3030
<meta name="twitter:data1" content="scopewu" />
3131
<meta name="twitter:creator" content="@ngwwj" />
3232
<link
33+
href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/css/bootstrap.min.css"
3334
rel="stylesheet"
34-
href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/css/bootstrap.min.css"
35-
integrity="sha384-T3c6CoIi6uLrA9TneNEoa7RxnatzjcDSCmG1MXxSR1GAsXEV/Dwwykc2MPK8M2HN"
35+
integrity="sha384-QWTKZyjpPEjISv5WaRU9OFeRpok6YctnYmDr5pNlyT2bRjXh0JMhjY6hW+ALEwIH"
3636
crossorigin="anonymous"
3737
referrerpolicy="no-referrer"
3838
/>
@@ -198,17 +198,33 @@
198198
.octicon-heart {
199199
color: #bf3989
200200
}
201+
.space-x-2 :not(:first-of-type){
202+
margin-left: 0.5rem;
203+
}
201204
[v-cloak] {
202205
display: none;
203206
}
204207
</style>
205-
206208
</head>
207209
<body>
208210
<div id="root">
209-
<div class="container-fluid">
210-
<div class="border-bottom mt-4 mb-3 pb-2">
211-
<h1>qrcode.vue:</h1>
211+
<div class="container-fluid mb-5">
212+
<header class="border-bottom mt-4 mb-3 pb-2">
213+
<div class='row align-items-center my-3'>
214+
<h1 class='col-sm-8 m-0'>qrcode.vue:</h1>
215+
<div class='col-4 space-x-2 text-end'>
216+
<a
217+
href='https://github.com/scopewu/qrcode.vue'
218+
class='link-dark link-underline-opacity-25 link-underline-opacity-100-hover'
219+
>GitHub</a>
220+
<a
221+
href='https://tie.pub'
222+
class='link-dark link-underline-opacity-25 link-underline-opacity-100-hover'
223+
target='_blank'
224+
rel='noopener'
225+
>Author</a>
226+
</div>
227+
</div>
212228
<div class='row'>
213229
<div class='col-4'>
214230
<div class="widget" v-cloak>
@@ -222,14 +238,8 @@ <h1>qrcode.vue:</h1>
222238
<a class="social-count" href="https://github.com/scopewu/qrcode.vue/stargazers" rel="noopener" target="_blank" :aria-label="`${stargazersCount} stargazers on GitHub`">{{ stargazersCount }}</a>
223239
</div>
224240
</div>
225-
<div class='col-8 text-end'>
226-
<a
227-
href='https://github.com/scopewu/qrcode.vue'
228-
class='link-dark'
229-
>Fork me on GitHub</a>
230-
</div>
231241
</div>
232-
</div>
242+
</header>
233243
<form v-cloak>
234244
<div class="row mb-3">
235245
<label class="col-sm-2 col-form-label">Value:</label>

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "qrcode.vue",
3-
"version": "3.4.1",
3+
"version": "3.5.0",
44
"description": "A Vue.js component to generate QRCode. Both support Vue 2 and Vue 3",
55
"type": "module",
66
"main": "./dist/qrcode.vue.cjs.js",
@@ -51,10 +51,10 @@
5151
"dependencies": {},
5252
"devDependencies": {
5353
"@rollup/plugin-terser": "^0.4.4",
54-
"@rsbuild/core": "^1.0.1",
54+
"@rsbuild/core": "^1.0.7",
5555
"rollup": "^4.22.4",
5656
"rollup-plugin-typescript2": "^0.36.0",
5757
"typescript": "^5.6.2",
58-
"vue": "^3.5.3"
58+
"vue": "^3.5.8"
5959
}
6060
}

rsbuild.config.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,14 @@ export default defineConfig({
1414
},
1515
},
1616
output: {
17+
assetPrefix: 'https://cdn.jsdelivr.net/gh/scopewu/qrcode.vue@gh-pages/',
1718
distPath: {
1819
root: './example/dist',
1920
},
2021
},
2122
html: {
2223
template: './example/webpack.html',
24+
scriptLoading: 'module',
2325
},
2426
server: {
2527
htmlFallback: 'index',

src/index.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ const QRCodeVueProps = {
178178
},
179179
}
180180

181-
export const QRCodeSvg = defineComponent({
181+
export const QrcodeSvg = defineComponent({
182182
name: 'QRCodeSvg',
183183
props: QRCodeProps,
184184
setup(props) {
@@ -245,7 +245,7 @@ export const QRCodeSvg = defineComponent({
245245
},
246246
})
247247

248-
export const QRCodeCanvas = defineComponent({
248+
export const QrcodeCanvas = defineComponent({
249249
name: 'QRCodeCanvas',
250250
props: QRCodeProps,
251251
setup(props, ctx) {
@@ -367,7 +367,7 @@ const QrcodeVue = defineComponent({
367367
const level = validErrorCorrectLevel(_level) ? _level : defaultErrorCorrectLevel
368368

369369
return h(
370-
renderAs === 'svg' ? QRCodeSvg : QRCodeCanvas,
370+
renderAs === 'svg' ? QrcodeSvg : QrcodeCanvas,
371371
{ value, size, margin, level, background, foreground, imageSettings },
372372
)
373373
},

0 commit comments

Comments
 (0)