ecinc-cloud-yoabase 9.6.274 → 9.6.277

package/lib/ecyoabase.common.js

@@ -239946,8 +239946,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=5d01eb32&scoped=true
-var PrintFilevue_type_template_id_5d01eb32_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=d4b340ae&scoped=true
+var PrintFilevue_type_template_id_d4b340ae_scoped_true_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -239987,7 +239987,7 @@ var PrintFilevue_type_template_id_5d01eb32_scoped_true_render = function render(
     }
   })], 1);
 };
-var PrintFilevue_type_template_id_5d01eb32_scoped_true_staticRenderFns = [];
+var PrintFilevue_type_template_id_d4b340ae_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
 
@@ -240031,59 +240031,167 @@ var PrintFilevue_type_template_id_5d01eb32_scoped_true_staticRenderFns = [];
     btnSaveAsDownloadClick: function btnSaveAsDownloadClick() {
       var _this = this;
       var $scope = this.$vnode.context;
-      // 返回base64图片地址
-      var printDiv = ifrmPrint.contentDocument.querySelector('#print');
-      var formTables = printDiv.querySelectorAll('.print_formtb');
-      new Promise(function (resolve) {
-        if (formTables.length > 1) {
-          printDiv.querySelectorAll('.print_formtb').forEach(function (printtb, i) {
-            printtb.style.display = 'none';
-          });
-          printDiv.querySelectorAll('.print_formtb').forEach(function (printtb, j) {
-            if (j !== 0) {
-              printDiv.querySelector('.form-header').display = 'none';
-            }
-            printtb.style.display = '';
-            _this.$nextTick(function () {
-              _this.saveWebformBase64data($scope, printDiv, j + 1).then(function (rst) {
-                printtb.parentElement.removeChild(printtb);
-              });
+      //A4纸210mm*297mm，按1英寸=25.41mm、96DPI（每英寸px数）、上下边距20mm计算，打印区域宽度为(210-20*2)/25.41*96=643px，打印区域高度为(297-20*2)/25.41*96=971px，
+      //web表单print：宽度为950px，根据A4打印区域比例转换高度为950/643*971=1434px
+      var pageHeight = 1434; //打印内容高度，根据高度计算分页
+      var blankHeight = 0; //空白高度
+
+      //处理单分页处理
+      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; //表单标题栏高度
+      var rowsHeight = 0;
+      var pageSize = 0;
+      var prevPositionY = 0;
+      var _loop = function _loop() {
+        var row = rows[r];
+        rowsHeight = headerHeight + row.offsetTop;
+        //超过一页，计算最后一页内容高度
+        if (pageSize > 0) {
+          rowsHeight -= pageHeight * pageSize;
+        }
+        if (rowsHeight + row.clientHeight > pageHeight) {
+          if (row.querySelectorAll('TR').length > 0 || row.querySelectorAll('.ideaDiv').length > 0) {
+            //内嵌子表
+            var subRows = row.querySelectorAll('TR');
+            if (subRows.length === 0) {
+              //处理意见栏
+              subRows = row.querySelectorAll('.ideaDiv');
+            }
+            subRows.forEach(function (subRow, subIndex) {
+              var subRowsHeight = rowsHeight + subRow.offsetTop;
+              var positionY = headerHeight + row.offsetTop + subRow.offsetTop;
+              if (subRow.tagName === 'TR' && subIndex > 0) {
+                //子表行数据，加上表头高度
+                subRowsHeight += row.querySelector('.el-table__header-wrapper').clientHeight;
+                positionY += row.querySelector('.el-table__header-wrapper').clientHeight;
+              }
+              //超过一页，计算最后一页内容高度
+              if (pageSize > 0) {
+                subRowsHeight -= pageHeight * pageSize;
+              }
+              if (subRowsHeight + subRow.clientHeight >= pageHeight) {
+                pageSize++;
+                subRow.classList.add('print_breakpage');
+                subRow.setAttribute('pageHeight', positionY - prevPositionY);
+                subRow.setAttribute('positionY', positionY);
+                prevPositionY = positionY;
+              }
             });
-          });
-          var timer = setInterval(function () {
-            if (printDiv.querySelectorAll('.print_formtb').length === 0) {
-              resolve(true);
-              clearInterval(timer);
+          } else if (row.clientHeight > pageHeight && r + 1 < rows.length) {
+            //单行高度超过页面高度，直接按页面高度截取
+            pageSize++;
+            row.classList.add('print_breakpage');
+            row.setAttribute('pageHeight', pageHeight);
+            row.setAttribute('positionY', prevPositionY + pageHeight);
+            prevPositionY = prevPositionY + pageHeight;
+            var remainderHeight = headerHeight + row.offsetTop + row.clientHeight - prevPositionY;
+
+            //剩余部分单独一页
+            row = rows[r + 1];
+            pageSize++;
+            row.classList.add('print_breakpage');
+            row.setAttribute('pageHeight', remainderHeight);
+            row.setAttribute('positionY', headerHeight + row.offsetTop);
+            prevPositionY = headerHeight + row.offsetTop;
+
+            //将剩余部分不足一页空白高度追加到标题栏高度
+            if (pageHeight > remainderHeight) {
+              blankHeight += pageHeight - remainderHeight;
+              headerHeight += pageHeight - remainderHeight;
             }
-          }, 1000);
+          } else {
+            pageSize++;
+            row.classList.add('print_breakpage');
+            row.setAttribute('pageHeight', headerHeight + row.offsetTop - prevPositionY);
+            row.setAttribute('positionY', headerHeight + row.offsetTop);
+            prevPositionY = headerHeight + row.offsetTop;
+          }
+        }
+      };
+      for (var r = 0; r < rows.length; r++) {
+        _loop();
+      }
+
+      //附件分页处理
+      var attachTitle = printDiv.querySelector('.sidebar-area-title');
+      rowsHeight = attachTitle.offsetTop + blankHeight;
+      //超过一页，计算最后一页内容高度
+      if (pageSize > 0) {
+        rowsHeight -= pageHeight * pageSize;
+      }
+      if (rowsHeight + attachTitle.getBoundingClientRect().height >= pageHeight) {
+        pageSize++;
+        attachTitle.classList.add('print_breakpage');
+        attachTitle.setAttribute('pageHeight', rowsHeight);
+        attachTitle.setAttribute('positionY', attachTitle.offsetTop);
+        rowsHeight = attachTitle.clientHeight + blankHeight;
+      } else {
+        rowsHeight += attachTitle.clientHeight;
+      }
+      var attachs = printDiv.querySelectorAll('.attach-row');
+      attachs.forEach(function (row, rindex) {
+        if (rowsHeight + row.getBoundingClientRect().height >= pageHeight) {
+          pageSize++;
+          row.classList.add('print_breakpage');
+          row.setAttribute('pageHeight', rowsHeight);
+          row.setAttribute('positionY', row.offsetTop);
+          rowsHeight = row.getBoundingClientRect().height + blankHeight;
         } else {
-          _this.saveWebformBase64data($scope, printDiv, 1).then(function (rst) {
-            resolve(true);
-          });
+          rowsHeight += row.getBoundingClientRect().height;
+        }
+      });
+      if (attachs.length === 0) {
+        rowsHeight += printDiv.querySelector('.sidebar-area-content').getBoundingClientRect().height;
+      }
+      rowsHeight += 15; //sidebar-area-content下边距
+      printDiv.innerHTML += '<span class="print_breakpage" pageHeight=' + rowsHeight + '></span>';
+
+      // 返回base64图片地址
+      var printPages = printDiv.querySelectorAll('.print_breakpage');
+      new Promise(function (resolve) {
+        if (printPages.length === 0) {
+          printPages = [printDiv];
         }
+        //遍历formTables，一次只保存一个分页图片
+        _this.saveWebformBase64data($scope, printPages, 0, 0, resolve);
       }).then(function (rst) {
         _this.$bus.emit('closeDoingDialog');
         if (rst) {
-          $scope.isShow = false;
+          //$scope.isShow = false
           var url = "/apigw" + '/' + $scope.wfEngineUrl.split('/')[0] + '/webForm/download?module=' + $scope.wfInstance.module + '&busiDataId=' + $scope.wfInstance.busiDataId;
-          url += '&pageSize=' + formTables.length;
+          url += '&pageSize=' + printPages.length;
           if ($scope.wfInstance.module !== 'fawen') url += '&doc=true';
           url += '&httpPort=' + location.port;
           window.open(url);
         }
       });
     },
-    saveWebformBase64data: function saveWebformBase64data($scope, printDiv, pageNum) {
+    saveWebformBase64data: function saveWebformBase64data($scope, printPages, pageNum, positionY, resolve) {
       var _this2 = this;
-      return new Promise(function (resolve) {
+      var printDiv = ifrmPrint.contentDocument.querySelector('.form-container-print');
+      var page = printPages[pageNum++];
+      var pageHeight = 1434;
+      if (page.attributes['pageHeight']) {
+        pageHeight = parseInt(page.attributes['pageHeight'].nodeValue);
+      }
+      if (pageHeight > 0) {
+        this.$bus.emit('showDoingDialog', '共' + printPages.length + '页，正在处理第' + pageNum + '页┉');
         html2canvas_default()(printDiv, {
-          dpi: 300,
-          scale: 2 // 添加的scale 参数
+          x: 0,
+          y: positionY,
+          width: 950,
+          height: pageHeight,
+          scale: 2,
+          // 增加渲染分辨率
+          dpi: 96,
+          logging: false
         }).then(function (canvas) {
           var dataURL = canvas.toDataURL('image/png');
           _this2.$http({
             method: 'POST',
-            url: '/gwgl/webForm/saveWebformBase64data',
+            url: '/' + $scope.wfEngineUrl.split('/')[0] + '/webForm/saveWebformBase64data',
             params: {
               busiDataId: $scope.wfInstance.busiDataId,
               pageNum: pageNum
@@ -240093,7 +240201,16 @@ var PrintFilevue_type_template_id_5d01eb32_scoped_true_staticRenderFns = [];
             }
           }).then(function (res) {
             if (res.code === 'success') {
-              resolve(res);
+              if (printPages.length === pageNum) {
+                resolve(res);
+              } else {
+                if (page.attributes['positionY']) {
+                  positionY = parseInt(page.attributes['positionY'].nodeValue);
+                } else {
+                  positionY += pageHeight;
+                }
+                _this2.saveWebformBase64data($scope, printPages, pageNum, positionY, resolve);
+              }
             } else {
               _this2.$message({
                 message: res.message,
@@ -240104,7 +240221,7 @@ var PrintFilevue_type_template_id_5d01eb32_scoped_true_staticRenderFns = [];
             _this2.$message.error(err);
           });
         });
-      });
+      }
     },
     btnToDuBan: function btnToDuBan($scope) {
       console.log(11, $scope);
@@ -240235,11 +240352,11 @@ var PrintFilevue_type_template_id_5d01eb32_scoped_true_staticRenderFns = [];
 ;
 var PrintFile_component = normalizeComponent(
   components_PrintFilevue_type_script_lang_js,
-  PrintFilevue_type_template_id_5d01eb32_scoped_true_render,
-  PrintFilevue_type_template_id_5d01eb32_scoped_true_staticRenderFns,
+  PrintFilevue_type_template_id_d4b340ae_scoped_true_render,
+  PrintFilevue_type_template_id_d4b340ae_scoped_true_staticRenderFns,
   false,
   null,
-  "5d01eb32",
+  "d4b340ae",
   null
   
 )

package/lib/ecyoabase.umd.js

@@ -239956,8 +239956,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=5d01eb32&scoped=true
-var PrintFilevue_type_template_id_5d01eb32_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=d4b340ae&scoped=true
+var PrintFilevue_type_template_id_d4b340ae_scoped_true_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -239997,7 +239997,7 @@ var PrintFilevue_type_template_id_5d01eb32_scoped_true_render = function render(
     }
   })], 1);
 };
-var PrintFilevue_type_template_id_5d01eb32_scoped_true_staticRenderFns = [];
+var PrintFilevue_type_template_id_d4b340ae_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
 
@@ -240041,59 +240041,167 @@ var PrintFilevue_type_template_id_5d01eb32_scoped_true_staticRenderFns = [];
     btnSaveAsDownloadClick: function btnSaveAsDownloadClick() {
       var _this = this;
       var $scope = this.$vnode.context;
-      // 返回base64图片地址
-      var printDiv = ifrmPrint.contentDocument.querySelector('#print');
-      var formTables = printDiv.querySelectorAll('.print_formtb');
-      new Promise(function (resolve) {
-        if (formTables.length > 1) {
-          printDiv.querySelectorAll('.print_formtb').forEach(function (printtb, i) {
-            printtb.style.display = 'none';
-          });
-          printDiv.querySelectorAll('.print_formtb').forEach(function (printtb, j) {
-            if (j !== 0) {
-              printDiv.querySelector('.form-header').display = 'none';
-            }
-            printtb.style.display = '';
-            _this.$nextTick(function () {
-              _this.saveWebformBase64data($scope, printDiv, j + 1).then(function (rst) {
-                printtb.parentElement.removeChild(printtb);
-              });
+      //A4纸210mm*297mm，按1英寸=25.41mm、96DPI（每英寸px数）、上下边距20mm计算，打印区域宽度为(210-20*2)/25.41*96=643px，打印区域高度为(297-20*2)/25.41*96=971px，
+      //web表单print：宽度为950px，根据A4打印区域比例转换高度为950/643*971=1434px
+      var pageHeight = 1434; //打印内容高度，根据高度计算分页
+      var blankHeight = 0; //空白高度
+
+      //处理单分页处理
+      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; //表单标题栏高度
+      var rowsHeight = 0;
+      var pageSize = 0;
+      var prevPositionY = 0;
+      var _loop = function _loop() {
+        var row = rows[r];
+        rowsHeight = headerHeight + row.offsetTop;
+        //超过一页，计算最后一页内容高度
+        if (pageSize > 0) {
+          rowsHeight -= pageHeight * pageSize;
+        }
+        if (rowsHeight + row.clientHeight > pageHeight) {
+          if (row.querySelectorAll('TR').length > 0 || row.querySelectorAll('.ideaDiv').length > 0) {
+            //内嵌子表
+            var subRows = row.querySelectorAll('TR');
+            if (subRows.length === 0) {
+              //处理意见栏
+              subRows = row.querySelectorAll('.ideaDiv');
+            }
+            subRows.forEach(function (subRow, subIndex) {
+              var subRowsHeight = rowsHeight + subRow.offsetTop;
+              var positionY = headerHeight + row.offsetTop + subRow.offsetTop;
+              if (subRow.tagName === 'TR' && subIndex > 0) {
+                //子表行数据，加上表头高度
+                subRowsHeight += row.querySelector('.el-table__header-wrapper').clientHeight;
+                positionY += row.querySelector('.el-table__header-wrapper').clientHeight;
+              }
+              //超过一页，计算最后一页内容高度
+              if (pageSize > 0) {
+                subRowsHeight -= pageHeight * pageSize;
+              }
+              if (subRowsHeight + subRow.clientHeight >= pageHeight) {
+                pageSize++;
+                subRow.classList.add('print_breakpage');
+                subRow.setAttribute('pageHeight', positionY - prevPositionY);
+                subRow.setAttribute('positionY', positionY);
+                prevPositionY = positionY;
+              }
             });
-          });
-          var timer = setInterval(function () {
-            if (printDiv.querySelectorAll('.print_formtb').length === 0) {
-              resolve(true);
-              clearInterval(timer);
+          } else if (row.clientHeight > pageHeight && r + 1 < rows.length) {
+            //单行高度超过页面高度，直接按页面高度截取
+            pageSize++;
+            row.classList.add('print_breakpage');
+            row.setAttribute('pageHeight', pageHeight);
+            row.setAttribute('positionY', prevPositionY + pageHeight);
+            prevPositionY = prevPositionY + pageHeight;
+            var remainderHeight = headerHeight + row.offsetTop + row.clientHeight - prevPositionY;
+
+            //剩余部分单独一页
+            row = rows[r + 1];
+            pageSize++;
+            row.classList.add('print_breakpage');
+            row.setAttribute('pageHeight', remainderHeight);
+            row.setAttribute('positionY', headerHeight + row.offsetTop);
+            prevPositionY = headerHeight + row.offsetTop;
+
+            //将剩余部分不足一页空白高度追加到标题栏高度
+            if (pageHeight > remainderHeight) {
+              blankHeight += pageHeight - remainderHeight;
+              headerHeight += pageHeight - remainderHeight;
             }
-          }, 1000);
+          } else {
+            pageSize++;
+            row.classList.add('print_breakpage');
+            row.setAttribute('pageHeight', headerHeight + row.offsetTop - prevPositionY);
+            row.setAttribute('positionY', headerHeight + row.offsetTop);
+            prevPositionY = headerHeight + row.offsetTop;
+          }
+        }
+      };
+      for (var r = 0; r < rows.length; r++) {
+        _loop();
+      }
+
+      //附件分页处理
+      var attachTitle = printDiv.querySelector('.sidebar-area-title');
+      rowsHeight = attachTitle.offsetTop + blankHeight;
+      //超过一页，计算最后一页内容高度
+      if (pageSize > 0) {
+        rowsHeight -= pageHeight * pageSize;
+      }
+      if (rowsHeight + attachTitle.getBoundingClientRect().height >= pageHeight) {
+        pageSize++;
+        attachTitle.classList.add('print_breakpage');
+        attachTitle.setAttribute('pageHeight', rowsHeight);
+        attachTitle.setAttribute('positionY', attachTitle.offsetTop);
+        rowsHeight = attachTitle.clientHeight + blankHeight;
+      } else {
+        rowsHeight += attachTitle.clientHeight;
+      }
+      var attachs = printDiv.querySelectorAll('.attach-row');
+      attachs.forEach(function (row, rindex) {
+        if (rowsHeight + row.getBoundingClientRect().height >= pageHeight) {
+          pageSize++;
+          row.classList.add('print_breakpage');
+          row.setAttribute('pageHeight', rowsHeight);
+          row.setAttribute('positionY', row.offsetTop);
+          rowsHeight = row.getBoundingClientRect().height + blankHeight;
         } else {
-          _this.saveWebformBase64data($scope, printDiv, 1).then(function (rst) {
-            resolve(true);
-          });
+          rowsHeight += row.getBoundingClientRect().height;
+        }
+      });
+      if (attachs.length === 0) {
+        rowsHeight += printDiv.querySelector('.sidebar-area-content').getBoundingClientRect().height;
+      }
+      rowsHeight += 15; //sidebar-area-content下边距
+      printDiv.innerHTML += '<span class="print_breakpage" pageHeight=' + rowsHeight + '></span>';
+
+      // 返回base64图片地址
+      var printPages = printDiv.querySelectorAll('.print_breakpage');
+      new Promise(function (resolve) {
+        if (printPages.length === 0) {
+          printPages = [printDiv];
         }
+        //遍历formTables，一次只保存一个分页图片
+        _this.saveWebformBase64data($scope, printPages, 0, 0, resolve);
       }).then(function (rst) {
         _this.$bus.emit('closeDoingDialog');
         if (rst) {
-          $scope.isShow = false;
+          //$scope.isShow = false
           var url = "/apigw" + '/' + $scope.wfEngineUrl.split('/')[0] + '/webForm/download?module=' + $scope.wfInstance.module + '&busiDataId=' + $scope.wfInstance.busiDataId;
-          url += '&pageSize=' + formTables.length;
+          url += '&pageSize=' + printPages.length;
           if ($scope.wfInstance.module !== 'fawen') url += '&doc=true';
           url += '&httpPort=' + location.port;
           window.open(url);
         }
       });
     },
-    saveWebformBase64data: function saveWebformBase64data($scope, printDiv, pageNum) {
+    saveWebformBase64data: function saveWebformBase64data($scope, printPages, pageNum, positionY, resolve) {
       var _this2 = this;
-      return new Promise(function (resolve) {
+      var printDiv = ifrmPrint.contentDocument.querySelector('.form-container-print');
+      var page = printPages[pageNum++];
+      var pageHeight = 1434;
+      if (page.attributes['pageHeight']) {
+        pageHeight = parseInt(page.attributes['pageHeight'].nodeValue);
+      }
+      if (pageHeight > 0) {
+        this.$bus.emit('showDoingDialog', '共' + printPages.length + '页，正在处理第' + pageNum + '页┉');
         html2canvas_default()(printDiv, {
-          dpi: 300,
-          scale: 2 // 添加的scale 参数
+          x: 0,
+          y: positionY,
+          width: 950,
+          height: pageHeight,
+          scale: 2,
+          // 增加渲染分辨率
+          dpi: 96,
+          logging: false
         }).then(function (canvas) {
           var dataURL = canvas.toDataURL('image/png');
           _this2.$http({
             method: 'POST',
-            url: '/gwgl/webForm/saveWebformBase64data',
+            url: '/' + $scope.wfEngineUrl.split('/')[0] + '/webForm/saveWebformBase64data',
             params: {
               busiDataId: $scope.wfInstance.busiDataId,
               pageNum: pageNum
@@ -240103,7 +240211,16 @@ var PrintFilevue_type_template_id_5d01eb32_scoped_true_staticRenderFns = [];
             }
           }).then(function (res) {
             if (res.code === 'success') {
-              resolve(res);
+              if (printPages.length === pageNum) {
+                resolve(res);
+              } else {
+                if (page.attributes['positionY']) {
+                  positionY = parseInt(page.attributes['positionY'].nodeValue);
+                } else {
+                  positionY += pageHeight;
+                }
+                _this2.saveWebformBase64data($scope, printPages, pageNum, positionY, resolve);
+              }
             } else {
               _this2.$message({
                 message: res.message,
@@ -240114,7 +240231,7 @@ var PrintFilevue_type_template_id_5d01eb32_scoped_true_staticRenderFns = [];
             _this2.$message.error(err);
           });
         });
-      });
+      }
     },
     btnToDuBan: function btnToDuBan($scope) {
       console.log(11, $scope);
@@ -240245,11 +240362,11 @@ var PrintFilevue_type_template_id_5d01eb32_scoped_true_staticRenderFns = [];
 ;
 var PrintFile_component = normalizeComponent(
   components_PrintFilevue_type_script_lang_js,
-  PrintFilevue_type_template_id_5d01eb32_scoped_true_render,
-  PrintFilevue_type_template_id_5d01eb32_scoped_true_staticRenderFns,
+  PrintFilevue_type_template_id_d4b340ae_scoped_true_render,
+  PrintFilevue_type_template_id_d4b340ae_scoped_true_staticRenderFns,
   false,
   null,
-  "5d01eb32",
+  "d4b340ae",
   null
   
 )