feat(lineNumbers): refactor line number generation and enhance element metrics handling

docker/docker-compose.yaml

@@ -1,6 +1,6 @@
 services:
   halo:
-    image: registry.fit2cloud.com/halo/halo:2.20.10
+    image: registry.fit2cloud.com/halo/halo:2.22.12
     volumes:
       - ./data:/root/.halo2
       - ../:/root/.halo2/themes/theme-terminal

package.json

@@ -1,7 +1,7 @@
 {
   "name": "theme-terminal",
   "private": true,
-  "version": "1.1.6",
+  "version": "1.1.9a",
   "description": "A terminal like theme for Halo.",
   "scripts": {
     "dev": "vite build --watch",

src/alpine/lineNumbers.ts

@@ -0,0 +1,231 @@
+// ============ 常量配置 ============
+
+const TEXT_ELEMENTS = ['p', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'blockquote', 'li'];
+const HEADING_ELEMENTS = ['h1', 'h2', 'h3', 'h4', 'h5', 'h6'];
+const NON_TEXT_ELEMENTS = ['img', 'table', 'video', 'audio', 'canvas', 'svg', 'iframe', 'pre'];
+const ALL_ELEMENTS = [...TEXT_ELEMENTS, ...NON_TEXT_ELEMENTS];
+const DIRECT_CHILD_SELECTOR = ALL_ELEMENTS.map(tag => `div > ${tag}`).join(', ');
+const DEFAULT_LINE_HEIGHT_RATIO = 1.54;
+
+// ============ 类型定义 ============
+
+interface LineSpanOptions {
+  lineNum: number;
+  top: number;
+  height: number;
+  isGap?: boolean;
+  isBreakpoint?: boolean;
+}
+
+interface ElementMetrics {
+  top: number;
+  height: number;
+  paddingTop: number;
+  lineHeight: number;
+  lines: number;
+  isHeading: boolean;
+}
+
+interface GapLinesOptions {
+  fragment: DocumentFragment;
+  gapStart: number;
+  gapEnd: number;
+  lineHeight: number;
+  startLine: number;
+}
+
+interface LineNumbersState {
+  $el?: HTMLElement;
+  totalLines: number;
+  resizeObserver: ResizeObserver | null;
+  init(): void;
+  calculateLineNumbers(): void;
+  destroy(): void;
+}
+
+// ============ 工具函数 ============
+
+const isNonTextElement = (tagName: string): boolean =>
+  NON_TEXT_ELEMENTS.includes(tagName.toLowerCase());
+
+const isHeadingElement = (tagName: string): boolean =>
+  HEADING_ELEMENTS.includes(tagName.toLowerCase());
+
+const isEmptyElement = (element: HTMLElement): boolean => {
+  if (isNonTextElement(element.tagName.toLowerCase())) return false;
+  return !element.textContent?.trim();
+};
+
+const getStyleValue = (style: CSSStyleDeclaration, prop: 'paddingTop' | 'paddingBottom' | 'lineHeight' | 'fontSize'): number =>
+  parseFloat(style[prop]) || 0;
+
+const getDefaultLineHeight = (element: HTMLElement): number => {
+  const style = getComputedStyle(element);
+  return getStyleValue(style, 'lineHeight') || getStyleValue(style, 'fontSize') * DEFAULT_LINE_HEIGHT_RATIO;
+};
+
+// 获取元素度量信息（合并多次 getComputedStyle 调用）
+const getElementMetrics = (element: HTMLElement, containerRect: DOMRect, defaultLineHeight: number): ElementMetrics => {
+  const tagName = element.tagName.toLowerCase();
+  const style = getComputedStyle(element);
+  const paddingTop = getStyleValue(style, 'paddingTop');
+  const paddingBottom = getStyleValue(style, 'paddingBottom');
+  const height = element.offsetHeight;
+  const contentHeight = height - paddingTop - paddingBottom;
+  const isNonText = isNonTextElement(tagName);
+
+  const lineHeight = isNonText ? contentHeight : (getStyleValue(style, 'lineHeight') || defaultLineHeight);
+  const lines = isNonText ? 1 : Math.max(1, Math.round(contentHeight / lineHeight));
+
+  return {
+    top: element.getBoundingClientRect().top - containerRect.top,
+    height,
+    paddingTop,
+    lineHeight: contentHeight / lines,
+    lines,
+    isHeading: isHeadingElement(tagName)
+  };
+};
+
+// ============ DOM 创建 ============
+
+const createLineSpan = (options: LineSpanOptions): HTMLSpanElement => {
+  const { lineNum, top, height, isGap = false, isBreakpoint = false } = options;
+  const span = document.createElement('span');
+
+  span.className = `line-number${isGap ? ' line-number--gap' : ''}${isBreakpoint ? ' line-number--breakpoint' : ''}`;
+  span.style.cssText = `top:${top}px;height:${height}px;line-height:${height}px`;
+  span.textContent = String(lineNum);
+
+  if (isBreakpoint) {
+    const breakpoint = document.createElement('span');
+    breakpoint.className = 'line-breakpoint';
+    breakpoint.textContent = '●';
+    span.appendChild(breakpoint);
+  }
+
+  return span;
+};
+
+// ============ 行号生成 ============
+
+const appendGapLines = (options: GapLinesOptions): number => {
+  const { fragment, gapStart, gapEnd, lineHeight, startLine } = options;
+  const gapHeight = gapEnd - gapStart;
+
+  if (gapHeight < lineHeight) return startLine;
+
+  const gapLines = Math.round(gapHeight / lineHeight);
+
+  for (let i = 0; i < gapLines; i++) {
+    fragment.appendChild(createLineSpan({
+      lineNum: startLine + i,
+      top: gapStart + i * lineHeight,
+      height: lineHeight,
+      isGap: true
+    }));
+  }
+
+  return startLine + gapLines;
+};
+
+const appendElementLines = (fragment: DocumentFragment, metrics: ElementMetrics, startLine: number): number => {
+  const { top, paddingTop, lineHeight, lines, isHeading } = metrics;
+  const startTop = top + paddingTop;
+
+  for (let i = 0; i < lines; i++) {
+    fragment.appendChild(createLineSpan({
+      lineNum: startLine + i,
+      top: startTop + i * lineHeight,
+      height: lineHeight,
+      isBreakpoint: i === 0 && isHeading
+    }));
+  }
+
+  return startLine + lines;
+};
+
+// ============ 主组件 ============
+
+export const lineNumbers = (): LineNumbersState => ({
+  totalLines: 0,
+  resizeObserver: null,
+
+  init() {
+    const content = this.$el?.querySelector('.post-content') as HTMLElement;
+    if (!content) return;
+
+    const recalculate = () => this.calculateLineNumbers();
+
+    // 延迟计算确保 DOM 渲染完成
+    requestAnimationFrame(() => setTimeout(recalculate, 50));
+
+    // 监听内容区域大小变化（带防抖）
+    if (typeof ResizeObserver !== 'undefined') {
+      let resizeTimer: number;
+      this.resizeObserver = new ResizeObserver(() => {
+        clearTimeout(resizeTimer);
+        resizeTimer = window.setTimeout(recalculate, 100);
+      });
+      this.resizeObserver.observe(content);
+    }
+
+    // 窗口大小变化时重新计算
+    let windowResizeTimer: number;
+    window.addEventListener('resize', () => {
+      clearTimeout(windowResizeTimer);
+      windowResizeTimer = window.setTimeout(recalculate, 200);
+    });
+
+    // 监听图片加载（使用 once 避免重复触发）
+    content.querySelectorAll('img').forEach((img: HTMLImageElement) => {
+      if (!img.complete) {
+        img.addEventListener('load', recalculate, { once: true });
+        img.addEventListener('error', recalculate, { once: true });
+      }
+    });
+  },
+
+  destroy() {
+    this.resizeObserver?.disconnect();
+  },
+
+  calculateLineNumbers() {
+    const content = this.$el?.querySelector('.post-content') as HTMLElement;
+    const gutter = this.$el?.querySelector('.post-line-gutter') as HTMLElement;
+    if (!content || !gutter) return;
+
+    const container = (content.querySelector(':scope > div') || content) as HTMLElement;
+    const containerRect = container.getBoundingClientRect();
+    const defaultLineHeight = getDefaultLineHeight(content);
+
+    const elements = Array.from(container.querySelectorAll(DIRECT_CHILD_SELECTOR))
+      .filter(el => !isEmptyElement(el as HTMLElement)) as HTMLElement[];
+
+    const fragment = document.createDocumentFragment();
+    let currentLine = 1;
+    let lastBottom = 0;
+
+    for (const element of elements) {
+      const metrics = getElementMetrics(element, containerRect, defaultLineHeight);
+
+      if (lastBottom > 0 && metrics.top > lastBottom) {
+        currentLine = appendGapLines({
+          fragment,
+          gapStart: lastBottom,
+          gapEnd: metrics.top,
+          lineHeight: defaultLineHeight,
+          startLine: currentLine
+        });
+      }
+
+      currentLine = appendElementLines(fragment, metrics, currentLine);
+      lastBottom = metrics.top + metrics.height;
+    }
+
+    gutter.innerHTML = '';
+    gutter.appendChild(fragment);
+    gutter.style.height = `${container.scrollHeight}px`;
+    this.totalLines = currentLine - 1;
+  }
+});

src/main.ts

@@ -6,6 +6,7 @@ import Alpine from 'alpinejs'
 import {upvote} from './alpine/upvote'
 import {themeMode} from './alpine/themeMode'
 import {menu} from './alpine/menu'
+import {lineNumbers} from './alpine/lineNumbers'
 import {typewriterEffect} from './utils'
 
 window.Alpine = Alpine
@@ -13,6 +14,7 @@ window.Alpine = Alpine
 Alpine.data('upvote', upvote)
 Alpine.data('themeMode', themeMode)
 Alpine.data('menu', menu)
+Alpine.data('lineNumbers', lineNumbers)
 
 Alpine.start()
 

src/styles/header.scss

@@ -13,10 +13,95 @@
 
   .dividing {
     flex: 1;
-    background: repeating-linear-gradient(90deg, var(--foreground), var(--foreground) 2px, transparent 0, transparent 10px);
     display: block;
     width: 100%;
     height: 25px;
+    position: relative;
+
+    // 虚线背景层 - 带遮罩
+    &::before {
+      content: '';
+      position: absolute;
+      top: 0;
+      left: 0;
+      width: 100%;
+      height: 100%;
+      background: repeating-linear-gradient(
+                      90deg,
+                      var(--foreground),
+                      var(--foreground) 2px,
+                      transparent 0,
+                      transparent 10px
+      );
+      background-size: 10px 100%;
+      animation: line-flow 3s linear infinite;
+
+      // 遮罩层实现虚线淡入淡出效果
+      mask-image: linear-gradient(
+                      90deg,
+                      transparent 0%,
+                      black 3%,
+                      black 97%,
+                      transparent 100%
+      );
+      -webkit-mask-image: linear-gradient(
+                      90deg,
+                      transparent 0%,
+                      black 3%,
+                      black 97%,
+                      transparent 100%
+      );
+    }
+
+    // 扫描光效 - 模拟终端扫描线
+    &::after {
+      content: '';
+      position: absolute;
+      left: -30%;
+      top: 50%;
+      transform: translateY(-50%);
+      width: 30%;
+      height: 120%;
+      filter: blur(4px);
+      background: linear-gradient(
+                      90deg,
+                      transparent 0%,
+                      var(--green) 80%,
+                      transparent 100%
+      );
+      opacity: 0.3;
+      animation: scan-line 5s ease-in-out infinite;
+      pointer-events: none;
+      z-index: 10;
+    }
+  }
+
+  // 虚线流动动画 - 模拟加载进度
+  @keyframes line-flow {
+    0% {
+      background-position: 0 0;
+    }
+    100% {
+      background-position: 10px 0;
+    }
+  }
+
+  // 扫描线动画 - 模拟终端扫描效果
+  @keyframes scan-line {
+    0% {
+      left: -20%;
+      opacity: 0;
+    }
+    30% {
+      opacity: .3;
+    }
+    70% {
+      opacity: .3;
+    }
+    100% {
+      left: 80%;
+      opacity: 0;
+    }
   }
 
   .menu {
@@ -56,12 +141,15 @@
       border: 2px solid var(--red);
       background: var(--background);
       box-shadow: 0 10px var(--background), -10px 10px var(--background), 10px 10px var(--background);
+      overflow: hidden;
 
       li {
         padding: 5px;
         white-space: nowrap;
         text-decoration: underline;
         color: var(--green);
+        opacity: 0;
+        transform: translateX(-10px);
 
         &:not(:last-of-type) {
           margin-right: 0;
@@ -70,6 +158,19 @@
 
       &.open {
         display: block;
+        animation: terminal-frame-reveal 0.3s ease-out forwards;
+
+        // 逐行渲染效果 - 为每个子项添加延迟动画
+        li {
+          animation: terminal-line 0.2s ease-out forwards;
+
+          // 为前20个菜单项添加递增延迟
+          @for $i from 1 through 20 {
+            &:nth-child(#{$i}) {
+              animation-delay: #{($i * 0.05) + 0.1}s;
+            }
+          }
+        }
       }
     }
   }
@@ -80,4 +181,31 @@
     margin: 0 0 0 .5rem;
     padding: 0;
   }
+
+  // 菜单框架渲染动画 - 从上到下逐层渲染边框和内容
+  @keyframes terminal-frame-reveal {
+    0% {
+      clip-path: inset(-10px -10px calc(100% + 10px) -10px);
+      opacity: 1;
+    }
+    100% {
+      clip-path: inset(-10px -10px -10px -10px);
+      opacity: 1;
+    }
+  }
+
+  // 菜单项逐行渲染动画 - 模拟终端文本逐行输出
+  @keyframes terminal-line {
+    0% {
+      opacity: 0;
+      transform: translateX(-2px);
+    }
+    50% {
+      opacity: 0.5;
+    }
+    100% {
+      opacity: 1;
+      transform: translateX(0);
+    }
+  }
 }

src/styles/main.scss

@@ -173,15 +173,6 @@ blockquote {
     padding-right: 0;
   }
 
-  &:before {
-    content: '”';
-    font-family: Georgia, serif;
-    font-size: 3.875rem;
-    position: absolute;
-    left: -40px;
-    top: -20px;
-  }
-
   p:first-of-type {
     margin-top: 0;
   }

src/styles/post.scss

@@ -38,6 +38,8 @@
   }
 
   %meta {
+    display: flex;
+    align-items: center;
     font-size: 1rem;
     margin-bottom: 10px;
     color: var(--brightBlue);
@@ -53,6 +55,30 @@
     display: inline;
   }
 
