docnest 0.1.17 → 0.1.19

package/README.md

@@ -66,6 +66,9 @@ export default defineConfig({
 `search-index.json`，并保留页面上的静态站点标记，让结果链接指向 `/doc/<path>.html`。
 受限模式不生成搜索索引，也不显示搜索入口，避免摘要绕过阅读限制。
 
+搜索框为空时显示最近搜索：仅记录有结果的关键词，去重后保留最近 10 条，点击即可再次搜索。
+历史保存在当前浏览器，按 `site.storageKeyPrefix` 隔离；不上传服务器。
+
 PDF、页面水印和图表外带能力由一个开关统一控制，默认使用普通阅读模式：
 
 ```js

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "docnest",
-  "version": "0.1.17",
+  "version": "0.1.19",
   "description": "可复用的本地 Markdown 文档中心",
   "repository": {
     "type": "git",

package/server/static/css/styles.css

@@ -2306,8 +2306,9 @@ body[data-theme="dark"] .tree-nav::-webkit-scrollbar-thumb:hover {
 }
 
 .doc-search-status {
+  flex-shrink: 0;
   min-height: 1.25rem;
-  padding: 0.75rem 1.25rem 0.5rem;
+  padding: 1rem 1.25rem 0.875rem;
   color: var(--linear-text-muted);
   font-size: 0.75rem;
 }
@@ -2319,6 +2320,44 @@ body[data-theme="dark"] .tree-nav::-webkit-scrollbar-thumb:hover {
   overscroll-behavior: contain;
 }
 
+.doc-search-history {
+  min-height: 0;
+  overflow-y: auto;
+  padding: 0.25rem 1.25rem 1.5rem;
+}
+
+.doc-search-history__title {
+  margin-bottom: 0.75rem;
+  color: var(--linear-text-muted);
+  font-size: 0.75rem;
+}
+
+.doc-search-history__items {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 0.625rem;
+}
+
+.doc-search-history__item {
+  max-width: 100%;
+  padding: 0.4rem 0.75rem;
+  border: 1px solid var(--linear-border);
+  border-radius: 8px;
+  background: var(--linear-bg-subtle);
+  color: var(--linear-text);
+  font: inherit;
+  font-size: 0.8125rem;
+  overflow-wrap: anywhere;
+  text-align: left;
+  cursor: pointer;
+}
+
+.doc-search-history__item:hover,
+.doc-search-history__item:focus-visible {
+  border-color: var(--linear-accent);
+  background: var(--doc-accent-soft);
+}
+
 .doc-search-result {
   position: relative;
   display: block;

package/server/static/js/core/doc-client-nav.js

@@ -23,7 +23,8 @@
         crumbs.push({ name: displayName, isLast: true, url: '' });
       } else {
         var dirPath = parts.slice(0, i + 1).join('/');
-        crumbs.push({ name: displayName, isLast: false, url: '/doc?path=' + encodeURIComponent(dirPath + '/README.md') });
+        // 服务端会根据目录是否存在 README.md 决定跳转到文档或目录列表。
+        crumbs.push({ name: displayName, isLast: false, url: '/dir?path=' + encodeURIComponent(dirPath) });
       }
     }
     return crumbs;
@@ -54,7 +55,17 @@
     return String(text).replace(/[&<>"']/g, function(m) { return map[m]; });
   }
 
-  function updateBreadcrumbs(docPath) {
+  function updateBreadcrumbs(docPath, loadedDocument) {
+    var currentBreadcrumbs = document.querySelector('.breadcrumbs');
+    if (!currentBreadcrumbs) return;
+
+    // 服务端已经掌握真实目录结构，优先复用它生成的面包屑，避免客户端猜测 README.md。
+    var serverBreadcrumbs = loadedDocument && loadedDocument.querySelector('.breadcrumbs');
+    if (serverBreadcrumbs) {
+      currentBreadcrumbs.innerHTML = serverBreadcrumbs.innerHTML;
+      return;
+    }
+
     var crumbs = buildBreadcrumbsFromPath(docPath);
     renderBreadcrumbs(crumbs);
   }
@@ -194,7 +205,7 @@
         if (newTitle) document.title = newTitle.textContent;
         window.currentDocPath = pathFromUrl || pathFromHref(absoluteUrl);
         updateActiveLink(window.currentDocPath);
-        updateBreadcrumbs(window.currentDocPath);
+        updateBreadcrumbs(window.currentDocPath, doc);
         if (typeof window.buildDocToc === 'function') window.buildDocToc();
         if (typeof window.scrollToDocHash === 'function') window.scrollToDocHash();
 

package/server/static/js/core/doc-search.js

@@ -2,6 +2,8 @@
   'use strict';
 
   var MAX_RESULTS = 12;
+  var MAX_HISTORY = 10;
+  var HISTORY_DELAY = 800;
   var SNIPPET_LENGTH = 160;
   var SEARCH_INDEX_PATH = '/search-index.json';
   var state = {
@@ -12,8 +14,77 @@
     lastFocus: null,
     results: [],
     selectedIndex: -1,
+    history: null,
+    pendingQuery: '',
+    historyTimer: null,
+    composing: false,
   };
 
+  function historyKey() {
+    return String((window.DOCNEST_CONFIG || {}).storageKeyPrefix || 'docnest') + ':search-history';
+  }
+
+  function readHistory() {
+    if (state.history) return state.history;
+    var saved;
+    try {
+      saved = JSON.parse(window.localStorage.getItem(historyKey()));
+    } catch (_) {}
+    var seen = new Set();
+    state.history = (Array.isArray(saved) ? saved : []).filter(function(query) {
+      if (typeof query !== 'string' || !query.trim()) return false;
+      var key = getQueryTerms(query).join(' ');
+      if (seen.has(key)) return false;
+      seen.add(key);
+      return true;
+    }).map(function(query) { return query.trim(); }).slice(0, MAX_HISTORY);
+    return state.history;
+  }
+
+  function savePendingQuery() {
+    window.clearTimeout(state.historyTimer);
+    state.historyTimer = null;
+    var query = state.pendingQuery;
+    state.pendingQuery = '';
+    if (!query || state.composing || searchDocuments(query).length === 0) return;
+    var key = getQueryTerms(query).join(' ');
+    state.history = [query].concat(readHistory().filter(function(item) {
+      return getQueryTerms(item).join(' ') !== key;
+    })).slice(0, MAX_HISTORY);
+    try {
+      window.localStorage.setItem(historyKey(), JSON.stringify(state.history));
+    } catch (_) {}
+  }
+
+  function renderHistory() {
+    state.modal.history.textContent = '';
+    var queries = readHistory().filter(function(query) { return searchDocuments(query).length > 0; });
+    state.modal.history.hidden = queries.length === 0;
+    if (!queries.length) return false;
+
+    var heading = document.createElement('div');
+    heading.className = 'doc-search-history__title';
+    heading.textContent = '最近搜索';
+    var items = document.createElement('div');
+    items.className = 'doc-search-history__items';
+    queries.forEach(function(query) {
+      var button = document.createElement('button');
+      button.type = 'button';
+      button.className = 'doc-search-history__item';
+      button.textContent = query;
+      button.addEventListener('click', function() {
+        state.modal.input.value = query;
+        renderResults();
+        savePendingQuery();
+        state.modal.input.focus();
+      });
+      items.appendChild(button);
+    });
+    state.modal.history.appendChild(heading);
+    state.modal.history.appendChild(items);
+    return true;
+  }
+
   function getAssetUrl(path) {
     var base = document.querySelector('base');
     if (base && base.getAttribute('href')) {
@@ -241,12 +312,22 @@
   function renderResults() {
     if (!state.modal) return;
     var query = state.modal.input.value.trim();
+    window.clearTimeout(state.historyTimer);
+    if (!query) savePendingQuery();
+    state.pendingQuery = '';
     state.modal.results.textContent = '';
+    state.modal.results.hidden = false;
+    state.modal.history.hidden = true;
+    state.modal.input.removeAttribute('aria-activedescendant');
     state.results = [];
     state.selectedIndex = -1;
 
     if (!query) {
       setStatus('输入标题、目录或正文关键词');
+      if (renderHistory()) {
+        state.modal.results.hidden = true;
+        return;
+      }
       state.modal.results.appendChild(createEmptyState('支持中文关键词、英文词组和文档路径搜索'));
       return;
     }
@@ -260,6 +341,10 @@
     }
 
     state.results = matches.slice(0, MAX_RESULTS);
+    if (!state.composing) {
+      state.pendingQuery = query;
+      state.historyTimer = window.setTimeout(savePendingQuery, HISTORY_DELAY);
+    }
     setStatus(matches.length > MAX_RESULTS
       ? '找到 ' + matches.length + ' 篇文档，显示最相关的 ' + MAX_RESULTS + ' 篇'
       : '找到 ' + matches.length + ' 篇文档');
@@ -287,6 +372,7 @@
           '<kbd class="doc-search-input-key">Esc</kbd>',
         '</div>',
         '<div class="doc-search-status" id="doc-search-status" role="status" aria-live="polite"></div>',
+        '<div class="doc-search-history" role="group" aria-label="最近搜索" hidden></div>',
         '<div class="doc-search-results" id="doc-search-results" role="listbox" aria-label="搜索结果"></div>',
         '<div class="doc-search-hint"><span>↑↓ 选择</span><span>Enter 打开</span><span>Esc 关闭</span></div>',
       '</div>',
@@ -297,9 +383,19 @@
       input: overlay.querySelector('.doc-search-input'),
       status: overlay.querySelector('.doc-search-status'),
       results: overlay.querySelector('.doc-search-results'),
+      history: overlay.querySelector('.doc-search-history'),
       close: overlay.querySelector('.doc-search-modal__close'),
     };
     modal.input.addEventListener('input', renderResults);
+    modal.input.addEventListener('compositionstart', function() {
+      state.composing = true;
+      window.clearTimeout(state.historyTimer);
+      state.pendingQuery = '';
+    });
+    modal.input.addEventListener('compositionend', function() {
+      state.composing = false;
+      renderResults();
+    });
     modal.close.addEventListener('click', closeSearch);
     overlay.addEventListener('click', function(event) {
       if (event.target === overlay) closeSearch();
@@ -336,6 +432,10 @@
 
   function openSearch() {
     if (!state.modal) createModal();
+    if (!state.modal.overlay.hidden) {
+      state.modal.input.focus();
+      return;
+    }
     state.lastFocus = document.activeElement;
     state.modal.overlay.hidden = false;
     state.modal.overlay.setAttribute('aria-hidden', 'false');
@@ -343,6 +443,8 @@
     state.modal.input.disabled = true;
     state.modal.input.value = '';
     state.modal.results.textContent = '';
+    state.modal.results.hidden = false;
+    state.modal.history.hidden = true;
     setStatus('正在加载文档索引…');
     window.requestAnimationFrame(function() { state.modal.input.focus(); });
 
@@ -361,6 +463,8 @@
 
   function closeSearch() {
     if (!state.modal || state.modal.overlay.hidden) return;
+    savePendingQuery();
+    state.composing = false;
     state.modal.overlay.hidden = true;
     state.modal.overlay.setAttribute('aria-hidden', 'true');
     document.body.classList.remove('doc-search-open');
@@ -383,6 +487,8 @@
     if (event.key === 'Escape') {
       event.preventDefault();
       closeSearch();
+    } else if (event.target !== state.modal.input) {
+      return;
     } else if (event.key === 'ArrowDown') {
       event.preventDefault();
       moveSelection(1);
@@ -414,6 +520,7 @@
     var isMac = /Mac|iPhone|iPad|iPod/i.test((window.navigator && window.navigator.platform) || '');
     if (shortcut) shortcut.textContent = isMac ? '⌘ K' : 'Ctrl K';
     document.addEventListener('keydown', onKeyDown);
+    window.addEventListener('pagehide', savePendingQuery);
   }
 
   if (document.readyState === 'loading') {