Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-12-29 21:08:49 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge remote-tracking branch 'origin/dev' into dev

Browse source
This commit is contained in:
Vanessa 2025-02-24 23:04:59 +08:00
commit 1ffc5eafc0
21 changed files with 42 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/appearance/langs/ar_SA.json
View file

@ -1361,7 +1361,7 @@
"26": "الرجاء تهيئة مفتاح مستودع البيانات أولاً في [الإعدادات - حول - مفتاح مستودع البيانات]",
"27": "‫جارٍ رفع [%v]‬",
"28": "الشبكة غير طبيعية، يرجى المحاولة مرة أخرى لاحقاً",
"29": "‫هذه الميزة تتطلب <a target='_blank' href='${url}'>الاشتراك المدفوع</a> (إذا كنت مشتركاً، يرجى التحديث أو تسجيل الدخول مرة أخرى في الإعدادات - الحساب)‬",
"29": "تتطلب هذه الميزة شراء <a target='_blank' href='${url}'>[اشتراك سنوي]</a> (إذا كنت قد اشتريت بالفعل، يرجى التحديث أو إعادة تسجيل الدخول في الإعدادات - الحساب)",
"30": "فشل في الحصول على معلومات السحابة",
"31": "فشل في مصادقة الحساب، يرجى تسجيل الدخول مرة أخرى",
"32": "فشل في إزالة دفتر الملاحظات في السحاب",

2
app/appearance/langs/de_DE.json
View file

@ -1361,7 +1361,7 @@
"26": "Bitte initialisieren Sie zuerst den Schlüssel des Daten-Repositorys in [Einstellungen - Über - Schlüssel des Daten-Repositorys]",
"27": "Hochladen [%v]",
"28": "Das Netzwerk ist abnormal, bitte versuchen Sie es später erneut",
"29": "Diese Funktion erfordert ein <a target='_blank' href='${url}'>bezahltes Abonnement</a> (Wenn Sie abonniert haben, bitte aktualisieren oder sich erneut anmelden in Einstellungen - Konto)",
"29": "Diese Funktion erfordert den Kauf eines <a target='_blank' href='${url}'>[Jahresabonnements]</a> (wenn Sie bereits gekauft haben, aktualisieren oder erneut anmelden in Einstellungen - Konto)",
"30": "Fehler beim Abrufen der Cloud-Informationen",
"31": "Die Kontenauthentifizierung ist fehlgeschlagen, bitte melden Sie sich erneut an",
"32": "Fehler beim Entfernen des Cloud-Notizbuchs",

2
app/appearance/langs/en_US.json
View file

@ -1361,7 +1361,7 @@
"26": "Please initialize the data repo key first in [Settings - About - Data repo key]",
"27": "Uploading [%v]",
"28": "The network is abnormal, please try again later",
"29": "This feature requires <a target='_blank' href='${url}'>paid subscription</a> (If you have subscribed, please refresh or log in again in settings - account)",
"29": "This feature requires the purchase of an <a target='_blank' href='${url}'>[Annual Subscription]</a> (if you have already purchased, please refresh or re-login in Settings - Account)",
"30": "Failed to obtain cloud info",
"31": "Account authentication failed, please login again",
"32": "Failed to remove cloud notebook",

2
app/appearance/langs/es_ES.json
View file

@ -1361,7 +1361,7 @@
"26": "Por favor, inicialice primero la clave de repositorio de datos en [Configuración - Acerca de - Clave de repositorio de datos]",
"27": "Subiendo [%v]",
"28": "La red es anómala, inténtalo de nuevo más tarde",
"29": "Esta función requiere una <a target='_blank' href='${url}'>suscripción de pago</a> (Si se ha suscrito, actualice o vuelva a conectarse en configuración - cuenta)",
"29": "Esta función requiere la compra de una <a target='_blank' href='${url}'>[suscripción anual]</a> (si ya has comprado, actualiza o vuelve a iniciar sesión en Configuración - Cuenta)",
"30": "No se pudo obtener la información de la nube",
"31": "Falló la autentificación de la cuenta, por favor, inicie sesión de nuevo",
"32": "Fallo en la eliminación de la libreta en la nube",

2
app/appearance/langs/fr_FR.json
View file

