From fc7d846893f31ee0dc449e13aeba1773896f7f25 Mon Sep 17 00:00:00 2001
From: Daniel <845765@qq.com>
Date: Thu, 26 Jun 2025 16:58:43 +0800
Subject: [PATCH 1/3] :art: https://github.com/siyuan-note/siyuan/issues/15145

---
 app/appearance/langs/ar_SA.json     |  2 +-
 app/appearance/langs/de_DE.json     |  2 +-
 app/appearance/langs/en_US.json     |  2 +-
 app/appearance/langs/es_ES.json     |  2 +-
 app/appearance/langs/fr_FR.json     |  2 +-
 app/appearance/langs/he_IL.json     |  2 +-
 app/appearance/langs/it_IT.json     |  2 +-
 app/appearance/langs/ja_JP.json     |  2 +-
 app/appearance/langs/pl_PL.json     |  2 +-
 app/appearance/langs/pt_BR.json     |  2 +-
 app/appearance/langs/ru_RU.json     |  2 +-
 app/appearance/langs/zh_CHT.json    |  2 +-
 app/appearance/langs/zh_CN.json     |  2 +-
 app/src/protyle/render/av/layout.ts | 12 ++++++------
 14 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/app/appearance/langs/ar_SA.json b/app/appearance/langs/ar_SA.json
