Merge commit '3e32816d' into xiezhaolin

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember(家庭成员信息表)/C/Child(子女)/YHChildBasicInfoVC.swift

@@ -263,6 +263,32 @@ extension YHChildBasicInfoVC : UITableViewDelegate, UITableViewDataSource {
                 cell.title = detailItem.getTitle()
                 cell.text = detailItem.value
                 cell.setTips(detailItem.tips, isShow: isNeedShowError && detailItem.isShowTips)
+                cell.textInputCondtion = {
+                    textField in
+                    
+                    if detailItem.type == .befourMarryFirstName { // 仅支持输入最多30个大写字母
+                        let regex = "[^A-Z]+"
+                        textField.limitInputWithPattern(pattern:regex, 30)
+                        return true
+                    }
+                    
+                    var max = -1
+                    if detailItem.type == .childName ||
+                        detailItem.type == .everName {
+                        max = 30
+                    } else if detailItem.type == .birthCity ||
+                              detailItem.type == .occupationName
+                    {
+                        max = 100
+                    }
+
+                    if max > 0 {
+                        if let textStr = textField.text {
+                            textField.text = (textStr.count > max ? textStr[safe: ..<max] : textStr)
+                        }
+                    }
+                    return true
+                }
                 cell.textChange = {
                     [weak self] (text, isEditEnd) in
                     guard let self = self else { return }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember(家庭成员信息表)/C/Spouse(配偶)/YHSpouseBasicInfoVC.swift

@@ -389,7 +389,32 @@ extension YHSpouseBasicInfoVC : UITableViewDelegate, UITableViewDataSource {
                 } else {
                     cell.setTips(detailItem.tips, isShow: isNeedShowError && detailItem.isShowTips)
                 }
-                
+                cell.textInputCondtion = {
+                    textField in
+                    
+                    if detailItem.type == .befourMarryFirstName { // 仅支持输入最多30个大写字母
+                        let regex = "[^A-Z]+"
+                        textField.limitInputWithPattern(pattern:regex, 30)
+                        return true
+                    }
+                    
+                    var max = -1
+                    if detailItem.type == .spouseName ||
+                        detailItem.type == .everName {
+                        max = 30
+                    } else if detailItem.type == .birthCity ||
+                              detailItem.type == .occupationName
+                    {
+                        max = 100
+                    }
+
+                    if max > 0 {
+                        if let textStr = textField.text {
+                            textField.text = (textStr.count > max ? textStr[safe: ..<max] : textStr)
+                        }
+                    }
+                    return true
+                }
                 cell.textChange = {
                     [weak self] (text, isEditEnd) in
                     guard let self = self else { return }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember(家庭成员信息表)/C/YHBrotherInfoVC.swift

@@ -234,6 +234,23 @@ extension YHBrotherInfoVC : UITableViewDelegate, UITableViewDataSource {
                 } else {
                     cell.setTips(detailItem.tips, isShow: isNeedShowError && detailItem.isShowTips)
                 }
+                cell.textInputCondtion = {
+                    textField in
+                    
+                    var max = -1
+                    if detailItem.type == .brotherName {
+                        max = 30
+                    } else if detailItem.type == .birthCity {
+                        max = 100
+                    }
+
+                    if max > 0 {
+                        if let textStr = textField.text {
+                            textField.text = (textStr.count > max ? textStr[safe: ..<max] : textStr)
+                        }
+                    }
+                    return true
+                }
                 cell.textChange = {
                     
                     [weak self] (text, isEditEnd) in

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember(家庭成员信息表)/C/YHCertificateInfoController.swift

@@ -171,8 +171,6 @@ extension YHCertificateInfoController : UITableViewDelegate, UITableViewDataSour
                             textField.text = (textStr.count > max ? textStr[safe: ..<max] : textStr)
                         }
                     }
-                        
-                    
                     return true
                 }
                 cell.textChange = {

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember(家庭成员信息表)/C/YHParentInfoVC.swift

@@ -276,6 +276,26 @@ extension YHParentInfoVC : UITableViewDelegate, UITableViewDataSource {
                 } else {
                     cell.setTips(detailItem.tips, isShow: isNeedShowError && detailItem.isShowTips)
                 }
+                cell.textInputCondtion = {
+                    textField in
+                    
+                    var max = -1
+                    if detailItem.type == .fatherName ||
+                        detailItem.type == .motherName {
+                        max = 30
+                    } else if detailItem.type == .birthCity ||
+                              detailItem.type == .occupationName
+                    {
+                        max = 100
+                    }
+
+                    if max > 0 {
+                        if let textStr = textField.text {
+                            textField.text = (textStr.count > max ? textStr[safe: ..<max] : textStr)
+                        }
+                    }
+                    return true
+                }
                 cell.textChange = {
                     
                     [weak self] (text, isEditEnd) in