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 1 year ago
committed by GitHub
parent
commit
353579fc8f
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
  1. 10
      modules/docs/src/Volo.Docs.Web/Pages/Documents/Project/Index.cshtml.cs

10
modules/docs/src/Volo.Docs.Web/Pages/Documents/Project/Index.cshtml.cs

@ -542,11 +542,6 @@ namespace Volo.Docs.Pages.Documents.Project
DocumentNameWithExtension = Document.Name; DocumentNameWithExtension = Document.Name;
SetDocumentPageTitle(); SetDocumentPageTitle();
if (Document != null && !Document.Content.IsNullOrEmpty())
{
TocItems = _tocGeneratorService.GenerateTocItems(Document.Content, TocLevelCount);
}
await ConvertDocumentContentToHtmlAsync(); await ConvertDocumentContentToHtmlAsync();
return true; return true;
@ -607,6 +602,11 @@ namespace Volo.Docs.Pages.Documents.Project
DocumentNavigationsDto = new DocumentNavigationsDto(); DocumentNavigationsDto = new DocumentNavigationsDto();
} }
if (Document != null && !Document.Content.IsNullOrEmpty())
{
TocItems = _tocGeneratorService.GenerateTocItems(Document.Content, TocLevelCount);
}
var converter = _documentToHtmlConverterFactory.Create<DocumentToHtmlConverterContext>(Document.Format ?? Project.Format); var converter = _documentToHtmlConverterFactory.Create<DocumentToHtmlConverterContext>(Document.Format ?? Project.Format);
var content = converter.Convert(new DocumentToHtmlConverterContext(Project, Document, GetSpecificVersionOrLatest(), LanguageCode, ProjectName)); var content = converter.Convert(new DocumentToHtmlConverterContext(Project, Document, GetSpecificVersionOrLatest(), LanguageCode, ProjectName));

Loading…
Cancel
Save