Skip to content

Commit feb55bf

Browse files
author
Sven
committed
支持 token 输入和选择。
1 parent 84cc6d9 commit feb55bf

File tree

4 files changed

+98
-91
lines changed

4 files changed

+98
-91
lines changed

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

Lines changed: 0 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -148,53 +148,5 @@
148148
landmarkType = "7">
149149
</BreakpointContent>
150150
</BreakpointProxy>
151-
<BreakpointProxy
152-
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
153-
<BreakpointContent
154-
uuid = "BB2236F1-C5FA-40C2-9773-8EA191AC6EAE"
155-
shouldBeEnabled = "Yes"
156-
ignoreCount = "0"
157-
continueAfterRunningActions = "No"
158-
filePath = "SwiftJSONModeler For Xcode/Controller/TokenViewController.swift"
159-
startingColumnNumber = "9223372036854775807"
160-
endingColumnNumber = "9223372036854775807"
161-
startingLineNumber = "41"
162-
endingLineNumber = "41"
163-
landmarkName = "setupToken()"
164-
landmarkType = "7">
165-
<Locations>
166-
<Location
167-
uuid = "BB2236F1-C5FA-40C2-9773-8EA191AC6EAE - 7669a082ef3bd75a"
168-
shouldBeEnabled = "Yes"
169-
ignoreCount = "0"
170-
continueAfterRunningActions = "No"
171-
symbolName = "SwiftJSONModeler_For_Xcode.TokenViewController.(setupToken in _CAA47979606C5E1A08E8780CD089187F)() -&gt; ()"
172-
moduleName = "SwiftJSONModeler For Xcode"
173-
usesParentBreakpointCondition = "Yes"
174-
urlString = "file:///Users/yibin/Desktop/SwiftJSONModeler/SwiftJSONModeler%20For%20Xcode/Controller/TokenViewController.swift"
175-
startingColumnNumber = "9223372036854775807"
176-
endingColumnNumber = "9223372036854775807"
177-
startingLineNumber = "41"
178-
endingLineNumber = "41"
179-
offsetFromSymbolStart = "65">
180-
</Location>
181-
<Location
182-
uuid = "BB2236F1-C5FA-40C2-9773-8EA191AC6EAE - 3f77a0dd0ae2dde1"
183-
shouldBeEnabled = "Yes"
184-
ignoreCount = "0"
185-
continueAfterRunningActions = "No"
186-
symbolName = "closure #1 (SwiftJSONModeler_For_Xcode.Token) -&gt; () in SwiftJSONModeler_For_Xcode.TokenViewController.(setupToken in _CAA47979606C5E1A08E8780CD089187F)() -&gt; ()"
187-
moduleName = "SwiftJSONModeler For Xcode"
188-
usesParentBreakpointCondition = "Yes"
189-
urlString = "file:///Users/yibin/Desktop/SwiftJSONModeler/SwiftJSONModeler%20For%20Xcode/Controller/TokenViewController.swift"
190-
startingColumnNumber = "9223372036854775807"
191-
endingColumnNumber = "9223372036854775807"
192-
startingLineNumber = "41"
193-
endingLineNumber = "41"
194-
offsetFromSymbolStart = "49">
195-
</Location>
196-
</Locations>
197-
</BreakpointContent>
198-
</BreakpointProxy>
199151
</Breakpoints>
200152
</Bucket>

‎SwiftJSONModeler For Xcode/Base.lproj/Main.storyboard‎

