Merge branch 'qmas-1130' into AI-1212

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -6804,7 +6804,7 @@
 				CODE_SIGN_ENTITLEMENTS = galaxy/galaxyTestEnv.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 10;
+				CURRENT_PROJECT_VERSION = 11;
 				DEVELOPMENT_TEAM = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -6946,7 +6946,7 @@
 				CODE_SIGN_ENTITLEMENTS = galaxy/galaxy.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 10;
+				CURRENT_PROJECT_VERSION = 11;
 				DEVELOPMENT_TEAM = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -7151,7 +7151,7 @@
 				CODE_SIGN_ENTITLEMENTS = galaxy/galaxyDebug.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 10;
+				CURRENT_PROJECT_VERSION = 11;
 				DEVELOPMENT_TEAM = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -7198,7 +7198,7 @@
 				CODE_SIGN_ENTITLEMENTS = galaxy/galaxy.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 10;
+				CURRENT_PROJECT_VERSION = 11;
 				DEVELOPMENT_TEAM = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				FRAMEWORK_SEARCH_PATHS = (

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/MyDocuments(我的文书)/V/YHHKPlanItemView.swift

@@ -61,6 +61,8 @@ class YHHKPlanItemView: UIView {
         let view = UILabel()
         view.text = "所属专业名称(如有）：资深数据科学家"
         view.font = UIFont.PFSC_R(ofSize: 14)
+        view.numberOfLines = 0
+        view.lineBreakMode = .byWordWrapping
         view.textColor = .init(hex: 0x6D788A)
         return view
     }()
@@ -160,7 +162,7 @@ private extension YHHKPlanItemView {
         iconImageV.snp.makeConstraints { make in
             make.left.equalTo(nameLable.snp.right).offset(4)
             make.centerY.equalTo(nameLable)
-            make.height.width.equalTo(16)
+            make.height.width.equalTo(18)
         }
         
         iconImageV.isHidden = true

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/MyNewScheme(我的方案)/V/YHImproveSchemeTemplateListView.swift

@@ -174,9 +174,10 @@ extension YHImproveSchemeTemplateListView : UITableViewDelegate, UITableViewData
                         vc.url = model.url
                         vc.isFullScreenFlag = false
                         UIViewController.current?.navigationController?.pushViewController(vc)
+                        self.dismiss()
                     }
                 }
-                self.dismiss()
+                
             }
             return cell
         }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/ServiceProcess(我的信息流程)/PersonInfoList(个人信息预览)/VM/YHPreviewViewModel.swift

@@ -577,8 +577,11 @@ private extension YHPreviewViewModel {
         do {
             //国家信息
             let tmp0 = YHPreviewQuestionAndAnswerModel(question: "国家/国籍：", answer: model.nationality)
-            let tmp1 = YHPreviewQuestionAndAnswerModel(question: "港澳通行证：", answer: model.is_handled == 0 ? "未办理" : "已办理")
-            let arr = [tmp0,tmp1]
+            var arr = [tmp0]
+            if model.nationality.contains("中国") {
+                let tmp1 = YHPreviewQuestionAndAnswerModel(question: "港澳通行证：", answer: model.is_handled == 0 ? "未办理" : "已办理")
+                arr.append(tmp1)
+            }
             let model1 = YHPreviewInfoSessionModel(cellType: .countryInfoType, cellTitle: "国籍信息", cellData0: arr)
             arrDataForMainApplicationInfo.append(model1)
         }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/ServiceProcess(我的信息流程)/WorkExperience(工作经验)/C/YHWorkExperienceViewController.swift

@@ -60,7 +60,6 @@ class YHWorkExperienceViewController: YHBaseViewController {
             guard let self = self else { return }
             if var text = text, let dataSorce = fileDataSource {
                 // 重命名
-                self.renameInputView.isHidden = true
                 text = text + "." + getFileSuffixName(selectEditItem.fileUrl)
                 for item in dataSorce {
                     if item.fileUrl == selectEditItem.fileUrl {