okooooooo/OpenStats
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

IP 地址区块：弹窗只显示公网地址，没有 IPv6 时不占行

Browse Source 
- 菜单栏弹窗里不再显示本地 IPv4、本地 IPv6 与路由器，这三行只在主窗口的网络页显示
- 网卡没有 IPv6 地址时不显示“本地 IPv6”，拿不到公网 IPv6 时不显示“公网 IPv6”，不再用“—”占一行
This commit is contained in:
gentpan committed 2026-09-16 21:01:14 +05:00
1 parent 46d5b33030
commit 5cca1169bd
5 files changed
+21 -9
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Packages/OpenStatsKit/Sources/OpenStatsUI/Popover/NetworkPopover.swift
+13 -4
View File
@@ -178,6 +178,7 @@ private struct InterfaceSection: View {
private struct AddressSection: View {
@Environment(AppModel.self) private var model
@Environment(\.isPopover) private var isPopover
var body: some View {
let network = model.network
@@ -187,12 +188,20 @@ private struct AddressSection: View {
Card(padding: DS.Space.s3, spacing: DS.Space.s2) {
header
InfoRow(label: tr("本地 IPv4")) { CopyableText(text: physical?.ipv4.first ?? "—") }
InfoRow(label: tr("本地 IPv6")) { CopyableText(text: physical?.ipv6.first ?? "—") }
InfoRow(label: tr("路由器")) { CopyableText(text: physical?.router ?? "—") }
// 本地地址与路由器只在主窗口的网络页显示，菜单栏弹窗里只看公网
if !isPopover {
InfoRow(label: tr("本地 IPv4")) { CopyableText(text: physical?.ipv4.first ?? "—") }
// 没有 IPv6 就不占行：网卡没有 IPv6 地址时不显示本地 IPv6，拿不到公网 IPv6 时不显示公网 IPv6
if let localIPv6 = physical?.ipv6.first {
InfoRow(label: tr("本地 IPv6")) { CopyableText(text: localIPv6) }
}
InfoRow(label: tr("路由器")) { CopyableText(text: physical?.router ?? "—") }
}
if lookup {
InfoRow(label: tr("公网 IPv4")) { publicValue(publicAddresses?.ipv4, loading: network.isLookingUpPublic) }
InfoRow(label: tr("公网 IPv6")) { publicValue(publicAddresses?.ipv6, loading: network.isLookingUpPublic) }
if let publicIPv6 = publicAddresses?.ipv6 {
InfoRow(label: tr("公网 IPv6")) { CopyableText(text: publicIPv6) }
}
if let publicAddresses, let code = publicAddresses.countryCode {
InfoRow(label: tr("归属地")) {
HStack(spacing: DS.Space.s2) {