diff --git a/modules/docs/src/Volo.Docs.Web/Markdown/MarkDigMarkdownConverter.cs b/modules/docs/src/Volo.Docs.Web/Markdown/MarkDigMarkdownConverter.cs
index a45dc0862f6..1a19c779ba9 100644
--- a/modules/docs/src/Volo.Docs.Web/Markdown/MarkDigMarkdownConverter.cs
+++ b/modules/docs/src/Volo.Docs.Web/Markdown/MarkDigMarkdownConverter.cs
@@ -1,5 +1,6 @@
 using System.Text;
 using Markdig;
+using Markdig.Extensions.AutoIdentifiers;
 using Volo.Abp.DependencyInjection;
 using Volo.Docs.Markdown.Extensions;
 
@@ -12,6 +13,7 @@ public class MarkDigMarkdownConverter : IMarkdownConverter, ISingletonDependency
         public MarkDigMarkdownConverter()
         {
             _markdownPipeline = new MarkdownPipelineBuilder()
+              .UseAutoIdentifiers(AutoIdentifierOptions.GitHub)
               .UseAutoLinks()
               .UseBootstrap()
               .UseGridTables()
diff --git a/modules/docs/src/Volo.Docs.Web/Pages/Documents/Project/Index.cshtml b/modules/docs/src/Volo.Docs.Web/Pages/Documents/Project/Index.cshtml
index 21d4aab5ac4..ec59d25db61 100644
--- a/modules/docs/src/Volo.Docs.Web/Pages/Documents/Project/Index.cshtml
+++ b/modules/docs/src/Volo.Docs.Web/Pages/Documents/Project/Index.cshtml
@@ -39,7 +39,6 @@
     <abp-style-bundle name="@typeof(IndexModel).FullName">
         <abp-style type="@typeof(PrismjsStyleBundleContributor)"/>
         <abp-style type="@typeof(MalihuCustomScrollbarPluginStyleBundleContributor)"/>
-        <abp-style src="/Pages/Documents/Project/bootstrap-toc.css"/>
         <abp-style src="/Pages/Documents/Shared/Styles/vs.css"/>
         <abp-style src="/Pages/Documents/Project/index.css"/>
         @if (DocsUiOptions.Value.EnableEnlargeImage)
@@ -72,7 +71,6 @@
             <abp-script type="@typeof(PopperJsScriptBundleContributor)"/>
             <abp-script src="/client-proxies/docs-proxy.js"/>
             <abp-script src="/client-proxies/docs-common-proxy.js"/>
-            <abp-script src="/Pages/Documents/Project/bootstrap-toc.js"/>
             <abp-script src="/Pages/Documents/Shared/Scripts/vs.js"/>
             <abp-script src="/Pages/Documents/Project/index.js"/>
             @if (DocsUiOptions.Value.EnableEnlargeImage)
@@ -599,7 +597,8 @@
                         <h5 class="card-title">@L["InThisDocument"]</h5>
 
                         <div id="scroll-index" class="">
-                            <nav id="docs-sticky-index" class="navbar index-scroll">
+                            <nav id="toc" class="navbar index-scroll">
+                                    <partial name="/Pages/Documents/Project/TableOfContents.cshtml" model="Model.TocItems" />
                             </nav>
                             <div class="row">
                                 <div class="col p-0">
diff --git a/modules/docs/src/Volo.Docs.Web/Pages/Documents/Project/Index.cshtml.cs b/modules/docs/src/Volo.Docs.Web/Pages/Documents/Project/Index.cshtml.cs
index 8ffe5c4c7a2..3254882f7ca 100644
--- a/modules/docs/src/Volo.Docs.Web/Pages/Documents/Project/Index.cshtml.cs
+++ b/modules/docs/src/Volo.Docs.Web/Pages/Documents/Project/Index.cshtml.cs
@@ -22,11 +22,12 @@
 using Volo.Docs.Common.Projects;
 using Volo.Docs.Documents;
 using Volo.Docs.Documents.Rendering;
+using Volo.Docs.GitHub.Documents.Version;
 using Volo.Docs.HtmlConverting;
+using Volo.Docs.Localization;
 using Volo.Docs.Models;
 using Volo.Docs.Projects;
-using Volo.Docs.GitHub.Documents.Version;
-using Volo.Docs.Localization;
+using Volo.Docs.TableOfContents;
 using Volo.Docs.Utils;
 
 namespace Volo.Docs.Pages.Documents.Project
@@ -75,6 +76,8 @@ public class IndexModel : AbpPageModel
 
         public string DocumentsUrlPrefix { get; set; }
 
+        public List<TocItem> TocItems { get; set; } = [];
+
         public bool ShowProjectsCombobox { get; set; }
 
         public bool ShowProjectsComboboxLabel { get; set; }
@@ -98,6 +101,7 @@ public class IndexModel : AbpPageModel
         public DocumentNavigationsDto DocumentNavigationsDto { get; private set; }
 
         private const int MaxDescriptionMetaTagLength = 200;
+        private const int TocLevelCount = 2;
         private readonly IDocumentAppService _documentAppService;
         private readonly IDocumentToHtmlConverterFactory _documentToHtmlConverterFactory;
         private readonly IProjectAppService _projectAppService;
@@ -105,6 +109,7 @@ public class IndexModel : AbpPageModel
         private readonly DocsUiOptions _uiOptions;
         private readonly IPermissionChecker _permissionChecker;
         private readonly IDocumentPdfAppService _documentPdfAppService;
+        private readonly ITocGeneratorService _tocGeneratorService;
 
         protected IDocsLinkGenerator DocsLinkGenerator => LazyServiceProvider.LazyGetRequiredService<IDocsLinkGenerator>();
         
@@ -117,7 +122,8 @@ public IndexModel(
             IOptions<DocsUiOptions> options,
             IWebDocumentSectionRenderer webDocumentSectionRenderer, 
             IPermissionChecker permissionChecker, 
-            IDocumentPdfAppService documentPdfAppService)
+            IDocumentPdfAppService documentPdfAppService,
+            ITocGeneratorService tocGeneratorService)
         {
             ObjectMapperContext = typeof(DocsWebModule);
 
@@ -128,6 +134,7 @@ public IndexModel(
             _permissionChecker = permissionChecker;
             _documentPdfAppService = documentPdfAppService;
             _uiOptions = options.Value;
+            _tocGeneratorService = tocGeneratorService;
             
             LocalizationResourceType = typeof(DocsResource);
         }
@@ -534,7 +541,14 @@ private async Task<bool> TrySetDocumentAsync()
                     DocumentLanguageCode = language;
                     DocumentNameWithExtension = Document.Name;
                     SetDocumentPageTitle();
+
+                    if (Document != null && !Document.Content.IsNullOrEmpty())
+                    {
+                        TocItems = _tocGeneratorService.GenerateTocItems(Document.Content, TocLevelCount);
+                    }
+
                     await ConvertDocumentContentToHtmlAsync();
+
                     return true;
                 }
                 catch (DocumentNotFoundException e)
