Merge branch 'eta2.3.9_dw' into debug_dw

src/views/report/Detail.vue

@@ -95,6 +95,15 @@ async function getReportInfo() {
     } else {//无权限
       reportContent.value = modifyReportContentIframeData(reportInfo.value.ContentSub)
     }
+
+    // 智能研报将富文本盒子高度设置为自动
+    if(res.Data.Report.ReportLayout===2){
+      nextTick(()=>{
+        document.querySelectorAll('div[comp-type="text"]').forEach(function(div) {
+          div.style.height = 'auto';
+        });
+      })
+    }
   }
 }
 getReportInfo()
@@ -596,7 +605,7 @@ function handleTips () {
         flex-wrap: wrap;
         .report-drag-item-wrap_child_content{
           flex: none !important;
-          width: 100%;
+          width: 100% !important;
         }
       }
     }