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

app/appearance/langs/ar_SA.json

@@ -340,6 +340,9 @@
   "filterOperatorIsAfter": "بعد",
   "filterOperatorIsOnOrBefore": "في أو قبل",
   "filterOperatorIsOnOrAfter": "في أو بعد",
+  "filterQuantifierAny": "أي",
+  "filterQuantifierAll": "الكل",
+  "filterQuantifierNone": "لا شيء",
   "asc": "تصاعدي",
   "desc": "تنازلي",
   "hideCol": "إخفاء الحقل",

app/appearance/langs/de_DE.json

@@ -340,6 +340,9 @@
   "filterOperatorIsAfter": "Ist nach",
   "filterOperatorIsOnOrBefore": "Ist am oder vor",
   "filterOperatorIsOnOrAfter": "Ist am oder nach",
+  "filterQuantifierAny": "Beliebig",
+  "filterQuantifierAll": "Alle",
+  "filterQuantifierNone": "Keine",
   "asc": "Aufsteigend",
   "desc": "Absteigend",
   "hideCol": "Spalte ausblenden",

app/appearance/langs/en_US.json

@@ -340,6 +340,9 @@
   "filterOperatorIsAfter": "Is after",
   "filterOperatorIsOnOrBefore": "Is on or before",
   "filterOperatorIsOnOrAfter": "Is on or after",
+  "filterQuantifierAny": "Any",
+  "filterQuantifierAll": "All",
+  "filterQuantifierNone": "None",
   "asc": "Ascending",
   "desc": "Descending",
   "hideCol": "Hide field",

app/appearance/langs/es_ES.json

@@ -340,6 +340,9 @@
   "filterOperatorIsAfter": "Es posterior a",
   "filterOperatorIsOnOrBefore": "Está activado o antes",
   "filterOperatorIsOnOrAfter": "Está encendido o después",
+  "filterQuantifierAny": "Cualquiera",
+  "filterQuantifierAll": "Todos",
+  "filterQuantifierNone": "Ninguno",
   "asc": "Ascendente",
   "desc": "Descendente",
   "hideCol": "Ocultar columna",

app/appearance/langs/fr_FR.json

@@ -340,6 +340,9 @@
   "filterOperatorIsAfter": "Est après",
   "filterOperatorIsOnOrBefore": "Est le ou avant",
   "filterOperatorIsOnOrAfter": "Est allumé ou après",
+  "filterQuantifierAny": "N'importe lequel",
+  "filterQuantifierAll": "Tous",
+  "filterQuantifierNone": "Aucun",
   "asc": "Ascendant",
   "desc": "Descendant",
   "hideCol": "Masquer la colonne",

app/appearance/langs/he_IL.json

@@ -340,6 +340,9 @@
   "filterOperatorIsAfter": "היה אחרי",
   "filterOperatorIsOnOrBefore": "היה על או לפני",
   "filterOperatorIsOnOrAfter": "היה על או אחרי",
+  "filterQuantifierAny": "כל אחד",
+  "filterQuantifierAll": "הכל",
+  "filterQuantifierNone": "אין",
   "asc": "עולה",
   "desc": "יורד",
   "hideCol": "החבא עמודה",

app/appearance/langs/it_IT.json

@@ -340,6 +340,9 @@
   "filterOperatorIsAfter": "È dopo",
   "filterOperatorIsOnOrBefore": "È il giorno o prima di",
   "filterOperatorIsOnOrAfter": "È il giorno o dopo di",
+  "filterQuantifierAny": "Qualsiasi",
+  "filterQuantifierAll": "Tutti",
+  "filterQuantifierNone": "Nessuno",
   "asc": "Ascendente",
   "desc": "Discendente",
   "hideCol": "Nascondi campo",

app/appearance/langs/ja_JP.json

@@ -340,6 +340,9 @@
   "filterOperatorIsAfter": "より後",
   "filterOperatorIsOnOrBefore": "以前",
   "filterOperatorIsOnOrAfter": "以降",
+  "filterQuantifierAny": "いずれか",
+  "filterQuantifierAll": "すべて",
+  "filterQuantifierNone": "なし",
   "asc": "昇順",
   "desc": "降順",
   "hideCol": "列を非表示",

app/appearance/langs/pl_PL.json

@@ -340,6 +340,9 @@
   "filterOperatorIsAfter": "Jest po",
   "filterOperatorIsOnOrBefore": "Jest na lub przed",
   "filterOperatorIsOnOrAfter": "Jest na lub po",
+  "filterQuantifierAny": "Dowolny",
+  "filterQuantifierAll": "Wszystkie",
+  "filterQuantifierNone": "Brak",
   "asc": "Rosnąco",
   "desc": "Malejąco",
   "hideCol": "Ukryj kolumnę",

app/appearance/langs/pt_BR.json

@@ -340,6 +340,9 @@
   "filterOperatorIsAfter": "É depois de",
   "filterOperatorIsOnOrBefore": "É em ou antes de",
   "filterOperatorIsOnOrAfter": "É em ou depois de",
+  "filterQuantifierAny": "Qualquer",
+  "filterQuantifierAll": "Todos",
+  "filterQuantifierNone": "Nenhum",
   "asc": "Ascendente",
   "desc": "Descendente",
   "hideCol": "Ocultar campo",

app/appearance/langs/ru_RU.json

@@ -340,6 +340,9 @@
   "filterOperatorIsAfter": "Находится после",
   "filterOperatorIsOnOrBefore": "Находится на или до",
   "filterOperatorIsOnOrAfter": "Находится на или после",
+  "filterQuantifierAny": "Любой",
+  "filterQuantifierAll": "Все",
+  "filterQuantifierNone": "Нет",
   "asc": "По возрастанию",
   "desc": "По убыванию",
   "hideCol": "Скрыть колонку",