diff --git a/modules/docs/src/Volo.Docs.Web/Pages/Documents/Project/TableOfContents.cshtml b/modules/docs/src/Volo.Docs.Web/Pages/Documents/Project/TableOfContents.cshtml
new file mode 100644
index 00000000000..51a1bbe59c3
--- /dev/null
+++ b/modules/docs/src/Volo.Docs.Web/Pages/Documents/Project/TableOfContents.cshtml
@@ -0,0 +1,41 @@
+@using Volo.Docs.TableOfContents
+@model List<TocItem>
+@{
+    if (Model == null || Model.Count == 0)
+    {
+        return;
+    }
+}
+
+<ul class="nav nav-pills flex-column">
+    @foreach (var item in Model)
+    {
+        <li class="nav-item @(item.Children.Any() ? "toc-item-has-children" : "")">
+            <a class="nav-link" href="#@item.Heading.Id">@item.Heading.Text</a>
+            
+            @if (item.Children.Any())
+            {
+                RenderChildrenRecursive(item.Children, 1);
+            }
+        </li>
+    }
+</ul>
+
+@{
+    void RenderChildrenRecursive(List<TocItem> children, int depth)
+    {
+        <ul class="nav nav-pills flex-column toc-depth-@depth">
+            @foreach (var child in children)
+            {
+                <li class="nav-item @(child.Children.Any() ? "toc-item-has-children" : "")">
+                    <a class="nav-link" href="#@child.Heading.Id">@child.Heading.Text</a>
+                
+                    @if (child.Children.Any())
+                    {
+                        RenderChildrenRecursive(child.Children, depth + 1);
+                    }
+                </li>
+            }
+        </ul>
+    }
+}
\ No newline at end of file
diff --git a/modules/docs/src/Volo.Docs.Web/Pages/Documents/Project/index.js b/modules/docs/src/Volo.Docs.Web/Pages/Documents/Project/index.js
index d55d9f2ef91..2e3bdf1f30e 100644
--- a/modules/docs/src/Volo.Docs.Web/Pages/Documents/Project/index.js
+++ b/modules/docs/src/Volo.Docs.Web/Pages/Documents/Project/index.js
@@ -42,8 +42,6 @@ var doc = doc || {};
 
                 $ul.append($li);
                 $lazyLiElement.append($ul)
