Przeglądaj źródła

Common editor action type cell, when it is not editable, the text does not turn gray -- common editor action 类型单元格,不可编辑时,文字没有变成灰色 (resolve: #14613)
The online enum select interface is blank -- online enum select 界面显示空白 (resolve: #14612)

Ray Zhang 4 lat temu
rodzic
commit
ed1a6edf76

BIN
RA TradeFiling/RA TradeFiling.xcodeproj/project.xcworkspace/xcuserdata/ruizhang.xcuserdatad/UserInterfaceState.xcuserstate


+ 72 - 8
RA TradeFiling/RA TradeFiling.xcodeproj/xcuserdata/ruizhang.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -72,7 +72,7 @@
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
             uuid = "358AAAFD-FB46-48B3-81C3-A7D751816C35"
-            shouldBeEnabled = "No"
+            shouldBeEnabled = "Yes"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "../common/customUI/commoneditor/CommonEditorViewController.m"
@@ -190,8 +190,8 @@
             filePath = "../common/customUI/commoneditor/CommonEditorViewController.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "4760"
-            endingLineNumber = "4760"
+            startingLineNumber = "4771"
+            endingLineNumber = "4771"
             landmarkName = "-tableView:willSelectRowAtIndexPath:"
             landmarkType = "7">
          </BreakpointContent>
@@ -216,14 +216,14 @@
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
             uuid = "72C4EA86-7BC0-4EEC-9D83-5DA6E47D5D11"
-            shouldBeEnabled = "No"
+            shouldBeEnabled = "Yes"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "../common/customUI/commoneditor/CommonEditorViewController.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "4759"
-            endingLineNumber = "4759"
+            startingLineNumber = "4770"
+            endingLineNumber = "4770"
             landmarkName = "-tableView:willSelectRowAtIndexPath:"
             landmarkType = "7">
          </BreakpointContent>
@@ -318,8 +318,8 @@
             filePath = "../common/customUI/commoneditor/CommonEditorViewController.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "5390"
-            endingLineNumber = "5390"
+            startingLineNumber = "5401"
+            endingLineNumber = "5401"
             landmarkName = "-setEnumValue:indexPath:"
             landmarkType = "7">
          </BreakpointContent>
@@ -356,5 +356,69 @@
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "1B30E7FC-2CA9-4554-9E1D-1C351C44A1C3"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "RA TradeFiling/DataProvider/RADataProvider.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "181"
+            endingLineNumber = "181"
+            landmarkName = "+request_editor:params:completionHandler:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "220666ED-0124-4101-A30A-E6AC5EE8B018"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "../common/customUI/commoneditor/CommonEditorViewController.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "1226"
+            endingLineNumber = "1226"
+            landmarkName = "-get_refresh_param"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "AF9891F3-F40B-49F3-B466-034FBD6D05BB"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "RA TradeFiling/TFEditor/TFEditorViewController.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "332"
+            endingLineNumber = "332"
+            landmarkName = "-commonAction:index:data:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "75B081DC-4869-48A4-83D3-752F9B7380DA"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "../common/customUI/commoneditor/EnumSelectOnlineViewController.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "377"
+            endingLineNumber = "377"
+            landmarkName = "-tableView:cellForRowAtIndexPath:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
    </Breakpoints>
 </Bucket>

+ 2 - 1
common/customUI/commoneditor/CommonEditor.storyboard

@@ -952,13 +952,14 @@
                                             <rect key="frame" x="0.0" y="0.0" width="768" height="44"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
-                                                <view contentMode="scaleToFill" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Qm5-av-MgR" customClass="RTLabel">
+                                                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Qm5-av-MgR" customClass="RTLabel">
                                                     <rect key="frame" x="15" y="5" width="706" height="34"/>
                                                     <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                 </view>
                                             </subviews>
                                             <constraints>
                                                 <constraint firstItem="Qm5-av-MgR" firstAttribute="top" secondItem="FgK-hs-kBJ" secondAttribute="top" constant="5" id="DWq-iS-IcJ"/>
+                                                <constraint firstAttribute="trailingMargin" secondItem="Qm5-av-MgR" secondAttribute="trailing" constant="31" id="QpT-q3-MWH"/>
                                                 <constraint firstAttribute="bottom" secondItem="Qm5-av-MgR" secondAttribute="bottom" constant="5" id="fg2-3e-6Le"/>
                                                 <constraint firstItem="Qm5-av-MgR" firstAttribute="leading" secondItem="FgK-hs-kBJ" secondAttribute="leading" constant="15" id="kbu-o6-Syf"/>
                                             </constraints>

+ 12 - 1
common/customUI/commoneditor/CommonEditorViewController.m

@@ -3830,8 +3830,19 @@
                 else
                     if([control isEqualToString:@"action"])
                     {
+                        
+                        
+                        
                         CellIdentifier = @"CommonEditorCellAction";
                         CommonEditorCellAction * cell= [tableView dequeueReusableCellWithIdentifier:CellIdentifier forIndexPath:indexPath];
+                        
+                        int disable = [[item_json valueForKey:@"disable"] intValue];
+                        if(disable==1||readonly)
+                        {
+                            cell.labelAction.textColor= [UIColor lightGrayColor];
+                            
+                        }
+                        
                         NSMutableString* title = [[item_json valueForKey:@"aname"] mutableCopy];
                         NSString* value =[item_json valueForKey:@"value"];
                         if([required isEqualToString:@"true"])
@@ -3843,7 +3854,7 @@
                         cell.labelAction.text=title;
                         cell.action_code = value;
                         
-                        
+
                         //cell.labelValue.text = value;
                         
                         if(self.cancommit==false && [required isEqualToString:@"true"] && (data==nil))