@ -1361,7 +1361,7 @@
"26": "Veuillez d'abord initialiser la clé du référentiel de données dans [Paramètres - À propos - Clé du référentiel de données]",
"27": "Téléchargement de [%v]",
"28": "Le réseau est anormal, veuillez réessayer plus tard",
"29": "Cette fonctionnalité nécessite <a target='_blank' href='${url}'>un abonnement payant</a> (Si vous êtes déjà abonné, Rafraîchissez ou connectez - vous à nouveau dans Paramètres - compte)",
"29": "Cette fonctionnalité nécessite l'achat d'un <a target='_blank' href='${url}'>[abonnement annuel]</a> (si vous avez déjà acheté, actualisez ou reconnectez-vous dans Paramètres - Compte)",
"30": "Échec de l'obtention des informations sur le cloud",
"31": "L'authentification du compte a échoué, veuillez vous reconnecter",
"32": "Échec de la suppression de carnet de notes du Cloud",

2
app/appearance/langs/he_IL.json
View file

@ -1361,7 +1361,7 @@
"26": "אנא אתחל קודם את מפתח מאגר הנתונים ב[הגדרות - אודות - מפתח מאגר הנתונים]",
"27": "מעלה [%v]",
"28": "חיבור לרשת בלתי תקין, אנא נסה שוב מאוחר יותר",
"29": "תכונה זו דורשת <a target='_blank' href='${url}'>מנוי בתשלום</a> (אם רשמת, אנא רענן או היכנס שוב בהגדרות - חשבון)",
"29": "פונקציה זו זמינה רק לאחר רכישת <a target='_blank' href='${url}'>[מנוי שנתי]</a> (אם כבר רכשת, רענן או התחבר מחדש בהגדרות - חשבון)",
"30": "נכשל בקבלת מידע על ענן",
"31": "אישור חשבון נכשל, אנא היכנס שוב",
"32": "נכשל בהסרת מחברת בענן",

2
app/appearance/langs/it_IT.json
View file

@ -1361,7 +1361,7 @@
"26": "Si prega di inizializzare prima la chiave del repository dati in [Impostazioni - Informazioni - Chiave del repository dati]",
"27": "Caricamento [%v]",
"28": "La rete è anormale, riprova più tardi",
"29": "Questa funzione richiede un <a target='_blank' href='${url}'>abbonamento a pagamento</a> (Se hai già un abbonamento, aggiorna o accedi nuovamente in impostazioni - account)",
"29": "Questa funzione è disponibile solo con l'acquisto di un <a target='_blank' href='${url}'>[abbonamento annuale]</a> (se hai già acquistato, aggiorna o accedi nuovamente in Impostazioni - Account)",
"30": "Impossibile ottenere informazioni sul cloud",
"31": "Autenticazione dell'account fallita, per favore accedi di nuovo",
"32": "Impossibile rimuovere il taccuino dal cloud",

2
app/appearance/langs/ja_JP.json
View file

@ -1361,7 +1361,7 @@
"26": "[設定] - [情報] - [データリポジトリキー] でデータリポジトリキーを初期化してください",
"27": "[%v] をアップロード中",
"28": "ネットワークに問題があります。後でまた試してださい",
"29": "この機能を使用するには<a target='_blank' href='${url}'>有料サブスクリプション</a>が必要です (サブスクリプション済みの方は [設定] - [アカウント] で更新または再ログインしてください)",
"29": "この機能は <a target='_blank' href='${url}'>[年額サブスクリプション]</a> を購入後に使用できます</a>（すでに購入している場合は、設定 - アカウントで更新または再ログインしてください）",
"30": "クラウド情報の取得に失敗しました",
"31": "アカウントの認証に失敗しました。もう一度ログインしてください",
"32": "クラウドノートブックの削除に失敗しました",

2
app/appearance/langs/pl_PL.json
View file

@ -1361,7 +1361,7 @@
"26": "Proszę najpierw zainicjować klucz repozytorium danych w [Ustawienia - O - Klucz repozytorium danych]",
"27": "Przesyłanie [%v]",
"28": "Sieć jest nieprawidłowa, proszę spróbować ponownie później",
"29": "Ta funkcjonalność wymaga <a target='_blank' href='${url}'>płatnej subskrypcji</a> (Jeśli subskrybowałeś, proszę odświeżyć lub zalogować się ponownie w ustawieniach - konto)",
"29": "Ta funkcja jest dostępna tylko po zakupie <a target='_blank' href='${url}'>[rocznej subskrypcji]</a> (jeśli już kupiłeś, odśwież lub zaloguj się ponownie w Ustawienia - Konto)",
"30": "Nie udało się uzyskać informacji w chmurze",
"31": "Autoryzacja konta nie powiodła się, proszę zalogować się ponownie",
"32": "Nie udało się usunąć notatnika w chmurze",

