ecinc-cloud-yoabase 9.6.296 → 9.6.298

package/lib/ecyoabase.common.js

@@ -240066,8 +240066,8 @@ var InlineTextEditor_component = normalizeComponent(
 )
 
 /* harmony default export */ var InlineTextEditor = (InlineTextEditor_component.exports);
-;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecyoa/yoabase/src/workflow/wfInstance/mainform/components/PrintFile.vue?vue&type=template&id=4070b204&scoped=true
-var PrintFilevue_type_template_id_4070b204_scoped_true_render = function render() {
+;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecyoa/yoabase/src/workflow/wfInstance/mainform/components/PrintFile.vue?vue&type=template&id=3a381c2a&scoped=true
+var PrintFilevue_type_template_id_3a381c2a_scoped_true_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -240107,7 +240107,7 @@ var PrintFilevue_type_template_id_4070b204_scoped_true_render = function render(
     }
   })], 1);
 };
-var PrintFilevue_type_template_id_4070b204_scoped_true_staticRenderFns = [];
+var PrintFilevue_type_template_id_3a381c2a_scoped_true_staticRenderFns = [];
 
 ;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecyoa/yoabase/src/workflow/wfInstance/mainform/components/PrintFile.vue?vue&type=script&lang=js
 
@@ -240155,9 +240155,17 @@ var PrintFilevue_type_template_id_4070b204_scoped_true_staticRenderFns = [];
       //web表单print：宽度为950px，根据A4打印区域比例转换高度为950/643*971=1434px
       var pageHeight = 1434; //打印内容高度，根据高度计算分页
       var blankHeight = 0; //空白高度
+      var landscape = 0;
+      var printDiv = ifrmPrint.contentDocument.querySelector('.form-container-print');
+      // 仅查找td标签下的.el-table
+      var innerTables = Array.from(printDiv.querySelectorAll('td .el-table'));
+      if (innerTables.length > 0) {
+        //横板打印宽度1200px,边距112，根据A4打印区域比较转换高度为(1200-112*2)*(210/297)
+        pageHeight = 690;
+        landscape = 1;
+      }
 
       //处理单分页处理
-      var printDiv = ifrmPrint.contentDocument.querySelector('.form-container-print');
       printDiv.style.paddingTop = '0px';
       var rows = printDiv.querySelector('tbody').children;
       var headerHeight = printDiv.querySelector('.form-header').getBoundingClientRect().height; //表单标题栏高度
@@ -240263,7 +240271,7 @@ var PrintFilevue_type_template_id_4070b204_scoped_true_staticRenderFns = [];
         }
       });
       if (attachs.length === 0) {
-        rowsHeight += printDiv.querySelector('.sidebar-area-content').getBoundingClientRect().height;
+        rowsHeight += printDiv.querySelector('.sidebar-area-content').getBoundingClientRect().height + 20;
       }
       rowsHeight += 15; //sidebar-area-content下边距
       printDiv.innerHTML += '<span class="print_breakpage" pageHeight=' + rowsHeight + '></span>';
@@ -240289,7 +240297,7 @@ var PrintFilevue_type_template_id_4070b204_scoped_true_staticRenderFns = [];
           } else {
             //另存为下载处理单、正文、附件自动打开下载链接
             var url = "/apigw" + '/' + $scope.wfEngineUrl.split('/')[0] + '/webForm/download?module=' + $scope.wfInstance.module + '&busiDataId=' + $scope.wfInstance.busiDataId;
-            url += '&pageSize=' + printPages.length;
+            url += '&pageSize=' + printPages.length + '&landscape=' + landscape;
             if ($scope.wfInstance.module !== 'fawen') url += '&doc=true';
             url += '&httpPort=' + location.port;
             window.open(url);
@@ -240304,6 +240312,13 @@ var PrintFilevue_type_template_id_4070b204_scoped_true_staticRenderFns = [];
       var printDiv = ifrmPrint.contentDocument.querySelector('.form-container-print');
       var page = printPages[pageNum++];
       var pageHeight = 1434;
+      var pageWidth = 950;
+      // 仅查找td标签下的.el-table
+      var innerTables = Array.from(printDiv.querySelectorAll('td .el-table'));
+      if (innerTables.length > 0) {
+        pageHeight = 690;
+        pageWidth = 1200;
+      }
       if (page.attributes['pageHeight']) {
         pageHeight = parseInt(page.attributes['pageHeight'].nodeValue);
       }
@@ -240317,7 +240332,7 @@ var PrintFilevue_type_template_id_4070b204_scoped_true_staticRenderFns = [];
         html2canvas_default()(printDiv, {
           x: 0,
           y: positionY,
-          width: 950,
+          width: pageWidth,
           height: pageHeight,
           scale: 2,
           // 增加渲染分辨率
@@ -240488,11 +240503,11 @@ var PrintFilevue_type_template_id_4070b204_scoped_true_staticRenderFns = [];
 ;
 var PrintFile_component = normalizeComponent(
   components_PrintFilevue_type_script_lang_js,
-  PrintFilevue_type_template_id_4070b204_scoped_true_render,
-  PrintFilevue_type_template_id_4070b204_scoped_true_staticRenderFns,
+  PrintFilevue_type_template_id_3a381c2a_scoped_true_render,
+  PrintFilevue_type_template_id_3a381c2a_scoped_true_staticRenderFns,
   false,
   null,
-  "4070b204",
+  "3a381c2a",
   null
   
 )

package/lib/ecyoabase.umd.js

@@ -240076,8 +240076,8 @@ var InlineTextEditor_component = normalizeComponent(
 )
 
 /* harmony default export */ var InlineTextEditor = (InlineTextEditor_component.exports);
-;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-82.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecyoa/yoabase/src/workflow/wfInstance/mainform/components/PrintFile.vue?vue&type=template&id=4070b204&scoped=true
-var PrintFilevue_type_template_id_4070b204_scoped_true_render = function render() {
+;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-82.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecyoa/yoabase/src/workflow/wfInstance/mainform/components/PrintFile.vue?vue&type=template&id=3a381c2a&scoped=true
+var PrintFilevue_type_template_id_3a381c2a_scoped_true_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -240117,7 +240117,7 @@ var PrintFilevue_type_template_id_4070b204_scoped_true_render = function render(
     }
   })], 1);
 };
