rules are optional
This commit is contained in:
parent
26a530af2c
commit
ae4855e358
@ -170,8 +170,8 @@ import UIKit
|
|||||||
navigationModel.line = LineModel(type: .none)
|
navigationModel.line = LineModel(type: .none)
|
||||||
}
|
}
|
||||||
pageModel?.navigationItem = navigationModel
|
pageModel?.navigationItem = navigationModel
|
||||||
if self.formValidator == nil,
|
if self.formValidator == nil {
|
||||||
let rules = pageModel?.formRules {
|
let rules = pageModel?.formRules
|
||||||
self.formValidator = FormValidator(rules)
|
self.formValidator = FormValidator(rules)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -12,13 +12,13 @@ import MVMCore
|
|||||||
@objcMembers public class FormValidator: NSObject {
|
@objcMembers public class FormValidator: NSObject {
|
||||||
|
|
||||||
static var defaultGroupName: String = "default"
|
static var defaultGroupName: String = "default"
|
||||||
var formRules: [FormGroupRule]
|
var formRules: [FormGroupRule]?
|
||||||
weak var delegate: FormHolderProtocol?
|
weak var delegate: FormHolderProtocol?
|
||||||
var fields: [String: FormFieldProtocol] = [:]
|
var fields: [String: FormFieldProtocol] = [:]
|
||||||
var groupWatchers: [FormGroupWatcherFieldProtocol] = []
|
var groupWatchers: [FormGroupWatcherFieldProtocol] = []
|
||||||
var radioButtonsModelByGroup: [String: RadioButtonSelectionHelper] = [:]
|
var radioButtonsModelByGroup: [String: RadioButtonSelectionHelper] = [:]
|
||||||
|
|
||||||
public init(_ formRules: [FormGroupRule]) {
|
public init(_ formRules: [FormGroupRule]?) {
|
||||||
self.formRules = formRules
|
self.formRules = formRules
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -59,6 +59,9 @@ import MVMCore
|
|||||||
/// Validates all rule groups. Returns if valid
|
/// Validates all rule groups. Returns if valid
|
||||||
public func validate() -> Bool {
|
public func validate() -> Bool {
|
||||||
var valid = true
|
var valid = true
|
||||||
|
guard let formRules = formRules else {
|
||||||
|
return valid
|
||||||
|
}
|
||||||
for group in formRules {
|
for group in formRules {
|
||||||
valid = valid && validateGroup(group)
|
valid = valid && validateGroup(group)
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user