Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(comp:watermark): prop content type error #944

Merged
merged 1 commit into from
Jun 9, 2022
Merged

fix(comp:watermark): prop content type error #944

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/components/watermark/src/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ export const watermarkProps = {
/** 水印内容
* * 多行文本时请以数组形式输入
*/
content: { type: String as PropType<string | string[]>, default: undefined, required: true },
content: { type: [String, Array] as PropType<string | string[]>, default: undefined, required: true },
/** 水印旋转角度 */
rotate: { type: Number, default: -22 },
/** 水印`z-index` */
Expand Down
5 changes: 4 additions & 1 deletion packages/components/watermark/style/themes/seer.less
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@
@import '../../../style/themes/default.less';
@import '../../../style/themes/seer.less';
@import './seer.variable.less';

@import '../index.less';
2 changes: 2 additions & 0 deletions packages/components/watermark/style/themes/seer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
// style dependencies
import '@idux/components/style/core/seer'

import './seer.less'