Skip to content

Commit 15eebea

Browse files
committed
添加不可用说明页面
1 parent ace67ef commit 15eebea

File tree

3 files changed

+17
-7
lines changed

3 files changed

+17
-7
lines changed

SwiftPamphletApp/HomeUI/HomeView.swift

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,23 @@ struct HomeView: View {
1919
if let link = selectedDataLinkString {
2020
DataLink.viewToShow(for: link, selectInfo: $selectInfo)
2121
} else {
22-
Text("请选择")
22+
ContentUnavailableView {
23+
Label("未选择栏目",
24+
systemImage: "map.circle.fill")
25+
} description: {
26+
Text("请在左侧选择一个栏目")
27+
}
2328
}
2429
} detail: {
2530
if let info = selectInfo {
2631
DetailLink.viewToShow(for: "资料", selectInfo: info)
2732
} else {
28-
Text("请选择")
33+
ContentUnavailableView {
34+
Label("未选",
35+
systemImage: "pencil.tip.crop.circle.badge.plus")
36+
} description: {
37+
Text("请选择或按+号增加一个资料")
38+
}
2939
}
3040
}
3141
.environment(appVM)

SwiftPamphletApp/HomeUI/SidebarView.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ struct SidebarView: View {
2525
}
2626
}
2727
})
28-
.frame(minWidth: 200)
28+
// .frame(minWidth: 200)
2929
}
3030
}
3131

SwiftPamphletApp/InfoOrganizer/Info/EditInfoView.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -126,18 +126,18 @@ struct EditInfoView: View {
126126
}
127127

128128
func fetchTitleFromUrl(urlString: String, isFetchContent: Bool = false) async -> (title:String, content:String) {
129+
var title = "没找到标题"
129130
guard let url = URL(string: urlString) else {
130-
return ("","")
131+
return (title,"")
131132
}
132133
guard let (data, _) = try? await URLSession.shared.data(from: url) else {
133-
return ("","")
134+
return (title,"")
134135
}
135136
guard let homepageHTML = String(data: data, encoding: .utf8), let soup = try? SwiftSoup.parse(homepageHTML) else {
136-
return ("","")
137+
return (title,"")
137138
}
138139

139140
// 获取标题
140-
var title = "没找到标题"
141141
let soupTitle = try? soup.title()
142142
let h1Title = try? soup.select("h1").first()?.text()
143143
if let okH1Title = h1Title {

0 commit comments

Comments
 (0)