Răsfoiți Sursa

common editor discard diry logic is wrong -- common editor discard diry 逻辑有错 (resolve: #14780)

Ray Zhang 4 ani în urmă
părinte
comite
1a6fd87826

+ 10 - 10
RA TradeFiling/RA TradeFiling.xcodeproj/project.pbxproj

@@ -127,6 +127,8 @@
 		3C452FA925BE98410035AF5F /* HomeDasheManifestCellE.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3C452FA725BE98410035AF5F /* HomeDasheManifestCellE.xib */; };
 		3C452FAF25BE985C0035AF5F /* HomeDashACIModelE.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C452FAE25BE985C0035AF5F /* HomeDashACIModelE.m */; };
 		3C452FB525BE987C0035AF5F /* HomeDasheManifestModelE.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C452FB425BE987C0035AF5F /* HomeDasheManifestModelE.m */; };
+		3C514970273E070300F78617 /* CommonEditorCellEditor.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C51496E273E070300F78617 /* CommonEditorCellEditor.m */; };
+		3C514971273E070300F78617 /* Phone_Editor_Cell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3C51496F273E070300F78617 /* Phone_Editor_Cell.xib */; };
 		3C5F8B482564F8D300CFD26A /* JLRefreshBasis.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C5F8B472564F8D300CFD26A /* JLRefreshBasis.m */; };
 		3C5F8B552564FDD100CFD26A /* ResultViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C5F8B522564FDD100CFD26A /* ResultViewController.m */; };
 		3C5F8B562564FDD100CFD26A /* Result.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 3C5F8B532564FDD100CFD26A /* Result.storyboard */; };
@@ -206,8 +208,6 @@
 		3C5FBF362636B9CE00130F65 /* TFEditorViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C5FBF352636B9CE00130F65 /* TFEditorViewController.m */; };
 		3C5FBF3B2637E83300130F65 /* edit_isf.json in Resources */ = {isa = PBXBuildFile; fileRef = 3C5FBF3A2637E83300130F65 /* edit_isf.json */; };
 		3C5FBF40263A4CF100130F65 /* CommonEditor.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 3C5FBF3F263A4CF100130F65 /* CommonEditor.storyboard */; };
-		3C5FBF4B263A947500130F65 /* CommonEditorCellEditor.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C5FBF49263A947500130F65 /* CommonEditorCellEditor.m */; };
-		3C5FBF4C263A947500130F65 /* Phone_Editor_Cell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3C5FBF4A263A947500130F65 /* Phone_Editor_Cell.xib */; };
 		3C5FBF57263AA5D800130F65 /* MonthPickerViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C5FBF54263AA5D800130F65 /* MonthPickerViewController.m */; };
 		3C5FBF58263AA5D800130F65 /* DatePickerViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C5FBF55263AA5D800130F65 /* DatePickerViewController.m */; };
 		3C5FBF63263BAD3A00130F65 /* edit_party.json in Resources */ = {isa = PBXBuildFile; fileRef = 3C5FBF62263BAD3A00130F65 /* edit_party.json */; };
