-
-
Notifications
You must be signed in to change notification settings - Fork 7
feat(PdfReader): add ResetToolbarView function #749
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
Merged
Changes from all commits
Commits
Show all changes
13 commits
Select commit
Hold shift + click to select a range
a903b0b
refactor: 移除 sidebar 样式
ArgoZhang 85c4fa5
refactor: 移除 dialog 样式
ArgoZhang 8259622
refactor: 移除不使用的枚举
ArgoZhang c534598
refactor: 更改方法名称为 initEventBus
ArgoZhang 92f05e8
refactor: 工具栏按钮事件统一到 toolbar 元素
ArgoZhang 6864e63
refactor: 旋转方法移动到客户端
ArgoZhang 0a0e565
feat: 移动工具栏按钮逻辑到客户端
ArgoZhang 3adb3d9
feat: 工具栏缩放功能下沉到客户端
ArgoZhang f90ef5f
refactor: 增加重置工具栏逻辑
ArgoZhang a048ef4
chore: bump version 10.0.5
ArgoZhang 8f3ebee
refactor: 增加双页视图状态保持逻辑
ArgoZhang 9f070e8
feat: 增加页码获得焦点逻辑
ArgoZhang a8f60aa
chore: bump version 10.0.5
ArgoZhang File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
2 changes: 1 addition & 1 deletion
2
src/components/BootstrapBlazor.PdfReader/BootstrapBlazor.PdfReader.csproj
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
106 changes: 0 additions & 106 deletions
106
src/components/BootstrapBlazor.PdfReader/EnumZoomMode.cs
This file was deleted.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -4,7 +4,6 @@ | |||||
|
|
||||||
| using Microsoft.AspNetCore.Components; | ||||||
| using Microsoft.Extensions.Localization; | ||||||
| using System.Globalization; | ||||||
|
|
||||||
| namespace BootstrapBlazor.Components; | ||||||
|
|
||||||
|
|
@@ -135,57 +134,13 @@ public partial class PdfReader | |||||
| .AddClassFromAttributes(AdditionalAttributes) | ||||||
| .Build(); | ||||||
|
|
||||||
| private string? ViewBodyString => CssBuilder.Default("bb-view-group bb-view-toolbar-main") | ||||||
| .AddClass("fit-width", FitMode == PdfReaderFitMode.PageHeight) | ||||||
| .Build(); | ||||||
|
|
||||||
| private string? _docTitle; | ||||||
| private PdfReaderFitMode _fitMode; | ||||||
| private uint _currentPage; | ||||||
| private string? _url; | ||||||
| private string? _currentScale; | ||||||
| private string? _dropdownItemCheckIcon; | ||||||
| private string? _dropdownItemDefaultIcon; | ||||||
| private bool _enableThumbnails = true; | ||||||
|
|
||||||
| private string CurrentPageString | ||||||
| { | ||||||
| get => CurrentPage.ToString(CultureInfo.InvariantCulture); | ||||||
| set => SetCurrentPage(value); | ||||||
| } | ||||||
|
|
||||||
| private void SetCurrentPage(string value) | ||||||
| { | ||||||
| if (uint.TryParse(value, NumberStyles.Integer, CultureInfo.InvariantCulture, out var num)) | ||||||
| { | ||||||
| CurrentPage = num; | ||||||
| } | ||||||
| } | ||||||
|
|
||||||
| private string CurrentScaleString | ||||||
| { | ||||||
| get => $"{CurrentScale ?? "100"}%"; | ||||||
| set => SetCurrentScale(value); | ||||||
| } | ||||||
|
|
||||||
| private void SetCurrentScale(string value) | ||||||
| { | ||||||
| if (string.IsNullOrEmpty(value)) | ||||||
| { | ||||||
| CurrentScale = "100"; | ||||||
| } | ||||||
| else if (float.TryParse(value.TrimEnd("%"), out var v)) | ||||||
| { | ||||||
| v = v switch | ||||||
| { | ||||||
| > 500 => 500, | ||||||
| < 25 => 25, | ||||||
| _ => v | ||||||
| }; | ||||||
|
|
||||||
| CurrentScale = v.ToString(CultureInfo.InvariantCulture); | ||||||
| } | ||||||
| } | ||||||
| private bool _showToolbar = true; | ||||||
|
|
||||||
| /// <summary> | ||||||
| /// <inheritdoc/> | ||||||
|
|
@@ -216,33 +171,29 @@ protected override async Task OnAfterRenderAsync(bool firstRender) | |||||
|
|
||||||
| if (firstRender) | ||||||
| { | ||||||
| _fitMode = FitMode; | ||||||
| _currentPage = CurrentPage; | ||||||
| _url = Url; | ||||||
| _currentScale = CurrentScale; | ||||||
| _currentPage = CurrentPage; | ||||||
| _enableThumbnails = EnableThumbnails; | ||||||
| _showToolbar = ShowToolbar; | ||||||
| } | ||||||
|
|
||||||
| if (_url != Url) | ||||||
| { | ||||||
| _url = Url; | ||||||
| await InvokeInitAsync(); | ||||||
| } | ||||||
|
|
||||||
| if (_fitMode != FitMode) | ||||||
| { | ||||||
| _fitMode = FitMode; | ||||||
| await InvokeVoidAsync("setScaleValue", Id, _fitMode.ToDescriptionString()); | ||||||
| } | ||||||
| if (_currentPage != CurrentPage) | ||||||
| { | ||||||
| _currentPage = CurrentPage; | ||||||
| await NavigateToPageAsync(_currentPage); | ||||||
| } | ||||||
| if (_currentScale != CurrentScale) | ||||||
| if (_showToolbar != ShowToolbar) | ||||||
| { | ||||||
| _currentScale = CurrentScale; | ||||||
| await InvokeVoidAsync("scale", Id, _currentScale); | ||||||
| _showToolbar = ShowToolbar; | ||||||
| if (_showToolbar) | ||||||
| { | ||||||
| await InvokeVoidAsync("resetToolbar", Id); | ||||||
| } | ||||||
| } | ||||||
| if (_enableThumbnails != EnableThumbnails) | ||||||
| { | ||||||
|
|
@@ -263,6 +214,7 @@ protected override async Task OnAfterRenderAsync(bool firstRender) | |||||
| Url, | ||||||
| FitMode, | ||||||
| EnableThumbnails, | ||||||
| CurrentPage, | ||||||
| TriggerPagesInit = OnPagesInitAsync != null, | ||||||
| TriggerPagesLoaded = OnPagesLoadedAsync != null, | ||||||
| TriggerPageChanged = OnPageChangedAsync != null, | ||||||
|
|
@@ -277,27 +229,21 @@ protected override async Task OnAfterRenderAsync(bool firstRender) | |||||
| public Task NavigateToPageAsync(uint pageNumber) => InvokeVoidAsync("navigateToPage", Id, pageNumber); | ||||||
|
|
||||||
| /// <summary> | ||||||
| /// 适应页面宽度 | ||||||
| /// 设置页面适配模式方法 | ||||||
| /// </summary> | ||||||
| public void SetFitMode(PdfReaderFitMode mode) => FitMode = mode; | ||||||
| public Task SetFitMode(PdfReaderFitMode mode) => InvokeVoidAsync("setScaleValue", Id, mode.ToDescriptionString()); | ||||||
|
||||||
| public Task SetFitMode(PdfReaderFitMode mode) => InvokeVoidAsync("setScaleValue", Id, mode.ToDescriptionString()); | |
| public Task SetFitModeAsync(PdfReaderFitMode mode) => InvokeVoidAsync("setScaleValue", Id, mode.ToDescriptionString()); |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -79,11 +79,11 @@ | |
| width: 1%; | ||
| } | ||
|
|
||
| .bb-view-toolbar-main.fit-width .bb-view-fit-height { | ||
| .bb-view-toolbar-main .fit-height .bb-view-fit-height { | ||
| display: none; | ||
| } | ||
|
|
||
| .bb-view-toolbar-main.fit-width .bb-view-fit-width { | ||
| .bb-view-toolbar-main .fit-height .bb-view-fit-width { | ||
| display: block; | ||
| } | ||
|
Comment on lines
+82
to
88
|
||
|
|
||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Missing parameter documentation: The
modeparameter is not documented. Add a<param name="mode">tag to describe the fit mode parameter.