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.

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

feat(function): add watermark custom style #3634

Merged
merged 1 commit into from
Mar 2, 2024

Conversation

Ccheng2729111
Copy link

@Ccheng2729111 Ccheng2729111 commented Feb 29, 2024

General

✏️ Mark the necessary items without changing the structure of the PR template.

  • [ x ] Pull request template structure not broken

Type

ℹ️ What types of changes does your code introduce?

👉 Put an x in the boxes that apply

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • [ ] This change requires a documentation update

Checklist

ℹ️ Check all checkboxes - this will indicate that you have done everything in accordance with the rules in CONTRIBUTING.

👉 Put an x in the boxes that apply.

  • My code follows the style guidelines of this project
  • Is the code format correct
  • Is the git submission information standard?
  • My code follows the style guidelines of this project
  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • My changes generate no new warnings
  • I have added tests that prove my fix is effective or that my feature works
  • New and existing unit tests pass locally with my changes
  • Any dependent changes have been merged and published in downstream modules

@Ccheng2729111
Copy link
Author

  1. 增加了waterMarkOptions,支持传入自定义水印基本样式,ts类型可看
  2. reset重置样式增加了display,visibility防止基本的隐藏水印的操作,否则可以直接增加样式进行隐藏水印

@wangjue666 wangjue666 merged commit ca3ddd1 into vbenjs:main Mar 2, 2024
2 checks passed
xxs3315 pushed a commit to xxs3315/vue-vben-admin that referenced this pull request Mar 7, 2024
@vbenjs vbenjs locked and limited conversation to collaborators Aug 4, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants