ecinc-cloud-yoabase 9.6.295 → 9.6.297

package/lib/ecyoabase.common.js

@@ -15411,7 +15411,7 @@ ___CSS_LOADER_EXPORT___.push([module.id, ".date_table_tree[data-v-228c62f6],.dat
 
 /***/ }),
 
-/***/ 6448:
+/***/ 4290:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -15425,7 +15425,7 @@ __webpack_require__.r(__webpack_exports__);
 
 var ___CSS_LOADER_EXPORT___ = _node_modules_css_loader_dist_runtime_api_js__WEBPACK_IMPORTED_MODULE_1___default()((_node_modules_css_loader_dist_runtime_noSourceMaps_js__WEBPACK_IMPORTED_MODULE_0___default()));
 // Module
-___CSS_LOADER_EXPORT___.push([module.id, ".top_app_popover[data-v-57c34baf]{width:100%;height:100%;-ms-flex-wrap:wrap;flex-wrap:wrap;-ms-flex-pack:distribute;justify-content:space-around;overflow:auto}.top_app_popover[data-v-57c34baf],.top_app_popover .item[data-v-57c34baf]{display:-webkit-box;display:-ms-flexbox;display:flex}.top_app_popover .item[data-v-57c34baf]{height:80px;background:#f1f3f8;font-size:var(--portalFontSize13);color:#333;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;margin:3px 0;cursor:pointer}.top_app_popover .item .spanName[data-v-57c34baf]{margin-top:8px}.top_app_popover .item[data-v-57c34baf]:hover{background:#eee}.top_app_popover[data-v-57c34baf]::-webkit-scrollbar{background-color:#fff;width:6px}.top_app_popover[data-v-57c34baf]::-webkit-scrollbar-thumb{border-radius:6px}.top_app_popover[data-v-57c34baf]:hover::-webkit-scrollbar-thumb{background-color:#d2d4da}", ""]);
+___CSS_LOADER_EXPORT___.push([module.id, ".top_app_popover[data-v-618e8f6a]{width:100%;height:100%;-ms-flex-wrap:wrap;flex-wrap:wrap;-ms-flex-pack:distribute;justify-content:space-around;overflow:auto}.top_app_popover[data-v-618e8f6a],.top_app_popover .item[data-v-618e8f6a]{display:-webkit-box;display:-ms-flexbox;display:flex}.top_app_popover .item[data-v-618e8f6a]{height:80px;background:#f1f3f8;font-size:var(--portalFontSize13);color:#333;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;margin:3px 0;cursor:pointer}.top_app_popover .item .spanName[data-v-618e8f6a]{margin-top:8px}.top_app_popover .item[data-v-618e8f6a]:hover{background:#eee}.top_app_popover[data-v-618e8f6a]::-webkit-scrollbar{background-color:#fff;width:6px}.top_app_popover[data-v-618e8f6a]::-webkit-scrollbar-thumb{border-radius:6px}.top_app_popover[data-v-618e8f6a]:hover::-webkit-scrollbar-thumb{background-color:#d2d4da}", ""]);
 // Exports
 /* harmony default export */ __webpack_exports__["default"] = (___CSS_LOADER_EXPORT___);
 
@@ -77770,7 +77770,7 @@ var update = add("8b1762cc", content, true, {"sourceMap":false,"shadowMode":fals
 
 /***/ }),
 
