ecinc-cloud-yoabase 9.6.274 → 9.6.276

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=30ef3fd2&scoped=true
+var PrintFilevue_type_template_id_30ef3fd2_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_30ef3fd2_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
 
@@ -240035,32 +240035,15 @@ var PrintFilevue_type_template_id_5d01eb32_scoped_true_staticRenderFns = [];
       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);
-              });
-            });
-          });
-          var timer = setInterval(function () {
-            if (printDiv.querySelectorAll('.print_formtb').length === 0) {
-              resolve(true);
-              clearInterval(timer);
-            }
-          }, 1000);
-        } else {
-          _this.saveWebformBase64data($scope, printDiv, 1).then(function (rst) {
-            resolve(true);
-          });
-        }
+        formTables.forEach(function (printtb, i) {
+          printtb.style.display = 'none';
+        });
+        printDiv.querySelectorAll('.page-splice').forEach(function (ps) {
+          ps.style.display = 'none';
+        });
+
+        //遍历formTables，一次只保存一个分页图片
+        _this.saveWebformBase64data($scope, formTables, 0, resolve);
       }).then(function (rst) {
         _this.$bus.emit('closeDoingDialog');
         if (rst) {
@@ -240073,36 +240056,46 @@ var PrintFilevue_type_template_id_5d01eb32_scoped_true_staticRenderFns = [];
         }
       });
     },
-    saveWebformBase64data: function saveWebformBase64data($scope, printDiv, pageNum) {
+    saveWebformBase64data: function saveWebformBase64data($scope, formTables, pageNum, resolve) {
       var _this2 = this;
-      return new Promise(function (resolve) {
-        html2canvas_default()(printDiv, {
-          dpi: 300,
-          scale: 2 // 添加的scale 参数
-        }).then(function (canvas) {
-          var dataURL = canvas.toDataURL('image/png');
-          _this2.$http({
-            method: 'POST',
-            url: '/gwgl/webForm/saveWebformBase64data',
-            params: {
-              busiDataId: $scope.wfInstance.busiDataId,
-              pageNum: pageNum
-            },
-            data: {
-              formBase64data: dataURL
-            }
-          }).then(function (res) {
-            if (res.code === 'success') {
+      var printDiv = ifrmPrint.contentDocument.querySelector('#print');
+      var printtb = formTables[pageNum++];
+      //只有第一页显示标题
+      if (pageNum !== 1) {
+        printDiv.querySelector('.form-header').style.display = 'none';
+      }
+      printtb.style.display = '';
+      html2canvas_default()(printDiv, {
+        dpi: 150,
+        scale: 1 // 添加的scale 参数
+      }).then(function (canvas) {
+        var dataURL = canvas.toDataURL('image/png');
+        printtb.style.display = 'none';
+        _this2.$http({
+          method: 'POST',
+          url: '/' + $scope.wfEngineUrl.split('/')[0] + '/webForm/saveWebformBase64data',
+          params: {
+            busiDataId: $scope.wfInstance.busiDataId,
+            pageNum: pageNum
+          },
+          data: {
+            formBase64data: dataURL
+          }
+        }).then(function (res) {
+          if (res.code === 'success') {
+            if (formTables.length === pageNum) {
               resolve(res);
             } else {
-              _this2.$message({
-                message: res.message,
-                type: 'warning'
-              });
+              _this2.saveWebformBase64data($scope, formTables, pageNum, resolve);
             }
-          }, function (err) {
-            _this2.$message.error(err);
-          });
+          } else {
+            _this2.$message({
+              message: res.message,
+              type: 'warning'
+            });
+          }
+        }, function (err) {
+          _this2.$message.error(err);
         });
       });
     },
@@ -240235,11 +240228,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_30ef3fd2_scoped_true_render,
+  PrintFilevue_type_template_id_30ef3fd2_scoped_true_staticRenderFns,
   false,
   null,
-  "5d01eb32",
+  "30ef3fd2",
   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=30ef3fd2&scoped=true
+var PrintFilevue_type_template_id_30ef3fd2_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_30ef3fd2_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
 
@@ -240045,32 +240045,15 @@ var PrintFilevue_type_template_id_5d01eb32_scoped_true_staticRenderFns = [];
       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);
-              });
-            });
-          });
-          var timer = setInterval(function () {
-            if (printDiv.querySelectorAll('.print_formtb').length === 0) {
-              resolve(true);
-              clearInterval(timer);
-            }
-          }, 1000);
-        } else {
-          _this.saveWebformBase64data($scope, printDiv, 1).then(function (rst) {
-            resolve(true);
-          });
-        }
+        formTables.forEach(function (printtb, i) {
+          printtb.style.display = 'none';
+        });
+        printDiv.querySelectorAll('.page-splice').forEach(function (ps) {
+          ps.style.display = 'none';
+        });
+
+        //遍历formTables，一次只保存一个分页图片
+        _this.saveWebformBase64data($scope, formTables, 0, resolve);
       }).then(function (rst) {
         _this.$bus.emit('closeDoingDialog');
         if (rst) {
@@ -240083,36 +240066,46 @@ var PrintFilevue_type_template_id_5d01eb32_scoped_true_staticRenderFns = [];
         }
       });
     },
