Update WaterMark.tsx (#743)

javasbot · web-flow · commit 88c15e718db6 · 2024-08-29T00:09:25.000+08:00
feat(m): 修复font属性覆盖错误
diff --git a/packages/react-vant/src/components/water-mark/WaterMark.tsx b/packages/react-vant/src/components/water-mark/WaterMark.tsx
@@ -68,7 +68,7 @@ const WaterMark: React.FC<WaterMarkProps> = p => {
           setBase64Url(canvas.toDataURL())
         }
       } else if (content) {
-        const frontProps = { ...font, ...DEFAULT_FONT }
+        const frontProps = { ...DEFAULT_FONT, ...font }
         const { size, family, style, weight, color } = frontProps
         ctx.textBaseline = 'middle'
         ctx.textAlign = 'center'

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ const WaterMark: React.FC<WaterMarkProps> = p => {`
`68`	`68`	`setBase64Url(canvas.toDataURL())`
`69`	`69`	`}`
`70`	`70`	`} else if (content) {`
`71`		`- const frontProps = { ...font, ...DEFAULT_FONT }`
	`71`	`+ const frontProps = { ...DEFAULT_FONT, ...font }`
`72`	`72`	`const { size, family, style, weight, color } = frontProps`
`73`	`73`	`ctx.textBaseline = 'middle'`
`74`	`74`	`ctx.textAlign = 'center'`