-/***/ 9382:
+/***/ 7001:
 /***/ (function(module, __unused_webpack_exports, __webpack_require__) {
 
 // style-loader: Adds some css to the DOM by adding a <style> tag
@@ -78122,19 +78122,19 @@ var update = add("3ffdea68", content, true, {"sourceMap":false,"shadowMode":fals
 
 /***/ }),
 
-/***/ 8258:
+/***/ 9468:
 /***/ (function(module, __unused_webpack_exports, __webpack_require__) {
 
 // style-loader: Adds some css to the DOM by adding a <style> tag
 
 // load the styles
-var content = __webpack_require__(6448);
+var content = __webpack_require__(4290);
 if(content.__esModule) content = content.default;
 if(typeof content === 'string') content = [[module.id, content, '']];
 if(content.locals) module.exports = content.locals;
 // add the styles to the DOM
 var add = (__webpack_require__(9548)/* ["default"] */ .A)
-var update = add("b1ea859a", content, true, {"sourceMap":false,"shadowMode":false});
+var update = add("0eb6f4d2", content, true, {"sourceMap":false,"shadowMode":false});
 
 /***/ }),
 
@@ -222219,7 +222219,7 @@ var Calendarvue_type_style_index_0_id_13d0ccc8_prod_scoped_true_lang_scss = __we
 ;// CONCATENATED MODULE: ./packages/ecyoa/yoabase/src/common/components/Calendar/index.vue?vue&type=style&index=0&id=13d0ccc8&prod&scoped=true&lang=scss
 
 // EXTERNAL MODULE: ./node_modules/vue-style-loader/index.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecyoa/yoabase/src/common/components/Calendar/index.vue?vue&type=style&index=1&id=13d0ccc8&prod&lang=scss
-var Calendarvue_type_style_index_1_id_13d0ccc8_prod_lang_scss = __webpack_require__(9382);
+var Calendarvue_type_style_index_1_id_13d0ccc8_prod_lang_scss = __webpack_require__(7001);
 ;// CONCATENATED MODULE: ./packages/ecyoa/yoabase/src/common/components/Calendar/index.vue?vue&type=style&index=1&id=13d0ccc8&prod&lang=scss
 
 ;// CONCATENATED MODULE: ./packages/ecyoa/yoabase/src/common/components/Calendar/index.vue
@@ -229249,8 +229249,8 @@ var OfdjsView_component = normalizeComponent(
 )
 
 /* harmony default export */ var OfdjsView = (OfdjsView_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/common/components/popover/appPopover.vue?vue&type=template&id=57c34baf&scoped=true
-var appPopovervue_type_template_id_57c34baf_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/common/components/popover/appPopover.vue?vue&type=template&id=618e8f6a&scoped=true
+var appPopovervue_type_template_id_618e8f6a_scoped_true_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -229297,7 +229297,7 @@ var appPopovervue_type_template_id_57c34baf_scoped_true_render = function render
     }]
   }, [_vm._v("暂无数据")])]], 2);
 };
-var appPopovervue_type_template_id_57c34baf_scoped_true_staticRenderFns = [];
+var appPopovervue_type_template_id_618e8f6a_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/common/components/popover/appPopover.vue?vue&type=script&lang=js
 /* harmony default export */ var appPopovervue_type_script_lang_js = ({
@@ -229436,6 +229436,8 @@ var appPopovervue_type_template_id_57c34baf_scoped_true_staticRenderFns = [];
           if (children[0].children[0].children) {
             if (children[0].children[0].children[0].meta.activeMenu != null) {
               this.href = children[0].children[0].children[0].meta.activeMenu + '?sys=' + sys.resName;
+            } else if (children[0].children[0].children[0].fullPath != null) {
+              this.href = children[0].children[0].children[0].fullPath + '?sys=' + sys.resName;
             }
           } else {
             if (children[0].children[0].meta.activeMenu != null) {
@@ -229463,31 +229465,21 @@ var appPopovervue_type_template_id_57c34baf_scoped_true_staticRenderFns = [];
       }
     },
     findChildren: function findChildren(routes, parentId) {
-      var _this2 = this;
       var children = [];
       routes.forEach(function (e) {
         if (e.meta && e.meta.parentId === parentId) {
           children.push(e);
         }
       });
-      if (children.length > 0) {
-        children.forEach(function (o) {
-          if (o.children && o.children.length > 0) {
-            return;
-          } else {
-            o.children = _this2.findChildren(_this2.routes, o.resId);
-          }
-        });
-      }
       return children;
     }
   }
 });
 ;// CONCATENATED MODULE: ./packages/ecyoa/yoabase/src/common/components/popover/appPopover.vue?vue&type=script&lang=js
  /* harmony default export */ var popover_appPopovervue_type_script_lang_js = (appPopovervue_type_script_lang_js); 
