@tnotesjs/core 0.0.7 → 0.1.14

package/vitepress/components/Layout/CustomSidebar.vue

@@ -15,14 +15,15 @@
 </template>
 
 <script setup lang="ts">
-import { ref, onMounted, watch, computed } from 'vue'
 import { useRoute, useData } from 'vitepress'
+import { ref, onMounted, watch, computed } from 'vue'
+
 import SidebarItems from './SidebarItems.vue'
+import { SIDEBAR_SHOW_NOTE_ID_KEY, SIDEBAR_MAX_DEPTH_KEY } from '../constants'
 // @ts-expect-error - VitePress Data Loader
 import { data as sidebarConfig } from '../sidebar.data'
 // @ts-expect-error - VitePress Data Loader
 import { data as tnotesConfig } from '../tnotes-config.data'
-import { SIDEBAR_SHOW_NOTE_ID_KEY, SIDEBAR_MAX_DEPTH_KEY } from '../constants'
 
 // 支持递归的侧边栏项类型
 interface SidebarItem {
@@ -192,7 +193,8 @@ function expandParentGroup(element: HTMLElement) {
 
   // 向上遍历，收集所有父级 group 的标题文本
   while (currentElement) {
-    const groupElement = currentElement.closest('.group')
+    const groupElement: HTMLElement | null =
+      currentElement.closest<HTMLElement>('.group')
     if (!groupElement) break
 
     const groupTitle = groupElement.querySelector('.group-title span')
@@ -205,7 +207,8 @@ function expandParentGroup(element: HTMLElement) {
     }
 
     // 继续向上查找
-    currentElement = groupElement.parentElement?.closest('.group') || null
+    currentElement =
+      groupElement.parentElement?.closest<HTMLElement>('.group') || null
   }
 
   console.log(

package/vitepress/components/Layout/DocBeforeControls.vue

@@ -74,7 +74,7 @@
           :class="$style.aboutIconButton"
           @click="$emit('open-time-modal')"
           aria-haspopup="dialog"
-          :aria-expanded="timeModalOpen.toString()"
+          :aria-expanded="timeModalOpen"
           :title="isHomeReadme ? '关于这个知识库' : '关于这篇笔记'"
           type="button"
         >
@@ -86,11 +86,11 @@
 </template>
 
 <script setup lang="ts">
-import { ref } from 'vue'
 import { useData } from 'vitepress'
-import ToggleSidebar from './ToggleSidebar.vue'
-import ToggleFullContent from './ToggleFullContent.vue'
+import { ref } from 'vue'
 
+import ToggleFullContent from './ToggleFullContent.vue'
+import ToggleSidebar from './ToggleSidebar.vue'
 import {
   icon__github,
   icon__vscode,

package/vitepress/components/Layout/DocFooter.vue

@@ -25,8 +25,9 @@
 </template>
 
 <script setup lang="ts">
-import { computed, ref, onMounted } from 'vue'
 import { useRoute, useData } from 'vitepress'
+import { computed, ref, onMounted } from 'vue'
+
 import { SIDEBAR_SHOW_NOTE_ID_KEY } from '../constants'
 // @ts-expect-error - VitePress Data Loader
 import { data as sidebarConfig } from '../sidebar.data'

package/vitepress/components/Layout/ImagePreview.vue

@@ -56,6 +56,8 @@
 </template>
 
 <script setup>
+import { ref, computed, onMounted, onBeforeUnmount } from 'vue'
+
 import {
   icon__close,
   icon__next,
@@ -65,7 +67,6 @@ import {
   icon__zoom_out,
 } from '../../assets/icons'
 
-import { ref, computed, onMounted, onBeforeUnmount } from 'vue'
 
 const preview = ref({
   visible: false,

package/vitepress/components/Layout/Layout.vue

@@ -156,6 +156,7 @@
         @toggle-expand="toggleSidebarSections"
         @toggle-note-id="toggleNoteId"
         @focus-current="focusCurrentNote"
+        @open-settings="openSettings"
       />
     </template>
 
@@ -180,37 +181,48 @@
     <!-- <template #nav-screen-content-before>nav-screen-content-before</template> -->
     <!-- <template #nav-screen-content-after>nav-screen-content-after</template> -->
   </Layout>
+
+  <!-- 全局重命名遮罩：关于面板保存或文件系统重命名时由 useRenameOverlay 控制 -->
+  <LoadingPage
+    :visible="renameOverlayState.visible"
+    :message="renameOverlayState.message"
+    :tip="renameOverlayState.tip"
+  />
+
+  <!-- 全局设置 Dialog：由 useSettingsDialog 控制显隐 -->
+  <SettingsDialog />
 </template>
 
 <script setup>
-import Discussions from "../Discussions/Discussions.vue";
-import ImagePreview from "./ImagePreview.vue";
-import Swiper from "./Swiper.vue";
-import ContentCollapse from "./ContentCollapse.vue";
-import AboutModal from "./AboutModal.vue";
-import AboutPanel from "./AboutPanel.vue";
-import DocBeforeControls from "./DocBeforeControls.vue";
-import CustomSidebar from "./CustomSidebar.vue";
-import SidebarNavBefore from "./SidebarNavBefore.vue";
-import DocFooter from "./DocFooter.vue";
-import NoteStatus from "./NoteStatus.vue";
-
 import { useData, useRoute, useRouter } from "vitepress";
 import DefaultTheme from "vitepress/theme";
 import { computed, onMounted, ref, watch } from "vue";
 
-import { data as allNotesConfig } from "../notesConfig.data.ts";
-import { data as readmeData } from "./homeReadme.data.ts";
+import { useCodeBlockFullscreen } from "../CodeBlockFullscreen";
 import { SIDEBAR_SHOW_NOTE_ID_KEY } from "../constants";
-
-// Composables
-import { useRedirect } from "./composables/useRedirect";
+import { data as allNotesConfig } from "../notesConfig.data.ts";
+import AboutModal from "./AboutModal.vue";
+import AboutPanel from "./AboutPanel.vue";
+import Discussions from "../Discussions/Discussions.vue";
+import LoadingPage from "../LoadingPage/LoadingPage.vue";
+import { useCollapseControl } from "./composables/useCollapseControl";
 import { useNoteConfig } from "./composables/useNoteConfig";
-import { useNoteValidation } from "./composables/useNoteValidation";
 import { useNoteSave } from "./composables/useNoteSave";
-import { useCollapseControl } from "./composables/useCollapseControl";
+import { useNoteValidation } from "./composables/useNoteValidation";
+import { useRedirect } from "./composables/useRedirect";
+import { useRenameOverlay } from "./composables/useRenameOverlay";
 import { useVSCodeIntegration } from "./composables/useVSCodeIntegration";
-import { useCodeBlockFullscreen } from "../CodeBlockFullscreen";
+import ContentCollapse from "./ContentCollapse.vue";
+import CustomSidebar from "./CustomSidebar.vue";
+import DocBeforeControls from "./DocBeforeControls.vue";
+import DocFooter from "./DocFooter.vue";
+import { data as readmeData } from "./homeReadme.data.ts";
+import ImagePreview from "./ImagePreview.vue";
+import NoteStatus from "./NoteStatus.vue";
+import SidebarNavBefore from "./SidebarNavBefore.vue";
+import Swiper from "./Swiper.vue";
+import { useSettingsDialog } from "../Settings/composables/useSettingsDialog";
+import SettingsDialog from "../Settings/SettingsDialog.vue";
 
 const { Layout } = DefaultTheme;
 const vpData = useData();
@@ -220,6 +232,12 @@ const route = useRoute();
 // 启用代码块全屏功能
 useCodeBlockFullscreen();
 
+// 全局重命名遮罩状态（由 useRenameRedirect 控制 show/hide）
+const { state: renameOverlayState } = useRenameOverlay();
+
+// 全局设置 Dialog 控制
+const { open: openSettings } = useSettingsDialog();
+
 // 自定义侧边栏引用
 const customSidebarRef = ref(null);
 const showNoteId = ref(false);

package/vitepress/components/Layout/NoteStatus.vue

@@ -16,8 +16,9 @@
 </template>
 
 <script setup lang="ts">
-import { computed, toRefs, ref, onMounted, nextTick } from 'vue'
 import { useData } from 'vitepress'
+import { computed, toRefs, ref, onMounted, nextTick } from 'vue'
+
 import Tooltip from '../Tooltip/Tooltip.vue'
 
 const props = defineProps({

package/vitepress/components/Layout/SidebarItems.vue

@@ -25,7 +25,7 @@
 
       <div v-show="!item.collapsed" class="group-items">
         <SidebarItems
-          :items="item.items"
+          :items="getChildItems(item)"
           :depth="depth + 1"
           :max-depth="maxDepth"
           :show-note-id="showNoteId"
@@ -55,7 +55,8 @@
 </template>
 
 <script setup lang="ts">
-import { computed } from 'vue'
+import { computed } from 'vue'
+
 import { icon__sidebar_opened, icon__sidebar_collapsed } from '../../assets/icons'
 
 interface SidebarItem {
@@ -92,6 +93,10 @@ function hasChildren(item: SidebarItem): boolean {
   return !!(item.items && item.items.length > 0)
 }
 
+function getChildItems(item: SidebarItem): SidebarItem[] {
+  return item.items ?? []
+}
+
 // 获取项的唯一 key
 function getItemKey(item: SidebarItem): string {
   return item.link || item.text

package/vitepress/components/Layout/SidebarNavBefore.vue

@@ -30,6 +30,16 @@
     >
       <img :src="icon__focus" class="toggle-icon" alt="聚焦当前笔记" />
     </button>
+
+    <!-- 设置按钮 -->
+    <button
+      class="toggle-btn settings-btn"
+      @click="$emit('open-settings')"
+      title="打开设置"
+      aria-label="打开设置"
+    >
+      <span class="settings-icon" aria-hidden="true">⚙️</span>
+    </button>
   </div>
 </template>
 
@@ -45,6 +55,7 @@ defineEmits<{
   'toggle-expand': []
   'toggle-note-id': []
   'focus-current': []
+  'open-settings': []
 }>()
 </script>
 
@@ -89,4 +100,15 @@ defineEmits<{
 .toggle-btn:hover .toggle-icon {
   transform: scale(1.1);
 }
+
+.settings-icon {
+  font-size: 18px;
+  line-height: 1;
+  display: inline-block;
+  transition: transform 0.2s ease;
+}
+
+.toggle-btn:hover .settings-icon {
+  transform: scale(1.1);
+}
 </style>

package/vitepress/components/Layout/ToggleFullContent.vue

@@ -1,9 +1,10 @@
 <template>
-  <img @click="toggle" :class="$style.contentToggleBtn" :aria-pressed="full.toString()" :title="full ? '退出全屏内容区' : '全屏显示内容区'" :src="full ? icon__fullscreen_exit : icon__fullscreen" alt=""></img>
+  <img @click="toggle" :class="$style.contentToggleBtn" :aria-pressed="full" :title="full ? '退出全屏内容区' : '全屏显示内容区'" :src="full ? icon__fullscreen_exit : icon__fullscreen" alt="" />
 </template>
 
 <script setup lang="ts">
 import { onMounted, ref } from 'vue'
+
 import { icon__fullscreen, icon__fullscreen_exit } from '../../assets/icons'
 
 const KEY = 'vp:content:fullscreen'

package/vitepress/components/Layout/ToggleSidebar.vue

@@ -1,10 +1,11 @@
 <!-- .vitepress\components\Layout\ToggleSidebar.vue -->
 <template>
-    <img @click="toggle" :class="$style.sidebarToggleBtn" :aria-pressed="hidden.toString()" :title="hidden ? '显示侧边栏' : '隐藏侧边栏'" :src="hidden ? icon__next : icon__prev" alt=""></img>
+    <img @click="toggle" :class="$style.sidebarToggleBtn" :aria-pressed="hidden" :title="hidden ? '显示侧边栏' : '隐藏侧边栏'" :src="hidden ? icon__next : icon__prev" alt="" />
 </template>
 
 <script setup lang="ts">
 import { onMounted, ref } from 'vue'
+
 import { icon__next, icon__prev } from '../../assets/icons'
 
 const KEY = 'vp:sidebar:hidden'

package/vitepress/components/Layout/composables/useCollapseControl.ts

@@ -1,5 +1,5 @@
-import { ref, watch } from 'vue'
 import { useRoute } from 'vitepress'
+import { ref, watch } from 'vue'
 
 /**
  * 全局折叠/展开功能

package/vitepress/components/Layout/composables/useNoteConfig.ts

@@ -1,7 +1,7 @@
 import { ref, computed, watch } from 'vue'
-import type { Ref } from 'vue'
-import { useData } from 'vitepress'
+
 import type { NoteConfig } from '../../../../types'
+import type { Ref } from 'vue'
 
 /**
  * 管理笔记配置状态
@@ -13,8 +13,6 @@ export function useNoteConfig(
   currentNoteTitle: Ref<string>,
   timeModalOpen: Ref<boolean>
 ) {
-  const vpData = useData()
-
   // 可编辑的配置项
   const editableNoteStatus = ref(false)
   const editableDiscussionsEnabled = ref(false)

package/vitepress/components/Layout/composables/useNoteSave.ts

@@ -1,7 +1,10 @@
-import { ref, computed } from 'vue'
-import type { Ref, ComputedRef } from 'vue'
 import { useData } from 'vitepress'
+import { ref, computed } from 'vue'
+
+import { redirectAfterRename } from './useRenameRedirect'
+
 import type { NoteConfig } from '../../../../types'
+import type { Ref, ComputedRef } from 'vue'
 
 /**
  * 处理笔记配置的保存和重置逻辑
@@ -53,6 +56,8 @@ export function useNoteSave(
     isSaving.value = true
     savingMessage.value = '正在保存配置...'
 
+    let renameNewUrl: string | null = null
+
     try {
       // 如果标题有变化,先重命名文件夹
       if (titleChanged) {
@@ -74,10 +79,17 @@ export function useNoteSave(
           throw new Error(`重命名失败: ${error}`)
         }
 
-        // 后端已经完成所有更新,包括文件系统同步
-        const result = await renameResponse.json()
-        console.log('重命名完成:', result)
+        // 后端已经完成所有更新（含文件系统、根 README、sidebar）
+        const result = (await renameResponse.json()) as {
+          success: boolean
+          newUrl?: string
+        }
 
+        if (!result?.newUrl) {
+          throw new Error('重命名响应缺少 newUrl 字段')
+        }
+
+        renameNewUrl = result.newUrl
         savingMessage.value = '文件已同步,准备跳转...'
       }
 
@@ -131,21 +143,14 @@ export function useNoteSave(
         showSuccessToast.value = false
       }, 3000)
 
-      // 如果标题改变了,先跳转到loading页,再由loading页根据configId查询目标URL
-      if (titleChanged) {
-        // 获取当前笔记的 configId (UUID)
-        const configId = allNotesConfig[currentNoteId.value]?.id
-
-        if (!configId) {
-          throw new Error('无法获取笔记的 configId')
-        }
+      // 如果标题改变了, 显示遮罩并整页跳到新 URL
+      if (titleChanged && renameNewUrl) {
+        // 提前结束「保存中」状态，避免遮罩退出后按钮文案残留
+        isSaving.value = false
+        savingMessage.value = ''
 
-        // 跳转到loading页,传递 configId 参数
         const base = vpData.site.value.base || '/'
-        const loadingUrl = `${base}loading?configId=${encodeURIComponent(
-          configId
-        )}`
-        window.location.href = loadingUrl
+        await redirectAfterRename(renameNewUrl, { base })
       }
     } catch (error) {
       console.error('保存配置失败:', error)

package/vitepress/components/Layout/composables/useRedirect.ts

@@ -1,5 +1,5 @@
-import { ref, watch } from 'vue'
 import { useRoute, useData } from 'vitepress'
+import { ref, watch } from 'vue'
 
 import type { NoteConfig } from '../../../../types'
 
@@ -32,11 +32,14 @@ export function useRedirect(allNotesConfig: Record<string, NoteConfig & { redire
     )
 
     if (match) {
-      matchedId.value = match[1]
-      const targetNote = allNotesConfig[matchedId.value]
-      redirectPath.value = targetNote ? targetNote.redirect : ''
+      const matchedNoteId = match[1]
+      if (!matchedNoteId) return false
+
+      matchedId.value = matchedNoteId
+      const targetNote = allNotesConfig[matchedNoteId]
+      redirectPath.value = targetNote?.redirect ?? ''
 
-      if (targetNote && targetNote.redirect) {
+      if (targetNote?.redirect) {
         const base = vpData.site.value.base
         // 构建目标路径（包含基础路径）
         const targetPath = `${base}${targetNote.redirect}`

package/vitepress/components/Layout/composables/useRenameOverlay.ts

@@ -0,0 +1,33 @@
+/**
+ * 全局「重命名遮罩」状态。
+ *
+ * Layout 顶层渲染 `<LoadingPage />`，由本 store 控制 visible/message/tip，
+ * `useRenameRedirect` 调用 show/hide 即可。
+ */
+import { reactive } from 'vue'
+
+export interface RenameOverlayState {
+  visible: boolean
+  message: string
+  tip: string
+}
+
+const state = reactive<RenameOverlayState>({
+  visible: false,
+  message: '正在处理...',
+  tip: '',
+})
+
+export function useRenameOverlay() {
+  function show(payload: { message?: string; tip?: string } = {}) {
+    state.message = payload.message ?? '正在处理...'
+    state.tip = payload.tip ?? ''
+    state.visible = true
+  }
+
+  function hide() {
+    state.visible = false
+  }
+
+  return { state, show, hide }
+}

package/vitepress/components/Layout/composables/useRenameRedirect.ts

@@ -0,0 +1,59 @@
+/**
+ * 重命名后跳转工具：显示遮罩 → 等 Vite HMR 重建路由 → 整页跳到新 URL。
+ *
+ * 关于面板保存与文件系统直接重命名两条入口共用此函数，确保行为一致。
+ */
+import { useRenameOverlay } from './useRenameOverlay'
+
+export interface RedirectAfterRenameOptions {
+  /** 主标题，默认「正在跳转到新地址...」 */
+  message?: string
+  /** 副提示，默认「请稍候」 */
+  tip?: string
+  /** 等待 HMR 的毫秒数，默认 200ms（经验值，给 Vite 重算路由表留时间） */
+  delayMs?: number
+  /** 站点 base，例如 `/TNotes.introduction/`；不传则使用 `import.meta.env.BASE_URL` 或 `/` */
+  base?: string
+}
+
+/**
+ * 根据后端返回的 `newUrl`（形如 `/notes/xxx/README`）跳转到最终地址。
+ *
+ * 注意：使用 `window.location.replace` 整页跳，避免 SPA 路由表滞后导致 404。
+ */
+export async function redirectAfterRename(
+  newUrl: string,
+  opts: RedirectAfterRenameOptions = {},
+): Promise<void> {
+  const { show } = useRenameOverlay()
+
+  show({
+    message: opts.message ?? '正在跳转到新地址...',
+    tip: opts.tip ?? '请稍候',
+  })
+
+  const base =
+    opts.base ??
+    (typeof import.meta !== 'undefined' ? import.meta.env?.BASE_URL : '/') ??
+    '/'
+
+  const normalizedBase = base.endsWith('/') ? base : `${base}/`
+  const normalizedPath = newUrl.replace(/^\/+/, '')
+  const finalUrl = normalizedBase + normalizedPath
+
+  // 关键：先用 replaceState 把地址栏同步切到新 URL。
+  // 文件系统重命名场景下，Vite chokidar 会几乎同时触发 full-reload，
+  // 如果只用 setTimeout + location.replace，会被 full-reload 抢先以旧 URL 重载页面。
+  // 先 replaceState 后，无论谁先重载，浏览器都从新 URL 拉页面。
+  try {
+    window.history.replaceState(null, '', finalUrl)
+  } catch {
+    // 跨域等异常下退回 location.replace
+  }
+
+  await new Promise((resolve) => setTimeout(resolve, opts.delayMs ?? 200))
+
+  // 再做一次显式跳转，确保 SPA 状态完全重置。
+  // 此时 location.href 已是 finalUrl，等价于 reload。
+  window.location.replace(finalUrl)
+}

package/vitepress/components/Layout/composables/useVSCodeIntegration.ts

@@ -1,8 +1,11 @@
-import { ref } from 'vue'
-import type { Ref, ComputedRef } from 'vue'
 import { useData } from 'vitepress'
-import type { Router } from 'vitepress'
-import { NOTES_DIR_KEY } from '../../constants'
+import { ref } from 'vue'
+
+import { NOTES_DIR_KEY } from '../../constants'
+
+import type { Router } from 'vitepress'
+import type { Ref, ComputedRef } from 'vue'
+
 
 /**
  * VSCode 集成和 GitHub 链接拦截

package/vitepress/components/Layout/homeReadme.data.ts

@@ -1,6 +1,6 @@
 // .vitepress/components/Layout/homeReadme.data.ts
-import fs from 'node:fs'
 import { execSync } from 'node:child_process'
+import fs from 'node:fs'
 import path from 'node:path'
 
 const rootPath = process.cwd()