Merge commit '0f91f51bb0f8fc7f71e3c038ae45a3d69d3e95e1'

* commit '0f91f51bb0f8fc7f71e3c038ae45a3d69d3e95e1': (109 commits) 🐛 fix siyuan-note#10238 🎨 Update linux/macOS packing font 🎨 Update npm mirror 🔖 Release v2.12.4 🚨 🎨 菜单右键复制无效 🎨 fix siyuan-note#10230 🎨 fix siyuan-note#10230 📝 Update changelogs 🐛 remove invalid requests during boot (siyuan-note#10227) 📝 Update changelogs 🎨 Improve search and replace spaces siyuan-note#10231 📝 Update changelogs 🎨 Improve data sync to prevent an old snapshot to overwrite the new one siyuan-note#10229 🎨 fix siyuan-note#10225 🎨 Update README 📝 ♻️ 🐛 Data sync may cause data loss on Android 14 siyuan-note#10205 🐛 Data sync may cause data loss on Android 14 siyuan-note#10205 ... # Conflicts: # README.md # app/src/config/account.ts
EightDoor · Jan 24, 2024 · 6139dad · 6139dad
2 parents a827a9e + 0f91f51
commit 6139dad
Show file tree

Hide file tree

Showing 148 changed files with 4,605 additions and 785 deletions.
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
@@ -16,21 +16,21 @@ Install pnpm: `npm install -g pnpm`
 
 Set the Electron mirror environment variable and install Electron:
 
-* macOS/Linux: `ELECTRON_MIRROR=https://cnpmjs.org/mirrors/electron/ pnpm install electron@28.1.3 -D`
+* macOS/Linux: `ELECTRON_MIRROR=https://registry.npmmirror.com/mirrors/electron/ pnpm install electron@28.1.4 -D`
 * Windows:
-    * `SET ELECTRON_MIRROR=https://cnpmjs.org/mirrors/electron/`
-    * `pnpm install electron@28.1.3 -D`
+    * `SET ELECTRON_MIRROR=https://registry.npmmirror.com/mirrors/electron/`
+    * `pnpm install electron@28.1.4 -D`
 
 NPM mirror:
 
-* Use npmmirror China mirror repository `pnpm --registry https://r.cnpmjs.org/ i`
-* Revert to using official repository `pnpm --registry https://registry.npmjs.org i`
+* Use npmmirror China mirror repository `pnpm --registry https://registry.npmmirror.com/ i`
+* Revert to using official repository `pnpm --registry https://registry.npmmirror.com i`
 
 </details>
 
 On the desktop, go to the app folder to run:
 
-* `pnpm install electron@28.1.3 -D`
+* `pnpm install electron@28.1.4 -D`
 * `pnpm run dev`
 * `pnpm run start`
 

diff --git a/.github/CONTRIBUTING_zh_CN.md b/.github/CONTRIBUTING_zh_CN.md
@@ -18,21 +18,21 @@
 
 * macOS/Linux: 
  ```
- ELECTRON_MIRROR=https://cnpmjs.org/mirrors/electron/ pnpm install electron@28.1.3 -D
+ ELECTRON_MIRROR=https://registry.npmmirror.com/mirrors/electron/ pnpm install electron@28.1.4 -D
  ```
 * Windows:
-    * `SET ELECTRON_MIRROR=https://cnpmjs.org/mirrors/electron/`
-    * `pnpm install electron@28.1.3 -D`
+    * `SET ELECTRON_MIRROR=https://registry.npmmirror.com/mirrors/electron/`
+    * `pnpm install electron@28.1.4 -D`
 
 NPM 镜像：
 
-* 使用 npmmirror 中国镜像仓库 `pnpm --registry https://r.cnpmjs.org/ i`
-* 恢复使用官方仓库 `pnpm --registry https://registry.npmjs.org i`
+* 使用 npmmirror 中国镜像仓库 `pnpm --registry https://registry.npmmirror.com/ i`
+* 恢复使用官方仓库 `pnpm --registry https://registry.npmmirror.com i`
 </details>
 
 桌面端进入 app 文件夹运行：
 
-* `pnpm install electron@28.1.3 -D`
+* `pnpm install electron@28.1.4 -D`
 * `pnpm run dev`
 * `pnpm run start`
 

diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml
@@ -49,4 +49,4 @@ jobs:
 
       - name: Build the Docker image
         run: |