-// EXTERNAL MODULE: ./node_modules/vue-style-loader/index.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecyoa/yoabase/src/common/components/popover/appPopover.vue?vue&type=style&index=0&id=57c34baf&prod&scoped=true&lang=scss
-var appPopovervue_type_style_index_0_id_57c34baf_prod_scoped_true_lang_scss = __webpack_require__(8258);
-;// CONCATENATED MODULE: ./packages/ecyoa/yoabase/src/common/components/popover/appPopover.vue?vue&type=style&index=0&id=57c34baf&prod&scoped=true&lang=scss
+// EXTERNAL MODULE: ./node_modules/vue-style-loader/index.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecyoa/yoabase/src/common/components/popover/appPopover.vue?vue&type=style&index=0&id=618e8f6a&prod&scoped=true&lang=scss
+var appPopovervue_type_style_index_0_id_618e8f6a_prod_scoped_true_lang_scss = __webpack_require__(9468);
+;// CONCATENATED MODULE: ./packages/ecyoa/yoabase/src/common/components/popover/appPopover.vue?vue&type=style&index=0&id=618e8f6a&prod&scoped=true&lang=scss
 
 ;// CONCATENATED MODULE: ./packages/ecyoa/yoabase/src/common/components/popover/appPopover.vue
 
@@ -229500,11 +229492,11 @@ var appPopovervue_type_style_index_0_id_57c34baf_prod_scoped_true_lang_scss = __
 
 var appPopover_component = normalizeComponent(
   popover_appPopovervue_type_script_lang_js,
-  appPopovervue_type_template_id_57c34baf_scoped_true_render,
-  appPopovervue_type_template_id_57c34baf_scoped_true_staticRenderFns,
+  appPopovervue_type_template_id_618e8f6a_scoped_true_render,
+  appPopovervue_type_template_id_618e8f6a_scoped_true_staticRenderFns,
   false,
   null,
-  "57c34baf",
+  "618e8f6a",
   null
   
 )
@@ -240074,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', {
@@ -240115,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
 
@@ -240163,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; //表单标题栏高度
@@ -240271,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>';
@@ -240297,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);
@@ -240312,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);
       }
@@ -240325,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,
           // 增加渲染分辨率
@@ -240496,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

@@ -15421,7 +15421,7 @@ ___CSS_LOADER_EXPORT___.push([module.id, ".date_table_tree[data-v-228c62f6],.dat
 
 /***/ }),
 
-/***/ 2352:
+/***/ 6546:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -15435,7 +15435,7 @@ __webpack_require__.r(__webpack_exports__);
 
 var ___CSS_LOADER_EXPORT___ = _node_modules_css_loader_dist_runtime_api_js__WEBPACK_IMPORTED_MODULE_1___default()((_node_modules_css_loader_dist_runtime_noSourceMaps_js__WEBPACK_IMPORTED_MODULE_0___default()));
 // Module
