From f220e3627fcc6b88a8566375a53698f8ee09220a Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Fri, 5 Sep 2025 23:15:20 +0800 Subject: [PATCH] :memo: Database rollup field filtering rules support "Any", "All", and "None" https://github.com/siyuan-note/siyuan/issues/15609 --- app/appearance/langs/ar_SA.json | 3 +++ app/appearance/langs/de_DE.json | 3 +++ app/appearance/langs/en_US.json | 3 +++ app/appearance/langs/es_ES.json | 3 +++ app/appearance/langs/fr_FR.json | 3 +++ app/appearance/langs/he_IL.json | 3 +++ app/appearance/langs/it_IT.json | 3 +++ app/appearance/langs/ja_JP.json | 3 +++ app/appearance/langs/pl_PL.json | 3 +++ app/appearance/langs/pt_BR.json | 3 +++ app/appearance/langs/ru_RU.json | 3 +++ app/appearance/langs/zh_CHT.json | 3 +++ app/appearance/langs/zh_CN.json | 3 +++ kernel/av/filter.go | 2 +- 14 files changed, 40 insertions(+), 1 deletion(-) diff --git a/app/appearance/langs/ar_SA.json b/app/appearance/langs/ar_SA.json index a96c64890..53f59c6c6 100644 --- a/app/appearance/langs/ar_SA.json +++ b/app/appearance/langs/ar_SA.json @@ -340,6 +340,9 @@ "filterOperatorIsAfter": "بعد", "filterOperatorIsOnOrBefore": "في أو قبل", "filterOperatorIsOnOrAfter": "في أو بعد", + "filterQuantifierAny": "أي", + "filterQuantifierAll": "الكل", + "filterQuantifierNone": "لا شيء", "asc": "تصاعدي", "desc": "تنازلي", "hideCol": "إخفاء الحقل", diff --git a/app/appearance/langs/de_DE.json b/app/appearance/langs/de_DE.json index 1ee83af85..f2788d899 100644 --- a/app/appearance/langs/de_DE.json +++ b/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", diff --git a/app/appearance/langs/en_US.json b/app/appearance/langs/en_US.json index 32808b73c..67bd87bcd 100644 --- a/app/appearance/langs/en_US.json +++ b/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", diff --git a/app/appearance/langs/es_ES.json b/app/appearance/langs/es_ES.json index 4e2afae35..83c3f5d6b 100644 --- a/app/appearance/langs/es_ES.json +++ b/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", diff --git a/app/appearance/langs/fr_FR.json b/app/appearance/langs/fr_FR.json index 8f281134f..e76b3a3d8 100644 --- a/app/appearance/langs/fr_FR.json +++ b/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", diff --git a/app/appearance/langs/he_IL.json b/app/appearance/langs/he_IL.json index 3c776a18f..337b4ed58 100644 --- a/app/appearance/langs/he_IL.json +++ b/app/appearance/langs/he_IL.json @@ -340,6 +340,9 @@ "filterOperatorIsAfter": "היה אחרי", "filterOperatorIsOnOrBefore": "היה על או לפני", "filterOperatorIsOnOrAfter": "היה על או אחרי", + "filterQuantifierAny": "כל אחד", + "filterQuantifierAll": "הכל", + "filterQuantifierNone": "אין", "asc": "עולה", "desc": "יורד", "hideCol": "החבא עמודה", diff --git a/app/appearance/langs/it_IT.json b/app/appearance/langs/it_IT.json index b52c9158a..d8e641b53 100644 --- a/app/appearance/langs/it_IT.json +++ b/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", diff --git a/app/appearance/langs/ja_JP.json b/app/appearance/langs/ja_JP.json index f65363058..805e53a33 100644 --- a/app/appearance/langs/ja_JP.json +++ b/app/appearance/langs/ja_JP.json @@ -340,6 +340,9 @@ "filterOperatorIsAfter": "より後", "filterOperatorIsOnOrBefore": "以前", "filterOperatorIsOnOrAfter": "以降", + "filterQuantifierAny": "いずれか", + "filterQuantifierAll": "すべて", + "filterQuantifierNone": "なし", "asc": "昇順", "desc": "降順", "hideCol": "列を非表示", diff --git a/app/appearance/langs/pl_PL.json b/app/appearance/langs/pl_PL.json index ecaba9146..7eb39ded5 100644 --- a/app/appearance/langs/pl_PL.json +++ b/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ę", diff --git a/app/appearance/langs/pt_BR.json b/app/appearance/langs/pt_BR.json index 93c4d4fae..12d6f0365 100644 --- a/app/appearance/langs/pt_BR.json +++ b/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", diff --git a/app/appearance/langs/ru_RU.json b/app/appearance/langs/ru_RU.json index a4d17da7b..3297d5b77 100644 --- a/app/appearance/langs/ru_RU.json +++ b/app/appearance/langs/ru_RU.json @@ -340,6 +340,9 @@ "filterOperatorIsAfter": "Находится после", "filterOperatorIsOnOrBefore": "Находится на или до", "filterOperatorIsOnOrAfter": "Находится на или после", + "filterQuantifierAny": "Любой", + "filterQuantifierAll": "Все", + "filterQuantifierNone": "Нет", "asc": "По возрастанию", "desc": "По убыванию", "hideCol": "Скрыть колонку", diff --git a/app/appearance/langs/zh_CHT.json b/app/appearance/langs/zh_CHT.json index 2916db9c3..062af4f8a 100644 --- a/app/appearance/langs/zh_CHT.json +++ b/app/appearance/langs/zh_CHT.json @@ -340,6 +340,9 @@ "filterOperatorIsAfter": "晚於", "filterOperatorIsOnOrBefore": "早於或等於", "filterOperatorIsOnOrAfter": "晚於或等於", + "filterQuantifierAny": "任一", + "filterQuantifierAll": "所有", + "filterQuantifierNone": "沒有", "asc": "升序", "desc": "降序", "hideCol": "隱藏欄位", diff --git a/app/appearance/langs/zh_CN.json b/app/appearance/langs/zh_CN.json index 9d5d66640..7cc5fae9a 100644 --- a/app/appearance/langs/zh_CN.json +++ b/app/appearance/langs/zh_CN.json @@ -340,6 +340,9 @@ "filterOperatorIsAfter": "晚于", "filterOperatorIsOnOrBefore": "早于或等于", "filterOperatorIsOnOrAfter": "晚于或等于", + "filterQuantifierAny": "任一", + "filterQuantifierAll": "所有", + "filterQuantifierNone": "没有", "asc": "升序", "desc": "降序", "hideCol": "隐藏字段", diff --git a/kernel/av/filter.go b/kernel/av/filter.go index ac462deb5..0ddc1f815 100644 --- a/kernel/av/filter.go +++ b/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"