🎨 Support database filter composition #10550

88250 · 88250 · commit cb0c72665d30 · 2026-06-18T22:40:07.000+08:00
Signed-off-by: Daniel &lt;845765@qq.com&gt;
diff --git a/app/appearance/langs/ar.json b/app/appearance/langs/ar.json
@@ -1,4 +1,6 @@
 {
+  "convertGroupToFilter": "تحويل إلى شرط",
+  "filterWhen": "عند",
   "addFilterCondition": "إضافة شرط تصفية",
   "convertToFilterGroup": "تحويل إلى مجموعة شروط",
   "filterCombinationAnd": "و",
diff --git a/app/appearance/langs/de.json b/app/appearance/langs/de.json
@@ -1,4 +1,6 @@
 {
+  "convertGroupToFilter": "In Bedingung umwandeln",
+  "filterWhen": "Wenn",
   "addFilterCondition": "Filterbedingung hinzufügen",
   "convertToFilterGroup": "In Bedingungsgruppe umwandeln",
   "filterCombinationAnd": "Und",
diff --git a/app/appearance/langs/en.json b/app/appearance/langs/en.json
@@ -1,4 +1,6 @@
 {
+  "convertGroupToFilter": "Convert to condition",
+  "filterWhen": "When",
   "addFilterCondition": "Add filter condition",
   "convertToFilterGroup": "Convert to filter group",
   "filterCombinationAnd": "And",
diff --git a/app/appearance/langs/es.json b/app/appearance/langs/es.json
@@ -1,4 +1,6 @@
 {
+  "convertGroupToFilter": "Convertir en condición",
+  "filterWhen": "Cuando",
   "addFilterCondition": "Añadir condición de filtro",
   "convertToFilterGroup": "Convertir en grupo de condiciones",
   "filterCombinationAnd": "Y",
diff --git a/app/appearance/langs/fr.json b/app/appearance/langs/fr.json
@@ -1,4 +1,6 @@
 {
+  "convertGroupToFilter": "Convertir en condition",
+  "filterWhen": "Quand",
   "addFilterCondition": "Ajouter une condition de filtre",
   "convertToFilterGroup": "Convertir en groupe de conditions",
   "filterCombinationAnd": "Et",
diff --git a/app/appearance/langs/he.json b/app/appearance/langs/he.json
@@ -1,4 +1,6 @@
 {
+  "convertGroupToFilter": "המר לתנאי",
+  "filterWhen": "כאשר",
   "addFilterCondition": "הוסף תנאי סינון",
   "convertToFilterGroup": "המר לקבוצת תנאים",
   "filterCombinationAnd": "וגם",
diff --git a/app/appearance/langs/hi.json b/app/appearance/langs/hi.json
@@ -1,4 +1,6 @@
 {
+  "convertGroupToFilter": "शर्त में बदलें",
+  "filterWhen": "जब",
   "addFilterCondition": "फ़िल्टर शर्त जोड़ें",
   "convertToFilterGroup": "शर्त समूह में बदलें",
   "filterCombinationAnd": "और",
diff --git a/app/appearance/langs/id.json b/app/appearance/langs/id.json
@@ -1,4 +1,6 @@
 {
+  "convertGroupToFilter": "Konversi ke kondisi",
+  "filterWhen": "Saat",
   "addFilterCondition": "Tambah kondisi filter",
   "convertToFilterGroup": "Konversi ke grup kondisi",
   "filterCombinationAnd": "Dan",
diff --git a/app/appearance/langs/it.json b/app/appearance/langs/it.json
@@ -1,4 +1,6 @@
 {
+  "convertGroupToFilter": "Converti in condizione",
+  "filterWhen": "Quando",
   "addFilterCondition": "Aggiungi condizione filtro",
   "convertToFilterGroup": "Converti in gruppo di condizioni",
   "filterCombinationAnd": "E",
diff --git a/app/appearance/langs/ja.json b/app/appearance/langs/ja.json
@@ -1,4 +1,6 @@
 {
+  "convertGroupToFilter": "条件に変換",
+  "filterWhen": "条件",
   "addFilterCondition": "フィルター条件を追加",
   "convertToFilterGroup": "条件グループに変換",
   "filterCombinationAnd": "かつ",
diff --git a/app/appearance/langs/ko.json b/app/appearance/langs/ko.json
@@ -1,4 +1,6 @@
 {
+  "convertGroupToFilter": "조건으로 변환",
+  "filterWhen": "조건",
   "addFilterCondition": "필터 조건 추가",
   "convertToFilterGroup": "조건 그룹으로 변환",
   "filterCombinationAnd": "그리고",
diff --git a/app/appearance/langs/nl.json b/app/appearance/langs/nl.json
@@ -1,4 +1,6 @@
 {
+  "convertGroupToFilter": "Converteren naar voorwaarde",
+  "filterWhen": "Wanneer",
   "addFilterCondition": "Filtervoorwaarde toevoegen",
   "convertToFilterGroup": "Converteren naar voorwaardegroep",
   "filterCombinationAnd": "En",
diff --git a/app/appearance/langs/pl.json b/app/appearance/langs/pl.json
@@ -1,4 +1,6 @@
 {
+  "convertGroupToFilter": "Konwertuj na warunek",
+  "filterWhen": "Gdy",
   "addFilterCondition": "Dodaj warunek filtru",
   "convertToFilterGroup": "Konwertuj na grupę warunków",
   "filterCombinationAnd": "I",
diff --git a/app/appearance/langs/pt-BR.json b/app/appearance/langs/pt-BR.json
@@ -1,4 +1,6 @@
 {
+  "convertGroupToFilter": "Converter para condição",
+  "filterWhen": "Quando",
   "addFilterCondition": "Adicionar condição de filtro",
   "convertToFilterGroup": "Converter para grupo de condições",
   "filterCombinationAnd": "E",
diff --git a/app/appearance/langs/ru.json b/app/appearance/langs/ru.json
@@ -1,4 +1,6 @@
 {
+  "convertGroupToFilter": "Преобразовать в условие",
+  "filterWhen": "Когда",
   "addFilterCondition": "Добавить условие фильтра",
   "convertToFilterGroup": "Преобразовать в группу условий",
   "filterCombinationAnd": "И",
diff --git a/app/appearance/langs/sk.json b/app/appearance/langs/sk.json
@@ -1,4 +1,6 @@
 {
+  "convertGroupToFilter": "Previesť na podmienku",
+  "filterWhen": "Keď",
   "addFilterCondition": "Pridať podmienku filtra",
   "convertToFilterGroup": "Previesť na skupinu podmienok",
   "filterCombinationAnd": "A",
diff --git a/app/appearance/langs/th.json b/app/appearance/langs/th.json
@@ -1,4 +1,6 @@
 {
+  "convertGroupToFilter": "แปลงเป็นเงื่อนไข",
+  "filterWhen": "เมื่อ",
   "addFilterCondition": "เพิ่มเงื่อนไขตัวกรอง",
   "convertToFilterGroup": "แปลงเป็นกลุ่มเงื่อนไข",
   "filterCombinationAnd": "และ",
diff --git a/app/appearance/langs/tr.json b/app/appearance/langs/tr.json
@@ -1,4 +1,6 @@
 {
+  "convertGroupToFilter": "Koşula dönüştür",
+  "filterWhen": "İken",
   "addFilterCondition": "Filtre koşulu ekle",
   "convertToFilterGroup": "Koşul grubuna dönüştür",
   "filterCombinationAnd": "Ve",
diff --git a/app/appearance/langs/uk.json b/app/appearance/langs/uk.json
@@ -1,4 +1,6 @@
 {
+  "convertGroupToFilter": "Перетворити на умову",
+  "filterWhen": "Коли",
   "addFilterCondition": "Додати умову фільтра",
   "convertToFilterGroup": "Перетворити на групу умов",
   "filterCombinationAnd": "І",
diff --git a/app/appearance/langs/zh-CN.json b/app/appearance/langs/zh-CN.json
@@ -1,4 +1,6 @@
 {
+  "convertGroupToFilter": "转换为条件",
+  "filterWhen": "当",
   "addFilterCondition": "添加筛选条件",
   "convertToFilterGroup": "转换为条件组",
   "filterCombinationAnd": "且",
diff --git a/app/appearance/langs/zh-TW.json b/app/appearance/langs/zh-TW.json
@@ -1,4 +1,6 @@
 {
+  "convertGroupToFilter": "轉換為條件",
+  "filterWhen": "當",
   "addFilterCondition": "添加篩選條件",
   "convertToFilterGroup": "轉換為條件組",
   "filterCombinationAnd": "且",
diff --git a/app/src/assets/scss/business/_av.scss b/app/src/assets/scss/business/_av.scss
@@ -919,6 +919,7 @@
 
       .av__filter-group-item {
         padding: 0 8px;
+        margin: 4px 0;
 
         &:hover > .b3-menu__action {
           opacity: 1;
@@ -966,6 +967,16 @@
         margin: 2px 0;
       }
 
+      .av__filter-row .b3-select,
+      .av__filter-row .b3-text-field--text {
+        border: 1px solid var(--b3-theme-surface-lighter);
+        border-radius: var(--b3-border-radius);
+      }
+
+      .av__field-wrapper .b3-select {
+        border: 0;
+      }
+
       .b3-menu__item.av__filter-row:hover {
         background-color: transparent;
       }
diff --git a/app/src/protyle/render/av/filter.ts b/app/src/protyle/render/av/filter.ts
diff --git a/app/src/protyle/render/av/openMenuPanel.ts b/app/src/protyle/render/av/openMenuPanel.ts
diff --git a/kernel/av/filter.go b/kernel/av/filter.go

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,6 @@`
`1`	`1`	`{`
	`2`	`+ "convertGroupToFilter": "تحويل إلى شرط",`
	`3`	`+ "filterWhen": "عند",`
`2`	`4`	`"addFilterCondition": "إضافة شرط تصفية",`
`3`	`5`	`"convertToFilterGroup": "تحويل إلى مجموعة شروط",`
`4`	`6`	`"filterCombinationAnd": "و",`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,6 @@`
`1`	`1`	`{`
	`2`	`+ "convertGroupToFilter": "In Bedingung umwandeln",`
	`3`	`+ "filterWhen": "Wenn",`
`2`	`4`	`"addFilterCondition": "Filterbedingung hinzufügen",`
`3`	`5`	`"convertToFilterGroup": "In Bedingungsgruppe umwandeln",`
`4`	`6`	`"filterCombinationAnd": "Und",`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,6 @@`
`1`	`1`	`{`
	`2`	`+ "convertGroupToFilter": "Convert to condition",`
	`3`	`+ "filterWhen": "When",`
`2`	`4`	`"addFilterCondition": "Add filter condition",`
`3`	`5`	`"convertToFilterGroup": "Convert to filter group",`
`4`	`6`	`"filterCombinationAnd": "And",`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,6 @@`
`1`	`1`	`{`
	`2`	`+ "convertGroupToFilter": "Convertir en condición",`
	`3`	`+ "filterWhen": "Cuando",`
`2`	`4`	`"addFilterCondition": "Añadir condición de filtro",`
`3`	`5`	`"convertToFilterGroup": "Convertir en grupo de condiciones",`
`4`	`6`	`"filterCombinationAnd": "Y",`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,6 @@`
`1`	`1`	`{`
	`2`	`+ "convertGroupToFilter": "Convertir en condition",`
	`3`	`+ "filterWhen": "Quand",`
`2`	`4`	`"addFilterCondition": "Ajouter une condition de filtre",`
`3`	`5`	`"convertToFilterGroup": "Convertir en groupe de conditions",`
`4`	`6`	`"filterCombinationAnd": "Et",`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,6 @@`
`1`	`1`	`{`
	`2`	`+ "convertGroupToFilter": "המר לתנאי",`
	`3`	`+ "filterWhen": "כאשר",`
`2`	`4`	`"addFilterCondition": "הוסף תנאי סינון",`
`3`	`5`	`"convertToFilterGroup": "המר לקבוצת תנאים",`
`4`	`6`	`"filterCombinationAnd": "וגם",`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,6 @@`
`1`	`1`	`{`
	`2`	`+ "convertGroupToFilter": "शर्त में बदलें",`
	`3`	`+ "filterWhen": "जब",`
`2`	`4`	`"addFilterCondition": "फ़िल्टर शर्त जोड़ें",`
`3`	`5`	`"convertToFilterGroup": "शर्त समूह में बदलें",`
`4`	`6`	`"filterCombinationAnd": "और",`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,6 @@`
`1`	`1`	`{`
	`2`	`+ "convertGroupToFilter": "Konversi ke kondisi",`
	`3`	`+ "filterWhen": "Saat",`
`2`	`4`	`"addFilterCondition": "Tambah kondisi filter",`
`3`	`5`	`"convertToFilterGroup": "Konversi ke grup kondisi",`
`4`	`6`	`"filterCombinationAnd": "Dan",`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,6 @@`
`1`	`1`	`{`
	`2`	`+ "convertGroupToFilter": "Converti in condizione",`
	`3`	`+ "filterWhen": "Quando",`
`2`	`4`	`"addFilterCondition": "Aggiungi condizione filtro",`
`3`	`5`	`"convertToFilterGroup": "Converti in gruppo di condizioni",`
`4`	`6`	`"filterCombinationAnd": "E",`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,6 @@`
`1`	`1`	`{`
	`2`	`+ "convertGroupToFilter": "条件に変換",`
	`3`	`+ "filterWhen": "条件",`
`2`	`4`	`"addFilterCondition": "フィルター条件を追加",`
`3`	`5`	`"convertToFilterGroup": "条件グループに変換",`
`4`	`6`	`"filterCombinationAnd": "かつ",`