docnest 0.1.16 → 0.1.18

package/package.json

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

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-pdf-export.js

@@ -568,25 +568,39 @@
   }
 
   function drawWatermarkPattern(context, width, height, referenceHeight, watermarkText) {
-    if (!watermarkText) return;
-    var tileWidth = width / 4;
-    var tileHeight = referenceHeight / 2;
-    var fontSize = Math.round(Math.min(tileWidth, tileHeight) * 0.38);
-    var startX = tileWidth / 2;
-    var startY = tileHeight / 2;
+    if (!watermarkText || width <= 0 || height <= 0 || referenceHeight <= 0) return;
+    var rotation = -Math.PI / 6;
+    var fontSize = Math.max(36, Math.min(56, Math.round(Math.min(width, referenceHeight) * 0.022)));
+    var font = '500 ' + fontSize + 'px "PingFang SC", "Microsoft YaHei", sans-serif';
 
     context.save();
     context.textAlign = 'center';
     context.textBaseline = 'middle';
-    context.fillStyle = 'rgba(30, 41, 59, 0.055)';
-    context.font = '700 ' + fontSize + 'px "PingFang SC", "Microsoft YaHei", sans-serif';
-
-    for (var y = startY; y < height + tileHeight; y += tileHeight) {
-      var rowOffsetX = Math.round(((y - startY) / tileHeight) % 2) * (tileWidth / 2);
-      for (var x = startX; x < width + tileWidth; x += tileWidth) {
+    context.fillStyle = 'rgba(30, 41, 59, 0.04)';
+    context.font = font;
+
+    // Use the actual rendered text width to calculate the repeat distance. The
+    // old fixed four-column grid was narrower than this long title, so adjacent
+    // watermarks collided and looked like a rough gray texture.
+    var textWidth = typeof context.measureText === 'function'
+      ? context.measureText(watermarkText).width
+      : fontSize * Math.max(watermarkText.length, 1) * 0.9;
+    var textHeight = fontSize;
+    var cos = Math.abs(Math.cos(rotation));
+    var sin = Math.abs(Math.sin(rotation));
+    var rotatedWidth = textWidth * cos + textHeight * sin;
+    var rotatedHeight = textWidth * sin + textHeight * cos;
+    var columnStep = Math.max(width / 3, rotatedWidth * 1.55);
+    var rowStep = Math.max(referenceHeight / 3, rotatedHeight * 2.75);
+    var startX = columnStep / 2;
+    var startY = rowStep / 2;
+
+    for (var rowIndex = 0, y = startY; y < height; rowIndex += 1, y += rowStep) {
+      var rowOffsetX = rowIndex % 2 === 1 ? columnStep / 2 : 0;
+      for (var x = startX; x + rowOffsetX < width; x += columnStep) {
         context.save();
         context.translate(x + rowOffsetX, y);
-        context.rotate(-Math.PI / 5.4);
+        context.rotate(rotation);
         context.fillText(watermarkText, 0, 0);
         context.restore();
       }