-    saveWebformBase64data: function saveWebformBase64data($scope, printDiv, pageNum) {
+    saveWebformBase64data: function saveWebformBase64data($scope, formTables, pageNum, resolve) {
       var _this2 = this;
-      return new Promise(function (resolve) {
-        html2canvas_default()(printDiv, {
-          dpi: 300,
-          scale: 2 // 添加的scale 参数
-        }).then(function (canvas) {
-          var dataURL = canvas.toDataURL('image/png');
-          _this2.$http({
-            method: 'POST',
-            url: '/gwgl/webForm/saveWebformBase64data',
-            params: {
-              busiDataId: $scope.wfInstance.busiDataId,
-              pageNum: pageNum
-            },
-            data: {
-              formBase64data: dataURL
-            }
-          }).then(function (res) {
-            if (res.code === 'success') {
+      var printDiv = ifrmPrint.contentDocument.querySelector('#print');
+      var printtb = formTables[pageNum++];
+      //只有第一页显示标题
+      if (pageNum !== 1) {
+        printDiv.querySelector('.form-header').style.display = 'none';
+      }
+      printtb.style.display = '';
+      html2canvas_default()(printDiv, {
+        dpi: 150,
+        scale: 1 // 添加的scale 参数
+      }).then(function (canvas) {
+        var dataURL = canvas.toDataURL('image/png');
+        printtb.style.display = 'none';
+        _this2.$http({
+          method: 'POST',
+          url: '/' + $scope.wfEngineUrl.split('/')[0] + '/webForm/saveWebformBase64data',
+          params: {
+            busiDataId: $scope.wfInstance.busiDataId,
+            pageNum: pageNum
+          },
+          data: {
+            formBase64data: dataURL
+          }
+        }).then(function (res) {
+          if (res.code === 'success') {
+            if (formTables.length === pageNum) {
               resolve(res);
             } else {
-              _this2.$message({
-                message: res.message,
-                type: 'warning'
-              });
+              _this2.saveWebformBase64data($scope, formTables, pageNum, resolve);
             }
-          }, function (err) {
-            _this2.$message.error(err);
-          });
+          } else {
+            _this2.$message({
+              message: res.message,
+              type: 'warning'
+            });
+          }
+        }, function (err) {
+          _this2.$message.error(err);
         });
       });
     },
@@ -240245,11 +240238,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_30ef3fd2_scoped_true_render,
+  PrintFilevue_type_template_id_30ef3fd2_scoped_true_staticRenderFns,
   false,
   null,
-  "5d01eb32",
+  "30ef3fd2",
   null
   
 )