ecinc-cloud-yoabase 9.6.272 → 9.6.274

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=a82d6028&scoped=true
-var PrintFilevue_type_template_id_a82d6028_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=5d01eb32&scoped=true
+var PrintFilevue_type_template_id_5d01eb32_scoped_true_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -239987,7 +239987,7 @@ var PrintFilevue_type_template_id_a82d6028_scoped_true_render = function render(
     }
   })], 1);
 };
-var PrintFilevue_type_template_id_a82d6028_scoped_true_staticRenderFns = [];
+var PrintFilevue_type_template_id_5d01eb32_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
 
@@ -240033,37 +240033,76 @@ var PrintFilevue_type_template_id_a82d6028_scoped_true_staticRenderFns = [];
       var $scope = this.$vnode.context;
       // 返回base64图片地址
       var printDiv = ifrmPrint.contentDocument.querySelector('#print');
-      html2canvas_default()(printDiv, {
-        // async: true,
-        // dpi: window.devicePixelRatio * scale,
-        scale: 1 // 添加的scale 参数
-      }).then(function (canvas) {
-        var dataURL = canvas.toDataURL('image/png');
-        _this.$http({
-          method: 'POST',
-          url: '/gwgl/webForm/saveWebformBase64data',
-          params: {
-            busiDataId: $scope.wfInstance.busiDataId
-          },
-          data: {
-            formBase64data: dataURL
-          }
-        }).then(function (res) {
-          _this.$bus.emit('closeDoingDialog');
-          if (res.code === 'success') {
-            $scope.isShow = false;
-            var url = "/apigw" + '/' + $scope.wfEngineUrl.split('/')[0] + '/webForm/download?module=' + $scope.wfInstance.module + '&busiDataId=' + $scope.wfInstance.busiDataId;
-            if ($scope.wfInstance.module !== 'fawen') url += '&doc=true';
-            url += '&httpPort=' + location.port;
-            window.open(url);
-          } else {
-            _this.$message({
-              message: res.message,
-              type: 'warning'
+      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);
+              });
             });
-          }
-        }, function (err) {
-          _this.$message.error(err);
+          });
+          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);
+          });
+        }
+      }).then(function (rst) {
+        _this.$bus.emit('closeDoingDialog');
+        if (rst) {
+          $scope.isShow = false;
+          var url = "/apigw" + '/' + $scope.wfEngineUrl.split('/')[0] + '/webForm/download?module=' + $scope.wfInstance.module + '&busiDataId=' + $scope.wfInstance.busiDataId;
+          url += '&pageSize=' + formTables.length;
+          if ($scope.wfInstance.module !== 'fawen') url += '&doc=true';
+          url += '&httpPort=' + location.port;
+          window.open(url);
+        }
+      });
+    },
+    saveWebformBase64data: function saveWebformBase64data($scope, printDiv, pageNum) {
+      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') {
+              resolve(res);
+            } else {
+              _this2.$message({
+                message: res.message,
+                type: 'warning'
+              });
+            }
+          }, function (err) {
+            _this2.$message.error(err);
+          });
         });
       });
     },
@@ -240196,11 +240235,11 @@ var PrintFilevue_type_template_id_a82d6028_scoped_true_staticRenderFns = [];
 ;
 var PrintFile_component = normalizeComponent(
   components_PrintFilevue_type_script_lang_js,
-  PrintFilevue_type_template_id_a82d6028_scoped_true_render,
-  PrintFilevue_type_template_id_a82d6028_scoped_true_staticRenderFns,
+  PrintFilevue_type_template_id_5d01eb32_scoped_true_render,
+  PrintFilevue_type_template_id_5d01eb32_scoped_true_staticRenderFns,
   false,
   null,
-  "a82d6028",
+  "5d01eb32",
   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=a82d6028&scoped=true
-var PrintFilevue_type_template_id_a82d6028_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=5d01eb32&scoped=true
+var PrintFilevue_type_template_id_5d01eb32_scoped_true_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -239997,7 +239997,7 @@ var PrintFilevue_type_template_id_a82d6028_scoped_true_render = function render(
     }
   })], 1);
 };
-var PrintFilevue_type_template_id_a82d6028_scoped_true_staticRenderFns = [];
+var PrintFilevue_type_template_id_5d01eb32_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
 
@@ -240043,37 +240043,76 @@ var PrintFilevue_type_template_id_a82d6028_scoped_true_staticRenderFns = [];
       var $scope = this.$vnode.context;
       // 返回base64图片地址
       var printDiv = ifrmPrint.contentDocument.querySelector('#print');
-      html2canvas_default()(printDiv, {
-        // async: true,
-        // dpi: window.devicePixelRatio * scale,
-        scale: 1 // 添加的scale 参数
-      }).then(function (canvas) {
-        var dataURL = canvas.toDataURL('image/png');
-        _this.$http({
-          method: 'POST',
-          url: '/gwgl/webForm/saveWebformBase64data',
-          params: {
-            busiDataId: $scope.wfInstance.busiDataId
-          },
-          data: {
-            formBase64data: dataURL
-          }
-        }).then(function (res) {
-          _this.$bus.emit('closeDoingDialog');
-          if (res.code === 'success') {
-            $scope.isShow = false;
-            var url = "/apigw" + '/' + $scope.wfEngineUrl.split('/')[0] + '/webForm/download?module=' + $scope.wfInstance.module + '&busiDataId=' + $scope.wfInstance.busiDataId;
-            if ($scope.wfInstance.module !== 'fawen') url += '&doc=true';
-            url += '&httpPort=' + location.port;
-            window.open(url);
-          } else {
-            _this.$message({
-              message: res.message,
-              type: 'warning'
+      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);
+              });
             });
-          }
-        }, function (err) {
-          _this.$message.error(err);
+          });
+          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);
+          });
+        }
+      }).then(function (rst) {
+        _this.$bus.emit('closeDoingDialog');
+        if (rst) {
+          $scope.isShow = false;
+          var url = "/apigw" + '/' + $scope.wfEngineUrl.split('/')[0] + '/webForm/download?module=' + $scope.wfInstance.module + '&busiDataId=' + $scope.wfInstance.busiDataId;
+          url += '&pageSize=' + formTables.length;
+          if ($scope.wfInstance.module !== 'fawen') url += '&doc=true';
+          url += '&httpPort=' + location.port;
+          window.open(url);
+        }
+      });
+    },
+    saveWebformBase64data: function saveWebformBase64data($scope, printDiv, pageNum) {
+      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') {
+              resolve(res);
+            } else {
+              _this2.$message({
+                message: res.message,
+                type: 'warning'
+              });
+            }
+          }, function (err) {
+            _this2.$message.error(err);
+          });
         });
       });
     },
@@ -240206,11 +240245,11 @@ var PrintFilevue_type_template_id_a82d6028_scoped_true_staticRenderFns = [];
 ;
 var PrintFile_component = normalizeComponent(
   components_PrintFilevue_type_script_lang_js,
-  PrintFilevue_type_template_id_a82d6028_scoped_true_render,
-  PrintFilevue_type_template_id_a82d6028_scoped_true_staticRenderFns,
+  PrintFilevue_type_template_id_5d01eb32_scoped_true_render,
+  PrintFilevue_type_template_id_5d01eb32_scoped_true_staticRenderFns,
   false,
   null,
-  "a82d6028",
+  "5d01eb32",
   null
   
 )