2
app/appearance/langs/ru_RU.json
View file

@ -1361,7 +1361,7 @@
"26": "Пожалуйста, сначала инициализируйте ключ репозитория данных в [Настройки - О программе - Ключ репозитория данных]",
"27": "Загрузка [%v]",
"28": "Сеть аномальная, пожалуйста, попробуйте позже",
"29": "Эта функция требует <a target='_blank' href='${url}'>платной подписки</a> (Если вы подписаны, пожалуйста, обновите или войдите снова в настройки - учетная запись)",
"29": "Эта функция доступна только при покупке <a target='_blank' href='${url}'>[годовой подписки]</a> (если вы уже купили, обновите или повторно войдите в Настройки - Аккаунт)",
"30": "Не удалось получить информацию о облаке",
"31": "Не удалось аутентифицировать учетную запись, пожалуйста, войдите снова",
"32": "Не удалось удалить облачный блокнот",

2
app/appearance/langs/zh_CHT.json
View file

@ -1361,7 +1361,7 @@
"26": "請先在 [設置 - 關於 - 資料倉庫密鑰] 中初始化資料倉庫密鑰",
"27": "正在上傳 [%v]",
"28": "網絡異常，請稍後再試",
"29": "該功能需要<a target='_blank' href='${url}'>付費訂閱</a>（如果你已經訂閱，請在設定-帳號中重繪或者重新登入）",
"29": "該功能需要購買 <a target='_blank' href='${url}'>[年付訂閱]</a> 後才能使用</a>（如果你已經購買，請在 設置 - 賬號中刷新或者重新登錄）",
"30": "獲取雲端資訊失敗",
"31": "帳號鑒權失敗，請重新登入帳號",
"32": "刪除雲端筆記本失敗",

2
app/appearance/langs/zh_CN.json
View file

@ -1361,7 +1361,7 @@
"26": "请先在 [设置 - 关于 - 数据仓库密钥] 中初始化数据仓库密钥",
"27": "正在上传 [%v]",
"28": "网络异常，请稍后再试",
"29": "该功能需要<a target='_blank' href='${url}'>付费订阅</a>（如果你已经订阅，请在 设置 - 账号中刷新或者重新登录）",
"29": "该功能需要购买 <a target='_blank' href='${url}'>[年付订阅]</a> 后才能使用</a>（如果你已经购买，请在 设置 - 账号中刷新或者重新登录）",
"30": "获取云端信息失败",
"31": "账号鉴权失败，请重新登录账号",
"32": "删除云端笔记本失败",

4
app/changelogs/v3.1.23/v3.1.23.md
View file