app/appearance/langs/zh_CHT.json

@@ -340,6 +340,9 @@
   "filterOperatorIsAfter": "晚於",
   "filterOperatorIsOnOrBefore": "早於或等於",
   "filterOperatorIsOnOrAfter": "晚於或等於",
+  "filterQuantifierAny": "任一",
+  "filterQuantifierAll": "所有",
+  "filterQuantifierNone": "沒有",
   "asc": "升序",
   "desc": "降序",
   "hideCol": "隱藏欄位",

app/appearance/langs/zh_CN.json

@@ -340,6 +340,9 @@
   "filterOperatorIsAfter": "晚于",
   "filterOperatorIsOnOrBefore": "早于或等于",
   "filterOperatorIsOnOrAfter": "晚于或等于",
+  "filterQuantifierAny": "任一",
+  "filterQuantifierAll": "所有",
+  "filterQuantifierNone": "没有",
   "asc": "升序",
   "desc": "降序",
   "hideCol": "隐藏字段",

app/src/protyle/render/av/render.ts

@@ -264,7 +264,7 @@ const renderGroupTable = (options: ITableOptions) => {
     options.data.view.groups.forEach((group: IAVTable) => {
         if (group.groupHidden === 0) {
             avBodyHTML += `${getGroupTitleHTML(group, group.rows.length)}
-<div data-group-id="${group.id}" data-page-size="${group.pageSize}" data-dtype="${group.groupKey.type}" data-content="${group.groupValue.text?.content}" style="float: left" class="av__body${group.groupFolded ? " fn__none" : ""}">${getTableHTMLs(group, options.blockElement)}</div>`;
+<div data-group-id="${group.id}" data-page-size="${group.pageSize}" data-dtype="${group.groupKey.type}" data-content="${Lute.EscapeHTMLStr(group.groupValue.text?.content)}" style="float: left" class="av__body${group.groupFolded ? " fn__none" : ""}">${getTableHTMLs(group, options.blockElement)}</div>`;
         }
     });
     if (options.renderAll) {

kernel/av/filter.go

@@ -80,7 +80,7 @@ const (
 type FilterQuantifier string
 
 const (
-	FilterQuantifierUndefined FilterQuantifier = ""
+	FilterQuantifierUndefined FilterQuantifier = "" // 等同于 Any
 	FilterQuantifierAny       FilterQuantifier = "Any"
 	FilterQuantifierAll       FilterQuantifier = "All"
 	FilterQuantifierNone      FilterQuantifier = "None"

kernel/go.mod

@@ -8,7 +8,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.20250227144607-7f4570b0d689
-	github.com/88250/lute v1.7.7-0.20250903134523-51a49dcdda40
+	github.com/88250/lute v1.7.7-0.20250905144855-8f6b06704488
 	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

kernel/go.sum

@@ -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.20250227144607-7f4570b0d689 h1:39y5g7vnFAIcXhTN3IXPk7h2xBhC4a9hBTykDhHJqRY=
 github.com/88250/gulu v1.2.3-0.20250227144607-7f4570b0d689/go.mod h1:c8uVw25vW2W4dhJ/j4iYsX5H1hc19spim266jO5x2hU=
-github.com/88250/lute v1.7.7-0.20250903134523-51a49dcdda40 h1:PR2s/jxhLei+dk41Ogr+dhWtdqxbrpwiRQU6Odflnsc=
+github.com/88250/lute v1.7.7-0.20250905144855-8f6b06704488 h1:MlRtevVsdfjqvN1pcB1K3DJIe6vFHgd9Si/FR5l3F7w=
-github.com/88250/lute v1.7.7-0.20250903134523-51a49dcdda40/go.mod h1:WYyUw//5yVw9BJnoVjx7rI/3szsISxNZCYGOqTIrV0o=
+github.com/88250/lute v1.7.7-0.20250905144855-8f6b06704488/go.mod h1:WYyUw//5yVw9BJnoVjx7rI/3szsISxNZCYGOqTIrV0o=
 github.com/88250/pdfcpu v0.3.14-0.20250424122812-f10e8d9d8d46 h1:Bq1JsDfVbHKUxNL/B2JXd8cC/1h6aFjrlXpGycnh0Hk=
 github.com/88250/pdfcpu v0.3.14-0.20250424122812-f10e8d9d8d46/go.mod h1:fVfOloBzs2+W2VJCCbq60XIxc3yJHAZ0Gahv1oO0gyI=
 github.com/88250/vitess-sqlparser v0.0.0-20210205111146-56a2ded2aba1 h1:48T899JQDwyyRu9yXHePYlPdHtpJfrJEUGBMH3SMBWY=

kernel/model/attribute_view_render.go

@@ -111,7 +111,8 @@ func renderAttributeViewGroups(viewable av.Viewable, attrView *av.AttributeView,
 	// 如果存在分组的话渲染分组视图
 
 	for _, groupView := range view.Groups {
-		switch groupView.GetGroupValue() {
+		groupView.Name = groupView.GetGroupValue()
+		switch groupView.Name {
 		case groupValueDefault:
 			groupView.Name = fmt.Sprintf(Conf.language(264), groupKey.Name)
 		case groupValueNotInRange:
@@ -130,8 +131,6 @@ func renderAttributeViewGroups(viewable av.Viewable, attrView *av.AttributeView,
 			groupView.Name = fmt.Sprintf(Conf.language(263), 7)
 		case groupValueNext30Days:
 			groupView.Name = fmt.Sprintf(Conf.language(263), 30)
-		default:
-			groupView.Name = groupView.GetGroupValue()
 		}
 	}