🔖 Release v3.6.5

Signed-off-by: Daniel <845765@qq.com>
🎨 https://github.com/siyuan-note/siyuan/issues/17560
2026-04-21 13:37:52 +00:00 · 2026-04-21 11:15:03 +08:00 · 2026-04-21 10:53:26 +08:00 · 2026-04-21 10:43:59 +08:00 · 2026-04-21 10:34:33 +08:00 · 2026-04-21 10:34:20 +08:00
253 changed files with 3995 additions and 2655 deletions
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@ -1,4 +1,5 @@
-[中文](https://github.com/siyuan-note/siyuan/blob/master/.github/CONTRIBUTING_zh_CN.md)
+**English**
+| [中文](CONTRIBUTING_zh_CN.md)

 ## Get the source code

@ -14,10 +15,10 @@ Install pnpm: `npm install -g pnpm@10.33.0`

 Set the Electron mirror environment variable and install Electron:

-* macOS/Linux: `ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/ pnpm install electron@40.8.5 -D`
+* macOS/Linux: `ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/ pnpm install electron@40.9.1 -D`
 * Windows:
  * `SET ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/`
-  * `pnpm install electron@40.8.5 -D`
+  * `pnpm install electron@40.9.1 -D`

 NPM mirror:

@ -27,7 +28,7 @@ NPM mirror:

 Enter the app folder and execute:

-* `pnpm install electron@40.8.5 -D`
+* `pnpm install electron@40.9.1 -D`
 * `pnpm run dev`
 * `pnpm run start`

--- a/.github/CONTRIBUTING_zh_CN.md
+++ b/.github/CONTRIBUTING_zh_CN.md
@ -1,4 +1,5 @@
-[English](https://github.com/siyuan-note/siyuan/blob/master/.github/CONTRIBUTING.md)
+[English](CONTRIBUTING.md)
+| **中文**

 ## 获取源码

@ -14,10 +15,10 @@

 设置 Electron 镜像环境变量并安装 Electron：

-* macOS/Linux：`ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/ pnpm install electron@40.8.5 -D`
+* macOS/Linux：`ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/ pnpm install electron@40.9.1 -D`
 * Windows：
  * `SET ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/`
-  * `pnpm install electron@40.8.5 -D`
+  * `pnpm install electron@40.9.1 -D`

 NPM 镜像：

@ -27,7 +28,7 @@ NPM 镜像：

 进入 app 文件夹执行：

-* `pnpm install electron@40.8.5 -D`
+* `pnpm install electron@40.9.1 -D`
 * `pnpm run dev`
 * `pnpm run start`

--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@ -8,8 +8,8 @@ Please provide a summary of the change and the issue being fixed. Include releva
 ## Type of change / 变更类型

 <!--
-A PR should only have one purpose, such as never putting multiple changes like refactoring, feature improvement, or bug fixes in one PR, otherwise the PR will be rejected.
-一个 PR 应该只包含一个目的，比如切勿将重构、功能改进或者修复缺陷等多个变更放在一个 PR 中，否则提交将被拒。
+A PR should have a single purpose. Please do not include multiple changes such as bug fixes, refactoring, or new features in one PR; otherwise, the PR will be rejected.
+一个 PR 应该只包含一个目的，请勿将缺陷修复、代码重构或新功能等多个变更包含在同一个 PR 中，否则 PR 将被拒绝。
 -->

 - [ ] Bug fix
--- a/.github/SECURITY.md
+++ b/.github/SECURITY.md
@ -7,6 +7,7 @@ https://github.com/siyuan-note/siyuan/security/advisories/new
 Some areas we don't consider security vulnerabilities:

 * Arbitrary file write: Writing files outside the workspace path (e.g., exporting files) is a common user need
+* Chart/Formula/ABC rendering code injection: This is a common user need, for details please refer to https://github.com/siyuan-note/siyuan/pull/6917
 * SQL injection

 Thank you very much!
--- a/.github/workflows/auto_aur_release_stable.yml
+++ b/.github/workflows/auto_aur_release_stable.yml
@ -34,7 +34,7 @@ jobs:
      - name: Create PKGBUILD
        run: |
          cat << EOF >> PKGBUILD
-          # maintainer: zxkmm (IHp4a21tQGhvdG1haWwuY29t)
+          # maintainer: SiYuan community (https://github.com/siyuan-note/siyuan/issues/new/choose)
          # auto running on siyuan official repo
          # PKGBUILD is modified from https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=siyuan-appimage
          # which is made by vvxxp8 <concatenate[g] the characters[x] in square[b] brackets[1] in[5] order[3] at gmail dot com>
@ -97,7 +97,7 @@ jobs:
          EOF

      - name: Publish AUR package
-        uses: KSXGitHub/github-actions-deploy-aur@v4.1.1
+        uses: KSXGitHub/github-actions-deploy-aur@v4.1.2
        with:
          pkgname: siyuan-bin
          pkgbuild: ./PKGBUILD
--- a/app/appearance/langs/ar_SA.json
+++ b/app/appearance/langs/ar_SA.json
@ -1,4 +1,6 @@
 {
+  "hyperlink": "ارتباط تشعبي",
+  "copyDoc": "نسخ النص كاملًا",
  "position": "الموقع",
  "insertColumnLeft1": "إدراج ${x} عمودًا إلى اليسار",
  "insertColumnRight1": "إدراج ${x} عمودًا إلى اليمين",
--- a/app/appearance/langs/de_DE.json
+++ b/app/appearance/langs/de_DE.json
@ -1,4 +1,6 @@
 {
+  "hyperlink": "Hyperlink",
+  "copyDoc": "Gesamten Text kopieren",
  "position": "Position",
  "insertColumnLeft1": "Füge ${x} Spalten links ein",
  "insertColumnRight1": "Füge ${x} Spalten rechts ein",
--- a/app/appearance/langs/en_US.json
+++ b/app/appearance/langs/en_US.json
@ -1,4 +1,6 @@
 {
+  "hyperlink": "Hyperlink",
+  "copyDoc": "Copy full document",
  "position": "Position",
  "insertColumnLeft1": "Insert ${x} column(s) to the left",
  "insertColumnRight1": "Insert ${x} column(s) to the right",
--- a/app/appearance/langs/es_ES.json
+++ b/app/appearance/langs/es_ES.json
@ -1,4 +1,6 @@
 {
+  "hyperlink": "Hipervínculo",
+  "copyDoc": "Copiar todo el texto",
  "position": "Posición",
  "insertColumnLeft1": "Insertar ${x} columnas a la izquierda",
  "insertColumnRight1": "Insertar ${x} columnas a la derecha",
--- a/app/appearance/langs/fr_FR.json
+++ b/app/appearance/langs/fr_FR.json
@ -1,4 +1,6 @@
 {
+  "hyperlink": "Hyperlien",
+  "copyDoc": "Copier tout le texte",
  "position": "Position",
  "insertColumnLeft1": "Insérer ${x} colonnes à gauche",
  "insertColumnRight1": "Insérer ${x} colonnes à droite",
@ -1758,7 +1760,7 @@
    "271": "Optimisation de l'index des données terminée, [%s] d'espace disque libéré",
    "272": "Champ sans nom",
    "273": "Ne créez pas l’espace de travail à la racine de la partition, créez un nouveau dossier comme espace de travail",
-    "274": "Ce dossier contient d’autres fichiers, créez un nouveau dossier comme espace de travail",    
+    "274": "Ce dossier contient d’autres fichiers, créez un nouveau dossier comme espace de travail",
    "275": "Impossible d'ouvrir le document créé par une version plus récente. Veuillez mettre à jour vers la dernière version et réessayer",
    "276": "Nettoyage des fichiers temporaires...",
    "277": "Nettoyage des fichiers temporaires terminé, [%d] fichiers supprimés, [%s] d'espace disque libéré",
--- a/app/appearance/langs/he_IL.json
+++ b/app/appearance/langs/he_IL.json
@ -1,4 +1,6 @@
 {
+  "hyperlink": "היפר־קישור",
+  "copyDoc": "העתק את כל הטקסט",
  "position": "מיקום",
  "insertColumnLeft1": "הוסף ${x} עמודות משמאל",
  "insertColumnRight1": "הוסף ${x} עמודות מימין",
--- a/app/appearance/langs/it_IT.json
+++ b/app/appearance/langs/it_IT.json
@ -1,4 +1,6 @@
 {
+  "hyperlink": "Collegamento ipertestuale",
+  "copyDoc": "Copia tutto il testo",
  "position": "Posizione",
  "insertColumnLeft1": "Inserisci ${x} colonne a sinistra",
  "insertColumnRight1": "Inserisci ${x} colonne a destra",
--- a/app/appearance/langs/ja_JP.json
+++ b/app/appearance/langs/ja_JP.json
@ -1,4 +1,6 @@
 {
+  "hyperlink": "ハイパーリンク",
+  "copyDoc": "全文をコピー",
  "position": "位置",
  "insertColumnLeft1": "左側に ${x} 列を挿入",
  "insertColumnRight1": "右側に ${x} 列を挿入",
--- a/app/appearance/langs/ko_KR.json
+++ b/app/appearance/langs/ko_KR.json
@ -1,4 +1,6 @@
 {
+  "hyperlink": "하이퍼링크",
+  "copyDoc": "전체 복사",
  "position": "위치",
  "insertColumnLeft1": "왼쪽에 ${x} 열 삽입",
  "insertColumnRight1": "오른쪽에 ${x} 열 삽입",
--- a/app/appearance/langs/pl_PL.json
+++ b/app/appearance/langs/pl_PL.json
@ -1,4 +1,6 @@
 {
+  "hyperlink": "Hiperłącze",
+  "copyDoc": "Kopiuj cały tekst",
  "position": "Pozycja",
  "insertColumnLeft1": "Wstaw ${x} kolumn po lewej",
  "insertColumnRight1": "Wstaw ${x} kolumn po prawej",
--- a/app/appearance/langs/pt_BR.json
+++ b/app/appearance/langs/pt_BR.json
@ -1,4 +1,6 @@
 {
+  "hyperlink": "Hiperlink",
+  "copyDoc": "Copiar todo o texto",
  "position": "Posição",
  "insertColumnLeft1": "Inserir ${x} colunas à esquerda",
  "insertColumnRight1": "Inserir ${x} colunas à direita",
--- a/app/appearance/langs/ru_RU.json
+++ b/app/appearance/langs/ru_RU.json
@ -1,4 +1,6 @@
 {
+  "hyperlink": "Гиперссылка",
+  "copyDoc": "Копировать весь текст",
  "position": "Позиция",
  "insertColumnLeft1": "Вставить слева ${x} столбцов",
  "insertColumnRight1": "Вставить справа ${x} столбцов",
@ -1276,7 +1278,7 @@
  "splitTB": "Разделить вниз",
  "splitMoveB": "Разделить и переместить вниз",
  "debug": "Инструменты разработчика",
-  "fileTree": "Дерево документа",
+  "fileTree": "Файлы",
  "graphView": "Граф",
  "sponsor": "Пожертвовать разработчикам",
  "relativeRelation": "Связанные",
--- a/app/appearance/langs/sk_SK.json
+++ b/app/appearance/langs/sk_SK.json
@ -1,4 +1,6 @@
 {
+  "hyperlink": "Hypertextový odkaz",
+  "copyDoc": "Kopírovať celý dokument",
  "position": "Pozícia",
  "insertColumnLeft1": "Vložiť ${x} stĺpec/stĺpce doľava",
  "insertColumnRight1": "Vložiť ${x} stĺpec/stĺpce doprava",
--- a/app/appearance/langs/tr_TR.json
+++ b/app/appearance/langs/tr_TR.json
@ -1,4 +1,6 @@
 {
+  "hyperlink": "Köprü",
+  "copyDoc": "Tüm metni kopyala",
  "position": "Pozisyon",
  "insertColumnLeft1": "Sol tarafa ${x} sütun ekle",
  "insertColumnRight1": "Sağ tarafa ${x} sütun ekle",
--- a/app/appearance/langs/zh_CHT.json
+++ b/app/appearance/langs/zh_CHT.json
@ -1,4 +1,6 @@
 {
+  "hyperlink": "超鏈接",
+  "copyDoc": "複製全文",
  "position": "位置",
  "insertColumnLeft1": "在左側插入 ${x} 欄",
  "insertColumnRight1": "在右側插入 ${x} 欄",
--- a/app/appearance/langs/zh_CN.json
+++ b/app/appearance/langs/zh_CN.json
@ -1,4 +1,6 @@
 {
+  "hyperlink": "超链接",
+  "copyDoc": "复制全文",
  "position": "位置",
  "insertColumnLeft1": "在左侧插入 ${x} 列",
  "insertColumnRight1": "在右侧插入 ${x} 列",
--- a/app/appearance/themes/daylight/theme.css
+++ b/app/appearance/themes/daylight/theme.css
@ -29,7 +29,7 @@
    --b3-font-family-graph: arial;
    --b3-font-family-emoji: "Emojis Additional", emojis;
    --b3-font-family-math: KaTeX_Math;
-    --b3-font-family-kbd: SFMono-Regular, Consolas, "Liberation Mono";
+    --b3-font-family-kbd: var(--b3-font-family-protyle);
    --b3-font-size: 14px;

    /* 顶部工具栏 */
@ -131,7 +131,8 @@
    /* 阴影 */
    --b3-point-shadow: 0 0 1px 0 rgba(0, 0, 0, .1), 0 0 2px 0 rgba(0, 0, 0, .2);
    --b3-dialog-shadow: 0 8px 24px rgba(0, 0, 0, .2);
-    --b3-button-shadow: 0 5px 5px -3px rgb(0 0 0 / .2), 0 8px 10px 1px rgb(0 0 0 / .14), 0 3px 14px 2px rgb(0 0 0 / .12);
+    --b3-button-shadow: 0 1px 2px 0 rgb(0 0 0 / .3), 0 1px 3px 1px rgb(0 0 0 /.15);
+    --b3-button-active-shadow: 0 2px 3px 1px rgb(0 0 0 / .3), 0 2px 4px 2px rgb(0 0 0 /.15);

    /* 图表颜色 */
    --b3-graph-p-point: #076f7e;
--- a/app/appearance/themes/daylight/theme.json
+++ b/app/appearance/themes/daylight/theme.json
@ -2,7 +2,7 @@
  "name": "daylight",
  "author": "Vanessa",
  "url": "https://github.com/Vanessa219",
-  "version": "1.1.0",
+  "version": "1.1.1",
  "modes": [
    "light"
  ]
--- a/app/appearance/themes/midnight/theme.css
+++ b/app/appearance/themes/midnight/theme.css
@ -28,7 +28,7 @@
    --b3-font-family-graph: arial;
    --b3-font-family-emoji: "Emojis Additional", emojis;
    --b3-font-family-math: KaTeX_Math;
-    --b3-font-family-kbd: SFMono-Regular, Consolas, "Liberation Mono";
+    --b3-font-family-kbd: var(--b3-font-family-protyle);
    --b3-font-size: 14px;

    /* 顶部工具栏 */
@ -130,7 +130,8 @@
    /* 阴影 */
    --b3-point-shadow: inset 0 .5px .5px .5px rgba(255, 255, 255, .09), 0 3px 6px rgba(0, 0, 0, .04), 0 0 0 0 transparent;
    --b3-dialog-shadow: 0 8px 24px #010409;
-    --b3-button-shadow: 0 5px 5px -3px rgb(0 0 0 / .2), 0 8px 10px 1px rgb(0 0 0 / .14), 0 3px 14px 2px rgb(0 0 0 / .12);
+    --b3-button-shadow: 0 1px 2px 0 rgb(0 0 0 / .3), 0 1px 3px 1px rgb(255 255 255 /.15);
+    --b3-button-active-shadow: 0 2px 3px 1px rgb(0 0 0 / .3), 0 2px 4px 2px rgb(255 255 255 /.15);

    /* 图表颜色 */
    --b3-graph-p-point: #076f7e;
--- a/app/appearance/themes/midnight/theme.json
+++ b/app/appearance/themes/midnight/theme.json
@ -2,7 +2,7 @@
  "name": "midnight",
  "author": "Vanessa",
  "url": "https://github.com/Vanessa219",
-  "version": "1.1.0",
+  "version": "1.1.1",
  "modes": [
    "dark"
  ]
--- a/app/appx/AppxManifest-arm64.xml
+++ b/app/appx/AppxManifest-arm64.xml
@ -9,7 +9,7 @@
    <Identity Name="89C2A984.SiYuan"
              ProcessorArchitecture="arm64"
              Publisher="CN=087C656E-C1D9-42D8-8807-CED45A74FC0F"
-              Version="3.6.2.0"/>
+              Version="3.6.5.0"/>
    <Properties>
        <DisplayName>SiYuan</DisplayName>
        <PublisherDisplayName>云南链滴科技有限公司</PublisherDisplayName>
--- a/app/appx/AppxManifest.xml
+++ b/app/appx/AppxManifest.xml
@ -9,7 +9,7 @@
    <Identity Name="89C2A984.SiYuan"
              ProcessorArchitecture="x64"
              Publisher="CN=087C656E-C1D9-42D8-8807-CED45A74FC0F"
-              Version="3.6.2.0"/>
+              Version="3.6.5.0"/>
    <Properties>
        <DisplayName>SiYuan</DisplayName>
        <PublisherDisplayName>云南链滴科技有限公司</PublisherDisplayName>
--- a/app/changelogs/v3.6.3/v3.6.3.md
+++ b/app/changelogs/v3.6.3/v3.6.3.md
@ -0,0 +1,29 @@
+## Overview
+
+This version improves some details.
+
+## Changelogs
+
+Below are the detailed changes in this version.
+
+### Enhancement
+
+* [Improve document deletion](https://github.com/siyuan-note/siyuan/issues/17351)
+* [Improve Linux disk type detection](https://github.com/siyuan-note/siyuan/pull/17361)
+* [Improve the dock panel title and tooltips](https://github.com/siyuan-note/siyuan/issues/17366)
+* [Empty tags no longer appear in the tag panel](https://github.com/siyuan-note/siyuan/issues/17367)
+* [Improve cloud configuration consistency](https://github.com/siyuan-note/siyuan/pull/17371)
+* [Inline memo tooltips cannot render HTML](https://github.com/siyuan-note/siyuan/issues/17374)
+* [Improve content escaping in formula blocks](https://github.com/siyuan-note/siyuan/issues/17375)
+* [Improve YAML front-matter tag export](https://github.com/siyuan-note/siyuan/issues/17376)
+* [Supports dragging and dropping files from other applications](https://github.com/siyuan-note/siyuan/issues/17382)
+
+### Bugfix
+
+* [The tooltip should not be escaped](https://github.com/siyuan-note/siyuan/issues/17359)
+* [Images in the database assets fields are not displaying](https://github.com/siyuan-note/siyuan/issues/17368)
+
+## Download
+
+* [B3log](https://b3log.org/siyuan/en/download.html)
+* [GitHub](https://github.com/siyuan-note/siyuan/releases)
--- a/app/changelogs/v3.6.3/v3.6.3_zh_CHT.md
+++ b/app/changelogs/v3.6.3/v3.6.3_zh_CHT.md
@ -0,0 +1,29 @@
+## 概述
+
+此版本改進了一些細節。
+
+## 變更記錄
+
+以下是此版本中的詳細變更。
+
+### 改進功能
+
+* [改進刪除文件](https://github.com/siyuan-note/siyuan/issues/17351)
+* [改進 Linux 磁碟類型檢測](https://github.com/siyuan-note/siyuan/pull/17361)
+* [改進停靠列面板的標題和工具提示](https://github.com/siyuan-note/siyuan/issues/17366)
+* [標籤面板中不再顯示空白標籤](https://github.com/siyuan-note/siyuan/issues/17367)
+* [改進雲端配置的一致性](https://github.com/siyuan-note/siyuan/pull/17371)
+* [行級備註的工具提示無法渲染 HTML](https://github.com/siyuan-note/siyuan/issues/17374)
+* [改良公式區塊中內容的轉義](https://github.com/siyuan-note/siyuan/issues/17375)
+* [改進 YAML front-matter 中標籤的匯出](https://github.com/siyuan-note/siyuan/issues/17376)
+* [支援從其他應用程式拖曳文件](https://github.com/siyuan-note/siyuan/issues/17382)
+
+### 修復缺陷
+
+* [工具提示不應轉義](https://github.com/siyuan-note/siyuan/issues/17359)
+* [資料庫資源欄位中的圖片未顯示](https://github.com/siyuan-note/siyuan/issues/17368)
+
+## 下載
+
+* [B3log](https://b3log.org/siyuan/download.html)
+* [GitHub](https://github.com/siyuan-note/siyuan/releases)
--- a/app/changelogs/v3.6.3/v3.6.3_zh_CN.md
+++ b/app/changelogs/v3.6.3/v3.6.3_zh_CN.md
@ -0,0 +1,29 @@
+## 概述
+
+此版本改进了一些细节。
+
+## 变更记录
+
+以下是此版本中的详细变更。
+
+### 改进功能
+
+* [改进删除文档](https://github.com/siyuan-note/siyuan/issues/17351)
+* [改进 Linux 磁盘类型检测](https://github.com/siyuan-note/siyuan/pull/17361)
+* [改进停靠栏面板的标题和工具提示](https://github.com/siyuan-note/siyuan/issues/17366)
+* [标签面板中不再显示空标签](https://github.com/siyuan-note/siyuan/issues/17367)
+* [改进云端配置的一致性](https://github.com/siyuan-note/siyuan/pull/17371)
+* [行级备注的工具提示无法渲染 HTML](https://github.com/siyuan-note/siyuan/issues/17374)
+* [改进公式块中内容的转义](https://github.com/siyuan-note/siyuan/issues/17375)
+* [改进 YAML front-matter 中标签的导出](https://github.com/siyuan-note/siyuan/issues/17376)
+* [支持从其他应用拖拽文件](https://github.com/siyuan-note/siyuan/issues/17382)
+
+### 修复缺陷
+
+* [工具提示不应被转义](https://github.com/siyuan-note/siyuan/issues/17359)
+* [数据库资源字段中的图片未显示](https://github.com/siyuan-note/siyuan/issues/17368)
+
+## 下载
+
+* [B3log](https://b3log.org/siyuan/download.html)
+* [GitHub](https://github.com/siyuan-note/siyuan/releases)
--- a/app/changelogs/v3.6.4/v3.6.4.md
+++ b/app/changelogs/v3.6.4/v3.6.4.md
@ -0,0 +1,46 @@
+## Overview
+
+This version improves some details.
+
+## Changelogs
+
+Below are the detailed changes in this version.
+
+### Enhancement
+
+* [Add a `Copy full document` option to the document block menu](https://github.com/siyuan-note/siyuan/issues/17352)
+* [The list in the backlink panel no longer collapses automatically after pasting](https://github.com/siyuan-note/siyuan/issues/17362)
+* [Improve pasting link](https://github.com/siyuan-note/siyuan/pull/17378)
+* [Improve block icon render when list items contain blockquotes or callouts](https://github.com/siyuan-note/siyuan/issues/17387)
+* [Improve pasting of inline code containing backticks and ampersands](https://github.com/siyuan-note/siyuan/issues/17388)
+* [Improve button box-shadow](https://github.com/siyuan-note/siyuan/issues/17389)
+* [Improve marketplace list cards](https://github.com/siyuan-note/siyuan/pull/17390)
+* [Improve block ref exporting](https://github.com/siyuan-note/siyuan/issues/17397)
+* [`Optimize typography` ignores full-width characters](https://github.com/siyuan-note/siyuan/issues/17417)
+* [Move pagination and navigation buttons to the top-left of the Flashcard Management window](https://github.com/siyuan-note/siyuan/issues/17422)
+* [Support displaying full Dock panel titles and action buttons](https://github.com/siyuan-note/siyuan/issues/17424)
+* [Improve the display position of block gutter](https://github.com/siyuan-note/siyuan/issues/17432)
+* [The loading icon no longer covers the entire cloud configuration page](https://github.com/siyuan-note/siyuan/pull/17434)
+* [Improve split-screen layout](https://github.com/siyuan-note/siyuan/issues/17435)
+* [Downloaded marketplace packages no longer fall back to fetching the online README](https://github.com/siyuan-note/siyuan/pull/17464)
+
+### Bugfix
+
+* [Default workspace data will be lost on macOS](https://github.com/siyuan-note/siyuan/issues/17430)
+* [Dragging a block to the Backlinks panel causes an error](https://github.com/siyuan-note/siyuan/issues/17437)
+* [Fix some security vulnerabilities](https://github.com/siyuan-note/siyuan/issues/17443)
+* [Markdown.zip import error on Android](https://github.com/siyuan-note/siyuan/issues/17453)
+* [The entire block disappears after dragging a block within the callout block](https://github.com/siyuan-note/siyuan/issues/17467)
+
+### Development
+
+* [Task lists support the `data-task` status attribute](https://github.com/siyuan-note/siyuan/issues/17343)
+* [Add a `type` parameter to the plugin API `getAllTabs`](https://github.com/siyuan-note/siyuan/issues/17354)
+* [Add kernel API `/api/file/workspaceCopyFiles`](https://github.com/siyuan-note/siyuan/pull/17421)
+* [Add kernel API `/api/block/updateTaskListItemMarker`](https://github.com/siyuan-note/siyuan/issues/17451)
+* [Add kernel API `/api/block/batchUpdateTaskListItemMarker`](https://github.com/siyuan-note/siyuan/pull/17461)
+
+## Download
+
+* [B3log](https://b3log.org/siyuan/en/download.html)
+* [GitHub](https://github.com/siyuan-note/siyuan/releases)
--- a/app/changelogs/v3.6.4/v3.6.4_zh_CHT.md
+++ b/app/changelogs/v3.6.4/v3.6.4_zh_CHT.md
@ -0,0 +1,46 @@
+## 概述
+
+此版本改進了一些細節。
+
+## 變更記錄
+
+以下是此版本中的詳細變更。
+
+### 改進功能
+
+* [在文件區塊選單中新增 `複製全文` 選項](https://github.com/siyuan-note/siyuan/issues/17352)
+* [反向連結面板中的清單在貼上後不再自動折疊](https://github.com/siyuan-note/siyuan/issues/17362)
+* [改進貼上連結](https://github.com/siyuan-note/siyuan/pull/17378)
+* [改進當清單項目包含區塊引用或提示區塊時的區塊標渲染](https://github.com/siyuan-note/siyuan/issues/17387)
+* [改進包含反引號和與號的行級程式碼的貼上](https://github.com/siyuan-note/siyuan/issues/17388)
+* [改進按鈕陰影效果](https://github.com/siyuan-note/siyuan/issues/17389)
+* [改進市集清單卡](https://github.com/siyuan-note/siyuan/pull/17390)
+* [改進區塊引用導出](https://github.com/siyuan-note/siyuan/issues/17397)
+* [`優化排版` 忽略全角字元](https://github.com/siyuan-note/siyuan/issues/17417)
+* [將閃卡管理視窗中的分頁和導覽按鈕移到左上角](https://github.com/siyuan-note/siyuan/issues/17422)
+* [支援顯示完整的停靠列面板標題和操作按鈕](https://github.com/siyuan-note/siyuan/issues/17424)
+* [改進塊標的顯示位置](https://github.com/siyuan-note/siyuan/issues/17432)
+* [載入圖示不再覆蓋整個雲端設定介面](https://github.com/siyuan-note/siyuan/pull/17434)
+* [改進分割畫面佈局](https://github.com/siyuan-note/siyuan/issues/17435)
+* [已下載的市集包不再回退取得線上 README](https://github.com/siyuan-note/siyuan/pull/17464)
+
+### 修復缺陷
+
+* [macOS 上預設工作空間資料會遺失](https://github.com/siyuan-note/siyuan/issues/17430)
+* [將區塊拖曳到反向連結面板時會導致報錯](https://github.com/siyuan-note/siyuan/issues/17437)
+* [修復一些安全漏洞](https://github.com/siyuan-note/siyuan/issues/17443)
+* [Android 上導入 Markdown.zip 出錯](https://github.com/siyuan-note/siyuan/issues/17453)
+* [在提示區塊內部拖曳區塊後整個區塊會消失](https://github.com/siyuan-note/siyuan/issues/17467)
+
+### 開發者
+
+* [任務清單支援 `data-task` 狀態屬性](https://github.com/siyuan-note/siyuan/issues/17343)
+* [為插件 API `getAllTabs` 新增 `type` 參數](https://github.com/siyuan-note/siyuan/issues/17354)
+* [新增核心 API `/api/file/workspaceCopyFiles`](https://github.com/siyuan-note/siyuan/pull/17421)
+* [新增內核 API `/api/block/updateTaskListItemMarker`](https://github.com/siyuan-note/siyuan/issues/17451)
+* [新增核心 API `/api/block/batchUpdateTaskListItemMarker`](https://github.com/siyuan-note/siyuan/pull/17461)
+
+## 下載
+
+* [B3log](https://b3log.org/siyuan/download.html)
+* [GitHub](https://github.com/siyuan-note/siyuan/releases)
--- a/app/changelogs/v3.6.4/v3.6.4_zh_CN.md
+++ b/app/changelogs/v3.6.4/v3.6.4_zh_CN.md
@ -0,0 +1,46 @@
+## 概述
+
+此版本改进了一些细节。
+
+## 变更记录
+
+以下是此版本中的详细变更。
+
+### 改进功能
+
+* [在文档块菜单中添加 `复制全文` 选项](https://github.com/siyuan-note/siyuan/issues/17352)
+* [反向链接面板中的列表在粘贴后不再自动折叠](https://github.com/siyuan-note/siyuan/issues/17362)
+* [改进粘贴链接](https://github.com/siyuan-note/siyuan/pull/17378)
+* [改进当列表项包含块引用或提示块时的块标渲染](https://github.com/siyuan-note/siyuan/issues/17387)
+* [改进包含反引号和与号的行级代码的粘贴](https://github.com/siyuan-note/siyuan/issues/17388)
+* [改进按钮阴影效果](https://github.com/siyuan-note/siyuan/issues/17389)
+* [改进集市列表卡片](https://github.com/siyuan-note/siyuan/pull/17390)
+* [改进块引用导出](https://github.com/siyuan-note/siyuan/issues/17397)
+* [`优化排版` 忽略全角字符](https://github.com/siyuan-note/siyuan/issues/17417)
+* [将闪卡管理窗口中的分页和导航按钮移动到左上角](https://github.com/siyuan-note/siyuan/issues/17422)
+* [支持显示完整的停靠栏面板标题和操作按钮](https://github.com/siyuan-note/siyuan/issues/17424)
+* [改进块标的显示位置](https://github.com/siyuan-note/siyuan/issues/17432)
+* [加载图标不再覆盖整个云端配置界面](https://github.com/siyuan-note/siyuan/pull/17434)
+* [改进分屏布局](https://github.com/siyuan-note/siyuan/issues/17435)
+* [已下载的集市包不再回退获取在线 README](https://github.com/siyuan-note/siyuan/pull/17464)
+
+### 修复缺陷
+
+* [macOS 上默认工作空间数据会丢失](https://github.com/siyuan-note/siyuan/issues/17430)
+* [将块拖动到反向链接面板时会导致报错](https://github.com/siyuan-note/siyuan/issues/17437)
+* [修复一些安全漏洞](https://github.com/siyuan-note/siyuan/issues/17443)
+* [Android 上导入 Markdown.zip 出错](https://github.com/siyuan-note/siyuan/issues/17453)
+* [在提示块内部拖动块后整个块会消失](https://github.com/siyuan-note/siyuan/issues/17467)
+
+### 开发者
+
+* [任务列表支持 `data-task` 状态属性](https://github.com/siyuan-note/siyuan/issues/17343)
+* [为插件 API `getAllTabs` 添加 `type` 参数](https://github.com/siyuan-note/siyuan/issues/17354)
+* [新增内核 API `/api/file/workspaceCopyFiles`](https://github.com/siyuan-note/siyuan/pull/17421)
+* [新增内核 API `/api/block/updateTaskListItemMarker`](https://github.com/siyuan-note/siyuan/issues/17451)
+* [新增内核 API `/api/block/batchUpdateTaskListItemMarker`](https://github.com/siyuan-note/siyuan/pull/17461)
+
+## 下载
+
+* [B3log](https://b3log.org/siyuan/download.html)
+* [GitHub](https://github.com/siyuan-note/siyuan/releases)
--- a/app/changelogs/v3.6.5/v3.6.5.md
+++ b/app/changelogs/v3.6.5/v3.6.5.md
@ -0,0 +1,52 @@
+## Overview
+
+This version improves some details.
+
+## Changelogs
+
+Below are the detailed changes in this version.
+
+### Enhancement
+
+* [Treat the renaming of tags, bookmarks and assets as a data history `Replace` operation](https://github.com/siyuan-note/siyuan/issues/17407)
+* [Improve appearance settings for inline text on mobile](https://github.com/siyuan-note/siyuan/issues/17477)
+* [Editor toolbar does not hide when clicking outside it on mobile](https://github.com/siyuan-note/siyuan/issues/17478)
+* [Improve task list item markdown indexing for `data-task` marker](https://github.com/siyuan-note/siyuan/issues/17502)
+* [Easy way to switch between tags](https://github.com/siyuan-note/siyuan/issues/17505)
+* [Improve decoding of anchor text when pasting hyperlinks](https://github.com/siyuan-note/siyuan/issues/17513)
+* [Improve `kbd` font `--b3-font-family-kbd`](https://github.com/siyuan-note/siyuan/issues/17517)
+* [Change default Redo shortcut to `⇧⌘Z` on macOS](https://github.com/siyuan-note/siyuan/issues/17518)
+* [Improve cursor positioning after Undo in tables](https://github.com/siyuan-note/siyuan/issues/17532)
+* [Optimize code block line number rendering for better performance](https://github.com/siyuan-note/siyuan/issues/17542)
+* [Improve data indexing](https://github.com/siyuan-note/siyuan/issues/17543)
+* [Improve input method compatibility](https://github.com/siyuan-note/siyuan/issues/17546)
+* [Improve the clipping extension to resolve issues where images were too large to be clipped](https://github.com/siyuan-note/siyuan/issues/17547)
+
+### Bugfix
+
+* [Click the editor may cause it to jump to the top on iOS](https://github.com/siyuan-note/siyuan/issues/17454)
+* [The IFrame block cannot be edited](https://github.com/siyuan-note/siyuan/issues/17486)
+* [Pasting links into database assets fields creates duplicate entries](https://github.com/siyuan-note/siyuan/issues/17492)
+* [The outline does not refresh automatically](https://github.com/siyuan-note/siyuan/issues/17493)
+* [Events are missing in the cloud configuration interface](https://github.com/siyuan-note/siyuan/issues/17495)
+* [A blank area appears after splitting the tabs](https://github.com/siyuan-note/siyuan/issues/17499)
+* [Fix some security vulnerabilities](https://github.com/siyuan-note/siyuan/issues/17503)
+* [Missing `window.siyuan.config` at startup causes an error](https://github.com/siyuan-note/siyuan/issues/17508)
+* [The `Ref` option in the slash menu is not searchable](https://github.com/siyuan-note/siyuan/issues/17510)
+* [Authentication failed due to an excessively long cookie](https://github.com/siyuan-note/siyuan/issues/17512)
+* [Fix outline issues in editor Preview Mode](https://github.com/siyuan-note/siyuan/issues/17551)
+
+### Refactor
+
+* [Upgrade to Electron v40.9.1](https://github.com/siyuan-note/siyuan/issues/17501)
+
+### Development
+
+* [Error occurs in standalone windows after `uninstall` plugins](https://github.com/siyuan-note/siyuan/issues/17509)
+* [Add the document opening mode parameter `doc.mode` to `openTab`](https://github.com/siyuan-note/siyuan/issues/17523)
+* [Add `switchMode` method to Protyle instance](https://github.com/siyuan-note/siyuan/issues/17552)
+
+## Download
+
+* [B3log](https://b3log.org/siyuan/en/download.html)
+* [GitHub](https://github.com/siyuan-note/siyuan/releases)
--- a/app/changelogs/v3.6.5/v3.6.5_zh_CHT.md
+++ b/app/changelogs/v3.6.5/v3.6.5_zh_CHT.md
@ -0,0 +1,52 @@
+## 概述
+
+此版本改進了一些細節。
+
+## 變更記錄
+
+以下是此版本中的詳細變更。
+
+### 改進功能
+
+* [將標籤、書籤和資源的重新命名視為資料歷史中的 `Replace` 操作](https://github.com/siyuan-note/siyuan/issues/17407)
+* [改進行動端行級文字的外觀設定](https://github.com/siyuan-note/siyuan/issues/17477)
+* [行動端點選編輯器外部時工具列不會隱藏](https://github.com/siyuan-note/siyuan/issues/17478)
+* [改進任務清單項目中 `data-task` 標記的 Markdown 索引](https://github.com/siyuan-note/siyuan/issues/17502)
+* [改進標籤切換](https://github.com/siyuan-note/siyuan/issues/17505)
+* [改進貼上超連結時對錨文本的解碼](https://github.com/siyuan-note/siyuan/issues/17513)
+* [改良 `kbd` 字體 `--b3-font-family-kbd`](https://github.com/siyuan-note/siyuan/issues/17517)
+* [將 macOS 上預設的重做快捷鍵改為 `⇧⌘Z`](https://github.com/siyuan-note/siyuan/issues/17518)
+* [改進表格中撤銷後的遊標定位](https://github.com/siyuan-note/siyuan/issues/17532)
+* [最佳化程式碼區塊行號渲染以提升效能](https://github.com/siyuan-note/siyuan/issues/17542)
+* [改進資料索引](https://github.com/siyuan-note/siyuan/issues/17543)
+* [改進輸入法相容性](https://github.com/siyuan-note/siyuan/issues/17546)
+* [改進剪藏擴充解決圖片過大無法剪藏](https://github.com/siyuan-note/siyuan/issues/17547)
+
+### 修復缺陷
+
+* [在 iOS 上點擊編輯器可能會導致頁面跳到頂部](https://github.com/siyuan-note/siyuan/issues/17454)
+* [IFrame 區塊無法編輯](https://github.com/siyuan-note/siyuan/issues/17486)
+* [將連結貼到資料庫資源欄位時會建立重複條目](https://github.com/siyuan-note/siyuan/issues/17492)
+* [大綱不會自動刷新](https://github.com/siyuan-note/siyuan/issues/17493)
+* [雲端設定介面中事件缺失](https://github.com/siyuan-note/siyuan/issues/17495)
+* [分割標籤頁後出現空白區域](https://github.com/siyuan-note/siyuan/issues/17499)
+* [修復一些安全漏洞](https://github.com/siyuan-note/siyuan/issues/17503)
+* [啟動時缺少 `window.siyuan.config` 會導致報錯](https://github.com/siyuan-note/siyuan/issues/17508)
+* [斜線選單中的 `引用` 選項無法搜尋](https://github.com/siyuan-note/siyuan/issues/17510)
+* [由於 Cookie 過長導致授權頁驗證失敗](https://github.com/siyuan-note/siyuan/issues/17512)
+* [修復預覽模式下大綱的問題](https://github.com/siyuan-note/siyuan/issues/17551)
+
+### 開發重構
+
+* [升級至 Electron v40.9.1](https://github.com/siyuan-note/siyuan/issues/17501)
+
+### 開發者
+
+* [獨立視窗中卸載插件報錯](https://github.com/siyuan-note/siyuan/issues/17509)
+* [為 `openTab` 新增文件開啟模式參數 `doc.mode`](https://github.com/siyuan-note/siyuan/issues/17523)
+* [為 Protyle 實例新增 `switchMode` 方法](https://github.com/siyuan-note/siyuan/issues/17552)
+
+## 下載
+
+* [B3log](https://b3log.org/siyuan/download.html)
+* [GitHub](https://github.com/siyuan-note/siyuan/releases)
--- a/app/changelogs/v3.6.5/v3.6.5_zh_CN.md
+++ b/app/changelogs/v3.6.5/v3.6.5_zh_CN.md
@ -0,0 +1,52 @@
+## 概述
+
+此版本改进了一些细节。
+
+## 变更记录
+
+以下是此版本中的详细变更。
+
+### 改进功能
+
+* [将标签、书签和资源的重命名视为数据历史中的 `Replace` 操作](https://github.com/siyuan-note/siyuan/issues/17407)
+* [改进移动端行级文本的外观设置](https://github.com/siyuan-note/siyuan/issues/17477)
+* [移动端点击编辑器外部时工具栏不会隐藏](https://github.com/siyuan-note/siyuan/issues/17478)
+* [改进任务列表项中 `data-task` 标记的 Markdown 索引](https://github.com/siyuan-note/siyuan/issues/17502)
+* [改进标签切换](https://github.com/siyuan-note/siyuan/issues/17505)
+* [改进粘贴超链接时对锚文本的解码](https://github.com/siyuan-note/siyuan/issues/17513)
+* [改进 `kbd` 字体 `--b3-font-family-kbd`](https://github.com/siyuan-note/siyuan/issues/17517)
+* [将 macOS 上默认的重做快捷键改为 `⇧⌘Z`](https://github.com/siyuan-note/siyuan/issues/17518)
+* [改进表格中撤销后的光标定位](https://github.com/siyuan-note/siyuan/issues/17532)
+* [优化代码块行号渲染以提升性能](https://github.com/siyuan-note/siyuan/issues/17542)
+* [改进数据索引](https://github.com/siyuan-note/siyuan/issues/17543)
+* [改进输入法兼容性](https://github.com/siyuan-note/siyuan/issues/17546)
+* [改进剪藏扩展解决图片过大无法剪藏](https://github.com/siyuan-note/siyuan/issues/17547)
+
+### 修复缺陷
+
+* [在 iOS 上点击编辑器可能导致页面跳到顶部](https://github.com/siyuan-note/siyuan/issues/17454)
+* [IFrame 块无法编辑](https://github.com/siyuan-note/siyuan/issues/17486)
+* [将链接粘贴到数据库资源字段时会创建重复条目](https://github.com/siyuan-note/siyuan/issues/17492)
+* [大纲不会自动刷新](https://github.com/siyuan-note/siyuan/issues/17493)
+* [云端配置界面中事件缺失](https://github.com/siyuan-note/siyuan/issues/17495)
+* [拆分标签页后出现空白区域](https://github.com/siyuan-note/siyuan/issues/17499)
+* [修复一些安全漏洞](https://github.com/siyuan-note/siyuan/issues/17503)
+* [启动时缺少 `window.siyuan.config` 会导致报错](https://github.com/siyuan-note/siyuan/issues/17508)
+* [斜杠菜单中的 `引用` 选项无法搜索](https://github.com/siyuan-note/siyuan/issues/17510)
+* [由于 Cookie 过长导致授权页验证失败](https://github.com/siyuan-note/siyuan/issues/17512)
+* [修复预览模式下大纲的问题](https://github.com/siyuan-note/siyuan/issues/17551)
+
+### 开发重构
+
+* [升级到 Electron v40.9.1](https://github.com/siyuan-note/siyuan/issues/17501)
+
+### 开发者
+
+* [独立窗口中卸载插件报错](https://github.com/siyuan-note/siyuan/issues/17509)
+* [为 `openTab` 添加文档打开模式参数 `doc.mode`](https://github.com/siyuan-note/siyuan/issues/17523)
+* [为 Protyle 实例添加 `switchMode` 方法](https://github.com/siyuan-note/siyuan/issues/17552)
+
+## 下载
+
+* [B3log](https://b3log.org/siyuan/download.html)
+* [GitHub](https://github.com/siyuan-note/siyuan/releases)
--- a/app/electron/error.html
+++ b/app/electron/error.html
@ -240,9 +240,10 @@
        'win32': 'Windows',
        'linux': 'Linux'
    }[process.platform] || process.platform;
-
+    const release = typeof process.getSystemVersion === 'function'
+        ? process.getSystemVersion() // Electron 提供，系统版本
+        : os.release(); // Node.js 提供，内核版本
    // Windows 系统版本判断
-    const release = os.release();
    if (process.platform === 'win32') {
        const versionParts = release.split('.'); // 10.0.22000
        if (versionParts.length >= 3) {
--- a/app/electron/init.html
+++ b/app/electron/init.html
@ -59,6 +59,7 @@
        }

        .b3-button {
+            cursor: pointer;
            color: #fff;
            border-radius: 6px;
            line-height: 20px;
@ -68,21 +69,20 @@
            display: inline-flex;
            align-items: center;
            justify-content: center;
-            transition: box-shadow 280ms cubic-bezier(0.4, 0, 0.2, 1);
+            transition: box-shadow 280ms ease;
            border: 0;
            box-sizing: border-box;
            text-align: center;
            width: 96px;
-            cursor: pointer;
        }

        .b3-button:hover, .b3-button:focus {
            text-decoration: none;
-            box-shadow: 0 5px 5px -3px rgb(0 0 0 / .2), 0 8px 10px 1px rgb(0 0 0 / .14), 0 3px 14px 2px rgb(0 0 0 / .12);
+            box-shadow: 0 1px 2px 0 rgb(0 0 0 / .3), 0 1px 3px 1px rgb(0 0 0 /.15);
        }

        .b3-button:active {
-            box-shadow: 0 5px 5px -3px rgba(0, 0, 0, 0.2), 0 8px 10px 1px rgba(0, 0, 0, 0.14), 0 3px 14px 2px rgba(0, 0, 0, 0.12);
+            box-shadow: 0 2px 3px 1px rgb(0 0 0 / .3), 0 2px 4px 2px rgb(0 0 0 /.15);
        }

        .b3-label {
@ -217,6 +217,14 @@
                background-color: #3573f0;
            }

+            .b3-button:hover, .b3-button:focus {
+                box-shadow: 0 1px 2px 0 rgb(0 0 0 / .3), 0 1px 3px 1px rgb(255 255 255 /.15);
+            }
+
+            .b3-button:active {
+                box-shadow: 0 2px 3px 1px rgb(0 0 0 / .3), 0 2px 4px 2px rgb(255 255 255 /.15);
+            }
+
            .b3-label {
                box-shadow: 0 15px 0 0 #1e1e1e, 0 16px 0 0 #363636;
            }
--- a/app/electron/main.js
+++ b/app/electron/main.js
@ -55,8 +55,9 @@ const isOpenAsHidden = function () {

 remote.initialize();

-app.setPath("userData", app.getPath("userData") + "-Electron"); // `~/.config` 下 Electron 相关文件夹名称改为 `SiYuan-Electron` https://github.com/siyuan-note/siyuan/issues/3349
-fs.rmSync(app.getPath("appData") + "/" + app.name, {recursive: true}); // 删除自动创建的应用目录 https://github.com/siyuan-note/siyuan/issues/13150
+// Electron 相关文件夹名称改为 `SiYuan-Electron` https://github.com/siyuan-note/siyuan/issues/3349
+// getPath("userData") 会创建空的 SiYuan 目录，改为 app.getPath("appData")
+app.setPath("userData", path.join(app.getPath("appData"), app.getName() + "-Electron"));

 if (process.platform === "win32") {
    // Windows 需要设置 AppUserModelId 才能正确显示应用名称和应用图标 https://github.com/siyuan-note/siyuan/issues/17022
@ -68,11 +69,6 @@ if (!app.requestSingleInstanceLock()) {
    return;
 }

-if (process.platform === "linux") {
-    app.commandLine.appendSwitch("enable-wayland-ime");
-    app.commandLine.appendSwitch("wayland-text-input-version", "3");
-}
-
 app.setAsDefaultProtocolClient("siyuan");

 app.commandLine.appendSwitch("disable-web-security");
@ -120,17 +116,9 @@ const windowNavigate = (currentWindow, windowType) => {
        if (url.startsWith(localServer)) {
            try {
                const pathname = new URL(url).pathname;
-                // 所有窗口都允许认证页面
-                if (pathname === "/check-auth" || pathname === "/") {
-                    return;
-                }
-                if (pathname === "/stage/build/app/" && windowType === "app") {
-                    return;
-                }
-                if (pathname === "/stage/build/app/window.html" && windowType === "window") {
-                    return;
-                }
-                if (pathname.startsWith("/export/temp/") && windowType === "export") {
+                if (windowType === "app" && ["/", "/stage/build/app/", "/check-auth"].includes(pathname) ||
+                    (windowType === "window" && ["/stage/build/app/window.html", "/check-auth"].includes(pathname)) ||
+                    (windowType === "export" && pathname.startsWith("/export/temp/"))) {
                    return;
                }
            } catch (e) {
--- a/app/package.json
+++ b/app/package.json
@ -1,6 +1,6 @@
 {
  "name": "SiYuan",
-  "version": "3.6.2",
+  "version": "3.6.5",
  "description": "Refactor your thinking",
  "homepage": "https://b3log.org/siyuan",
  "main": "./electron/main.js",
@ -57,7 +57,7 @@
    "clean-webpack-plugin": "^4.0.0",
    "css-loader": "^7.1.2",
    "dayjs": "^1.11.5",
-    "electron": "40.8.5",
+    "electron": "40.9.1",
    "electron-builder": "26.0.12",
    "encoding": "^0.1.13",
    "esbuild-loader": "^3.0.1",
--- a/app/pnpm-lock.yaml
+++ b/app/pnpm-lock.yaml
@ -10,7 +10,7 @@ importers:
    dependencies:
      '@electron/remote':
        specifier: ^2.1.3
-        version: 2.1.3(electron@40.8.5)
+        version: 2.1.3(electron@40.9.1)
    devDependencies:
      '@eslint/eslintrc':
        specifier: ^3.3.1
@ -40,8 +40,8 @@ importers:
        specifier: ^1.11.5
        version: 1.11.19
      electron:
-        specifier: 40.8.5
-        version: 40.8.5
+        specifier: 40.9.1
+        version: 40.9.1
      electron-builder:
        specifier: 26.0.12
        version: 26.0.12(electron-builder-squirrel-windows@26.0.12)
@ -692,6 +692,7 @@ packages:
  '@xmldom/xmldom@0.8.11':
    resolution: {integrity: sha512-cQzWCtO6C8TQiYl1ruKNn2U6Ao4o4WBBcbL61yJl84x+j5sOWWFU9X7DpND8XZG3daDppSsigMdfAIl2upQBRw==}
    engines: {node: '>=10.0.0'}
+    deprecated: this version has critical issues, please update to the latest version

  '@xtuc/ieee754@1.2.0':
    resolution: {integrity: sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==}
@ -1185,8 +1186,8 @@ packages:
    resolution: {integrity: sha512-bO3y10YikuUwUuDUQRM4KfwNkKhnpVO7IPdbsrejwN9/AABJzzTQ4GeHwyzNSrVO+tEH3/Np255a3sVZpZDjvg==}
    engines: {node: '>=8.0.0'}

-  electron@40.8.5:
-    resolution: {integrity: sha512-pgTY/VPQKaiU4sTjfU96iyxCXrFm4htVPCMRT4b7q9ijNTRgtLmLvcmzp2G4e7xDrq9p7OLHSmu1rBKFf6Y1/A==}
+  electron@40.9.1:
+    resolution: {integrity: sha512-dgUqGjpTJeLZQEbvZQlnjMtPCUfOGRBNJIYjw8yC2ZN9O1QS172r09trhLke+rC8JCLBGbf2DeU63AArd0tbhQ==}
    engines: {node: '>= 12.20.55'}
    hasBin: true

@ -1817,6 +1818,9 @@ packages:
  lodash@4.17.23:
    resolution: {integrity: sha512-LgVTMpQtIopCi79SJeDiP0TfWi5CNEc/L/aRdTh3yIvmZXTnheWpKjSZhnvMl8iXbC1tFg9gdHHDMLoV7CnG+w==}

+  lodash@4.18.1:
+    resolution: {integrity: sha512-dMInicTPVE8d1e5otfwmmjlxkZoUpiVLwyeTdUsi/Caj/gfzzblBcCE5sRHV/AsjuCmxWrte2TNGSYuCeCq+0Q==}
+
  log-symbols@4.1.0:
    resolution: {integrity: sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==}
    engines: {node: '>=10'}
@ -2831,9 +2835,9 @@ snapshots:
      - bluebird
      - supports-color

-  '@electron/remote@2.1.3(electron@40.8.5)':
+  '@electron/remote@2.1.3(electron@40.9.1)':
    dependencies:
-      electron: 40.8.5
+      electron: 40.9.1

  '@electron/universal@2.0.1':
    dependencies:
@ -3953,14 +3957,14 @@ snapshots:
      '@electron/asar': 3.4.1
      debug: 4.4.3
      fs-extra: 7.0.1
-      lodash: 4.17.23
+      lodash: 4.18.1
      temp: 0.9.4
    optionalDependencies:
      '@electron/windows-sign': 1.2.2
    transitivePeerDependencies:
      - supports-color

-  electron@40.8.5:
+  electron@40.9.1:
    dependencies:
      '@electron/get': 2.0.3
      '@types/node': 24.12.0
@ -4655,6 +4659,8 @@ snapshots:

  lodash@4.17.23: {}

+  lodash@4.18.1: {}
+
  log-symbols@4.1.0:
    dependencies:
      chalk: 4.1.2
--- a/app/src/assets/scss/business/_block.scss
+++ b/app/src/assets/scss/business/_block.scss
@ -85,7 +85,7 @@
    transition: var(--b3-transition), opacity .3s cubic-bezier(0, 0, .2, 1) 0ms;
    line-height: 14px;

-    &:hover:not([disabled]):not(.ft__primary):not(.block__icon--warning),
+    &:hover:not([disabled]):not(.block__icon--text):not(.block__icon--warning),
    &--active {
      color: var(--b3-theme-on-background);
      background-color: var(--b3-list-icon-hover);
--- a/app/src/assets/scss/business/_config.scss
+++ b/app/src/assets/scss/business/_config.scss
@ -260,7 +260,7 @@
    }

    &__content {
-      margin-top: -15px;
+      margin: 1px 16px;
    }

    &__readme {
--- a/app/src/assets/scss/component/_button.scss
+++ b/app/src/assets/scss/component/_button.scss
@ -9,7 +9,7 @@
  display: inline-flex;
  align-items: center;
  justify-content: center;
-  transition: box-shadow 280ms cubic-bezier(.4, 0, .2, 1);
+  transition: box-shadow 280ms ease;
  border: 0;
  box-sizing: border-box;
  text-align: center;
@ -29,7 +29,7 @@
  }

  &:active {
-    box-shadow: 0 5px 5px -3px rgba(0, 0, 0, .2), 0 8px 10px 1px rgba(0, 0, 0, .14), 0 3px 14px 2px rgba(0, 0, 0, .12);
+    box-shadow: var(--b3-button-active-shadow)
  }

  &--progress {
--- a/app/src/assets/scss/component/_card.scss
+++ b/app/src/assets/scss/component/_card.scss
@ -4,31 +4,28 @@
  box-shadow: var(--b3-point-shadow);
  background-color: var(--b3-theme-surface);
  border-radius: var(--b3-border-radius);
-  margin: 16px;
  overflow: hidden;
  position: relative;
  transition: var(--b3-transition);
  cursor: pointer;
  display: flex;

-  &--wrap {
-    flex: 1;
-    margin: 16px 0 0 16px;
-    min-width: 342px;
-  }
-
  &:hover {
    background-color: var(--b3-list-hover);
  }

  &s {
-    display: flex;
-    flex-wrap: wrap;
-    margin: 0 16px 16px 0;
+    display: grid;
+    gap: 16px;
+    grid-template-columns: repeat(auto-fill, minmax(min(100%, 342px), 1fr));
+
+    &--nowrap {
+      grid-template-columns:1fr;
+    }
  }

  &--current {
-    background-color: var(--b3-theme-primary-lightest)
+    background-color: var(--b3-theme-primary-lightest);
  }

  &--disabled {
@ -48,7 +45,7 @@
  }

  &__info {
-    padding: 16px 16px 4px;
+    padding: 16px 16px 0;
    line-height: 18px;

    &--left {
@ -60,17 +57,23 @@
  &__desc {
    color: var(--b3-theme-on-surface);
    font-size: 12px;
-    margin-top: 4px;
+    text-autospace: normal;
+    margin-top: 8px;
    max-height: 54px;
    @include mixin.text-clamp(3);
  }

  &__actions {
-    padding: 0 16px 14px 16px;
    display: flex;
    box-sizing: border-box;
    font-size: 12px;
    line-height: 14px;
+    padding: 3px 11px 11px;
+
+    &:not(.b3-card__actions--right) .block__icon svg {
+      height: 12px;
+      width: 12px;
+    }

    &--right {
      padding-left: 0;
--- a/app/src/assets/scss/main/_main.scss
+++ b/app/src/assets/scss/main/_main.scss
@ -248,13 +248,34 @@ html[data-frontend="browser-desktop"] {
 }

 .file-tree {
+  .block__icons .block__icon,
+  &:not(.fullscreen) .block__icons .fn__space {
+    display: none;
+    transition: opacity .3s cubic-bezier(0, 0, .2, 1) 0ms, display .3s cubic-bezier(0, 0, .2, 1) 0ms allow-discrete;
+  }
+
+  .block__logo::-webkit-scrollbar {
+    display: none;
+  }
+
+  &:hover .block__icons .fn__space {
+    display: block;
+  }
+
  &:hover .block__icons .block__icon:not([disabled]),
+  &:not(.fullscreen):hover .block__icons .fn__space,
  &.fullscreen .block__icons .block__icon:not([disabled]) {
    opacity: 1;
+    display: block;
+    @starting-style {
+      opacity: 0;
+    }
  }

  &:hover .block__icons .block__icon[disabled] {
    opacity: .38;
+    display: block;
+    cursor: not-allowed;
  }

  &__close {
--- a/app/src/block/popover.ts
+++ b/app/src/block/popover.ts
@ -30,7 +30,7 @@ export const initBlockPopover = (app: App) => {
            hasClosestByClassName(event.target, "av__cell");
        if (aElement) {
            let tooltipClass = "";
-            let tip = escapeHtml(aElement.getAttribute("aria-label")) || "";
+            let tip = aElement.getAttribute("aria-label") || "";
            if (aElement.classList.contains("av__cell") && !aElement.classList.contains("ariaLabel")) {
                if (aElement.classList.contains("av__cell--header")) {
                    const textElement = aElement.querySelector(".av__celltext");
@ -79,10 +79,12 @@ export const initBlockPopover = (app: App) => {
                if (childElement && childElement.clientWidth < childElement.scrollWidth) {
                    tip = childElement.textContent;
                }
+            } else if (aElement.classList.contains("protyle-attr--memo")) {
+                tip = escapeHtml(tip);
            }
            let tooltipSpace: number | undefined;
            if (!tip && aElement.getAttribute("data-type")?.includes("inline-memo")) {
-                tip = escapeHtml(aElement.getAttribute("data-inline-memo-content"));
+                tip = window.DOMPurify.sanitize(aElement.getAttribute("data-inline-memo-content"));
                tooltipClass = "memo"; // 为行级备注添加 class https://github.com/siyuan-note/siyuan/issues/6161
                tooltipSpace = 0; // tooltip 和备注元素之间不能有空隙 https://github.com/siyuan-note/siyuan/issues/14796#issuecomment-3649757267
            }
--- a/app/src/boot/globalEvent/commonHotkey.ts
+++ b/app/src/boot/globalEvent/commonHotkey.ts
@ -96,6 +96,14 @@ const hasKeymap = (keymap: Record<string, IKeymapItem>, key1: "general" | "edito
 };

 export const correctHotkey = (app: App) => {
+    if (!["darwin", "ios"].includes(window.siyuan.config.system.os)) {
+        ["fileTree", "outline", "bookmark", "tag", "dailyNote", "inbox", "backlinks",
+            "graphView", "globalGraph", "riffCard"].forEach(key => {
+            Constants.SIYUAN_KEYMAP.general[key].custom = Constants.SIYUAN_KEYMAP.general[key].default =
+                Constants.SIYUAN_KEYMAP.general[key].default.replace("⌃", "⌥");
+        });
+        Constants.SIYUAN_KEYMAP.editor.general.redo.custom = Constants.SIYUAN_KEYMAP.editor.general.redo.default = "⌘Y";
+    }
    const matchKeymap1 = matchKeymap(Constants.SIYUAN_KEYMAP.general, "general");
    const matchKeymap2 = matchKeymap(Constants.SIYUAN_KEYMAP.editor.general, "editor", "general");
    const matchKeymap3 = matchKeymap(Constants.SIYUAN_KEYMAP.editor.insert, "editor", "insert");
--- a/app/src/boot/globalEvent/keydown.ts
+++ b/app/src/boot/globalEvent/keydown.ts
@ -30,7 +30,7 @@ import {goBack, goForward} from "../../util/backForward";
 import {getDisplayName, getNotebookName} from "../../util/pathName";
 import {openFileById} from "../../editor/util";
 import {getAllDocks, getAllModels, getAllTabs} from "../../layout/getAll";
-import {focusBlock, focusByOffset, focusByRange, getSelectionOffset} from "../../protyle/util/selection";
+import {focusBlock, focusByRange} from "../../protyle/util/selection";
 import {initFileMenu, initNavigationMenu} from "../../menus/navigation";
 import {bindMenuKeydown} from "../../menus/Menu";
 import {Dialog} from "../../dialog";
@ -440,15 +440,12 @@ const editKeydown = (app: App, event: KeyboardEvent) => {
    }
    if (matchHotKey(window.siyuan.config.keymap.editor.general.outline.custom, event)) {
        event.preventDefault();
-        const offset = getSelectionOffset(target);
        openOutline({
            app,
            rootId: protyle.block.rootID,
            title: protyle.options.render.title ? (protyle.title.editElement.textContent || window.siyuan.languages.untitled) : "",
            isPreview: !protyle.preview.element.classList.contains("fn__none")
        });
-        // switchWnd 后，range会被清空，需要重新设置
-        focusByOffset(target, offset.start, offset.end);
        return true;
    }
    if (matchHotKey(window.siyuan.config.keymap.editor.general.copyPlainText.custom, event)) {
--- a/app/src/boot/globalEvent/mousemove.ts
+++ b/app/src/boot/globalEvent/mousemove.ts
@ -4,15 +4,36 @@ import {hasClosestBlock, hasClosestByClassName, hasClosestByTag} from "../../pro
 import {getColIndex} from "../../protyle/util/table";

 const getRightBlock = (element: HTMLElement, x: number, y: number) => {
-    let index = 1;
+    let left = x + 34;
    let nodeElement = element;
    if (nodeElement && nodeElement.classList.contains("protyle-action")) {
        return nodeElement;
    }
-    while (nodeElement && (nodeElement.classList.contains("list") || nodeElement.classList.contains("li"))) {
-        nodeElement = document.elementFromPoint(x + 73 * index, y) as HTMLElement;
+    let lastNodeElement;
+    while (nodeElement && (
+        nodeElement.classList.contains("list") || nodeElement.classList.contains("li") ||
+        nodeElement.classList.contains("bq") || nodeElement.classList.contains("callout")
+    )) {
+        nodeElement = document.elementFromPoint(left, y) as HTMLElement;
+        const calloutInfoElement = hasClosestByClassName(nodeElement, "callout-info");
+        if (calloutInfoElement) {
+            nodeElement = calloutInfoElement;
+            break;
+        }
        nodeElement = hasClosestBlock(nodeElement) as HTMLElement;
-        index++;
+        if (lastNodeElement && lastNodeElement === nodeElement) {
+            break;
+        }
+        lastNodeElement = nodeElement;
+        if (nodeElement) {
+            if (nodeElement.classList.contains("bq") || nodeElement.classList.contains("callout")) {
+                left += 10;
+            } else {
+                left += 34;
+            }
+        } else {
+            left += 34;
+        }
    }
    return nodeElement;
 };
--- a/app/src/boot/onGetConfig.ts
+++ b/app/src/boot/onGetConfig.ts
@ -98,6 +98,9 @@ export const onGetConfig = (isStart: boolean, app: App) => {
                    }
                });
            }
+            window.siyuan.dialogs.forEach(item => {
+                item.resize();
+            });
        }, Constants.TIMEOUT_RESIZE);
    });
 };
--- a/app/src/card/viewCards.ts
+++ b/app/src/card/viewCards.ts
@ -23,14 +23,14 @@ export const viewCards = (app: App, deckID: string, title: string, deckType: "Tr
        const dialog = new Dialog({
            positionId: Constants.DIALOG_VIEWCARDS,
            content: `<div class="fn__flex-column" style="height: 100%">
-    <div class="block__icons">
-        <span class="fn__flex-1 fn__flex-center resize__move">${escapeHtml(title)}</span>
+    <div class="block__icons" style="border-bottom: 1px solid var(--b3-border-color)">
+        <span class="fn__flex-center resize__move">${escapeHtml(title)}</span>
+        <span class="fn__space${(deckType === "" && deckID === "") ? " fn__none" : ""}"></span>
+        <span data-type="resetAll" data-position="north" class="block__icon block__icon--show ariaLabel${(deckType === "" && deckID === "") ? " fn__none" : ""}" aria-label="${window.siyuan.languages.reset}"><svg><use xlink:href='#iconUndo'></use></svg></span>
        <span class="fn__space"></span>
-        <span data-type="resetAll" class="block__icon block__icon--show b3-tooltips b3-tooltips__w${(deckType === "" && deckID === "") ? " fn__none" : ""}" aria-label="${window.siyuan.languages.reset}"><svg><use xlink:href='#iconUndo'></use></svg></span>
+        <span data-type="previous" data-position="north" class="block__icon block__icon--show ariaLabel" disabled="disabled" aria-label="${window.siyuan.languages.previousLabel}"><svg><use xlink:href='#iconLeft'></use></svg></span>
        <span class="fn__space"></span>
-        <span data-type="previous" class="block__icon block__icon--show b3-tooltips b3-tooltips__w" disabled="disabled" aria-label="${window.siyuan.languages.previousLabel}"><svg><use xlink:href='#iconLeft'></use></svg></span>
-        <span class="fn__space"></span>
-        <span data-type="next" class="block__icon block__icon--show b3-tooltips b3-tooltips__w" disabled="disabled" aria-label="${window.siyuan.languages.nextLabel}"><svg><use xlink:href='#iconRight'></use></svg></span>
+        <span data-type="next" data-position="north" class="block__icon block__icon--show ariaLabel" disabled="disabled" aria-label="${window.siyuan.languages.nextLabel}"><svg><use xlink:href='#iconRight'></use></svg></span>
        <span class="fn__space"></span>
        <span class="fn__flex-center ft__on-surface">${pageIndex}/${response.data.pageCount || 1}</span>
        <span class="fn__space"></span>
@ -41,7 +41,7 @@ export const viewCards = (app: App, deckID: string, title: string, deckType: "Tr
 </div>` : ""}
    </div>
    <div class="${isMobile() ? "fn__flex-column" : "fn__flex"} fn__flex-1" style="min-height: auto">
-        <ul class="fn__flex-1 b3-list b3-list--background" style="user-select: none">
+        <ul class="fn__flex-1 b3-list b3-list--background" style="user-select: none;padding: 8px 0">
            ${renderViewItem(response.data.blocks, title, deckType)}
        </ul>
        <div id="cardPreview" style="border-bottom-right-radius:var(--b3-border-radius-b);" class="fn__flex-1 fn__none"></div>
--- a/app/src/config/about.ts
+++ b/app/src/config/about.ts
@ -57,7 +57,7 @@ export const about = {
    <div class="fn__space"></div>
    <input class="b3-switch fn__flex-center" id="downloadInstallPkg" type="checkbox"${window.siyuan.config.system.downloadInstallPkg ? " checked" : ""}>
 </label>
-<div class="b3-label${isBrowser() ? " fn__none" : ""}">
+<div class="b3-label${(isBrowser() && !isInMobileApp() && !isIPad()) ? " fn__none" : ""}">
    <label class="fn__flex config__item">
        <div class="fn__flex-1">
            ${window.siyuan.languages.about11}
--- a/app/src/config/bazaar.ts
+++ b/app/src/config/bazaar.ts
@ -101,7 +101,7 @@ export const bazaar = {
            <input ${window.siyuan.config.bazaar.petalDisabled ? "" : " checked"} data-type="plugins-enable" type="checkbox" class="b3-switch fn__flex-center" style="margin-right: 8px">
            <div class="counter counter--bg fn__none fn__flex-center ariaLabel" data-position="north" aria-label="${window.siyuan.languages.total}"></div>
        </div>
-        <div id="configBazaarDownloaded" class="config-bazaar__content">
+        <div id="configBazaarDownloaded" class="config-bazaar__content b3-cards b3-cards--nowrap">
            ${loadingHTML}
        </div>
    </div>
@ -236,9 +236,9 @@ export const bazaar = {
        }
        try {
            new URL(funding);
-            return `<a target="_blank" href="${escapeAttr(funding)}" class="block__icon block__icon--show ariaLabel" data-position="north" aria-label="${window.siyuan.languages.sponsor} ${escapeAttr(funding)}"><svg class="ft__pink"><use xlink:href="#iconHeart"></use></svg></a>`;
+            return `<span class="fn__space--small"></span><a target="_blank" href="${escapeAttr(funding)}" class="block__icon block__icon--show ariaLabel" data-position="north" aria-label="${window.siyuan.languages.sponsor} ${escapeAttr(funding)}"><svg class="ft__pink"><use xlink:href="#iconHeart"></use></svg></a>`;
        } catch (e) {
-            return `<span data-type="copy-funding" data-funding="${escapeAttr(funding)}" class="block__icon block__icon--show ariaLabel" data-position="north" aria-label="${window.siyuan.languages.sponsor} ${escapeAttr(funding)}"><svg class="ft__pink"><use xlink:href="#iconHeart"></use></svg></span>`;
+            return `<span class="fn__space--small"></span><span data-type="copy-funding" data-funding="${escapeAttr(funding)}" class="block__icon block__icon--show ariaLabel" data-position="north" aria-label="${window.siyuan.languages.sponsor} ${escapeAttr(funding)}"><svg class="ft__pink"><use xlink:href="#iconHeart"></use></svg></span>`;
        }
    },
    _genCardHTML(item: IBazaarItem, bazaarType: TBazaarType) {
@ -266,35 +266,37 @@ export const bazaar = {
            downloads: item.downloads,
            downloaded: false,
        };
-        return `<div data-obj='${JSON.stringify(dataObj)}' class="b3-card b3-card--wrap${hide ? " fn__none" : ""}${item.current ? " b3-card--current" : ""}">
+        return `<div data-obj='${JSON.stringify(dataObj)}' class="b3-card${hide ? " fn__none" : ""}${item.current ? " b3-card--current" : ""}">
    <div class="b3-card__img">
        <img src="${item.iconURL}" loading="lazy" onerror="this.src='/stage/images/icon.png'"/>
    </div>
    <div class="fn__flex-1 fn__flex-column">
        <div class="b3-card__info fn__flex-1">
-            ${item.preferredName}${item.preferredName !== item.name ? ` <span class="ft__on-surface ft__smaller">${item.name}</span>` : ""}
+            ${item.preferredName}
            <div class="b3-card__desc" title="${escapeAttr(item.preferredDesc) || ""}">
                ${item.preferredDesc || ""}
            </div>
        </div>
        <div class="b3-card__actions">
-            <span class="block__icon block__icon--show ft__primary">
+            <span class="block__icon block__icon--show block__icon--text">
                <svg><use xlink:href="#iconDownload"></use></svg>
-                <span class="fn__space"></span>
+                <span class="fn__space--small"></span>
                ${item.downloads}
            </span>
-            <span class="fn__space"></span>
-            ${bazaar._genFundingHTML(item.preferredFunding)}
-            <span class="fn__space"></span>
-            <div class="fn__flex-1"></div>
-            <span data-position="north" class="ariaLabel block__icon block__icon--show${item.installed ? "" : " fn__none"}" data-type="uninstall" aria-label="${window.siyuan.languages.uninstall}">
-                <svg><use xlink:href="#iconTrashcan"></use></svg>
+            <span class="fn__space--small"></span>
+            <span class="block__icon block__icon--show block__icon--text">
+                <svg><use xlink:href="#iconAccount"></use></svg>
+                <span class="fn__space--small"></span>
+                ${item.author}
            </span>
-            <div class="fn__space${!item.current && item.installed && showSwitch ? "" : " fn__none"}"></div>
+            ${bazaar._genFundingHTML(item.preferredFunding)}
+            <span class="fn__space--small"></span>
+            <div class="fn__flex-1"></div>
+            <div class="fn__space--small${!item.current && item.installed && showSwitch ? "" : " fn__none"}"></div>
            <span data-position="north" class="ariaLabel block__icon block__icon--show${!item.current && item.installed && showSwitch ? "" : " fn__none"}" data-type="switch" aria-label="${window.siyuan.languages.use}">
                <svg><use xlink:href="#iconSelect"></use></svg>
            </span>
-            <div class="fn__space${item.outdated ? "" : " fn__none"}"></div>
+            <div class="fn__space--small${item.outdated ? "" : " fn__none"}"></div>
            <span data-type="install-t" ${item.disallowUpdate ? "disabled" : ""} aria-label="${item.disallowUpdate ? window.siyuan.languages.bazaarNeedVersion.replace("${x}", item.updateRequiredMinAppVer) : window.siyuan.languages.update}" data-position="north" class="ariaLabel block__icon block__icon--show${item.outdated ? "" : " fn__none"}">
                <svg class="ft__primary"><use xlink:href="#iconRefresh"></use></svg>
            </span>
@ -316,7 +318,7 @@ export const bazaar = {
    <div class="b3-card__img"><img src="${item.iconURL}" loading="lazy" onerror="this.src='/stage/images/icon.png'"/></div>
    <div class="fn__flex-1 fn__flex-column">
        <div class="b3-card__info b3-card__info--left fn__flex-1">
-            ${item.preferredName}${item.preferredName !== item.name ? ` <span class="ft__on-surface ft__smaller">${item.name}</span>` : ""}
+            ${item.preferredName}
            <div class="b3-card__desc" title="${escapeAttr(item.preferredDesc) || ""}">${item.preferredDesc || ""}</div>
        </div>
    </div>
@ -362,7 +364,7 @@ export const bazaar = {
    <span class="fn__space"></span>
    <div class="counter counter--bg fn__flex-center ariaLabel" data-position="north" aria-label="${window.siyuan.languages.total}">${allCount}</div>
 </div>
-<div class="config-bazaar__content">${html}</div>`;
+<div class="config-bazaar__content b3-cards b3-cards--nowrap">${html}</div>`;
        });
    },
    _genMyHTML(bazaarType: TBazaarType, app: App, updateUpdate = true) {
@ -425,7 +427,7 @@ export const bazaar = {
    <div class="b3-card__img"><img src="${item.iconURL}" loading="lazy" onerror="this.src='/stage/images/icon.png'"/></div>
    <div class="fn__flex-1 fn__flex-column">
        <div class="b3-card__info b3-card__info--left fn__flex-1">
-            ${item.preferredName}${item.preferredName !== item.name ? ` <span class="ft__on-surface ft__smaller">${item.name}</span>` : ""}
+            ${item.preferredName}
            <div class="b3-card__desc" title="${escapeAttr(item.preferredDesc) || ""}">${item.preferredDesc || ""}</div>
        </div>
    </div>
@ -467,7 +469,7 @@ type="checkbox">
            } else {
                checkElement.classList.add("fn__none");
            }
-            contentElement.innerHTML = html ? html : `<div class="fn__hr"></div><ul class="b3-list b3-list--background"><li class="b3-list--empty">${window.siyuan.languages.emptyContent}</li></ul>`;
+            contentElement.innerHTML = html ? html : `<ul class="b3-list b3-list--background"><li class="b3-list--empty">${window.siyuan.languages.emptyContent}</li></ul>`;
        });
    },
    _data: {
@ -527,7 +529,7 @@ type="checkbox">
        <span class="fn__flex-1"></span>
        ${data.preferredFunding ?
            bazaar._genFundingHTML(data.preferredFunding) :
-            `<span data-position="north" class="ariaLabel block__icon block__icon--show ft__primary" aria-label="${window.siyuan.languages.author}" style="cursor: default"><svg><use xlink:href="#iconAccount"></use></svg></span>`
+            '<span class="block__icon block__icon--show block__icon--text" style="cursor: default"><svg><use xlink:href="#iconAccount"></use></svg></span>'
        }
        <span class="fn__space"></span>
        <a href="${urls.join("/")}" target="_blank" title="Creator">${data.author}</a>
@ -593,9 +595,9 @@ type="checkbox">
        <img data-type="img-loading" style="height: 64px;width: 100%;padding: 16px 0;" src="/stage/loading-pure.svg">
    </div>
 </div>`;
-        if (downloaded && data.preferredReadme) {
+        if (downloaded) {
            const mdElement = readmeElement.querySelector(".item__readme");
-            mdElement.innerHTML = data.preferredReadme;
+            mdElement.innerHTML = data.preferredReadme || "";
            highlightRender(mdElement);
        } else {
            fetchPost("/api/bazaar/getBazaarPackageREADME", {
@ -711,7 +713,6 @@ type="checkbox">
                                        fetchPost("/api/petal/setPetalEnabled", {
                                            packageName: dataObj.name,
                                            enabled: true,
-                                            frontend: getFrontend(),
                                            app: Constants.SIYUAN_APPID,
                                        }, (response) => {
                                            loadPlugin(app, response.data);
@ -727,7 +728,7 @@ type="checkbox">
                    break;
                } else if (type === "install-all") {
                    confirmDialog("⬆️ " + window.siyuan.languages.updateAll, window.siyuan.languages.confirmUpdateAll, () => {
-                        fetchPost("/api/bazaar/batchUpdatePackage", {frontend: getFrontend()});
+                        fetchPost("/api/bazaar/batchUpdatePackage");
                    });
                    event.preventDefault();
                    event.stopPropagation();
@ -878,7 +879,6 @@ type="checkbox">
                        fetchPost("/api/petal/setPetalEnabled", {
                            packageName: dataObj.name,
                            enabled,
-                            frontend: getFrontend(),
                            app: Constants.SIYUAN_APPID,
                        }, (response) => {
                            target.removeAttribute("disabled");
@ -1076,9 +1076,6 @@ type="checkbox">
                    }
                    localSort[selectElement.parentElement.parentElement.getAttribute("data-type")] = selectElement.value;
                    setStorageVal(Constants.LOCAL_BAZAAR, window.siyuan.storage[Constants.LOCAL_BAZAAR]);
-                    if (cardElements.length > 1) {
-                        html += '<div class="fn__flex-1" style="margin-left: 15px;min-width: 342px;"></div><div class="fn__flex-1" style="margin-left: 15px;min-width: 342px;"></div>';
-                    }
                    panelElement.querySelector(".b3-cards").innerHTML = html;
                }
            });
@ -1140,9 +1137,6 @@ type="checkbox">
                html += item.outerHTML;
            });
        }
-        if (response.data.packages.length > 1) {
-            html += '<div class="fn__flex-1" style="margin-left: 15px;min-width: 342px;"></div><div class="fn__flex-1" style="margin-left: 15px;min-width: 342px;"></div>';
-        }
-        element.innerHTML = `<div class="b3-cards">${html}</div>`;
+        element.innerHTML = `<div class="b3-cards${html ? "" : " b3-cards--nowrap"}">${html || `<ul class="b3-list b3-list--background"><li class="b3-list--empty">${window.siyuan.languages.emptyContent}</li></ul>`}</div>`;
    }
 };
--- a/app/src/config/repos.ts
+++ b/app/src/config/repos.ts
@ -1,5 +1,5 @@
 import {isPaidUser, needSubscribe} from "../util/needSubscribe";
-import {fetchPost} from "../util/fetch";
+import {fetchPost, fetchSyncPost} from "../util/fetch";
 import {showMessage} from "../dialog/message";
 import {bindSyncCloudListEvent, getSyncCloudList} from "../sync/syncGuide";
 import {processSync} from "../dialog/processSystem";
@ -59,61 +59,61 @@ const renderProvider = (provider: number) => {
 <div class="b3-label b3-label--inner fn__flex">
    <div class="fn__flex-center fn__size200">Endpoint</div>
    <div class="fn__space"></div>
-    <input id="endpoint" class="b3-text-field fn__block" value="${window.siyuan.config.sync.s3.endpoint}">
+    <input id="endpoint" class="b3-text-field fn__block">
 </div>
 <div class="b3-label b3-label--inner fn__flex">
    <div class="fn__flex-center fn__size200">Access Key</div>
    <div class="fn__space"></div>
-    <input id="accessKey" class="b3-text-field fn__block" value="${window.siyuan.config.sync.s3.accessKey}">
+    <input id="accessKey" class="b3-text-field fn__block">
 </div>
 <div class="b3-label b3-label--inner fn__flex">
    <div class="fn__flex-center fn__size200">Secret Key</div>
    <div class="fn__space"></div>
    <div class="b3-form__icona fn__block">
-        <input id="secretKey" type="password" class="b3-text-field b3-form__icona-input" value="${window.siyuan.config.sync.s3.secretKey}">
+        <input id="secretKey" type="password" class="b3-text-field b3-form__icona-input">
        <svg class="b3-form__icona-icon" data-action="togglePassword"><use xlink:href="#iconEye"></use></svg>
    </div>
 </div>
 <div class="b3-label b3-label--inner fn__flex">
    <div class="fn__flex-center fn__size200">Bucket</div>
    <div class="fn__space"></div>
-    <input id="bucket" class="b3-text-field fn__block" value="${window.siyuan.config.sync.s3.bucket}">
+    <input id="bucket" class="b3-text-field fn__block">
 </div>
 <div class="b3-label b3-label--inner fn__flex">
    <div class="fn__flex-center fn__size200">Region ID</div>
    <div class="fn__space"></div>
-    <input id="region" class="b3-text-field fn__block" value="${window.siyuan.config.sync.s3.region}">
+    <input id="region" class="b3-text-field fn__block">
 </div>
 <div class="b3-label b3-label--inner fn__flex">
    <div class="fn__flex-center fn__size200">Timeout (s)</div>
    <div class="fn__space"></div>
-    <input id="timeout" class="b3-text-field fn__block" type="number" min="7" max="300" value="${window.siyuan.config.sync.s3.timeout}">
+    <input id="timeout" class="b3-text-field fn__block" type="number" min="7" max="300">
 </div>
 <div class="b3-label b3-label--inner fn__flex">
    <div class="fn__flex-center fn__size200">Addressing</div>
    <div class="fn__space"></div>
    <select class="b3-select fn__block" id="pathStyle">
-        <option ${window.siyuan.config.sync.s3.pathStyle ? "selected" : ""} value="true">Path-style</option>
-        <option ${window.siyuan.config.sync.s3.pathStyle ? "" : "selected"} value="false">Virtual-hosted-style</option>
+        <option value="true">Path-style</option>
+        <option value="false">Virtual-hosted-style</option>
    </select>
 </div>
 <div class="b3-label b3-label--inner fn__flex">
    <div class="fn__flex-center fn__size200">TLS Verify</div>
    <div class="fn__space"></div>
    <select class="b3-select fn__block" id="s3SkipTlsVerify">
-        <option ${window.siyuan.config.sync.s3.skipTlsVerify ? "" : "selected"} value="false">Verify</option>
-        <option ${window.siyuan.config.sync.s3.skipTlsVerify ? "selected" : ""} value="true">Skip</option>
+        <option value="false">Verify</option>
+        <option value="true">Skip</option>
    </select>
 </div>
 <div class="b3-label b3-label--inner fn__flex">
    <div class="fn__flex-center fn__size200">Concurrent Reqs</div>
    <div class="fn__space"></div>
-    <input id="s3ConcurrentReqs" class="b3-text-field fn__block" type="number" min="1" max="16" value="${window.siyuan.config.sync.s3.concurrentReqs}">
+    <input id="s3ConcurrentReqs" class="b3-text-field fn__block" type="number" min="1" max="16">
 </div>
 <div class="b3-label b3-label--inner fn__flex">
    <div class="fn__flex-1"></div>
    <button class="b3-button b3-button--outline fn__size200" data-action="purgeData">
-        <svg><use xlink:href="#iconTrashcan"></use></svg>${window.siyuan.languages.purge}
+        <svg><use xlink:href="#iconTrashcan"></use></svg>${window.siyuan.languages.cloudStoragePurge}
    </button>
    <div class="fn__space"></div>
    <button class="b3-button b3-button--outline fn__size200" style="position: relative">
@ -136,43 +136,43 @@ const renderProvider = (provider: number) => {
 <div class="b3-label b3-label--inner fn__flex">
    <div class="fn__flex-center fn__size200">Endpoint</div>
    <div class="fn__space"></div>
-    <input id="endpoint" class="b3-text-field fn__block" value="${window.siyuan.config.sync.webdav.endpoint}">
+    <input id="endpoint" class="b3-text-field fn__block">
 </div>
 <div class="b3-label b3-label--inner fn__flex">
    <div class="fn__flex-center fn__size200">Username</div>
    <div class="fn__space"></div>
-    <input id="username" class="b3-text-field fn__block" value="${window.siyuan.config.sync.webdav.username}">
+    <input id="username" class="b3-text-field fn__block">
 </div>
 <div class="b3-label b3-label--inner fn__flex">
    <div class="fn__flex-center fn__size200">Password</div>
    <div class="fn__space"></div>
    <div class="b3-form__icona fn__block">
-        <input id="password" type="password" class="b3-text-field b3-form__icona-input" value="${window.siyuan.config.sync.webdav.password}">
+        <input id="password" type="password" class="b3-text-field b3-form__icona-input">
        <svg class="b3-form__icona-icon" data-action="togglePassword"><use xlink:href="#iconEye"></use></svg>
    </div>
 </div>
 <div class="b3-label b3-label--inner fn__flex">
    <div class="fn__flex-center fn__size200">Timeout (s)</div>
    <div class="fn__space"></div>
-    <input id="timeout" class="b3-text-field fn__block" type="number" min="7" max="300" value="${window.siyuan.config.sync.webdav.timeout}">
+    <input id="timeout" class="b3-text-field fn__block" type="number" min="7" max="300">
 </div>
 <div class="b3-label b3-label--inner fn__flex">
    <div class="fn__flex-center fn__size200">TLS Verify</div>
    <div class="fn__space"></div>
    <select class="b3-select fn__block" id="webdavSkipTlsVerify">
-        <option ${window.siyuan.config.sync.webdav.skipTlsVerify ? "" : "selected"} value="false">Verify</option>
-        <option ${window.siyuan.config.sync.webdav.skipTlsVerify ? "selected" : ""} value="true">Skip</option>
+        <option value="false">Verify</option>
+        <option value="true">Skip</option>
    </select>
 </div>
 <div class="b3-label b3-label--inner fn__flex">
    <div class="fn__flex-center fn__size200">Concurrent Reqs</div>
    <div class="fn__space"></div>
-    <input id="webdavConcurrentReqs" class="b3-text-field fn__block" type="number" min="1" max="16" value="${window.siyuan.config.sync.webdav.concurrentReqs}">
+    <input id="webdavConcurrentReqs" class="b3-text-field fn__block" type="number" min="1" max="16">
 </div>
 <div class="b3-label b3-label--inner fn__flex">
    <div class="fn__flex-1"></div>
    <button class="b3-button b3-button--outline fn__size200" data-action="purgeData">
-        <svg><use xlink:href="#iconTrashcan"></use></svg>${window.siyuan.languages.purge}
+        <svg><use xlink:href="#iconTrashcan"></use></svg>${window.siyuan.languages.cloudStoragePurge}
    </button>
    <div class="fn__space"></div>
    <button class="b3-button b3-button--outline fn__size200" style="position: relative">
@ -197,22 +197,66 @@ const renderProvider = (provider: number) => {
 <div class="b3-label b3-label--inner fn__flex">
    <div class="fn__flex-center fn__size200">Endpoint</div>
    <div class="fn__space"></div>
-    <input id="endpoint" class="b3-text-field fn__block" value="${window.siyuan.config.sync.local.endpoint}">
+    <input id="endpoint" class="b3-text-field fn__block">
 </div>
 <div class="b3-label b3-label--inner fn__flex">
    <div class="fn__flex-center fn__size200">Timeout (s)</div>
    <div class="fn__space"></div>
-    <input id="timeout" class="b3-text-field fn__block" type="number" min="7" max="300" value="${window.siyuan.config.sync.local.timeout}">
+    <input id="timeout" class="b3-text-field fn__block" type="number" min="7" max="300">
 </div>
 <div class="b3-label b3-label--inner fn__flex">
    <div class="fn__flex-center fn__size200">Concurrent Reqs</div>
    <div class="fn__space"></div>
-    <input id="localConcurrentReqs" class="b3-text-field fn__block" type="number" min="1" max="1024" value="${window.siyuan.config.sync.local.concurrentReqs}">
+    <input id="localConcurrentReqs" class="b3-text-field fn__block" type="number" min="1" max="1024">
 </div>`;
    }
    return "";
 };

+const fillSyncProviderPanelValues = (panel: Element) => {
+    if (!isPaidUser()) {
+        return;
+    }
+    const provider = window.siyuan.config.sync.provider;
+    if (provider === 2) {
+        const s3 = window.siyuan.config.sync.s3;
+        (panel.querySelector("#endpoint") as HTMLInputElement).value = String(s3.endpoint);
+        (panel.querySelector("#accessKey") as HTMLInputElement).value = String(s3.accessKey);
+        (panel.querySelector("#secretKey") as HTMLInputElement).value = String(s3.secretKey);
+        (panel.querySelector("#bucket") as HTMLInputElement).value = String(s3.bucket);
+        (panel.querySelector("#region") as HTMLInputElement).value = String(s3.region);
+        (panel.querySelector("#timeout") as HTMLInputElement).value = String(s3.timeout);
+        (panel.querySelector("#pathStyle") as HTMLSelectElement).value = s3.pathStyle ? "true" : "false";
+        (panel.querySelector("#s3SkipTlsVerify") as HTMLSelectElement).value = s3.skipTlsVerify ? "true" : "false";
+        (panel.querySelector("#s3ConcurrentReqs") as HTMLInputElement).value = String(s3.concurrentReqs);
+    } else if (provider === 3) {
+        const webdav = window.siyuan.config.sync.webdav;
+        (panel.querySelector("#endpoint") as HTMLInputElement).value = String(webdav.endpoint);
+        (panel.querySelector("#username") as HTMLInputElement).value = String(webdav.username);
+        (panel.querySelector("#password") as HTMLInputElement).value = String(webdav.password);
+        (panel.querySelector("#timeout") as HTMLInputElement).value = String(webdav.timeout);
+        (panel.querySelector("#webdavSkipTlsVerify") as HTMLSelectElement).value = webdav.skipTlsVerify ? "true" : "false";
+        (panel.querySelector("#webdavConcurrentReqs") as HTMLInputElement).value = String(webdav.concurrentReqs);
+    } else if (provider === 4) {
+        const local = window.siyuan.config.sync.local;
+        (panel.querySelector("#endpoint") as HTMLInputElement).value = String(local.endpoint);
+        (panel.querySelector("#timeout") as HTMLInputElement).value = String(local.timeout);
+        (panel.querySelector("#localConcurrentReqs") as HTMLInputElement).value = String(local.concurrentReqs);
+    }
+};
+
+const getReposDataLoadingHTML = () => `<div class="fn__flex">
+    <div class="fn__flex-1">
+        ${window.siyuan.languages.cloudStorage}
+    </div>
+    <div class="fn__flex-1">
+        ${window.siyuan.languages.trafficStat}
+    </div>
+</div>
+<div style="min-height: 183px; display: flex; justify-content: center;" id="reposLoading">
+    <img src="/stage/loading-pure.svg">
+</div>`;
+
 const bindProviderEvent = () => {
    const importElement = repos.element.querySelector("#importData") as HTMLInputElement;
    if (importElement) {
@ -235,10 +279,8 @@ const bindProviderEvent = () => {
    }

    const reposDataElement = repos.element.querySelector("#reposData");
-    const loadingElement = repos.element.querySelector("#reposLoading");
    if (window.siyuan.config.sync.provider === 0) {
        if (needSubscribe("")) {
-            loadingElement.classList.add("fn__none");
            let nextElement = reposDataElement;
            while (nextElement) {
                nextElement.classList.add("fn__none");
@ -246,13 +288,13 @@ const bindProviderEvent = () => {
            }
            return;
        }
+        reposDataElement.innerHTML = getReposDataLoadingHTML();
        fetchPost("/api/cloud/getCloudSpace", {}, (response) => {
-            loadingElement.classList.add("fn__none");
            if (response.code === 1) {
                reposDataElement.innerHTML = response.msg;
                return;
-            } else {
-                reposDataElement.innerHTML = `<div class="fn__flex">
+            }
+            reposDataElement.innerHTML = `<div class="fn__flex">
    <div class="fn__flex-1">
        ${window.siyuan.languages.cloudStorage}
        <div class="fn__hr"></div>
@ -276,13 +318,11 @@ const bindProviderEvent = () => {
        </ul>
    </div>
 </div>`;
-            }
        });
        reposDataElement.classList.remove("fn__none");
        return;
    }

-    loadingElement.classList.add("fn__none");
    let nextElement = reposDataElement.nextElementSibling;
    while (nextElement) {
        if (isPaidUser()) {
@ -294,10 +334,12 @@ const bindProviderEvent = () => {
    }
    reposDataElement.classList.add("fn__none");
    const providerPanelElement = repos.element.querySelector("#syncProviderPanel");
+    fillSyncProviderPanelValues(providerPanelElement);
    providerPanelElement.querySelectorAll(".b3-text-field, .b3-select").forEach(item => {
        item.addEventListener("blur", () => {
            if (window.siyuan.config.sync.provider === 2) {
-                let timeout = parseInt((providerPanelElement.querySelector("#timeout") as HTMLInputElement).value, 10);
+                const s3TimeoutInput = providerPanelElement.querySelector("#timeout") as HTMLInputElement;
+                let timeout = parseInt(s3TimeoutInput.value, 10);
                if (7 > timeout) {
                    if (1 > timeout) {
                        timeout = 30;
@ -315,29 +357,32 @@ const bindProviderEvent = () => {
                if (16 < concurrentReqs) {
                    concurrentReqs = 16;
                }
-                (providerPanelElement.querySelector("#timeout") as HTMLInputElement).value = timeout.toString();
-                let endpoint = (providerPanelElement.querySelector("#endpoint") as HTMLInputElement).value;
-                endpoint = endpoint.trim().replace("http://http(s)://", "https://");
-                endpoint = endpoint.replace("http(s)://", "https://");
-                if (!endpoint.startsWith("http")) {
-                    endpoint = "http://" + endpoint;
-                }
+                s3TimeoutInput.value = timeout.toString();
                const s3 = {
-                    endpoint: endpoint,
+                    endpoint: (providerPanelElement.querySelector("#endpoint") as HTMLInputElement).value,
                    accessKey: (providerPanelElement.querySelector("#accessKey") as HTMLInputElement).value.trim(),
                    secretKey: (providerPanelElement.querySelector("#secretKey") as HTMLInputElement).value.trim(),
                    bucket: (providerPanelElement.querySelector("#bucket") as HTMLInputElement).value.trim(),
-                    pathStyle: (providerPanelElement.querySelector("#pathStyle") as HTMLInputElement).value === "true",
+                    pathStyle: (providerPanelElement.querySelector("#pathStyle") as HTMLSelectElement).value === "true",
                    region: (providerPanelElement.querySelector("#region") as HTMLInputElement).value.trim(),
-                    skipTlsVerify: (providerPanelElement.querySelector("#s3SkipTlsVerify") as HTMLInputElement).value === "true",
+                    skipTlsVerify: (providerPanelElement.querySelector("#s3SkipTlsVerify") as HTMLSelectElement).value === "true",
                    timeout: timeout,
                    concurrentReqs: concurrentReqs,
                };
-                fetchPost("/api/sync/setSyncProviderS3", {s3}, () => {
-                    window.siyuan.config.sync.s3 = s3;
-                });
+                // 使用 fetchSyncPost：内核返回 code < 0 时 fetchPost 不会调用回调，此处需始终回写界面与已保存配置一致
+                fetchSyncPost("/api/sync/setSyncProviderS3", {s3})
+                    .then((response) => {
+                        if (response.code === 0 && response.data?.s3) {
+                            window.siyuan.config.sync.s3 = response.data.s3;
+                        }
+                    })
+                    .finally(() => {
+                        fillSyncProviderPanelValues(providerPanelElement);
+                    })
+                    .catch(() => {});
            } else if (window.siyuan.config.sync.provider === 3) {
-                let timeout = parseInt((providerPanelElement.querySelector("#timeout") as HTMLInputElement).value, 10);
+                const webdavTimeoutInput = providerPanelElement.querySelector("#timeout") as HTMLInputElement;
+                let timeout = parseInt(webdavTimeoutInput.value, 10);
                if (7 > timeout) {
                    timeout = 7;
                }
@ -351,26 +396,28 @@ const bindProviderEvent = () => {
                if (16 < concurrentReqs) {
                    concurrentReqs = 16;
                }
-                (providerPanelElement.querySelector("#timeout") as HTMLInputElement).value = timeout.toString();
-                let endpoint = (providerPanelElement.querySelector("#endpoint") as HTMLInputElement).value;
-                endpoint = endpoint.trim().replace("http://http(s)://", "https://");
-                endpoint = endpoint.replace("http(s)://", "https://");
-                if (!endpoint.startsWith("http")) {
-                    endpoint = "http://" + endpoint;
-                }
+                webdavTimeoutInput.value = timeout.toString();
                const webdav = {
-                    endpoint: endpoint,
+                    endpoint: (providerPanelElement.querySelector("#endpoint") as HTMLInputElement).value,
                    username: (providerPanelElement.querySelector("#username") as HTMLInputElement).value.trim(),
                    password: (providerPanelElement.querySelector("#password") as HTMLInputElement).value.trim(),
-                    skipTlsVerify: (providerPanelElement.querySelector("#webdavSkipTlsVerify") as HTMLInputElement).value === "true",
+                    skipTlsVerify: (providerPanelElement.querySelector("#webdavSkipTlsVerify") as HTMLSelectElement).value === "true",
                    timeout: timeout,
                    concurrentReqs: concurrentReqs,
                };
-                fetchPost("/api/sync/setSyncProviderWebDAV", {webdav}, () => {
-                    window.siyuan.config.sync.webdav = webdav;
-                });
+                fetchSyncPost("/api/sync/setSyncProviderWebDAV", {webdav})
+                    .then((response) => {
+                        if (response.code === 0 && response.data?.webdav) {
+                            window.siyuan.config.sync.webdav = response.data.webdav;
+                        }
+                    })
+                    .finally(() => {
+                        fillSyncProviderPanelValues(providerPanelElement);
+                    })
+                    .catch(() => {});
            } else if (window.siyuan.config.sync.provider === 4) {
-                let timeout = parseInt((providerPanelElement.querySelector("#timeout") as HTMLInputElement).value, 10);
+                const localTimeoutInput = providerPanelElement.querySelector("#timeout") as HTMLInputElement;
+                let timeout = parseInt(localTimeoutInput.value, 10);
                if (7 > timeout) {
                    timeout = 7;
                }
@ -384,24 +431,22 @@ const bindProviderEvent = () => {
                if (1024 < concurrentReqs) {
                    concurrentReqs = 1024;
                }
-                (providerPanelElement.querySelector("#timeout") as HTMLInputElement).value = timeout.toString();
+                localTimeoutInput.value = timeout.toString();
                const local = {
                    endpoint: (providerPanelElement.querySelector("#endpoint") as HTMLInputElement).value,
                    timeout: timeout,
                    concurrentReqs: concurrentReqs,
                };
-                fetchPost("/api/sync/setSyncProviderLocal", {local}, (response) => {
-                    if (response.code === 0) {
-                        window.siyuan.config.sync.local = response.data.local;
-
-                        const endpoint = providerPanelElement.querySelector<HTMLInputElement>("#endpoint");
-                        if (endpoint) {
-                            endpoint.value = response.data.local.endpoint;
+                fetchSyncPost("/api/sync/setSyncProviderLocal", {local})
+                    .then((response) => {
+                        if (response.code === 0 && response.data?.local) {
+                            window.siyuan.config.sync.local = response.data.local;
                        }
-                    } else {
-                        window.siyuan.config.sync.local = local;
-                    }
-                });
+                    })
+                    .finally(() => {
+                        fillSyncProviderPanelValues(providerPanelElement);
+                    })
+                    .catch(() => {});
            }
        });
    });
@ -410,11 +455,7 @@ const bindProviderEvent = () => {
 export const repos = {
    element: undefined as Element,
    genHTML: () => {
-        return `<div>
-<div style="position: fixed;width: 800px;height: 434px;box-sizing: border-box;text-align: center;display: flex;align-items: center;justify-content: center;z-index: 1;" id="reposLoading">
-    <img src="/stage/loading-pure.svg">
-</div>
-<div class="fn__flex b3-label config__item">
+        return `<div><div class="fn__flex b3-label config__item">
    <div class="fn__flex-1">
        ${window.siyuan.languages.syncProvider}
        <div class="b3-label__text">${window.siyuan.languages.syncProviderTip}</div>
@ -431,14 +472,7 @@ export const repos = {
    ${renderProvider(window.siyuan.config.sync.provider)}
 </div>
 <div id="reposData" class="b3-label">
-    <div class="fn__flex">
-        <div class="fn__flex-1">
-            ${window.siyuan.languages.cloudStorage}
-        </div>
-        <div class="fn__flex-1">
-            ${window.siyuan.languages.trafficStat}
-        </div>
-    </div>
+    ${getReposDataLoadingHTML()}
 </div>
 <label class="fn__flex b3-label">
    <div class="fn__flex-1">
@ -504,8 +538,7 @@ export const repos = {
 <div class="b3-label fn__flex">
    <div class="fn__flex-center">${window.siyuan.languages.cloudBackup}</div>
    <div class="b3-list-item__meta fn__flex-center">${window.siyuan.languages.cloudBackupTip}</div>
-</div>
-</div>`;
+</div></div>`;
    },
    bindEvent: () => {
        bindProviderEvent();
@ -592,9 +625,6 @@ export const repos = {
                }
            });
        });
-        const loadingElement = repos.element.querySelector("#reposLoading") as HTMLElement;
-        loadingElement.style.width = repos.element.clientWidth + "px";
-        loadingElement.style.height = repos.element.clientHeight + "px";
        bindSyncCloudListEvent(syncConfigElement);
        repos.element.firstElementChild.addEventListener("click", (event) => {
            let target = event.target as HTMLElement;
--- a/app/src/constants.ts
+++ b/app/src/constants.ts
@ -6,8 +6,6 @@ declare const NODE_ENV: string;
 const _SIYUAN_VERSION = SIYUAN_VERSION;
 const _NODE_ENV = NODE_ENV;

-const altNumber = navigator.platform.toUpperCase().indexOf("MAC") > -1 ? "⌃" : "⌥";
-
 const getFunctionKey = () => {
    const fData: { [key: number]: string } = {};
    for (let i = 1; i <= 32; i++) {
@ -440,16 +438,16 @@ export abstract class Constants {
            stickSearch: {default: "⇧⌘F", custom: "⇧⌘F"},
            replace: {default: "⌘R", custom: "⌘R"},
            closeTab: {default: "⌘W", custom: "⌘W"},
-            fileTree: {default: altNumber + "1", custom: altNumber + "1"},
-            outline: {default: altNumber + "2", custom: altNumber + "2"},
-            bookmark: {default: altNumber + "3", custom: altNumber + "3"},
-            tag: {default: altNumber + "4", custom: altNumber + "4"},
-            dailyNote: {default: altNumber + "5", custom: altNumber + "5"},
-            inbox: {default: altNumber + "6", custom: altNumber + "6"},
-            backlinks: {default: altNumber + "7", custom: altNumber + "7"},
-            graphView: {default: altNumber + "8", custom: altNumber + "8"},
-            globalGraph: {default: altNumber + "9", custom: altNumber + "9"},
-            riffCard: {default: altNumber + "0", custom: altNumber + "0"},
+            fileTree: {default: "⌃1", custom: "⌃1"},
+            outline: {default: "⌃2", custom: "⌃2"},
+            bookmark: {default: "⌃3", custom: "⌃3"},
+            tag: {default: "⌃4", custom: "⌃4"},
+            dailyNote: {default: "⌃5", custom: "⌃5"},
+            inbox: {default: "⌃6", custom: "⌃6"},
+            backlinks: {default: "⌃7", custom: "⌃7"},
+            graphView: {default: "⌃8", custom: "⌃8"},
+            globalGraph: {default: "⌃9", custom: "⌃9"},
+            riffCard: {default: "⌃0", custom: "⌃0"},
            config: {default: "⌥P", custom: "⌥P"},
            dataHistory: {default: "⌥H", custom: "⌥H"},
            toggleWin: {default: "⌥M", custom: "⌥M"},
@ -505,7 +503,7 @@ export abstract class Constants {
                copyBlockEmbed: {default: "⇧⌘E", custom: "⇧⌘E"},
                copyHPath: {default: "⇧⌘P", custom: "⇧⌘P"},
                undo: {default: "⌘Z", custom: "⌘Z"},
-                redo: {default: "⌘Y", custom: "⌘Y"},
+                redo: {default: "⇧⌘Z", custom: "⇧⌘Z"},
                rename: {default: "F2", custom: "F2"},
                newNameFile: {default: "F3", custom: "F3"},
                newContentFile: {default: "F4", custom: "F4"},
--- a/app/src/dialog/index.ts
+++ b/app/src/dialog/index.ts
@ -14,6 +14,7 @@ export class Dialog {
    private disableClose: boolean;
    public editors: { [key: string]: Protyle };
    public data: any;
+    private resizeCallback: (type: string) => void;

    constructor(options: {
        positionId?: string,
@ -29,6 +30,7 @@ export class Dialog {
        resizeCallback?: (type: string) => void,
        containerClassName?: string
    }) {
+        this.resizeCallback = options.resizeCallback;
        this.disableClose = options.disableClose;
        this.id = genUUID();
        window.siyuan.dialogs.push(this);
@ -85,6 +87,15 @@ left:${left || "auto"};top:${top || "auto"}">
        /// #endif
    }

+    public resize() {
+        if (this.resizeCallback) {
+            const containerElement = this.element.querySelector(".b3-dialog__container") as HTMLElement;
+            if (containerElement && containerElement.style.maxWidth !== "none") {
+                this.resizeCallback("l");
+            }
+        }
+    }
+
    public destroy(options?: IObject) {
        this.element.classList.remove("b3-dialog--open");
        setTimeout(() => {
--- a/app/src/dialog/processSystem.ts
+++ b/app/src/dialog/processSystem.ts
@ -50,14 +50,15 @@ export const reloadSync = (
        hideMessage();
    }
    /// #if MOBILE
-    if (window.siyuan.mobile.popEditor) {
+    if (window.siyuan.mobile.popEditor && window.siyuan.mobile.popEditor.protyle) {
        if (data.removeRootIDs.includes(window.siyuan.mobile.popEditor.protyle.block.rootID)) {
            hideElements(["dialog"]);
        } else {
            reloadProtyle(window.siyuan.mobile.popEditor.protyle, false, updateReadonly);
        }
    }
-    if (window.siyuan.mobile.editor) {
+    if (document.getElementById("empty").classList.contains("fn__none") &&
+        window.siyuan.mobile.editor && window.siyuan.mobile.editor.protyle) {
        if (data.removeRootIDs.includes(window.siyuan.mobile.editor.protyle.block.rootID)) {
            setEmpty(app);
        } else {
@ -190,7 +191,7 @@ export const setDefRefCount = (data: {
        // 不能对比 rootId，否则嵌入块中的锚文本无法更新
        editor.protyle.wysiwyg.element.querySelectorAll(`[data-node-id="${data.blockID}"]`).forEach(item => {
            // 不能直接查询，否则列表中会获取到第一个列表项的 attr https://github.com/siyuan-note/siyuan/issues/12738
-            const countElement = item.lastElementChild.querySelector(".protyle-attr--refcount");
+            const countElement = item.lastElementChild?.querySelector(".protyle-attr--refcount");
            if (countElement) {
                if (data.refCount === 0) {
                    countElement.remove();
@ -378,14 +379,17 @@ export const exitSiYuan = async (setCurrentWorkspace = true) => {
    });
 };

-export const transactionError = () => {
+export const transactionError = (msg?: string) => {
    if (document.getElementById("transactionError")) {
        return;
    }
    const dialog = new Dialog({
        disableClose: true,
        title: `${window.siyuan.languages.stateExcepted} v${Constants.SIYUAN_VERSION}`,
-        content: `<div class="b3-dialog__content" id="transactionError">${window.siyuan.languages.rebuildIndexTip}</div>
+        content: `<div class="b3-dialog__content" style="max-height: calc(100vh - 182px)" id="transactionError">
+    ${window.siyuan.languages.rebuildIndexTip}
+    ${msg ? `<div class="fn__hr"></div>${escapeHtml(msg.trim())}` : ""}
+</div>
 <div class="b3-dialog__action">
    <button class="b3-button b3-button--text">${window.siyuan.languages._kernel[97]}</button>
    <div class="fn__space"></div>
--- a/app/src/editor/util.ts
+++ b/app/src/editor/util.ts
@ -5,9 +5,8 @@ import {getInstanceById, getWndByLayout, pdfIsLoading, setPanelFocus} from "../l
 import {getDockByType} from "../layout/tabUtil";
 import {getAllModels, getAllTabs} from "../layout/getAll";
 import {highlightById, scrollCenter} from "../util/highlightById";
-import {getDisplayName, useShell, pathPosix} from "../util/pathName";
+import {getDisplayName, pathPosix, useShell} from "../util/pathName";
 import {Constants} from "../constants";
-import {setEditMode} from "../protyle/util/setEditMode";
 import {Files} from "../layout/dock/Files";
 import {fetchPost, fetchSyncPost} from "../util/fetch";
 import {focusBlock, focusByOffset, focusByRange} from "../protyle/util/selection";
@ -361,7 +360,6 @@ const switchEditor = (editor: Editor, options: IOpenFileOptions, allModels: IMod
    editor.parent.parent.switchTab(editor.parent.headElement);
    editor.parent.parent.showHeading();
    if (options.mode !== "preview" && !editor.editor.protyle.preview.element.classList.contains("fn__none")) {
-        // TODO https://github.com/siyuan-note/siyuan/issues/3059
        return true;
    }
    if (options.zoomIn) {
@ -442,9 +440,6 @@ const switchEditor = (editor: Editor, options: IOpenFileOptions, allModels: IMod
    if (options.action?.includes(Constants.CB_GET_OUTLINE)) {
        hideElements(["select"], editor.editor.protyle);
    }
-    if (options.mode) {
-        setEditMode(editor.editor.protyle, options.mode);
-    }
 };

 const newTab = (options: IOpenFileOptions) => {
@ -633,6 +628,9 @@ export const updateOutline = (models: IModels, protyle: IProtyle, reload = false
            let blockId = "";
            if (protyle && protyle.block) {
                blockId = protyle.block.rootID;
+                if (!blockId && reload && item.type === "local") {
+                    blockId = item.blockId;
+                }
            }
            if (blockId === item.blockId && !reload && item.isPreview !== protyle.preview.element.classList.contains("fn__none")) {
                return;
--- a/app/src/index.ts
+++ b/app/src/index.ts
@ -40,7 +40,6 @@ import {ipcRenderer} from "electron";
 /// #endif
 import {getDockByType} from "./layout/tabUtil";
 import {Tag} from "./layout/dock/Tag";
-import {updateControlAlt} from "./protyle/util/hotKey";
 import {updateAppearance} from "./config/util/updateAppearance";
 import {renderSnippet} from "./config/util/snippets";

@ -121,7 +120,6 @@ export class App {
                                break;
                            case "setConf":
                                window.siyuan.config = data.data;
-                                updateControlAlt();
                                break;
                            case "setPublish":
                                window.siyuan.config.publish = data.data;
@ -188,7 +186,7 @@ export class App {
                                downloadProgress(data.data);
                                break;
                            case "txerr":
-                                transactionError();
+                                transactionError(data.msg);
                                break;
                            case "syncing":
                                processSync(data, this.plugins);
@ -220,7 +218,6 @@ export class App {
            addScriptSync(`${Constants.PROTYLE_CDN}/js/lute/lute.min.js?v=${Constants.SIYUAN_VERSION}`, "protyleLuteScript");
            addScript(`${Constants.PROTYLE_CDN}/js/protyle-html.js?v=${Constants.SIYUAN_VERSION}`, "protyleWcHtmlScript");
            window.siyuan.config = response.data.conf;
-            updateControlAlt();
            window.siyuan.isPublish = response.data.isPublish;
            await loadPlugins(this);
            getLocalStorage(() => {
--- a/app/src/layout/Model.ts
+++ b/app/src/layout/Model.ts
@ -55,7 +55,9 @@ export class Model {
            }
        };
        ws.onmessage = (event) => {
-            if (options.msgCallback) {
+            if (options.msgCallback &&
+                // 等待 config 加载完成才接受推送 https://github.com/siyuan-note/siyuan/issues/17508
+                window.siyuan.config) {
                const data = processMessage(JSON.parse(event.data));
                options.msgCallback.call(this, data);
            }
--- a/app/src/layout/Tab.ts
+++ b/app/src/layout/Tab.ts
@ -99,7 +99,9 @@ export class Tab {
                    tabElement.style.opacity = "0.38";
                    window.siyuan.dragElement = this.headElement;
                }
+                /// #if !BROWSER
                ipcRenderer.send(Constants.SIYUAN_SEND_WINDOWS, {cmd: "resetTabsStyle", data: "removeRegionStyle"});
+                /// #endif
            });
            this.headElement.addEventListener("dragend", (event: DragEvent & { target: HTMLElement }) => {
                const tabElement = hasClosestByTag(event.target, "LI");
--- a/app/src/layout/Wnd.ts
+++ b/app/src/layout/Wnd.ts
@ -9,7 +9,6 @@ import {
    pdfIsLoading,
    saveLayout,
    setPanelFocus,
-    switchWnd
 } from "./util";
 import {Tab} from "./Tab";
 import {Model} from "./Model";
@ -382,26 +381,16 @@ export class Wnd {
                // split
                if (dragElement.style.height === "50%") {
                    // split to bottom
-                    const newWnd = targetWnd.split("tb");
+                    const newWnd = targetWnd.split("tb", dragElement.style.bottom !== "50%");
                    newWnd.headersElement.append(oldTab.headElement);
                    newWnd.headersElement.parentElement.classList.remove("fn__none");
                    newWnd.moveTab(oldTab);
-
-                    if (dragElement.style.bottom === "50%" && newWnd.element.previousElementSibling && targetWnd.element.parentElement) {
-                        // 交换位置
-                        switchWnd(newWnd, targetWnd);
-                    }
                } else if (dragElement.style.width === "50%") {
                    // split to right
-                    const newWnd = targetWnd.split("lr");
+                    const newWnd = targetWnd.split("lr", dragElement.style.right !== "50%");
                    newWnd.headersElement.append(oldTab.headElement);
                    newWnd.headersElement.parentElement.classList.remove("fn__none");
                    newWnd.moveTab(oldTab);
-
-                    if (dragElement.style.right === "50%" && newWnd.element.previousElementSibling && targetWnd.element.parentElement) {
-                        // 交换位置
-                        switchWnd(newWnd, targetWnd);
-                    }
                }
                resizeTabs();
                /// #if !BROWSER
@ -990,7 +979,7 @@ export class Wnd {
        /// #endif
    }

-    public split(direction: Config.TUILayoutDirection) {
+    public split(direction: Config.TUILayoutDirection, after = true) {
        if (this.children.length === 1 && !this.children[0].headElement) {
            // 场景：没有打开的文档，点击标签面板打开
            return this;
@ -998,18 +987,19 @@ export class Wnd {
        recordBeforeResizeTop();
        const wnd = new Wnd(this.app, direction);
        if (direction === this.parent.direction) {
-            this.parent.addWnd(wnd, this.id);
+            this.parent.addWnd(wnd, this.id, after);
        } else if (this.parent.children.length === 1) {
            // layout 仅含一个时，只需更新 direction
            this.parent.direction = direction;
            if (direction === "tb") {
                this.parent.element.classList.add("fn__flex-column");
+                this.parent.element.style.minHeight = "8px";
                this.parent.element.classList.remove("fn__flex");
            } else {
                this.parent.element.classList.remove("fn__flex-column");
                this.parent.element.classList.add("fn__flex");
            }
-            this.parent.addWnd(wnd, this.id);
+            this.parent.addWnd(wnd, this.id, after);
        } else {
            this.parent.children.find((item, index) => {
                if (item.id === this.id) {
@ -1017,14 +1007,23 @@ export class Wnd {
                        resize: item.resize,
                        direction,
                    });
-                    this.parent.addLayout(layout, item.id);
-                    const movedWnd = this.parent.children.splice(index, 1)[0];
+                    this.parent.addLayout(layout, item.id, after);
+                    const movedWnd = this.parent.children.splice(after ? index : index + 1, 1)[0];
                    if (movedWnd.resize) {
-                        movedWnd.element.previousElementSibling.remove();
+                        if (movedWnd.element.previousElementSibling && movedWnd.element.previousElementSibling.classList.contains("layout__resize")) {
+                            movedWnd.element.previousElementSibling.remove();
+                        } else if (movedWnd.element.nextElementSibling && movedWnd.element.nextElementSibling.classList.contains("layout__resize")) {
+                            movedWnd.element.nextElementSibling.remove();
+                        }
                        movedWnd.resize = undefined;
                    }
-                    layout.addWnd.call(layout, movedWnd);
-                    layout.addWnd.call(layout, wnd);
+                    if (after) {
+                        layout.addWnd.call(layout, movedWnd);
+                        layout.addWnd.call(layout, wnd);
+                    } else {
+                        layout.addWnd.call(layout, wnd);
+                        layout.addWnd.call(layout, movedWnd);
+                    }

                    if (direction === "tb" && movedWnd.element.style.width) {
                        layout.element.style.width = movedWnd.element.style.width;
--- a/app/src/layout/dock/Backlink.ts
+++ b/app/src/layout/dock/Backlink.ts
@ -44,6 +44,7 @@ export class Backlink extends Model {
        super({
            app: options.app,
            id: options.tab.id,
+            type: "backlink",
            callback() {
                if (this.type === "local") {
                    fetchPost("/api/block/checkBlockExist", {id: this.blockId}, existResponse => {
@ -84,36 +85,34 @@ export class Backlink extends Model {
        const backlinkSort = window.siyuan.config.editor.backlinkSort;
        const backmentionSort = window.siyuan.config.editor.backmentionSort;
        this.element.innerHTML = `<div class="block__icons">
-    <div class="block__logo">
+    <div class="block__logo fn__flex-1">
        <svg class="block__logoicon"><use xlink:href="#iconLink"></use></svg>${window.siyuan.languages.backlinks}
    </div>
    <span class="counter listCount" style="margin-left: 0"></span>
-    <span class="fn__flex-1"></span>
    <span class="fn__space"></span>
    <input class="b3-text-field search__label fn__none fn__size200" placeholder="${window.siyuan.languages.filterKeywordEnter}" />
-    <span data-type="search" class="block__icon b3-tooltips b3-tooltips__sw" aria-label="${window.siyuan.languages.filter}"><svg><use xlink:href='#iconFilter'></use></svg></span>
+    <span data-type="search" class="block__icon ariaLabel" data-position="north" aria-label="${window.siyuan.languages.filter}"><svg><use xlink:href='#iconFilter'></use></svg></span>
    <span class="fn__space"></span>
-    <span data-type="refresh" class="block__icon b3-tooltips b3-tooltips__sw" aria-label="${window.siyuan.languages.refresh}"><svg><use xlink:href='#iconRefresh'></use></svg></span>
+    <span data-type="refresh" class="block__icon ariaLabel" data-position="north" aria-label="${window.siyuan.languages.refresh}"><svg><use xlink:href='#iconRefresh'></use></svg></span>
    <span class="fn__space"></span>
-    <span data-type="sort" data-sort="${backlinkSort}" class="block__icon b3-tooltips b3-tooltips__sw" aria-label="${window.siyuan.languages.sort}"><svg><use xlink:href='#iconSort'></use></svg></span>
+    <span data-type="sort" data-sort="${backlinkSort}" class="block__icon ariaLabel" data-position="north" aria-label="${window.siyuan.languages.sort}"><svg><use xlink:href='#iconSort'></use></svg></span>
    <span class="fn__space"></span>
-    <span data-type="expand" class="block__icon b3-tooltips b3-tooltips__sw" aria-label="${window.siyuan.languages.expand}${updateHotkeyAfterTip(window.siyuan.config.keymap.editor.general.expand.custom)}">
+    <span data-type="expand" class="block__icon ariaLabel" data-position="north" aria-label="${window.siyuan.languages.expand}${updateHotkeyAfterTip(window.siyuan.config.keymap.editor.general.expand.custom)}">
        <svg><use xlink:href="#iconExpand"></use></svg>
    </span>
    <span class="fn__space"></span>
-    <span data-type="collapse" class="block__icon b3-tooltips b3-tooltips__sw" aria-label="${window.siyuan.languages.collapse}${updateHotkeyAfterTip(window.siyuan.config.keymap.editor.general.collapse.custom)}">
+    <span data-type="collapse" class="block__icon ariaLabel" data-position="north" aria-label="${window.siyuan.languages.collapse}${updateHotkeyAfterTip(window.siyuan.config.keymap.editor.general.collapse.custom)}">
        <svg><use xlink:href="#iconContract"></use></svg>
    </span>
    <span class="${this.type === "local" ? "fn__none " : ""}fn__space"></span>
-    <span data-type="min" class="${this.type === "local" ? "fn__none " : ""}block__icon b3-tooltips b3-tooltips__sw" aria-label="${window.siyuan.languages.min}${updateHotkeyAfterTip(window.siyuan.config.keymap.general.closeTab.custom)}"><svg><use xlink:href='#iconMin'></use></svg></span>
+    <span data-type="min" class="${this.type === "local" ? "fn__none " : ""}block__icon ariaLabel" data-position="north" aria-label="${window.siyuan.languages.min}${updateHotkeyAfterTip(window.siyuan.config.keymap.general.closeTab.custom)}"><svg><use xlink:href='#iconMin'></use></svg></span>
 </div>
 <div class="backlinkList fn__flex-1"></div>
 <div class="block__icons">
-    <div class="block__logo fn__pointer" data-type="mention">
+    <div class="block__logo fn__flex-1 fn__pointer" data-type="mention">
        <svg class="block__logoicon"><use xlink:href="#iconLink"></use></svg>${window.siyuan.languages.mentions}
    </div>
    <span class="counter listMCount" style="margin-left: 0;"></span>
-    <span class="fn__flex-1"></span>
    <span class="fn__space"></span>
    <input class="b3-text-field search__label fn__none fn__size200" placeholder="${window.siyuan.languages.filterKeywordEnter}" />
    <span data-type="search" class="block__icon b3-tooltips b3-tooltips__nw" aria-label="${window.siyuan.languages.filter}"><svg><use xlink:href='#iconFilter'></use></svg></span>
--- a/app/src/layout/dock/Bookmark.ts
+++ b/app/src/layout/dock/Bookmark.ts
@ -21,6 +21,7 @@ export class Bookmark extends Model {
        super({
            app,
            id: tab.id,
+            type: "bookmark",
            msgCallback(data) {
                if (data) {
                    switch (data.cmd) {
@ -52,22 +53,20 @@ export class Bookmark extends Model {
        this.element = tab.panelElement;
        this.element.classList.add("fn__flex-column", "file-tree", "sy__bookmark", "dockPanel");
        this.element.innerHTML = `<div class="block__icons">
-    <div class="block__logo">
+    <div class="block__logo fn__flex-1">
        <svg class="block__logoicon"><use xlink:href="#iconBookmark"></use></svg>${window.siyuan.languages.bookmark}
    </div>
-    <span class="fn__flex-1"></span>
+    <span data-type="refresh" class="block__icon ariaLabel" data-position="north" aria-label="${window.siyuan.languages.refresh}"><svg><use xlink:href='#iconRefresh'></use></svg></span>
    <span class="fn__space"></span>
-    <span data-type="refresh" class="block__icon b3-tooltips b3-tooltips__sw" aria-label="${window.siyuan.languages.refresh}"><svg><use xlink:href='#iconRefresh'></use></svg></span>
-    <span class="fn__space"></span>
-    <span data-type="expand" class="block__icon b3-tooltips b3-tooltips__sw" aria-label="${window.siyuan.languages.expand}${updateHotkeyAfterTip(window.siyuan.config.keymap.editor.general.expand.custom)}">
+    <span data-type="expand" class="block__icon ariaLabel" data-position="north" aria-label="${window.siyuan.languages.expand}${updateHotkeyAfterTip(window.siyuan.config.keymap.editor.general.expand.custom)}">
        <svg><use xlink:href="#iconExpand"></use></svg>
    </span>
    <span class="fn__space"></span>
-    <span data-type="collapse" class="block__icon b3-tooltips b3-tooltips__sw" aria-label="${window.siyuan.languages.collapse}${updateHotkeyAfterTip(window.siyuan.config.keymap.editor.general.collapse.custom)}">
+    <span data-type="collapse" class="block__icon ariaLabel" data-position="north" aria-label="${window.siyuan.languages.collapse}${updateHotkeyAfterTip(window.siyuan.config.keymap.editor.general.collapse.custom)}">
        <svg><use xlink:href="#iconContract"></use></svg>
    </span>
    <span class="fn__space"></span>
-    <span data-type="min" class="block__icon b3-tooltips b3-tooltips__sw" aria-label="${window.siyuan.languages.min}${updateHotkeyAfterTip(window.siyuan.config.keymap.general.closeTab.custom)}"><svg><use xlink:href='#iconMin'></use></svg></span>
+    <span data-type="min" class="block__icon ariaLabel" data-position="north" aria-label="${window.siyuan.languages.min}${updateHotkeyAfterTip(window.siyuan.config.keymap.general.closeTab.custom)}"><svg><use xlink:href='#iconMin'></use></svg></span>
 </div>
 <div class="fn__flex-1" style="margin-bottom: 8px"></div>`;
        this.tree = new Tree({
--- a/app/src/layout/dock/Files.ts
+++ b/app/src/layout/dock/Files.ts
@ -118,21 +118,20 @@ export class Files extends Model {
        });
        options.tab.panelElement.classList.add("fn__flex-column", "file-tree", "sy__file", "dockPanel");
        options.tab.panelElement.innerHTML = `<div class="block__icons">
-    <div class="block__logo">
+    <div class="block__logo fn__flex-1">
        <svg class="block__logoicon"><use xlink:href="#iconFiles"></use></svg>${window.siyuan.languages.fileTree}
    </div>
-    <span class="fn__flex-1 fn__space"></span>
-    <span data-type="focus" class="block__icon b3-tooltips b3-tooltips__sw" aria-label="${window.siyuan.languages.selectOpen1}${updateHotkeyAfterTip(window.siyuan.config.keymap.general.selectOpen1.custom)}"><svg><use xlink:href='#iconFocus'></use></svg></span>
+    <span data-type="focus" class="block__icon ariaLabel" data-position="north" aria-label="${window.siyuan.languages.selectOpen1}${updateHotkeyAfterTip(window.siyuan.config.keymap.general.selectOpen1.custom)}"><svg><use xlink:href='#iconFocus'></use></svg></span>
    <span class="fn__space"></span>
-    <span data-type="collapse" class="block__icon b3-tooltips b3-tooltips__sw" aria-label="${window.siyuan.languages.collapse}${updateHotkeyAfterTip(window.siyuan.config.keymap.editor.general.collapse.custom)}">
+    <span data-type="collapse" class="block__icon ariaLabel" data-position="north" aria-label="${window.siyuan.languages.collapse}${updateHotkeyAfterTip(window.siyuan.config.keymap.editor.general.collapse.custom)}">
        <svg><use xlink:href="#iconContract"></use></svg>
    </span>
    <div class="fn__space${window.siyuan.config.readonly ? " fn__none" : ""}"></div>
-    <div data-type="more" class="b3-tooltips b3-tooltips__sw block__icon${window.siyuan.config.readonly ? " fn__none" : ""}" aria-label="${window.siyuan.languages.more}">
+    <div data-type="more" class="ariaLabel block__icon${window.siyuan.config.readonly ? " fn__none" : ""}" data-position="north" aria-label="${window.siyuan.languages.more}">
        <svg><use xlink:href="#iconMore"></use></svg>
    </div> 
    <span class="fn__space"></span>
-    <span data-type="min" class="block__icon b3-tooltips b3-tooltips__sw" aria-label="${window.siyuan.languages.min}${updateHotkeyAfterTip(window.siyuan.config.keymap.general.closeTab.custom)}"><svg><use xlink:href='#iconMin'></use></svg></span>
+    <span data-type="min" class="block__icon ariaLabel" data-position="north" aria-label="${window.siyuan.languages.min}${updateHotkeyAfterTip(window.siyuan.config.keymap.general.closeTab.custom)}"><svg><use xlink:href='#iconMin'></use></svg></span>
 </div>
 <div class="fn__flex-1" style="padding-top: 2px;"></div>
 <ul class="b3-list fn__flex-column" style="min-height: auto;height:30px;transition: height  .2s cubic-bezier(0, 0, .2, 1) 0ms">
@ -1063,7 +1062,7 @@ data-type="navigation-root" data-path="/">
        if (!fileItemElement) {
            return;
        }
-        fileItemElement.setAttribute("data-name", Lute.EscapeHTMLStr(data.title));
+        fileItemElement.setAttribute("data-name", data.title);
        fileItemElement.querySelector(".b3-list-item__text").innerHTML = escapeHtml(data.title);
    }

@ -1358,7 +1357,7 @@ class="b3-list-item b3-list-item--hide-action" data-path="${item.path}">
    <span class="b3-list-item__icon b3-tooltips b3-tooltips__n popover__block${editingPublishAccess ? " fn__none" : ""}" data-id="${item.id}" aria-label="${window.siyuan.languages.changeIcon}">${unicode2Emoji(item.icon || (item.subFileCount === 0 ? window.siyuan.storage[Constants.LOCAL_IMAGES].file : window.siyuan.storage[Constants.LOCAL_IMAGES].folder))}</span>
    <span class="b3-list-item__switch b3-tooltips b3-tooltips__n${editingPublishAccess ? "" : " fn__none"}" aria-label="${window.siyuan.languages.publishAccess}">${getPublishAccessOptionByLevel("public").iconHTML}</span>
    <span class="b3-list-item__text ariaLabel" data-position="parentE"
-aria-label="${ariaLabel}">${getDisplayName(item.name, true, true)}</span>
+aria-label="${ariaLabel}">${getDisplayName(Lute.EscapeHTMLStr(item.name), true, true)}</span>
    <span data-type="more-file" class="b3-list-item__action b3-tooltips b3-tooltips__nw" aria-label="${window.siyuan.languages.more}">
        <svg><use xlink:href="#iconMore"></use></svg>
    </span>
--- a/app/src/layout/dock/Graph.ts
+++ b/app/src/layout/dock/Graph.ts
@ -41,6 +41,7 @@ export class Graph extends Model {
        super({
            app: options.app,
            id: options.tab.id,
+            type: "graph",
            callback() {
                if (this.type === "local") {
                    fetchPost("/api/block/checkBlockExist", {id: this.blockId}, existResponse => {
@ -265,25 +266,23 @@ export class Graph extends Model {
 <button class="b3-button b3-button--small fn__block">${window.siyuan.languages.reset}</button>`;
        }
        this.element.innerHTML = `<div class="block__icons"> 
-    <div class="block__logo">
+    <div class="block__logo fn__flex-1">
        <svg class="block__logoicon"><use xlink:href="#icon${this.type === "global" ? "GlobalGraph" : "Graph"}"></use></svg>${this.type === "global" ? window.siyuan.languages.globalGraph : window.siyuan.languages.graphView}
    </div>
-    <span class="fn__flex-1"></span>
-    <span class="fn__space"></span>
    <input class="b3-text-field search__label fn__size200 fn__none" placeholder="${window.siyuan.languages.search}" />
-    <span data-type="search" class="block__icon b3-tooltips b3-tooltips__sw" aria-label="${window.siyuan.languages.search}"><svg><use xlink:href='#iconFilter'></use></svg></span>
+    <span data-type="search" class="block__icon ariaLabel" data-position="north" aria-label="${window.siyuan.languages.search}"><svg><use xlink:href='#iconFilter'></use></svg></span>
    <span class="fn__space"></span>
-    <span data-type="refresh" class="block__icon b3-tooltips b3-tooltips__sw" aria-label="${window.siyuan.languages.refresh}"><svg><use xlink:href='#iconRefresh'></use></svg></span>
+    <span data-type="refresh" class="block__icon ariaLabel" data-position="north" aria-label="${window.siyuan.languages.refresh}"><svg><use xlink:href='#iconRefresh'></use></svg></span>
    <div class="fn__space"></div>
-    <div data-type="fullscreen" class="b3-tooltips b3-tooltips__sw block__icon" aria-label="${window.siyuan.languages.fullscreen}">
+    <div data-type="fullscreen" class="ariaLabel block__icon" data-position="north" aria-label="${window.siyuan.languages.fullscreen}">
        <svg><use xlink:href="#iconFullscreen"></use></svg>
    </div>
    <div class="fn__space"></div>
-    <div data-type="menu" class="b3-tooltips b3-tooltips__sw block__icon" aria-label="${window.siyuan.languages.more}">
+    <div data-type="menu" class="ariaLabel block__icon" data-position="north" aria-label="${window.siyuan.languages.more}">
        <svg><use xlink:href="#iconMore"></use></svg>
    </div> 
    <span class="${this.type === "local" ? "fn__none " : ""}fn__space"></span>
-    <span data-type="min"  class="${this.type === "local" ? "fn__none " : ""}block__icon b3-tooltips b3-tooltips__sw" aria-label="${window.siyuan.languages.min}${updateHotkeyAfterTip(window.siyuan.config.keymap.general.closeTab.custom)}"><svg><use xlink:href='#iconMin'></use></svg></span>
+    <span data-type="min"  class="${this.type === "local" ? "fn__none " : ""}block__icon ariaLabel" data-position="north" aria-label="${window.siyuan.languages.min}${updateHotkeyAfterTip(window.siyuan.config.keymap.general.closeTab.custom)}"><svg><use xlink:href='#iconMin'></use></svg></span>
 </div>
 <div class="graph__panel">
    ${panelHTML}
@ -316,11 +315,11 @@ export class Graph extends Model {
                    if (dataType === "min") {
                        getDockByType(this.type === "global" ? "globalGraph" : "graph").toggleModel(this.type === "global" ? "globalGraph" : "graph", false, true);
                    } else if (dataType === "menu") {
-                        if (target.classList.contains("ft__primary")) {
-                            target.classList.remove("ft__primary");
+                        if (target.classList.contains("block__icon--active")) {
+                            target.classList.remove("block__icon--active");
                            this.panelElement.style.right = "";
                        } else {
-                            target.classList.add("ft__primary");
+                            target.classList.add("block__icon--active");
                            this.panelElement.style.right = "0";
                        }
                    } else if (dataType === "search") {
@ -341,8 +340,8 @@ export class Graph extends Model {
                    }
                    break;
                } else if (target.classList.contains("graph__svg")) {
-                    this.element.querySelectorAll(".block__icon.ft__primary").forEach(item => {
-                        item.classList.remove("ft__primary");
+                    this.element.querySelectorAll(".block__icon.block__icon--active").forEach(item => {
+                        item.classList.remove("block__icon--active");
                    });
                    this.panelElement.style.right = "";
                    break;
--- a/app/src/layout/dock/Inbox.ts
+++ b/app/src/layout/dock/Inbox.ts
@ -54,21 +54,19 @@ export class Inbox extends Model {
        /// #else
        this.element.classList.add("fn__flex-column", "file-tree", "sy__inbox", "dockPanel");
        this.element.innerHTML = `<div class="block__icons">
-    <div class="block__logo">
+    <div class="block__logo fn__flex-1">
        <svg class="block__logoicon"><use xlink:href="#iconInbox"></use></svg>${window.siyuan.languages.inbox}&nbsp;
        <span class="inboxSelectCount"></span>
    </div>
-    <span class="fn__flex-1"></span>
-    <span class="fn__space"></span>
    <span data-type="selectall" class="block__icon"><svg><use xlink:href="#iconUncheck"></use></svg></span>
    <span class="fn__space"></span>
-    <span data-type="previous" class="block__icon b3-tooltips b3-tooltips__w" disabled="disabled" aria-label="${window.siyuan.languages.previousLabel}"><svg><use xlink:href="#iconLeft"></use></svg></span>
+    <span data-type="previous" class="block__icon ariaLabel" disabled="disabled" data-position="north" aria-label="${window.siyuan.languages.previousLabel}"><svg><use xlink:href="#iconLeft"></use></svg></span>
    <span class="fn__space"></span>
-    <span data-type="next" class="block__icon b3-tooltips b3-tooltips__w" disabled="disabled" aria-label="${window.siyuan.languages.nextLabel}"><svg><use xlink:href="#iconRight"></use></svg></span>
+    <span data-type="next" class="block__icon ariaLabel" disabled="disabled" data-position="north" aria-label="${window.siyuan.languages.nextLabel}"><svg><use xlink:href="#iconRight"></use></svg></span>
    <span class="fn__space"></span>
-    <span data-type="more" data-menu="true" class="block__icon b3-tooltips b3-tooltips__w" aria-label="${window.siyuan.languages.more}"><svg><use xlink:href="#iconMore"></use></svg></span>
+    <span data-type="more" data-menu="true" class="block__icon ariaLabel" data-position="north" aria-label="${window.siyuan.languages.more}"><svg><use xlink:href="#iconMore"></use></svg></span>
    <span class="fn__space"></span>
-    <span data-type="min" class="block__icon b3-tooltips b3-tooltips__w" aria-label="${window.siyuan.languages.min}${updateHotkeyAfterTip(window.siyuan.config.keymap.general.closeTab.custom)}"><svg><use xlink:href="#iconMin"></use></svg></span>
+    <span data-type="min" class="block__icon ariaLabel" data-position="north" aria-label="${window.siyuan.languages.min}${updateHotkeyAfterTip(window.siyuan.config.keymap.general.closeTab.custom)}"><svg><use xlink:href="#iconMin"></use></svg></span>
 </div>
 <div class="fn__loading fn__none">
    <img width="64px" src="/stage/loading-pure.svg"></div>
@ -203,7 +201,7 @@ ${data.shorthandContent}
 </div>`;
        /// #else
        if (data.shorthandURL) {
-            linkHTML = `<span class="fn__space"></span><a href="${data.shorthandURL}" target="_blank" class="block__icon block__icon--show b3-tooltips b3-tooltips__w" aria-label="${window.siyuan.languages.link}">
+            linkHTML = `<span class="fn__space"></span><a href="${data.shorthandURL}" target="_blank" class="block__icon block__icon--show ariaLabel" data-position="north" aria-label="${window.siyuan.languages.link}">
        <svg><use xlink:href="#iconLink"></use></svg>
    </a>`;
        }
--- a/app/src/layout/dock/Outline.ts
+++ b/app/src/layout/dock/Outline.ts
@ -48,6 +48,7 @@ export class Outline extends Model {
        super({
            app: options.app,
            id: options.tab.id,
+            type: "outline",
            callback() {
                if (this.type === "local") {
                    fetchPost("/api/block/checkBlockExist", {id: this.blockId}, existResponse => {
@ -97,32 +98,31 @@ export class Outline extends Model {
        this.type = options.type;
        options.tab.panelElement.classList.add("fn__flex-column", "file-tree", "sy__outline", "dockPanel");
        options.tab.panelElement.innerHTML = `<div class="block__icons fn__hidescrollbar">
-    <div class="block__logo">
+    <div class="block__logo fn__flex-1">
        <svg class="block__logoicon"><use xlink:href="#iconAlignCenter"></use></svg>${window.siyuan.languages.outline}
    </div>
-    <span class="fn__flex-1 fn__space"></span>
    <input class="b3-text-field search__label fn__none fn__size200" placeholder="${window.siyuan.languages.filterKeywordEnter}" />
-    <span data-type="search" class="block__icon ariaLabel" aria-label="${window.siyuan.languages.filter}">
+    <span data-type="search" class="block__icon ariaLabel" data-position="north" aria-label="${window.siyuan.languages.filter}">
        <svg><use xlink:href='#iconFilter'></use></svg>
    </span>
    <span class="fn__space"></span>
-    <span data-type="keepCurrentExpand" class="block__icon ariaLabel${window.siyuan.storage[Constants.LOCAL_OUTLINE].keepCurrentExpand ? " block__icon--active" : ""}" aria-label="${window.siyuan.languages.outlineKeepCurrentExpand}">
+    <span data-type="keepCurrentExpand" class="block__icon ariaLabel${window.siyuan.storage[Constants.LOCAL_OUTLINE].keepCurrentExpand ? " block__icon--active" : ""}" data-position="north" aria-label="${window.siyuan.languages.outlineKeepCurrentExpand}">
        <svg><use xlink:href="#iconFocus"></use></svg>
    </span>
    <span class="fn__space"></span>
-    <span data-type="expandLevel" class="block__icon ariaLabel" aria-label="${window.siyuan.languages.expandLevel}">
+    <span data-type="expandLevel" class="block__icon ariaLabel" data-position="north" aria-label="${window.siyuan.languages.expandLevel}">
        <svg><use xlink:href="#iconList"></use></svg>
    </span>
    <span class="fn__space"></span>
-    <span data-type="expand" class="block__icon ariaLabel" aria-label="${window.siyuan.languages.expandAll}${updateHotkeyAfterTip(window.siyuan.config.keymap.editor.general.expand.custom)}">
+    <span data-type="expand" class="block__icon ariaLabel" data-position="north" aria-label="${window.siyuan.languages.expandAll}${updateHotkeyAfterTip(window.siyuan.config.keymap.editor.general.expand.custom)}">
        <svg><use xlink:href="#iconExpand"></use></svg>
    </span>
    <span class="fn__space"></span>
-    <span data-type="collapse" class="block__icon ariaLabel" aria-label="${window.siyuan.languages.foldAll}${updateHotkeyAfterTip(window.siyuan.config.keymap.editor.general.collapse.custom)}">
+    <span data-type="collapse" class="block__icon ariaLabel" data-position="north" aria-label="${window.siyuan.languages.foldAll}${updateHotkeyAfterTip(window.siyuan.config.keymap.editor.general.collapse.custom)}">
        <svg><use xlink:href="#iconContract"></use></svg>
    </span>
    <span class="${this.type === "local" ? "fn__none " : ""}fn__space"></span>
-    <span data-type="min" class="${this.type === "local" ? "fn__none " : ""}block__icon ariaLabel" aria-label="${window.siyuan.languages.min}${updateHotkeyAfterTip(window.siyuan.config.keymap.general.closeTab.custom)}">
+    <span data-type="min" class="${this.type === "local" ? "fn__none " : ""}block__icon ariaLabel" data-position="north" aria-label="${window.siyuan.languages.min}${updateHotkeyAfterTip(window.siyuan.config.keymap.general.closeTab.custom)}">
        <svg><use xlink:href='#iconMin'></use></svg>
    </span>
 </div>
--- a/app/src/layout/dock/Tag.ts
+++ b/app/src/layout/dock/Tag.ts
@ -21,6 +21,7 @@ export class Tag extends Model {
        super({
            app,
            id: tab.id,
+            type: "tag",
            msgCallback(data) {
                if (data) {
                    switch (data.cmd) {
@ -54,26 +55,24 @@ export class Tag extends Model {
        this.element.classList.add("fn__flex-column", "file-tree", "sy__tag", "dockPanel");

        this.element.innerHTML = `<div class="block__icons">
-    <div class="block__logo">
+    <div class="block__logo fn__flex-1">
        <svg class="block__logoicon"><use xlink:href="#iconTags"></use></svg>${window.siyuan.languages.tag}
    </div>
-    <span class="fn__flex-1"></span>
+    <span data-type="refresh" class="block__icon ariaLabel" data-position="north" aria-label="${window.siyuan.languages.refresh}"><svg><use xlink:href='#iconRefresh'></use></svg></span>
    <span class="fn__space"></span>
-    <span data-type="refresh" class="block__icon b3-tooltips b3-tooltips__sw" aria-label="${window.siyuan.languages.refresh}"><svg><use xlink:href='#iconRefresh'></use></svg></span>
-    <span class="fn__space"></span>
-    <span data-type="sort" class="block__icon b3-tooltips b3-tooltips__sw${window.siyuan.config.readonly ? " fn__none" : ""}" aria-label="${window.siyuan.languages.sort}">
+    <span data-type="sort" class="block__icon ariaLabel${window.siyuan.config.readonly ? " fn__none" : ""}" data-position="north" aria-label="${window.siyuan.languages.sort}">
        <svg><use xlink:href="#iconSort"></use></svg>
    </span>
    <span class="fn__space${window.siyuan.config.readonly ? " fn__none" : ""}"></span>
-    <span data-type="expand" class="block__icon b3-tooltips b3-tooltips__sw" aria-label="${window.siyuan.languages.expand}${updateHotkeyAfterTip(window.siyuan.config.keymap.editor.general.expand.custom)}">
+    <span data-type="expand" class="block__icon ariaLabel" data-position="north" aria-label="${window.siyuan.languages.expand}${updateHotkeyAfterTip(window.siyuan.config.keymap.editor.general.expand.custom)}">
        <svg><use xlink:href="#iconExpand"></use></svg>
    </span>
    <span class="fn__space"></span>
-    <span data-type="collapse" class="block__icon b3-tooltips b3-tooltips__sw" aria-label="${window.siyuan.languages.collapse}${updateHotkeyAfterTip(window.siyuan.config.keymap.editor.general.collapse.custom)}">
+    <span data-type="collapse" class="block__icon ariaLabel" data-position="north" aria-label="${window.siyuan.languages.collapse}${updateHotkeyAfterTip(window.siyuan.config.keymap.editor.general.collapse.custom)}">
        <svg><use xlink:href="#iconContract"></use></svg>
    </span>
    <span class="fn__space"></span>
-    <span data-type="min" class="block__icon b3-tooltips b3-tooltips__sw" aria-label="${window.siyuan.languages.min}${updateHotkeyAfterTip(window.siyuan.config.keymap.general.closeTab.custom)}"><svg><use xlink:href='#iconMin'></use></svg></span>
+    <span data-type="min" class="block__icon ariaLabel" data-position="north" aria-label="${window.siyuan.languages.min}${updateHotkeyAfterTip(window.siyuan.config.keymap.general.closeTab.custom)}"><svg><use xlink:href='#iconMin'></use></svg></span>
 </div>
 <div class="fn__flex-1" style="margin-bottom: 8px"></div>`;

--- a/app/src/layout/dock/util.ts
+++ b/app/src/layout/dock/util.ts
@ -2,7 +2,7 @@ import {getAllModels} from "../getAll";
 import {Tab} from "../Tab";
 import {Graph} from "./Graph";
 import {Outline} from "./Outline";
-import {fixWndFlex1, getInstanceById, getWndByLayout, saveLayout, switchWnd} from "../util";
+import {fixWndFlex1, getInstanceById, getWndByLayout, saveLayout} from "../util";
 import {getDockByType, resizeTabs} from "../tabUtil";
 import {Backlink} from "./Backlink";
 import {App} from "../../index";
@ -145,7 +145,7 @@ export const openOutline = async (options: {
    if (!wnd) {
        wnd = getWndByLayout(window.siyuan.layout.centerLayout);
    }
-    const newWnd = wnd.split("lr");
+    const newWnd = wnd.split("lr", false);

    if (!options.title) {
        const response = await fetchSyncPost("api/block/getDocInfo", {id: options.rootId});
@ -166,7 +166,6 @@ export const openOutline = async (options: {
    }), false, false);
    newWnd.element.style.width = "200px";
    newWnd.element.classList.remove("fn__flex-1");
-    switchWnd(newWnd, wnd);
    fixWndFlex1(newWnd.parent);
    saveLayout();
 };
--- a/app/src/layout/getAll.ts
+++ b/app/src/layout/getAll.ts
@ -123,15 +123,52 @@ export const getAllWnds = (layout: Layout, wnds: Wnd[]) => {
    }
 };

-export const getAllTabs = () => {
+export const getAllTabs = (type?: TTab | string) => {
    const tabs: Tab[] = [];
    const getTabs = (layout: Layout) => {
        for (let i = 0; i < layout.children.length; i++) {
            const item = layout.children[i];
-            if (item instanceof Tab) {
-                tabs.push(item);
-            } else {
+            if (!(item instanceof Tab)) {
                getTabs(item as Layout);
+                continue;
+            }
+            if (!type) {
+                tabs.push(item);
+                continue;
+            }
+            const model = item.model;
+            if (model) {
+                if (model instanceof Search && type === "Search") {
+                    tabs.push(item);
+                } else if (model instanceof Asset && type === "Asset") {
+                    tabs.push(item);
+                } else if (model instanceof Editor && type === "Editor") {
+                    tabs.push(item);
+                } else if (model instanceof Graph && type === "Graph") {
+                    tabs.push(item);
+                } else if (model instanceof Backlink && type === "Backlink") {
+                    tabs.push(item);
+                } else if (model instanceof Outline && type === "Outline") {
+                    tabs.push(item);
+                } else if (model instanceof Custom && model.type === type) {
+                    tabs.push(item);
+                }
+                continue;
+            }
+            const initData = item.headElement?.getAttribute("data-initdata");
+            if (!initData) {
+                continue;
+            }
+            try {
+                const initObj = JSON.parse(initData) as ILayoutJSON;
+                if (
+                    (initObj.instance === "Custom" && initObj.customModelType === type) ||
+                    initObj.instance === type
+                ) {
+                    tabs.push(item);
+                }
+            } catch (e) {
+                console.log(`getAllTabs(${type}) error:`, e);
            }
        }
    };
--- a/app/src/layout/index.ts
+++ b/app/src/layout/index.ts
@ -42,7 +42,7 @@ export class Layout {
        }
    }

-    addLayout(child: Layout, id?: string) {
+    addLayout(child: Layout, id?: string, after = true) {
        if (!id) {
            this.children.splice(this.children.length, 0, child);
            if (this) {
@ -51,8 +51,12 @@ export class Layout {
        } else {
            this.children.find((item, index) => {
                if (item.id === id) {
-                    this.children.splice(index + 1, 0, child);
-                    item.element.after(child.element);
+                    this.children.splice(after ? index + 1 : index, 0, child);
+                    if (after) {
+                        item.element.after(child.element);
+                    } else {
+                        item.element.before(child.element);
+                    }
                    return true;
                }
            });
@ -62,18 +66,22 @@ export class Layout {
        } else {
            child.element.style[(this && this.direction === "lr") ? "width" : "height"] = child.size;
        }
-        addResize(child);
+        addResize(child, after);
        child.parent = this;
    }

-    addWnd(child: Wnd, id?: string) {
+    addWnd(child: Wnd, id?: string, after = true) {
        if (!id) {
            this.children.splice(this.children.length, 0, child);
            this.element.append(child.element);
        } else {
            this.children.find((item, index) => {
                if (item.id === id) {
-                    this.children.splice(index + 1, 0, child);
+                    if (after) {
+                        this.children.splice(index + 1, 0, child);
+                    } else {
+                        this.children.splice(index, 0, child);
+                    }
                    if (this.direction === "lr") {
                        // 向右分屏，左侧文档抖动，移除动画和边距
                        item.element.querySelectorAll(".protyle-content").forEach((element: HTMLElement) => {
@ -84,7 +92,11 @@ export class Layout {
                            }
                        });
                    }
-                    item.element.after(child.element);
+                    if (after) {
+                        item.element.after(child.element);
+                    } else {
+                        item.element.before(child.element);
+                    }
                    return true;
                }
            });
@ -92,7 +104,7 @@ export class Layout {
        if (id) {
            fixWndFlex1(this);
        }
-        addResize(child);
+        addResize(child, after);
        resizeTabs(false);
        child.parent = this;
    }
--- a/app/src/layout/util.ts
+++ b/app/src/layout/util.ts
@ -12,18 +12,15 @@ import {getAllModels, getAllTabs, getAllWnds} from "./getAll";
 import {Asset} from "../asset";
 import {Search} from "../search";
 import {Dock} from "./dock";
-import {focusByOffset, focusByRange, getSelectionOffset} from "../protyle/util/selection";
+import {focusByRange} from "../protyle/util/selection";
 import {hideElements} from "../protyle/ui/hideElements";
 import {fetchPost} from "../util/fetch";
-import {hasClosestBlock, hasClosestByClassName} from "../protyle/util/hasClosest";
+import {hasClosestByClassName} from "../protyle/util/hasClosest";
 import {Constants} from "../constants";
 import {saveScroll} from "../protyle/scroll/saveScroll";
 import {Backlink} from "./dock/Backlink";
 import {openFileById} from "../editor/util";
 import {isWindow} from "../util/functions";
-/// #if !BROWSER
-import {setTabPosition} from "../window/setHeader";
-/// #endif
 import {showMessage} from "../dialog/message";
 import {getIdZoomInByPath} from "../util/pathName";
 import {Custom} from "./dock/Custom";
@ -68,57 +65,6 @@ export const setPanelFocus = (element: Element, isSaveLayout = true) => {
    }
 };

-export const switchWnd = (newWnd: Wnd, targetWnd: Wnd) => {
-    // DOM 移动后 range 会变化
-    const rangeDatas: {
-        id: string,
-        start: number,
-        end: number
-    }[] = [];
-    targetWnd.children.forEach((item) => {
-        if (item.model instanceof Editor && item.model.editor.protyle.toolbar.range) {
-            const blockElement = hasClosestBlock(item.model.editor.protyle.toolbar.range.startContainer);
-            if (blockElement) {
-                const startEnd = getSelectionOffset(blockElement, undefined, item.model.editor.protyle.toolbar.range);
-                rangeDatas.push({
-                    id: blockElement.getAttribute("data-node-id"),
-                    start: startEnd.start,
-                    end: startEnd.end
-                });
-            }
-        }
-    });
-    newWnd.element.after(targetWnd.element);
-    targetWnd.children.forEach((item) => {
-        if (item.model instanceof Editor) {
-            const rangeData = rangeDatas.splice(0, 1)[0];
-            if (!rangeData) {
-                return;
-            }
-            const range = focusByOffset(item.model.editor.protyle.wysiwyg.element.querySelector(`[data-node-id="${rangeData.id}"]`), rangeData.start, rangeData.end);
-            if (range) {
-                item.model.editor.protyle.toolbar.range = range;
-            }
-        }
-    });
-    // 分隔线
-    newWnd.element.after(newWnd.element.previousElementSibling);
-    newWnd.parent.children.find((item, index) => {
-        if (item.id === newWnd.id) {
-            const tempResize = newWnd.parent.children[index].resize;
-            newWnd.parent.children[index].resize = newWnd.parent.children[index - 1].resize;
-            newWnd.parent.children[index - 1].resize = tempResize;
-            const temp = item;
-            newWnd.parent.children[index] = newWnd.parent.children[index - 1];
-            newWnd.parent.children[index - 1] = temp;
-            return true;
-        }
-    });
-    /// #if !BROWSER
-    setTabPosition();
-    /// #endif
-};
-
 export const getWndByLayout: (layout: Layout) => Wnd = (layout: Layout) => {
    const wndsTemp: Wnd[] = [];
    getAllWnds(layout, wndsTemp);
@ -757,7 +703,8 @@ export const newModelByInitData = (app: App, tab: Tab, json: any) => {
            blockId: json.blockId,
            mode: json.mode,
            scrollPosition: json.scrollPosition,
-            action: typeof json.action === "string" ? (json.action ? [json.action, Constants.CB_GET_FOCUS] : [Constants.CB_GET_FOCUS]) : json.action.concat(Constants.CB_GET_FOCUS),
+            action: Array.isArray(json.action) ? json.action.concat(Constants.CB_GET_FOCUS) :
+                (json.action ? [json.action, Constants.CB_GET_FOCUS] : [Constants.CB_GET_FOCUS]),
        });
    }
    return model;
@ -790,7 +737,7 @@ export const getInstanceById = (id: string, layout = window.siyuan.layout.center
    return _getInstanceById(layout, id);
 };

-export const addResize = (obj: Layout | Wnd) => {
+export const addResize = (obj: Layout | Wnd, after = true) => {
    if (!obj.resize) {
        return;
    }
@ -917,7 +864,12 @@ export const addResize = (obj: Layout | Wnd) => {
        resizeElement.classList.add("layout__resize--lr");
    }
    resizeElement.classList.add("layout__resize");
-    obj.element.insertAdjacentElement("beforebegin", resizeElement);
+    if (after) {
+        obj.element.insertAdjacentElement((obj.element.previousElementSibling && !obj.element.previousElementSibling.classList.contains("layout__resize")) ?
+            "beforebegin" : "afterend", resizeElement);
+    } else {
+        obj.element.insertAdjacentElement("afterend", resizeElement);
+    }
    resizeWnd(resizeElement, obj.resize);

    resizeElement.addEventListener("dblclick", () => {
@ -985,6 +937,13 @@ export const adjustLayout = (layout: Layout = window.siyuan.layout.centerLayout.
        } else {
            item.element.style.minWidth = "";
        }
+
+        if (!item.element.style.height && !item.element.classList.contains("layout__center") &&
+            item.element.classList.contains("fn__flex-column")) {
+            item.element.style.minHeight = "8px";
+        } else {
+            item.element.style.minHeight = "";
+        }
    });
    if (layout.direction === "lr" && layout.element.scrollWidth > layout.element.clientWidth + 2) {
        let index = Math.ceil(screen.width / 8);
--- a/app/src/menus/commonMenuItem.ts
+++ b/app/src/menus/commonMenuItem.ts
@ -415,7 +415,7 @@ export const openAttr = (nodeElement: Element, focusName = "bookmark", protyle:
    });
 };

-export const copySubMenu = (ids: string[], accelerator = true, focusElement?: Element, stdMarkdownId?: string) => {
+export const copySubMenu = (ids: string[], accelerator = true, focusElement?: Element, stdMarkdownId?: string): IMenu[] => {
    const menuItems = [{
        id: "copyBlockRef",
        iconHTML: "",
--- a/app/src/menus/protyle.ts
+++ b/app/src/menus/protyle.ts
@ -48,7 +48,7 @@ import {pushBack} from "../mobile/util/MobileBackFoward";
 import {copyPNGByLink, exportAsset, writeAssetToClipboard} from "./util";
 import {removeInlineType} from "../protyle/toolbar/util";
 import {alignImgCenter, alignImgLeft} from "../protyle/wysiwyg/commonHotkey";
-import {checkFold, renameTag} from "../util/noRelyPCFunction";
+import {checkFold, genTagList, renameTag} from "../util/noRelyPCFunction";
 import {hideElements} from "../protyle/ui/hideElements";
 import {emitOpenMenu} from "../plugin/EventBus";
 import {openMobileFileById} from "../mobile/editor";
@ -65,6 +65,7 @@ import {hideTooltip} from "../dialog/tooltip";
 import {clearSelect} from "../protyle/util/clear";
 import {scrollCenter} from "../util/highlightById";
 import {base64ToURL} from "../util/image";
+import {setPosition} from "../util/setPosition";

 const renderAssetList = (element: Element, k: string, position: IPosition, exts: string[] = []) => {
    fetchPost("/api/search/searchAsset", {
@ -572,7 +573,7 @@ export const refMenu = (protyle: IProtyle, element: HTMLElement) => {
            }
        }, {
            id: "link",
-            label: window.siyuan.languages.link,
+            label: window.siyuan.languages.hyperlink,
            iconHTML: "",
            click() {
                element.outerHTML = `<span data-type="a" data-href="siyuan://blocks/${element.getAttribute("data-id")}">${element.innerHTML}</span><wbr>`;
@ -1764,55 +1765,84 @@ style="margin:4px 0;width: ${isMobile() ? "100%" : "360px"}" class="b3-text-fiel

 export const tagMenu = (protyle: IProtyle, tagElement: HTMLElement) => {
    window.siyuan.menus.menu.remove();
-    window.siyuan.menus.menu.element.setAttribute("data-name", Constants.MENU_INLINE_TAG);
    const nodeElement = hasClosestBlock(tagElement);
    if (!nodeElement) {
        return;
    }
    hideElements(["util", "toolbar", "hint"], protyle);
    const id = nodeElement.getAttribute("data-node-id");
-    let html = nodeElement.outerHTML;
+    let inputElement: HTMLInputElement;
+    const oldHTML = nodeElement.outerHTML;
+    window.siyuan.menus.menu.removeCB = () => {
+        tagElement.innerHTML = Constants.ZWSP + Lute.EscapeHTMLStr(inputElement.value || "");
+        if (!inputElement.value) {
+            tagElement.insertAdjacentHTML("afterend", "<wbr>");
+            tagElement.remove();
+            focusByWbr(nodeElement, protyle.toolbar.range);
+        } else {
+            protyle.toolbar.range.selectNodeContents(tagElement);
+            protyle.toolbar.range.collapse(false);
+            focusByRange(protyle.toolbar.range);
+        }
+        if (nodeElement.outerHTML !== oldHTML) {
+            nodeElement.setAttribute("updated", dayjs().format("YYYYMMDDHHmmss"));
+            updateTransaction(protyle, id, nodeElement.outerHTML, oldHTML);
+        }
+    };
+    window.siyuan.menus.menu.element.setAttribute("data-name", Constants.MENU_INLINE_TAG);
    window.siyuan.menus.menu.append(new MenuItem({
        id: "tag",
        iconHTML: "",
        type: "readonly",
-        label: `<input class="b3-text-field fn__block" style="margin: 4px 0" placeholder="${window.siyuan.languages.tag}">`,
+        label: `<input class="b3-text-field fn__block" style="margin: 4px 0" placeholder="${window.siyuan.languages.tag}">
+<div class="fn__none b3-list fn__flex-1 b3-list--background protyle-hint" style="position: fixed"></div>`,
        bind(element) {
-            const inputElement = element.querySelector("input");
+            const listElement = element.querySelector(".b3-list") as HTMLElement;
+            inputElement = element.querySelector("input");
            inputElement.value = tagElement.textContent.replace(Constants.ZWSP, "");
-            inputElement.addEventListener("change", () => {
-                updateTransaction(protyle, id, nodeElement.outerHTML, html);
-                html = nodeElement.outerHTML;
-            });
            inputElement.addEventListener("compositionend", () => {
-                tagElement.innerHTML = Constants.ZWSP + Lute.EscapeHTMLStr(inputElement.value || "");
+                genTagList(listElement, inputElement.value.trim());
+                setPosition(listElement, inputElementRect.right + 8, inputElementRect[isMobile() ? "bottom" : "top"], inputElementRect.height);
            });
            inputElement.addEventListener("input", (event: KeyboardEvent) => {
                if (!event.isComposing) {
-                    // https://github.com/siyuan-note/siyuan/issues/4511
-                    tagElement.innerHTML = Constants.ZWSP + Lute.EscapeHTMLStr(inputElement.value || "");
+                    listElement.classList.remove("fn__none");
+                    genTagList(listElement, inputElement.value.trim());
+                    setPosition(listElement, inputElementRect.right + 8, inputElementRect[isMobile() ? "bottom" : "top"], inputElementRect.height);
                }
            });
            inputElement.addEventListener("keydown", (event) => {
-                if ((event.key === "Enter" || event.key === "Escape") && !event.isComposing) {
-                    event.preventDefault();
-                    event.stopPropagation();
-                    if (!inputElement.value) {
-                        const oldHTML = nodeElement.outerHTML;
-                        tagElement.insertAdjacentHTML("afterend", "<wbr>");
-                        tagElement.remove();
-                        nodeElement.setAttribute("updated", dayjs().format("YYYYMMDDHHmmss"));
-                        updateTransaction(protyle, id, nodeElement.outerHTML, oldHTML);
-                        focusByWbr(nodeElement, protyle.toolbar.range);
-                    } else {
-                        protyle.toolbar.range.selectNodeContents(tagElement);
-                        protyle.toolbar.range.collapse(false);
-                        focusByRange(protyle.toolbar.range);
-                    }
-                    window.siyuan.menus.menu.remove();
-                } else if (electronUndo(event)) {
+                event.stopPropagation();
+                if (event.isComposing) {
                    return;
                }
+                if (event.key === "Enter" || event.key === "Escape") {
+                    if (!listElement.classList.contains("fn__none")) {
+                        listElement.classList.add("fn__none");
+                        if (event.key === "Enter") {
+                            const currentElement = listElement.querySelector(".b3-list-item--focus") as HTMLElement;
+                            inputElement.value = currentElement.dataset.type === "new" ? currentElement.querySelector("mark").textContent.trim() : currentElement.textContent.trim();
+                        }
+                        return;
+                    }
+                    if (event.key === "Escape") {
+                        window.siyuan.menus.menu.removeCB = null;
+                    }
+                    window.siyuan.menus.menu.remove();
+                    event.preventDefault();
+                } else {
+                    electronUndo(event);
+                    upDownHint(listElement, event);
+                }
+            });
+            listElement.addEventListener("click", (event) => {
+                const target = event.target as HTMLElement;
+                const listItemElement = hasClosestByClassName(target, "b3-list-item");
+                if (!listItemElement) {
+                    return;
+                }
+                inputElement.value = listItemElement.dataset.type === "new" ? listItemElement.querySelector("mark").textContent.trim() : listItemElement.textContent.trim();
+                listElement.classList.add("fn__none");
            });
        }
    }).element);
@ -1885,7 +1915,6 @@ export const tagMenu = (protyle: IProtyle, tagElement: HTMLElement) => {
        icon: "iconTrashcan",
        label: window.siyuan.languages.remove,
        click() {
-            const oldHTML = nodeElement.outerHTML;
            tagElement.insertAdjacentHTML("afterend", "<wbr>");
            tagElement.remove();
            nodeElement.setAttribute("updated", dayjs().format("YYYYMMDDHHmmss"));
@ -1918,7 +1947,8 @@ export const tagMenu = (protyle: IProtyle, tagElement: HTMLElement) => {
    /// #endif
    const popoverElement = hasTopClosestByClassName(protyle.element, "block__popover", true);
    window.siyuan.menus.menu.element.setAttribute("data-from", popoverElement ? popoverElement.dataset.level + "popover" : "app");
-    window.siyuan.menus.menu.element.querySelector("input").select();
+    inputElement.select();
+    const inputElementRect = inputElement.getBoundingClientRect();
 };

 export const inlineMathMenu = (protyle: IProtyle, element: Element) => {
--- a/app/src/menus/util.ts
+++ b/app/src/menus/util.ts
@ -12,6 +12,8 @@ import {App} from "../index";
 import {exportByMobile, isInAndroid, updateHotkeyTip} from "../protyle/util/compatibility";
 import {checkFold} from "../util/noRelyPCFunction";
 import {showMessage} from "../dialog/message";
+import {Editor} from "../editor";
+import {setEditMode} from "../protyle/util/setEditMode";

 export const exportAsset = (src: string) => {
    return {
@ -164,7 +166,11 @@ export const openEditorTab = (app: App, ids: string[], notebookId?: string, path
        label: window.siyuan.languages.preview,
        click: () => {
            ids.forEach((id) => {
-                openFileById({app, id, mode: "preview"});
+                openFileById({
+                    app, id, mode: "preview", afterOpen(editor: Editor) {
+                        setEditMode(editor.editor.protyle, "preview");
+                    }
+                });
            });
        }
    });
--- a/app/src/mobile/dock/MobileFiles.ts
+++ b/app/src/mobile/dock/MobileFiles.ts
@ -527,7 +527,7 @@ export class MobileFiles extends Model {
        if (!fileItemElement) {
            return;
        }
-        fileItemElement.setAttribute("data-name", Lute.EscapeHTMLStr(data.title));
+        fileItemElement.setAttribute("data-name", data.title);
        fileItemElement.querySelector(".b3-list-item__text").innerHTML = escapeHtml(data.title);
    }

@ -802,7 +802,7 @@ class="b3-list-item" data-path="${item.path}">
    </span>
    <span class="b3-list-item__icon"${editingPublishAccess ? " fn__none" : ""}>${unicode2Emoji(item.icon || (item.subFileCount === 0 ? window.siyuan.storage[Constants.LOCAL_IMAGES].file : window.siyuan.storage[Constants.LOCAL_IMAGES].folder))}</span>
    <span class="b3-list-item__switch${editingPublishAccess ? "" : " fn__none"}">${getPublishAccessOptionByLevel("public").iconHTML}</span>
-    <span class="b3-list-item__text">${getDisplayName(item.name, true, true)}</span>
+    <span class="b3-list-item__text">${getDisplayName(Lute.EscapeHTMLStr(item.name), true, true)}</span>
    <span data-type="more-file" class="b3-list-item__action b3-tooltips b3-tooltips__nw" aria-label="${window.siyuan.languages.more}">
        <svg><use xlink:href="#iconMore"></use></svg>
    </span>
--- a/app/src/mobile/dock/MobileOutline.ts
+++ b/app/src/mobile/dock/MobileOutline.ts
@ -1,12 +1,7 @@
 import {Tree} from "../../util/Tree";
 import {fetchPost} from "../../util/fetch";
 import {hasClosestBlock, hasClosestByClassName} from "../../protyle/util/hasClosest";
-import {
-    isInAndroid,
-    isInHarmony,
-    setStorageVal,
-    writeText
-} from "../../protyle/util/compatibility";
+import {isInAndroid, isInHarmony, setStorageVal, writeText} from "../../protyle/util/compatibility";
 import {Constants} from "../../constants";
 import {MenuItem} from "../../menus/Menu";
 import {getPreviousBlock} from "../../protyle/wysiwyg/getBlock";
@ -35,6 +30,7 @@ export class MobileOutline extends Model {
        super({
            app: options.app,
            id: genUUID(),
+            type: "outline",
            msgCallback(data) {
                if (data) {
                    switch (data.cmd) {
--- a/app/src/mobile/index.ts
+++ b/app/src/mobile/index.ts
@ -2,7 +2,12 @@ import {addScript, addScriptSync} from "../protyle/util/addScript";
 import {Constants} from "../constants";
 import {onMessage} from "./util/onMessage";
 import {genUUID} from "../util/genID";
-import {hasClosestBlock, hasClosestByAttribute, hasTopClosestByClassName} from "../protyle/util/hasClosest";
+import {
+    hasClosestBlock,
+    hasClosestByAttribute,
+    hasClosestByClassName,
+    hasTopClosestByClassName
+} from "../protyle/util/hasClosest";
 import {Model} from "../layout/Model";
 import "../assets/scss/mobile.scss";
 import {Menus} from "../menus";
@ -30,9 +35,9 @@ import {updateCardHV} from "../card/util";
 import {mobileKeydown} from "./util/keydown";
 import {correctHotkey} from "../boot/globalEvent/commonHotkey";
 import {processIOSPurchaseResponse} from "../util/iOSPurchase";
-import {updateControlAlt} from "../protyle/util/hotKey";
 import {nbsp2space} from "../protyle/util/normalizeText";
 import {callMobileAppShowKeyboard, canInput, setWebViewFocusable} from "./util/mobileAppUtil";
+import {hideAllElements} from "../protyle/ui/hideElements";

 class App {
    public plugins: import("../plugin").Plugin[] = [];
@ -101,6 +106,9 @@ class App {
                    callMobileAppShowKeyboard();
                }
            }
+            if (!hasClosestByClassName(event.target as Element, "protyle-util")) {
+                hideAllElements(["util"]);
+            }
        });
        if (window.JSAndroid && window.JSAndroid.showKeyboard || window.JSHarmony && window.JSHarmony.showKeyboard) {
            const __siyuan_original_focus = HTMLElement.prototype.focus;
@ -132,7 +140,6 @@ class App {
            addScriptSync(`${Constants.PROTYLE_CDN}/js/lute/lute.min.js?v=${Constants.SIYUAN_VERSION}`, "protyleLuteScript");
            addScript(`${Constants.PROTYLE_CDN}/js/protyle-html.js?v=${Constants.SIYUAN_VERSION}`, "protyleWcHtmlScript");
            window.siyuan.config = confResponse.data.conf;
-            updateControlAlt();
            window.siyuan.isPublish = confResponse.data.isPublish;
            correctHotkey(siyuanApp);
            await loadPlugins(this);
--- a/app/src/mobile/util/keyboardToolbar.ts
+++ b/app/src/mobile/util/keyboardToolbar.ts
@ -7,7 +7,7 @@ import {
 } from "../../protyle/util/hasClosest";
 import {moveToDown, moveToUp} from "../../protyle/wysiwyg/move";
 import {Constants} from "../../constants";
-import {focusByRange, getSelectionPosition} from "../../protyle/util/selection";
+import {focusBlock, focusByRange, getSelectionPosition} from "../../protyle/util/selection";
 import {getCurrentEditor} from "../editor";
 import {fontEvent, getFontNodeElements} from "../../protyle/toolbar/Font";
 import {hideElements} from "../../protyle/ui/hideElements";
@ -15,6 +15,7 @@ import {softEnter} from "../../protyle/wysiwyg/enter";
 import {isInAndroid, isInEdge, isInHarmony} from "../../protyle/util/compatibility";
 import {tabCodeBlock} from "../../protyle/wysiwyg/codeBlock";
 import {callMobileAppShowKeyboard, canInput, keyboardLockUntil} from "./mobileAppUtil";
+import {isNotEditBlock} from "../../protyle/wysiwyg/getBlock";

 let renderKeyboardToolbarTimeout: number;
 let showUtil = false;
@ -440,13 +441,24 @@ export const showKeyboardToolbar = () => {
    setTimeout(() => {
        const contentElement = hasClosestByClassName(range.startContainer, "protyle-content", true);
        if (contentElement) {
-            const contentTop = contentElement.getBoundingClientRect().top;
-            const cursorTop = getSelectionPosition(contentElement).top;
-            if (cursorTop < window.innerHeight - 42 && cursorTop > contentTop) {
+            let cursorTop = getSelectionPosition(contentElement).top;
+            if (cursorTop < 0 && window.siyuan.mobile.touchRange) {
+                const rangeBlockElement = hasClosestBlock(window.siyuan.mobile.touchRange.startContainer);
+                if (rangeBlockElement) {
+                    if (isNotEditBlock(rangeBlockElement)) {
+                        focusBlock(rangeBlockElement);
+                    } else {
+                        focusByRange(window.siyuan.mobile.touchRange);
+                    }
+                    cursorTop = getSelectionPosition(contentElement, window.siyuan.mobile.touchRange).top;
+                }
+            }
+            if (cursorTop < window.innerHeight - 42 && cursorTop > contentElement.getBoundingClientRect().top) {
                return;
            }
            contentElement.scroll({
-                top: contentElement.scrollTop + cursorTop - window.innerHeight + 42 + 26,
+                top: cursorTop < 0 ? contentElement.scrollTop + window.innerHeight - 42 :
+                    contentElement.scrollTop + cursorTop - window.innerHeight + 42 + 26,
                left: contentElement.scrollLeft,
                behavior: "smooth"
            });
@ -731,6 +743,13 @@ export const initKeyboardToolbar = () => {
                renderTextMenu(protyle, toolbarElement);
                showKeyboardToolbarUtil(oldScrollTop);
                window.JSAndroid?.hideKeyboard();
+                setTimeout(() => {
+                    focusByRange(range);
+                    preventRender = true;
+                    setTimeout(() => {
+                        preventRender = false;
+                    }, 1000);
+                }, Constants.TIMEOUT_TRANSITION);
            }
            return;
        } else if (type === "moveup") {
--- a/app/src/mobile/util/onMessage.ts
+++ b/app/src/mobile/util/onMessage.ts
@ -11,7 +11,6 @@ import {App} from "../../index";
 import {reloadPlugin} from "../../plugin/loader";
 import {reloadEmoji} from "../../emoji";
 import {setLocalShorthandCount} from "../../util/noRelyPCFunction";
-import {updateControlAlt} from "../../protyle/util/hotKey";
 import {renderSnippet} from "../../config/util/snippets";
 import {redirectToCheckAuth} from "../../util/pathName";

@ -67,7 +66,6 @@ export const onMessage = (app: App, data: IWebSocketData) => {
                break;
            case "setConf":
                window.siyuan.config = data.data;
-                updateControlAlt();
                break;
            case "setPublish":
                window.siyuan.config.publish = data.data;
@ -92,7 +90,7 @@ export const onMessage = (app: App, data: IWebSocketData) => {
                openMobileFileById(app, data.data.id);
                break;
            case"txerr":
-                transactionError();
+                transactionError(data.msg);
                break;
            case"statusbar":
                if (!document.querySelector("#keyboardToolbar").classList.contains("fn__none") ||
--- a/app/src/mobile/util/touch.ts
+++ b/app/src/mobile/util/touch.ts
@ -10,6 +10,8 @@ import {activeBlur} from "./keyboardToolbar";
 import {isIPhone} from "../../protyle/util/compatibility";
 import {App} from "../../index";
 import {globalTouchEnd, globalTouchStart} from "../../boot/globalEvent/touch";
+import {getRangeByPoint} from "../../protyle/util/selection";
+import {getCurrentEditor} from "../editor";

 let clientX: number;
 let clientY: number;
@ -164,6 +166,15 @@ export const handleTouchStart = (event: TouchEvent) => {
    if (globalTouchStart(event)) {
        return;
    }
+
+    if (getSelection().rangeCount > 0 && hasClosestBlock(event.target as Element)) {
+        const editor = getCurrentEditor();
+        if (editor && !editor.protyle.disabled && event.touches[0].clientY > window.innerHeight / 2 &&
+            document.querySelector("#keyboardToolbar").classList.contains("fn__none")) {
+            window.siyuan.mobile.touchRange = getRangeByPoint(event.touches[0].clientX, event.touches[0].clientY);
+        }
+    }
+
    firstDirection = null;
    xDiff = undefined;
    yDiff = undefined;
--- a/app/src/plugin/API.ts
+++ b/app/src/plugin/API.ts
@ -80,6 +80,7 @@ openTab = (options: {
        id: string,     // 块 id
        action?: TProtyleAction [] // cb-get-all：获取所有内容；cb-get-focus：打开后光标定位在 id 所在的块；cb-get-hl: 打开后 id 块高亮
        zoomIn?: boolean // 是否缩放
+        mode?: TEditorMode  // 文档打开模式，默认 "wysiwyg"
    },
    pdf?: {
        path: string,
@ -126,7 +127,8 @@ openTab = (options: {
            id: options.doc.id,
            action: options.doc.action,
            zoomIn: options.doc.zoomIn,
-            scrollPosition: "start"
+            scrollPosition: "start",
+            mode: options.doc.mode,
        });
    }
    if (options.asset) {
--- a/app/src/plugin/uninstall.ts
+++ b/app/src/plugin/uninstall.ts
@ -76,19 +76,19 @@ export const uninstall = (app: App, name: string, isReload: boolean) => {
                    }
                }

-                if (Object.keys(window.siyuan.layout.leftDock.data).includes(key)) {
+                if (window.siyuan.layout.leftDock && Object.keys(window.siyuan.layout.leftDock.data).includes(key)) {
                    window.siyuan.layout.leftDock.remove(key);
                    if (dockIconElement) {
                        window.siyuan.storage[Constants.LOCAL_PLUGIN_DOCKS][plugin.name][key].position =
                            "Left" + (dockIconElement.getAttribute("data-index") === "0" ? "Top" : "Bottom");
                    }
-                } else if (Object.keys(window.siyuan.layout.rightDock.data).includes(key)) {
+                } else if (window.siyuan.layout.rightDock && Object.keys(window.siyuan.layout.rightDock.data).includes(key)) {
                    window.siyuan.layout.rightDock.remove(key);
                    if (dockIconElement) {
                        window.siyuan.storage[Constants.LOCAL_PLUGIN_DOCKS][plugin.name][key].position =
                            "Right" + (dockIconElement.getAttribute("data-index") === "0" ? "Top" : "Bottom");
                    }
-                } else if (Object.keys(window.siyuan.layout.bottomDock.data).includes(key)) {
+                } else if (window.siyuan.layout.bottomDock && Object.keys(window.siyuan.layout.bottomDock.data).includes(key)) {
                    window.siyuan.layout.bottomDock.remove(key);
                    if (dockIconElement) {
                        window.siyuan.storage[Constants.LOCAL_PLUGIN_DOCKS][plugin.name][key].position =
--- a/app/src/protyle/breadcrumb/action.ts
+++ b/app/src/protyle/breadcrumb/action.ts
@ -1,12 +1,11 @@
 /// #if !MOBILE
-import {getAllEditor, getAllModels, getAllWnds} from "../../layout/getAll";
+import {getAllModels, getAllWnds} from "../../layout/getAll";
 /// #endif
 import {addLoading} from "../ui/initUI";
 import {fetchPost} from "../../util/fetch";
 import {Constants} from "../../constants";
 import {hideAllElements, hideElements} from "../ui/hideElements";
 import {hasClosestByClassName} from "../util/hasClosest";
-import {reloadProtyle} from "../util/reload";
 import {resize} from "../util/resize";
 import {disabledProtyle, enableProtyle} from "../util/onGet";
 import {isWindow} from "../../util/functions";
@ -20,16 +19,6 @@ export const net2LocalAssets = (protyle: IProtyle, type: "Assets" | "Img") => {
    hideElements(["toolbar"], protyle);
    fetchPost(`/api/format/net${type}2LocalAssets`, {
        id: protyle.block.rootID
-    }, () => {
-        /// #if MOBILE
-        reloadProtyle(protyle, false);
-        /// #else
-        getAllEditor().forEach(item => {
-            if (item.protyle.block.rootID === protyle.block.rootID) {
-                reloadProtyle(item.protyle, item.protyle.element === protyle.element);
-            }
-        });
-        /// #endif
    });
 };

@ -111,7 +100,7 @@ export const fullscreen = (element: Element, btnElement?: Element) => {
 };

 export const updateReadonly = (target: Element, protyle: IProtyle) => {
-    if (!window.siyuan.config.readonly) {
+    if (!window.siyuan.config.readonly && protyle.element.getAttribute("disabled-forever") !== "true") {
        const isReadonly = target.querySelector("use").getAttribute("xlink:href") !== "#iconUnlock";
        if (window.siyuan.config.editor.readOnly) {
            if (isReadonly) {
--- a/app/src/protyle/breadcrumb/index.ts
+++ b/app/src/protyle/breadcrumb/index.ts
@ -573,6 +573,9 @@ ${padHTML}
    }

    public render(protyle: IProtyle, update = false, nodeElement?: Element | false) {
+        if (protyle.element.getAttribute("disabled-forever") === "true") {
+            return;
+        }
        /// #if !MOBILE
        let range: Range;
        let blockElement: Element;
--- a/app/src/protyle/export/util.ts
+++ b/app/src/protyle/export/util.ts
@ -8,7 +8,7 @@ import {Dialog} from "../../dialog";
 import {addScript} from "../util/addScript";
 import {isMobile} from "../../util/functions";
 import {Constants} from "../../constants";
-import {highlightRender} from "../render/highlightRender";
+import {highlightRender, lineNumberRender} from "../render/highlightRender";
 import {processRender} from "../util/processCode";
 import {isIPhone, isSafari, openByMobile, setStorageVal} from "../util/compatibility";
 import {useShell} from "../../util/pathName";
@ -27,6 +27,7 @@ export const afterExport = (exportPath: string, msgId: string) => {

 export const exportImage = (id: string) => {
    const exportDialog = new Dialog({
+        disableAnimation: true,
        title: window.siyuan.languages.exportAsImage,
        content: `<div class="b3-dialog__content" style="${isMobile() ? "padding:8px;" : ""};background-color: var(--b3-theme-background)">
    <div style="${isMobile() ? "margin: 8px 0" : "padding: 48px;margin: 8px 0"}" class="export-img">
@ -51,7 +52,14 @@ export const exportImage = (id: string) => {
 </div>
 <div class="fn__loading"><img height="128px" width="128px" src="stage/loading-pure.svg"></div>`,
        width: isMobile() ? "92vw" : "990px",
-        height: "70vh"
+        height: "70vh",
+        resizeCallback() {
+            previewElement.querySelectorAll(".code-block .protyle-linenumber__rows").forEach((item: HTMLElement) => {
+                if ((item.nextElementSibling as HTMLElement).style.wordBreak === "break-word") {
+                    lineNumberRender(item.parentElement);
+                }
+            });
+        }
    });
    exportDialog.element.setAttribute("data-key", Constants.DIALOG_EXPORTIMAGE);
    const btnsElement = exportDialog.element.querySelectorAll(".b3-button");
--- a/app/src/protyle/gutter/index.ts
+++ b/app/src/protyle/gutter/index.ts
@ -2565,8 +2565,14 @@ export class Gutter {
                if (index === 0) {
                    // 不单独显示，要不然在块的间隔中，gutter 会跳来跳去的
                    if (["NodeBlockquote", "NodeList", "NodeCallout", "NodeSuperBlock"].includes(type)) {
-                        if (target && type === "NodeCallout" && hasTopClosestByClassName(target, "callout-info")) {
+                        if (target && type === "NodeCallout") {
                            // Callout 标题需显示
+                            const calloutInfoElement = hasTopClosestByClassName(target, "callout-info");
+                            if (calloutInfoElement) {
+                                element = calloutInfoElement;
+                            } else {
+                                return;
+                            }
                        } else {
                            return;
                        }
@ -2585,7 +2591,13 @@ export class Gutter {
                    }
                    // 标题（除列表下的）、提示下的块必须显示
                    if (topElement !== nodeElement && type !== "NodeHeading" && !hasClosestByClassName(nodeElement, "callout")) {
-                        nodeElement = topElement;
+                        while (nodeElement !== topElement) {
+                            nodeElement = nodeElement.parentElement;
+                            // > > > > 1 left 位置
+                            if (nodeElement.parentElement.classList.contains("bq")) {
+                                space += 10;
+                            }
+                        }
                        parentElement = hasClosestBlock(nodeElement.parentElement);
                        type = nodeElement.getAttribute("data-type");
                        dataNodeId = nodeElement.getAttribute("data-node-id");
@ -2606,11 +2618,11 @@ export class Gutter {
                if (protyle.options.backlinkData) {
                    popoverHTML = `class="popover__block" data-id="${dataNodeId}"`;
                }
-                const buttonHTML = `<button class="ariaLabel" data-position="parentW" aria-label="${gutterTip}" 
+                const buttonHTML = type ? `<button class="ariaLabel" data-position="parentW" aria-label="${gutterTip}" 
 data-type="${type}" data-subtype="${nodeElement.getAttribute("data-subtype")}" data-node-id="${dataNodeId}">
    <svg><use xlink:href="#${getIconByType(type, nodeElement.getAttribute("data-subtype"))}"></use></svg>
    <span ${popoverHTML} ${protyle.disabled ? "" : 'draggable="true"'}></span>
-</button>`;
+</button>` : "";
                if (!hideParent) {
                    html = buttonHTML + html;
                }
@ -2618,7 +2630,7 @@ data-type="${type}" data-subtype="${nodeElement.getAttribute("data-subtype")}" d
                if (type === "NodeListItem" && nodeElement.childElementCount > 3 || type === "NodeHeading") {
                    const fold = nodeElement.getAttribute("fold");
                    foldHTML = `<button class="ariaLabel" data-position="parentW" aria-label="${window.siyuan.languages.fold}" 
-data-type="fold" style="cursor:inherit;"><svg style="width: 10px${fold && fold === "1" ? "" : ";transform:rotate(90deg)"}"><use xlink:href="#iconPlay"></use></svg></button>`;
+data-type="fold" style="cursor:inherit;"><svg style="width: 10px;${fold && fold === "1" ? "" : "transform:rotate(90deg)"}"><use xlink:href="#iconPlay"></use></svg></button>`;
                }
                if (type === "NodeListItem" || type === "NodeList") {
                    listItem = nodeElement;
@ -2630,7 +2642,7 @@ data-type="fold" style="cursor:inherit;"><svg style="width: 10px${fold && fold =
                    html = html + foldHTML;
                }
                if (["NodeBlockquote", "NodeCallout"].includes(type)) {
-                    space += 8;
+                    space += 10;
                }
                if ((nodeElement.previousElementSibling && nodeElement.previousElementSibling.getAttribute("data-node-id")) ||
                    nodeElement.parentElement.classList.contains("callout-content")) {
@ -2642,7 +2654,7 @@ data-type="fold" style="cursor:inherit;"><svg style="width: 10px${fold && fold =
                    }
                    // 列表项中的引述块中的第二个段落块块标和引述块左侧样式重叠
                    if (parentElement && ["NodeBlockquote", "NodeCallout"].includes(parentElement.getAttribute("data-type"))) {
-                        space += 8;
+                        space += 10;
                    }
                }
            }
--- a/app/src/protyle/header/Background.ts
+++ b/app/src/protyle/header/Background.ts
@ -262,11 +262,11 @@ export class Background {
                } else if (type === "show-random" && !protyle.disabled) {
                    let html = "";
                    bgs.forEach((item: string, index: number) => {
-                        html += `<div data-index="${index}" style="height: 128px;${item}" class="b3-card b3-card--wrap"></div>`;
+                        html += `<div data-index="${index}" style="height: 128px;${item}" class="b3-card"></div>`;
                    });
                    const dialog = new Dialog({
                        title: window.siyuan.languages.builtIn,
-                        content: `<div class="b3-cards">${html}</div>`,
+                        content: `<div class="b3-cards" style="padding: 16px">${html}</div>`,
                        width: isMobile() ? "92vw" : "912px",
                        height: isMobile() ? "80vh" : "70vh",
                    });
--- a/app/src/protyle/header/openTitleMenu.ts
+++ b/app/src/protyle/header/openTitleMenu.ts
@ -2,7 +2,7 @@ import {fetchPost, fetchSyncPost} from "../../util/fetch";
 import {MenuItem} from "../../menus/Menu";
 import {copySubMenu, exportMd, movePathToMenu, openFileAttr, openFileWechatNotify,} from "../../menus/commonMenuItem";
 import {deleteFile} from "../../editor/deleteFile";
-import {updateHotkeyTip} from "../util/compatibility";
+import {encodeBase64, updateHotkeyTip} from "../util/compatibility";
 /// #if !MOBILE
 import {openBacklink, openGraph, openOutline} from "../../layout/dock/util";
 import * as path from "path";
@ -25,6 +25,8 @@ import {transferBlockRef} from "../../menus/block";
 import {addEditorToDatabase} from "../render/av/addToDatabase";
 import {openFileById} from "../../editor/util";
 import {hasTopClosestByClassName} from "../util/hasClosest";
+import {showMessage} from "../../dialog/message";
+import {removeZWJ} from "../util/normalizeText";

 export const openTitleMenu = (protyle: IProtyle, position: IPosition, from: string) => {
    hideTooltip();
@ -40,12 +42,41 @@ export const openTitleMenu = (protyle: IProtyle, position: IPosition, from: stri
        window.siyuan.menus.menu.element.setAttribute("data-name", Constants.MENU_TITLE);
        const popoverElement = hasTopClosestByClassName(protyle.element, "block__popover", true);
        window.siyuan.menus.menu.element.setAttribute("data-from", popoverElement ? popoverElement.dataset.level + "popover-" + from : "app-" + from);
+        const submenu = copySubMenu([protyle.block.rootID], true, undefined, protyle.block.showAll ? protyle.block.id : protyle.block.rootID);
+        submenu.push({
+            iconHTML: "",
+            label: window.siyuan.languages.copyDoc,
+            accelerator: undefined,
+            click: async () => {
+                const [responseHTML, responseText] = await Promise.all([
+                    fetchSyncPost("/api/block/getBlockDOM", {id: protyle.block.rootID}),
+                    fetchSyncPost("/api/export/exportMdContent", {
+                        id: protyle.block.rootID,
+                        refMode: 3,
+                        embedMode: 1,
+                        yfm: false,
+                        fillCSSVar: false,
+                        adjustHeadingLevel: false
+                    })
+                ]);
+
+                const textHTML = `<!--data-siyuan='${encodeBase64(responseHTML.data.dom)}'-->${removeZWJ(responseHTML.data.dom)}`;
+                await navigator.clipboard.write([
+                    new ClipboardItem({
+                        "text/plain": new Blob([responseText.data.content], {type: "text/plain"}),
+                        "text/html": new Blob([textHTML], {type: "text/html"}),
+                    })
+                ]);
+
+                showMessage(window.siyuan.languages.copied);
+            }
+        });
        window.siyuan.menus.menu.append(new MenuItem({
            id: "copy",
            label: window.siyuan.languages.copy,
            icon: "iconCopy",
            type: "submenu",
-            submenu: copySubMenu([protyle.block.rootID], true, undefined, protyle.block.showAll ? protyle.block.id : protyle.block.rootID)
+            submenu,
        }).element);
        if (!protyle.disabled) {
            window.siyuan.menus.menu.append(movePathToMenu([protyle.path]));
--- a/app/src/protyle/hint/index.ts
+++ b/app/src/protyle/hint/index.ts
@ -647,8 +647,8 @@ ${genHintItemHTML(item)}
            blockRender(protyle, protyle.wysiwyg.element);
            return;
        } else if (this.splitChar === "/" || this.splitChar === "、") {
-            this.enableExtend = true;
            if (value === "((" || value === "{{") {
+                this.enableExtend = true;
                if (value === "((") {
                    hintRef("", protyle, "hint");
                } else {
--- a/app/src/protyle/index.ts
+++ b/app/src/protyle/index.ts
@ -48,6 +48,7 @@ import {getAllModels} from "../layout/getAll";
 import {isSupportCSSHL} from "./render/searchMarkRender";
 import {renderAVAttribute} from "./render/av/blockAttr";
 import {setFoldById, zoomOut} from "../menus/protyle";
+import {setEditMode} from "./util/setEditMode";

 export class Protyle {

@ -306,9 +307,15 @@ export class Protyle {
        }
        let needCreateAction = "";
        data.data[0].doOperations.find((item: IOperation) => {
-             if (this.protyle.options.backlinkData && ["delete", "move"].includes(item.action)) {
+            if (this.protyle.options.backlinkData && ["delete", "move"].includes(item.action)) {
                // 只对特定情况刷新，否则展开、编辑等操作刷新会频繁
                /// #if !MOBILE
+                if (2 == data.data[0].doOperations.length && "insert" === data.data[0].doOperations[0].action && "delete" === data.data[0].doOperations[1].action) {
+                    // 从反链面板复制块到正文粘贴时不再自动刷新反链面板
+                    // The list in the backlink panel no longer collapses automatically https://github.com/siyuan-note/siyuan/issues/17362
+                    return true;
+                }
+
                getAllModels().backlink.find(backlinkItem => {
                    if (backlinkItem.element.contains(this.protyle.element)) {
                        backlinkItem.refresh();
@ -528,4 +535,8 @@ export class Protyle {
    public renderAVAttribute(element: HTMLElement, id: string, cb?: (element: HTMLElement) => void) {
        renderAVAttribute(element, id, this.protyle, cb);
    }
+
+    public switchMode(mode: TEditorMode) {
+        setEditMode(this.protyle, mode);
+    }
 }
--- a/app/src/protyle/preview/image.ts
+++ b/app/src/protyle/preview/image.ts
@ -9,7 +9,7 @@ export const previewImages = (srcList: string[], currentSrc?: string) => {
        let initialViewIndex = -1;
        srcList.forEach((item: string, index: number) => {
            if (item) {
-                html += `<li><img src="${item}"></li>`;
+                html += `<li><img src="${encodeURI(item)}"></li>`;
                if (currentSrc && initialViewIndex === -1 && (currentSrc.endsWith(encodeURI(item)) || currentSrc.endsWith(item))) {
                    initialViewIndex = index;
                }
--- a/app/src/protyle/render/av/asset.ts
+++ b/app/src/protyle/render/av/asset.ts
@ -62,8 +62,8 @@ export const getAssetHTML = (cellElements: HTMLElement[]) => {
    genCellValueByElement("mAsset", cellElements[0]).mAsset.forEach((item, index) => {
        let contentHTML;
        if (item.type === "image") {
-            contentHTML = `<span data-type="openAssetItem" class="fn__flex-1 ariaLabel" aria-label="${item.content}">
-    <img style="max-height: 180px;max-width: 360px;border-radius: var(--b3-border-radius);margin: 4px 0;" src="${getCompressURL(item.content)}"/>
+            contentHTML = `<span data-type="openAssetItem" class="fn__flex-1 ariaLabel" aria-label="${escapeAttr(item.content)}">
+    <img style="max-height: 180px;max-width: 360px;border-radius: var(--b3-border-radius);margin: 4px 0;" src="${getCompressURL(encodeURI(item.content))}"/>
 </span>`;
        } else {
            contentHTML = `<span data-type="openAssetItem" class="fn__ellipsis b3-menu__label ariaLabel" aria-label="${escapeAttr(item.content)}" style="max-width: 360px">${item.name || item.content}</span>`;
@ -203,8 +203,8 @@ export const editAssetItem = (options: {
    const type = options.type as "image" | "file";
    const menu = new Menu(Constants.MENU_AV_ASSET_EDIT, async () => {
        let currentLink = textElements[0].value;
-        if ((!textElements[1] && currentLink === linkAddress) ||
-            (textElements[1] && currentLink === linkAddress && textElements[1].value === options.name)) {
+        if ((!textElements[1] && currentLink === decodeURI(linkAddress)) ||
+            (textElements[1] && currentLink === decodeURI(linkAddress) && textElements[1].value === options.name)) {
            return;
        }
        if (type === "image" && currentLink.startsWith("data:image/")) {
@ -302,7 +302,7 @@ export const editAssetItem = (options: {
            label: window.siyuan.languages.copy,
            icon: "iconCopy",
            click() {
-                writeText(`![](${linkAddress.replace(/%20/g, " ")})`);
+                writeText(`![](${textElements[0].value})`);
            }
        });
        menu.addItem({
@ -310,7 +310,7 @@ export const editAssetItem = (options: {
            label: window.siyuan.languages.copyAsPNG,
            icon: "iconImage",
            click() {
-                copyPNGByLink(linkAddress);
+                copyPNGByLink(textElements[0].value);
            }
        });
    }
@ -333,7 +333,7 @@ export const editAssetItem = (options: {
            label: window.siyuan.languages.rename,
            icon: "iconEdit",
            click() {
-                renameAsset(linkAddress);
+                renameAsset(decodeURI(linkAddress));
                document.querySelector(".av__panel")?.remove();
            }
        });
@ -381,7 +381,7 @@ export const editAssetItem = (options: {
    });
    /// #endif
    const textElements = menu.element.querySelectorAll("textarea");
-    textElements[0].value = linkAddress;
+    textElements[0].value = decodeURI(linkAddress);
    textElements[0].focus();
    textElements[0].select();
    if (textElements.length > 1) {
--- a/app/src/protyle/render/av/cell.ts
+++ b/app/src/protyle/render/av/cell.ts
@ -132,7 +132,7 @@ export const genCellValueByElement = (colType: TAVCol, cellElement: HTMLElement)
            const isImg = item.classList.contains("av__cellassetimg");
            mAsset.push({
                type: isImg ? "image" : "file",
-                content: isImg ? removeCompressURL(item.getAttribute("src")) : item.getAttribute("data-url"),
+                content: isImg ? removeCompressURL(decodeURI(item.getAttribute("src"))) : item.getAttribute("data-url"),
                name: isImg ? "" : item.getAttribute("data-name")
            });
        });
@ -786,13 +786,6 @@ export const updateCellsValue = async (protyle: IProtyle, nodeElement: HTMLEleme
                    name = getAssetName(value) + pathPosix().extname(value);
                }
                // https://github.com/siyuan-note/siyuan/issues/12308
-                if (link) {
-                    htmlValue.push({
-                        type: "file",
-                        content: link,
-                        name
-                    });
-                }
                if (html) {
                    const tempElement = document.createElement("template");
                    tempElement.innerHTML = html;
@ -811,14 +804,28 @@ export const updateCellsValue = async (protyle: IProtyle, nodeElement: HTMLEleme
                            });
                        }
                    });
-                    if (htmlValue.length === 0 && value) {
+                }
+                if (link) {
+                    const hasExited = htmlValue.find(valueItem => {
+                        if (valueItem.content === link) {
+                            return true;
+                        }
+                    });
+                    if (!hasExited) {
                        htmlValue.push({
                            type: "file",
-                            content: "",
-                            name: value
+                            content: link,
+                            name
                        });
                    }
                }
+                if (htmlValue.length === 0 && value) {
+                    htmlValue.push({
+                        type: "file",
+                        content: "",
+                        name: value
+                    });
+                }
                newValue = oldValue.mAsset.concat(htmlValue);
            }
        } else if (type === "mSelect" || type === "select") {
@ -996,7 +1003,7 @@ export const renderCell = (cellValue: IAVCellValue, rowIndex = 0, showIcon = tru
    } else if (cellValue.type === "mAsset") {
        cellValue?.mAsset?.forEach((item) => {
            if (item.type === "image") {
-                text += `<img loading="lazy" class="av__cellassetimg ariaLabel" aria-label="${item.content}" src="${getCompressURL(item.content)}">`;
+                text += `<img loading="lazy" class="av__cellassetimg ariaLabel" aria-label="${escapeAttr(item.content)}" src="${getCompressURL(encodeURI(item.content))}">`;
            } else {
                text += `<span class="b3-chip av__celltext--url ariaLabel" aria-label="${escapeAttr(item.content)}" data-name="${escapeAttr(item.name)}" data-url="${escapeAttr(item.content)}">${item.name || item.content}</span>`;
            }
--- a/app/src/protyle/render/highlightRender.ts
+++ b/app/src/protyle/render/highlightRender.ts
@ -2,6 +2,7 @@ import {addScript} from "../util/addScript";
 import {Constants} from "../../constants";
 import {focusByOffset} from "../util/selection";
 import {setCodeTheme} from "./util";
+import {escapeHtml} from "../../util/escape";

 export const highlightRender = (element: Element, cdn = Constants.PROTYLE_CDN, zoom = 1) => {
    let codeElements: NodeListOf<Element>;
@ -116,24 +117,26 @@ export const highlightRender = (element: Element, cdn = Constants.PROTYLE_CDN, z
    });
 };

-export const lineNumberRender = (block: HTMLElement, zoom = 1) => {
-    const lineNumber = block.parentElement.getAttribute("lineNumber");
+export const lineNumberRender = (hljsElement: HTMLElement, zoom = 1) => {
+    const lineNumber = hljsElement.parentElement.getAttribute("lineNumber");
    if (lineNumber === "false") {
        return;
    }
    if (!window.siyuan.config.editor.codeSyntaxHighlightLineNum && lineNumber !== "true") {
        return;
    }
+    const codeElement = hljsElement.lastElementChild as HTMLElement;
+    if (hljsElement.firstElementChild.clientHeight === codeElement.clientHeight && codeElement.style.wordBreak !== "break-word") {
+        return;
+    }
    // clientHeight 总是取的整数
-    block.parentElement.style.lineHeight = `${((parseInt(block.parentElement.style.fontSize) || window.siyuan.config.editor.fontSize) * 1.625 * 0.85).toFixed(0)}px`;
-    const codeElement = block.lastElementChild as HTMLElement;
-
+    hljsElement.parentElement.style.lineHeight = `${((parseInt(hljsElement.parentElement.style.fontSize) || window.siyuan.config.editor.fontSize) * 1.625 * 0.85).toFixed(0)}px`;
    const lineList = codeElement.textContent.split(/\r\n|\r|\n|\u2028|\u2029/g);
    if (lineList[lineList.length - 1] === "" && lineList.length > 1) {
        lineList.pop();
    }
-    block.firstElementChild.innerHTML = `<span>${lineList.length}</span>`;
-    codeElement.style.paddingLeft = `${block.firstElementChild.clientWidth + 16}px`;
+    hljsElement.firstElementChild.innerHTML = `<span>${lineList.length}</span>`;
+    codeElement.style.paddingLeft = `${hljsElement.firstElementChild.clientWidth + 16}px`;
    let lineNumberHTML = "";
    if (codeElement.style.wordBreak === "break-word") {
        // 代码块开启了换行
@ -142,7 +145,7 @@ export const lineNumberRender = (block: HTMLElement, zoom = 1) => {
        lineNumberTemp.className = "hljs";
        // 不能使用 codeElement.clientWidth，被忽略小数点导致宽度不一致
        // 需要手动复制字体样式 https://ld246.com/article/1762527296449
-        lineNumberTemp.setAttribute("style", `padding-left:${codeElement.style.paddingLeft};
+        lineNumberTemp.innerHTML = `<div contenteditable="true" style="padding-left:${codeElement.style.paddingLeft};
 width: ${codeElement.getBoundingClientRect().width / zoom}px;
 white-space:${codeElementStyle.whiteSpace};
 word-break:${codeElementStyle.wordBreak};
@ -151,31 +154,26 @@ font-family:${codeElementStyle.fontFamily};
 font-size:${codeElementStyle.fontSize};
 line-height:${codeElementStyle.lineHeight};
 font-weight:${codeElementStyle.fontWeight};
-padding-right:0;max-height: none;box-sizing: border-box;position: absolute;padding-top:0 !important;padding-bottom:0 !important;min-height:auto !important;`);
-        lineNumberTemp.setAttribute("contenteditable", "true");
-        block.insertAdjacentElement("afterend", lineNumberTemp);
+padding-right:0;max-height: none;box-sizing: border-box;position: absolute;padding-top:0 !important;padding-bottom:0 !important;min-height:auto !important;"></div>`;
+        lineNumberTemp.firstElementChild.innerHTML = lineList.map(line =>
+            `<div>${line.trim() ? escapeHtml(line) : "&nbsp;" }</div>`
+        ).join("");
+        hljsElement.insertAdjacentElement("afterend", lineNumberTemp);

-        lineList.map((line) => {
-            // windows 下空格高度为 0 https://github.com/siyuan-note/siyuan/issues/12346
-            lineNumberTemp.textContent = line.trim() ? line : "<br>";
-            // 不能使用 lineNumberTemp.getBoundingClientRect().height.toFixed(1) 否则
-            // windows 需等待字体下载完成再计算，否则导致不换行，高度计算错误
-            // https://github.com/siyuan-note/siyuan/issues/9029
-            // https://github.com/siyuan-note/siyuan/issues/9140
-            lineNumberHTML += `<span style="height:${lineNumberTemp.clientHeight}px"></span>`;
-        });
+        const childNodes = lineNumberTemp.firstElementChild.children;
+        for (let i = 0; i < childNodes.length; i++) {
+            lineNumberHTML += `<span style="height:${childNodes[i].clientHeight}px"></span>`;
+        }
        lineNumberTemp.remove();
    } else {
        lineNumberHTML = "<span></span>".repeat(lineList.length);
    }
-
-    block.firstElementChild.innerHTML = lineNumberHTML;
-
+    hljsElement.firstElementChild.innerHTML = lineNumberHTML;
    // https://github.com/siyuan-note/siyuan/issues/12726
-    if (block.scrollHeight > block.clientHeight) {
+    if (hljsElement.scrollHeight > hljsElement.clientHeight) {
        if (getSelection().rangeCount > 0) {
            const range = getSelection().getRangeAt(0);
-            if (block.contains(range.startContainer)) {
+            if (hljsElement.contains(range.startContainer)) {
                const brElement = document.createElement("br");
                range.insertNode(brElement);
                brElement.scrollIntoView({block: "nearest"});
--- a/app/src/protyle/render/mermaidRender.ts
+++ b/app/src/protyle/render/mermaidRender.ts
@ -98,7 +98,15 @@ const initMermaid = (mermaidElements: Element[]) => {
        try {
            renderElement.innerHTML = `<span style="position: absolute;left:0;top:0;width: 1px;">${Constants.ZWSP}</span><div contenteditable="false"><span id="${id}"></span></div>`;
            const mermaidData = await window.mermaid.render(id, Lute.UnEscapeHTMLStr(item.getAttribute("data-content")));
-            renderElement.lastElementChild.innerHTML = mermaidData.svg;
+            let svg = mermaidData.svg.replace(/(href|src|xlink:href)\s*=\s*["']\\\\/gi, (match, p1) => `${p1}="about:blank"`);
+            svg = window.DOMPurify.sanitize(svg, {
+                USE_PROFILES: { svg: true, svgFilters: true },
+                ADD_TAGS: ["foreignObject", "use", "style"],
+                    ADD_ATTR: ["dominant-baseline", "xlink:href", "href"], // 保留对齐和链接属性
+                    // 必须添加此项，否则 foreignObject 里的 HTML 内容会被清空
+                    HTML_INTEGRATION_POINTS: { foreignobject: true }
+            });
+            renderElement.lastElementChild.innerHTML = svg;
        } catch (e) {
            const errorElement = document.querySelector("#" + id);
            renderElement.lastElementChild.innerHTML = `${errorElement.outerHTML}<div class="fn__hr"></div><div class="ft__error">${e.message.replace(/\n/, "<br>")}</div>`;
--- a/app/src/protyle/render/setLute.ts
+++ b/app/src/protyle/render/setLute.ts
@ -47,6 +47,10 @@ export const setLute = (options: ILuteOptions) => {
        });
        lute.PutEmojis(emojis);
    }
-    lute.SetUnorderedListMarker("-");;
+    lute.SetUnorderedListMarker("-");
+    lute.SetDataTask(true);
+    lute.SetExportNormalizeTaskListMarker(true);
+    lute.SetArbitraryTaskListItemMarker(true);
+
    return lute;
 };
--- a/app/src/protyle/upload/index.ts
+++ b/app/src/protyle/upload/index.ts
@ -389,7 +389,7 @@ export const uploadFiles = (protyle: IProtyle, files: FileList | DataTransferIte
                        genUploadedLabel(responseText, protyle);
                    }
                } else if (xhr.status === 0) {
-                    showMessage(window.siyuan.languages.fileTypeError);
+                    showMessage(window.siyuan.languages["_kernel"][28]);
                } else {
                    if (protyle.options.upload.error) {
                        protyle.options.upload.error(xhr.responseText);
--- a/Show more
+++ b/Show more