-
-                window.Toc.helpers.initNavEvent();
             },
             loadAll : function(lazyLiElements){
                 if(doc.lazyExpandableNavigation.isAllLoaded){
diff --git a/modules/docs/src/Volo.Docs.Web/Pages/Documents/Project/index.scss b/modules/docs/src/Volo.Docs.Web/Pages/Documents/Project/index.scss
index 9589b1fb73b..1af1c41cf51 100644
--- a/modules/docs/src/Volo.Docs.Web/Pages/Documents/Project/index.scss
+++ b/modules/docs/src/Volo.Docs.Web/Pages/Documents/Project/index.scss
@@ -71,4 +71,16 @@ body {
     background-color: transparent;
     border-color: transparent;
     font-size: 14px;
+}
+
+.toc-item-has-children > ul {
+    max-height: 0;
+    overflow: hidden;
+    opacity: 0;
+    transition: max-height 0.3s ease-in-out, opacity 0.3s ease-in-out;
+}
+
+.toc-item-has-children.open > ul {
+    max-height: 1000px;
+    opacity: 1;
 }
\ No newline at end of file
diff --git a/modules/docs/src/Volo.Docs.Web/Pages/Documents/Shared/Scripts/vs.js b/modules/docs/src/Volo.Docs.Web/Pages/Documents/Shared/Scripts/vs.js
index 5208ac99c07..0bddcf844c1 100644
--- a/modules/docs/src/Volo.Docs.Web/Pages/Documents/Shared/Scripts/vs.js
+++ b/modules/docs/src/Volo.Docs.Web/Pages/Documents/Shared/Scripts/vs.js
@@ -1,8 +1,6 @@
 (function ($) {
     $(function () {
 
-        window.Toc.helpers.initNavEvent();
-
         var scrollTopBtn = $('.scroll-top-btn');
         var enoughHeight = $('.docs-sidebar-wrapper > .docs-top').height();
         var enoughHeightPlus = 500;
@@ -64,10 +62,10 @@
             handleCustomScrolls();
 
             var $myNav = $('#docs-sticky-index');
-            Toc.init($myNav);
 
             $('body').scrollspy({
                 target: $myNav,
+                offset:100
             });
 
             $('#docs-sticky-index a').on('click', function (event) {
@@ -86,6 +84,23 @@
                 }
             });
 
+            $("body").on('activate.bs.scrollspy', function (e) {
+                var $activeLink = $('.nav-link.active', $('#docs-sticky-index'));
+
+                var $activeLi = $activeLink.parent('li.nav-item');
+
+                $myNav.find('li.toc-item-has-children.open').each(function () {
+                    if ($(this).has($activeLi).length === 0) {
+                        $(this).removeClass('open');
+                    }
+                });
+
+                var $parentToOpen = $activeLi.closest('li.toc-item-has-children');
+                if ($parentToOpen.length > 0) {
+                    $parentToOpen.addClass('open');
+                }
+            });
+
             $('.btn-toggle').on('click', function () {
                 $('.toggle-row').slideToggle(400);
                 $(this).toggleClass('less');
@@ -99,6 +114,7 @@
                 $('.docs-tree-list').slideToggle();
             });
 
+            initMenuToggle();
             scrollToHashLink();
         });
 
@@ -125,26 +141,7 @@
         });
     }
 
