Browse Source
Merge pull request #23902 from abpframework/auto-merge/rel-10-0/4027
Merge branch dev with rel-10.0
pull/23905/head
Ma Liming
8 months ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with
6 additions and
6 deletions
-
modules/docs/src/Volo.Docs.Web/Pages/Documents/Project/Index.cshtml.cs
|
|
|
@ -542,12 +542,7 @@ namespace Volo.Docs.Pages.Documents.Project |
|
|
|
DocumentNameWithExtension = Document.Name; |
|
|
|
SetDocumentPageTitle(); |
|
|
|
|
|
|
|
if (Document != null && !Document.Content.IsNullOrEmpty()) |
|
|
|
{ |
|
|
|
TocItems = _tocGeneratorService.GenerateTocItems(Document.Content, TocLevelCount); |
|
|
|
} |
|
|
|
|
|
|
|
await ConvertDocumentContentToHtmlAsync(); |
|
|
|
await ConvertDocumentContentToHtmlAsync(); |
|
|
|
|
|
|
|
return true; |
|
|
|
} |
|
|
|
@ -605,6 +600,11 @@ namespace Volo.Docs.Pages.Documents.Project |
|
|
|
else |
|
|
|
{ |
|
|
|
DocumentNavigationsDto = new DocumentNavigationsDto(); |
|
|
|
} |
|
|
|
|
|
|
|
if (Document != null && !Document.Content.IsNullOrEmpty()) |
|
|
|
{ |
|
|
|
TocItems = _tocGeneratorService.GenerateTocItems(Document.Content, TocLevelCount); |
|
|
|
} |
|
|
|
|
|
|
|
var converter = _documentToHtmlConverterFactory.Create<DocumentToHtmlConverterContext>(Document.Format ?? Project.Format); |
|
|
|
|