@ -11,7 +11,9 @@ Below are the detailed changes in this version.
* [Hide text in breadcrumb of last non-document path in embed block](https://github.com/siyuan-note/siyuan/issues/13866)
* [Improve code/kbd/tag element editing](https://github.com/siyuan-note/siyuan/issues/13871)
* [Deduplicate container block backlink](https://github.com/siyuan-note/siyuan/issues/13872)
* [Improve positioning of table and recent block searches](https://github.com/siyuan-note/siyuan/issues/13876)
* [`AI writing` supports custom shortcut keys](https://github.com/siyuan-note/siyuan/issues/13894)
* [Improve positioning after exiting focus](https://github.com/siyuan-note/siyuan/issues/13897)
* [Improve the window control button position after the graph panel is full screen](https://github.com/siyuan-note/siyuan/issues/13899)
* [Improve the centering and line wrapping of database primary key emojis](https://github.com/siyuan-note/siyuan/issues/13940)
* [Insert list reference when dragging multiple docs into the editor](https://github.com/siyuan-note/siyuan/issues/13942)
@ -60,9 +62,11 @@ Below are the detailed changes in this version.
* [Rollback document exception after moving document](https://github.com/siyuan-note/siyuan/issues/14107)
* [Font folder not packaged on macOS/Linux/Windows arm64](https://github.com/siyuan-note/siyuan/issues/14119)
* [Unable to download online video](https://github.com/siyuan-note/siyuan/issues/14155)
* [`dragover__bottom` class name not removed](https://github.com/siyuan-note/siyuan/issues/14177)
### Refactor
* [Upgrade to Graphviz v3.11.0](https://github.com/siyuan-note/siyuan/issues/13852)
* [Upgrade to Electron v33.4.1](https://github.com/siyuan-note/siyuan/issues/14101)
### Development

6
app/changelogs/v3.1.23/v3.1.23_zh_CHT.md
View file

@ -11,8 +11,10 @@
* [隱藏嵌入區塊中最後一個非文檔路徑的麵包屑文字](https://github.com/siyuan-note/siyuan/issues/13866)
* [改進程式碼/鍵盤/標籤元素編輯](https://github.com/siyuan-note/siyuan/issues/13871)
* [去重容器區塊反向連結](https://github.com/siyuan-note/siyuan/issues/13872)
* [改進表格和最近區塊搜尋的定位](https://github.com/siyuan-note/siyuan/issues/13876)
* [`AI 編寫` 支援自訂快捷鍵](https://github.com/siyuan-note/siyuan/issues/13894)
* [Improve the window control button position after the graph panel is full screen](https://github.com/siyuan-note/siyuan/issues/13899)
* [改進退出對焦後定位](https://github.com/siyuan-note/siyuan/issues/13897)
* [改進關係圖面板全螢幕後視窗控制按鈕位置](https://github.com/siyuan-note/siyuan/issues/13899)
* [改進資料庫主鍵表情的居中與換行](https://github.com/siyuan-note/siyuan/issues/13940)
* [將多個文件拖曳到編輯器時插入清單參考](https://github.com/siyuan-note/siyuan/issues/13942)
* [雙擊 .search__drag 恢復預設寬度](https://github.com/siyuan-note/siyuan/issues/13964)
@ -60,9 +62,11 @@
* [行動文件後回溯文件異常](https://github.com/siyuan-note/siyuan/issues/14107)
* [macOS/Linux/Windows arm64 上未打包字型](https://github.com/siyuan-note/siyuan/issues/14119)
* [網路影片無法下載](https://github.com/siyuan-note/siyuan/issues/14155)
* [`dragover__bottom` 類別名稱沒有移除](https://github.com/siyuan-note/siyuan/issues/14177)
### 開發重構
* [升級至 Graphviz v3.11.0](https://github.com/siyuan-note/siyuan/issues/13852)
* [升級至 Electron v33.4.1](https://github.com/siyuan-note/siyuan/issues/14101)
### 開發者

6
app/changelogs/v3.1.23/v3.1.23_zh_CN.md
View file

@ -11,8 +11,10 @@
* [隐藏嵌入块中最后一个非文档路径的面包屑文本](https://github.com/siyuan-note/siyuan/issues/13866)
* [改进代码/键盘/标签元素编辑](https://github.com/siyuan-note/siyuan/issues/13871)
* [去重容器块反向链接](https://github.com/siyuan-note/siyuan/issues/13872)
* [改进表格和最近块搜索的定位](https://github.com/siyuan-note/siyuan/issues/13876)
* [`AI 编写` 支持自定义快捷键](https://github.com/siyuan-note/siyuan/issues/13894)
* [Improve the window control button position after the graph panel is full screen](https://github.com/siyuan-note/siyuan/issues/13899)
* [改进退出聚焦后定位](https://github.com/siyuan-note/siyuan/issues/13897)
* [改进关系图面板全屏后窗口控制按钮位置](https://github.com/siyuan-note/siyuan/issues/13899)
* [改进数据库主键表情的居中和换行](https://github.com/siyuan-note/siyuan/issues/13940)
* [将多个文档拖入编辑器时插入列表引用](https://github.com/siyuan-note/siyuan/issues/13942)
* [双击 .search__drag 恢复默认宽度](https://github.com/siyuan-note/siyuan/issues/13964)
@ -60,9 +62,11 @@
* [移动文档后回滚文档异常](https://github.com/siyuan-note/siyuan/issues/14107)
* [macOS/Linux/Windows arm64 上未打包字体](https://github.com/siyuan-note/siyuan/issues/14119)
* [网络视频无法下载](https://github.com/siyuan-note/siyuan/issues/14155)
* [`dragover__bottom` 类名没有移除](https://github.com/siyuan-note/siyuan/issues/14177)
### 开发重构
* [升级到 Graphviz v3.11.0](https://github.com/siyuan-note/siyuan/issues/13852)
* [升级到 Electron v33.4.1](https://github.com/siyuan-note/siyuan/issues/14101)
### 开发者

7
app/src/sync/syncGuide.ts
View file

@ -148,8 +148,11 @@ export const syncGuide = (app?: App) => {
return;
}
/// #if MOBILE
if ((0 === window.siyuan.config.sync.provider && needSubscribe()) ||
(0 !== window.siyuan.config.sync.provider && !isPaidUser())) {
if (0 === window.siyuan.config.sync.provider) {
if (needSubscribe()) {
return
}
} else if (!isPaidUser()) {
showMessage(window.siyuan.languages["_kernel"][214]);
return;
}

2
app/stage/protyle/js/lute/lute.min.js vendored
View file

File diff suppressed because one or more lines are too long

2
kernel/go.mod
View file

@ -10,7 +10,7 @@ require (
github.com/88250/epub v0.0.0-20230830085737-c19055cd1f48
github.com/88250/go-humanize v0.0.0-20240424102817-4f78fac47ea7
github.com/88250/gulu v1.2.3-0.20241212012748-c4dc08fe45ec
github.com/88250/lute v1.7.7-0.20250223032430-d9f7c2451f59
github.com/88250/lute v1.7.7-0.20250224132053-4107c2bfa949
github.com/88250/vitess-sqlparser v0.0.0-20210205111146-56a2ded2aba1
github.com/ClarkThan/ahocorasick v0.0.0-20231011042242-30d1ef1347f4
github.com/ConradIrwin/font v0.2.1

4
kernel/go.sum
View file

@ -14,8 +14,8 @@ github.com/88250/go-sqlite3 v1.14.13-0.20231214121541-e7f54c482950 h1:Pa5hMiBceT
github.com/88250/go-sqlite3 v1.14.13-0.20231214121541-e7f54c482950/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
github.com/88250/gulu v1.2.3-0.20241212012748-c4dc08fe45ec h1:YsUSpByWJP+x8C+IT+C3QlFvU7ZQ6+E95SFd9+zy6QU=
github.com/88250/gulu v1.2.3-0.20241212012748-c4dc08fe45ec/go.mod h1:c8uVw25vW2W4dhJ/j4iYsX5H1hc19spim266jO5x2hU=
github.com/88250/lute v1.7.7-0.20250223032430-d9f7c2451f59 h1:mnT05Pm5mYYiFVkulWQn4+epbBNQ74dRa5B72F4QhJM=
github.com/88250/lute v1.7.7-0.20250223032430-d9f7c2451f59/go.mod h1:WYyUw//5yVw9BJnoVjx7rI/3szsISxNZCYGOqTIrV0o=
github.com/88250/lute v1.7.7-0.20250224132053-4107c2bfa949 h1:uij2PUDgDSW0LJQnnCeQi2wvkn0DW2luW60H4qL88gs=
github.com/88250/lute v1.7.7-0.20250224132053-4107c2bfa949/go.mod h1:WYyUw//5yVw9BJnoVjx7rI/3szsISxNZCYGOqTIrV0o=
github.com/88250/pdfcpu v0.3.14-0.20241201033812-5a93b7586a01 h1:AcFe63RXjIh1XtX/dc4Es3U8bYKjlEkvavHd1nFBOHM=
github.com/88250/pdfcpu v0.3.14-0.20241201033812-5a93b7586a01/go.mod h1:fVfOloBzs2+W2VJCCbq60XIxc3yJHAZ0Gahv1oO0gyI=
github.com/88250/vitess-sqlparser v0.0.0-20210205111146-56a2ded2aba1 h1:48T899JQDwyyRu9yXHePYlPdHtpJfrJEUGBMH3SMBWY=

2
kernel/model/block.go
View file

@ -279,7 +279,7 @@ func GetUnfoldedParentID(id string) (parentID string) {
if nil != firstFoldedParent {
parentID = firstFoldedParent.ID
} else {
parentID = parent.ID
parentID = id
}
return
}

6
kernel/model/search.go
View file

@ -590,6 +590,12 @@ func FindReplace(keyword, replacement string, replaceTypes map[string]bool, ids
if replaceTextNode(n, method, keyword, replacement, r, luteEngine) {
if nil != n.Parent && ast.NodeBackslash == n.Parent.Type {
unlinks = append(unlinks, n.Parent)
prev, next := n.Parent.Previous, n.Parent.Next
if nil != prev && ast.NodeText == prev.Type && nil != next && ast.NodeText == next.Type {
prev.Tokens = append(prev.Tokens, next.Tokens...)
unlinks = append(unlinks, next)
}
} else {
unlinks = append(unlinks, n)
}