-var PrintFilevue_type_template_id_4070b204_scoped_true_staticRenderFns = [];
+var PrintFilevue_type_template_id_3a381c2a_scoped_true_staticRenderFns = [];
 
 ;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-82.use[0]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecyoa/yoabase/src/workflow/wfInstance/mainform/components/PrintFile.vue?vue&type=script&lang=js
 
@@ -240165,9 +240165,17 @@ var PrintFilevue_type_template_id_4070b204_scoped_true_staticRenderFns = [];
       //web表单print：宽度为950px，根据A4打印区域比例转换高度为950/643*971=1434px
       var pageHeight = 1434; //打印内容高度，根据高度计算分页
       var blankHeight = 0; //空白高度
+      var landscape = 0;
+      var printDiv = ifrmPrint.contentDocument.querySelector('.form-container-print');
+      // 仅查找td标签下的.el-table
+      var innerTables = Array.from(printDiv.querySelectorAll('td .el-table'));
+      if (innerTables.length > 0) {
+        //横板打印宽度1200px,边距112，根据A4打印区域比较转换高度为(1200-112*2)*(210/297)
+        pageHeight = 690;
+        landscape = 1;
+      }
 
       //处理单分页处理
-      var printDiv = ifrmPrint.contentDocument.querySelector('.form-container-print');
       printDiv.style.paddingTop = '0px';
       var rows = printDiv.querySelector('tbody').children;
       var headerHeight = printDiv.querySelector('.form-header').getBoundingClientRect().height; //表单标题栏高度
@@ -240273,7 +240281,7 @@ var PrintFilevue_type_template_id_4070b204_scoped_true_staticRenderFns = [];
         }
       });
       if (attachs.length === 0) {
-        rowsHeight += printDiv.querySelector('.sidebar-area-content').getBoundingClientRect().height;
+        rowsHeight += printDiv.querySelector('.sidebar-area-content').getBoundingClientRect().height + 20;
       }
       rowsHeight += 15; //sidebar-area-content下边距
       printDiv.innerHTML += '<span class="print_breakpage" pageHeight=' + rowsHeight + '></span>';
@@ -240299,7 +240307,7 @@ var PrintFilevue_type_template_id_4070b204_scoped_true_staticRenderFns = [];
           } else {
             //另存为下载处理单、正文、附件自动打开下载链接
             var url = "/apigw" + '/' + $scope.wfEngineUrl.split('/')[0] + '/webForm/download?module=' + $scope.wfInstance.module + '&busiDataId=' + $scope.wfInstance.busiDataId;
-            url += '&pageSize=' + printPages.length;
+            url += '&pageSize=' + printPages.length + '&landscape=' + landscape;
             if ($scope.wfInstance.module !== 'fawen') url += '&doc=true';
             url += '&httpPort=' + location.port;
             window.open(url);
@@ -240314,6 +240322,13 @@ var PrintFilevue_type_template_id_4070b204_scoped_true_staticRenderFns = [];
       var printDiv = ifrmPrint.contentDocument.querySelector('.form-container-print');
       var page = printPages[pageNum++];
       var pageHeight = 1434;
+      var pageWidth = 950;
+      // 仅查找td标签下的.el-table
+      var innerTables = Array.from(printDiv.querySelectorAll('td .el-table'));
+      if (innerTables.length > 0) {
+        pageHeight = 690;
+        pageWidth = 1200;
+      }
       if (page.attributes['pageHeight']) {
         pageHeight = parseInt(page.attributes['pageHeight'].nodeValue);
       }
@@ -240327,7 +240342,7 @@ var PrintFilevue_type_template_id_4070b204_scoped_true_staticRenderFns = [];
         html2canvas_default()(printDiv, {
           x: 0,
           y: positionY,
-          width: 950,
+          width: pageWidth,
           height: pageHeight,
           scale: 2,
           // 增加渲染分辨率
@@ -240498,11 +240513,11 @@ var PrintFilevue_type_template_id_4070b204_scoped_true_staticRenderFns = [];
 ;
 var PrintFile_component = normalizeComponent(
   components_PrintFilevue_type_script_lang_js,
-  PrintFilevue_type_template_id_4070b204_scoped_true_render,
-  PrintFilevue_type_template_id_4070b204_scoped_true_staticRenderFns,
+  PrintFilevue_type_template_id_3a381c2a_scoped_true_render,
+  PrintFilevue_type_template_id_3a381c2a_scoped_true_staticRenderFns,
   false,
   null,
-  "4070b204",
+  "3a381c2a",
   null
   
 )