diff --git a/packages/vant/src/watermark/README.md b/packages/vant/src/watermark/README.md index 375ed851a..1c88194ca 100644 --- a/packages/vant/src/watermark/README.md +++ b/packages/vant/src/watermark/README.md @@ -33,7 +33,7 @@ Use the `image` prop to set the watermark image, and use `opacity` prop to adjus ```html ``` @@ -46,7 +46,7 @@ Use `gap-x` `gap-y` prop to control the gap between watermark items. image="https://fastly.jsdelivr.net/npm/@vant/assets/vant-watermark.png" :gap-x="30" :gap-y="10" - :opacity="0.2" + opacity="0.2" /> ``` @@ -58,7 +58,7 @@ Use `rotate` prop to control the rotate of watermark. The default value is `-22` ``` @@ -69,7 +69,7 @@ Use the `full-page` prop to control the display range of the watermark. ```html ``` @@ -101,7 +101,7 @@ Use the `default` slot to pass HTML directly. Inline styles are supported, and s | gapX | Horizontal spacing between watermarks | _number_ | `0` | | gapY | Vertical spacing between watermarks | _number_ | `0` | | font-color | Color of text watermark | _string_ | `#dcdee0` | -| opacity | opacity of watermark | _number_ | `1` | +| opacity | Opacity of watermark | _number \| string_ | - | ### Slots diff --git a/packages/vant/src/watermark/README.zh-CN.md b/packages/vant/src/watermark/README.zh-CN.md index ee8e5b284..4164c9608 100644 --- a/packages/vant/src/watermark/README.zh-CN.md +++ b/packages/vant/src/watermark/README.zh-CN.md @@ -33,7 +33,7 @@ app.use(Watermark); ```html ``` @@ -46,7 +46,7 @@ app.use(Watermark); image="https://fastly.jsdelivr.net/npm/@vant/assets/vant-watermark.png" :gap-x="30" :gap-y="10" - :opacity="0.2" + opacity="0.2" /> ``` @@ -58,7 +58,7 @@ app.use(Watermark); ``` @@ -69,7 +69,7 @@ app.use(Watermark); ```html ``` @@ -101,7 +101,7 @@ app.use(Watermark); | gapX | 水印之间的水平间隔 | _number_ | `0` | | gapY | 水印之间的垂直间隔 | _number_ | `0` | | font-color | 文字水印的颜色 | _string_ | `#dcdee0` | -| opacity | 水印的透明度 | _number_ | `1` | +| opacity | 水印的透明度 | _number \| string_ | - | ### Slots diff --git a/packages/vant/src/watermark/Watermark.tsx b/packages/vant/src/watermark/Watermark.tsx index 470c3db42..ec0838f4f 100644 --- a/packages/vant/src/watermark/Watermark.tsx +++ b/packages/vant/src/watermark/Watermark.tsx @@ -21,17 +21,17 @@ import { const [name, bem] = createNamespace('watermark'); export const watermarkProps = { + gapX: makeNumberProp(0), + gapY: makeNumberProp(0), + image: String, width: makeNumberProp(100), height: makeNumberProp(100), rotate: makeNumericProp(-22), zIndex: numericProp, content: String, - image: String, + opacity: numericProp, fullPage: truthProp, - gapX: makeNumberProp(0), - gapY: makeNumberProp(0), fontColor: makeStringProp('#dcdee0'), - opacity: makeNumberProp(1), }; export type WatermarkProps = ExtractPropTypes; diff --git a/packages/vant/src/watermark/demo/index.vue b/packages/vant/src/watermark/demo/index.vue index 35b01ec19..8ee4a9c7c 100644 --- a/packages/vant/src/watermark/demo/index.vue +++ b/packages/vant/src/watermark/demo/index.vue @@ -42,7 +42,7 @@ const fullPage = ref(false);
@@ -54,7 +54,7 @@ const fullPage = ref(false); image="https://fastly.jsdelivr.net/npm/@vant/assets/vant-watermark.png" :gap-x="30" :gap-y="10" - :opacity="0.2" + opacity="0.2" :full-page="false" /> @@ -65,7 +65,7 @@ const fullPage = ref(false); @@ -78,7 +78,7 @@ const fullPage = ref(false); diff --git a/packages/vant/src/watermark/test/__snapshots__/index.spec.ts.snap b/packages/vant/src/watermark/test/__snapshots__/index.spec.ts.snap index 023212ef7..5e6458fe3 100644 --- a/packages/vant/src/watermark/test/__snapshots__/index.spec.ts.snap +++ b/packages/vant/src/watermark/test/__snapshots__/index.spec.ts.snap @@ -9,7 +9,7 @@ exports[`watermark should render content 1`] = ` width="100" height="100" xmlns="http://www.w3.org/2000/svg" - style="padding: 0px 0px 0px 0px; opacity: 1;" + style="padding: 0px 0px 0px 0px;" >