Skip to content

Commit 9d39898

Browse files
author
Sven
committed
feat: ss
1 parent 7a73e52 commit 9d39898

File tree

2 files changed

+69
-30
lines changed

2 files changed

+69
-30
lines changed

SwiftJSONModeler For Xcode.xcodeproj/xcuserdata/yibin.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

Lines changed: 48 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -55,64 +55,96 @@
5555
<BreakpointProxy
5656
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
5757
<BreakpointContent
58-
uuid = "259A2B1F-983C-476D-BC9E-B49703E339FF"
58+
uuid = "EEBD5BA0-73FC-44D4-BF00-64B132D52219"
5959
shouldBeEnabled = "Yes"
6060
ignoreCount = "0"
6161
continueAfterRunningActions = "No"
6262
filePath = "SwiftJSONModeler For Xcode/TokenViewController.swift"
6363
startingColumnNumber = "9223372036854775807"
6464
endingColumnNumber = "9223372036854775807"
65-
startingLineNumber = "71"
66-
endingLineNumber = "71"
65+
startingLineNumber = "81"
66+
endingLineNumber = "81"
6767
landmarkName = "updateTokenView()"
6868
landmarkType = "7">
6969
</BreakpointContent>
7070
</BreakpointProxy>
7171
<BreakpointProxy
7272
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
7373
<BreakpointContent
74-
uuid = "F2320FE5-2A0C-435F-9D39-62CBD66F4025"
74+
uuid = "FBC1388D-D304-4FC9-B718-C509DFF7A525"
7575
shouldBeEnabled = "Yes"
7676
ignoreCount = "0"
7777
continueAfterRunningActions = "No"
7878
filePath = "SwiftJSONModeler For Xcode/TokenViewController.swift"
7979
startingColumnNumber = "9223372036854775807"
8080
endingColumnNumber = "9223372036854775807"
81-
startingLineNumber = "66"
82-
endingLineNumber = "66"
81+
startingLineNumber = "89"
82+
endingLineNumber = "89"
83+
landmarkName = "updateDataSource()"
84+
landmarkType = "7">
85+
</BreakpointContent>
86+
</BreakpointProxy>
87+
<BreakpointProxy
88+
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
89+
<BreakpointContent
90+
uuid = "4BDC3081-BAB1-449A-A5BE-59A954D74DC6"
91+
shouldBeEnabled = "Yes"
92+
ignoreCount = "0"
93+
continueAfterRunningActions = "No"
94+
filePath = "SwiftJSONModeler For Xcode/TokenViewController.swift"
95+
startingColumnNumber = "9223372036854775807"
96+
endingColumnNumber = "9223372036854775807"
97+
startingLineNumber = "92"
98+
endingLineNumber = "92"
99+
landmarkName = "updateDataSource()"
100+
landmarkType = "7">
101+
</BreakpointContent>
102+
</BreakpointProxy>
103+
<BreakpointProxy
104+
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
105+
<BreakpointContent
106+
uuid = "EDF7216D-B274-4CBA-A94F-C87B3066F5F2"
107+
shouldBeEnabled = "Yes"
108+
ignoreCount = "0"
109+
continueAfterRunningActions = "No"
110+
filePath = "SwiftJSONModeler For Xcode/TokenViewController.swift"
111+
startingColumnNumber = "9223372036854775807"
112+
endingColumnNumber = "9223372036854775807"
113+
startingLineNumber = "60"
114+
endingLineNumber = "60"
83115
landmarkName = "updateTokenView()"
84116
landmarkType = "7">
85117
</BreakpointContent>
86118
</BreakpointProxy>
87119
<BreakpointProxy
88120
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
89121
<BreakpointContent
90-
uuid = "5B59D30D-BD6C-4CAE-9A75-6122570FDD7E"
122+
uuid = "D57F4346-297C-43BC-8CB1-A57817CDE04E"
91123
shouldBeEnabled = "Yes"
92124
ignoreCount = "0"
93125
continueAfterRunningActions = "No"
94-
filePath = "SwiftJSONModeler For Xcode/View/TokenView.swift"
126+
filePath = "SwiftJSONModeler For Xcode/TokenViewController.swift"
95127
startingColumnNumber = "9223372036854775807"
96128
endingColumnNumber = "9223372036854775807"
97-
startingLineNumber = "57"
98-
endingLineNumber = "57"
99-
landmarkName = "deleteButtonTap(_:)"
129+
startingLineNumber = "70"
130+
endingLineNumber = "70"
131+
landmarkName = "updateTokenView()"
100132
landmarkType = "7">
101133
</BreakpointContent>
102134
</BreakpointProxy>
103135
<BreakpointProxy
104136
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
105137
<BreakpointContent
106-
uuid = "B2F4B2F2-85B6-415D-BD88-B93B4D7377A9"
138+
uuid = "C8B7AE06-DE18-4DBA-9A59-3E83A8C55E2F"
107139
shouldBeEnabled = "Yes"
108140
ignoreCount = "0"
109141
continueAfterRunningActions = "No"
110-
filePath = "SwiftJSONModeler For Xcode/View/TokenView.swift"
142+
filePath = "SwiftJSONModeler For Xcode/TokenViewController.swift"
111143
startingColumnNumber = "9223372036854775807"
112144
endingColumnNumber = "9223372036854775807"
113-
startingLineNumber = "61"
114-
endingLineNumber = "61"
115-
landmarkName = "addButtonTap(_:)"
145+
startingLineNumber = "68"
146+
endingLineNumber = "68"
147+
landmarkName = "updateTokenView()"
116148
landmarkType = "7">
117149
</BreakpointContent>
118150
</BreakpointProxy>

