From e923f06d572c9a0e3b1eb2c54471af02c9d95bcf Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期四, 18 十二月 2025 10:05:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/kotlin/com/flightfeather/uav/biz/FactorFilter.kt | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/src/main/kotlin/com/flightfeather/uav/biz/FactorFilter.kt b/src/main/kotlin/com/flightfeather/uav/biz/FactorFilter.kt
index 6a34992..b227bc4 100644
--- a/src/main/kotlin/com/flightfeather/uav/biz/FactorFilter.kt
+++ b/src/main/kotlin/com/flightfeather/uav/biz/FactorFilter.kt
@@ -28,6 +28,11 @@
return this
}
+ fun withCombination(com: List<List<FactorType>>):Builder{
+ combination.addAll(com)
+ return this
+ }
+
fun create(): FactorFilter {
return this@FactorFilter
}
@@ -85,6 +90,9 @@
// 鎵�閫夊洜瀛愰泦鍚�
val selectedList = mutableListOf<SelectedFactor>()
+ // 鍥犲瓙鐨勫叧鑱斿叧绯�
+ val combination = mutableListOf<List<FactorType>>()
+
fun mainList(): List<FactorType> {
return selectedList.map { it.main }
}
--
Gitblit v1.9.3