-          docker buildx build --push --platform linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v8 -t b3log/siyuan:latest -t b3log/siyuan:v2.12.2 .
+          docker buildx build --push --platform linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v8 -t b3log/siyuan:latest -t b3log/siyuan:v2.12.4 .
diff --git a/README.md b/README.md
@@ -77,14 +77,16 @@
 
 ![思源笔记架构设计](https://b3logfile.com/file/2023/05/SiYuan_Arch-Sgu8vXT.png "思源笔记架构设计")
 
-* [bazzar](https://github.com/siyuan-note/bazaar)：社区集市
-* [dejavu](https://github.com/siyuan-note/dejavu)：数据仓库
-* [riff](https://github.com/siyuan-note/riff)：间隔重复系统
-* [petal](https://github.com/siyuan-note/petal)：插件 API
-* [chrome](https://github.com/siyuan-note/siyuan-chrome)：Chrome 扩展
-* [lute](https://github.com/88250/lute)：结构化的编辑器引擎，支持 Go 和 JavaScript
-* [ios](https://github.com/siyuan-note/siyuan-ios): iOS APP
-* [android](https://github.com/siyuan-note/siyuan-android): Android APP
+| Project                                                  | Description             | Forks                                                                           | Stars                                                                                | 
+|----------------------------------------------------------|-------------------------|---------------------------------------------------------------------------------|--------------------------------------------------------------------------------------|
+| [lute](https://github.com/88250/lute)                    | Editor engine           | ![GitHub forks](https://img.shields.io/github/forks/88250/lute)                 | ![GitHub Repo stars](https://img.shields.io/github/stars/88250/lute)                 |
+| [chrome](https://github.com/siyuan-note/siyuan-chrome)   | Chrome/Edge extension   | ![GitHub forks](https://img.shields.io/github/forks/siyuan-note/siyuan-chrome)  | ![GitHub Repo stars](https://img.shields.io/github/stars/siyuan-note/siyuan-chrome)  |
+| [bazaar](https://github.com/siyuan-note/bazaar)          | Community marketplace   | ![GitHub forks](https://img.shields.io/github/forks/siyuan-note/bazaar)         | ![GitHub Repo stars](https://img.shields.io/github/stars/siyuan-note/bazaar)         |
+| [dejavu](https://github.com/siyuan-note/dejavu)          | Data repo               | ![GitHub forks](https://img.shields.io/github/forks/siyuan-note/dejavu)         | ![GitHub Repo stars](https://img.shields.io/github/stars/siyuan-note/dejavu)         |
+| [petal](https://github.com/siyuan-note/petal)            | Plugin API              | ![GitHub forks](https://img.shields.io/github/forks/siyuan-note/petal)          | ![GitHub Repo stars](https://img.shields.io/github/stars/siyuan-note/petal)          |
+| [android](https://github.com/siyuan-note/siyuan-android) | Android APP             | ![GitHub forks](https://img.shields.io/github/forks/siyuan-note/siyuan-android) | ![GitHub Repo stars](https://img.shields.io/github/stars/siyuan-note/siyuan-android) |
+| [ios](https://github.com/siyuan-note/siyuan-ios)         | iOS APP                 | ![GitHub forks](https://img.shields.io/github/forks/siyuan-note/siyuan-ios)     | ![GitHub Repo stars](https://img.shields.io/github/stars/siyuan-note/siyuan-ios)     |
+| [riff](https://github.com/siyuan-note/riff)              | Spaced repetition | ![GitHub forks](https://img.shields.io/github/forks/siyuan-note/riff)           | ![GitHub Repo stars](https://img.shields.io/github/stars/siyuan-note/riff)           |
 
 ## 🌟 Star History
 

diff --git a/README_en.md b/README_en.md
@@ -77,14 +77,16 @@
 
 ![思源笔记架构设计](https://b3logfile.com/file/2023/05/SiYuan_Arch-Sgu8vXT.png "思源笔记架构设计")
 
-* [bazzar](https://github.com/siyuan-note/bazaar)：社区集市
-* [dejavu](https://github.com/siyuan-note/dejavu)：数据仓库
-* [riff](https://github.com/siyuan-note/riff)：间隔重复系统
-* [petal](https://github.com/siyuan-note/petal)：插件 API
-* [chrome](https://github.com/siyuan-note/siyuan-chrome)：Chrome 扩展
-* [lute](https://github.com/88250/lute)：结构化的编辑器引擎，支持 Go 和 JavaScript
-* [ios](https://github.com/siyuan-note/siyuan-ios): iOS APP
-* [android](https://github.com/siyuan-note/siyuan-android): Android APP
+| Project                                                  | Description    | Forks                                                                           | Stars                                                                                | 
+|----------------------------------------------------------|----------------|---------------------------------------------------------------------------------|--------------------------------------------------------------------------------------|
+| [lute](https://github.com/88250/lute)                    | 编辑器引擎          | ![GitHub forks](https://img.shields.io/github/forks/88250/lute)                 | ![GitHub Repo stars](https://img.shields.io/github/stars/88250/lute)                 |
+| [chrome](https://github.com/siyuan-note/siyuan-chrome)   | Chrome/Edge 扩展 | ![GitHub forks](https://img.shields.io/github/forks/siyuan-note/siyuan-chrome)  | ![GitHub Repo stars](https://img.shields.io/github/stars/siyuan-note/siyuan-chrome)  |
+| [bazaar](https://github.com/siyuan-note/bazaar)          | 社区集市           | ![GitHub forks](https://img.shields.io/github/forks/siyuan-note/bazaar)         | ![GitHub Repo stars](https://img.shields.io/github/stars/siyuan-note/bazaar)         |
+| [dejavu](https://github.com/siyuan-note/dejavu)          | 数据仓库           | ![GitHub forks](https://img.shields.io/github/forks/siyuan-note/dejavu)         | ![GitHub Repo stars](https://img.shields.io/github/stars/siyuan-note/dejavu)         |
+| [petal](https://github.com/siyuan-note/petal)            | 插件 API         | ![GitHub forks](https://img.shields.io/github/forks/siyuan-note/petal)          | ![GitHub Repo stars](https://img.shields.io/github/stars/siyuan-note/petal)          |
+| [android](https://github.com/siyuan-note/siyuan-android) | Android APP    | ![GitHub forks](https://img.shields.io/github/forks/siyuan-note/siyuan-android) | ![GitHub Repo stars](https://img.shields.io/github/stars/siyuan-note/siyuan-android) |
+| [ios](https://github.com/siyuan-note/siyuan-ios)         | iOS APP        | ![GitHub forks](https://img.shields.io/github/forks/siyuan-note/siyuan-ios)     | ![GitHub Repo stars](https://img.shields.io/github/stars/siyuan-note/siyuan-ios)     |
+| [riff](https://github.com/siyuan-note/riff)              | 间隔重复           | ![GitHub forks](https://img.shields.io/github/forks/siyuan-note/riff)           | ![GitHub Repo stars](https://img.shields.io/github/stars/siyuan-note/riff)           |
 
 ## 🌟 Star History
 

diff --git a/app/appearance/langs/en_US.json b/app/appearance/langs/en_US.json
@@ -1,4 +1,6 @@
 {
+  "dragFill": "Drag vertically to fill value",
+  "switchReadonly": "Switch read-only mode",
   "original": "Original",
   "selectRelation": "Please select the related column first",
   "backRelation": "Bidirectional",
@@ -848,7 +850,8 @@
   "refreshUser": "User information refreshed",
   "insertBottom": "Open Below the Tab",
   "insertRight": "Open Right the Tab",
-  "account1": "Click to subscribe",
+  "account1": "Become a paid member",
+  "account4": "Upgrade to a subscription member",
   "account2": "End-to-end encrypted data sync and backup",
   "account3": "Trial Subscription",
   "account5": "Cloud assets hosting",
@@ -1385,6 +1388,9 @@
     "217": "[%d/%d] Created asset content data index",
     "218": "Too many snapshots of the data repo have been detected, which slows down program startup and data sync. Please consider executing [Settings - About - Data repo purge]",
     "219": "The cloud storage service is unavailable, please try again later",
-    "220": "Due to a defect in the previous version, the cloud data is corrupted. Please refer to the User Guide-FAQ-Lost Key steps to reset the local data repo and cloud directory"
+    "220": "Due to a defect in the previous version, the cloud data is corrupted. Please refer to the User Guide-FAQ-Lost Key steps to reset the local data repo and cloud directory",
+    "221": "The replacement operation is not supported after grouping by document. Please use ungrouping and then replace",
+    "222": "Data sync is in progress, please wait until data sync is completed and try again",
+    "223": "Cleaning cloud storage..."
   }
 }
diff --git a/app/appearance/langs/es_ES.json b/app/appearance/langs/es_ES.json
@@ -1,4 +1,6 @@
 {
+  "dragFill": "Arrastra verticalmente para rellenar el valor",
+  "switchReadonly": "Cambiar modo de sólo lectura",
   "original": "Original",
   "selectRelation": "Seleccione primero la columna relacionada",
   "backRelation": "Bidireccional",
@@ -848,7 +850,8 @@
   "refreshUser": "Información del usuario actualizada",
   "insertBottom": "Abrir debajo de la pestaña",
   "insertRight": "Abrir a la derecha la pestaña",
-  "account1": "Haga clic para suscribirse",
+  "account1": "Conviértete en miembro pago",
+  "account4": "Actualizar a miembro suscrito",
   "account2": "Copia de seguridad y sincronización de datos cifrados de extremo a extremo",
   "account3": "Suscripción de prueba",
   "account5": "Alojamiento de activos en la nube",
@@ -1385,6 +1388,9 @@
     "217": "[%d/%d] Índice de datos de contenido de activos creado",
     "218": "Se han detectado demasiadas instantáneas del repositorio de datos, lo que ralentiza el inicio del programa y la sincronización de datos. Considere ejecutar [Configuración - Acerca de - Purga del repositorio de datos]",
     "219": "El servicio de almacenamiento en la nube no está disponible, inténtalo de nuevo más tarde",
-    "220": "Debido a un defecto en la versión anterior, los datos de la nube están dañados. Consulte los pasos de la User Guide-FAQ-Lost Key para restablecer el repositorio de datos local y el directorio de la nube"
+    "220": "Debido a un defecto en la versión anterior, los datos de la nube están dañados. Consulte los pasos de la User Guide-FAQ-Lost Key para restablecer el repositorio de datos local y el directorio de la nube",
+    "221": "La operación de reemplazo no es compatible después de agrupar por documento. Utilice desagrupar y luego reemplazar",
+    "222": "La sincronización de datos está en curso. Espere hasta que se complete la sincronización de datos e inténtelo de nuevo",
+    "223": "Limpiando el almacenamiento en la nube..."
   }
 }
diff --git a/app/appearance/langs/fr_FR.json b/app/appearance/langs/fr_FR.json
@@ -1,4 +1,6 @@
 {
+  "dragFill": "Arrastra verticalmente para rellenar el valor",
+  "switchReadonly": "Changer de mode lecture seule",
   "original": "Originale",
   "selectRelation": "Veuillez d'abord sélectionner la colonne associée",
   "backRelation": "Bidirectionnel",
@@ -848,7 +850,8 @@
   "refreshUser": "Les informations sur l'utilisateur ont été actualisées",
   "insertBottom": "Ouvrir en bas de l'onglet",
   "insertRight": "Ouvrir en droit de l'onglet",
-  "account1": "Cliquez pour vous abonner",
+  "account1": "Devenez membre payant",
+  "account4": "Mise à niveau vers un Membre abonné",
   "account2": "Synchronisation et sauvegarde des données cryptées de bout en bout",
   "account3": "Abonnement d'essai",
   "account5": "Hébergement d'actifs cloud",
@@ -1385,6 +1388,9 @@
     "217": "[%d/%d] Création d'un index de données de contenu d'actif",
     "218": "Trop d'instantanés du référentiel de données ont été détectés, ce qui ralentit le démarrage du programme et la synchronisation des données. Veuillez envisager d'exécuter [Paramètres - À propos - Purge du référentiel de données]",
     "219": "Le service de stockage cloud n'est pas disponible, veuillez réessayer plus tard",
-    "220": "En raison d'un défaut dans la version précédente, les données cloud sont corrompues. Veuillez vous référer aux étapes User Guide-FAQ-Lost Key pour réinitialiser le référentiel de données local et le répertoire cloud"
+    "220": "En raison d'un défaut dans la version précédente, les données cloud sont corrompues. Veuillez vous référer aux étapes User Guide-FAQ-Lost Key pour réinitialiser le référentiel de données local et le répertoire cloud",
+    "221": "L'opération de remplacement n'est pas prise en charge après le regroupement par document. Veuillez utiliser le dissociation puis remplacer",
+    "222": "La synchronisation des données est en cours, veuillez attendre que la synchronisation des données soit terminée et réessayer",
+    "223": "Nettoyage du stockage cloud..."
   }
 }
diff --git a/app/appearance/langs/zh_CHT.json b/app/appearance/langs/zh_CHT.json
@@ -1,4 +1,6 @@
 {
+  "dragFill": "下拉填滿資料",
+  "switchReadonly": "唯讀模式切換",
   "original": "原值",
   "selectRelation": "請先選擇關聯列",
   "backRelation": "雙向關聯",
@@ -848,7 +850,8 @@
   "refreshUser": "使用者資訊更新完畢",
   "insertBottom": "在分頁下側打開",
   "insertRight": "在分頁右側打開",
-  "account1": "點擊前往訂閱",
+  "account1": "成為付費會員",
+  "account4": "陞級為訂閱會員",
   "account2": "端到端加密資料同步和備份",
   "account3": "試用訂閱",
   "account5": "雲端圖床服務",
@@ -1385,6 +1388,9 @@
     "217": "[%d/%d] 已經創建資源文件內容數據索引",
     "218": "偵測到資料倉儲快照過多，降低了程式啟動和資料同步速度，請考慮執行 [設定 - 關於 - 資料倉儲清理]",
     "219": "雲端儲存服務不可用，請稍後再試",
-    "220": "由於先前版本的缺陷導致了雲端資料損壞，請參考 用戶指南-常見問題-遺失密鑰 步驟來重置本地資料倉儲和雲端目錄"
+    "220": "由於先前版本的缺陷導致了雲端資料損壞，請參考 用戶指南-常見問題-遺失密鑰 步驟來重置本地資料倉儲和雲端目錄",
+    "221": "按文檔分組後不支援替換操作，請使用取消分組後再進行替換",
+    "222": "資料同步中，請等待資料同步完成後再試",
+    "223": "正在清理雲端儲存..."
   }
 }
diff --git a/app/appearance/langs/zh_CN.json b/app/appearance/langs/zh_CN.json
@@ -1,4 +1,6 @@
 {
+  "dragFill": "下拉填充数据",
+  "switchReadonly": "只读模式切换",
   "original": "原值",
   "selectRelation": "请先选择关联列",
   "backRelation": "双向关联",
@@ -848,7 +850,8 @@
   "refreshUser": "用户信息刷新完毕",
   "insertBottom": "在页签下侧打开",
   "insertRight": "在页签右侧打开",
-  "account1": "点击前往订阅",
+  "account1": "成为付费会员",
+  "account4": "升级为订阅会员",
   "account2": "端到端加密数据同步和备份",
   "account3": "试用订阅",
   "account5": "云端图床服务",
@@ -1385,6 +1388,9 @@
     "217": "[%d/%d] 已经创建资源文件内容数据索引",
     "218": "检测到数据仓库快照过多，降低了程序启动和数据同步速度，请考虑执行 [设置 - 关于 - 数据仓库清理]",
     "219": "云端存储服务不可用，请稍后再试",
-    "220": "由于之前版本的缺陷导致了云端数据损坏，请参考 用户指南-常见问题-遗失密钥 步骤来重置本地数据仓库和云端目录"
+    "220": "由于之前版本的缺陷导致了云端数据损坏，请参考 用户指南-常见问题-遗失密钥 步骤来重置本地数据仓库和云端目录",
+    "221": "按文档分组后不支持替换操作，请使用取消分组后再进行替换",
+    "222": "数据同步中，请等待数据同步完成后再试",
+    "223": "正在清理云端存储..."
   }
 }
diff --git a/app/appx/AppxManifest.xml b/app/appx/AppxManifest.xml
@@ -9,7 +9,7 @@
     <Identity Name="89C2A984.SiYuan"
               ProcessorArchitecture="x64"
               Publisher="CN=087C656E-C1D9-42D8-8807-CED45A74FC0F"
-              Version="2.12.2.0"/>
+              Version="2.12.4.0"/>
     <Properties>
         <DisplayName>SiYuan</DisplayName>
         <PublisherDisplayName>云南链滴科技有限公司</PublisherDisplayName>

diff --git a/app/changelogs/v2.12.2/v2.12.2_zh_CHT.md b/app/changelogs/v2.12.2/v2.12.2_zh_CHT.md
@@ -11,7 +11,6 @@
 * [改進忘記授權碼提示文案](https://github.com/siyuan-note/siyuan/issues/10127)
 * [同一輪複習中出現過期閃卡](https://github.com/siyuan-note/siyuan/issues/10130)
 
-
 ### 修復缺陷
 
 * [無法進入主介面](https://github.com/siyuan-note/siyuan/issues/10126)

diff --git a/app/changelogs/v2.12.2/v2.12.2_zh_CN.md b/app/changelogs/v2.12.2/v2.12.2_zh_CN.md
@@ -11,7 +11,6 @@
 * [改进忘记授权码提示文案](https://github.com/siyuan-note/siyuan/issues/10127)
 * [同一轮复习中出现过期闪卡](https://github.com/siyuan-note/siyuan/issues/10130)
 
-
 ### 修复缺陷
 
 * [无法进入主界面](https://github.com/siyuan-note/siyuan/issues/10126)