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

feat: watermark #3751

Merged
merged 22 commits into from
Oct 22, 2024
Merged

feat: watermark #3751

merged 22 commits into from
Oct 22, 2024

Conversation

ybzky
Copy link
Member

@ybzky ybzky commented Oct 14, 2024

close #xxx

Pull Request Checklist

  • Related tickets or issues have been linked in the PR description (or missing issue).
  • Naming convention is followed (do please check it especially when you created new plugins, commands and resources).
  • Unit tests have been added for the changes (if applicable).
  • Breaking changes have been documented (or no breaking changes introduced in this PR).

@github-actions GitHub Actions
Copy link

github-actions bot commented Oct 14, 2024 •
edited
Loading

View Deployment

📑 Examples 📚 Storybook
🔗 Preview link 🔗 Preview link

@github-actions GitHub Actions
Copy link

github-actions bot commented Oct 14, 2024 •
edited
Loading

Playwright test results

passed  17 passed

Details

stats  17 tests across 8 suites
duration  4 minutes, 9 seconds
commit  2023841
info  For more information, see full report

@codecov Codecov
Copy link

codecov bot commented Oct 14, 2024 •
edited
Loading

Codecov Report

Attention: Patch coverage is 0% with 429 lines in your changes missing coverage. Please review.

Project coverage is 31.92%. Comparing base (7107be6) to head (2023841).
Report is 4 commits behind head on dev.

Files with missing lines Patch % Lines
packages/watermark/src/util.ts 0.00% 98 Missing ⚠️
...ark/src/views/components/WatermarkImageSetting.tsx 0.00% 60 Missing ⚠️
packages/watermark/src/plugin.ts 0.00% 48 Missing ⚠️
...mark/src/views/components/WatermarkTextSetting.tsx 0.00% 33 Missing ⚠️
...ark/src/controllers/watermark.render.controller.ts 0.00% 31 Missing ⚠️
.../watermark/src/views/components/WatermarkPanel.tsx 0.00% 28 Missing ⚠️
...mark/src/views/components/WatermarkPanelFooter.tsx 0.00% 23 Missing ⚠️
...ckages/watermark/src/services/watermark.service.ts 0.00% 22 Missing ⚠️
.../watermark/src/views/extensions/watermark-layer.ts 0.00% 16 Missing ⚠️
...rmark/src/controllers/watermark.menu.controller.ts 0.00% 13 Missing ⚠️
... and 10 more
Additional details and impacted files 
@@            Coverage Diff             @@
##              dev    #3751      +/-   ##
==========================================
- Coverage   32.06%   31.92%   -0.15%     
==========================================
  Files        2322     2338      +16     
  Lines      120245   120698     +453     
  Branches    26608    26707      +99     
==========================================
- Hits        38562    38537      -25     
- Misses      81683    82161     +478

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

wzhudev
wzhudev requested changes Oct 19, 2024
View reviewed changes
Copy link
Member

@wzhudev wzhudev left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

README of this plugin is empty.

packages/sheets-ui/src/services/sheets-render.service.ts Outdated
@@ -87,6 +87,7 @@ export class SheetsRenderService extends RxDisposable {
this._renderManagerService.created$.subscribe((renderer) => {
if (renderer.unitId === unitId) {
renderer.engine.getCanvas().setId(SHEET_MAIN_CANVAS_ID);
renderer.engine.getCanvas().getContext().setId(SHEET_MAIN_CANVAS_ID);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There may be multi renderers on the same webpage.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

here only set id to the main canvas

packages/watermark/src/commands/operations/OpenWatermarkPanelOperation.ts Outdated Show resolved Hide resolved
packages/watermark/src/services/watermarkService.ts Outdated Show resolved Hide resolved
@zhaolixin7 zhaolixin7 added the qa:verified This PR has already by verified by a QA and is considered good enough to be merge label Oct 19, 2024
@ybzky ybzky requested a review from wzhudev October 21, 2024 06:22
wzhudev
wzhudev approved these changes Oct 22, 2024
View reviewed changes
Copy link
Member

@wzhudev wzhudev left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. An e2e visual comparison test would be better.

packages/watermark/src/services/watermark.service.ts Outdated Show resolved Hide resolved
@ybzky ybzky merged commit 9630e31 into dev Oct 22, 2024
9 checks passed
@ybzky ybzky deleted the feat/watermark branch October 22, 2024 06:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@wzhudev wzhudev wzhudev approved these changes

@jikkai jikkai Awaiting requested review from jikkai jikkai is a code owner

@Jocs Jocs Awaiting requested review from Jocs Jocs is a code owner

@lumixraku lumixraku Awaiting requested review from lumixraku lumixraku is a code owner

@Dushusir Dushusir Awaiting requested review from Dushusir Dushusir is a code owner

@hexf00 hexf00 Awaiting requested review from hexf00 hexf00 is a code owner

Assignees
No one assigned
Labels
qa:verified This PR has already by verified by a QA and is considered good enough to be merge
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@ybzky @wzhudev @zhaolixin7