-    window.Toc.helpers.createNavList = function () {
-        return $('<ul class="nav nav-pills flex-column"></ul>');
-    };
-
-    window.Toc.helpers.createChildNavList = function ($parent) {
-        var $childList = this.createNavList();
-        $parent.append($childList);
-        return $childList;
-    };
-
-    window.Toc.helpers.generateNavEl = function (anchor, text) {
-        var $a = $('<a class="nav-link"></a>');
-        $a.attr('href', '#' + anchor);
-        $a.text(text);
-        var $li = $('<li class="nav-item"></li>');
-        $li.append($a);
-        return $li;
-    };
-    
-    window.Toc.helpers.initNavEvent = function () {
+     function initMenuToggle() {
         $('li:not(.last-link) a.tree-toggle').off('click');
         $('li:not(.last-link) span.plus-icon i.fa-chevron-right').off('click');
         
diff --git a/modules/docs/src/Volo.Docs.Web/TableOfContents/ITocGeneratorService.cs b/modules/docs/src/Volo.Docs.Web/TableOfContents/ITocGeneratorService.cs
new file mode 100644
index 00000000000..7a57597efe6
--- /dev/null
+++ b/modules/docs/src/Volo.Docs.Web/TableOfContents/ITocGeneratorService.cs
@@ -0,0 +1,15 @@
+using System.Collections.Generic;
+using Volo.Abp.Application.Services;
+
+namespace Volo.Docs.TableOfContents;
+
+public interface ITocGeneratorService : IApplicationService
+{
+    List<TocHeading> GenerateTocHeadings(string markdownContent);
+    
+    List<TocItem> GenerateTocItems(List<TocHeading> tocHeadings, int topLevel, int levelCount);
+    
+    int GetTopLevel(List<TocHeading> tocHeadings);
+    
+    List<TocItem> GenerateTocItems(string markdownContent, int levelCount, int? topLevel = null);
+}
diff --git a/modules/docs/src/Volo.Docs.Web/TableOfContents/TocGeneratorService.cs b/modules/docs/src/Volo.Docs.Web/TableOfContents/TocGeneratorService.cs
new file mode 100644
index 00000000000..5b7a1eeb23c
--- /dev/null
+++ b/modules/docs/src/Volo.Docs.Web/TableOfContents/TocGeneratorService.cs
@@ -0,0 +1,209 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Markdig;
+using Markdig.Extensions.AutoIdentifiers;
+using Markdig.Renderers.Html;
+using Markdig.Syntax;
+using Markdig.Syntax.Inlines;
+using Volo.Abp.DependencyInjection;
+
+namespace Volo.Docs.TableOfContents;
+
+public class TocGeneratorService : ITocGeneratorService, ITransientDependency
+{
+    private const int MinHeadingLevel = 1;
+    private const int MaxHeadingLevel = 6;
+
+    public virtual List<TocHeading> GenerateTocHeadings(string markdownContent)
+    {
+        if (markdownContent.IsNullOrWhiteSpace())
+        {
+            return new List<TocHeading>();
+        }
+
+        var markdownPipeline = CreateMarkdownPipeline();
+        var document = Markdig.Markdown.Parse(markdownContent, markdownPipeline);
+        var headingBlocks = document.Descendants<HeadingBlock>();
+
+        return headingBlocks
+            .Select(CreateTocHeading)
+            .ToList();
+    }
+
+    public virtual List<TocItem> GenerateTocItems(List<TocHeading> tocHeadings, int topLevel, int levelCount)
+    {
+        var maxLevel = GetMaxLevel(tocHeadings, topLevel, levelCount);
+
+        var filteredHeadings = tocHeadings
+            .Where(heading => heading.Level >= topLevel && heading.Level <= maxLevel)
+            .ToList();
+
+        return BuildHierarchicalStructure(filteredHeadings, topLevel);
+    }
+
+    public virtual int GetTopLevel(List<TocHeading> headings)
+    {
+        return Enumerable.Range(MinHeadingLevel, MaxHeadingLevel)
+            .FirstOrDefault(level => headings.Count(h => h.Level == level) > 1, MinHeadingLevel);
+    }
+
+    public virtual List<TocItem> GenerateTocItems(string markdownContent, int levelCount, int? topLevel = null)
+    {
+        var headings = GenerateTocHeadings(markdownContent);
+        if (headings.Count == 0)
+        {
+            return new List<TocItem>();
+        }
+
+        var resolvedTopLevel = topLevel ?? GetTopLevel(headings);
+        return GenerateTocItems(headings, resolvedTopLevel, levelCount);
+    }
+
+    protected virtual MarkdownPipeline CreateMarkdownPipeline()
+    {
+        return new MarkdownPipelineBuilder()
+            .UseAutoIdentifiers(AutoIdentifierOptions.GitHub)
+            .UseAdvancedExtensions()
+            .Build();
+    }
+
+    protected virtual TocHeading CreateTocHeading(HeadingBlock headingBlock)
+    {
+        var plainText = GetPlainText(headingBlock.Inline);
+        var id = headingBlock.GetAttributes().Id;
+        return new TocHeading(headingBlock.Level, plainText, id);
+    }
+
+    protected virtual List<TocItem> BuildHierarchicalStructure(List<TocHeading> headings, int topLevel)
+    {
+        var result = new List<TocItem>();
+
+        for (var i = 0; i < headings.Count; i++)
+        {
+            var currentHeading = headings[i];
+
+            if (currentHeading.Level != topLevel)
+            {
+                continue;
+            }
+
+            var children = GetDirectChildren(headings, i, currentHeading.Level);
+            result.Add(new TocItem(currentHeading, children));
+        }
+
+        return result;
+    }
+
+    protected virtual List<TocItem> GetDirectChildren(List<TocHeading> allHeadings, int parentIndex, int parentLevel)
+    {
+        var targetChildLevel = parentLevel + 1;
+        var children = new List<TocItem>();
+
+        for (var i = parentIndex + 1; i < allHeadings.Count; i++)
+        {
+            var heading = allHeadings[i];
+
+            // Stop if we encounter a heading at the same level or higher than parent
+            if (heading.Level <= parentLevel)
+            {
+                break;
+            }
+
+            // Only process direct children (not grandchildren)
+            if (heading.Level != targetChildLevel)
+            {
+                continue;
+            }
+
+            var grandChildren = GetDirectChildren(allHeadings, i, heading.Level);
+            children.Add(new TocItem(heading, grandChildren));
+        }
+
+        return children;
+    }
+
+    protected virtual string GetPlainText(ContainerInline container)
+    {
+        if (container == null)
+        {
+            return string.Empty;
+        }
+
+        // Optimization for simple case with single literal inline
+        if (HasExactCount(container, 1) && container.First() is LiteralInline singleLiteral)
+        {
+            return singleLiteral.Content.ToString();
+        }
+
+        return ProcessInlineContent(container);
+    }
+
+    protected virtual string ProcessInlineContent(ContainerInline container)
+    {
+        var textBuilder = new StringBuilder();
+        var processingQueue = new Queue<Inline>();
+
+        // Enqueue all initial inlines
+        foreach (var inline in container)
+        {
+            processingQueue.Enqueue(inline);
+        }
+
+        // Process each inline in the queue
+        while (processingQueue.Count > 0)
+        {
+            var currentInline = processingQueue.Dequeue();
+            AppendInlineText(currentInline, textBuilder, processingQueue);
+        }
+
+        return textBuilder.ToString();
+    }
+
+    protected virtual void AppendInlineText(Inline inline, StringBuilder builder, Queue<Inline> processingQueue)
+    {
+        switch (inline)
+        {
+            case LiteralInline literal:
+                builder.Append(literal.Content);
+                break;
+
+            case CodeInline code:
+                builder.Append(code.Content);
+                break;
+
+            case ContainerInline containerInline:
+                foreach (var childInline in containerInline)
+                {
+                    processingQueue.Enqueue(childInline);
+                }
+                break;
+        }
+    }
+
+    protected virtual int GetMaxLevel(List<TocHeading> tocHeadings, int topLevel, int levelCount)
+    {
+        return tocHeadings.Where(h => h.Level >= topLevel)
+            .Select(h => h.Level)
+            .Distinct()
+            .OrderBy(level => level)
+            .Skip(levelCount - 1)
+            .FirstOrDefault(topLevel);
+    }
+
+    protected virtual bool HasExactCount<T>(IEnumerable<T> enumerable, int count)
+    {
+        var itemCount = 0;
+        foreach (var _ in enumerable)
+        {
+            itemCount++;
+            if (itemCount > count)
+            {
+                return false;
+            }
+        }
+        
+        return itemCount == count;
+    }
+}
diff --git a/modules/docs/src/Volo.Docs.Web/TableOfContents/TocHeading.cs b/modules/docs/src/Volo.Docs.Web/TableOfContents/TocHeading.cs
new file mode 100644
index 00000000000..790b556e9d8
--- /dev/null
+++ b/modules/docs/src/Volo.Docs.Web/TableOfContents/TocHeading.cs
@@ -0,0 +1,7 @@
+using System.Collections.Generic;
+
+namespace Volo.Docs.TableOfContents;
+
+public record TocHeading(int Level, string Text, string Id);
+
+public record TocItem(TocHeading Heading, List<TocItem> Children);