Merge branch 'dev/v4.8.69_yf' of qmx/jy into feature/v4.8.69

src/web/staticres/css/dataSmt/dataMart.css

@@ -389,7 +389,7 @@
 }
 .dataMart .dataMart_dialog .content{
   width: 750px;
-  height: 674px;
+  /* height: 674px; */
   border-radius: 8px;
   position: absolute;
   left: 50%;
@@ -484,4 +484,9 @@ color: #1D1D1D;
   color: #2ABED1;
   text-decoration: underline;
   cursor: pointer;
- }
+ }
+@media screen and (max-height: 800px) {
+  .dataMart .dataMart_dialog .content .table_box{
+    height: 400px;
+  }
+}

src/web/templates/pc/dataExport_sieve.html

@@ -1585,8 +1585,13 @@
     var $progress = document.getElementById('progress_')
     $progress.scrollIntoView()
     sessionStorage.setItem('refresh', '1')
-    let redirectUrl = '/front/dataExport/toCreateOrderPage/' + dataNode._data.dataInfo._id
-    window.location.href = location.origin + redirectUrl + "?from=" + GetQueryString("from")+ "&type=" + dataNode.dataType +  "&source=" +GetQueryString("source")
+    var redirectUrl = '/front/dataExport/toCreateOrderPage/' + dataNode._data.dataInfo._id
+    var goHref = location.origin + redirectUrl + "?from=" + GetQueryString("from")+ "&type=" + dataNode.dataType +  "&source=" +GetQueryString("source")
+    if (goTemplateData.inIframe) {
+      window.parent.location.href = goHref
+    } else {
+      window.location.href = goHref
+    }
   })
 	function isIE(){
 		if(!!window.ActiveXObject || "ActiveXObject" in window){