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: Improve mobile slash menu settings and touch sorting https://github.com/siyuan-note/siyuan/issues/19842
Danielefb640bef63f
diff --git a/app/appearance/langs/ar.json b/app/appearance/langs/ar.jsonindex 30ef5019e3..17ac5cfbf6 100644--- a/app/appearance/langs/ar.json+++ b/app/appearance/langs/ar.json@@ -212,7 +212,7 @@"backlinkHideReference": "إخفاء كتل المراجع في الروابط الخلفية الموروثة","backlinkHideReferenceTip": "إخفاء الكتل التي تحتوي فقط على مراجع كتل في الروابط الخلفية الموروثة عندما يبقى محتوى آخر ظاهرًا، وإظهارها مجددًا أثناء التحرير","uploadInsertTargetUnavailable": "لم تعد وجهة الرفع الأصلية متاحة. لم تُدرج النتيجة؛ تم الاحتفاظ بالملفات المرفوعة.",- "mobileToolbarEntryTip": "اضبط ظهور عناصر شريط الأدوات على الهاتف وترتيبها؛ تُحفظ ملفات التعريف على هذا الجهاز ولا تتم مزامنتها بين الأجهزة",+ "mobileToolbarEntryTip": "اضبط ظهور عناصر شريط الأدوات وقائمة الشرطة المائلة على الهاتف وترتيبها؛ تُحفظ ملفات التعريف على هذا الجهاز ولا تتم مزامنتها بين الأجهزة","keymapAssigned": "مُعيَّن","keymapCustomized": "مخصص بواسطتي","keymapUnassigned": "غير مُعيَّن",diff --git a/app/appearance/langs/de.json b/app/appearance/langs/de.jsonindex c741ff55a2..8af78a7744 100644--- a/app/appearance/langs/de.json+++ b/app/appearance/langs/de.json@@ -212,7 +212,7 @@"backlinkHideReference": "Referenzblöcke in vererbten Rückverweisen ausblenden","backlinkHideReferenceTip": "Blöcke mit ausschließlich Blockreferenzen in vererbten Rückverweisen ausblenden, wenn andere Inhalte sichtbar bleiben, und beim Bearbeiten wieder anzeigen","uploadInsertTargetUnavailable": "Das ursprüngliche Upload-Ziel ist nicht mehr verfügbar. Das Ergebnis wurde nicht eingefügt; hochgeladene Dateien bleiben erhalten.",- "mobileToolbarEntryTip": "Sichtbarkeit und Reihenfolge der mobilen Werkzeugleisteneinträge konfigurieren; Profile werden auf diesem Gerät gespeichert und nicht zwischen Geräten synchronisiert",+ "mobileToolbarEntryTip": "Sichtbarkeit und Reihenfolge der mobilen Werkzeugleisten- und Schrägstrichmenüeinträge konfigurieren; Profile werden auf diesem Gerät gespeichert und nicht zwischen Geräten synchronisiert","keymapAssigned": "Zugewiesen","keymapCustomized": "Von mir angepasst","keymapUnassigned": "Nicht zugewiesen",diff --git a/app/appearance/langs/en.json b/app/appearance/langs/en.jsonindex b19b26f87f..17ecd92f88 100644--- a/app/appearance/langs/en.json+++ b/app/appearance/langs/en.json@@ -212,7 +212,7 @@"backlinkHideReference": "Hide reference blocks in propagated backlinks","backlinkHideReferenceTip": "Hide blocks containing only block references in propagated backlinks when other content remains visible, and show them again while editing","uploadInsertTargetUnavailable": "The original upload target is no longer available. The result was not inserted; uploaded files are retained.",- "mobileToolbarEntryTip": "Configure mobile toolbar visibility and order; profiles are saved on this device and are not synced across devices",+ "mobileToolbarEntryTip": "Configure the visibility and order of mobile toolbar and slash menu items; profiles are saved on this device and are not synced across devices","keymapAssigned": "Assigned","keymapCustomized": "Customized by me","keymapUnassigned": "Unassigned",diff --git a/app/appearance/langs/es.json b/app/appearance/langs/es.jsonindex 800c3464f4..b1bd97b667 100644--- a/app/appearance/langs/es.json+++ b/app/appearance/langs/es.json@@ -212,7 +212,7 @@"backlinkHideReference": "Ocultar bloques de referencia en enlaces inversos propagados","backlinkHideReferenceTip": "Ocultar los bloques que solo contienen referencias a bloques en los enlaces inversos propagados cuando queda otro contenido visible y mostrarlos de nuevo al editar","uploadInsertTargetUnavailable": "El destino original de la carga ya no está disponible. No se insertó el resultado; los archivos cargados se conservan.",- "mobileToolbarEntryTip": "Configurar la visibilidad y el orden de los elementos de la barra de herramientas móvil; los perfiles se guardan en este dispositivo y no se sincronizan entre dispositivos",+ "mobileToolbarEntryTip": "Configurar la visibilidad y el orden de los elementos de la barra de herramientas y del menú de barra inclinada en el móvil; los perfiles se guardan en este dispositivo y no se sincronizan entre dispositivos","keymapAssigned": "Asignados","keymapCustomized": "Personalizados por mí","keymapUnassigned": "Sin asignar",diff --git a/app/appearance/langs/fr.json b/app/appearance/langs/fr.jsonindex 3d264555ca..6f9fcc7822 100644--- a/app/appearance/langs/fr.json+++ b/app/appearance/langs/fr.json@@ -212,7 +212,7 @@"backlinkHideReference": "Masquer les blocs de référence dans les liens retour propagés","backlinkHideReferenceTip": "Masquer les blocs contenant uniquement des références de bloc dans les liens retour propagés si un autre contenu reste visible, et les réafficher pendant la modification","uploadInsertTargetUnavailable": "La cible initiale du téléversement n’est plus disponible. Le résultat n’a pas été inséré ; les fichiers téléversés sont conservés.",- "mobileToolbarEntryTip": "Configurer la visibilité et l’ordre des éléments de la barre d’outils mobile ; les profils sont enregistrés sur cet appareil et ne sont pas synchronisés entre les appareils",+ "mobileToolbarEntryTip": "Configurer la visibilité et l’ordre des éléments de la barre d’outils et du menu slash sur mobile ; les profils sont enregistrés sur cet appareil et ne sont pas synchronisés entre les appareils","keymapAssigned": "Attribués","keymapCustomized": "Personnalisés par moi","keymapUnassigned": "Non attribués",diff --git a/app/appearance/langs/he.json b/app/appearance/langs/he.jsonindex eab5c51a3e..9c6ee2fcad 100644--- a/app/appearance/langs/he.json+++ b/app/appearance/langs/he.json@@ -212,7 +212,7 @@"backlinkHideReference": "הסתרת בלוקי הפניה בקישורים נכנסים מועברים","backlinkHideReferenceTip": "הסתרת בלוקים המכילים רק הפניות לבלוקים בקישורים נכנסים מועברים כאשר תוכן אחר נשאר גלוי, והצגתם מחדש בזמן עריכה","uploadInsertTargetUnavailable": "יעד ההעלאה המקורי אינו זמין עוד. התוצאה לא הוכנסה; הקבצים שהועלו נשמרים.",- "mobileToolbarEntryTip": "הגדרת הנראות והסדר של פריטי סרגל הכלים בנייד; הפרופילים נשמרים במכשיר זה ואינם מסונכרנים בין מכשירים",+ "mobileToolbarEntryTip": "הגדרת הנראות והסדר של פריטי סרגל הכלים ותפריט הלוכסן בנייד; הפרופילים נשמרים במכשיר זה ואינם מסונכרנים בין מכשירים","keymapAssigned": "מוקצים","keymapCustomized": "מותאמים אישית על ידי","keymapUnassigned": "לא מוקצים",diff --git a/app/appearance/langs/hi.json b/app/appearance/langs/hi.jsonindex 1ce57e34d7..05ac7e70bd 100644--- a/app/appearance/langs/hi.json+++ b/app/appearance/langs/hi.json@@ -212,7 +212,7 @@"backlinkHideReference": "प्रसारित बैकलिंक में संदर्भ ब्लॉक छिपाएँ","backlinkHideReferenceTip": "प्रसारित बैकलिंक में केवल ब्लॉक संदर्भ वाले ब्लॉक छिपाएँ जब अन्य सामग्री दिखाई देती रहे, और संपादन के दौरान उन्हें फिर से दिखाएँ","uploadInsertTargetUnavailable": "अपलोड का मूल लक्ष्य अब उपलब्ध नहीं है। परिणाम सम्मिलित नहीं किया गया; अपलोड की गई फ़ाइलें सुरक्षित रखी गई हैं।",- "mobileToolbarEntryTip": "मोबाइल टूलबार की मदों की दृश्यता और क्रम सेट करें; प्रोफ़ाइल इस डिवाइस पर सहेजी जाती हैं और डिवाइसों के बीच सिंक नहीं होतीं",+ "mobileToolbarEntryTip": "मोबाइल टूलबार और स्लैश मेनू की मदों की दृश्यता और क्रम सेट करें; प्रोफ़ाइल इस डिवाइस पर सहेजी जाती हैं और डिवाइसों के बीच सिंक नहीं होतीं","keymapAssigned": "असाइन किए गए","keymapCustomized": "मेरे द्वारा अनुकूलित","keymapUnassigned": "असाइन नहीं किए गए",diff --git a/app/appearance/langs/id.json b/app/appearance/langs/id.jsonindex c12096f850..8e9abb8473 100644--- a/app/appearance/langs/id.json+++ b/app/appearance/langs/id.json@@ -212,7 +212,7 @@"backlinkHideReference": "Sembunyikan blok referensi pada tautan balik yang diteruskan","backlinkHideReferenceTip": "Sembunyikan blok yang hanya berisi referensi blok pada tautan balik yang diteruskan jika konten lain tetap terlihat, dan tampilkan kembali saat mengedit","uploadInsertTargetUnavailable": "Tujuan unggahan awal tidak lagi tersedia. Hasil tidak disisipkan; berkas yang diunggah tetap disimpan.",- "mobileToolbarEntryTip": "Atur visibilitas dan urutan item bilah alat seluler; profil disimpan di perangkat ini dan tidak disinkronkan antarperangkat",+ "mobileToolbarEntryTip": "Atur visibilitas dan urutan item bilah alat dan menu garis miring di ponsel; profil disimpan di perangkat ini dan tidak disinkronkan antarperangkat","keymapAssigned": "Ditetapkan","keymapCustomized": "Disesuaikan oleh saya","keymapUnassigned": "Belum ditetapkan",diff --git a/app/appearance/langs/it.json b/app/appearance/langs/it.jsonindex 6d8eff6f85..959331b28b 100644--- a/app/appearance/langs/it.json+++ b/app/appearance/langs/it.json@@ -212,7 +212,7 @@"backlinkHideReference": "Nascondi i blocchi di riferimento nei backlink propagati","backlinkHideReferenceTip": "Nascondi i blocchi contenenti solo riferimenti a blocchi nei backlink propagati quando rimangono altri contenuti visibili e mostrali di nuovo durante la modifica","uploadInsertTargetUnavailable": "La destinazione originale del caricamento non è più disponibile. Il risultato non è stato inserito; i file caricati vengono conservati.",- "mobileToolbarEntryTip": "Configura la visibilità e l’ordine degli elementi della barra degli strumenti mobile; i profili vengono salvati su questo dispositivo e non vengono sincronizzati tra dispositivi",+ "mobileToolbarEntryTip": "Configura la visibilità e l’ordine degli elementi della barra degli strumenti e del menu slash su mobile; i profili vengono salvati su questo dispositivo e non vengono sincronizzati tra dispositivi","keymapAssigned": "Assegnate","keymapCustomized": "Personalizzate da me","keymapUnassigned": "Non assegnate",diff --git a/app/appearance/langs/ja.json b/app/appearance/langs/ja.jsonindex 890b014cc8..5250fe4cb6 100644--- a/app/appearance/langs/ja.json+++ b/app/appearance/langs/ja.json@@ -212,7 +212,7 @@"backlinkHideReference": "伝播型バックリンクの参照ブロックを非表示","backlinkHideReferenceTip": "伝播型バックリンクで、ほかに表示できる内容がある場合はブロック参照のみのブロックを非表示にし、編集中は再表示します","uploadInsertTargetUnavailable": "アップロード元の挿入先が無効になったため、結果を挿入しませんでした。アップロード済みのファイルは保持されます。",- "mobileToolbarEntryTip": "モバイル版ツールバー項目の表示・非表示と順序を設定します。プロファイルはこの端末に保存され、端末間では同期されません",+ "mobileToolbarEntryTip": "モバイル版のツールバーとスラッシュメニュー項目の表示・非表示と順序を設定します。プロファイルはこの端末に保存され、端末間では同期されません","keymapAssigned": "割り当て済み","keymapCustomized": "自分でカスタマイズ","keymapUnassigned": "未割り当て",diff --git a/app/appearance/langs/ko.json b/app/appearance/langs/ko.jsonindex a0483da28b..d24316b2ef 100644--- a/app/appearance/langs/ko.json+++ b/app/appearance/langs/ko.json@@ -212,7 +212,7 @@"backlinkHideReference": "전파된 백링크의 참조 블록 숨기기","backlinkHideReferenceTip": "전파된 백링크에서 다른 표시할 내용이 있으면 블록 참조만 포함된 블록을 숨기고 편집 중에는 다시 표시","uploadInsertTargetUnavailable": "원래 업로드 대상이 더 이상 유효하지 않습니다. 결과를 삽입하지 않았으며 업로드된 파일은 유지됩니다.",- "mobileToolbarEntryTip": "모바일 도구 모음 항목의 표시 여부와 순서를 설정합니다. 프로필은 이 기기에 저장되며 기기 간에 동기화되지 않습니다",+ "mobileToolbarEntryTip": "모바일 도구 모음과 슬래시 메뉴 항목의 표시 여부와 순서를 설정합니다. 프로필은 이 기기에 저장되며 기기 간에 동기화되지 않습니다","keymapAssigned": "할당됨","keymapCustomized": "내가 사용자 지정함","keymapUnassigned": "할당되지 않음",diff --git a/app/appearance/langs/nl.json b/app/appearance/langs/nl.jsonindex c1c6499a24..7edd93753d 100644--- a/app/appearance/langs/nl.json+++ b/app/appearance/langs/nl.json@@ -212,7 +212,7 @@"backlinkHideReference": "Verwijzingsblokken in doorgegeven backlinks verbergen","backlinkHideReferenceTip": "Verberg blokken met uitsluitend blokverwijzingen in doorgegeven backlinks als andere inhoud zichtbaar blijft en toon ze weer tijdens het bewerken","uploadInsertTargetUnavailable": "Het oorspronkelijke uploaddoel is niet meer beschikbaar. Het resultaat is niet ingevoegd; geüploade bestanden blijven behouden.",- "mobileToolbarEntryTip": "Configureer de zichtbaarheid en volgorde van mobiele werkbalkitems; profielen worden op dit apparaat opgeslagen en niet tussen apparaten gesynchroniseerd",+ "mobileToolbarEntryTip": "Configureer de zichtbaarheid en volgorde van mobiele werkbalk- en slashmenu-items; profielen worden op dit apparaat opgeslagen en niet tussen apparaten gesynchroniseerd","keymapAssigned": "Toegewezen","keymapCustomized": "Door mij aangepast","keymapUnassigned": "Niet toegewezen",diff --git a/app/appearance/langs/pl.json b/app/appearance/langs/pl.jsonindex 513668264c..65da10130f 100644--- a/app/appearance/langs/pl.json+++ b/app/appearance/langs/pl.json@@ -212,7 +212,7 @@"backlinkHideReference": "Ukryj bloki odwołań w propagowanych linkach zwrotnych","backlinkHideReferenceTip": "Ukrywaj bloki zawierające wyłącznie odwołania do bloków w propagowanych linkach zwrotnych, gdy pozostaje inna widoczna treść, i pokazuj je ponownie podczas edycji","uploadInsertTargetUnavailable": "Pierwotny cel przesyłania nie jest już dostępny. Wynik nie został wstawiony; przesłane pliki zostały zachowane.",- "mobileToolbarEntryTip": "Skonfiguruj widoczność i kolejność elementów mobilnego paska narzędzi; profile są zapisywane na tym urządzeniu i nie są synchronizowane między urządzeniami",+ "mobileToolbarEntryTip": "Skonfiguruj widoczność i kolejność elementów mobilnego paska narzędzi i menu ukośnika; profile są zapisywane na tym urządzeniu i nie są synchronizowane między urządzeniami","keymapAssigned": "Przypisane","keymapCustomized": "Dostosowane przeze mnie","keymapUnassigned": "Nieprzypisane",diff --git a/app/appearance/langs/pt-BR.json b/app/appearance/langs/pt-BR.jsonindex 7d88d326ef..e3349c8dd4 100644--- a/app/appearance/langs/pt-BR.json+++ b/app/appearance/langs/pt-BR.json@@ -212,7 +212,7 @@"backlinkHideReference": "Ocultar blocos de referência em backlinks propagados","backlinkHideReferenceTip": "Ocultar blocos que contêm apenas referências a blocos em backlinks propagados quando houver outro conteúdo visível e exibi-los novamente durante a edição","uploadInsertTargetUnavailable": "O destino original do envio não está mais disponível. O resultado não foi inserido; os arquivos enviados foram mantidos.",- "mobileToolbarEntryTip": "Configure a visibilidade e a ordem dos itens da barra de ferramentas móvel; os perfis são salvos neste dispositivo e não são sincronizados entre dispositivos",+ "mobileToolbarEntryTip": "Configure a visibilidade e a ordem dos itens da barra de ferramentas e do menu de barra no celular; os perfis são salvos neste dispositivo e não são sincronizados entre dispositivos","keymapAssigned": "Atribuídos","keymapCustomized": "Personalizados por mim","keymapUnassigned": "Não atribuídos",diff --git a/app/appearance/langs/ru.json b/app/appearance/langs/ru.jsonindex dac1d8b86d..92a0e12543 100644--- a/app/appearance/langs/ru.json+++ b/app/appearance/langs/ru.json@@ -212,7 +212,7 @@"backlinkHideReference": "Скрывать блоки ссылок в наследуемых обратных ссылках","backlinkHideReferenceTip": "Скрывать блоки, содержащие только ссылки на блоки, в наследуемых обратных ссылках, если остаётся другое содержимое, и показывать их при редактировании","uploadInsertTargetUnavailable": "Исходное место вставки больше недоступно. Результат не вставлен; загруженные файлы сохранены.",- "mobileToolbarEntryTip": "Настройте видимость и порядок элементов мобильной панели инструментов; профили сохраняются на этом устройстве и не синхронизируются между устройствами",+ "mobileToolbarEntryTip": "Настройте видимость и порядок элементов мобильной панели инструментов и меню косой черты; профили сохраняются на этом устройстве и не синхронизируются между устройствами","keymapAssigned": "Назначенные","keymapCustomized": "Настроенные мной","keymapUnassigned": "Неназначенные",diff --git a/app/appearance/langs/sk.json b/app/appearance/langs/sk.jsonindex 25c1e95245..2228cccb72 100644--- a/app/appearance/langs/sk.json+++ b/app/appearance/langs/sk.json@@ -212,7 +212,7 @@"backlinkHideReference": "Skryť bloky odkazov v prenesených spätných odkazoch","backlinkHideReferenceTip": "Skryť bloky obsahujúce iba odkazy na bloky v prenesených spätných odkazoch, ak zostáva viditeľný iný obsah, a znova ich zobraziť pri úpravách","uploadInsertTargetUnavailable": "Pôvodný cieľ nahrávania už nie je dostupný. Výsledok nebol vložený; nahrané súbory zostávajú zachované.",- "mobileToolbarEntryTip": "Nastavte viditeľnosť a poradie položiek mobilného panela nástrojov; profily sa ukladajú v tomto zariadení a nesynchronizujú sa medzi zariadeniami",+ "mobileToolbarEntryTip": "Nastavte viditeľnosť a poradie položiek mobilného panela nástrojov a ponuky lomky; profily sa ukladajú v tomto zariadení a nesynchronizujú sa medzi zariadeniami","keymapAssigned": "Priradené","keymapCustomized": "Upravené mnou","keymapUnassigned": "Nepriradené",diff --git a/app/appearance/langs/sr.json b/app/appearance/langs/sr.jsonindex 88df6c460b..2da0ccad3e 100644--- a/app/appearance/langs/sr.json+++ b/app/appearance/langs/sr.json@@ -212,7 +212,7 @@"backlinkHideReference": "Sakrij blokove referenci u prenetim povratnim vezama","backlinkHideReferenceTip": "Sakrij blokove koji sadrže samo reference na blokove u prenetim povratnim vezama kada ostali sadržaj ostaje vidljiv, i prikaži ih ponovo tokom uređivanja","uploadInsertTargetUnavailable": "Prvobitno odredište otpremanja više nije dostupno. Rezultat nije umetnut; otpremljeni fajlovi su sačuvani.",- "mobileToolbarEntryTip": "Подесите видљивост и редослед ставки мобилне траке са алаткама; профили се чувају на овом уређају и не синхронизују се између уређаја",+ "mobileToolbarEntryTip": "Подесите видљивост и редослед ставки мобилне траке са алаткама и менија косе црте; профили се чувају на овом уређају и не синхронизују се између уређаја","keymapAssigned": "Dodeljeno","keymapCustomized": "Moje izmene","keymapUnassigned": "Nedodeljeno",diff --git a/app/appearance/langs/th.json b/app/appearance/langs/th.jsonindex 18745b0435..0ceeaabb2f 100644--- a/app/appearance/langs/th.json+++ b/app/appearance/langs/th.json@@ -212,7 +212,7 @@"backlinkHideReference": "ซ่อนบล็อกอ้างอิงในลิงก์ย้อนกลับที่ส่งต่อ","backlinkHideReferenceTip": "ซ่อนบล็อกที่มีเฉพาะการอ้างอิงบล็อกในลิงก์ย้อนกลับที่ส่งต่อเมื่อยังมีเนื้อหาอื่นให้แสดง และแสดงอีกครั้งขณะแก้ไข","uploadInsertTargetUnavailable": "ปลายทางเดิมของการอัปโหลดไม่พร้อมใช้งานแล้ว จึงไม่ได้แทรกผลลัพธ์ แต่ไฟล์ที่อัปโหลดแล้วจะยังคงอยู่",- "mobileToolbarEntryTip": "กำหนดการแสดงผลและลำดับของรายการในแถบเครื่องมือบนมือถือ โปรไฟล์จะบันทึกไว้ในอุปกรณ์นี้และไม่ซิงค์ระหว่างอุปกรณ์",+ "mobileToolbarEntryTip": "กำหนดการแสดงผลและลำดับของรายการในแถบเครื่องมือและเมนูเครื่องหมายทับบนมือถือ โปรไฟล์จะบันทึกไว้ในอุปกรณ์นี้และไม่ซิงค์ระหว่างอุปกรณ์","keymapAssigned": "กำหนดแล้ว","keymapCustomized": "ปรับแต่งโดยฉัน","keymapUnassigned": "ยังไม่ได้กำหนด",diff --git a/app/appearance/langs/tr.json b/app/appearance/langs/tr.jsonindex e178b8e54c..d91f971fa4 100644--- a/app/appearance/langs/tr.json+++ b/app/appearance/langs/tr.json@@ -212,7 +212,7 @@"backlinkHideReference": "Aktarılan geri bağlantılarda referans bloklarını gizle","backlinkHideReferenceTip": "Başka içerik görünür kaldığında aktarılan geri bağlantılarda yalnızca blok referansları içeren blokları gizle ve düzenleme sırasında yeniden göster","uploadInsertTargetUnavailable": "Özgün yükleme hedefi artık kullanılamıyor. Sonuç eklenmedi; yüklenen dosyalar korunuyor.",- "mobileToolbarEntryTip": "Mobil araç çubuğu öğelerinin görünürlüğünü ve sırasını yapılandırın; profiller bu cihazda kaydedilir ve cihazlar arasında eşitlenmez",+ "mobileToolbarEntryTip": "Mobil araç çubuğu ve eğik çizgi menüsü öğelerinin görünürlüğünü ve sırasını yapılandırın; profiller bu cihazda kaydedilir ve cihazlar arasında eşitlenmez","keymapAssigned": "Atanmış","keymapCustomized": "Benim özelleştirdiklerim","keymapUnassigned": "Atanmamış",diff --git a/app/appearance/langs/uk.json b/app/appearance/langs/uk.jsonindex 65d650e546..8d0def60c2 100644--- a/app/appearance/langs/uk.json+++ b/app/appearance/langs/uk.json@@ -212,7 +212,7 @@"backlinkHideReference": "Приховувати блоки посилань в успадкованих зворотних посиланнях","backlinkHideReferenceTip": "Приховувати блоки, що містять лише посилання на блоки, в успадкованих зворотних посиланнях, якщо залишається інший вміст, і показувати їх під час редагування","uploadInsertTargetUnavailable": "Початкове місце вставлення більше недоступне. Результат не вставлено; завантажені файли збережено.",- "mobileToolbarEntryTip": "Налаштуйте видимість і порядок елементів мобільної панелі інструментів; профілі зберігаються на цьому пристрої та не синхронізуються між пристроями",+ "mobileToolbarEntryTip": "Налаштуйте видимість і порядок елементів мобільної панелі інструментів і меню скісної риски; профілі зберігаються на цьому пристрої та не синхронізуються між пристроями","keymapAssigned": "Призначені","keymapCustomized": "Налаштовані мною","keymapUnassigned": "Непризначені",diff --git a/app/appearance/langs/zh-CN.json b/app/appearance/langs/zh-CN.jsonindex 3b9632072e..b48f06509c 100644--- a/app/appearance/langs/zh-CN.json+++ b/app/appearance/langs/zh-CN.json@@ -212,7 +212,7 @@"backlinkHideReference": "隐藏传递型反链的引用块","backlinkHideReferenceTip": "在反链面板中隐藏仅含块引用且仍有其他内容可展示的传递型引用块,编辑时恢复显示","uploadInsertTargetUnavailable": "原上传目标已失效,未回填结果;已上传的文件会保留。",- "mobileToolbarEntryTip": "配置移动端工具栏项的显隐与排序,方案保存在本设备,不跨设备同步",+ "mobileToolbarEntryTip": "配置移动端工具栏和斜杠菜单项的显隐与排序,方案保存在本设备,不跨设备同步","keymapAssigned": "已分配","keymapCustomized": "由我分配","keymapUnassigned": "未分配",diff --git a/app/appearance/langs/zh-TW.json b/app/appearance/langs/zh-TW.jsonindex 519a3a7e60..5fc03c29ba 100644--- a/app/appearance/langs/zh-TW.json+++ b/app/appearance/langs/zh-TW.json@@ -212,7 +212,7 @@"backlinkHideReference": "隱藏傳遞型反向連結的引用區塊","backlinkHideReferenceTip": "在反向連結面板中隱藏僅含區塊引用且仍有其他內容可顯示的傳遞型引用區塊,編輯時恢復顯示","uploadInsertTargetUnavailable": "原上傳目標已失效,未填入結果;已上傳的檔案會保留。",- "mobileToolbarEntryTip": "設定行動端工具列項目的顯隱與排序,方案儲存在本裝置,不跨裝置同步",+ "mobileToolbarEntryTip": "設定行動端工具列和斜線選單項目的顯隱與排序,方案儲存在本裝置,不跨裝置同步","keymapAssigned": "已指派","keymapCustomized": "由我指派","keymapUnassigned": "未指派",diff --git a/app/guide/20210808180117-6v0mkxr/20200923234011-ieuun1p/20210808180303-xaduj2o/20200924100950-9op5xi1.sy b/app/guide/20210808180117-6v0mkxr/20200923234011-ieuun1p/20210808180303-xaduj2o/20200924100950-9op5xi1.syindex cf10960b96..6e919add45 100644--- a/app/guide/20210808180117-6v0mkxr/20200923234011-ieuun1p/20210808180303-xaduj2o/20200924100950-9op5xi1.sy+++ b/app/guide/20210808180117-6v0mkxr/20200923234011-ieuun1p/20210808180303-xaduj2o/20200924100950-9op5xi1.sy@@ -7,7 +7,7 @@"id": "20200924100950-9op5xi1","title": "Shortcuts","type": "doc",- "updated": "20260926152753"+ "updated": "20260927164841"},"Children": [{@@ -101,6 +101,61 @@}]},+ {+ "ID": "20260927164841-n9zgr7r",+ "Type": "NodeParagraph",+ "Properties": {+ "id": "20260927164841-n9zgr7r",+ "updated": "20260927164841"+ },+ "Children": [+ {+ "Type": "NodeText",+ "Data": "On mobile, open "+ },+ {+ "Type": "NodeTextMark",+ "TextMarkType": "kbd",+ "TextMarkTextContent": "Settings"+ },+ {+ "Type": "NodeText",+ "Data": " - "+ },+ {+ "Type": "NodeTextMark",+ "TextMarkType": "kbd",+ "TextMarkTextContent": "Appearance"+ },+ {+ "Type": "NodeText",+ "Data": " - "+ },+ {+ "Type": "NodeTextMark",+ "TextMarkType": "kbd",+ "TextMarkTextContent": "Menu and button visibility and order"+ },+ {+ "Type": "NodeText",+ "Data": " and view or edit a profile, then select the slash menu category. The mobile slash menu switch is off by default; changing it takes effect immediately and preserves your existing preference. When both this switch and the profile’s slash menu switch are enabled, type / to search for content blocks and select a result to insert at the original cursor position."+ }+ ]+ },+ {+ "ID": "20260927164841-clwu05c",+ "Type": "NodeParagraph",+ "Properties": {+ "id": "20260927164841-clwu05c",+ "updated": "20260927164841"+ },+ "Children": [+ {+ "Type": "NodeText",+ "Data": "In custom profiles, use the category selector to switch between the toolbar and slash menu. Drag the six-dot handle on the left of an item to change its order, or use its switch to change visibility. Drag near the list edge to scroll. Clear the search before sorting, and confirm to save the profile. Built-in profiles are read-only; duplicate one to customize it, then activate the saved profile. Profiles are stored on this device and are not synced across devices."+ }+ ]+ },{"ID": "20260923233001-pfoov15","Type": "NodeParagraph",diff --git a/app/guide/20210808180117-czj9bvb/20200812220555-lj3enxa/20210808180321-hbvl5c2/20200813004551-gm0pbn1.sy b/app/guide/20210808180117-czj9bvb/20200812220555-lj3enxa/20210808180321-hbvl5c2/20200813004551-gm0pbn1.syindex 2ed57dff69..db3da134ca 100644--- a/app/guide/20210808180117-czj9bvb/20200812220555-lj3enxa/20210808180321-hbvl5c2/20200813004551-gm0pbn1.sy+++ b/app/guide/20210808180117-czj9bvb/20200812220555-lj3enxa/20210808180321-hbvl5c2/20200813004551-gm0pbn1.sy@@ -7,7 +7,7 @@"id": "20200813004551-gm0pbn1","title": "快捷键","type": "doc",- "updated": "20260926152753"+ "updated": "20260927164841"},"Children": [{@@ -101,6 +101,61 @@}]},+ {+ "ID": "20260927164841-yjk81pw",+ "Type": "NodeParagraph",+ "Properties": {+ "id": "20260927164841-yjk81pw",+ "updated": "20260927164841"+ },+ "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": ",查看或编辑方案后选择斜杠菜单分类。移动端斜杠菜单开关默认关闭,修改后立即生效,并保留已有设置。该开关与方案中的斜杠菜单开关均开启时,输入 / 可搜索内容块,选择候选后在原光标处插入。"+ }+ ]+ },+ {+ "ID": "20260927164841-y6wu08m",+ "Type": "NodeParagraph",+ "Properties": {+ "id": "20260927164841-y6wu08m",+ "updated": "20260927164841"+ },+ "Children": [+ {+ "Type": "NodeText",+ "Data": "编辑自定义方案时,可通过分类选择框切换工具栏与斜杠菜单。拖动项目左侧的六点手柄调整顺序,使用项目开关调整显隐;拖至列表边缘可滚动。排序前需清空搜索,修改后确认保存方案。内置方案只读,可复制后自定义,再启用保存的方案。方案保存在本设备,不跨设备同步。"+ }+ ]+ },{"ID": "20260923233001-fcalbnf","Type": "NodeParagraph",diff --git a/app/guide/20211226090932-5lcq56f/20211226115423-d5z1joq/20211226121203-rjjngpz/20211226122549-jktxego.sy b/app/guide/20211226090932-5lcq56f/20211226115423-d5z1joq/20211226121203-rjjngpz/20211226122549-jktxego.syindex 4499f223ae..78388614fd 100644--- a/app/guide/20211226090932-5lcq56f/20211226115423-d5z1joq/20211226121203-rjjngpz/20211226122549-jktxego.sy+++ b/app/guide/20211226090932-5lcq56f/20211226115423-d5z1joq/20211226121203-rjjngpz/20211226122549-jktxego.sy@@ -7,7 +7,7 @@"id": "20211226122549-jktxego","title": "快捷鍵","type": "doc",- "updated": "20260926152753"+ "updated": "20260927164841"},"Children": [{@@ -101,6 +101,61 @@}]},+ {+ "ID": "20260927164841-m2ossua",+ "Type": "NodeParagraph",+ "Properties": {+ "id": "20260927164841-m2ossua",+ "updated": "20260927164841"+ },+ "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": ",檢視或編輯方案後選擇斜線選單分類。行動端斜線選單開關預設關閉,修改後立即生效,並保留既有設定。此開關與方案中的斜線選單開關皆開啟時,輸入 / 可搜尋內容區塊,選擇候選項目後在原游標處插入。"+ }+ ]+ },+ {+ "ID": "20260927164841-7yj0cwc",+ "Type": "NodeParagraph",+ "Properties": {+ "id": "20260927164841-7yj0cwc",+ "updated": "20260927164841"+ },+ "Children": [+ {+ "Type": "NodeText",+ "Data": "編輯自訂方案時,可透過分類選擇框切換工具列與斜線選單。拖曳項目左側的六點把手調整順序,使用項目開關調整顯隱;拖至清單邊緣可捲動。排序前需清空搜尋,修改後確認儲存方案。內建方案唯讀,可複製後自訂,再啟用儲存的方案。方案儲存在本裝置,不跨裝置同步。"+ }+ ]+ },{"ID": "20260923233001-dx1k6zh","Type": "NodeParagraph",diff --git a/app/guide/20240530133126-axarxgx/20240530101000-4qitucx/20240530101000-g3ugxml/20240530101000-xsbxokr.sy b/app/guide/20240530133126-axarxgx/20240530101000-4qitucx/20240530101000-g3ugxml/20240530101000-xsbxokr.syindex 7cdfbd360e..edc907c57e 100644--- a/app/guide/20240530133126-axarxgx/20240530101000-4qitucx/20240530101000-g3ugxml/20240530101000-xsbxokr.sy+++ b/app/guide/20240530133126-axarxgx/20240530101000-4qitucx/20240530101000-g3ugxml/20240530101000-xsbxokr.sy@@ -9,7 +9,7 @@"id": "20240530101000-xsbxokr","title": "ショートカット","type": "doc",- "updated": "20260926152753"+ "updated": "20260927164841"},"Children": [{@@ -95,6 +95,61 @@}]},+ {+ "ID": "20260927164841-exxixvw",+ "Type": "NodeParagraph",+ "Properties": {+ "id": "20260927164841-exxixvw",+ "updated": "20260927164841"+ },+ "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": " を開き、プロファイルを表示または編集して、スラッシュメニューの分類を選択します。モバイルのスラッシュメニューは初期設定では無効です。スイッチの変更は即座に反映され、既存の設定は保持されます。このスイッチとプロファイル内のスラッシュメニューのスイッチが両方有効な場合、/ を入力してコンテンツブロックを検索でき、候補を選択すると元のカーソル位置に挿入されます。"+ }+ ]+ },+ {+ "ID": "20260927164841-2wtv9yz",+ "Type": "NodeParagraph",+ "Properties": {+ "id": "20260927164841-2wtv9yz",+ "updated": "20260927164841"+ },+ "Children": [+ {+ "Type": "NodeText",+ "Data": "カスタムプロファイルでは、分類の選択欄でツールバーとスラッシュメニューを切り替えます。項目の左側にある6つの点のハンドルをドラッグして順序を変更し、スイッチで表示・非表示を設定します。リストの端までドラッグするとスクロールします。並べ替える前に検索欄を空にし、変更後は確認してプロファイルを保存します。組み込みプロファイルは読み取り専用です。複製してカスタマイズし、保存したプロファイルを有効にしてください。プロファイルはこの端末に保存され、端末間では同期されません。"+ }+ ]+ },{"ID": "20260923233001-0vynujv","Type": "NodeParagraph",diff --git a/app/src/assets/scss/business/_config.scss b/app/src/assets/scss/business/_config.scssindex 6c8d700108..0a3ca2b011 100644--- a/app/src/assets/scss/business/_config.scss+++ b/app/src/assets/scss/business/_config.scss@@ -1328,6 +1328,7 @@}.config-entry-visibility__column {+ box-sizing: border-box;flex: 1 0 100%;}@@ -1335,7 +1336,6 @@margin: 0 8px 8px;}- .config-entry-visibility__drag,.config-entry-visibility__arrow-space {display: none;}@@ -1343,6 +1343,27 @@.config-entry-visibility__row {min-height: 44px;}++ .config-entry-visibility__drag {+ min-height: 32px;+ min-width: 24px;+ touch-action: none;+ }+ }++ &__mobile-header {+ flex: 0 1 auto;+ min-height: 0;+ max-height: 60%;+ overflow-y: auto;+ }++ &__mobile-controls {+ margin: 0 8px 8px;++ > .b3-select {+ width: 100%;+ }}&__content {@@ -1358,7 +1379,8 @@margin: 0 0 16px;}- &__content > .config-group + .config-group {+ &__content > .config-group + .config-group,+ &__mobile-header > .config-group + .config-group {margin-top: 0;}@@ -1543,17 +1565,11 @@}&__drag {- color: var(--b3-theme-on-surface-light);cursor: grab;- flex: 0 0 16px;- height: 16px;margin-right: 8px;- width: 16px;svg {- height: 16px;pointer-events: none;- width: 16px;}&:active {diff --git a/app/src/config/entryVisibility/mobileUi.test.ts b/app/src/config/entryVisibility/mobileUi.test.tsnew file mode 100644index 0000000000..bc7ff6b257--- /dev/null+++ b/app/src/config/entryVisibility/mobileUi.test.ts@@ -0,0 +1,305 @@+import * as assert from "node:assert/strict";+import {execFile} from "node:child_process";+import {mkdtempSync, readFileSync, rmSync, writeFileSync} from "node:fs";+import {tmpdir} from "node:os";+import * as path from "node:path";+import {test} from "node:test";+import {promisify} from "node:util";+import {ModuleKind, ScriptTarget, transpileModule} from "typescript";++const browserCases = async (sources: Record<string, string>, languages: Record<string, string>, narrow = false) => {+ const check = (condition: unknown, message: string) => {+ if (!condition) {+ throw new Error(message);+ }+ };+ let mobile = true;+ const writes: unknown[] = [];+ const cache: Record<string, Record<string, any>> = {};+ const noop = () => {};+ const storageKey = "local-mobile-slash-menu";+ window.siyuan = {languages, storage: {}, config: {editor: {codeTabSpaces: 4}, appearance: {+ entryVisibility: {active: "custom", profiles: [{id: "custom", name: "Custom", entries: {}, orders: {}}]},+ }}, layout: {}} as unknown as typeof window.siyuan;+ const load = (id: string): Record<string, any> => {+ if (cache[id]) {+ return cache[id];+ }+ if (id === "config/entryVisibility/runtime") {+ return {+ ENTRY_PROFILE_FULL: "full", ENTRY_PROFILE_SIMPLE: "simple", ENTRY_VISIBILITY_VERSION: 1,+ createEntryProfileSnapshot: () => ({}), createEntryOrderSnapshot: () => ({}),+ getConfiguredEntryVisibility: () => true,+ saveEntryVisibility: (config: Config.IEntryVisibility) => {+ window.siyuan.config.appearance.entryVisibility = config;+ },+ };+ }+ if (!sources[id]) {+ const mocks: Record<string, unknown> = {+ "util/functions": {isMobile: () => mobile},+ "util/hostCapabilities": {getHostCapabilities: () => ({importExport: false})},+ "util/genID": {genUUID: () => "new"},+ "constants": {Constants: {LOCAL_MOBILE_SLASH_MENU: storageKey}},+ "dialog/confirmDialog": {confirmDialog: (_title: string, _text: string, callback: () => void) => callback()},+ "dialog/message": {showMessage: noop},+ "protyle/util/compatibility": {isInMobileApp: () => true, setStorageVal: (...args: unknown[]) => writes.push(args)},+ };+ check(id in mocks, `Missing module ${id}`);+ return mocks[id];+ }+ const exports = {};+ cache[id] = exports;+ const require = (relative: string) => {+ const parts = id.split("/").slice(0, -1);+ relative.split("/").forEach(part => {+ if (part === "..") {+ parts.pop();+ } else if (part !== ".") {+ parts.push(part);+ }+ });+ return load(parts.join("/"));+ };+ new Function("exports", "require", sources[id])(exports, require);+ return exports;+ };+ const ui = load("config/entryVisibility/ui");+ const catalog = load("config/entryVisibility/catalog");+ const config = () => window.siyuan.config.appearance.entryVisibility;+ config().profiles[0].orders["editor.slash.menu"] = ["heading1", "plugin:missing:item", "heading2", "heading3"];+ document.body.insertAdjacentHTML("beforeend", '<div class="config__tab-container"><div id="root"></div></div>');+ const root = document.querySelector<HTMLElement>("#root");+ const open = (id = "custom") => {+ document.querySelectorAll(".config-entry-visibility__view").forEach(item => item.remove());+ ui.open(root, id);+ return document.querySelector<HTMLElement>(".config-entry-visibility__view");+ };+ let view = open();+ const selectSlash = () => {+ const select = view.querySelector<HTMLSelectElement>("[data-type='entry-section']");+ check(select.options.length === 2, "Mobile must offer toolbar and slash categories");+ select.value = "editor.slash";+ select.dispatchEvent(new Event("change", {bubbles: true}));+ };+ if (narrow) {+ for (const id of ["", "custom"]) {+ view = open(id);+ check(Boolean(view.querySelector("[data-profile-field='template']")) === !id,+ "New profiles must include the template selector");+ selectSlash();+ const list = view.querySelector<HTMLElement>(".config-entry-visibility__column-list");+ const bounds = list.getBoundingClientRect();+ check(bounds.height >= 132, `${id || "new"} profile list is too short: ${bounds.height}px`);+ const action = view.querySelector<HTMLElement>(".b3-dialog__action").getBoundingClientRect();+ check(action.bottom <= innerHeight && bounds.bottom <= action.top,+ "List and actions must remain inside the viewport");+ const header = view.querySelector<HTMLElement>(".config-entry-visibility__mobile-header");+ for (const selector of ["[data-profile-field='name']", "[data-type='mobile-slash-menu']"]) {+ const control = view.querySelector<HTMLElement>(selector);+ control.scrollIntoView({block: "nearest"});+ const rect = control.getBoundingClientRect();+ check(document.elementFromPoint(rect.left + rect.width / 2, rect.top + rect.height / 2) === control,+ `${selector} must be reachable by scrolling the form`);+ }+ check(header.scrollHeight > header.clientHeight, "Upper form must scroll independently");+ const candidate = list.querySelector<HTMLInputElement>("input[data-entry-path]");+ candidate.scrollIntoView({block: "nearest"});+ const rect = candidate.getBoundingClientRect();+ check(document.elementFromPoint(rect.left + rect.width / 2, rect.top + rect.height / 2) === candidate,+ "Candidate controls must remain reachable after scrolling the form");+ const checked = candidate.checked;+ candidate.click();+ const updated = view.querySelector<HTMLInputElement>(`[data-entry-path='${candidate.dataset.entryPath}']`);+ check(updated.checked !== checked, "Candidate visibility must remain editable");+ }+ view = open("");+ selectSlash();+ return "Narrow new and existing profiles passed";+ }+ selectSlash();+ let enabled = view.querySelector<HTMLInputElement>("[data-type='mobile-slash-menu']");+ check(!enabled.checked, "Mobile slash defaults to off");+ enabled.click();+ check(window.siyuan.storage[storageKey].enabled && writes.length === 1, "Device switch must persist immediately");+ check(view.querySelector("[data-entry-path='editor.slash.menu']"), "Profile root switch must be reachable");+ check(!view.querySelector("[data-entry-move]"), "No arrow sort controls");+ const browser = view.querySelector<HTMLElement>("[data-type='entry-browser']");+ // 合成指针不属于浏览器的活动指针,仅替换捕获状态,命中测试和事件分发仍使用真实 DOM。+ let captured = false;+ browser.setPointerCapture = () => { captured = true; };+ browser.hasPointerCapture = () => captured;+ browser.releasePointerCapture = () => { captured = false; };+ const row = (key: string) => browser.querySelector<HTMLElement>(`[data-entry-key='${key}']`);+ const handle = () => row("heading1").querySelector<HTMLElement>(".config-entry-visibility__drag");+ row("heading3").scrollIntoView({block: "center"});+ check(getComputedStyle(handle()).display !== "none", "Drag handle must be visible");+ check(getComputedStyle(handle()).touchAction === "none", "Handle must own touch gestures");+ const point = (el: Element) => {+ const rect = el.getBoundingClientRect();+ return {clientX: rect.left + rect.width / 2, clientY: rect.bottom - 3};+ };+ const send = (target: Element, type: string, coordinates: {clientX: number, clientY: number}) => target.dispatchEvent(+ new PointerEvent(type, {bubbles: true, cancelable: true, pointerId: 1, isPrimary: true, button: 0,+ pointerType: "touch", ...coordinates}));+ const drag = (end: string) => {+ send(handle(), "pointerdown", point(handle()));+ send(browser, "pointermove", point(row("heading3")));+ check(browser.querySelector(".config-entry-visibility__row--drop-after"),+ `Missing drop marker: ${JSON.stringify({handle: point(handle()), target: point(row("heading3")),+ hit: document.elementFromPoint(point(row("heading3")).clientX, point(row("heading3")).clientY)?.outerHTML.slice(0, 300)})}`);+ send(browser, end, point(row("heading3")));+ };+ drag("pointercancel");+ check(row("heading1").compareDocumentPosition(row("heading2")) & Node.DOCUMENT_POSITION_FOLLOWING,+ "Cancelled drag must not reorder");+ check(!captured && !browser.querySelector(".config-entry-visibility__row--dragging"), "Cancel must clean capture and markers");+ drag("pointerup");+ check(row("heading3").compareDocumentPosition(row("heading1")) & Node.DOCUMENT_POSITION_FOLLOWING,+ "Touch drag must reorder candidates");+ const visibility = row("heading1").querySelector<HTMLInputElement>("input");+ const checked = visibility.checked;+ row("heading1").click();+ check(visibility.checked === checked, "Release click must not toggle visibility");+ // 停在列表边缘时应持续滚动,离开列表释放时不得提交上一个落点。+ row("heading1").scrollIntoView({block: "center"});+ send(handle(), "pointerdown", point(handle()));+ const list = browser.querySelector<HTMLElement>(".config-entry-visibility__column-list");+ send(browser, "pointermove", point(list));+ const beforeScroll = list.scrollTop;+ await new Promise(resolve => setTimeout(resolve, 100));+ check(list.scrollTop > beforeScroll, "Drag near edge must scroll without further pointer movement");+ send(browser, "pointerup", {clientX: -20, clientY: -20});+ check(!browser.querySelector(".config-entry-visibility__row--drop-after"), "Outside release clears drop target");+ view.querySelector<HTMLElement>("[data-action='confirm']").click();+ const order = config().profiles[0].orders["editor.slash.menu"];+ check(order.includes("plugin:missing:item"), "Unavailable plugin slots must survive sorting");+ check(order.indexOf("heading3") < order.indexOf("heading1"), "Confirmed order must persist");+ view = open();+ selectSlash();+ enabled = view.querySelector<HTMLInputElement>("[data-type='mobile-slash-menu']");+ check(enabled.checked, "Reopening must preserve device setting");+ const search = view.querySelector<HTMLInputElement>("[data-type='entry-search']");+ search.value = "heading1";+ search.dispatchEvent(new Event("input", {bubbles: true}));+ check(!view.querySelector(".config-entry-visibility__drag"), "Search results must not permit partial-list sorting");+ search.value = "";+ search.dispatchEvent(new Event("input", {bubbles: true}));+ const rootSwitch = view.querySelector<HTMLInputElement>("[data-entry-path='editor.slash.menu']");+ rootSwitch.click();+ check(!view.querySelector(".config-entry-visibility__drag"), "Disabled menu must not be draggable");+ check(view.querySelector<HTMLInputElement>("[data-entry-path='editor.slash.menu.heading1']").disabled,+ "Disabled menu must disable candidate controls");+ view.querySelector<HTMLElement>("[data-action='cancel']").click();+ check(config().profiles[0].entries["editor.slash.menu"] !== false, "Cancelling must discard profile changes");+ view = open("full");+ selectSlash();+ check(!view.querySelector(".config-entry-visibility__drag"), "Built-in profiles must remain read-only");+ enabled = view.querySelector<HTMLInputElement>("[data-type='mobile-slash-menu']");+ enabled.click();+ check(window.siyuan.storage[storageKey].enabled === false, "Device preference is editable while viewing built-in profiles");+ view.querySelector<HTMLElement>("[data-action='cancel']").click();+ mobile = false;+ view = open();+ check(!view.querySelector("[data-type='entry-section']"), "Desktop retains its location column");+ check(view.querySelector(".config-entry-visibility__column--locations"), "Desktop locations remain reachable");+ view.querySelector<HTMLElement>("[data-entry-section='editor.slash']").click();+ const desktopBrowser = view.querySelector<HTMLElement>("[data-type='entry-browser']");+ const first = desktopBrowser.querySelector<HTMLElement>("[data-entry-key='heading1']");+ const target = desktopBrowser.querySelector<HTMLElement>("[data-entry-key='heading2']");+ const transfer = new DataTransfer();+ first.querySelector(".config-entry-visibility__drag").dispatchEvent(new DragEvent("dragstart", {bubbles: true, dataTransfer: transfer}));+ target.dispatchEvent(new DragEvent("dragover", {bubbles: true, cancelable: true, dataTransfer: transfer, ...point(target)}));+ target.dispatchEvent(new DragEvent("drop", {bubbles: true, cancelable: true, dataTransfer: transfer}));+ view.querySelector<HTMLElement>("[data-action='confirm']").click();+ const desktopOrder = config().profiles[0].orders["editor.slash.menu"];+ check(desktopOrder.indexOf("heading1") < desktopOrder.indexOf("heading3"), "Desktop drag still updates order");+ check(catalog.getEntryCatalogChildren("editor.slash.menu").length > 20, "Exercise the actual slash catalog");+ mobile = true;+ view = open();+ const toolbarBrowser = view.querySelector<HTMLElement>("[data-type='entry-browser']");+ toolbarBrowser.setPointerCapture = () => { captured = true; };+ toolbarBrowser.hasPointerCapture = () => captured;+ toolbarBrowser.releasePointerCapture = () => { captured = false; };+ const toolbarRows = Array.from(toolbarBrowser.querySelectorAll<HTMLElement>("[data-entry-row]"));+ const firstKey = toolbarRows[0].dataset.entryKey;+ const secondKey = toolbarRows[1].dataset.entryKey;+ const toolbarHandle = toolbarRows[0].querySelector(".config-entry-visibility__drag");+ send(toolbarHandle, "pointerdown", point(toolbarHandle));+ send(toolbarBrowser, "pointermove", point(toolbarRows[1]));+ send(toolbarBrowser, "pointerup", point(toolbarRows[1]));+ view.querySelector<HTMLElement>("[data-action='confirm']").click();+ const toolbarOrder = config().profiles[0].orders["editor.toolbar"];+ check(toolbarOrder.indexOf(secondKey) < toolbarOrder.indexOf(firstKey), "Toolbar touch sorting must persist");+ view = open();+ selectSlash();+ return "Mobile entry settings passed";+};++test("mobile entry settings preserve preferences and support touch sorting without arrow controls", {+ skip: process.platform === "linux" && !process.env.DISPLAY && !process.env.WAYLAND_DISPLAY,+ timeout: 45000,+}, async () => {+ const modules = ["config/entryVisibility/ui", "config/entryVisibility/catalog", "config/entryVisibility/order",+ "config/entryVisibility/profile", "config/entryVisibility/dockOrder", "config/entryVisibility/touchOrder",+ "protyle/toolbar/defaults", "protyle/wysiwyg/codeBlockUtil", "plugin/dockKey", "plugin/topBarKey", "util/escape"];+ const sources = Object.fromEntries(modules.map(id => [id, transpileModule(+ readFileSync(path.resolve(process.cwd(), "src", id + ".ts"), "utf8") ++ (id.endsWith("/ui") ? "\nexports.open = openProfileEditor;" : ""),+ {compilerOptions: {target: ScriptTarget.ES2021, module: ModuleKind.CommonJS}},+ ).outputText]));+ const languages = JSON.parse(readFileSync(path.resolve(process.cwd(), "appearance/langs/zh-CN.json"), "utf8"));+ const temporary = mkdtempSync(path.join(tmpdir(), "siyuan-entry-ui-test-"));+ const script = path.join(temporary, "run.cjs");+ writeFileSync(script, `const {app, BrowserWindow} = require("electron");+app.setPath("userData", ${JSON.stringify(path.join(temporary, "profile"))});+app.commandLine.appendSwitch("disable-gpu");+app.whenReady().then(async () => {+ const win = new BrowserWindow({show: false, width: 390, height: 844, webPreferences: {offscreen: true}});+ try {+ await win.loadURL("data:text/html,<html><body></body></html>");+ await win.webContents.insertCSS(require("node:fs").readFileSync(${JSON.stringify(path.resolve("appearance/themes/daylight/theme.css"))}, "utf8"));+ await win.webContents.executeJavaScript(require("node:fs").readFileSync(${JSON.stringify(path.resolve("appearance/icons/litheness/icon.js"))}, "utf8"));+ await win.webContents.insertCSS(require(${JSON.stringify(require.resolve("sass"))}).compile(${JSON.stringify(path.resolve("src/assets/scss/mobile.scss"))}, {logger: {warn() {}}}).css);+ await win.webContents.insertCSS(".config__tab-container {position: relative; height: 100vh;} .config__view {transition: none;}");+ console.log(await win.webContents.executeJavaScript(${JSON.stringify("const __name = value => value; (" + browserCases.toString() + ")(" + JSON.stringify(sources) + "," + JSON.stringify(languages) + ")")}));+ await win.webContents.insertCSS("body {font-size: 20px;}");+ win.setSize(320, 640);+ await new Promise(resolve => setTimeout(resolve, 300));+ await win.webContents.executeJavaScript("document.querySelector('.config__tab-container').remove()");+ console.log(await win.webContents.executeJavaScript(${JSON.stringify("(" + browserCases.toString() + ")(" + JSON.stringify(sources) + "," + JSON.stringify(languages) + ",true)")}));+ if (process.env.SIYUAN_ENTRY_UI_SCREENSHOT) {+ await new Promise(resolve => setTimeout(resolve, 300));+ require("node:fs").writeFileSync(process.env.SIYUAN_ENTRY_UI_SCREENSHOT, (await win.webContents.capturePage()).toPNG());+ await win.webContents.insertCSS(require("node:fs").readFileSync(${JSON.stringify(path.resolve("appearance/themes/midnight/theme.css"))}, "utf8"));+ await win.webContents.insertCSS("body {font-size: 20px;}");+ win.setSize(320, 640);+ await new Promise(resolve => setTimeout(resolve, 300));+ require("node:fs").writeFileSync(process.env.SIYUAN_ENTRY_UI_SCREENSHOT + ".dark.png", (await win.webContents.capturePage()).toPNG());+ const fits = await win.webContents.executeJavaScript("(() => {const view = document.querySelector('.config-entry-visibility__view'); const action = view.querySelector('.b3-dialog__action').getBoundingClientRect(); const list = view.querySelector('.config-entry-visibility__column-list').getBoundingClientRect(); return action.bottom <= innerHeight && list.height > 40;})()");+ if (!fits) { throw new Error("Narrow layout clips actions or list"); }+ }+ win.destroy();+ app.exit(0);+ } catch (error) {+ if (process.env.SIYUAN_ENTRY_UI_SCREENSHOT) {+ require("node:fs").writeFileSync(process.env.SIYUAN_ENTRY_UI_SCREENSHOT, (await win.webContents.capturePage()).toPNG());+ }+ console.error(error);+ win.destroy();+ app.exit(1);+ }+});`, "utf8");+ const env = {...process.env};+ delete env.ELECTRON_RUN_AS_NODE;+ try {+ const result = await promisify(execFile)(require("electron") as unknown as string, [script],+ {env, timeout: 40000, windowsHide: true});+ assert.match(result.stdout, /Mobile entry settings passed/);+ } finally {+ if (path.dirname(path.resolve(temporary)) === path.resolve(tmpdir()) &&+ path.basename(temporary).startsWith("siyuan-entry-ui-test-")) {+ rmSync(temporary, {recursive: true, force: true});+ }+ }+});diff --git a/app/src/config/entryVisibility/touchOrder.ts b/app/src/config/entryVisibility/touchOrder.tsnew file mode 100644index 0000000000..05e79d03a6--- /dev/null+++ b/app/src/config/entryVisibility/touchOrder.ts@@ -0,0 +1,115 @@+interface ITouchOrderCallbacks {+ start: (row: HTMLElement) => boolean;+ move: (target: Element, clientY: number) => void;+ drop: () => void;+ cancel: () => void;+}++// 只从拖拽柄接管指针,列表其他区域仍可正常滚动和切换开关。+export const bindTouchOrder = (browser: HTMLElement, callbacks: ITouchOrderCallbacks) => {+ let pointer: {id: number, x: number, y: number, startX: number, startY: number, moved: boolean};+ let frame = 0;+ let suppressClick = false;+ const hitTest = () => {+ const target = document.elementFromPoint(pointer.x, pointer.y);+ return target && browser.contains(target) ? target : null;+ };+ const finish = (commit: boolean) => {+ if (!pointer) {+ return;+ }+ const current = pointer;+ pointer = undefined;+ cancelAnimationFrame(frame);+ if (browser.hasPointerCapture(current.id)) {+ browser.releasePointerCapture(current.id);+ }+ if (commit && current.moved) {+ callbacks.drop();+ } else {+ callbacks.cancel();+ }+ };+ const scroll = () => {+ if (!pointer || !browser.isConnected) {+ finish(false);+ return;+ }+ if (pointer.moved) {+ const target = hitTest();+ const list = target?.closest<HTMLElement>(".config-entry-visibility__column-list");+ if (list) {+ const bounds = list.getBoundingClientRect();+ const edge = Math.min(40, bounds.height / 4);+ const delta = pointer.y < bounds.top + edge ? -8 : pointer.y > bounds.bottom - edge ? 8 : 0;+ if (delta) {+ list.scrollTop += delta;+ }+ }+ callbacks.move(hitTest(), pointer.y);+ }+ frame = requestAnimationFrame(scroll);+ };+ const down = (event: PointerEvent) => {+ if (pointer || !event.isPrimary || event.button !== 0) {+ return;+ }+ suppressClick = false;+ const handle = (event.target as Element).closest(".config-entry-visibility__drag");+ const row = handle?.closest<HTMLElement>("[data-entry-row]");+ if (!row || !browser.contains(row) || !callbacks.start(row)) {+ return;+ }+ pointer = {id: event.pointerId, x: event.clientX, y: event.clientY,+ startX: event.clientX, startY: event.clientY, moved: false};+ suppressClick = true;+ browser.setPointerCapture(event.pointerId);+ event.preventDefault();+ frame = requestAnimationFrame(scroll);+ };+ const move = (event: PointerEvent) => {+ if (pointer?.id !== event.pointerId) {+ return;+ }+ pointer.x = event.clientX;+ pointer.y = event.clientY;+ pointer.moved ||= Math.hypot(pointer.x - pointer.startX, pointer.y - pointer.startY) >= 5;+ if (pointer.moved) {+ callbacks.move(hitTest(), pointer.y);+ }+ event.preventDefault();+ };+ const up = (event: PointerEvent) => {+ if (pointer?.id === event.pointerId) {+ move(event);+ finish(true);+ }+ };+ const cancel = (event: PointerEvent) => {+ if (pointer?.id === event.pointerId) {+ finish(false);+ }+ };+ const click = (event: MouseEvent) => {+ if (suppressClick) {+ suppressClick = false;+ event.preventDefault();+ event.stopImmediatePropagation();+ }+ };+ browser.addEventListener("pointerdown", down);+ browser.addEventListener("pointermove", move);+ browser.addEventListener("pointerup", up);+ browser.addEventListener("pointercancel", cancel);+ browser.addEventListener("lostpointercapture", cancel);+ browser.addEventListener("click", click, true);+ return () => {+ finish(false);+ browser.removeEventListener("pointerdown", down);+ browser.removeEventListener("pointermove", move);+ browser.removeEventListener("pointerup", up);+ browser.removeEventListener("pointercancel", cancel);+ browser.removeEventListener("lostpointercapture", cancel);+ browser.removeEventListener("click", click, true);+ };+};diff --git a/app/src/config/entryVisibility/ui.test.ts b/app/src/config/entryVisibility/ui.test.tsindex a8f2ad37ad..16cedd707b 100644--- a/app/src/config/entryVisibility/ui.test.ts+++ b/app/src/config/entryVisibility/ui.test.ts@@ -5,6 +5,7 @@ import {test} from "node:test";import {runInNewContext} from "node:vm";import {ModuleKind, transpileModule} from "typescript";import {entryCatalog, TOP_BAR_ROOT_PATH} from "./catalog";+import {MOBILE_TOOLBAR_NAMES, TOOLBAR_ENTRY_ROOT_PATH} from "../../protyle/toolbar/defaults";test("entry settings show exit only on native tablets without changing the persisted catalog", () => {const source = readFileSync(resolve(process.cwd(), "src/config/entryVisibility/ui.ts"), "utf8");@@ -12,12 +13,13 @@ test("entry settings show exit only on native tablets without changing the persicompilerOptions: {module: ModuleKind.CommonJS},}).outputText;let nativeTablet = false;+ let mobile = false;const exports = {} as {catalog: () => typeof entryCatalog};runInNewContext(compiled, {exports,require: () => ({- entryCatalog, TOP_BAR_ROOT_PATH,- isMobile: () => false,+ entryCatalog, TOP_BAR_ROOT_PATH, MOBILE_TOOLBAR_NAMES, TOOLBAR_ENTRY_ROOT_PATH,+ isMobile: () => mobile,isInMobileApp: () => nativeTablet,DOCK_ORDER_SCOPES_BY_SIDE: {},}),@@ -28,4 +30,9 @@ test("entry settings show exit only on native tablets without changing the persiassert.equal(hasExit(entryCatalog), true);nativeTablet = true;assert.equal(hasExit(exports.catalog()), true);+ mobile = true;+ const catalog = exports.catalog();+ assert.deepEqual(Array.from(catalog, item => item.key), [TOOLBAR_ENTRY_ROOT_PATH, "editor.slash"]);+ assert.equal(catalog[1], entryCatalog.find(item => item.key === "editor.slash"));+ assert.ok(catalog[0].children.every(item => item.type === "separator" || MOBILE_TOOLBAR_NAMES.includes(item.key)));});diff --git a/app/src/config/entryVisibility/ui.ts b/app/src/config/entryVisibility/ui.tsindex 245295efac..3ef8be541f 100644--- a/app/src/config/entryVisibility/ui.ts+++ b/app/src/config/entryVisibility/ui.ts@@ -42,7 +42,9 @@ import {} from "./profile";import {getHostCapabilities} from "../../util/hostCapabilities";import {isMobile} from "../../util/functions";-import {isInMobileApp} from "../../protyle/util/compatibility";+import {isInMobileApp, setStorageVal} from "../../protyle/util/compatibility";+import {Constants} from "../../constants";+import {bindTouchOrder} from "./touchOrder";import {MOBILE_TOOLBAR_NAMES, TOOLBAR_ENTRY_ROOT_PATH} from "../../protyle/toolbar/defaults";import {DOCK_ORDER_SCOPES,@@ -57,17 +59,12 @@ import {} from "./dockOrder";const getVisibleEntryCatalog = () => isMobile() ? entryCatalog.filter(item =>- item.key === TOOLBAR_ENTRY_ROOT_PATH)- .map(item => ({...item, children: item.children.filter(child => child.type === "separator" ||- MOBILE_TOOLBAR_NAMES.includes(child.key) || child.key.startsWith("plugin:"))})) : entryCatalog.map(item =>+ item.key === TOOLBAR_ENTRY_ROOT_PATH || item.key === "editor.slash")+ .map(item => item.key === TOOLBAR_ENTRY_ROOT_PATH ? {...item, children: item.children.filter(child =>+ child.type === "separator" || MOBILE_TOOLBAR_NAMES.includes(child.key) || child.key.startsWith("plugin:"))} : item) : entryCatalog.map(item =>item.key === TOP_BAR_ROOT_PATH && !isInMobileApp() ?{...item, children: item.children.filter(child => child.key !== "barExit")} : item);-const renderTouchOrderButtons = (enabled: boolean) => isMobile() && enabled ? ["up", "down"].map(direction =>- `<button type="button" class="block__icon block__icon--show" data-entry-move="${direction}"- aria-label="${escapeAttr(window.siyuan.languages[direction])}">- <svg><use xlink:href="#${direction === "up" ? "iconUp" : "iconDown"}"></use></svg></button>`).join("") : "";-type TImportFile = {type: "siyuan-entry-profile" | "siyuan-entry-profile-bundle";version: number;@@ -272,10 +269,9 @@ const renderEntryRows = (profile: Config.IEntryVisibilityProfile, prefix: string(prefix === TOOLBAR_ENTRY_ROOT_PATH ? ` ${separatorIndex}` : "");return `<div class="config-entry-visibility__row config-entry-visibility__row--separator${parentEnabled ? "" : " config-entry-visibility__row--disabled"}${readOnly ? " config-entry-visibility__row--readonly" : ""}"data-entry-row data-entry-key="${escapeAttr(item.key)}" data-entry-parent="${escapeAttr(prefix)}">- ${draggable ? '<span class="config-entry-visibility__drag" draggable="true"><svg><use xlink:href="#iconDrag"></use></svg></span>' : ""}+ ${draggable ? `<span class="block__icon block__icon--show config-entry-visibility__drag" draggable="${!isMobile()}"><svg><use xlink:href="#iconDrag"></use></svg></span>` : ""}<span class="config-entry-visibility__label">${escapeHtml(label)}</span>${renderEntrySwitch(profile, path, item, parentEnabled, readOnly, label)}- ${renderTouchOrderButtons(draggable && !readOnly)}<span class="config-entry-visibility__arrow-space"></span></div>`;}@@ -286,13 +282,12 @@ const renderEntryRows = (profile: Config.IEntryVisibilityProfile, prefix: stringconst rowType = hasChildren ? "navigable" : configurable ? "toggleable" : "fixed";return `<${rowTag} class="config-entry-visibility__row config-entry-visibility__row--${rowType}${selected ? " config-entry-visibility__row--current" : ""}${parentEnabled ? "" : " config-entry-visibility__row--disabled"}${readOnly ? " config-entry-visibility__row--readonly" : ""}"data-entry-row data-entry-key="${escapeAttr(item.key)}" data-entry-parent="${escapeAttr(prefix)}" data-entry-path-row="${escapeAttr(path)}"${hasChildren ? ` data-action="navigate-entry" data-entry-path="${escapeAttr(path)}" data-entry-depth="${depth}"` : ""}>- ${draggable ? '<span class="config-entry-visibility__drag" draggable="true"><svg><use xlink:href="#iconDrag"></use></svg></span>' : ""}+ ${draggable ? `<span class="block__icon block__icon--show config-entry-visibility__drag" draggable="${!isMobile()}"><svg><use xlink:href="#iconDrag"></use></svg></span>` : ""}${hasChildren ? `<button class="config-entry-visibility__navigate" data-action="navigate-entry"data-entry-path="${escapeAttr(path)}" data-entry-depth="${depth}" title="${escapeAttr(label)}"><span>${escapeHtml(label)}</span></button>` : `<span class="config-entry-visibility__label" title="${escapeAttr(label)}">${escapeHtml(label)}</span>`}${configurable ? renderEntrySwitch(profile, path, item, parentEnabled, readOnly) : ""}- ${renderTouchOrderButtons(draggable && !readOnly)}${hasChildren ? `<button class="block__icon block__icon--show config-entry-visibility__arrow" data-action="navigate-entry"data-entry-path="${escapeAttr(path)}" data-entry-depth="${depth}" aria-label="${escapeAttr(window.siyuan.languages.expand)}"><svg><use xlink:href="#iconRight"></use></svg>@@ -557,6 +552,7 @@ const openProfileEditor = (root: HTMLElement, profileID?: string) => {const view = createEntryView(root);const body = view.querySelector<HTMLElement>(".b3-dialog__body");body.innerHTML = `<div class="b3-dialog__content config-entry-visibility__content">+ ${isMobile() ? '<div class="config-entry-visibility__mobile-header">' : ""}${builtin ? "" : `<div class="config-group"><div class="config-title">${creating ? window.siyuan.languages.entryCreateProfile : escapeHtml(draft.name)}</div><div class="config-items">@@ -582,6 +578,10 @@ const openProfileEditor = (root: HTMLElement, profileID?: string) => {<input spellcheck="false" class="b3-text-field fn__flex-1" data-type="entry-search" placeholder="${escapeAttr(window.siyuan.languages.searchPlaceholder)}"></div></div>+ ${isMobile() ? `<div class="config-entry-visibility__mobile-controls">+ <select class="b3-select" data-type="entry-section" aria-label="${escapeAttr(window.siyuan.languages.position)}"></select>+ <div data-type="entry-mobile-options"></div>+ </div></div>` : ""}<div class="config-entry-visibility__browser" data-type="entry-browser"></div></div><div class="b3-dialog__action">@@ -632,6 +632,26 @@ const openProfileEditor = (root: HTMLElement, profileID?: string) => {resetEntryColumns = true;revealSelection = true;}+ if (isMobile()) {+ const sections = getVisibleEntryCatalog().filter(item => !filter || filter.visibleSectionKeys.has(item.key));+ const section = sections.find(item => item.key === selectedSectionKey) || sections[0];+ selectedSectionKey = section.key;+ view.querySelector("[data-type='entry-section']").innerHTML = sections.map(item =>+ `<option value="${escapeAttr(item.key)}"${item.key === section.key ? " selected" : ""}>${escapeHtml(item.label())}</option>`).join("");+ const directRoot = getDirectDisplayRoot(section);+ view.querySelector("[data-type='entry-mobile-options']").innerHTML = directRoot ? `+ <label class="fn__flex b3-label config-item">+ <div class="fn__flex-1"><div class="config-name">${escapeHtml(directRoot.label())}</div></div>+ ${renderEntrySwitch(draft, `${section.key}.${directRoot.key}`, directRoot, true, builtin)}+ </label>+ <label class="fn__flex b3-label config-item">+ <div class="fn__flex-1"><div class="config-name">${window.siyuan.languages.mobileSlashMenu}</div>+ <div class="b3-label__text">${window.siyuan.languages.mobileSlashMenuTip}</div></div>+ <span class="fn__space"></span>+ <input class="b3-switch" type="checkbox" data-type="mobile-slash-menu"+ ${window.siyuan.storage[Constants.LOCAL_MOBILE_SLASH_MENU]?.enabled === true ? " checked" : ""}>+ </label>` : "";+ }browser.innerHTML = renderEntryColumns(draft, selectedSectionKey, selectedPaths, builtin,filter?.visiblePaths, filter?.visibleSectionKeys, dockOrderSnapshot);previousQuery = query;@@ -640,7 +660,7 @@ const openProfileEditor = (root: HTMLElement, profileID?: string) => {columns.forEach((column, index) => {const list = column.querySelector<HTMLElement>(".config-entry-visibility__column-list");if (list) {- list.scrollTop = resetEntryColumns && index > 0 ? 0 : oldScrollTops[index] || 0;+ list.scrollTop = resetEntryColumns && (isMobile() || index > 0) ? 0 : oldScrollTops[index] || 0;if (revealSelection) {const current = list.querySelector<HTMLElement>(".config-entry-visibility__location--current, .config-entry-visibility__row--current");@@ -654,7 +674,10 @@ const openProfileEditor = (root: HTMLElement, profileID?: string) => {columnsContainer.scrollLeft = scrollToEnd ? columnsContainer.scrollWidth : oldScrollLeft;}};- const leaveEditor = () => removeEntryView(root, view);+ const leaveEditor = () => {+ disposeTouchOrder();+ removeEntryView(root, view);+ };const closeEditor = () => {if (JSON.stringify(draft) !== initialJSON) {confirmDialog(window.siyuan.languages.confirm, window.siyuan.languages.discardUnsavedChanges, leaveEditor);@@ -664,37 +687,8 @@ const openProfileEditor = (root: HTMLElement, profileID?: string) => {};renderBrowser();searchInput.addEventListener("input", () => renderBrowser());- browser.addEventListener("click", event => {- const button = (event.target as Element).closest<HTMLElement>("[data-entry-move]");- if (!button) {- return;- }- event.preventDefault();- event.stopPropagation();- if (builtin || searchInput.value.trim()) {- return;- }- const row = button.closest<HTMLElement>("[data-entry-row]");- const parent = row.dataset.entryParent;- const nodes = getEntryCatalogChildren(parent);- const order = getProfileEntryOrder(draft, parent, nodes);- const rows = Array.from(row.parentElement.querySelectorAll<HTMLElement>("[data-entry-row]"));- const after = button.dataset.entryMove === "down";- const target = rows[rows.indexOf(row) + (after ? 1 : -1)];- if (!target) {- return;- }- const updated = moveEntryOrder(order, row.dataset.entryKey, target.dataset.entryKey, after,- new Set(nodes.filter(item => item.type === "separator").map(item => item.key)));- if (updated) {- draft.orders ||= {};- draft.orders[parent] = mergeEntryOrderPreservingUnknown(nodes.map(item => item.key),- draft.orders[parent], updated, new Set(nodes.filter(item => item.type === "separator").map(item => item.key)));- renderBrowser();- }- });browser.addEventListener("dragstart", (event: DragEvent) => {- if (builtin || searchInput.value.trim()) {+ if (isMobile() || builtin || searchInput.value.trim()) {event.preventDefault();return;}@@ -709,13 +703,13 @@ const openProfileEditor = (root: HTMLElement, profileID?: string) => {event.dataTransfer.effectAllowed = "move";event.dataTransfer.setData("text/plain", row.dataset.entryKey);});- browser.addEventListener("dragover", (event: DragEvent) => {+ const updateDropTarget = (target: Element, clientY: number) => {if (!dragging) {return;}- const row = (event.target as Element).closest<HTMLElement>("[data-entry-row]");+ const row = target?.closest<HTMLElement>("[data-entry-row]");if (isDockOrderScope(dragging.parentPath)) {- const dropScopeElement = (event.target as Element).closest<HTMLElement>("[data-entry-drop-scope]");+ const dropScopeElement = target?.closest<HTMLElement>("[data-entry-drop-scope]");const targetScopeValue = row?.dataset.entryParent || dropScopeElement?.dataset.entryDropScope || "";if (!isDockOrderScope(targetScopeValue)) {clearDropTarget();@@ -724,7 +718,7 @@ const openProfileEditor = (root: HTMLElement, profileID?: string) => {}const targetKey = row?.dataset.entryParent === targetScopeValue ? row.dataset.entryKey : undefined;const after = targetKey- ? event.clientY >= row.getBoundingClientRect().top + row.offsetHeight / 2+ ? clientY >= row.getBoundingClientRect().top + row.offsetHeight / 2: undefined;const movedOrder = moveDockEntryOrderSnapshot(mergeDockEntryOrderSnapshot(dockOrderSnapshot, draft.orders),@@ -738,8 +732,6 @@ const openProfileEditor = (root: HTMLElement, profileID?: string) => {if (!movedOrder) {return;}- event.preventDefault();- event.dataTransfer.dropEffect = "move";if (targetKey) {row.classList.add(`config-entry-visibility__row--drop-${after ? "after" : "before"}`);} else {@@ -761,7 +753,7 @@ const openProfileEditor = (root: HTMLElement, profileID?: string) => {context.defaultOrder,context.separatorKeys,);- const after = event.clientY >= row.getBoundingClientRect().top + row.offsetHeight / 2;+ const after = clientY >= row.getBoundingClientRect().top + row.offsetHeight / 2;const movedOrder = moveEntryOrder(order, dragging.sourceKey, row.dataset.entryKey, after,context.separatorKeys);clearDropTarget();@@ -769,16 +761,13 @@ const openProfileEditor = (root: HTMLElement, profileID?: string) => {if (!movedOrder) {return;}- event.preventDefault();- event.dataTransfer.dropEffect = "move";row.classList.add(`config-entry-visibility__row--drop-${after ? "after" : "before"}`);- });- browser.addEventListener("drop", (event: DragEvent) => {+ };+ const saveDrop = () => {if (dragging && isDockOrderScope(dragging.parentPath)) {if (!dragging.dockOrder) {return;}- event.preventDefault();draft.orders ||= {};DOCK_ORDER_SCOPES.forEach((scope) => {draft.orders[scope] = [...dragging.dockOrder[scope]];@@ -790,7 +779,6 @@ const openProfileEditor = (root: HTMLElement, profileID?: string) => {if (!dragging?.defaultOrder || !dragging.order) {return;}- event.preventDefault();draft.orders ||= {};const savedOrder = draft.orders[dragging.parentPath];const context = getEntryOrderContext(dragging.parentPath, dockOrderSnapshot);@@ -807,13 +795,42 @@ const openProfileEditor = (root: HTMLElement, profileID?: string) => {);dragging = undefined;renderBrowser();- });- browser.addEventListener("dragend", () => {+ };+ const cancelDrag = () => {dragging = undefined;clearDropTarget();browser.querySelector(".config-entry-visibility__row--dragging")?.classList.remove("config-entry-visibility__row--dragging");+ };+ browser.addEventListener("dragover", (event: DragEvent) => {+ updateDropTarget(event.target as Element, event.clientY);+ if (dragging?.order || dragging?.dockOrder) {+ event.preventDefault();+ event.dataTransfer.dropEffect = "move";+ }});+ browser.addEventListener("drop", (event: DragEvent) => {+ event.preventDefault();+ saveDrop();+ cancelDrag();+ });+ browser.addEventListener("dragend", cancelDrag);+ const disposeTouchOrder = isMobile() ? bindTouchOrder(browser, {+ start: (row) => {+ if (builtin || searchInput.value.trim() || !row.dataset.entryParent || !row.dataset.entryKey) {+ return false;+ }+ dragging = {parentPath: row.dataset.entryParent, sourceKey: row.dataset.entryKey};+ row.classList.add("config-entry-visibility__row--dragging");+ return true;+ },+ move: updateDropTarget,+ drop: () => {+ saveDrop();+ cancelDrag();+ },+ cancel: cancelDrag,+ }) : () => {};view.addEventListener("input", (event) => {if (builtin) {return;@@ -824,6 +841,19 @@ const openProfileEditor = (root: HTMLElement, profileID?: string) => {}});view.addEventListener("change", (event) => {+ const control = event.target as HTMLInputElement | HTMLSelectElement;+ if (control.dataset.type === "entry-section") {+ selectedSectionKey = control.value;+ selectedPaths = [];+ renderBrowser(false, true);+ return;+ }+ if (control.dataset.type === "mobile-slash-menu") {+ const config = {enabled: (control as HTMLInputElement).checked};+ window.siyuan.storage[Constants.LOCAL_MOBILE_SLASH_MENU] = config;+ setStorageVal(Constants.LOCAL_MOBILE_SLASH_MENU, config);+ return;+ }if (builtin) {return;}diff --git a/app/src/config/tabs/appearanceTab.ts b/app/src/config/tabs/appearanceTab.tsindex 1d8961d4f2..ecb4f35fad 100644--- a/app/src/config/tabs/appearanceTab.ts+++ b/app/src/config/tabs/appearanceTab.ts@@ -943,7 +943,9 @@ const registerAppearanceControlsGroup = (tab: SettingTabBuilder) => {/// #endifgroup.slot({key: "entryVisibility",- keywords: [window.siyuan.languages.entryVisibility, window.siyuan.languages.entryVisibilityTip],+ keywords: [window.siyuan.languages.entryVisibility, window.siyuan.languages.entryVisibilityTip,+ window.siyuan.languages.entryToolbar, window.siyuan.languages.entrySlashMenu,+ ...(isMobile() ? [window.siyuan.languages.mobileSlashMenu, window.siyuan.languages.mobileToolbarEntryTip] : [])],html: genEntryVisibilityHtml,afterMount: mountEntryVisibility,});diff --git a/app/src/config/tabs/editorTab.ts b/app/src/config/tabs/editorTab.tsindex 124fc8bec6..783ad834bb 100644--- a/app/src/config/tabs/editorTab.ts+++ b/app/src/config/tabs/editorTab.ts@@ -1,6 +1,6 @@import {Constants} from "../../constants";import {isBrowser, isMobile} from "../../util/functions";-import {setStorageVal, updateHotkeyTip} from "../../protyle/util/compatibility";+import {updateHotkeyTip} from "../../protyle/util/compatibility";import {editorConfigApi} from "./editorRuntime";import type {SettingTabBuilder} from "../setting/builder";import {controlSelect} from "../setting/control";@@ -64,18 +64,6 @@ const registerEditorBehaviorGroup = (tab: SettingTabBuilder) => {title: window.siyuan.languages.hashTagSearch,desc: window.siyuan.languages.hashTagSearchTip,});- if (isMobile()) {- group.switch("mobile.slashMenu", {- title: window.siyuan.languages.mobileSlashMenu,- desc: window.siyuan.languages.mobileSlashMenuTip,- readConfig: () => window.siyuan.storage[Constants.LOCAL_MOBILE_SLASH_MENU]?.enabled === true,- save: (value) => {- const config = {enabled: value === true};- window.siyuan.storage[Constants.LOCAL_MOBILE_SLASH_MENU] = config;- setStorageVal(Constants.LOCAL_MOBILE_SLASH_MENU, config);- },- });- }group.switch("editor.pasteURLAutoConvert", {title: window.siyuan.languages.pasteURLAutoConvert,desc: window.siyuan.languages.pasteURLAutoConvertTip,