@@ -483,6 +483,9 @@
 		3C452FAE25BE985C0035AF5F /* HomeDashACIModelE.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = HomeDashACIModelE.m; sourceTree = "<group>"; };
 		3C452FB325BE987C0035AF5F /* HomeDasheManifestModelE.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = HomeDasheManifestModelE.h; sourceTree = "<group>"; };
 		3C452FB425BE987C0035AF5F /* HomeDasheManifestModelE.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = HomeDasheManifestModelE.m; sourceTree = "<group>"; };
+		3C51496D273E070300F78617 /* CommonEditorCellEditor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CommonEditorCellEditor.h; path = ../../common/customUI/commoneditor/CommonEditorCellEditor.h; sourceTree = "<group>"; };
+		3C51496E273E070300F78617 /* CommonEditorCellEditor.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CommonEditorCellEditor.m; path = ../../common/customUI/commoneditor/CommonEditorCellEditor.m; sourceTree = "<group>"; };
+		3C51496F273E070300F78617 /* Phone_Editor_Cell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = Phone_Editor_Cell.xib; path = ../../common/customUI/commoneditor/Phone_Editor_Cell.xib; sourceTree = "<group>"; };
 		3C5F8B462564F8D300CFD26A /* JLRefreshBasis.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JLRefreshBasis.h; path = ../../common/customUI/Refresh/JLRefreshBasis.h; sourceTree = "<group>"; };
 		3C5F8B472564F8D300CFD26A /* JLRefreshBasis.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = JLRefreshBasis.m; path = ../../common/customUI/Refresh/JLRefreshBasis.m; sourceTree = "<group>"; };
 		3C5F8B522564FDD100CFD26A /* ResultViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ResultViewController.m; sourceTree = "<group>"; };
@@ -619,9 +622,6 @@
 		3C5FBF352636B9CE00130F65 /* TFEditorViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = TFEditorViewController.m; sourceTree = "<group>"; };
 		3C5FBF3A2637E83300130F65 /* edit_isf.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = edit_isf.json; sourceTree = "<group>"; };
 		3C5FBF3F263A4CF100130F65 /* CommonEditor.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = CommonEditor.storyboard; path = ../../common/customUI/commoneditor/CommonEditor.storyboard; sourceTree = "<group>"; };
-		3C5FBF48263A947500130F65 /* CommonEditorCellEditor.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CommonEditorCellEditor.h; sourceTree = "<group>"; };
-		3C5FBF49263A947500130F65 /* CommonEditorCellEditor.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CommonEditorCellEditor.m; sourceTree = "<group>"; };
-		3C5FBF4A263A947500130F65 /* Phone_Editor_Cell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = Phone_Editor_Cell.xib; sourceTree = "<group>"; };
 		3C5FBF53263AA5D800130F65 /* DatePickerViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DatePickerViewController.h; path = ../../common/customUI/commoneditor/DatePickerViewController.h; sourceTree = "<group>"; };
 		3C5FBF54263AA5D800130F65 /* MonthPickerViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = MonthPickerViewController.m; path = ../../common/customUI/commoneditor/MonthPickerViewController.m; sourceTree = "<group>"; };
 		3C5FBF55263AA5D800130F65 /* DatePickerViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = DatePickerViewController.m; path = ../../common/customUI/commoneditor/DatePickerViewController.m; sourceTree = "<group>"; };
@@ -1394,9 +1394,9 @@
 		3C5FBF47263A8C2F00130F65 /* EditorCell */ = {
 			isa = PBXGroup;
 			children = (
-				3C5FBF48263A947500130F65 /* CommonEditorCellEditor.h */,
-				3C5FBF49263A947500130F65 /* CommonEditorCellEditor.m */,
-				3C5FBF4A263A947500130F65 /* Phone_Editor_Cell.xib */,
+				3C51496D273E070300F78617 /* CommonEditorCellEditor.h */,
+				3C51496E273E070300F78617 /* CommonEditorCellEditor.m */,
+				3C51496F273E070300F78617 /* Phone_Editor_Cell.xib */,
 			);
 			name = EditorCell;
 			sourceTree = "<group>";
@@ -1655,6 +1655,7 @@
 				3C76707425A2F60C00588DB5 /* container.json in Resources */,
 				3C2431A3258B3C7A00555555 /* ResultISFCell.xib in Resources */,
 				3C24317C258B00A800555555 /* searchresult_customer.json in Resources */,
+				3C514971273E070300F78617 /* Phone_Editor_Cell.xib in Resources */,
 				3C452F3525B9766C0035AF5F /* HomeDashISFCellP.xib in Resources */,
 				3C5F8BC9256503ED00CFD26A /* ApexResultAdditionView.xib in Resources */,
 				3C5F8C87256B935E00CFD26A /* my.json in Resources */,
@@ -1675,7 +1676,6 @@
 				3C5F8D13257A265600CFD26A /* result_acem1.json in Resources */,
 				3C76709625A84C0C00588DB5 /* log_acem1.json in Resources */,
 				3C5F8C4525650B0E00CFD26A /* ResultACEM1Cell.xib in Resources */,
-				3C5FBF4C263A947500130F65 /* Phone_Editor_Cell.xib in Resources */,
 				3C0CB398255E81BD00718A03 /* HomeHeader.xib in Resources */,
 				3C2C27892636628D009460F5 /* signature.storyboard in Resources */,
 				3C5F8CE42578807100CFD26A /* search_aci.json in Resources */,
@@ -1797,6 +1797,7 @@
 				3C2C27B02636652F009460F5 /* EnumSelectorCell.m in Sources */,
 				3C5F8BE12565055400CFD26A /* SavedSearchViewController.m in Sources */,
 				3CAB3FDB2564F27D00CB554D /* RAUtils.m in Sources */,
+				3C514970273E070300F78617 /* CommonEditorCellEditor.m in Sources */,
 				3C452F8E25BE971C0035AF5F /* HomeDashACEM1ModelE.m in Sources */,
 				3C5F8C7B2566610A00CFD26A /* OfflineDataProvider.m in Sources */,
 				3C2C273426355918009460F5 /* CommonEditorCellSignature.m in Sources */,
@@ -1817,7 +1818,6 @@
 				3C76711425B7C28600588DB5 /* AgreementViewController.m in Sources */,
 				3C2C27BF2636657C009460F5 /* EnumSelectAndSortCell.m in Sources */,
 				3C5FBF58263AA5D800130F65 /* DatePickerViewController.m in Sources */,
-				3C5FBF4B263A947500130F65 /* CommonEditorCellEditor.m in Sources */,
 				3C2C27F026366B3C009460F5 /* DefaultTableHeaderView.m in Sources */,
 				3C5F8C3B25650A8500CFD26A /* TableCellEdit.m in Sources */,
 				3C5F8C152565092C00CFD26A /* MyAutocompleteView.m in Sources */,

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


+ 128 - 32
RA TradeFiling/RA TradeFiling.xcodeproj/xcuserdata/ruizhang.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -14,8 +14,8 @@
             filePath = "../common/customUI/commoneditor/CommonEditorViewController.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1969"
-            endingLineNumber = "1969"
+            startingLineNumber = "1971"
+            endingLineNumber = "1971"
             landmarkName = "-prepareReturn:"
             landmarkType = "7">
          </BreakpointContent>
@@ -30,8 +30,8 @@
             filePath = "../common/customUI/commoneditor/CommonEditorViewController.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "2921"
-            endingLineNumber = "2921"
+            startingLineNumber = "2935"
+            endingLineNumber = "2935"
             landmarkName = "-returnValue:indexPath:"
             landmarkType = "7">
          </BreakpointContent>
@@ -46,8 +46,8 @@
             filePath = "../common/customUI/commoneditor/CommonEditorViewController.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1975"
-            endingLineNumber = "1975"
+            startingLineNumber = "1977"
+            endingLineNumber = "1977"
             landmarkName = "-prepareReturn:"
             landmarkType = "7">
          </BreakpointContent>
@@ -62,8 +62,8 @@
             filePath = "../common/customUI/commoneditor/CommonEditorViewController.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1978"
-            endingLineNumber = "1978"
+            startingLineNumber = "1980"
+            endingLineNumber = "1980"
             landmarkName = "-prepareReturn:"
             landmarkType = "7">
          </BreakpointContent>
@@ -94,8 +94,8 @@
             filePath = "../common/customUI/commoneditor/CommonEditorViewController.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "5899"
-            endingLineNumber = "5899"
+            startingLineNumber = "5913"
+            endingLineNumber = "5913"
             landmarkName = "-textField:shouldChangeCharactersInRange:replacementString:"
             landmarkType = "7">
          </BreakpointContent>
@@ -190,8 +190,8 @@
             filePath = "../common/customUI/commoneditor/CommonEditorViewController.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "3991"
-            endingLineNumber = "3991"
+            startingLineNumber = "4005"
+            endingLineNumber = "4005"
             landmarkName = "-tableView:cellForRowAtIndexPath:"
             landmarkType = "7">
          </BreakpointContent>
@@ -238,8 +238,8 @@
             filePath = "../common/customUI/commoneditor/CommonEditorViewController.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1979"
-            endingLineNumber = "1979"
+            startingLineNumber = "1981"
+            endingLineNumber = "1981"
             landmarkName = "-prepareReturn:"
             landmarkType = "7">
          </BreakpointContent>
@@ -248,7 +248,7 @@
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
             uuid = "1D569098-9104-4FD5-81D2-C00681AA80F2"
-            shouldBeEnabled = "Yes"
+            shouldBeEnabled = "No"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "../common/customUI/commoneditor/CommonEditorViewController.m"
@@ -264,7 +264,7 @@
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
             uuid = "CF205B30-9032-472A-B8E8-C2D9FC6F1253"
-            shouldBeEnabled = "Yes"
+            shouldBeEnabled = "No"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "../common/customUI/commoneditor/CommonEditorViewController.m"
@@ -280,14 +280,14 @@
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
             uuid = "1E8251C4-8226-41ED-96AC-B7D2EE6513F9"
-            shouldBeEnabled = "No"
+            shouldBeEnabled = "Yes"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "../common/customUI/commoneditor/CommonEditorViewController.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1983"
-            endingLineNumber = "1983"
+            startingLineNumber = "1985"
+            endingLineNumber = "1985"
             landmarkName = "-handle_action_return:indexPath:action:"
             landmarkType = "7">
          </BreakpointContent>
@@ -302,8 +302,8 @@
             filePath = "../common/customUI/commoneditor/CommonEditorViewController.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "2328"
-            endingLineNumber = "2328"
+            startingLineNumber = "2342"
+            endingLineNumber = "2342"
             landmarkName = "-handle_action_return:indexPath:action:"
             landmarkType = "7">
          </BreakpointContent>
@@ -328,7 +328,7 @@
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
             uuid = "B28673C0-6CDC-4C93-8947-DFDA84D8AA65"
-            shouldBeEnabled = "Yes"
+            shouldBeEnabled = "No"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "../common/customUI/commoneditor/CommonEditorViewController.m"
@@ -350,8 +350,8 @@
             filePath = "../common/customUI/commoneditor/CommonEditorViewController.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "6661"
-            endingLineNumber = "6661"
+            startingLineNumber = "6675"
+            endingLineNumber = "6675"
             landmarkName = "-keyboardWillChangeFrame:"
             landmarkType = "7">
          </BreakpointContent>
@@ -366,8 +366,8 @@
             filePath = "../common/customUI/commoneditor/CommonEditorViewController.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "6801"
-            endingLineNumber = "6801"
+            startingLineNumber = "6815"
+            endingLineNumber = "6815"
             landmarkName = "-keyboardDidChangeFrame:"
             landmarkType = "7">
          </BreakpointContent>
@@ -382,8 +382,8 @@
             filePath = "../common/customUI/commoneditor/CommonEditorViewController.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "6686"
-            endingLineNumber = "6686"
+            startingLineNumber = "6700"
+            endingLineNumber = "6700"
             landmarkName = "-keyboardWillChangeFrame:"
             landmarkType = "7">
          </BreakpointContent>
@@ -398,8 +398,8 @@
             filePath = "../common/customUI/commoneditor/CommonEditorViewController.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "5779"
-            endingLineNumber = "5779"
+            startingLineNumber = "5793"
+            endingLineNumber = "5793"
             landmarkName = "-textView:shouldChangeTextInRange:replacementText:"
             landmarkType = "7">
          </BreakpointContent>
@@ -414,11 +414,107 @@
             filePath = "../common/customUI/commoneditor/CommonEditorViewController.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "5748"
-            endingLineNumber = "5748"
+            startingLineNumber = "5762"
+            endingLineNumber = "5762"
             landmarkName = "-textView:shouldChangeTextInRange:replacementText:"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "98109D8B-F760-4DD2-ADA8-A3DF461893F4"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "../common/customUI/commoneditor/CommonEditorViewController.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "5449"
+            endingLineNumber = "5449"
+            landmarkName = "-setEnumValue:indexPath:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "0294AB83-6874-4884-850C-4A2B163D3D51"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "../common/customUI/commoneditor/CommonEditorViewController.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "5501"
+            endingLineNumber = "5501"
+            landmarkName = "-setEnumValue:indexPath:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "80B1FE50-0BD9-46AF-BB4F-8D3401DCDF3B"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "../common/customUI/commoneditor/CommonEditorViewController.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "5500"
+            endingLineNumber = "5500"
+            landmarkName = "-setEnumValue:indexPath:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "0382CA08-AD50-4ABB-9E96-41E927377CAE"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "../common/customUI/commoneditor/CommonEditorViewController.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "1388"
+            endingLineNumber = "1388"
+            landmarkName = "-refresh:discardDirty:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "E7EA8BDB-5FDA-4D4A-81A7-055B4D479A22"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "../common/customUI/commoneditor/CommonEditorViewController.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "1240"
+            endingLineNumber = "1240"
+            landmarkName = "-get_refresh_param"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "F2D172C0-AEDF-4F01-9709-A809AB395AC9"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "../common/customUI/commoneditor/CommonEditorViewController.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "1407"
+            endingLineNumber = "1407"
+            landmarkName = "-refresh:discardDirty:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
    </Breakpoints>
 </Bucket>

+ 3 - 0
RA TradeFiling/RA TradeFiling/FAKE_DATA/edit_isf.json

@@ -38,6 +38,7 @@
         "aname": "CREATE NEW PARTY"
       },
       "item_1": {
+         
         "key_map": {
           "bol": "customer_email",
           "isfbondholder": "customer_cid"
@@ -85,6 +86,7 @@
     "item_0": {
       "control": "edit",
       "autocomplete": false,
+      "refresh":true,
       "value": "DNCYQDFDAL214088",
       "name": "bol",
       "length": 5,
@@ -92,6 +94,7 @@
       "required": "true"
     },
     "item_1": {
+        "refresh":true,
       "control": "enum",
       "name": "bolcode",
       "cadedate": {

+ 2 - 2
RA TradeFiling/RA TradeFiling/config.h

@@ -12,8 +12,8 @@
 #define JSON_TIMEOUT 60
 //#define fake_data false
 #ifdef DEBUG
-//    #define test_server
-    #define fake_data false
+    #define test_server
+    #define fake_data true
 #else
     #define fake_data false
 # endif

+ 1 - 27
common/RAUtils.m

@@ -34,33 +34,7 @@
 //    int irandom = [self getRandomNumber:0 to:5];
 //    return irandom / 100.0;
 //}
-//+(NSString*) getdbzip:(NSString*)dbname
-//{
-//
-//
-//    NSArray *paths = NSSearchPathForDirectoriesInDomains(NSCachesDirectory, NSUserDomainMask, YES);
-//    NSString *documents = /*[NSHomeDirectory() stringByAppendingPathComponent:@"Documents"];*/[paths objectAtIndex:0];
-//    NSString *database_path = [documents stringByAppendingPathComponent:dbname];
-//
-//
-//            NSString* temp = NSTemporaryDirectory();
-//
-//    NSString* uuid=[[NSUUID UUID] UUIDString];
-//
-//    NSString *tempfile = [temp stringByAppendingPathComponent:[NSString stringWithFormat:@"%@.zip",uuid]];
-//
-//    ZipArchive* zip = [[ZipArchive alloc] init];
-//
-//
-//    BOOL result = [zip CreateZipFile2:tempfile Password:@"usai2010"];
-//
-//
-//        result = [zip addFileToZip:database_path newname:[database_path lastPathComponent]];
-//    return tempfile;
-//
-//
-//
-//}
+
 +(NSData*) getdbfile:(NSString*)dbname
 {
     NSArray *paths = NSSearchPathForDirectoriesInDomains(NSCachesDirectory, NSUserDomainMask, YES);

+ 0 - 0
RA TradeFiling/RA TradeFiling/CommonEditorCellEditor.h → common/customUI/commoneditor/CommonEditorCellEditor.h


+ 0 - 0
RA TradeFiling/RA TradeFiling/CommonEditorCellEditor.m → common/customUI/commoneditor/CommonEditorCellEditor.m


+ 1 - 0
common/customUI/commoneditor/CommonEditorViewController.h

@@ -100,6 +100,7 @@
 -(NSMutableDictionary*) fill_switch_subitem:(NSMutableDictionary *) switch_item subid:(NSArray*) subid source:(NSMutableDictionary*)source mapping:(NSDictionary*)mapping;
 -(NSMutableDictionary*) fill_enum_subitem:(NSMutableDictionary *) enum_item subid:(NSArray*) subid source:(NSMutableDictionary*)source mapping:(NSDictionary*)mapping;
 //-(void) refresh1:(NSString*) trigger;
+-(void) refresh:(NSString*) trigger discardDirty:(bool) discardDirty;
 -(void) handle_action_return:(NSMutableDictionary *)value indexPath :(NSIndexPath*) indexPath action:(int) action_code;
 
 // Urgency

+ 15 - 0
common/customUI/commoneditor/CommonEditorViewController.m

@@ -55,6 +55,7 @@
 #import "ContentPreviewController.h"
 #import "NetworkUtils.h"
 #import "EnumSelectOnlineViewController.h"
+#import "common_const.h"
 
 @interface subitem_data ()
 
@@ -1416,6 +1417,8 @@ if(!self.alert.isBeingDismissed)
                             weakself.content_data_download = [weakself CopyDirty:weakself.content_data_download to:[editor_json mutableCopy]];//[editor_json mutableCopy];
 
                         }
+                        else
+                            weakself.content_data_download = [editor_json mutableCopy];
                         
                         weakself.content_data_control = [weakself translate_json:weakself.content_data_download changed: weakself.changed_data];
                         
@@ -2282,6 +2285,18 @@ if(!self.alert.isBeingDismissed)
                         
                         if(valuestr !=nil)
                         {
+                            if([modify_item[@"control"] isEqualToString:@"enum"]&& valuefrom.length==0)
+                            {
+                                NSMutableDictionary* cadedate = modify_item[@"cadedate"];
+                                int ccount = [cadedate[@"count"] intValue];
+                                for(int jcc=0;jcc<ccount;jcc++)
+                                {
+                                    NSMutableDictionary * cval=cadedate[[NSString stringWithFormat:@"val_%d",jcc]];
+                                    cval[@"check"]=@0;
+                                    cadedate[[NSString stringWithFormat:@"val_%d",jcc]]=cval;
+                                }
+                                modify_item[@"cadedate"]=cadedate;
+                            }
                             
                             [modify_item setValue:valuestr forKey:@"value"];
                             

+ 0 - 0
RA TradeFiling/RA TradeFiling/Phone_Editor_Cell.xib → common/customUI/commoneditor/Phone_Editor_Cell.xib