Merge branch 'master' into feat-hik

Author: ArgoZhang

src/components/BootstrapBlazor.PdfReader/BootstrapBlazor.PdfReader.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <Version>10.0.9</Version>
+    <Version>10.0.11</Version>
   </PropertyGroup>
 
   <PropertyGroup>

src/components/BootstrapBlazor.PdfReader/PdfReader.razor

@@ -13,7 +13,7 @@
                 }
                 <span class="bb-view-subject">@_docTitle</span>
             </div>
-            <div class="bb-view-group bb-view-toolbar-main">
+            <div class="bb-view-group bb-view-toolbar-main invisible">
                 <div class="bb-view-group bb-view-group-page">
                     <input type="text" class="bb-view-num" value="1" /><span class="bb-view-slash">/</span>
                     <div class="bb-view-pagesCount"></div>
@@ -42,10 +42,10 @@
                     <div class="bb-view-icon bb-view-rotate-right" title="@Localizer["RotateRight"]"><i class="fa-solid fa-fw fa-rotate-right"></i></div>
                 </div>
             </div>
-            <div class="bb-view-group bb-view-controls">
+            <div class="bb-view-group bb-view-controls invisible">
                 @if (ShowDownload)
                 {
-                    <div class="bb-view-icon bb-view-download" title="@Localizer["Download"]" @onclick="OnDownload"><i class="fa-solid fa-fw fa-arrow-right-to-bracket fa-rotate-90"></i></div>
+                    <div class="bb-view-icon bb-view-download" title="@Localizer["Download"]"><i class="fa-solid fa-fw fa-arrow-right-to-bracket fa-rotate-90"></i></div>
                 }
                 @if (ShowPrint)
                 {
@@ -98,7 +98,7 @@
             </div>
         </div>
     </div>
-    <div class="bb-view-pdf-info">
+    <div class="bb-view-pdf-info invisible">
         <div class="bb-view-pdf-backdrop"></div>
         <div class="bb-view-pdf-dialog">
             <div class="bb-view-pdf-dialog-title mb-3">@Localizer["DocumentProperties"]</div>

src/components/BootstrapBlazor.PdfReader/PdfReader.razor.cs

@@ -121,12 +121,6 @@ public partial class PdfReader
     [Parameter]
     public string? MoreButtonIcon { get; set; }
 
-    /// <summary>
-    /// 点击下载按钮回调方法 默认 null
-    /// </summary>
-    [Parameter]
-    public Func<Task>? OnDownloadAsync { get; set; }
-
     /// <summary>
     /// 正在打印回调方法 默认 null
     /// </summary>
@@ -272,14 +266,6 @@ protected override async Task OnAfterRenderAsync(bool firstRender)
     /// <returns></returns>
     public Task RotateRight() => InvokeVoidAsync("rotate", Id, 90);
 
-    private async Task OnDownload()
-    {
-        if (OnDownloadAsync != null)
-        {
-            await OnDownloadAsync();
-        }
-    }
-
     /// <summary>
     /// 页面开始初始化时回调方法
     /// </summary>

src/components/BootstrapBlazor.PdfReader/PdfReader.razor.js

@@ -9,7 +9,7 @@ if (pdfjsLib != null) {
 }
 
 export async function init(id, invoke, options) {
-    await addLink('./_content/BootstrapBlazor.PdfReader/css/pdf_viewer.css');
+    await addLink('./_content/BootstrapBlazor.PdfReader/css/pdf_reader.css');
 
     const el = document.getElementById(id);
     if (el === null) {
@@ -109,8 +109,6 @@ const loadPdf = async (el, invoke, options) => {
 }
 
 const loadMetadata = (el, pdfViewer, metadata) => {
-    console.log(metadata);
-
     const filename = el.querySelector('.bb-view-pdf-dialog-filename');
     const docTitle = el.querySelector('.bb-view-subject');
     filename.textContent = docTitle.textContent;
@@ -371,6 +369,9 @@ const addEventBus = (el, pdfViewer, eventBus, invoke, options) => {
 
 const addToolbarEventHandlers = (el, pdfViewer, invoke, options) => {
     const toolbar = el.querySelector(".bb-view-toolbar");
+    [...el.querySelectorAll('.invisible')].forEach(i => {
+        i.classList.remove('invisible');
+    });
 
     EventHandler.on(toolbar, "click", '.bb-view-bar', e => {
         const thumbnailsEl = el.querySelector(".bb-view-thumbnails");
@@ -436,6 +437,17 @@ const addToolbarEventHandlers = (el, pdfViewer, invoke, options) => {
             pdfViewer.spreadMode = 0;
         }
     });
+    EventHandler.on(toolbar, "click", ".bb-view-download", e => {
+        if (options.url) {
+            const docTitle = el.querySelector('.bb-view-subject');
+            const anchorElement = document.createElement('a');
+            anchorElement.href = options.url;
+            anchorElement.download = docTitle.textContent;
+            anchorElement.click();
+            anchorElement.remove();
+        }
+    });
+
     EventHandler.on(toolbar, "click", ".dropdown-item-presentation", async e => {
         e.delegateTarget.classList.toggle("active");
 

…trapBlazor.PdfReader/PdfReader.razor.css …zor.PdfReader/wwwroot/css/pdf_reader.csssrc/components/BootstrapBlazor.PdfReader/PdfReader.razor.css renamed to src/components/BootstrapBlazor.PdfReader/wwwroot/css/pdf_reader.css src/components/BootstrapBlazor.PdfReader/PdfReader.razor.css renamed to src/components/BootstrapBlazor.PdfReader/wwwroot/css/pdf_reader.css

@@ -1,3 +1,5 @@
+@import url('pdf_viewer.css');
+
 .bb-pdf-reader {
     --bb-pdf-view-height: 600px;
     --bb-pdf-toolbar-height: 60px;
@@ -163,20 +165,20 @@
         flex-basis: 300px;
     }
 
-::deep .bb-view-thumbnail-item {
+.bb-view-thumbnail-item {
     display: block;
     text-align: center;
 }
 
-    ::deep .bb-view-thumbnail-item:not(:last-child) {
+    .bb-view-thumbnail-item:not(:last-child) {
         margin-block-end: 1rem;
     }
 
-    ::deep .bb-view-thumbnail-item.active img {
+    .bb-view-thumbnail-item.active img {
         border: 2px solid #0d6efd;
     }
 
-    ::deep .bb-view-thumbnail-item img {
+    .bb-view-thumbnail-item img {
         width: 128px;
         padding: 1px;
         cursor: pointer;
@@ -185,13 +187,13 @@
         margin: 0 auto;
     }
 
-    ::deep .bb-view-thumbnail-item .bb-view-thumbnail-group {
+    .bb-view-thumbnail-item .bb-view-thumbnail-group {
         display: flex;
         flex-direction: column;
         justify-content: center;
     }
 
-        ::deep .bb-view-thumbnail-item .bb-view-thumbnail-group label {
+        .bb-view-thumbnail-item .bb-view-thumbnail-group label {
             color: #fff;
         }
 

src/components/BootstrapBlazor.Vditor/BootstrapBlazor.Vditor.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <Version>10.0.1</Version>
+    <Version>10.0.2</Version>
   </PropertyGroup>
 
   <PropertyGroup>

src/components/BootstrapBlazor.Vditor/Vditor.razor

@@ -6,4 +6,6 @@
 {
     <BootstrapLabel required="@Required" for="@Id" ShowLabelTooltip="ShowLabelTooltip" Value="@DisplayText" />
 }
-<div @attributes="@AdditionalAttributes" class="@ClassString" id="@Id"></div>
+<div @attributes="@AdditionalAttributes" class="@ClassString" id="@Id">
+    <div class="bb-vditor-container"></div>
+</div>

src/components/BootstrapBlazor.Vditor/Vditor.razor.js

@@ -1,4 +1,4 @@
-import { addLink, addScript } from '../BootstrapBlazor/modules/utility.js';
+import { addLink, addScript } from '../BootstrapBlazor/modules/utility.js';
 import Data from '../BootstrapBlazor/modules/data.js';
 
 export async function init(id, invoke, options) {
@@ -10,8 +10,9 @@ export async function init(id, invoke, options) {
     await addLink('./_content/BootstrapBlazor.Vditor/css/vditor.css');
     await addScript('./_content/BootstrapBlazor.Vditor/js/vditor.js');
 
+    const root = el.querySelector('.bb-vditor-container');
     const { options: op, value } = options;
-    const vditor = new Vditor(id, getOptions(invoke, { ...op, value }));
+    const vditor = new Vditor(root, getOptions(invoke, { ...op, value }));
 
     Data.set(id, { el, invoke, vditor });
     return vditor;
@@ -35,11 +36,12 @@ const getOptions = (invoke, options) => {
 
 export async function reset(id, value, options) {
     const md = Data.get(id);
-    const { invoke, vditor } = md;
+    const { el, invoke, vditor } = md;
     if (vditor) {
         vditor.destroy();
 
-        md.vditor = new Vditor(id, getOptions(invoke, { ...options, value }));
+        const root = el.querySelector('.bb-vditor-container');
+        md.vditor = new Vditor(root, getOptions(invoke, { ...options, value }));
     }
     return md.vditor;
 }

src/components/BootstrapBlazor.Vditor/wwwroot/css/vditor.css

@@ -1,14 +1,14 @@
 @import url('index.css');
 
-.bb-vditor {
+.bb-vditor .vditor {
     border-radius: var(--bs-border-radius);
     overflow: hidden;
 }
 
-.bb-vditor.is-invalid {
+.bb-vditor.is-invalid .vditor {
     border-color: var(--bs-danger);
 }
 
-.bb-vditor.is-valid {
+.bb-vditor.is-valid .vditor {
     border-color: var(--bs-success);
 }