SwiftJSONModeler For Xcode/TokenViewController.swift

Lines changed: 21 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,14 @@ class TokenViewController: NSViewController {
2929
}
3030

3131
/// 删除一行token 数据
32-
private func remoçveOneRowToken(_ index: Int) {
33-
dataSource.remove(at: index)
34-
updateTokenView()
32+
private func removeOneRowToken(_ index: Int) {
33+
if index < dataSource.count {
34+
dataSource.remove(at: index)
35+
updateTokenView()
36+
} else {
37+
38+
}
39+
3540
}
3641

3742
private func updateTokenView() {
@@ -52,15 +57,20 @@ class TokenViewController: NSViewController {
5257
}
5358
// 需要删除
5459
if tokenCount < viewsCount {
55-
let deleteNumber = viewsCount - tokenCount
56-
tokenViews.removeLast(deleteNumber)
60+
stackView.removeArrangedSubview(tokenViews.first!)
61+
tokenViews.removeFirst()
62+
63+
// let deleteNumber = viewsCount - tokenCount
64+
// let willRemoveTokenView = tokenViews.dropFirst(deleteNumber)
65+
// willRemoveTokenView.forEach { stackView.removeArrangedSubview($0) }
5766
}
58-
for (index, value) in dataSource.enumerated() {
59-
let tokenView = tokenViews[index]
60-
tokenView.titleTextField.stringValue = value.title
61-
tokenView.tokenTextField.stringValue = value.token
67+
for (index, tokenView) in tokenViews.enumerated() {
68+
if index < dataSource.count {
69+
let value = dataSource[index]
70+
tokenView.titleTextField.stringValue = value.title
71+
tokenView.tokenTextField.stringValue = value.token
72+
}
6273
tokenView.buttonTag = index
63-
// ??? 闭包没有回调
6474
tokenView.deleteClosure = {
6575
index in
6676
print("删除第\(index+1)")
@@ -77,10 +87,7 @@ class TokenViewController: NSViewController {
7787
private func updateDataSource() {
7888
dataSource = []
7989
for (index, value) in tokenViews.enumerated() {
80-
guard index != tokenViews.count - 1 else {
81-
return
82-
}
83-
dataSource.append((title: value.titleTextField.stringValue, token: value.tokenTextField.stringValue))
90+
dataSource.append((title: value.titleTextField.stringValue, token: value.tokenTextField.stringValue))
8491
}
8592
}
8693

0 commit comments

Comments
 (0)