From ae91476f6bb88bce01836b339efe20b74b0302ca Mon Sep 17 00:00:00 2001 From: Liuzj <530604689@qq.com> Date: Thu, 9 Jun 2022 19:45:01 +0800 Subject: [PATCH] fix(comp:watermark): prop content type error (#944) --- packages/components/watermark/src/types.ts | 2 +- packages/components/watermark/style/themes/seer.less | 5 ++++- packages/components/watermark/style/themes/seer.ts | 2 ++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/packages/components/watermark/src/types.ts b/packages/components/watermark/src/types.ts index b1ab887c9..988f05185 100644 --- a/packages/components/watermark/src/types.ts +++ b/packages/components/watermark/src/types.ts @@ -21,7 +21,7 @@ export const watermarkProps = { /** 水印内容 * * 多行文本时请以数组形式输入 */ - content: { type: String as PropType, default: undefined, required: true }, + content: { type: [String, Array] as PropType, default: undefined, required: true }, /** 水印旋转角度 */ rotate: { type: Number, default: -22 }, /** 水印`z-index` */ diff --git a/packages/components/watermark/style/themes/seer.less b/packages/components/watermark/style/themes/seer.less index 5be7463c7..32bf707c1 100644 --- a/packages/components/watermark/style/themes/seer.less +++ b/packages/components/watermark/style/themes/seer.less @@ -1 +1,4 @@ -@import '../../../style/themes/default.less'; +@import '../../../style/themes/seer.less'; +@import './seer.variable.less'; + +@import '../index.less'; diff --git a/packages/components/watermark/style/themes/seer.ts b/packages/components/watermark/style/themes/seer.ts index 63a4fe708..cf5110609 100644 --- a/packages/components/watermark/style/themes/seer.ts +++ b/packages/components/watermark/style/themes/seer.ts @@ -1,2 +1,4 @@ // style dependencies +import '@idux/components/style/core/seer' + import './seer.less'