-___CSS_LOADER_EXPORT___.push([module.id, ".top_app_popover[data-v-57c34baf]{width:100%;height:100%;-ms-flex-wrap:wrap;flex-wrap:wrap;-ms-flex-pack:distribute;justify-content:space-around;overflow:auto}.top_app_popover[data-v-57c34baf],.top_app_popover .item[data-v-57c34baf]{display:-webkit-box;display:-ms-flexbox;display:flex}.top_app_popover .item[data-v-57c34baf]{height:80px;background:#f1f3f8;font-size:var(--portalFontSize13);color:#333;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;margin:3px 0;cursor:pointer}.top_app_popover .item .spanName[data-v-57c34baf]{margin-top:8px}.top_app_popover .item[data-v-57c34baf]:hover{background:#eee}.top_app_popover[data-v-57c34baf]::-webkit-scrollbar{background-color:#fff;width:6px}.top_app_popover[data-v-57c34baf]::-webkit-scrollbar-thumb{border-radius:6px}.top_app_popover[data-v-57c34baf]:hover::-webkit-scrollbar-thumb{background-color:#d2d4da}", ""]);
+___CSS_LOADER_EXPORT___.push([module.id, ".top_app_popover[data-v-618e8f6a]{width:100%;height:100%;-ms-flex-wrap:wrap;flex-wrap:wrap;-ms-flex-pack:distribute;justify-content:space-around;overflow:auto}.top_app_popover[data-v-618e8f6a],.top_app_popover .item[data-v-618e8f6a]{display:-webkit-box;display:-ms-flexbox;display:flex}.top_app_popover .item[data-v-618e8f6a]{height:80px;background:#f1f3f8;font-size:var(--portalFontSize13);color:#333;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;margin:3px 0;cursor:pointer}.top_app_popover .item .spanName[data-v-618e8f6a]{margin-top:8px}.top_app_popover .item[data-v-618e8f6a]:hover{background:#eee}.top_app_popover[data-v-618e8f6a]::-webkit-scrollbar{background-color:#fff;width:6px}.top_app_popover[data-v-618e8f6a]::-webkit-scrollbar-thumb{border-radius:6px}.top_app_popover[data-v-618e8f6a]:hover::-webkit-scrollbar-thumb{background-color:#d2d4da}", ""]);
 // Exports
 /* harmony default export */ __webpack_exports__["default"] = (___CSS_LOADER_EXPORT___);
 
@@ -78132,19 +78132,19 @@ var update = add("e308a668", content, true, {"sourceMap":false,"shadowMode":fals
 
 /***/ }),
 
-/***/ 396:
+/***/ 1550:
 /***/ (function(module, __unused_webpack_exports, __webpack_require__) {
 
 // style-loader: Adds some css to the DOM by adding a <style> tag
 
 // load the styles
-var content = __webpack_require__(2352);
+var content = __webpack_require__(6546);
 if(content.__esModule) content = content.default;
 if(typeof content === 'string') content = [[module.id, content, '']];
 if(content.locals) module.exports = content.locals;
 // add the styles to the DOM
 var add = (__webpack_require__(9548)/* ["default"] */ .A)
-var update = add("73645f33", content, true, {"sourceMap":false,"shadowMode":false});
+var update = add("7603b0d2", content, true, {"sourceMap":false,"shadowMode":false});
 
 /***/ }),
 
@@ -229259,8 +229259,8 @@ var OfdjsView_component = normalizeComponent(
 )
 
 /* harmony default export */ var OfdjsView = (OfdjsView_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/common/components/popover/appPopover.vue?vue&type=template&id=57c34baf&scoped=true
-var appPopovervue_type_template_id_57c34baf_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/common/components/popover/appPopover.vue?vue&type=template&id=618e8f6a&scoped=true
+var appPopovervue_type_template_id_618e8f6a_scoped_true_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -229307,7 +229307,7 @@ var appPopovervue_type_template_id_57c34baf_scoped_true_render = function render
     }]
   }, [_vm._v("暂无数据")])]], 2);
 };
