An open-source, privacy-first, self-hosted knowledge workspace where humans and AI agents work together 开源、隐私优先、自托管的知识工作空间,让人与智能体在此协作
TypeScript agentic-aiai-agentknowledge-baselocal-firstmarkdownmcpmindmapnote-takingself-hostedsiyuanworkspace
:sparkles: Support compact and full block indicators https://github.com/siyuan-note/siyuan/issues/20647
Danielb49db8171e9c
diff --git a/app/appearance/langs/ar.json b/app/appearance/langs/ar.jsonindex bb5c1c21a6..9724c7f47a 100644--- a/app/appearance/langs/ar.json+++ b/app/appearance/langs/ar.json@@ -1,4 +1,8 @@{+ "blockGutterMode": "وضع مؤشرات الكتل",+ "blockGutterModeTip": "الوضع المختصر هو الافتراضي؛ يعرض الوضع الكامل مؤشرات الكتلة الحالية وجميع حاوياتها",+ "blockGutterCompact": "مختصر",+ "blockGutterFull": "كامل","automationCollectionTarget": "هدف التجميع","automationCollectionTargetBlock": "الكتلة التي تحتوي على الوسم","automationCollectionTargetContainer": "كتلة الحاوية",diff --git a/app/appearance/langs/de.json b/app/appearance/langs/de.jsonindex b498a06863..61fdbb841a 100644--- a/app/appearance/langs/de.json+++ b/app/appearance/langs/de.json@@ -1,4 +1,8 @@{+ "blockGutterMode": "Modus der Blockmarkierungen",+ "blockGutterModeTip": "Standardmäßig kompakt; der vollständige Modus zeigt Markierungen für den aktuellen Block und alle seine Container",+ "blockGutterCompact": "Kompakt",+ "blockGutterFull": "Vollständig","automationCollectionTarget": "Sammelziel","automationCollectionTargetBlock": "Block mit dem Tag","automationCollectionTargetContainer": "Containerblock",diff --git a/app/appearance/langs/en.json b/app/appearance/langs/en.jsonindex 044c5dc54e..c41609ac40 100644--- a/app/appearance/langs/en.json+++ b/app/appearance/langs/en.json@@ -1,4 +1,8 @@{+ "blockGutterMode": "Block indicator mode",+ "blockGutterModeTip": "Compact by default; full mode shows indicators for the current block and all its containers",+ "blockGutterCompact": "Compact",+ "blockGutterFull": "Full","automationCollectionTarget": "Collect","automationCollectionTargetBlock": "Block containing the tag","automationCollectionTargetContainer": "Container block",diff --git a/app/appearance/langs/es.json b/app/appearance/langs/es.jsonindex 7d9f40a30d..0380891c0c 100644--- a/app/appearance/langs/es.json+++ b/app/appearance/langs/es.json@@ -1,4 +1,8 @@{+ "blockGutterMode": "Modo de indicadores de bloque",+ "blockGutterModeTip": "Compacto por defecto; el modo completo muestra los indicadores del bloque actual y de todos sus contenedores",+ "blockGutterCompact": "Compacto",+ "blockGutterFull": "Completo","automationCollectionTarget": "Objeto de recopilación","automationCollectionTargetBlock": "Bloque que contiene la etiqueta","automationCollectionTargetContainer": "Bloque contenedor",diff --git a/app/appearance/langs/fr.json b/app/appearance/langs/fr.jsonindex ac1db97bf0..042568d74a 100644--- a/app/appearance/langs/fr.json+++ b/app/appearance/langs/fr.json@@ -1,4 +1,8 @@{+ "blockGutterMode": "Mode des indicateurs de bloc",+ "blockGutterModeTip": "Compact par défaut ; le mode complet affiche les indicateurs du bloc actuel et de tous ses conteneurs",+ "blockGutterCompact": "Compact",+ "blockGutterFull": "Complet","automationCollectionTarget": "Objet à collecter","automationCollectionTargetBlock": "Bloc contenant l’étiquette","automationCollectionTargetContainer": "Bloc conteneur",diff --git a/app/appearance/langs/he.json b/app/appearance/langs/he.jsonindex 225a9e8b0a..2abd9291df 100644--- a/app/appearance/langs/he.json+++ b/app/appearance/langs/he.json@@ -1,4 +1,8 @@{+ "blockGutterMode": "מצב סמני בלוקים",+ "blockGutterModeTip": "מצב מצומצם כברירת מחדל; מצב מלא מציג סמנים לבלוק הנוכחי ולכל המכלים שלו",+ "blockGutterCompact": "מצומצם",+ "blockGutterFull": "מלא","automationCollectionTarget": "יעד האיסוף","automationCollectionTargetBlock": "בלוק המכיל את התגית","automationCollectionTargetContainer": "בלוק מכל",diff --git a/app/appearance/langs/hi.json b/app/appearance/langs/hi.jsonindex 3e1380e623..c700479edf 100644--- a/app/appearance/langs/hi.json+++ b/app/appearance/langs/hi.json@@ -1,4 +1,8 @@{+ "blockGutterMode": "ब्लॉक संकेतक मोड",+ "blockGutterModeTip": "डिफ़ॉल्ट रूप से संक्षिप्त; पूर्ण मोड में वर्तमान ब्लॉक और उसके सभी कंटेनर के संकेतक दिखते हैं",+ "blockGutterCompact": "संक्षिप्त",+ "blockGutterFull": "पूर्ण","automationCollectionTarget": "संग्रह लक्ष्य","automationCollectionTargetBlock": "टैग वाला ब्लॉक","automationCollectionTargetContainer": "कंटेनर ब्लॉक",diff --git a/app/appearance/langs/id.json b/app/appearance/langs/id.jsonindex 7548f71309..9fa7debc40 100644--- a/app/appearance/langs/id.json+++ b/app/appearance/langs/id.json@@ -1,4 +1,8 @@{+ "blockGutterMode": "Mode indikator blok",+ "blockGutterModeTip": "Ringkas secara bawaan; mode lengkap menampilkan indikator blok saat ini dan semua wadahnya",+ "blockGutterCompact": "Ringkas",+ "blockGutterFull": "Lengkap","automationCollectionTarget": "Objek pengumpulan","automationCollectionTargetBlock": "Blok yang berisi tag","automationCollectionTargetContainer": "Blok wadah",diff --git a/app/appearance/langs/it.json b/app/appearance/langs/it.jsonindex e9ea36b3f3..39d71317db 100644--- a/app/appearance/langs/it.json+++ b/app/appearance/langs/it.json@@ -1,4 +1,8 @@{+ "blockGutterMode": "Modalità degli indicatori di blocco",+ "blockGutterModeTip": "Compatta per impostazione predefinita; la modalità completa mostra gli indicatori del blocco corrente e di tutti i suoi contenitori",+ "blockGutterCompact": "Compatta",+ "blockGutterFull": "Completa","automationCollectionTarget": "Oggetto da raccogliere","automationCollectionTargetBlock": "Blocco contenente il tag","automationCollectionTargetContainer": "Blocco contenitore",diff --git a/app/appearance/langs/ja.json b/app/appearance/langs/ja.jsonindex 2d184fde75..3e569d9e34 100644--- a/app/appearance/langs/ja.json+++ b/app/appearance/langs/ja.json@@ -1,4 +1,8 @@{+ "blockGutterMode": "ブロックアイコンの表示モード",+ "blockGutterModeTip": "既定は簡略表示です。完全表示では、現在のブロックと、それを含むすべてのコンテナのアイコンを表示します",+ "blockGutterCompact": "簡略",+ "blockGutterFull": "完全","automationCollectionTarget": "収集対象","automationCollectionTargetBlock": "タグを含むブロック","automationCollectionTargetContainer": "コンテナブロック",diff --git a/app/appearance/langs/ko.json b/app/appearance/langs/ko.jsonindex c7518d73c8..49de56c743 100644--- a/app/appearance/langs/ko.json+++ b/app/appearance/langs/ko.json@@ -1,4 +1,8 @@{+ "blockGutterMode": "블록 표시 모드",+ "blockGutterModeTip": "기본값은 간소화이며, 전체 모드는 현재 블록과 이를 포함하는 모든 컨테이너의 표시를 보여줍니다",+ "blockGutterCompact": "간소화",+ "blockGutterFull": "전체","automationCollectionTarget": "수집 대상","automationCollectionTargetBlock": "태그가 있는 블록","automationCollectionTargetContainer": "컨테이너 블록",diff --git a/app/appearance/langs/nl.json b/app/appearance/langs/nl.jsonindex 7167753fda..111b5452a8 100644--- a/app/appearance/langs/nl.json+++ b/app/appearance/langs/nl.json@@ -1,4 +1,8 @@{+ "blockGutterMode": "Modus voor blokindicatoren",+ "blockGutterModeTip": "Standaard compact; de volledige modus toont indicatoren voor het huidige blok en alle bijbehorende containers",+ "blockGutterCompact": "Compact",+ "blockGutterFull": "Volledig","automationCollectionTarget": "Verzameldoel","automationCollectionTargetBlock": "Blok met de tag","automationCollectionTargetContainer": "Containerblok",diff --git a/app/appearance/langs/pl.json b/app/appearance/langs/pl.jsonindex db9916c786..d2f9e02cd6 100644--- a/app/appearance/langs/pl.json+++ b/app/appearance/langs/pl.json@@ -1,4 +1,8 @@{+ "blockGutterMode": "Tryb wskaźników bloków",+ "blockGutterModeTip": "Domyślnie kompaktowy; tryb pełny pokazuje wskaźniki bieżącego bloku i wszystkich jego kontenerów",+ "blockGutterCompact": "Kompaktowy",+ "blockGutterFull": "Pełny","automationCollectionTarget": "Obiekt zbierania","automationCollectionTargetBlock": "Blok zawierający tag","automationCollectionTargetContainer": "Blok kontenera",diff --git a/app/appearance/langs/pt-BR.json b/app/appearance/langs/pt-BR.jsonindex ef1e688f6d..4675ae555f 100644--- a/app/appearance/langs/pt-BR.json+++ b/app/appearance/langs/pt-BR.json@@ -1,4 +1,8 @@{+ "blockGutterMode": "Modo dos indicadores de bloco",+ "blockGutterModeTip": "Compacto por padrão; o modo completo mostra os indicadores do bloco atual e de todos os seus contêineres",+ "blockGutterCompact": "Compacto",+ "blockGutterFull": "Completo","automationCollectionTarget": "Objeto da coleta","automationCollectionTargetBlock": "Bloco que contém a etiqueta","automationCollectionTargetContainer": "Bloco contêiner",diff --git a/app/appearance/langs/ru.json b/app/appearance/langs/ru.jsonindex 63154020e2..1d35383962 100644--- a/app/appearance/langs/ru.json+++ b/app/appearance/langs/ru.json@@ -1,4 +1,8 @@{+ "blockGutterMode": "Режим значков блоков",+ "blockGutterModeTip": "По умолчанию компактный; полный режим показывает значки текущего блока и всех его контейнеров",+ "blockGutterCompact": "Компактный",+ "blockGutterFull": "Полный","automationCollectionTarget": "Объект сбора","automationCollectionTargetBlock": "Блок с тегом","automationCollectionTargetContainer": "Блок-контейнер",diff --git a/app/appearance/langs/sk.json b/app/appearance/langs/sk.jsonindex 6dff34e192..ccbf58f239 100644--- a/app/appearance/langs/sk.json+++ b/app/appearance/langs/sk.json@@ -1,4 +1,8 @@{+ "blockGutterMode": "Režim indikátorov blokov",+ "blockGutterModeTip": "Predvolene kompaktný; úplný režim zobrazuje indikátory aktuálneho bloku a všetkých jeho kontajnerov",+ "blockGutterCompact": "Kompaktný",+ "blockGutterFull": "Úplný","automationCollectionTarget": "Objekt zbierania","automationCollectionTargetBlock": "Blok obsahujúci značku","automationCollectionTargetContainer": "Kontajnerový blok",diff --git a/app/appearance/langs/sr.json b/app/appearance/langs/sr.jsonindex 4b2effac99..962c756c2b 100644--- a/app/appearance/langs/sr.json+++ b/app/appearance/langs/sr.json@@ -1,4 +1,8 @@{+ "blockGutterMode": "Режим ознака блокова",+ "blockGutterModeTip": "Подразумевано сажет; потпуни режим приказује ознаке тренутног блока и свих његових контејнера",+ "blockGutterCompact": "Сажет",+ "blockGutterFull": "Потпун","automationCollectionTarget": "Објекат прикупљања","automationCollectionTargetBlock": "Блок који садржи ознаку","automationCollectionTargetContainer": "Контејнерски блок",diff --git a/app/appearance/langs/th.json b/app/appearance/langs/th.jsonindex 6e39974714..a0682ca88d 100644--- a/app/appearance/langs/th.json+++ b/app/appearance/langs/th.json@@ -1,4 +1,8 @@{+ "blockGutterMode": "โหมดตัวบ่งชี้บล็อก",+ "blockGutterModeTip": "ค่าเริ่มต้นเป็นแบบย่อ โดยโหมดเต็มจะแสดงตัวบ่งชี้ของบล็อกปัจจุบันและคอนเทนเนอร์ทั้งหมดที่ครอบบล็อกนั้น",+ "blockGutterCompact": "ย่อ",+ "blockGutterFull": "เต็ม","automationCollectionTarget": "เป้าหมายการรวบรวม","automationCollectionTargetBlock": "บล็อกที่มีแท็ก","automationCollectionTargetContainer": "บล็อกคอนเทนเนอร์",diff --git a/app/appearance/langs/tr.json b/app/appearance/langs/tr.jsonindex 238bd0349e..f612a6b906 100644--- a/app/appearance/langs/tr.json+++ b/app/appearance/langs/tr.json@@ -1,4 +1,8 @@{+ "blockGutterMode": "Blok göstergesi modu",+ "blockGutterModeTip": "Varsayılan olarak sade; tam mod, geçerli bloğun ve onu içeren tüm kapsayıcıların göstergelerini gösterir",+ "blockGutterCompact": "Sade",+ "blockGutterFull": "Tam","automationCollectionTarget": "Toplanacak nesne","automationCollectionTargetBlock": "Etiketi içeren blok","automationCollectionTargetContainer": "Kapsayıcı blok",diff --git a/app/appearance/langs/uk.json b/app/appearance/langs/uk.jsonindex 21158c70f2..ce3c71c9ad 100644--- a/app/appearance/langs/uk.json+++ b/app/appearance/langs/uk.json@@ -1,4 +1,8 @@{+ "blockGutterMode": "Режим значків блоків",+ "blockGutterModeTip": "Типово компактний; повний режим показує значки поточного блоку та всіх його контейнерів",+ "blockGutterCompact": "Компактний",+ "blockGutterFull": "Повний","automationCollectionTarget": "Об’єкт збирання","automationCollectionTargetBlock": "Блок із тегом","automationCollectionTargetContainer": "Блок-контейнер",diff --git a/app/appearance/langs/zh-CN.json b/app/appearance/langs/zh-CN.jsonindex 0c58b718a6..ece17e2e32 100644--- a/app/appearance/langs/zh-CN.json+++ b/app/appearance/langs/zh-CN.json@@ -1,4 +1,8 @@{+ "blockGutterMode": "块标显示模式",+ "blockGutterModeTip": "默认精简显示,完整模式显示当前块及其所属容器的全部块标",+ "blockGutterCompact": "精简",+ "blockGutterFull": "完整","automationCollectionTarget": "收集对象","automationCollectionTargetBlock": "标签所在块","automationCollectionTargetContainer": "容器块",diff --git a/app/appearance/langs/zh-TW.json b/app/appearance/langs/zh-TW.jsonindex 6dcd859545..64c0fbcae8 100644--- a/app/appearance/langs/zh-TW.json+++ b/app/appearance/langs/zh-TW.json@@ -1,4 +1,8 @@{+ "blockGutterMode": "區塊標顯示模式",+ "blockGutterModeTip": "預設精簡顯示,完整模式顯示目前區塊及其所屬容器的所有區塊標",+ "blockGutterCompact": "精簡",+ "blockGutterFull": "完整","automationCollectionTarget": "收集對象","automationCollectionTargetBlock": "標籤所在區塊","automationCollectionTargetContainer": "容器區塊",diff --git a/app/guide/20210808180117-6v0mkxr/20200923234731-h3zkwm2.sy b/app/guide/20210808180117-6v0mkxr/20200923234731-h3zkwm2.syindex b828ad8a0c..59a1f4d71f 100644--- a/app/guide/20210808180117-6v0mkxr/20200923234731-h3zkwm2.sy+++ b/app/guide/20210808180117-6v0mkxr/20200923234731-h3zkwm2.sy@@ -7,7 +7,7 @@"id": "20200923234731-h3zkwm2","title": "FAQ","type": "doc",- "updated": "20261016191102"+ "updated": "20261017212429"},"Children": [{@@ -1077,6 +1077,56 @@}]},+ {+ "ID": "20261017212429-ykfqzzo",+ "Type": "NodeParagraph",+ "Properties": {+ "id": "20261017212429-ykfqzzo",+ "updated": "20261017212429"+ },+ "Children": [+ {+ "Type": "NodeText",+ "Data": "Compact indicators are used by default. To show indicators for the current block and all its containers, open "+ },+ {+ "Type": "NodeTextMark",+ "TextMarkType": "kbd",+ "TextMarkTextContent": "Settings"+ },+ {+ "Type": "NodeText",+ "Data": " - "+ },+ {+ "Type": "NodeTextMark",+ "TextMarkType": "kbd",+ "TextMarkTextContent": "Editor"+ },+ {+ "Type": "NodeText",+ "Data": " - "+ },+ {+ "Type": "NodeTextMark",+ "TextMarkType": "kbd",+ "TextMarkTextContent": "Behavior"+ },+ {+ "Type": "NodeText",+ "Data": " - "+ },+ {+ "Type": "NodeTextMark",+ "TextMarkType": "kbd",+ "TextMarkTextContent": "Block indicator mode"+ },+ {+ "Type": "NodeText",+ "Data": " and select Full. Each indicator opens the corresponding block menu and provides a drag handle."+ }+ ]+ },{"ID": "20220501231348-bfslmf5","Type": "NodeParagraph",diff --git a/app/guide/20210808180117-czj9bvb/20200813093015-u6bopdt.sy b/app/guide/20210808180117-czj9bvb/20200813093015-u6bopdt.syindex 6e3c242781..4601cf9f6c 100644--- a/app/guide/20210808180117-czj9bvb/20200813093015-u6bopdt.sy+++ b/app/guide/20210808180117-czj9bvb/20200813093015-u6bopdt.sy@@ -7,7 +7,7 @@"id": "20200813093015-u6bopdt","title": "常见问题","type": "doc",- "updated": "20261016202635"+ "updated": "20261017212429"},"Children": [{@@ -1069,6 +1069,56 @@}]},+ {+ "ID": "20261017212429-ssbwd82",+ "Type": "NodeParagraph",+ "Properties": {+ "id": "20261017212429-ssbwd82",+ "updated": "20261017212429"+ },+ "Children": [+ {+ "Type": "NodeText",+ "Data": "默认使用精简块标。若要显示当前块及其所属容器的全部块标,可在 "+ },+ {+ "Type": "NodeTextMark",+ "TextMarkType": "kbd",+ "TextMarkTextContent": "设置"+ },+ {+ "Type": "NodeText",+ "Data": " - "+ },+ {+ "Type": "NodeTextMark",+ "TextMarkType": "kbd",+ "TextMarkTextContent": "编辑器"+ },+ {+ "Type": "NodeText",+ "Data": " - "+ },+ {+ "Type": "NodeTextMark",+ "TextMarkType": "kbd",+ "TextMarkTextContent": "行为"+ },+ {+ "Type": "NodeText",+ "Data": " - "+ },+ {+ "Type": "NodeTextMark",+ "TextMarkType": "kbd",+ "TextMarkTextContent": "块标显示模式"+ },+ {+ "Type": "NodeText",+ "Data": " 中选择「完整」,通过各层块标直接打开对应块的菜单或拖拽该块。"+ }+ ]+ },{"ID": "20220501230748-wvrcnzu","Type": "NodeParagraph",diff --git a/app/guide/20211226090932-5lcq56f/20211226115227-r1rty9v.sy b/app/guide/20211226090932-5lcq56f/20211226115227-r1rty9v.syindex 2bed04f68d..7b5aee48cd 100644--- a/app/guide/20211226090932-5lcq56f/20211226115227-r1rty9v.sy+++ b/app/guide/20211226090932-5lcq56f/20211226115227-r1rty9v.sy@@ -7,7 +7,7 @@"id": "20211226115227-r1rty9v","title": "常見問題","type": "doc",- "updated": "20261016191102"+ "updated": "20261017212429"},"Children": [{@@ -1073,6 +1073,56 @@}]},+ {+ "ID": "20261017212429-ke3nbw0",+ "Type": "NodeParagraph",+ "Properties": {+ "id": "20261017212429-ke3nbw0",+ "updated": "20261017212429"+ },+ "Children": [+ {+ "Type": "NodeText",+ "Data": "預設使用精簡區塊標。若要顯示目前區塊及其所屬容器的所有區塊標,可在 "+ },+ {+ "Type": "NodeTextMark",+ "TextMarkType": "kbd",+ "TextMarkTextContent": "設定"+ },+ {+ "Type": "NodeText",+ "Data": " - "+ },+ {+ "Type": "NodeTextMark",+ "TextMarkType": "kbd",+ "TextMarkTextContent": "編輯器"+ },+ {+ "Type": "NodeText",+ "Data": " - "+ },+ {+ "Type": "NodeTextMark",+ "TextMarkType": "kbd",+ "TextMarkTextContent": "行為"+ },+ {+ "Type": "NodeText",+ "Data": " - "+ },+ {+ "Type": "NodeTextMark",+ "TextMarkType": "kbd",+ "TextMarkTextContent": "區塊標顯示模式"+ },+ {+ "Type": "NodeText",+ "Data": " 中選擇「完整」,透過各層區塊標直接開啟對應區塊的選單或拖曳該區塊。"+ }+ ]+ },{"ID": "20220501231338-vs50rai","Type": "NodeParagraph",diff --git a/app/guide/20240530133126-axarxgx/20240530101000-jp793ic.sy b/app/guide/20240530133126-axarxgx/20240530101000-jp793ic.syindex 811c6fa907..b90101502a 100644--- a/app/guide/20240530133126-axarxgx/20240530101000-jp793ic.sy+++ b/app/guide/20240530133126-axarxgx/20240530101000-jp793ic.sy@@ -8,7 +8,7 @@"id": "20240530101000-jp793ic","title": "よくある質問","type": "doc",- "updated": "20261016202856"+ "updated": "20261017212429"},"Children": [{@@ -1129,6 +1129,56 @@}]},+ {+ "ID": "20261017212429-yem61n3",+ "Type": "NodeParagraph",+ "Properties": {+ "id": "20261017212429-yem61n3",+ "updated": "20261017212429"+ },+ "Children": [+ {+ "Type": "NodeText",+ "Data": "既定では簡略表示です。現在のブロックと、それを含むすべてのコンテナのアイコンを表示するには "+ },+ {+ "Type": "NodeTextMark",+ "TextMarkType": "kbd",+ "TextMarkTextContent": "設定"+ },+ {+ "Type": "NodeText",+ "Data": " - "+ },+ {+ "Type": "NodeTextMark",+ "TextMarkType": "kbd",+ "TextMarkTextContent": "エディタ"+ },+ {+ "Type": "NodeText",+ "Data": " - "+ },+ {+ "Type": "NodeTextMark",+ "TextMarkType": "kbd",+ "TextMarkTextContent": "動作"+ },+ {+ "Type": "NodeText",+ "Data": " - "+ },+ {+ "Type": "NodeTextMark",+ "TextMarkType": "kbd",+ "TextMarkTextContent": "ブロックアイコンの表示モード"+ },+ {+ "Type": "NodeText",+ "Data": " で「完全」を選択します。各アイコンから対応するブロックのメニューを開いたり、そのブロックをドラッグしたりできます。"+ }+ ]+ },{"ID": "20240530101000-iryhc7k","Type": "NodeParagraph",diff --git a/app/src/assets/scss/protyle/_protyle.scss b/app/src/assets/scss/protyle/_protyle.scssindex 72e40defba..2fbc816d99 100644--- a/app/src/assets/scss/protyle/_protyle.scss+++ b/app/src/assets/scss/protyle/_protyle.scss@@ -147,6 +147,22 @@pointer-events: none;}+ &--full {+ display: flex;+ flex-wrap: wrap;+ width: max-content;+ scrollbar-width: none;+ overscroll-behavior: contain;++ > button {+ flex-shrink: 0;+ }+ }++ &[data-scrollable="true"] span {+ touch-action: pan-y;+ }+button {border: 0;background-color: transparent;diff --git a/app/src/config/tabs/editorGutterMode.test.ts b/app/src/config/tabs/editorGutterMode.test.tsnew file mode 100644index 0000000000..19de9d4564--- /dev/null+++ b/app/src/config/tabs/editorGutterMode.test.ts@@ -0,0 +1,42 @@+import * as assert from "node:assert/strict";+import {readFileSync} from "node:fs";+import {test} from "node:test";+import {runInNewContext} from "node:vm";+import {createSourceFile, ScriptTarget, transpileModule} from "typescript";++const {parse} = require("ifdef-loader/preprocessor");++for (const mobile of [false, true]) {+ test(`block indicator mode follows badges in editor behavior settings (mobile=${mobile})`, () => {+ const source = createSourceFile("editorTab.ts", parse(readFileSync("src/config/tabs/editorTab.ts", "utf8"),+ {BROWSER: true, MOBILE: mobile}, false, true), ScriptTarget.ES2021, true);+ const registration = source.statements.find(node => node.getText(source).startsWith("const registerEditorBehaviorGroup ="));+ assert.ok(registration);+ const rows: Array<{kind: string; id: string; spec: {title: string; options?: Array<{value: number; label: string}>}}> = [];+ const exports: {register?: (tab: unknown) => void} = {};+ runInNewContext(transpileModule(registration.getText(source), {+ compilerOptions: {target: ScriptTarget.ES2021},+ }).outputText + "\nexports.register = registerEditorBehaviorGroup;", {+ exports,+ window: {siyuan: {languages: new Proxy({}, {get: (_, key) => String(key)}),+ config: {keymap: {general: {editReadonly: {custom: ""}}}}}},+ isMobile: () => mobile, isBrowser: () => true,+ updateHotkeyTip: String,+ CODE_TAB_SPACE_VALUES: [0, 2, 4, 6, 8], getCodeTabSpacesLabel: String,+ });+ exports.register({group: (name: string) => {+ assert.equal(name, "behavior");+ return new Proxy({}, {get: (_, kind: string) => (id: string, spec: typeof rows[number]["spec"]) => {+ rows.push({kind, id, spec});+ }});+ }});+ const index = rows.findIndex(row => row.id === "editor.blockGutterMode");+ assert.ok(index > 0);+ assert.equal(rows[index - 1].id, "editor.displayBookmarkIcon");+ assert.equal(rows[index].kind, "select");+ assert.equal(rows[index].spec.title, "blockGutterMode");+ assert.deepEqual(JSON.parse(JSON.stringify(rows[index].spec.options)), [+ {value: 0, label: "blockGutterCompact"}, {value: 1, label: "blockGutterFull"},+ ]);+ });+}diff --git a/app/src/config/tabs/editorRuntime.ts b/app/src/config/tabs/editorRuntime.tsindex a368eb1441..e5de167eee 100644--- a/app/src/config/tabs/editorRuntime.ts+++ b/app/src/config/tabs/editorRuntime.ts@@ -43,6 +43,7 @@ const runtime = createSectionRuntime<Config.IEditor>({setTitleAutoDirection(document.getElementById("toolbarName"), next.autoDirection);/// #endifgetAllEditor().forEach(({protyle}) => {+ if (old.blockGutterMode !== next.blockGutterMode) protyle.gutter?.element.classList.add("fn__none");if (old.keepLoadedContent !== next.keepLoadedContent) protyle.scroll.keepLoadedContent = next.keepLoadedContent;protyle.databaseAttributePanel?.updateDisplayConfig();reloadProtyle(protyle, false);diff --git a/app/src/config/tabs/editorTab.ts b/app/src/config/tabs/editorTab.tsindex 41f604877e..0adc3257ad 100644--- a/app/src/config/tabs/editorTab.ts+++ b/app/src/config/tabs/editorTab.ts@@ -50,6 +50,14 @@ const registerEditorBehaviorGroup = (tab: SettingTabBuilder) => {title: window.siyuan.languages.md12,desc: window.siyuan.languages.md16,});+ group.select("editor.blockGutterMode", {+ title: window.siyuan.languages.blockGutterMode,+ desc: window.siyuan.languages.blockGutterModeTip,+ options: [+ {value: 0, label: window.siyuan.languages.blockGutterCompact},+ {value: 1, label: window.siyuan.languages.blockGutterFull},+ ],+ });group.select("editor.codeTabSpaces", {title: window.siyuan.languages.md29,desc: window.siyuan.languages.md30,diff --git a/app/src/mobile/util/blockSelection.test.ts b/app/src/mobile/util/blockSelection.test.tsindex 61644987ee..3c0ff687bd 100644--- a/app/src/mobile/util/blockSelection.test.ts+++ b/app/src/mobile/util/blockSelection.test.ts@@ -78,6 +78,16 @@ describe("mobile block selection", () => {assert.equal(getMobileBlockSelectionElement(asHTMLElement(paragraph)), asHTMLElement(paragraph));});+ it("keeps the exact paragraph or list item selected from a full indicator menu", () => {+ const editor = new TestElement().addClass("protyle-wysiwyg");+ const paragraph = block("NodeParagraph");+ const listItem = block("NodeListItem").append(new TestElement(), paragraph, new TestElement());+ editor.append(block("NodeList").append(listItem, new TestElement()));++ assert.equal(getMobileBlockSelectionElement(asHTMLElement(paragraph), true), asHTMLElement(paragraph));+ assert.equal(getMobileBlockSelectionElement(asHTMLElement(listItem), true), asHTMLElement(listItem));+ });+it("selects the query embed instead of a rendered child block", () => {const editor = new TestElement().addClass("protyle-wysiwyg");const child = block("NodeParagraph");@@ -85,5 +95,6 @@ describe("mobile block selection", () => {editor.append(embed);assert.equal(getMobileBlockSelectionElement(asHTMLElement(child)), asHTMLElement(embed));+ assert.equal(getMobileBlockSelectionElement(asHTMLElement(child), true), asHTMLElement(embed));});});diff --git a/app/src/mobile/util/blockSelection.ts b/app/src/mobile/util/blockSelection.tsindex 4dc4402060..ca0e23260f 100644--- a/app/src/mobile/util/blockSelection.ts+++ b/app/src/mobile/util/blockSelection.ts@@ -1,7 +1,10 @@import {isInEmbedBlock} from "../../protyle/util/hasClosest";import {getTopAloneElement} from "../../protyle/wysiwyg/getBlock";-export const getMobileBlockSelectionElement = (blockElement: HTMLElement) => {+export const getMobileBlockSelectionElement = (blockElement: HTMLElement, exact = false) => {const embedBlockElement = isInEmbedBlock(blockElement);+ if (exact && !embedBlockElement) {+ return blockElement;+ }return getTopAloneElement((embedBlockElement || blockElement) as HTMLElement) as HTMLElement;};diff --git a/app/src/protyle/gutter/container.ts b/app/src/protyle/gutter/container.tsindex 9e7f5b25c3..f0788875b5 100644--- a/app/src/protyle/gutter/container.ts+++ b/app/src/protyle/gutter/container.ts@@ -1,11 +1,11 @@import {Constants} from "../../constants";-// 列表项的首个容器保留独立块标,段落仍沿用列表项的合并操作。-export const getListItemGutterContainer = (element: Element) => {+// 精简模式保留首个容器的独立块标,完整模式也允许从列表标记定位首个内容块。+export const getListItemGutterContainer = (element: Element, full = false) => {const item = element.closest('[data-type="NodeListItem"]');const first = item?.querySelector(":scope > [data-node-id]");const type = first?.getAttribute("data-type");- if (first && (["NodeTable", "NodeBlockquote", "NodeCallout", "NodeSuperBlock", "NodeTabs",+ if (first && (full || ["NodeTable", "NodeBlockquote", "NodeCallout", "NodeSuperBlock", "NodeTabs","NodeMindmap", "NodeAttributeView", "NodeCodeBlock", "NodeIFrame"].includes(type) ||type === "NodeList" && first.getAttribute(Constants.CUSTOM_SY_LIST_MINDMAP) === "1") &&(element === item || first.contains(element) ||diff --git a/app/src/protyle/gutter/index.ts b/app/src/protyle/gutter/index.tsindex 77488ab6f0..d5a99cd406 100644--- a/app/src/protyle/gutter/index.ts+++ b/app/src/protyle/gutter/index.ts@@ -592,20 +592,21 @@ export class Gutter {hideElements(["gutter"], protyle);return;}+ const foldButton = buttonElement.nextElementSibling?.getAttribute("data-type") === "fold" ?+ buttonElement.nextElementSibling : buttonElement.parentElement.querySelector("[data-type='fold']");+ const foldArrow = foldButton?.querySelector("svg");if (buttonElement.getAttribute("data-type") === "NodeHeading") {foldHeadingGroup(protyle, foldElement, "siblings");} else if (buttonElement.getAttribute("data-type") === "NodeListItem" && foldElement.parentElement.getAttribute("data-node-id")) {// 折叠同级toggleListFold(protyle, foldElement.parentElement);- const arrowElement = buttonElement.parentElement.querySelector("[data-type='fold'] > svg") as HTMLElement;- if (arrowElement) {- arrowElement.style.transform = foldElement.getAttribute("fold") === "1" ? "" : "rotate(90deg)";+ if (foldArrow) {+ foldArrow.style.transform = foldElement.getAttribute("fold") === "1" ? "" : "rotate(90deg)";}} else {const hasFold = setFold(protyle, foldElement).fold;- const foldArrowElement = buttonElement.parentElement.querySelector("[data-type='fold'] > svg") as HTMLElement;- if (hasFold !== -1 && foldArrowElement) {- foldArrowElement.style.transform = hasFold === 0 ? "rotate(90deg)" : "";+ if (hasFold !== -1 && foldArrow) {+ foldArrow.style.transform = hasFold === 0 ? "rotate(90deg)" : "";}}foldElement.classList.remove("protyle-wysiwyg--hl");@@ -694,6 +695,7 @@ export class Gutter {(item as HTMLElement).style.display = "none";});};+ this.element.addEventListener("scroll", hideInsert, {passive: true});this.element.addEventListener("pointerdown", () => window.clearTimeout(hidePlusTimeout), {passive: true});this.element.addEventListener("pointerleave", (event: PointerEvent & { target: HTMLInputElement }) => {// 鼠标悬停后可能收到模拟触摸,保留按下时的命中元素直到点击完成。@@ -1607,7 +1609,8 @@ export class Gutter {icon: "iconCheck",label: window.siyuan.languages.multiSelect,click: () => {- const blockElement = getMobileBlockSelectionElement(nodeElement as HTMLElement);+ const blockElement = getMobileBlockSelectionElement(nodeElement as HTMLElement,+ window.siyuan.config.editor.blockGutterMode === 1);hideElements(["select"], protyle);window.getSelection()?.removeAllRanges();protyle.toolbar.showMultiSelectMode(protyle, blockElement);@@ -3706,9 +3709,10 @@ export class Gutter {hideElements(["gutter"], protyle);return;}+ const fullGutter = !isMultiSelect && window.siyuan.config.editor.blockGutterMode === 1;let html = "";let nodeElement = selectedElement || element;- const listItemContainer = isMultiSelect ? undefined : getListItemGutterContainer(nodeElement);+ const listItemContainer = isMultiSelect ? undefined : getListItemGutterContainer(nodeElement, fullGutter);if (listItemContainer && (nodeElement === listItemContainer.parentElement ||nodeElement.classList.contains("protyle-action"))) {nodeElement = listItemContainer;@@ -3722,6 +3726,7 @@ export class Gutter {if (tabsHeader) {element = tabsHeader;}+ const gutterBlockElement = nodeElement;this.element.classList.toggle("protyle-gutters--sb-column",!!getHorizontalSuperBlockChild(nodeElement, protyle.wysiwyg.element));let space = 0;@@ -3762,7 +3767,7 @@ export class Gutter {}if (index === 0) {// 不单独显示,要不然在块的间隔中,gutter 会跳来跳去的- if (!isMultiSelect && !mindmapElement && !listItemContainer &&+ if (!fullGutter && !isMultiSelect && !mindmapElement && !listItemContainer &&["NodeBlockquote", "NodeList", "NodeCallout", "NodeSuperBlock"].includes(type)) {if (target && type === "NodeCallout") {// Callout 标题需显示@@ -3777,8 +3782,8 @@ export class Gutter {}}- let topElement = selectedElement || (tabsHeader || mindmapElement ? nodeElement : getTopAloneElement(nodeElement));- if (listItemContainer && topElement.contains(listItemContainer)) {+ let topElement = selectedElement || (fullGutter || tabsHeader || mindmapElement ? nodeElement : getTopAloneElement(nodeElement));+ if (!fullGutter && listItemContainer && topElement.contains(listItemContainer)) {topElement = nodeElement === listItemContainer.parentElement ? nodeElement : listItemContainer;}if (embedContext && !embedContext.boundaryElement.contains(topElement)) {@@ -3791,7 +3796,7 @@ export class Gutter {topElement = nodeElement;}// 提示下方仅有单个列表- if (topElement.classList.contains("callout") && !nodeElement.classList.contains("callout") &&+ if (!fullGutter && topElement.classList.contains("callout") && !nodeElement.classList.contains("callout") &&getParentBlock(nodeElement) !== topElement) {topElement = topElement.querySelector("[data-node-id]");}@@ -3819,7 +3824,7 @@ export class Gutter {}// - > # 1 \n > 2const containsListItemContainer = listItemContainer && nodeElement.contains(listItemContainer);- if (type === "NodeListItem" && index > 0 && !containsListItemContainer) {+ if (!fullGutter && type === "NodeListItem" && index > 0 && !containsListItemContainer) {// 列表项内的块不显示块标html = "";}@@ -3852,23 +3857,24 @@ export class Gutter {popoverHTML,draggable: !protyle.disabled && !embedContext,}) : "";- if (!hideParent) {- html = buttonHTML + html;- }let foldHTML = "";if (type === "NodeListItem" && nodeElement.childElementCount > 3 || type === "NodeHeading") {const fold = nodeElement.getAttribute("fold");foldHTML = `<button class="ariaLabel" data-delay="500" data-position="parentW" aria-label="${window.siyuan.languages.fold}"data-type="fold"${viewOccurrenceID ? ` data-view-occurrence-id="${encodeURIComponent(viewOccurrenceID)}"` : ""} style="cursor:inherit;"><svg style="width: 10px;${fold && fold === "1" ? "" : "transform:rotate(90deg)"}"><use xlink:href="#iconPlay"></use></svg></button>`;}+ if (!hideParent) {+ // 完整层级的折叠按钮紧邻所属块标,避免命中子块或其他层级。+ html = buttonHTML + (fullGutter ? foldHTML : "") + html;+ }if (type === "NodeListItem" || type === "NodeList") {listItem = nodeElement;- if (type === "NodeListItem" && nodeElement.childElementCount > 3) {+ if (!fullGutter && type === "NodeListItem" && nodeElement.childElementCount > 3) {html = containsListItemContainer ?html + foldHTML : buttonHTML + foldHTML;}}- if (type === "NodeHeading") {+ if (!fullGutter && type === "NodeHeading") {html = html + foldHTML;}space += getContainerGutterSpace(type, element === nodeElement);@@ -3877,12 +3883,12 @@ data-type="fold"${viewOccurrenceID ? ` data-view-occurrence-id="${encodeURICompowhile (previousBlock && !previousBlock.getAttribute("data-node-id")) {previousBlock = previousBlock.previousElementSibling;}- // 页签栏用于操作整个容器,正文区域的块标层级只显示到当前页签项。+ // 精简模式的正文块标只显示到当前页签项,页签栏用于操作整个容器。const isTabItemBoundary = type === "NodeTabItem" && nodeElement.parentElement.classList.contains("tabs");if ((previousBlock && previousBlock.getAttribute("data-node-id")) ||nodeElement.parentElement.classList.contains("callout-content") || isTabItemBoundary) {- // 前一个块存在时,只显示到当前层级- hideParent = true;+ // 前一个块存在时,精简模式只显示到当前层级。+ hideParent = !fullGutter;// 由于折叠块的第二个子块在界面上不显示,因此移除块标 https://github.com/siyuan-note/siyuan/issues/14304if (parentElement && parentElement.getAttribute("fold") === "1") {return;@@ -3935,11 +3941,16 @@ data-type="fold"${viewOccurrenceID ? ` data-view-occurrence-id="${encodeURICompo}const shouldRenderInsert = !isMultiSelect;const insertElementCount = this.element.querySelectorAll(".protyle-gutters__line, .protyle-gutters__plus").length;- const renderKey = `${shouldRenderInsert ? "1" : "0"}${html}`;+ const renderKey = `${fullGutter ? "1" : "0"}${shouldRenderInsert ? "1" : "0"}${html}`;let shouldRenderContent = this.renderKey !== renderKey || this.element.childElementCount === 0 ||!isGutterInsertStateMatched(insertElementCount, shouldRenderInsert);// 相同内容保留现有 DOM 防止抖动,但仍需继续更新位置 https://github.com/siyuan-note/siyuan/issues/12321const wasCompressed = this.element.style.width === "24px";+ const previousScrollTop = this.element.scrollTop;+ this.element.classList.toggle("protyle-gutters--full", fullGutter);+ this.element.style.maxHeight = "";+ this.element.style.overflowY = "";+ delete this.element.dataset.scrollable;this.element.classList.remove("fn__none");if (shouldRenderContent) {this.element.innerHTML = html;@@ -3960,7 +3971,8 @@ data-type="fold"${viewOccurrenceID ? ` data-view-occurrence-id="${encodeURICompo);}// 数据库行操作跟随当前行,其余列表容器使用统一锚点,独立脑图使用可见面板。- let rect = (element.classList.contains("av__row") ? element :+ let rect = (element.classList.contains("av__row") ? element : fullGutter ?+ tabsHeader || mindmapElement || gutterBlockElement :listItemContainer || mindmapElement || element).getBoundingClientRect();let marginHeight = 0;const autoListDirection = getAutoListDirection(element);@@ -3968,15 +3980,22 @@ data-type="fold"${viewOccurrenceID ? ` data-view-occurrence-id="${encodeURICompowindow.siyuan.config.editor.rtl || getComputedStyle(element).direction === "rtl";if (mindmapElement && !listItemContainer) {space = 0;- } else if (listItem && !isRTL) {+ } else if (!fullGutter && listItem && !isRTL) {rect = listItem.firstElementChild.getBoundingClientRect();space = 0;- } else if (nodeElement.getAttribute("data-type") === "NodeBlockQueryEmbed") {+ } else if (!fullGutter && nodeElement.getAttribute("data-type") === "NodeBlockQueryEmbed") {rect = nodeElement.getBoundingClientRect();space = 0;}// 页签栏只用于垂直定位;水平方向和其他块一样以整个块的外边界为基准。let horizontalAnchorLeft = tabsHeader && !listItem ? tabsHeader.parentElement.getBoundingClientRect().left : rect.left;+ if (fullGutter && !isRTL && !element.classList.contains("av__row")) {+ const action = gutterBlockElement.closest('[data-type="NodeListItem"]')?.querySelector(":scope > .protyle-action");+ if (action) {+ horizontalAnchorLeft = action.getBoundingClientRect().left;+ space = 0;+ }+ }if (listItem && element.classList.contains("protyle-action") &&element.parentElement.getAttribute("data-type") === "NodeListItem") {const listItemElement = element.parentElement;@@ -3999,8 +4018,8 @@ data-type="fold"${viewOccurrenceID ? ` data-view-occurrence-id="${encodeURIComporeturn left - gutterGap;};let naturalLeft = getNaturalLeft(this.naturalWidth || this.element.clientWidth);- let compressed = naturalLeft < this.element.parentElement.getBoundingClientRect().left;- if (!shouldRenderContent && compressed !== wasCompressed) {+ let compressed = !fullGutter && naturalLeft < this.element.parentElement.getBoundingClientRect().left;+ if (!fullGutter && !shouldRenderContent && compressed !== wasCompressed) {this.element.innerHTML = html;this.element.style.width = "";this.naturalWidth = this.element.clientWidth;@@ -4029,9 +4048,29 @@ data-type="fold"${viewOccurrenceID ? ` data-view-occurrence-id="${encodeURICompo// 双元素:框线贴块标边缘不移动,+号独立定位在外偏位置,tooltip 基于+号元素对齐this.element.insertAdjacentHTML("beforeend", `<button class="protyle-gutters__line" data-type="gutterLineBefore" style="display:none"></button><button class="protyle-gutters__line" data-type="gutterLineAfter" style="display:none"></button><button class="protyle-gutters__plus ariaLabel" data-type="gutterPlusBefore" data-position="4west" aria-label="${window.siyuan.languages.insertBefore}" style="display:none"><svg><use xlink:href="#iconAdd"></use></svg></button><button class="protyle-gutters__plus ariaLabel" data-type="gutterPlusAfter" data-position="4west" aria-label="${window.siyuan.languages.insertAfter}" style="display:none"><svg><use xlink:href="#iconAdd"></use></svg></button>`);}+ const viewportRect = protyle.contentElement.getBoundingClientRect();+ const paneRect = protyle.element.closest(".layout-tab-container")?.getBoundingClientRect() || viewportRect;+ const viewportLeft = Math.max(viewportRect.left, paneRect.left);+ const viewportRight = Math.min(viewportRect.right, paneRect.right);+ const viewportBottom = Math.min(viewportRect.bottom, paneRect.bottom);+ if (fullGutter) {+ // 完整层级按左侧可用宽度换行,超出视口的层级可滚动访问。+ const buttons = Array.from(this.element.querySelectorAll<HTMLElement>("button[data-node-id], button[data-type='fold']"));+ const buttonWidth = Math.max(24, ...buttons.map(button => button.getBoundingClientRect().width));+ const availableWidth = Math.max(buttonWidth, horizontalAnchorLeft - space - gutterGap - viewportLeft);+ this.element.style.width = `${Math.min(this.naturalWidth, availableWidth, viewportRight - viewportLeft)}px`;+ this.element.style.maxHeight = `${Math.max(0, viewportBottom - Math.max(contentTop, paneRect.top))}px`;+ if (this.element.scrollHeight > this.element.clientHeight) {+ this.element.style.overflowY = "auto";+ this.element.dataset.scrollable = "true";+ if (!shouldRenderContent) {+ this.element.scrollTop = previousScrollTop;+ }+ }+ }if (!element.classList.contains("av__row")) {const gutterMarginHeight = getGutterMarginHeight(- rect.height, this.element.clientHeight, this.naturalHeight,+ rect.height, this.element.clientHeight, fullGutter ? this.element.clientHeight : this.naturalHeight,window.siyuan.config.editor.fontSize);if (typeof gutterMarginHeight === "number") {marginHeight = gutterMarginHeight;@@ -4045,15 +4084,19 @@ data-type="fold"${viewOccurrenceID ? ` data-view-occurrence-id="${encodeURICompo}const foldElement = hasClosestByAttribute(element.parentElement, "fold", "1") as HTMLElement;const fixedContainerRect = getGutterFixedContainerRect(protyle.element);- const top = Math.max(rect.top + marginHeight, contentTop, foldElement ? foldElement.getBoundingClientRect().top : 0);+ let top = Math.max(rect.top + marginHeight, contentTop, foldElement ? foldElement.getBoundingClientRect().top : 0);+ if (fullGutter) {+ top = Math.max(contentTop, paneRect.top, Math.min(top, viewportBottom - this.element.clientHeight));+ }this.element.style.top = `${getFixedGutterPosition(top, fixedContainerRect?.top)}px`;// 压缩模式需加 2,否则和折叠标题无法对齐- const left = compressed ? horizontalAnchorLeft - this.element.clientWidth - space / 2 + 3 - gutterGap :+ let left = compressed ? horizontalAnchorLeft - this.element.clientWidth - space / 2 + 3 - gutterGap :getNaturalLeft(this.element.clientWidth);+ if (fullGutter) {+ left = Math.max(viewportLeft, Math.min(left, viewportRight - this.element.clientWidth));+ }this.element.style.left = `${getFixedGutterPosition(left, fixedContainerRect?.left)}px`;// 块标及其插入按钮按滚动视口和分屏边界裁剪,保留视口内的外伸控件。- const viewportRect = protyle.contentElement.getBoundingClientRect();- const paneRect = protyle.element.closest(".layout-tab-container")?.getBoundingClientRect() || viewportRect;const gutterRect = this.element.getBoundingClientRect();this.element.style.clipPath = `inset(${Math.max(contentTop, paneRect.top) - gutterRect.top}px ${gutterRect.right - Math.min(viewportRect.right, paneRect.right)}px ${diff --git a/app/src/protyle/util/editorCommonEvent.ts b/app/src/protyle/util/editorCommonEvent.tsindex 9b7b29fae6..6c26b1b8e1 100644--- a/app/src/protyle/util/editorCommonEvent.ts+++ b/app/src/protyle/util/editorCommonEvent.ts@@ -471,7 +471,7 @@ const moveTo = async (protyle: IProtyle, sourceElements: Element[], targetElemenlet topSourceElement = getTopAloneElement(item);const oldSourceParentElement = getParentBlock(item);const sourceContainerSnapshots = new Map<Element, TDragSourceContainerSnapshot>();- if (topSourceElement !== item && item.getAttribute("data-type") === "NodeListItem") {+ if (topSourceElement !== item) {let sourceContainer = oldSourceParentElement;while (sourceContainer) {const sourceContainerID = sourceContainer.getAttribute("data-node-id");@@ -479,10 +479,9 @@ const moveTo = async (protyle: IProtyle, sourceElements: Element[], targetElemenconst sourceContainerClone = sourceContainer.cloneNode(true) as Element;const movedItemClone = sourceContainerClone.querySelector(`[data-node-id="${id}"]`);if (movedItemClone) {- const placeholderElement = genDragListItemPlaceholder(- protyle.lute,- movedItemClone.getAttribute("data-subtype")- );+ const placeholderElement = item.getAttribute("data-type") === "NodeListItem" ?+ genDragListItemPlaceholder(protyle.lute, movedItemClone.getAttribute("data-subtype")) :+ genEmptyElement(false, false, Lute.NewNodeID());const placeholderID = placeholderElement?.getAttribute("data-node-id");if (!placeholderElement || !placeholderID) {break;@@ -553,7 +552,7 @@ const moveTo = async (protyle: IProtyle, sourceElements: Element[], targetElemen});const sourceContainerSnapshot = sourceContainerSnapshots.get(topSourceElement);if (sourceContainerSnapshot && undoMoveOperation) {- // 使用占位列表项保持容器快照有效,撤销时恢复容器、移回原列表项,再删除占位项。+ // 占位块保持容器快照有效,撤销时恢复容器、移回原块,再删除占位块。replaceDragUndoOperation(undoOperations, undoMoveOperation, [{action: "delete",diff --git a/app/src/types/api/index.d.ts b/app/src/types/api/index.d.tsindex d490351d56..1c062b8480 100644--- a/app/src/types/api/index.d.ts+++ b/app/src/types/api/index.d.ts@@ -1878,7 +1878,7 @@ export type SetCriterionRequestInput = { "criterion": CriterionInput | null; };export type SetDatabaseBlockViewRequestInput = { "avID": string; "id": string; "viewID": string; };-export type SetEditorRequestInput = { "allowHTMLBLockScript"?: boolean | null; "allowSVGScript"?: boolean | null; "assetOpen"?: SettingAssetOpenInput | null; "autoCloseRefBrackets"?: boolean | null; "autoDirection"?: boolean | null; "backlinkBlockSort"?: number | null; "backlinkContainChildren"?: boolean | null; "backlinkExpandCount"?: number | null; "backlinkGlobalSort"?: number | null; "backlinkHideReference"?: boolean | null; "backlinkMentionExclude"?: string | null; "backlinkShowBottom"?: boolean | null; "backlinkSort"?: number | null; "backmentionExpandCount"?: number | null; "backmentionSort"?: number | null; "blockRefDynamicAnchorTextMaxLen"?: number | null; "checkBlockRef"?: boolean | null; "codeFontFamilies"?: Array<SettingEditorFontInput | null> | null; "codeLigatures"?: boolean | null; "codeLineWrap"?: boolean | null; "codeSyntaxHighlightLineNum"?: boolean | null; "codeTabSpaces"?: number | null; "cursorSurroundingLines"?: number | null; "databaseAttrClickMode"?: number | null; "databaseAttrHideEmpty"?: boolean | null; "databaseAttrShow"?: boolean | null; "databaseAttrUseTabs"?: boolean | null; "databaseAttrViewMode"?: number | null; "displayBookmarkIcon"?: boolean | null; "displayImgAlt"?: boolean | null; "displayImgName"?: boolean | null; "displayNetImgMark"?: boolean | null; "dragHTMLFileToIframe"?: boolean | null; "dynamicLoadBlocks"?: number | null; "embedBlockBreadcrumb"?: boolean | null; "emoji"?: Array<string> | null; "floatWindowDelay"?: number | null; "floatWindowMode"?: number | null; "fontFamilies"?: Array<SettingEditorFontInput | null> | null; "fontFamily"?: string | null; "fontFamilyDisplay"?: string | null; "fontSize"?: number | null; "fontSizeScrollZoom"?: boolean | null; "fontWeight"?: number | null; "fullWidth"?: boolean | null; "generateHistoryInterval"?: number | null; "hashTagSearch"?: boolean | null; "headingEmbedMode"?: number | null; "headingNumber"?: boolean | null; "headingNumberFormat"?: string | null; "historyRetentionDays"?: number | null; "justify"?: boolean | null; "katexMacros"?: string | null; "keepLoadedContent"?: boolean | null; "listItemDotNumberClickFocus"?: boolean | null; "listLogicalOutdent"?: boolean | null; "markdown"?: SettingMarkdownInput | null; "onlySearchForDoc"?: boolean | null; "pageScrollButtons"?: boolean | null; "pasteURLAutoConvert"?: boolean | null; "plantUMLServePath"?: string | null; "readOnly"?: boolean | null; "rtl"?: boolean | null; "spellcheck"?: boolean | null; "spellcheckLanguages"?: Array<string> | null; "virtualBlockRef"?: boolean | null; "virtualBlockRefExclude"?: string | null; "virtualBlockRefInclude"?: string | null; };+export type SetEditorRequestInput = { "allowHTMLBLockScript"?: boolean | null; "allowSVGScript"?: boolean | null; "assetOpen"?: SettingAssetOpenInput | null; "autoCloseRefBrackets"?: boolean | null; "autoDirection"?: boolean | null; "backlinkBlockSort"?: number | null; "backlinkContainChildren"?: boolean | null; "backlinkExpandCount"?: number | null; "backlinkGlobalSort"?: number | null; "backlinkHideReference"?: boolean | null; "backlinkMentionExclude"?: string | null; "backlinkShowBottom"?: boolean | null; "backlinkSort"?: number | null; "backmentionExpandCount"?: number | null; "backmentionSort"?: number | null; "blockGutterMode"?: number | null; "blockRefDynamicAnchorTextMaxLen"?: number | null; "checkBlockRef"?: boolean | null; "codeFontFamilies"?: Array<SettingEditorFontInput | null> | null; "codeLigatures"?: boolean | null; "codeLineWrap"?: boolean | null; "codeSyntaxHighlightLineNum"?: boolean | null; "codeTabSpaces"?: number | null; "cursorSurroundingLines"?: number | null; "databaseAttrClickMode"?: number | null; "databaseAttrHideEmpty"?: boolean | null; "databaseAttrShow"?: boolean | null; "databaseAttrUseTabs"?: boolean | null; "databaseAttrViewMode"?: number | null; "displayBookmarkIcon"?: boolean | null; "displayImgAlt"?: boolean | null; "displayImgName"?: boolean | null; "displayNetImgMark"?: boolean | null; "dragHTMLFileToIframe"?: boolean | null; "dynamicLoadBlocks"?: number | null; "embedBlockBreadcrumb"?: boolean | null; "emoji"?: Array<string> | null; "floatWindowDelay"?: number | null; "floatWindowMode"?: number | null; "fontFamilies"?: Array<SettingEditorFontInput | null> | null; "fontFamily"?: string | null; "fontFamilyDisplay"?: string | null; "fontSize"?: number | null; "fontSizeScrollZoom"?: boolean | null; "fontWeight"?: number | null; "fullWidth"?: boolean | null; "generateHistoryInterval"?: number | null; "hashTagSearch"?: boolean | null; "headingEmbedMode"?: number | null; "headingNumber"?: boolean | null; "headingNumberFormat"?: string | null; "historyRetentionDays"?: number | null; "justify"?: boolean | null; "katexMacros"?: string | null; "keepLoadedContent"?: boolean | null; "listItemDotNumberClickFocus"?: boolean | null; "listLogicalOutdent"?: boolean | null; "markdown"?: SettingMarkdownInput | null; "onlySearchForDoc"?: boolean | null; "pageScrollButtons"?: boolean | null; "pasteURLAutoConvert"?: boolean | null; "plantUMLServePath"?: string | null; "readOnly"?: boolean | null; "rtl"?: boolean | null; "spellcheck"?: boolean | null; "spellcheckLanguages"?: Array<string> | null; "virtualBlockRef"?: boolean | null; "virtualBlockRefExclude"?: string | null; "virtualBlockRefInclude"?: string | null; };export type SetEntryVisibilityRequestInput = { "active"?: string | null; "profiles"?: Array<SettingEntryVisibilityProfileInput | null> | null; "version"?: number | null; };@@ -2014,13 +2014,13 @@ export type SettingEditing = { "maxCompletionTokens": number; "maxHistoryMessageexport type SettingEditingInput = { "maxCompletionTokens"?: number | null; "maxHistoryMessages"?: number | null; "modelId"?: string | null; "temperature"?: number | null; };-export type SettingEditor = { "allowHTMLBLockScript": boolean; "allowSVGScript": boolean; "assetOpen": SettingAssetOpen | null; "autoCloseRefBrackets": boolean; "autoDirection": boolean; "backlinkBlockSort": number; "backlinkContainChildren": boolean; "backlinkExpandCount": number; "backlinkGlobalSort": number; "backlinkHideReference": boolean; "backlinkMentionExclude": string; "backlinkShowBottom": boolean; "backlinkSort": number | null; "backmentionExpandCount": number; "backmentionSort": number | null; "blockRefDynamicAnchorTextMaxLen": number; "checkBlockRef": boolean | null; "codeFontFamilies": Array<SettingEditorFont | null> | null; "codeLigatures": boolean; "codeLineWrap": boolean; "codeSyntaxHighlightLineNum": boolean; "codeTabSpaces": number; "cursorSurroundingLines": number; "databaseAttrClickMode": number; "databaseAttrHideEmpty": boolean; "databaseAttrShow": boolean | null; "databaseAttrUseTabs": boolean | null; "databaseAttrViewMode": number; "displayBookmarkIcon": boolean; "displayImgAlt": boolean; "displayImgName": boolean; "displayNetImgMark": boolean; "dragHTMLFileToIframe": boolean; "dynamicLoadBlocks": number; "embedBlockBreadcrumb": boolean; "emoji": Array<string> | null; "floatWindowDelay": number | null; "floatWindowMode": number; "fontFamilies": Array<SettingEditorFont | null> | null; "fontFamily": string; "fontFamilyDisplay": string; "fontSize": number; "fontSizeScrollZoom": boolean; "fontWeight": number; "fullWidth": boolean; "generateHistoryInterval": number; "hashTagSearch": boolean | null; "headingEmbedMode": number; "headingNumber": boolean; "headingNumberFormat": string; "historyRetentionDays": number; "justify": boolean; "katexMacros": string; "keepLoadedContent": boolean; "listItemDotNumberClickFocus": boolean; "listLogicalOutdent": boolean; "markdown": SettingMarkdown | null; "onlySearchForDoc": boolean; "pageScrollButtons": boolean; "pasteURLAutoConvert": boolean; "plantUMLServePath": string; "readOnly": boolean; "rtl": boolean; "spellcheck": boolean; "spellcheckLanguages": Array<string> | null; "virtualBlockRef": boolean; "virtualBlockRefExclude": string; "virtualBlockRefInclude": string; };+export type SettingEditor = { "allowHTMLBLockScript": boolean; "allowSVGScript": boolean; "assetOpen": SettingAssetOpen | null; "autoCloseRefBrackets": boolean; "autoDirection": boolean; "backlinkBlockSort": number; "backlinkContainChildren": boolean; "backlinkExpandCount": number; "backlinkGlobalSort": number; "backlinkHideReference": boolean; "backlinkMentionExclude": string; "backlinkShowBottom": boolean; "backlinkSort": number | null; "backmentionExpandCount": number; "backmentionSort": number | null; "blockGutterMode": number; "blockRefDynamicAnchorTextMaxLen": number; "checkBlockRef": boolean | null; "codeFontFamilies": Array<SettingEditorFont | null> | null; "codeLigatures": boolean; "codeLineWrap": boolean; "codeSyntaxHighlightLineNum": boolean; "codeTabSpaces": number; "cursorSurroundingLines": number; "databaseAttrClickMode": number; "databaseAttrHideEmpty": boolean; "databaseAttrShow": boolean | null; "databaseAttrUseTabs": boolean | null; "databaseAttrViewMode": number; "displayBookmarkIcon": boolean; "displayImgAlt": boolean; "displayImgName": boolean; "displayNetImgMark": boolean; "dragHTMLFileToIframe": boolean; "dynamicLoadBlocks": number; "embedBlockBreadcrumb": boolean; "emoji": Array<string> | null; "floatWindowDelay": number | null; "floatWindowMode": number; "fontFamilies": Array<SettingEditorFont | null> | null; "fontFamily": string; "fontFamilyDisplay": string; "fontSize": number; "fontSizeScrollZoom": boolean; "fontWeight": number; "fullWidth": boolean; "generateHistoryInterval": number; "hashTagSearch": boolean | null; "headingEmbedMode": number; "headingNumber": boolean; "headingNumberFormat": string; "historyRetentionDays": number; "justify": boolean; "katexMacros": string; "keepLoadedContent": boolean; "listItemDotNumberClickFocus": boolean; "listLogicalOutdent": boolean; "markdown": SettingMarkdown | null; "onlySearchForDoc": boolean; "pageScrollButtons": boolean; "pasteURLAutoConvert": boolean; "plantUMLServePath": string; "readOnly": boolean; "rtl": boolean; "spellcheck": boolean; "spellcheckLanguages": Array<string> | null; "virtualBlockRef": boolean; "virtualBlockRefExclude": string; "virtualBlockRefInclude": string; };export type SettingEditorFont = { "displayName": string; "family": string; "weight": number; };export type SettingEditorFontInput = { "displayName"?: string | null; "family"?: string | null; "weight"?: number | null; };-export type SettingEditorInput = { "allowHTMLBLockScript"?: boolean | null; "allowSVGScript"?: boolean | null; "assetOpen"?: SettingAssetOpenInput | null; "autoCloseRefBrackets"?: boolean | null; "autoDirection"?: boolean | null; "backlinkBlockSort"?: number | null; "backlinkContainChildren"?: boolean | null; "backlinkExpandCount"?: number | null; "backlinkGlobalSort"?: number | null; "backlinkHideReference"?: boolean | null; "backlinkMentionExclude"?: string | null; "backlinkShowBottom"?: boolean | null; "backlinkSort"?: number | null; "backmentionExpandCount"?: number | null; "backmentionSort"?: number | null; "blockRefDynamicAnchorTextMaxLen"?: number | null; "checkBlockRef"?: boolean | null; "codeFontFamilies"?: Array<SettingEditorFontInput | null> | null; "codeLigatures"?: boolean | null; "codeLineWrap"?: boolean | null; "codeSyntaxHighlightLineNum"?: boolean | null; "codeTabSpaces"?: number | null; "cursorSurroundingLines"?: number | null; "databaseAttrClickMode"?: number | null; "databaseAttrHideEmpty"?: boolean | null; "databaseAttrShow"?: boolean | null; "databaseAttrUseTabs"?: boolean | null; "databaseAttrViewMode"?: number | null; "displayBookmarkIcon"?: boolean | null; "displayImgAlt"?: boolean | null; "displayImgName"?: boolean | null; "displayNetImgMark"?: boolean | null; "dragHTMLFileToIframe"?: boolean | null; "dynamicLoadBlocks"?: number | null; "embedBlockBreadcrumb"?: boolean | null; "emoji"?: Array<string> | null; "floatWindowDelay"?: number | null; "floatWindowMode"?: number | null; "fontFamilies"?: Array<SettingEditorFontInput | null> | null; "fontFamily"?: string | null; "fontFamilyDisplay"?: string | null; "fontSize"?: number | null; "fontSizeScrollZoom"?: boolean | null; "fontWeight"?: number | null; "fullWidth"?: boolean | null; "generateHistoryInterval"?: number | null; "hashTagSearch"?: boolean | null; "headingEmbedMode"?: number | null; "headingNumber"?: boolean | null; "headingNumberFormat"?: string | null; "historyRetentionDays"?: number | null; "justify"?: boolean | null; "katexMacros"?: string | null; "keepLoadedContent"?: boolean | null; "listItemDotNumberClickFocus"?: boolean | null; "listLogicalOutdent"?: boolean | null; "markdown"?: SettingMarkdownInput | null; "onlySearchForDoc"?: boolean | null; "pageScrollButtons"?: boolean | null; "pasteURLAutoConvert"?: boolean | null; "plantUMLServePath"?: string | null; "readOnly"?: boolean | null; "rtl"?: boolean | null; "spellcheck"?: boolean | null; "spellcheckLanguages"?: Array<string> | null; "virtualBlockRef"?: boolean | null; "virtualBlockRefExclude"?: string | null; "virtualBlockRefInclude"?: string | null; };+export type SettingEditorInput = { "allowHTMLBLockScript"?: boolean | null; "allowSVGScript"?: boolean | null; "assetOpen"?: SettingAssetOpenInput | null; "autoCloseRefBrackets"?: boolean | null; "autoDirection"?: boolean | null; "backlinkBlockSort"?: number | null; "backlinkContainChildren"?: boolean | null; "backlinkExpandCount"?: number | null; "backlinkGlobalSort"?: number | null; "backlinkHideReference"?: boolean | null; "backlinkMentionExclude"?: string | null; "backlinkShowBottom"?: boolean | null; "backlinkSort"?: number | null; "backmentionExpandCount"?: number | null; "backmentionSort"?: number | null; "blockGutterMode"?: number | null; "blockRefDynamicAnchorTextMaxLen"?: number | null; "checkBlockRef"?: boolean | null; "codeFontFamilies"?: Array<SettingEditorFontInput | null> | null; "codeLigatures"?: boolean | null; "codeLineWrap"?: boolean | null; "codeSyntaxHighlightLineNum"?: boolean | null; "codeTabSpaces"?: number | null; "cursorSurroundingLines"?: number | null; "databaseAttrClickMode"?: number | null; "databaseAttrHideEmpty"?: boolean | null; "databaseAttrShow"?: boolean | null; "databaseAttrUseTabs"?: boolean | null; "databaseAttrViewMode"?: number | null; "displayBookmarkIcon"?: boolean | null; "displayImgAlt"?: boolean | null; "displayImgName"?: boolean | null; "displayNetImgMark"?: boolean | null; "dragHTMLFileToIframe"?: boolean | null; "dynamicLoadBlocks"?: number | null; "embedBlockBreadcrumb"?: boolean | null; "emoji"?: Array<string> | null; "floatWindowDelay"?: number | null; "floatWindowMode"?: number | null; "fontFamilies"?: Array<SettingEditorFontInput | null> | null; "fontFamily"?: string | null; "fontFamilyDisplay"?: string | null; "fontSize"?: number | null; "fontSizeScrollZoom"?: boolean | null; "fontWeight"?: number | null; "fullWidth"?: boolean | null; "generateHistoryInterval"?: number | null; "hashTagSearch"?: boolean | null; "headingEmbedMode"?: number | null; "headingNumber"?: boolean | null; "headingNumberFormat"?: string | null; "historyRetentionDays"?: number | null; "justify"?: boolean | null; "katexMacros"?: string | null; "keepLoadedContent"?: boolean | null; "listItemDotNumberClickFocus"?: boolean | null; "listLogicalOutdent"?: boolean | null; "markdown"?: SettingMarkdownInput | null; "onlySearchForDoc"?: boolean | null; "pageScrollButtons"?: boolean | null; "pasteURLAutoConvert"?: boolean | null; "plantUMLServePath"?: string | null; "readOnly"?: boolean | null; "rtl"?: boolean | null; "spellcheck"?: boolean | null; "spellcheckLanguages"?: Array<string> | null; "virtualBlockRef"?: boolean | null; "virtualBlockRefExclude"?: string | null; "virtualBlockRefInclude"?: string | null; };export type SettingEmbedding = { "apiKey": string; "baseURL": string; "batchSize": number; "concurrency": number; "dimensions": number; "enabled": boolean; "id": string; "name": string; "timeout": number; };diff --git a/app/src/types/config.d.ts b/app/src/types/config.d.tsindex 250bb7652c..54be3d87bc 100644--- a/app/src/types/config.d.ts+++ b/app/src/types/config.d.ts@@ -646,6 +646,8 @@ declare namespace Config {* Whether to display the bookmark icon*/displayBookmarkIcon: boolean;+ /** 块标显示模式,0:精简,1:完整;默认及越界值为 0,旧接口省略时保留当前值 */+ blockGutterMode: number;/*** Whether to display the network image mark*/diff --git a/app/src/util/touchDragBridge.test.ts b/app/src/util/touchDragBridge.test.tsindex f6d743a6d0..1eb9939b09 100644--- a/app/src/util/touchDragBridge.test.ts+++ b/app/src/util/touchDragBridge.test.ts@@ -30,6 +30,10 @@ class TestElement {constructor(private classes: string[] = [], public parentElement?: TestElement) {}closest(selector: string): TestElement | null {+ if (selector === ".protyle-gutters[data-scrollable='true']" &&+ this.classes.includes("protyle-gutters") && this.dataset.scrollable === "true") {+ return this;+ }return this.classes.includes(selector.slice(1)) ? this : this.parentElement?.closest(selector) || null;}@@ -57,7 +61,7 @@ class TestElement {class TestHTMLElement extends TestElement {}const createBridge = (rowClass = "b3-menu__item", panelClass = "av__panel", mobile = false,- options: {browser?: boolean, container?: string} = {}) => {+ options: {browser?: boolean, container?: string, scrollable?: boolean} = {}) => {let now = 1000;let hidden = false;let nextTimer = 0;@@ -67,6 +71,9 @@ const createBridge = (rowClass = "b3-menu__item", panelClass = "av__panel", mobiconst listeners = new Map<string, Array<(event: object) => void>>();const body = new TestHTMLElement();const panel = new TestHTMLElement([panelClass], body);+ if (options.scrollable) {+ panel.dataset.scrollable = "true";+ }const button = panelClass === "protyle-gutters" ? new TestHTMLElement([], panel) : panel;if (panelClass === "protyle-gutters") {button.tagName = "BUTTON";@@ -371,6 +378,21 @@ test("desktop touch block gutters keep direct dragging", () => {assert.deepEqual(bridge.row.events, ["dragstart"]);});+for (const mobile of [false, true]) {+ test(`scrollable full gutters preserve swiping and long-press dragging (mobile=${mobile})`, () => {+ const bridge = createBridge("", "protyle-gutters", mobile, {scrollable: true});+ bridge.dispatch("touchstart", bridge.row);+ assert.equal(bridge.dispatch("touchmove", bridge.row, 140, 50), false);+ bridge.advance(500);+ assert.deepEqual(bridge.row.events, []);+ bridge.dispatch("touchend", bridge.row, 140);+ bridge.dispatch("touchstart", bridge.row);+ bridge.advance(500);+ assert.equal(bridge.dispatch("touchmove", bridge.row, 140), true);+ assert.equal(bridge.row.events.filter(type => type === "dragstart").length, 1);+ });+}+test("mobile mouse block gutters keep direct dragging", () => {const bridge = createBridge("", "protyle-gutters", true);bridge.dispatch("pointerdown", bridge.row, 100, 0, true);diff --git a/app/src/util/touchDragBridge.ts b/app/src/util/touchDragBridge.tsindex 54fc25d1d9..458018f676 100644--- a/app/src/util/touchDragBridge.ts+++ b/app/src/util/touchDragBridge.ts@@ -454,6 +454,7 @@ const createDragState = (draggableElement: HTMLElement, target: Element, point:draggableElement.closest(".av__gallery-item") !== null ||draggableElement.closest(".av__group-title") !== null ||draggableElement.closest(".av__cell--header") !== null ||+ draggableElement.closest(".protyle-gutters[data-scrollable='true']") !== null ||draggableElement.closest(".layout-tab-bar") !== null ||draggableElement.closest(".protyle-action") !== null, isMouse, !!isInAndroid()),longPressCancelled: false,diff --git a/app/tests/listContainerGutter.test.js b/app/tests/listContainerGutter.test.jsindex e065a1c6fe..406d87fd27 100644--- a/app/tests/listContainerGutter.test.js+++ b/app/tests/listContainerGutter.test.js@@ -9,6 +9,16 @@ const sources = (full = false) => {"../src/protyle/gutter/index.ts"), "utf8"), ts.ScriptTarget.Latest, true);const gutter = source.statements.find(node => ts.isClassDeclaration(node) && node.name.text === "Gutter");const render = gutter.members.find(node => node.name?.getText(source) === "render");+ const getNodeElement = gutter.members.find(node => node.name?.getText(source) === "getNodeElement");+ const interactions = [];+ const collectInteractions = node => {+ if (ts.isCallExpression(node) && node.expression.getText(source) === "this.element.addEventListener" &&+ ['"dragstart"', '"click"'].includes(node.arguments[0].getText(source))) {+ interactions.push(node.getText(source));+ }+ ts.forEachChild(node, collectInteractions);+ };+ collectInteractions(gutter.members.find(ts.isConstructorDeclaration));const body = full ? render.body.getText(source) :render.body.getText(source).split("const shouldRenderInsert")[0] + "return html; }";const helpers = ["protyle/gutter/container.ts", "protyle/wysiwyg/getBlock.ts", "protyle/gutter/layout.ts",@@ -38,7 +48,15 @@ const sources = (full = false) => {const events = readFileSync(path.join(__dirname, "../src/boot/globalEvent/mousemove.ts"), "utf8").replace(/^import .*;\r?\n/gm, "").replace(/^export /gm, "") +`\nfunction bindHover(protyle) { let overAttr = false; ${hoverBinding}; }`;- return ts.transpileModule(helpers + `\nfunction render(protyle, element, target) ${body}\n` + (full ? events : ""), {+ const interactionSource = `function getNodeElement(protyle, element) ${getNodeElement.body.getText(source)}+function bindInteractions(protyle) {+ let isGutterDragging = false;+ let dragCleanupController;+ const restoreGutter = () => {};+ ${interactions.join("\n")};+}`;+ return ts.transpileModule(helpers + `\nfunction render(protyle, element, target) ${body}\n` ++ (full ? events + interactionSource : ""), {compilerOptions: {target: ts.ScriptTarget.ES2021},}).outputText;};@@ -46,23 +64,36 @@ const sources = (full = false) => {const cases = (source, fullSource, css) => {const check = require("node:assert/strict");const noop = () => false;+ let multiSelect = false;+ const clicked = [];+ const folded = [];const dependencies = {- Constants: {CUSTOM_SY_LIST_MINDMAP: "custom-sy-list-mindmap"}, hideElements: noop, getCrossBlockTextRange: noop,- getGutterSelection: () => ({isMultiSelect: false, selectElements: []}),+ Constants: {CUSTOM_SY_LIST_MINDMAP: "custom-sy-list-mindmap", ZWSP: "|", SIYUAN_DROP_BLOCK: "block",+ SIYUAN_DROP_GUTTER: "gutter:"}, hideElements: noop, getCrossBlockTextRange: noop,+ getGutterSelection: selected => ({isMultiSelect: multiSelect, selectElements: selected}),+ getGutterSelectionTarget: (selected, element) => selected.find(item => item === element || item.contains(element)),getHorizontalSuperBlockChild: noop, getEmbedGutterOperationContext: noop, isInEmbedBlock: noop,isInAVBlock: noop, hasViewFoldContext: noop, getGutterFixedContainerRect: noop,isMobile: () => mobile, isWindow: noop, isTabGutterBridge: noop, isMac: noop,getAllModels: () => ({editor: [{editor: {protyle}}], backlink: []}), getAllEditor: () => [{protyle}],isGutterInsertStateMatched: (count, insert) => count === (insert ? 4 : 0),getBlockTypeName: type => type, getIconByType: () => "iconTest",- genGutterBlockButtonHTML: data => `<button data-type="${data.type}" data-node-id="${data.nodeID}"><svg><use href="#iconTest"></use></svg></button>`,+ genGutterBlockButtonHTML: data => `<button data-type="${data.type}" data-node-id="${data.nodeID}"><svg><use href="#iconTest"></use></svg><span ${data.draggable ? 'draggable="true"' : ""}></span></button>`,+ hideTooltip: noop, clearSelect: noop, isOnlyMeta: noop, isEncryptedBox: noop,+ prepareCrossBlockTextSelection: noop, getContenteditableElement: element => element.querySelector('[contenteditable="true"]'),+ genEmptyElement: () => {const element = document.createElement("div"); element.innerHTML = '<div contenteditable="true"></div>'; return element;},+ getLangByType: type => type,+ setDragTipGhost: noop, stringifyBlockDragData: JSON.stringify, restoreGutterRange: noop,+ setFold: (_owner, element) => {folded.push(element.dataset.nodeId); return {fold: 1};},+ markGutterForFoldRestore: () => true,+ toggleMenu: options => options.build(null, {show: callback => callback()}),};const render = new Function(...Object.keys(dependencies), source + "\nreturn render;")(...Object.values(dependencies));- const {render: renderFull, windowMouseMove, bindHover} = new Function(...Object.keys(dependencies),- fullSource + "\nreturn {render, windowMouseMove, bindHover};")(...Object.values(dependencies));+ const {render: renderFull, windowMouseMove, bindHover, getNodeElement, bindInteractions} = new Function(...Object.keys(dependencies),+ fullSource + "\nreturn {render, windowMouseMove, bindHover, getNodeElement, bindInteractions};")(...Object.values(dependencies));let mobile = false;window.siyuan = {languages: {fold: "Fold", rowTip: "Row", addBelowAbove: "Add"}, layout: {}, blockPanels: [],- config: {editor: {fontSize: 16, rtl: false}}};+ config: {editor: {fontSize: 16, rtl: false}, system: {workspaceDir: "test"}}};const style = document.createElement("style");style.textContent = `body {margin:0; width:1000px; height:800px} .protyle-wysiwyg {margin:80px 180px;width:500px}.li {position:relative;padding-left:34px} .protyle-action {position:absolute;left:0;top:0;width:24px;height:34px}@@ -233,6 +264,109 @@ ${legacyMindmap ? 'custom-sy-list-mindmap="1"' : ""}>${content}${attr}</div>${p(}}check.deepEqual(movements, [], "moving to the marker must preserve gutters");++ window.siyuan.config.editor.blockGutterMode = 1;+ window.siyuan.menus = {menu: {element: document.createElement("div"), remove() {}, fullscreen() {}, popup() {}}};+ Object.assign(protyle, {toolbar: {range: {}}, block: {rootID: "document"}, notebookId: "notebook"});+ gutter.getNodeElement = (...args) => getNodeElement.apply(gutter, args);+ gutter.isMatchNode = () => true;+ gutter.renderMenu = (_owner, button) => clicked.push(gutter.getNodeElement(protyle, button).dataset.nodeId);+ bindInteractions.call(gutter, protyle);+ const assertTargets = ids => {+ check.deepEqual(state().ids, ids);+ for (const id of ids) {+ const button = gutter.element.querySelector(`button[data-node-id="${id}"]`);+ check.equal(gutter.getNodeElement(protyle, button), root.querySelector(`[data-node-id="${id}"]`));+ button.click();+ check.equal(clicked.at(-1), id, "each block icon opens its own menu");+ const transfer = new DataTransfer();+ button.querySelector("span").dispatchEvent(new DragEvent("dragstart", {bubbles: true, dataTransfer: transfer}));+ check.deepEqual(errors, []);+ check.ok(transfer.types.some(type => type.startsWith("gutter:") && type.includes(`|${id}|`)),+ `${id}: dragging uses the icon's exact block ID`);+ }+ gutter.element.querySelectorAll('[data-type="fold"]').forEach(button => {+ const id = button.previousElementSibling.dataset.nodeId;+ check.ok(id, "fold controls stay adjacent to their block");+ button.click();+ check.equal(folded.at(-1), id);+ });+ };+ for (const platform of [false, true]) {+ mobile = platform;+ for (const [type, cls, content, layout = "row"] of fixtures) {+ root.innerHTML = `<div data-node-id="list" data-type="NodeList" class="list"><div data-node-id="item" data-type="NodeListItem" class="li"><div class="protyle-action">-</div><div data-node-id="container" data-type="${type}" class="${cls}" data-sb-layout="${layout}">${content}${attr}</div>${p("after")}${attr}</div>${attr}</div>`;+ const container = root.querySelector('[data-node-id="container"]');+ if (type === "NodeList" && content.includes("mindmap-view")) {+ container.setAttribute("custom-sy-list-mindmap", "1");+ }+ gutter.render(protyle, container, container);+ assertTargets(["list", "item", "container"]);+ gutter.render(protyle, root.querySelector('[data-node-id="after"]'));+ assertTargets(["list", "item", "after"]);+ }+ for (const subtype of ["u", "o", "t"]) {+ root.innerHTML = `<div data-node-id="list" data-type="NodeList" data-subtype="${subtype}" class="list"><div data-node-id="item" data-type="NodeListItem" data-subtype="${subtype}" class="li"><div class="protyle-action">-</div>${p("paragraph")}${attr}</div>${attr}</div>`;+ gutter.render(protyle, root.querySelector('[data-node-id="paragraph"]'));+ assertTargets(["list", "item", "paragraph"]);+ const before = state();+ check.deepEqual(hover(root.querySelector(".protyle-action")), before,+ "moving from a paragraph to the list marker retains the complete chain");+ }+ }++ root.innerHTML = `<div data-node-id="outer-list" data-type="NodeList" class="list"><div data-node-id="outer-item" data-type="NodeListItem" class="li"><div class="protyle-action">-</div>${p("first")}<div data-node-id="quote" data-type="NodeBlockquote" class="bq">${p("qfirst")}<div data-node-id="tabs" data-type="NodeTabs" class="tabs"><div class="tabs-header">Tabs</div><div data-node-id="tab" data-type="NodeTabItem" class="tab-item"><div class="tab-item-content">${p("leaf")}</div>${attr}</div>${attr}</div>${attr}</div>${attr}</div>${attr}</div>`;+ gutter.render(protyle, root.querySelector('[data-node-id="leaf"]'));+ assertTargets(["outer-list", "outer-item", "quote", "tabs", "tab", "leaf"]);+ const nestedState = state();+ const leafRect = root.querySelector('[data-node-id="leaf"]').getBoundingClientRect();+ check.deepEqual(hover(root.querySelector('[data-node-id="quote"]'),+ (gutter.element.getBoundingClientRect().right + leafRect.left) / 2, leafRect.top + 5), nestedState,+ "crossing ancestor padding preserves the current complete chain");+ protyle.disabled = true;+ gutter.render(protyle, root.querySelector('[data-node-id="leaf"]'));+ check.equal(gutter.element.querySelectorAll('[draggable="true"]').length, 0, "read-only icons remain non-draggable");+ protyle.disabled = false;++ pane.style.cssText = "width:320px;height:200px";+ root.style.cssText = "padding:20px 24px;width:250px";+ document.documentElement.style.setProperty("--b3-font-size-editor", "48px");+ const deepIDs = Array.from({length: 16}, (_, index) => `deep-${index}`);+ root.innerHTML = deepIDs.reduceRight((html, id) =>+ `<div data-node-id="${id}" data-type="NodeBlockquote" class="bq">${html}${attr}</div>`, p("deep-leaf"));+ gutter.render(protyle, root.querySelector('[data-node-id="deep-leaf"]'));+ check.deepEqual(state().ids, [...deepIDs, "deep-leaf"]);+ const bounds = gutter.element.getBoundingClientRect();+ const viewport = pane.getBoundingClientRect();+ check.ok(bounds.left >= viewport.left && bounds.right <= viewport.right && bounds.top >= viewport.top && bounds.bottom <= viewport.bottom,+ "full indicators stay within a narrow pane with large editor fonts");+ check.equal(gutter.element.dataset.scrollable, "true", "deep chains are scrollable");+ gutter.element.scrollTop = gutter.element.scrollHeight;+ const previousButton = gutter.element.querySelector("button[data-node-id]");+ const previousScrollTop = gutter.element.scrollTop;+ gutter.render(protyle, root.querySelector('[data-node-id="deep-leaf"]'));+ check.equal(gutter.element.querySelector("button[data-node-id]"), previousButton, "repeated rendering keeps full-mode buttons stable");+ check.equal(gutter.element.scrollTop, previousScrollTop, "repeated rendering preserves the visible level");+ const lastButton = gutter.element.querySelector('button[data-node-id="deep-leaf"]');+ const lastRect = lastButton.getBoundingClientRect();+ check.equal(document.elementFromPoint(lastRect.left + lastRect.width / 2, lastRect.top + lastRect.height / 2)?.closest("button"), lastButton,+ "the innermost block remains clickable after scrolling");++ multiSelect = true;+ root.innerHTML = p("selected1") + p("selected2");+ root.querySelectorAll("[data-node-id]").forEach(element => element.classList.add("protyle-wysiwyg--select"));+ gutter.render(protyle, root.firstElementChild);+ check.deepEqual(state().ids, ["selected1"], "full mode retains the existing multi-selection target");+ check.equal(gutter.element.querySelectorAll(".protyle-gutters__line, .protyle-gutters__plus").length, 0);+ check.equal(gutter.element.classList.contains("protyle-gutters--full"), false);+ multiSelect = false;+ window.siyuan.config.editor.blockGutterMode = 0;+ root.innerHTML = `<div data-node-id="list" data-type="NodeList" class="list"><div data-node-id="item" data-type="NodeListItem" class="li"><div class="protyle-action"></div>${p("paragraph")}${attr}</div>${attr}</div>`;+ gutter.render(protyle, root.querySelector('[data-node-id="paragraph"]'));+ check.deepEqual(state().ids, ["list"], "switching back restores compact mode");+ check.equal(gutter.element.style.maxHeight, "");+ check.equal(gutter.element.style.overflowY, "");+ check.equal(gutter.element.dataset.scrollable, undefined);return "List container gutters passed";};@@ -255,7 +389,7 @@ if (process.versions.electron && process.type === "browser") {app.exit(0);})().catch(error => { console.error(error); require("electron").app.exit(1); });} else {- require("node:test").test("first list containers retain both container and list item gutters", {+ require("node:test").test("compact and full block indicators keep exact targets and remain reachable", {skip: process.platform === "linux" && !process.env.DISPLAY && !process.env.WAYLAND_DISPLAY,timeout: 30000,}, async () => {diff --git a/app/tests/listFoldRemoval.test.js b/app/tests/listFoldRemoval.test.jsindex 38cce79df5..830d3bb025 100644--- a/app/tests/listFoldRemoval.test.js+++ b/app/tests/listFoldRemoval.test.js@@ -14,7 +14,7 @@ const rendererSource = () => {assert.equal(statements.length, names.length, file);return statements.map(statement => statement.getText(source)).join("\n");};- const extractClick = (file, condition, call = "toggleListFold(") => {+ const extractClick = (file, condition, call = "toggleListFold(", prefixNames = []) => {const source = ts.createSourceFile(file,readFileSync(path.join(__dirname, "../src/protyle", `${file}.ts`), "utf8"),ts.ScriptTarget.Latest, true);@@ -22,7 +22,16 @@ const rendererSource = () => {const visit = node => {if (ts.isIfStatement(node) && condition(node.expression.getText(source)) &&node.thenStatement.getText(source).includes(call)) {- matches.push(node.thenStatement.getText(source));+ let prefix = "";+ for (let parent = node.parent; parent; parent = parent.parent) {+ if (ts.isBlock(parent)) {+ prefix = parent.statements.filter(statement => ts.isVariableStatement(statement) &&+ statement.declarationList.declarations.some(declaration => prefixNames.includes(declaration.name.getText(source))))+ .map(statement => statement.getText(source)).join("\n");+ break;+ }+ }+ matches.push(prefix ? `{${prefix}\n${node.thenStatement.getText(source)}}` : node.thenStatement.getText(source));}ts.forEachChild(node, visit);};@@ -93,7 +102,7 @@ const rendererSource = () => {${extractClick("wysiwyg/index", condition => condition.includes("shouldFoldEmbeddedListByAlt") && condition.includes("hasClosestByClassName(target"), "event.preventDefault()")}};export const clickGutter = (protyle, foldElement, buttonElement) => ${extractClick("gutter/index",- condition => condition.includes('buttonElement.getAttribute("data-type") === "NodeListItem"'))};+ condition => condition.includes('buttonElement.getAttribute("data-type") === "NodeListItem"'), "toggleListFold(", ["foldButton", "foldArrow"])};export const clickArrow = (protyle, foldElement, buttonElement) => ${extractClick("gutter/index",condition => condition === "event.altKey", 'toggleListFold(protyle, foldElement, "children")')};export const clickDot = (protyle, actionElement) => ${extractClick("wysiwyg/index",diff --git a/app/tests/tabsDrag.test.js b/app/tests/tabsDrag.test.jsindex 5d229c346c..ea0c29090c 100644--- a/app/tests/tabsDrag.test.js+++ b/app/tests/tabsDrag.test.js@@ -18,8 +18,9 @@ const sources = () => {};return [extract("protyle/util/editorCommonEvent.ts", ["getDragSourceParentID", "getDragSourceNextID", "moveTo"]),+ extract("protyle/util/dragDocument.ts", ["replaceDragUndoOperation"]),extract("protyle/util/foldHeadingMove.ts", ["isFoldedHeading", "getHeadingLevel", "shouldUnfoldMovedHeading"]),- extract("protyle/wysiwyg/getBlock.ts", ["getParentBlock", "getPreviousBlockSibling", "getNextBlockSibling", "getTopAloneElement"]),+ extract("protyle/wysiwyg/getBlock.ts", ["getParentBlock", "getPreviousBlockSibling", "getNextBlockSibling", "getTopAloneElement", "getSbChildBlockCount"]),(() => {const file = ts.createSourceFile("tabsRender.ts", readFileSync(path.join(__dirname,"../src/protyle/render/tabsRender.ts"), "utf8"), ts.ScriptTarget.Latest, true);@@ -43,6 +44,8 @@ const cases = async (source) => {const check = require("node:assert/strict");const lute = window.Lute.New();lute.SetTabs(true);+ lute.SetCallout(true);+ lute.SetSuperBlock(true);lute.SetKramdownIAL(true);lute.SetProtyleWYSIWYG(true);const genEmptyElement = (_wbr, _start, id) => {@@ -130,14 +133,18 @@ const cases = async (source) => {if (operation.action === "insert") {const template = document.createElement("template");template.innerHTML = lute.SpinBlockDOM(operation.data);- moving = template.content.firstElementChild;+ // 解析独立列表项时会生成列表包装,事务按操作 ID 插入实际目标。+ moving = template.content.querySelector(`[data-node-id="${operation.id}"]`);+ check.ok(moving, JSON.stringify(operation));}if (operation.nextID) {find(operation.nextID).before(moving);} else if (operation.previousID) {find(operation.previousID).after(moving);} else {- find(operation.parentID).prepend(moving);+ const parent = find(operation.parentID);+ check.ok(parent, JSON.stringify(operation));+ (parent.querySelector(":scope > .callout-content, :scope > .tab-item-content") || parent).prepend(moving);}}});@@ -232,6 +239,29 @@ const cases = async (source) => {replay(operations.undoOperations);check.deepEqual(Array.from(stored.children).map(node => node.dataset.nodeId), originalIDs);}+ for (const markdown of ["- Only item\n\nTarget", "1. Only item\n\nTarget", "- [ ] Only item\n\nTarget",+ "- First item\n- Second item\n\nTarget", "> Only quote\n\nTarget", "> [!NOTE]\n> Only callout\n\nTarget",+ "{{{row\nOnly child\n}}}\n\nTarget", "- > Only nested quote\n\nTarget"]) {+ root.innerHTML = lute.Md2BlockDOM(markdown);+ protyle.block.showAll = true;+ const container = root.firstElementChild;+ const paragraph = container.querySelector('[data-type="NodeParagraph"]');+ check.ok(paragraph, markdown);+ const originalIDs = Array.from(root.querySelectorAll("[data-node-id]")).map(node => node.dataset.nodeId);+ const originalParent = paragraph.parentElement.closest("[data-node-id]").dataset.nodeId;+ stored.innerHTML = root.innerHTML;+ const operations = await moveTo(protyle, [paragraph], root.lastElementChild, true, "afterend", false);+ replay(operations.doOperations);+ check.equal(find(paragraph.dataset.nodeId).parentElement, stored, "a child gutter drags only its own paragraph");+ for (let repeat = 0; repeat < 2; repeat++) {+ replay(operations.undoOperations);+ check.equal(find(paragraph.dataset.nodeId).parentElement.closest("[data-node-id]").dataset.nodeId, originalParent,+ "undo restores the paragraph to its original container");+ check.deepEqual(Array.from(stored.querySelectorAll("[data-node-id]")).map(node => node.dataset.nodeId), originalIDs,+ "undo preserves every original block ID without adding placeholders");+ replay(operations.doOperations);+ }+ }root.innerHTML = lute.Md2BlockDOM("## Heading\n\nChild\n\n### Nested\n\nNested child\n\n## Boundary");root.firstElementChild.setAttribute("fold", "1");check.equal(getDragSourceNextID(root.firstElementChild, [root.firstElementChild]), root.lastElementChild.dataset.nodeId);@@ -269,7 +299,7 @@ const run = async () => {if (process.versions.electron && process.type === "browser") {run().catch(error => { console.error(error); require("electron").app.exit(1); });} else {- require("node:test").test("repeated tab drags preserve active IDs through attribute replay, undo and redo", {+ require("node:test").test("tab and content block drags preserve IDs through attribute replay, undo and redo", {skip: process.platform === "linux" && !process.env.DISPLAY && !process.env.WAYLAND_DISPLAY,timeout: 45000,}, async () => {diff --git a/kernel/api/contract_setting_gutter_test.go b/kernel/api/contract_setting_gutter_test.gonew file mode 100644index 0000000000..4a4f503385--- /dev/null+++ b/kernel/api/contract_setting_gutter_test.go@@ -0,0 +1,81 @@+package api++import (+ "encoding/json"+ "os"+ "path/filepath"+ "testing"++ "github.com/siyuan-note/siyuan/kernel/apicontract"+ "github.com/siyuan-note/siyuan/kernel/conf"+ "github.com/siyuan-note/siyuan/kernel/model"+ "github.com/siyuan-note/siyuan/kernel/util"+)++func TestAPIContractSettingBlockGutterMode(t *testing.T) {+ compareSettingConfig(t, apicontract.SetEditor, conf.NewEditor, []string{+ `{}`, `{"blockGutterMode":0}`, `{"blockGutterMode":1}`, `{"blockGutterMode":null}`,+ `{"BlockGutterMode":1}`, `{"blockGutterMode":-1}`, `{"blockGutterMode":2}`,+ `{"blockGutterMode":"bad"}`, `{"blockGutterMode":true}`, `{"blockGutterMode":1.5}`,+ })+ previousConf, previousReadOnly, previousMarkdown := model.Conf, util.ReadOnly, util.MarkdownSettings.Load()+ previousConfDir := util.ConfDir+ util.ConfDir = t.TempDir()+ model.Conf = model.NewAppConf()+ model.Conf.Editor.Store(conf.NewEditor())+ util.ReadOnly = true+ t.Cleanup(func() {+ model.Conf = previousConf+ util.ReadOnly = previousReadOnly+ util.MarkdownSettings.Store(previousMarkdown)+ util.ConfDir = previousConfDir+ })+ if model.Conf.Editor.Load().BlockGutterMode != 0 {+ t.Fatal("block gutter mode must default to compact")+ }+ for _, entry := range []struct {+ body string+ want int+ }{+ {`{"blockGutterMode":1}`, 1}, {`{}`, 1}, {`{"blockGutterMode":0}`, 0},+ {`{"BlockGutterMode":1}`, 1}, {`{"blockGutterMode":null}`, 0},+ {`{"blockGutterMode":-1}`, 0}, {`{"blockGutterMode":2}`, 0},+ } {+ code, message, data := settingContractRequest(t, "setEditor", setEditor, entry.body)+ var response apicontract.SettingEditor+ if err := json.Unmarshal(data, &response); err != nil {+ t.Fatal(err)+ }+ if code != 0 || model.Conf.Editor.Load().BlockGutterMode != entry.want || response.BlockGutterMode != entry.want {+ t.Fatalf("block gutter mode update %s: code=%d message=%s data=%s", entry.body, code, message, data)+ }+ }+ for _, entry := range []struct {+ body string+ want int+ }{+ {`{"editor":{"blockGutterMode":1}}`, 1}, {`{"editor":{"fontSize":18}}`, 1},+ {`{"editor":{"blockGutterMode":0}}`, 0}, {`{"editor":{"blockGutterMode":99}}`, 0},+ } {+ code, message, data := settingContractRequest(t, "patch", patchSetting, entry.body)+ if code != 0 || model.Conf.Editor.Load().BlockGutterMode != entry.want {+ t.Fatalf("block gutter mode patch %s: code=%d message=%s data=%s", entry.body, code, message, data)+ }+ }+ code, message, _ := settingContractRequest(t, "setEditor", setEditor, `{"blockGutterMode":1}`)+ if code != 0 {+ t.Fatalf("full mode could not be saved: %d %s", code, message)+ }+ util.ReadOnly = false+ model.Conf.Save()+ data, err := os.ReadFile(filepath.Join(util.ConfDir, "conf.json"))+ if err != nil {+ t.Fatal(err)+ }+ var stored struct {+ Editor conf.Editor `json:"editor"`+ }+ if err = json.Unmarshal(data, &stored); err != nil || conf.NormalizeEditor(&stored.Editor).BlockGutterMode != 1 {+ t.Fatalf("full block gutter mode was not preserved in saved configuration: %v", err)+ }+}diff --git a/kernel/api/setting.go b/kernel/api/setting.goindex 21b28b77d4..b13bfc418f 100644--- a/kernel/api/setting.go+++ b/kernel/api/setting.go@@ -372,6 +372,9 @@ func applyEditorSetting(c *gin.Context, request apicontract.SetEditorRequest) (rif !request.HasFieldFold("pageScrollButtons") {editor.PageScrollButtons = model.Conf.Editor.Load().PageScrollButtons}+ if !request.HasFieldFold("blockGutterMode") {+ editor.BlockGutterMode = model.Conf.Editor.Load().BlockGutterMode+ }issues, applyErr := model.ApplyConfSection("editor", editor)recordSettingIssues(c, issues)diff --git a/kernel/api/setting_contract.go b/kernel/api/setting_contract.goindex 8d7a61a701..4ec7ef4249 100644--- a/kernel/api/setting_contract.go+++ b/kernel/api/setting_contract.go@@ -365,6 +365,7 @@ func settingEditorPayload(value *conf.Editor) *apicontract.SettingEditor {result.CodeLineWrap = value.CodeLineWrapresult.CodeLigatures = value.CodeLigaturesresult.DisplayBookmarkIcon = value.DisplayBookmarkIcon+ result.BlockGutterMode = value.BlockGutterModeresult.DisplayNetImgMark = value.DisplayNetImgMarkresult.DisplayImgName = value.DisplayImgNameresult.DisplayImgAlt = value.DisplayImgAltdiff --git a/kernel/apicontract/schema.json b/kernel/apicontract/schema.jsonindex 8661fd7c31..d7788a245e 100644--- a/kernel/apicontract/schema.json+++ b/kernel/apicontract/schema.json@@ -40357,6 +40357,16 @@}]},+ "blockGutterMode": {+ "anyOf": [+ {+ "type": "integer"+ },+ {+ "type": "null"+ }+ ]+ },"blockRefDynamicAnchorTextMaxLen": {"anyOf": [{@@ -44452,6 +44462,9 @@}]},+ "blockGutterMode": {+ "type": "integer"+ },"blockRefDynamicAnchorTextMaxLen": {"type": "integer"},@@ -44724,6 +44737,7 @@"backlinkSort","backmentionExpandCount","backmentionSort",+ "blockGutterMode","blockRefDynamicAnchorTextMaxLen","checkBlockRef","codeFontFamilies",@@ -44989,6 +45003,16 @@}]},+ "blockGutterMode": {+ "anyOf": [+ {+ "type": "integer"+ },+ {+ "type": "null"+ }+ ]+ },"blockRefDynamicAnchorTextMaxLen": {"anyOf": [{diff --git a/kernel/apicontract/setting.go b/kernel/apicontract/setting.goindex f7e0de02ed..0194e24fb4 100644--- a/kernel/apicontract/setting.go+++ b/kernel/apicontract/setting.go@@ -195,6 +195,7 @@ type SettingFlashcard struct {}// SettingEditor 描述编辑器配置。displayImgName 和 displayImgAlt 默认关闭,更新设置时省略这些字段保留当前值。+// blockGutterMode 为 0 时精简块标,为 1 时显示当前块及其容器层级;默认及越界值为 0,旧接口省略时保留当前值。type SettingEditor struct {AllowSVGScript bool `json:"allowSVGScript" api:"optional,nullable"`AllowHTMLBLockScript bool `json:"allowHTMLBLockScript" api:"optional,nullable"`@@ -211,6 +212,7 @@ type SettingEditor struct {CodeLineWrap bool `json:"codeLineWrap" api:"optional,nullable"`CodeLigatures bool `json:"codeLigatures" api:"optional,nullable"`DisplayBookmarkIcon bool `json:"displayBookmarkIcon" api:"optional,nullable"`+ BlockGutterMode int `json:"blockGutterMode" api:"optional,nullable"`DisplayNetImgMark bool `json:"displayNetImgMark" api:"optional,nullable"`DisplayImgName bool `json:"displayImgName" api:"optional,nullable"`DisplayImgAlt bool `json:"displayImgAlt" api:"optional,nullable"`diff --git a/kernel/conf/editor.go b/kernel/conf/editor.goindex 481c60bbdb..5ab2f69a7b 100644--- a/kernel/conf/editor.go+++ b/kernel/conf/editor.go@@ -59,6 +59,7 @@ type Editor struct {CodeLineWrap bool `json:"codeLineWrap"` // 代码块是否自动折行CodeLigatures bool `json:"codeLigatures"` // 代码块是否连字DisplayBookmarkIcon bool `json:"displayBookmarkIcon"` // 是否显示内容块角标+ BlockGutterMode int `json:"blockGutterMode"` // 块标显示模式,0:精简,1:完整DisplayNetImgMark bool `json:"displayNetImgMark"` // 是否显示网络图片角标DisplayImgName bool `json:"displayImgName"` // 是否显示图片文件名DisplayImgAlt bool `json:"displayImgAlt"` // 是否显示图片提示文本diff --git a/kernel/conf/settings_normalize.go b/kernel/conf/settings_normalize.goindex 3a539c1dd0..6148eaa92a 100644--- a/kernel/conf/settings_normalize.go+++ b/kernel/conf/settings_normalize.go@@ -106,6 +106,9 @@ func NormalizeEditor(editor *Editor) *Editor {if editor.DatabaseAttrViewMode < 0 || editor.DatabaseAttrViewMode > 1 {editor.DatabaseAttrViewMode = defaults.DatabaseAttrViewMode}+ if editor.BlockGutterMode < 0 || editor.BlockGutterMode > 1 {+ editor.BlockGutterMode = defaults.BlockGutterMode+ }switch editor.CodeTabSpaces {case 0, 2, 4, 6, 8:default:diff --git a/kernel/conf/settings_ranges_test.go b/kernel/conf/settings_ranges_test.goindex 1615da3d42..6061dbde90 100644--- a/kernel/conf/settings_ranges_test.go+++ b/kernel/conf/settings_ranges_test.go@@ -38,7 +38,7 @@ func TestNormalizeSettingsEnumRanges(t *testing.T) {for _, field := range []string{"BacklinkGlobalSort", "BacklinkBlockSort", "FloatWindowMode", "HeadingEmbedMode"} {checkNormalizedIntValues(t, NewEditor, NormalizeEditor, field, ternary)}- for _, field := range []string{"DatabaseAttrClickMode", "DatabaseAttrViewMode"} {+ for _, field := range []string{"DatabaseAttrClickMode", "DatabaseAttrViewMode", "BlockGutterMode"} {checkNormalizedIntValues(t, NewEditor, NormalizeEditor, field, binary)}checkNormalizedIntValues(t, NewEditor, NormalizeEditor, "CodeTabSpaces",