index 4307a383e..a6139b626 100644
--- a/app/appearance/langs/ar_SA.json
+++ b/app/appearance/langs/ar_SA.json
@@ -1,7 +1,7 @@
 {
   "hideEmptyFields": "إخفاء الحقول الفارغة",
   "displayEmptyFields": "عرض الحقول الفارغة",
-  "cardAspectRatio": "نسبة العرض إلى الارتفاع للبطاقة",
+  "cardAspectRatio": "نسبة العرض إلى الارتفاع لمنطقة المعاينة",
   "cardPreview1": "معاينة البطاقة",
   "contentImage": "صورة المحتوى",
   "cardSize": "حجم البطاقة",
diff --git a/app/appearance/langs/de_DE.json b/app/appearance/langs/de_DE.json
index f5722e4f2..f87e51713 100644
--- a/app/appearance/langs/de_DE.json
+++ b/app/appearance/langs/de_DE.json
@@ -1,7 +1,7 @@
 {
   "hideEmptyFields": "Leere Felder ausblenden",
   "displayEmptyFields": "Leere Felder anzeigen",
-  "cardAspectRatio": "Seitenverhältnis der Karte",
+  "cardAspectRatio": "Seitenverhältnis des Vorschau-Bereichs",
   "cardPreview1": "Kartenansicht",
   "contentImage": "Inhaltsbild",
   "cardSize": "Kartengröße",
diff --git a/app/appearance/langs/en_US.json b/app/appearance/langs/en_US.json
index a097b23f8..2d5fcb397 100644
--- a/app/appearance/langs/en_US.json
+++ b/app/appearance/langs/en_US.json
@@ -1,7 +1,7 @@
 {
   "hideEmptyFields": "Hide empty fields",
   "displayEmptyFields": "Display empty fields",
-  "cardAspectRatio": "Card aspect ratio",
+  "cardAspectRatio": "Preview area aspect ratio",
   "cardPreview1": "Card preview",
   "contentImage": "Content image",
   "cardSize": "Card size",
diff --git a/app/appearance/langs/es_ES.json b/app/appearance/langs/es_ES.json
index 9d2e565f7..6d1c4a166 100644
--- a/app/appearance/langs/es_ES.json
+++ b/app/appearance/langs/es_ES.json
@@ -1,7 +1,7 @@
 {
   "hideEmptyFields": "Ocultar campos vacíos",
   "displayEmptyFields": "Mostrar campos vacíos",
-  "cardAspectRatio": "Proporción de la tarjeta",
+  "cardAspectRatio": "Proporción del área de vista previa",
   "cardPreview1": "Vista previa de la tarjeta",
   "contentImage": "Imagen del contenido",
   "cardSize": "Tamaño de la tarjeta",
diff --git a/app/appearance/langs/fr_FR.json b/app/appearance/langs/fr_FR.json
index a03b9ee60..4d3db6d1c 100644
--- a/app/appearance/langs/fr_FR.json
+++ b/app/appearance/langs/fr_FR.json
@@ -1,7 +1,7 @@
 {
   "hideEmptyFields": "Masquer les champs vides",
   "displayEmptyFields": "Afficher les champs vides",
-  "cardAspectRatio": "Proportions de la carte",
+  "cardAspectRatio": "Proportions de la zone d'aperçu",
   "cardPreview1": "Aperçu de la carte",
   "contentImage": "Image du contenu",
   "cardSize": "Taille de la carte",
diff --git a/app/appearance/langs/he_IL.json b/app/appearance/langs/he_IL.json
index 68f5cddf2..c508a32f0 100644
--- a/app/appearance/langs/he_IL.json
+++ b/app/appearance/langs/he_IL.json
@@ -1,7 +1,7 @@
 {
   "hideEmptyFields": "הסתר שדות ריקים",
   "displayEmptyFields": "הצג שדות ריקים",
-  "cardAspectRatio": "יחס גובה-רוחב של כרטיס",
+  "cardAspectRatio": "יחס גובה-רוחב של אזור התצוגה המקדימה",
   "cardPreview1": "תצוגה מקדימה של כרטיס",
   "contentImage": "תמונת תוכן",
   "cardSize": "גודל כרטיס",
diff --git a/app/appearance/langs/it_IT.json b/app/appearance/langs/it_IT.json
index c6fdc6cfb..256906bbb 100644
--- a/app/appearance/langs/it_IT.json
+++ b/app/appearance/langs/it_IT.json
@@ -1,7 +1,7 @@
 {
   "hideEmptyFields": "Nascondi campi vuoti",
   "displayEmptyFields": "Mostra campi vuoti",
-  "cardAspectRatio": "Proporzioni della carta",
+  "cardAspectRatio": "Proporzioni dell'area di anteprima",
   "cardPreview1": "Anteprima della carta",
   "contentImage": "Immagine del contenuto",
   "cardSize": "Dimensione della carta",
diff --git a/app/appearance/langs/ja_JP.json b/app/appearance/langs/ja_JP.json
index db79920c9..e0cecf465 100644
--- a/app/appearance/langs/ja_JP.json
+++ b/app/appearance/langs/ja_JP.json
@@ -1,7 +1,7 @@
 {
   "hideEmptyFields": "空のフィールドを非表示",
   "displayEmptyFields": "空のフィールドを表示",
-  "cardAspectRatio": "カードのアスペクト比",
+  "cardAspectRatio": "プレビューエリアのアスペクト比",
   "cardPreview1": "カードプレビュー",
   "contentImage": "コンテンツ画像",
   "cardSize": "カードサイズ",
diff --git a/app/appearance/langs/pl_PL.json b/app/appearance/langs/pl_PL.json
index 15a065c83..3b13e4173 100644
--- a/app/appearance/langs/pl_PL.json
+++ b/app/appearance/langs/pl_PL.json
@@ -1,7 +1,7 @@
 {
   "hideEmptyFields": "Ukryj puste pola",
   "displayEmptyFields": "Pokaż puste pola",
-  "cardAspectRatio": "Proporcje karty",
+  "cardAspectRatio": "Proporcje obszaru podglądu",
   "cardPreview1": "Podgląd karty",
   "contentImage": "Obraz treści",
   "cardSize": "Rozmiar karty",
diff --git a/app/appearance/langs/pt_BR.json b/app/appearance/langs/pt_BR.json
index cbc9e32f9..4233af261 100644
--- a/app/appearance/langs/pt_BR.json
+++ b/app/appearance/langs/pt_BR.json
@@ -1,7 +1,7 @@
 {
   "hideEmptyFields": "Ocultar campos vazios",
   "displayEmptyFields": "Exibir campos vazios",
-  "cardAspectRatio": "Proporção da carta",
+  "cardAspectRatio": "Proporção da área de visualização",
   "cardPreview1": "Pré-visualização do cartão",
   "contentImage": "Imagem do conteúdo",
   "cardSize": "Tamanho do cartão",
diff --git a/app/appearance/langs/ru_RU.json b/app/appearance/langs/ru_RU.json
index 43e232ae1..21b738d48 100644
--- a/app/appearance/langs/ru_RU.json
+++ b/app/appearance/langs/ru_RU.json
@@ -1,7 +1,7 @@
 {
   "hideEmptyFields": "Скрыть пустые поля",
   "displayEmptyFields": "Показать пустые поля",
-  "cardAspectRatio": "Соотношение сторон карточки",
+  "cardAspectRatio": "Соотношение сторон области предварительного просмотра",
   "cardPreview1": "Предпросмотр карты",
   "contentImage": "Изображение содержимого",
   "cardSize": "Размер карты",
diff --git a/app/appearance/langs/zh_CHT.json b/app/appearance/langs/zh_CHT.json
index 9ff83c167..f2ae138ec 100644
--- a/app/appearance/langs/zh_CHT.json
+++ b/app/appearance/langs/zh_CHT.json
@@ -1,7 +1,7 @@
 {
   "hideEmptyFields": "隱藏空字段",
   "displayEmptyFields": "顯示空字段",
-  "cardAspectRatio": "卡片寬高比",
+  "cardAspectRatio": "預覽區寬高比",
   "cardPreview1": "卡片預覽",
   "contentImage": "內容圖片",
   "cardSize": "卡片大小",
diff --git a/app/appearance/langs/zh_CN.json b/app/appearance/langs/zh_CN.json
index 448c5f8f0..baf6d6447 100644
--- a/app/appearance/langs/zh_CN.json
+++ b/app/appearance/langs/zh_CN.json
@@ -1,7 +1,7 @@
 {
   "hideEmptyFields": "隐藏空字段",
   "displayEmptyFields": "显示空字段",
-  "cardAspectRatio": "卡片宽高比",
+  "cardAspectRatio": "预览区宽高比",
   "cardPreview1": "卡片预览",
   "contentImage": "内容图",
   "cardSize": "卡片大小",
diff --git a/app/src/protyle/render/av/layout.ts b/app/src/protyle/render/av/layout.ts
index 10371b0ad..5a6df885b 100644
--- a/app/src/protyle/render/av/layout.ts
+++ b/app/src/protyle/render/av/layout.ts
@@ -26,18 +26,18 @@ export const getLayoutHTML = (data: IAV) => {
     <span class="b3-menu__accelerator">${coverFromTitle}</span>
     <svg class="b3-menu__icon b3-menu__icon--small"><use xlink:href="#iconRight"></use></svg>
 </button>
-<button class="b3-menu__item" data-type="set-gallery-size">
-    <span class="fn__flex-center">${window.siyuan.languages.cardSize}</span>
-    <span class="fn__flex-1"></span>
-    <span class="b3-menu__accelerator">${view.cardSize === 0 ? window.siyuan.languages.small : (view.cardSize === 1 ? window.siyuan.languages.medium : window.siyuan.languages.large)}</span>
-    <svg class="b3-menu__icon b3-menu__icon--small"><use xlink:href="#iconRight"></use></svg>
-</button>
 <button class="b3-menu__item" data-type="set-gallery-ratio">
     <span class="fn__flex-center">${window.siyuan.languages.cardAspectRatio}</span>
     <span class="fn__flex-1"></span>
     <span class="b3-menu__accelerator">${getCardAspectRatio(view.cardAspectRatio)}</span>
     <svg class="b3-menu__icon b3-menu__icon--small"><use xlink:href="#iconRight"></use></svg>
 </button>
+<button class="b3-menu__item" data-type="set-gallery-size">
+    <span class="fn__flex-center">${window.siyuan.languages.cardSize}</span>
+    <span class="fn__flex-1"></span>
+    <span class="b3-menu__accelerator">${view.cardSize === 0 ? window.siyuan.languages.small : (view.cardSize === 1 ? window.siyuan.languages.medium : window.siyuan.languages.large)}</span>
+    <svg class="b3-menu__icon b3-menu__icon--small"><use xlink:href="#iconRight"></use></svg>
+</button>
 <label class="b3-menu__item">
     <span class="fn__flex-center">${window.siyuan.languages.fitImage}</span>
     <span class="fn__space fn__flex-1"></span>

From 04f81c4deeceaaf0651b9e6134f4bbd0d778219e Mon Sep 17 00:00:00 2001
From: Daniel <845765@qq.com>
Date: Thu, 26 Jun 2025 18:41:09 +0800
Subject: [PATCH 2/3] :art: Replace \\u0000 with "" when writing tree data

---
 kernel/filesys/tree.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/kernel/filesys/tree.go b/kernel/filesys/tree.go
index 820bd6573..d1b69d144 100644
--- a/kernel/filesys/tree.go
+++ b/kernel/filesys/tree.go
@@ -242,6 +242,7 @@ func prepareWriteTree(tree *parse.Tree) (data []byte, filePath string, err error
 	tree.Root.SetIALAttr("type", "doc")
 	renderer := render.NewJSONRenderer(tree, luteEngine.RenderOptions)
 	data = renderer.Render()
+	data = bytes.ReplaceAll(data, []byte("\\u0000"), []byte(""))
 
 	if !util.UseSingleLineSave {
 		buf := bytes.Buffer{}

From d71db850517f0d686e0e2b8b763b5bc1e8a7a348 Mon Sep 17 00:00:00 2001
From: Daniel <845765@qq.com>
Date: Thu, 26 Jun 2025 20:27:48 +0800
Subject: [PATCH 3/3] :sparkles: Database grouping by field
 https://github.com/siyuan-note/siyuan/issues/10964

---
 kernel/av/group.go | 57 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 57 insertions(+)
 create mode 100644 kernel/av/group.go

diff --git a/kernel/av/group.go b/kernel/av/group.go
new file mode 100644
index 000000000..4e78e5ff2
--- /dev/null
+++ b/kernel/av/group.go
@@ -0,0 +1,57 @@
+// SiYuan - Refactor your thinking
+// Copyright (c) 2020-present, b3log.org
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+package av
+
+// Groupable 定义了可分组的视图类型。
+type Groupable interface {
+
+	// Group 根据视图中设置的分组规则进行分组。
+	Group(attrView *AttributeView)
+}
+
+type ViewGroup struct {
+	Field  string      `json:"field"`           // 分组字段 ID
+	Method GroupMethod `json:"method"`          // 分组方式
+	Range  *GroupRange `json:"range,omitempty"` // 分组范围
+	Order  GroupOrder  `json:"order"`           // 分组顺序
+}
+
+type GroupMethod int
+
+const (
+	GroupMethodValue        GroupMethod = iota // 按值分组
+	GroupMethodRangeNum                        // 按数字范围分组
+	GroupMethodDateRelative                    // 按相对日期日期分组
+	GroupMethodDateDay                         // 按天日期分组
+	GroupMethodDateWeek                        // 按周日期分组
+	GroupMethodDateMonth                       // 按月日期分组
+	GroupMethodDateYear                        // 按年日期分组
+)
+
+// GroupRange 定义了分组范围的结构。
+type GroupRange struct {
+	NumStart float64 `json:"numStart"` // 数字范围起始值
+	NumEnd   float64 `json:"numEnd"`   // 数字范围结束值
+	NumStep  float64 `json:"numStep"`  // 数字范围步长
+}
+
+type GroupOrder string
+
+const (
+	GroupOrderAsc  GroupOrder = "ASC"
+	GroupOrderDesc GroupOrder = "DESC"
+)