-var appPopovervue_type_template_id_57c34baf_scoped_true_staticRenderFns = [];
+var appPopovervue_type_template_id_618e8f6a_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/common/components/popover/appPopover.vue?vue&type=script&lang=js
 /* harmony default export */ var appPopovervue_type_script_lang_js = ({
@@ -229446,6 +229446,8 @@ var appPopovervue_type_template_id_57c34baf_scoped_true_staticRenderFns = [];
           if (children[0].children[0].children) {
             if (children[0].children[0].children[0].meta.activeMenu != null) {
               this.href = children[0].children[0].children[0].meta.activeMenu + '?sys=' + sys.resName;
+            } else if (children[0].children[0].children[0].fullPath != null) {
+              this.href = children[0].children[0].children[0].fullPath + '?sys=' + sys.resName;
             }
           } else {
             if (children[0].children[0].meta.activeMenu != null) {
@@ -229473,31 +229475,21 @@ var appPopovervue_type_template_id_57c34baf_scoped_true_staticRenderFns = [];
       }
     },
     findChildren: function findChildren(routes, parentId) {
-      var _this2 = this;
       var children = [];
       routes.forEach(function (e) {
         if (e.meta && e.meta.parentId === parentId) {
           children.push(e);
         }
       });
-      if (children.length > 0) {
-        children.forEach(function (o) {
-          if (o.children && o.children.length > 0) {
-            return;
-          } else {
-            o.children = _this2.findChildren(_this2.routes, o.resId);
-          }
-        });
-      }
       return children;
     }
   }
 });
 ;// CONCATENATED MODULE: ./packages/ecyoa/yoabase/src/common/components/popover/appPopover.vue?vue&type=script&lang=js
  /* harmony default export */ var popover_appPopovervue_type_script_lang_js = (appPopovervue_type_script_lang_js); 
-// EXTERNAL MODULE: ./node_modules/vue-style-loader/index.js??clonedRuleSet-64.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-64.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-64.use[2]!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-64.use[3]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-64.use[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecyoa/yoabase/src/common/components/popover/appPopover.vue?vue&type=style&index=0&id=57c34baf&prod&scoped=true&lang=scss
-var appPopovervue_type_style_index_0_id_57c34baf_prod_scoped_true_lang_scss = __webpack_require__(396);
-;// CONCATENATED MODULE: ./packages/ecyoa/yoabase/src/common/components/popover/appPopover.vue?vue&type=style&index=0&id=57c34baf&prod&scoped=true&lang=scss
+// EXTERNAL MODULE: ./node_modules/vue-style-loader/index.js??clonedRuleSet-64.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-64.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-64.use[2]!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-64.use[3]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-64.use[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecyoa/yoabase/src/common/components/popover/appPopover.vue?vue&type=style&index=0&id=618e8f6a&prod&scoped=true&lang=scss
+var appPopovervue_type_style_index_0_id_618e8f6a_prod_scoped_true_lang_scss = __webpack_require__(1550);
+;// CONCATENATED MODULE: ./packages/ecyoa/yoabase/src/common/components/popover/appPopover.vue?vue&type=style&index=0&id=618e8f6a&prod&scoped=true&lang=scss
 
 ;// CONCATENATED MODULE: ./packages/ecyoa/yoabase/src/common/components/popover/appPopover.vue
 
@@ -229510,11 +229502,11 @@ var appPopovervue_type_style_index_0_id_57c34baf_prod_scoped_true_lang_scss = __
 
 var appPopover_component = normalizeComponent(
   popover_appPopovervue_type_script_lang_js,
-  appPopovervue_type_template_id_57c34baf_scoped_true_render,
-  appPopovervue_type_template_id_57c34baf_scoped_true_staticRenderFns,
+  appPopovervue_type_template_id_618e8f6a_scoped_true_render,
+  appPopovervue_type_template_id_618e8f6a_scoped_true_staticRenderFns,
   false,
   null,
-  "57c34baf",
+  "618e8f6a",
   null
   
 )
@@ -240084,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', {
@@ -240125,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
 
@@ -240173,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; //表单标题栏高度
@@ -240281,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>';
@@ -240307,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);
@@ -240322,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);
       }
@@ -240335,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,
           // 增加渲染分辨率
@@ -240506,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
   
 )