mirror of
https://github.com/yJason/ClashX-Dashboard.git
synced 2026-03-01 00:35:19 +08:00
feat: search support
This commit is contained in:
@@ -16,6 +16,16 @@ struct ProviderProxiesView: View {
|
||||
@State private var isTesting = false
|
||||
@State private var isUpdating = false
|
||||
|
||||
var proxies: [DBProxy] {
|
||||
if searchString.string.isEmpty {
|
||||
return provider.proxies
|
||||
} else {
|
||||
return provider.proxies.filter {
|
||||
$0.name.lowercased().contains(searchString.string.lowercased())
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
var body: some View {
|
||||
ScrollView {
|
||||
Section {
|
||||
@@ -55,21 +65,13 @@ struct ProviderProxiesView: View {
|
||||
var proxyListView: some View {
|
||||
LazyVGrid(columns: Array(repeating: GridItem(.flexible()),
|
||||
count: columnCount)) {
|
||||
ForEach($provider.proxies, id: \.id) { proxy in
|
||||
ForEach(proxies, id: \.id) { proxy in
|
||||
ProxyItemView(
|
||||
proxy: proxy,
|
||||
selectable: false
|
||||
)
|
||||
.background(.white)
|
||||
.cornerRadius(8)
|
||||
|
||||
.show(isVisible: {
|
||||
if searchString.string.isEmpty {
|
||||
return true
|
||||
} else {
|
||||
return proxy.wrappedValue.name.lowercased().contains(searchString.string.lowercased())
|
||||
}
|
||||
}())
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -9,9 +9,20 @@ import SwiftUI
|
||||
struct ProxyProvidersRowView: View {
|
||||
|
||||
@ObservedObject var providerStorage: DBProviderStorage
|
||||
@EnvironmentObject var searchString: ProxiesSearchString
|
||||
|
||||
@State private var isUpdating = false
|
||||
|
||||
var providers: [DBProxyProvider] {
|
||||
if searchString.string.isEmpty {
|
||||
return providerStorage.proxyProviders
|
||||
} else {
|
||||
return providerStorage.proxyProviders.filter {
|
||||
$0.name.lowercased().contains(searchString.string.lowercased())
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
var body: some View {
|
||||
NavigationLink {
|
||||
contentView
|
||||
@@ -53,7 +64,7 @@ struct ProxyProvidersRowView: View {
|
||||
}
|
||||
|
||||
var listView: some View {
|
||||
ForEach(providerStorage.proxyProviders, id: \.id) {
|
||||
ForEach(providers, id: \.id) {
|
||||
ProxyProviderInfoView(provider: $0)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -9,9 +9,20 @@ import SwiftUI
|
||||
struct RuleProvidersRowView: View {
|
||||
|
||||
@ObservedObject var providerStorage: DBProviderStorage
|
||||
@EnvironmentObject var searchString: ProxiesSearchString
|
||||
|
||||
@State private var isUpdating = false
|
||||
|
||||
var providers: [DBRuleProvider] {
|
||||
if searchString.string.isEmpty {
|
||||
return providerStorage.ruleProviders
|
||||
} else {
|
||||
return providerStorage.ruleProviders.filter {
|
||||
$0.name.lowercased().contains(searchString.string.lowercased())
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
var body: some View {
|
||||
NavigationLink {
|
||||
contentView
|
||||
@@ -26,7 +37,7 @@ struct RuleProvidersRowView: View {
|
||||
ScrollView {
|
||||
Section {
|
||||
VStack(spacing: 12) {
|
||||
ForEach(providerStorage.ruleProviders, id: \.id) {
|
||||
ForEach(providers, id: \.id) {
|
||||
RuleProviderView(provider: $0)
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user