+  &-separator {
+    position: relative;
+    top: 1px;
+    display: inline-grid;
+    grid-template-columns: repeat(2, 3px);
+    grid-template-rows: repeat(2, 3px);
+    gap: 2px;
+    margin: 0 6px;
+
+    span {
+      width: 2px;
+      height: 2px;
+      background-color: var(--brightBlue);
+      border-radius: 50%;
+      opacity: 0.2;
+    }
+
+    // 每个点使用不同动画和时长，形成随机效果
+    span:nth-child(1) { animation: dot-blink-1 2.8s ease-in-out infinite; }
+    span:nth-child(2) { animation: dot-blink-2 2.2s ease-in-out infinite 0.4s; }
+    span:nth-child(3) { animation: dot-blink-3 3.4s ease-in-out infinite 1s; }
+    span:nth-child(4) { animation: dot-blink-4 2.6s ease-in-out infinite 0.2s; }
+  }
+
   &-title {
     --border: 3px dotted var(--blue);
 
@@ -102,9 +128,68 @@
     }
   }
 
-  &-content {
+  &-body {
+    position: relative;
     margin-top: 30px;
+  }
+
+  &-line-gutter {
+    position: absolute;
+    left: -80px;
+    top: 0;
+    width: 60px;
+    user-select: none;
+    opacity: 0.5;
+    border-right: 1px solid color-mix(in srgb, var(--foreground) 15%, transparent);
+
+    @media (max-width: $tablet-max-width) {
+      display: none;
+    }
+
+    .line-number {
+      position: absolute;
+      right: 8px;
+      display: flex;
+      align-items: center;
+      justify-content: flex-end;
+      padding-right: 10px;
+      font-size: 0.75rem;
+      color: var(--foreground);
+      font-family: Hack, Monaco, Consolas, monospace;
+      transition: opacity 0.15s ease;
+      opacity: 0.8;
+
+      &:hover {
+        opacity: 1;
+      }
+    }
+
+    .line-number--gap {
+      opacity: 0.5;
+    }
+
+    .line-number--breakpoint {
+      cursor: pointer;
+
+      .line-breakpoint {
+        position: absolute;
+        top: -1px;
+        right: -3px;
+        color: #e51400;
+        font-size: 0.875rem;
+        transition: transform 0.15s ease, filter 0.15s ease;
+      }
+
+      &:hover .line-breakpoint {
+        transform: scale(1.2);
+        filter: brightness(1.2);
+      }
+    }
+  }
+
+  &-content {
     font-family: Hack, Monaco, Consolas, 'Ubuntu Mono', PingHei, 'PingFang SC', 'Microsoft YaHei', monospace;
+    line-height: 1.54;
   }
 
   &-cover {
@@ -173,3 +258,33 @@
   position: relative;
   z-index: 2;
 }
+
+// 4个不同的随机动画模式
+@keyframes dot-blink-1 {
+  0%, 100% { opacity: 0.2; }
+  25% { opacity: 1; }
+  50% { opacity: 0.3; }
+  75% { opacity: 0.8; }
+}
+
+@keyframes dot-blink-2 {
+  0%, 100% { opacity: 0.3; }
+  30% { opacity: 0.9; }
+  60% { opacity: 0.2; }
+  85% { opacity: 0.7; }
+}
+
+@keyframes dot-blink-3 {
+  0%, 100% { opacity: 0.2; }
+  20% { opacity: 0.6; }
+  45% { opacity: 1; }
+  70% { opacity: 0.4; }
+}
+
+@keyframes dot-blink-4 {
+  0%, 100% { opacity: 0.4; }
+  15% { opacity: 0.2; }
+  40% { opacity: 0.8; }
+  65% { opacity: 1; }
+  90% { opacity: 0.3; }
+}

templates/index.html

@@ -12,18 +12,21 @@
       <div class="posts">
         <div class="post on-list" th:each="post : ${posts.items}">
           <h1 class="post-title">
-            <a th:text="${post.spec.title}" th:href="${post.status.permalink}">Post Title</a>
+            <a th:text="'< ' + ${post.spec.title} + ' >'" th:href="${post.status.permalink}">Post Title</a>
           </h1>
           <div class="post-meta">
             <span class="post-date" th:text="${#dates.format(post.spec.publishTime,'yyyy-MM-dd')}">
               Post CreateTime
             </span>
-            <span
+            <span class="post-separator">
-              class="post-author"
+              <span></span>
-              th:with="contributor = ${post.contributors[0]}"
+              <span></span>
-              th:text="${':: '+contributor.displayName}"
+              <span></span>
-              >:: Author</span
+              <span></span>
-            >
+            </span>
+            <span class="post-author" th:with="contributor = ${post.contributors[0]}" th:text="${contributor.displayName}">
+              Author
+            </span>
           </div>
           <span class="post-tags-inline" th:each="tag : ${post.tags}">
             <a

templates/modules/header.html

@@ -51,6 +51,7 @@
           <a
             class="text-gray-600 hover:text-blue-600"
             th:href="${menuItem.status.href}"
+            th:target="${menuItem.spec.target?.value}"
             th:text="${menuItem.status.displayName + (not #lists.isEmpty(menuItem.children) ? '▾' : '')}"
           ></a>
           <ul 
@@ -61,8 +62,9 @@
             <li th:each="childMenuItem : ${menuItem.children}">
               <a 
                 class="text-gray-600 hover:text-blue-600" 
-                th:href="${childMenuItem.status.href} " 
+                th:href="${childMenuItem.status.href}"
-                th:text="${childMenuItem.status.displayName} "
+                th:target="${childMenuItem.spec.target?.value}"
+                th:text="${childMenuItem.status.displayName}"
               ></a>
             </li>
           </ul>

templates/post.html

@@ -4,11 +4,17 @@
   th:replace="~{modules/layout :: html(title = |${post.spec.title} - ${site.title}|, header = null, content = ~{::content}, footer = null)}"
 >
   <th:block th:fragment="content">
-    <div class="post">
+    <div class="post" x-data="lineNumbers" x-init="init()">
-      <h1 class="post-title" th:text="${post.spec.title}">Post Title</h1>
+      <h1 class="post-title" th:text="'< ' + ${post.spec.title} + ' >'">Post Title</h1>
       <div class="post-meta">
         <span class="post-date" th:text="${#dates.format(post.spec.publishTime,'yyyy-MM-dd')}"> publishTime </span>
-        <span class="post-author" th:text="${':: '+post.owner.displayName}">:: Author</span>
+        <span class="post-separator">
+          <span></span>
+          <span></span>
+          <span></span>
+          <span></span>
+        </span>
+        <span class="post-author" th:text="${post.owner.displayName}">Author</span>
       </div>
       <span class="post-tags-inline" th:each="tag : ${post.tags}">
         <a
@@ -19,8 +25,11 @@
           >#Tag</a
         >
       </span>
-      <div class="post-content">
+      <div class="post-body">
-        <div th:utext="${post.content.content}">Post Content</div>
+        <div class="post-line-gutter"></div>
+        <div class="post-content">
+          <div th:utext="${post.content.content}">Post Content</div>
+        </div>
       </div>
     </div>
     <div class="comment-wrap" th:if="${haloCommentEnabled}">

theme.yaml

@@ -13,5 +13,5 @@ spec:
   repo: https://git.dev.cm/theme-terminal
   settingName: "theme-terminal-setting"
   configMapName: "theme-terminal-configMap"
-  version: 1.1.7
+  version: 1.1.10
-  require: ">=2.20.0"
+  require: ">=2.22.0"