* [x] 新增工作记录和获奖情况--描述必填

* [x] 工作记录desc 展开显示不全

* [x] 新增工作记录和获奖情况--描述必填
* [x] 工作记录desc 展开显示不全
“张旭”
1 parent d0102ac2
Showing 3 changed files with 41 additions and 8 deletions
metaCode/Classes/Main/HomePage/Controller/DigitalAuth/工作相关页面/CNLiveVitaeAddWorkController.swift
metaCode/Classes/Main/HomePage/View/DigitalAuthViews/Vitae/Work/CNLiveVitaeWorkCell.swift
metaCode/Classes/Main/HomePage/View/DigitalAuthViews/我的简历cell/CNLiveDigitalResumePreviewFourWorkAwardCell.swift
@@ -299,7 +299,7 @@ class CNLiveVitaeAddWorkController:CNLiveBaseViewController,UITableViewDataSourc
                 showMessage(message: "请选择结束时间")
                 return
             }
-            if secCell?.huoJiangtextView.text?.count == 0 || secCell?.huoJiangtextView.text == "获奖描述"{
+            if secCell?.huoJiangtextView.text?.count == 0 || secCell?.huoJiangtextView.text == "描述"{
                 showMessage(message: "请填写经历描述")
                 return
             }
@@ -306,7 +306,10 @@ class CNLiveVitaeWorkCell: UITableViewCell{
     required init?(coder: NSCoder) {
         fatalError("init(coder:) has not been implemented")
     }
-    
+    override func layoutSubviews() {
+        super.layoutSubviews()
+        
+    }
     //获奖
     func setupNewAwardUI(model:CNLiveVitaeAwardsModel){
         self.imagesTotalView.subviews.forEach { view in
@@ -335,10 +338,15 @@ class CNLiveVitaeWorkCell: UITableViewCell{
             self.expandBtn.isHidden = false
         }
+        jianjieLabel.numberOfLines = 0
+        jianjieLabel.width = self.whiteBgView.width-15-20
+        let size = jianjieLabel.sizeThatFits(CGSize(width: jianjieLabel.width, height: CGFloat.greatestFiniteMagnitude))
+        self.jianjieLabel.sizeToFit()
+        
         var jienjieH:CGFloat = 0
         if model.isExpand{
             //展开状态
-            jienjieH = height*CGFloat(lines)
+            jienjieH = self.jianjieLabel.height//height*CGFloat(lines)
             self.jianjieLabel.numberOfLines = 0
         }else{
             //收起状态
@@ -465,10 +473,15 @@ class CNLiveVitaeWorkCell: UITableViewCell{
             self.expandBtn.isHidden = false
         }
+        jianjieLabel.numberOfLines = 0
+        jianjieLabel.width = self.whiteBgView.width-15-20
+        let size = jianjieLabel.sizeThatFits(CGSize(width: jianjieLabel.width, height: CGFloat.greatestFiniteMagnitude))
+        self.jianjieLabel.sizeToFit()
+        
         var jienjieH:CGFloat = 0
         if model.isExpand{
             //展开状态
-            jienjieH = height*CGFloat(lines)
+            jienjieH = self.jianjieLabel.height//height*CGFloat(lines)
             self.jianjieLabel.numberOfLines = 0
         }else{
             //收起状态
@@ -600,11 +613,16 @@ class CNLiveVitaeWorkCell: UITableViewCell{
         button.isSelected = !button.isSelected
         let lines = jianjieLabel.getRealLabelTextLines()
         let height = jianjieLabel.qmui_lineHeight
+        
+        jianjieLabel.numberOfLines = 0
+        jianjieLabel.width = self.whiteBgView.width-15-20
+        let size = jianjieLabel.sizeThatFits(CGSize(width: jianjieLabel.width, height: CGFloat.greatestFiniteMagnitude))
+        self.jianjieLabel.sizeToFit()
         var jienjieH:CGFloat = 0
         if button.isSelected{
             //文本收起状态,点击展开
-            jienjieH = CGFloat(lines)*height
+            jienjieH = self.jianjieLabel.height//size.height//CGFloat(lines)*height
         }else{
             //文本展开状态,点击收起
             jienjieH = 2*height+2
@@ -304,10 +304,15 @@ class CNLiveDigitalResumePreviewFourWorkAwardCell:UITableViewCell{
             self.expandBtn.isHidden = false
         }
+        jianjieLabel.numberOfLines = 0
+        jianjieLabel.width = self.contentView.width-50-20
+        let size = jianjieLabel.sizeThatFits(CGSize(width: jianjieLabel.width, height: CGFloat.greatestFiniteMagnitude))
+        self.jianjieLabel.sizeToFit()
+        
         var jienjieH:CGFloat = 0
         if model.isExpand{
             //展开状态
-            jienjieH = height*CGFloat(lines)
+            jienjieH = self.jianjieLabel.height//height*CGFloat(lines)
             self.jianjieLabel.numberOfLines = 0
         }else{
             //收起状态
@@ -457,10 +462,15 @@ class CNLiveDigitalResumePreviewFourWorkAwardCell:UITableViewCell{
             self.expandBtn.isHidden = false
         }
+        jianjieLabel.numberOfLines = 0
+        jianjieLabel.width = self.contentView.width-50-20
+        let size = jianjieLabel.sizeThatFits(CGSize(width: jianjieLabel.width, height: CGFloat.greatestFiniteMagnitude))
+        self.jianjieLabel.sizeToFit()
+        
         var jienjieH:CGFloat = 0
         if model.isExpand{
             //展开状态
-            jienjieH = height*CGFloat(lines)
+            jienjieH = self.jianjieLabel.height//height*CGFloat(lines)
             self.jianjieLabel.numberOfLines = 0
         }else{
             //收起状态
@@ -567,10 +577,15 @@ class CNLiveDigitalResumePreviewFourWorkAwardCell:UITableViewCell{
         let lines = jianjieLabel.getRealLabelTextLines()
         let height = jianjieLabel.qmui_lineHeight
+        jianjieLabel.numberOfLines = 0
+        jianjieLabel.width = self.contentView.width-50-20
+        let size = jianjieLabel.sizeThatFits(CGSize(width: jianjieLabel.width, height: CGFloat.greatestFiniteMagnitude))
+        self.jianjieLabel.sizeToFit()
+
         var jienjieH:CGFloat = 0
         if button.isSelected{
             //文本收起状态,点击展开
-            jienjieH = CGFloat(lines)*height
+            jienjieH = self.jianjieLabel.height//size.height//CGFloat(lines)*height
         }else{
             //文本展开状态,点击收起
             jienjieH = 2*height+2