Lines changed: 30 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="16097.2" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="dRj-c1-ovZ">
2+
<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="16097.2" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="5gI-5U-AMq">
33
<dependencies>
44
<deployment identifier="macosx"/>
55
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="16097.2"/>
@@ -945,17 +945,6 @@
945945
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
946946
</textFieldCell>
947947
</textField>
948-
<textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="4N2-lf-lAi">
949-
<rect key="frame" x="149" y="49" width="551" height="30"/>
950-
<constraints>
951-
<constraint firstAttribute="height" constant="30" id="p5V-3n-LYJ"/>
952-
</constraints>
953-
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" alignment="left" placeholderString="通过Id解析转换模型时必填" bezelStyle="round" id="RvH-G4-6OW">
954-
<font key="font" usesAppearanceFont="YES"/>
955-
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
956-
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
957-
</textFieldCell>
958-
</textField>
959948
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="c6O-6p-YRV">
960949
<rect key="frame" x="38" y="20" width="105" height="16"/>
961950
<textFieldCell key="cell" lineBreakMode="clipping" title="YApi项目host：" id="ykd-gD-bwv">
@@ -964,7 +953,7 @@
964953
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
965954
</textFieldCell>
966955
</textField>
967-
<textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="25V-Ky-0tb">
956+
<textField verticalHuggingPriority="750" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="25V-Ky-0tb">
968957
<rect key="frame" x="149" y="13" width="551" height="30"/>
969958
<constraints>
970959
<constraint firstAttribute="height" constant="30" id="cOL-bv-yfT"/>
@@ -975,11 +964,32 @@
975964
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
976965
</textFieldCell>
977966
</textField>
967+
<comboBox verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="e6x-Y0-QC6">
968+
<rect key="frame" x="149" y="45" width="405" height="36"/>
969+
<constraints>
970+
<constraint firstAttribute="height" constant="30" id="FO2-EN-wZh"/>
971+
</constraints>
972+
<comboBoxCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" placeholderString="请输入或选择已配置 Token" bezelStyle="round" completes="NO" numberOfVisibleItems="5" id="vqP-Tt-vqS">
973+
<font key="font" metaFont="system"/>
974+
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
975+
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
976+
</comboBoxCell>
977+
</comboBox>
978+
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Mih-Hn-oxm">
979+
<rect key="frame" x="575" y="47" width="131" height="32"/>
980+
<buttonCell key="cell" type="push" title="配置多个Token" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="voO-Fi-BVZ">
981+
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
982+
<font key="font" size="13" name=".PingFangSC-Regular"/>
983+
</buttonCell>
984+
<connections>
985+
<segue destination="bxC-4J-HfZ" kind="modal" id="LJ4-XP-kB0"/>
986+
</connections>
987+
</button>
978988
</subviews>
979989
<constraints>
980-
<constraint firstItem="4N2-lf-lAi" firstAttribute="trailing" secondItem="6ac-fB-Cyc" secondAttribute="trailing" id="4cT-ke-lSV"/>
990+
<constraint firstItem="Mih-Hn-oxm" firstAttribute="centerY" secondItem="e6x-Y0-QC6" secondAttribute="centerY" id="4VG-B6-PwO"/>
981991
<constraint firstAttribute="trailing" secondItem="6ac-fB-Cyc" secondAttribute="trailing" constant="30" id="762-cT-OPI"/>
982-
<constraint firstItem="25V-Ky-0tb" firstAttribute="trailing" secondItem="4N2-lf-lAi" secondAttribute="trailing" id="BkX-0U-sHp"/>
992+
<constraint firstItem="Mih-Hn-oxm" firstAttribute="trailing" secondItem="6ac-fB-Cyc" secondAttribute="trailing" id="AGz-lh-PoQ"/>
983993
<constraint firstItem="33u-sp-CUS" firstAttribute="leading" secondItem="lMe-2A-rbQ" secondAttribute="leading" id="Dqm-Hw-W91"/>
984994
<constraint firstItem="25V-Ky-0tb" firstAttribute="leading" secondItem="c6O-6p-YRV" secondAttribute="trailing" constant="8" id="Hch-8n-8UR"/>
985995
<constraint firstItem="pKM-dx-KjW" firstAttribute="centerY" secondItem="BE1-j6-twg" secondAttribute="centerY" id="KAA-ya-BBP"/>
@@ -988,16 +998,17 @@
988998
<constraint firstItem="33u-sp-CUS" firstAttribute="top" secondItem="lMe-2A-rbQ" secondAttribute="bottom" constant="20" id="NWp-9k-hbu"/>
989999
<constraint firstItem="33u-sp-CUS" firstAttribute="width" secondItem="lMe-2A-rbQ" secondAttribute="width" id="NZo-m7-cBg"/>
9901000
<constraint firstItem="c6O-6p-YRV" firstAttribute="width" secondItem="33u-sp-CUS" secondAttribute="width" id="ODr-eI-kS9"/>
991-
<constraint firstItem="4N2-lf-lAi" firstAttribute="centerY" secondItem="33u-sp-CUS" secondAttribute="centerY" id="PCh-8k-htV"/>
1001+
<constraint firstItem="Mih-Hn-oxm" firstAttribute="leading" secondItem="e6x-Y0-QC6" secondAttribute="trailing" constant="30" id="RzU-pq-Lul"/>
9921002
<constraint firstItem="6ac-fB-Cyc" firstAttribute="centerY" secondItem="lMe-2A-rbQ" secondAttribute="centerY" id="TLC-LW-9k2"/>
9931003
<constraint firstItem="BE1-j6-twg" firstAttribute="top" secondItem="cf4-vW-LAT" secondAttribute="top" constant="20" id="Y1O-LV-VdA"/>
9941004
<constraint firstAttribute="trailing" secondItem="pKM-dx-KjW" secondAttribute="trailing" constant="40" id="YPH-Gz-ObN"/>
9951005
<constraint firstItem="lMe-2A-rbQ" firstAttribute="leading" secondItem="BE1-j6-twg" secondAttribute="leading" id="cnH-Is-nBY"/>
9961006
<constraint firstItem="lMe-2A-rbQ" firstAttribute="top" secondItem="BE1-j6-twg" secondAttribute="bottom" constant="20" id="d0o-pz-0Hj"/>
9971007
<constraint firstItem="c6O-6p-YRV" firstAttribute="top" secondItem="33u-sp-CUS" secondAttribute="bottom" constant="20" id="j62-vL-Ql1"/>
9981008
<constraint firstItem="6ac-fB-Cyc" firstAttribute="leading" secondItem="lMe-2A-rbQ" secondAttribute="trailing" constant="8" id="lME-Jt-hZB"/>
999-
<constraint firstItem="4N2-lf-lAi" firstAttribute="leading" secondItem="33u-sp-CUS" secondAttribute="trailing" constant="8" id="quv-Dp-H9I"/>
1009+
<constraint firstItem="e6x-Y0-QC6" firstAttribute="centerY" secondItem="33u-sp-CUS" secondAttribute="centerY" id="nKS-ZC-HkY"/>
10001010
<constraint firstItem="BE1-j6-twg" firstAttribute="leading" secondItem="cf4-vW-LAT" secondAttribute="leading" constant="40" id="tDe-fO-y2i"/>
1011+
<constraint firstItem="e6x-Y0-QC6" firstAttribute="leading" secondItem="6ac-fB-Cyc" secondAttribute="leading" id="tcv-y7-HMI"/>
10011012
<constraint firstAttribute="bottom" secondItem="c6O-6p-YRV" secondAttribute="bottom" constant="20" id="zV1-3B-ypo"/>
10021013
</constraints>
10031014
</customView>
@@ -1034,19 +1045,6 @@
10341045
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
10351046
</textFieldCell>
10361047
</textField>
1037-
<comboBox verticalHuggingPriority="750" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="e6x-Y0-QC6">
1038-
<rect key="frame" x="81" y="33" width="99" height="25"/>
1039-
<comboBoxCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" drawsBackground="YES" completes="NO" numberOfVisibleItems="5" id="vqP-Tt-vqS">
1040-
<font key="font" metaFont="system"/>
1041-
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
1042-
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
1043-
<objectValues>
1044-
<string>Item 1</string>
1045-
<string>Item 2</string>
1046-
<string>Item 3</string>
1047-
</objectValues>
1048-
</comboBoxCell>
1049-
</comboBox>
10501048
</subviews>
10511049
<constraints>
10521050
<constraint firstItem="cf4-vW-LAT" firstAttribute="top" secondItem="iFK-rh-eoW" secondAttribute="bottom" constant="20" id="0Fy-Bq-4Hz"/>
@@ -1072,14 +1070,12 @@
10721070
<constraint firstItem="o35-tq-gm8" firstAttribute="leading" secondItem="bDa-kJ-Mhx" secondAttribute="leading" id="RYG-CM-3Sq"/>
10731071
<constraint firstItem="FOi-zT-B7B" firstAttribute="leading" secondItem="ERx-hH-rdd" secondAttribute="leading" constant="30" id="Vow-FC-0iL"/>
10741072
<constraint firstAttribute="trailing" secondItem="CYR-Nv-8jk" secondAttribute="trailing" constant="30" id="VuX-E7-Agq"/>
1075-
<constraint firstItem="e6x-Y0-QC6" firstAttribute="leading" secondItem="ERx-hH-rdd" secondAttribute="leading" constant="81" id="XQC-5Q-Wf0"/>
10761073
<constraint firstItem="szC-Is-Jzs" firstAttribute="centerY" secondItem="cR5-nc-6qZ" secondAttribute="centerY" id="Xgl-rm-8Ns"/>
10771074
<constraint firstAttribute="trailing" secondItem="vSj-38-HG4" secondAttribute="trailing" constant="30" id="ZLc-N7-aTr"/>
10781075
<constraint firstItem="cR5-nc-6qZ" firstAttribute="leading" secondItem="bDa-kJ-Mhx" secondAttribute="leading" id="bVu-DC-XIX"/>
10791076
<constraint firstAttribute="trailing" secondItem="TgM-de-NPF" secondAttribute="trailing" constant="30" id="ccX-KR-uIA"/>
10801077
<constraint firstAttribute="bottom" secondItem="vSj-38-HG4" secondAttribute="bottom" constant="40" id="efW-1D-QSD"/>
10811078
<constraint firstItem="bDa-kJ-Mhx" firstAttribute="leading" secondItem="ERx-hH-rdd" secondAttribute="leading" constant="30" id="efd-GX-YfT"/>
1082-
<constraint firstItem="e6x-Y0-QC6" firstAttribute="top" secondItem="FOi-zT-B7B" secondAttribute="bottom" constant="41" id="gV5-h7-cN7"/>
10831079
<constraint firstItem="iFK-rh-eoW" firstAttribute="top" secondItem="CYR-Nv-8jk" secondAttribute="bottom" constant="30" id="jDo-hs-jcy"/>
10841080
<constraint firstItem="n0v-j5-oIk" firstAttribute="leading" secondItem="ERx-hH-rdd" secondAttribute="leading" constant="30" id="jj4-ZX-MCz"/>
10851081
<constraint firstItem="S2C-lh-p4C" firstAttribute="top" secondItem="cR5-nc-6qZ" secondAttribute="bottom" constant="60" id="k0h-Gq-Hui"/>
@@ -1092,6 +1088,7 @@
10921088
</constraints>
10931089
</view>
10941090
<connections>
1091+
<outlet property="configTokenButton" destination="Mih-Hn-oxm" id="nRJ-G9-2TX"/>
10951092
<outlet property="confromTextField" destination="a5h-sk-bjS" id="pka-iP-L8P"/>
10961093
<outlet property="isAllowOptionalBtn" destination="EHm-R1-Ay3" id="Za1-zF-4TA"/>
10971094
<outlet property="isArrayEmptyBtn" destination="Cn0-Pn-vUD" id="Krz-HD-8fv"/>
@@ -1103,8 +1100,8 @@
11031100
<outlet property="prefixTextField" destination="KDI-lJ-ln3" id="y7k-Y3-phg"/>
11041101
<outlet property="remarkTextField" destination="FOi-zT-B7B" id="yPo-G2-M4p"/>
11051102
<outlet property="subffixTextField" destination="szC-Is-Jzs" id="SXg-12-Bsl"/>
1103+
<outlet property="tokenBox" destination="e6x-Y0-QC6" id="tPi-Wl-x2b"/>
11061104
<outlet property="yapiHostTextField" destination="25V-Ky-0tb" id="CZD-42-Aud"/>
1107-
<outlet property="yapiTokenTextField" destination="4N2-lf-lAi" id="Vvt-lc-2uY"/>
11081105
</connections>
11091106
</viewController>
11101107
<customObject id="2Tp-Fl-jBw" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder"/>

0 commit comments

Comments
 (0)