ecinc-cloud-yoabase 9.6.271 → 9.6.272

package/lib/ecyoabase.common.js

@@ -239946,17 +239946,18 @@ 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=db84b5ba&scoped=true
-var PrintFilevue_type_template_id_db84b5ba_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=a82d6028&scoped=true
+var PrintFilevue_type_template_id_a82d6028_scoped_true_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
-  return _c('div', [_c('el-button', {
+  return _c('div', {
     directives: [{
       name: "show",
       rawName: "v-show",
-      value: false,
-      expression: "false"
-    }],
+      value: true,
+      expression: "true"
+    }]
+  }, [_c('el-button', {
     attrs: {
       "id": "btnSaveSignedfile",
       "type": "default"
@@ -239965,12 +239966,6 @@ var PrintFilevue_type_template_id_db84b5ba_scoped_true_render = function render(
       "click": _vm.btnSaveSignedfile
     }
   }), _c('el-button', {
-    directives: [{
-      name: "show",
-      rawName: "v-show",
-      value: false,
-      expression: "false"
-    }],
     attrs: {
       "id": "btnShowInstall",
       "type": "default"
@@ -239978,17 +239973,24 @@ var PrintFilevue_type_template_id_db84b5ba_scoped_true_render = function render(
     on: {
       "click": _vm.btnShowInstallClick
     }
-  }), _c('print', {
-    ref: "print",
+  }), _c('iframe', {
     attrs: {
-      "type": 'saveas',
-      "name": "print"
+      "id": "ifrmPrint"
+    }
+  }), _c('el-button', {
+    attrs: {
+      "id": "btnSaveAsDownloadClick",
+      "type": "default"
+    },
+    on: {
+      "click": _vm.btnSaveAsDownloadClick
     }
   })], 1);
 };
-var PrintFilevue_type_template_id_db84b5ba_scoped_true_staticRenderFns = [];
+var PrintFilevue_type_template_id_a82d6028_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
+
 /* harmony default export */ var PrintFilevue_type_script_lang_js = ({
   props: {},
   data: function data() {
@@ -240005,89 +240007,76 @@ var PrintFilevue_type_template_id_db84b5ba_scoped_true_staticRenderFns = [];
   computed: {},
   watch: {},
   created: function created() {
-    var _this2 = this;
-    this.$options.components['print'] = this.$loadComponent('@/wapp/workflow/wfInstance/mainform/print');
-    var $scope = this.$vnode.context;
+    this.$bus.on('btnSaveAsClick', this.btnSaveAsClick);
     this.$bus.on('btnPrintWebFormClick', this.btnPrintWebFormClick);
     this.$bus.on('btnPrintFileClick', this.btnPrintFileClick);
     this.$bus.on('btnPrintGzClick', this.btnPrintGzClick);
-    this.$bus.on('btnSaveAsClick', this.btnSaveAsClick);
     this.$bus.on('btnStampClick', this.btnStampClick);
     this.$bus.on('btnToDuBan', this.btnToDuBan);
-    this.$bus.on('dataurl', function (res) {
-      if (res) {
-        var _this = _this2;
-        _this2.dataURL = res;
-        _this2.$nextTick(function () {
-          if (_this2.dataURL) {
-            _this2.$bus.emit('showDoingDialog');
-
-            // this.dataURL = this.dataURL.split('data:image/png;base64,')[1]
-            _this2.$http({
-              method: 'POST',
-              url: '/gwgl/webForm/saveWebformBase64data',
-              params: {
-                busiDataId: $scope.wfInstance.busiDataId
-              },
-              data: {
-                formBase64data: _this2.dataURL
-              }
-            }).then(function (res) {
-              _this2.$bus.emit('closeDoingDialog');
-              if (res.code === 'success') {
-                _this.$parent.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 {
-                _this2.$message({
-                  message: res.message,
-                  type: 'warning'
-                });
-              }
-            }, function (err) {
-              _this2.$message.error(err);
-            });
-          }
-        });
-      }
-    });
   },
   beforeDestroy: function beforeDestroy() {
+    this.$bus.off('btnSaveAsClick', this.btnSaveAsClick);
     this.$bus.off('btnPrintWebFormClick', this.btnPrintWebFormClick);
     this.$bus.off('btnPrintFileClick', this.btnPrintFileClick);
     this.$bus.off('btnPrintGzClick', this.btnPrintGzClick);
-    this.$bus.off('btnSaveAsClick', this.btnSaveAsClick);
     this.$bus.off('btnStampClick', this.btnStampClick);
     this.$bus.off('btnToDuBan', this.btnToDuBan);
-    this.$bus.off('dataurl');
   },
   mounted: function mounted() {},
   methods: {
+    btnSaveAsClick: function btnSaveAsClick() {
+      this.$bus.emit('showDoingDialog');
+      ifrmPrint.src = location.href.replace('/wflow?', '/print?') + '&saveAs=true';
+    },
+    btnSaveAsDownloadClick: function btnSaveAsDownloadClick() {
+      var _this = this;
+      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'
+            });
+          }
+        }, function (err) {
+          _this.$message.error(err);
+        });
+      });
+    },
     btnToDuBan: function btnToDuBan($scope) {
       console.log(11, $scope);
       window.open('/#/wflow?wfEngineUrl=dbgl/itemApply&busiCode=itemApply&wfName=督办立项&startNodeName=&title=' + $scope.vo.flSubject);
     },
     btnPrintWebFormClick: function btnPrintWebFormClick($scope) {
-      console.log(91, $scope);
       // let url = process.env.VUE_APP_BASE_API + '/' + $scope.wfEngineUrl.split('/')[0] + '/webForm/print?inline=true&module=' + $scope.wfInstance.module + '&busiDataId=' + $scope.wfInstance.busiDataId
       // url += '&httpPort=' + location.port
       var params = location.href.split('?')[1];
       window.open('#/print?' + params);
     },
-    btnSaveAsClick: function btnSaveAsClick($scope) {
-      if ($scope.attachments.length === 0) {
-        this.$alert(this.$tx('yoabase.alerts.notAttach', '当前文件没有附件。'), this.$tx('common.operationTip', '操作提示'), {
-          type: 'warning'
-        });
-        return;
-      }
-      this.$scope = $scope;
-      // let url = process.env.VUE_APP_BASE_API + '/' + $scope.wfEngineUrl.split('/')[0] + '/webForm/download?module=' + $scope.wfInstance.module + '&busiDataId=' + $scope.wfInstance.busiDataId
-      // url += '&httpPort=' + location.port
-      // window.open(url)
-    },
     btnPrintFileClick: function btnPrintFileClick($scope) {
       if ($scope.bodyfile === null || $scope.bodyfile.id === undefined) {
         this.$alert(this.$tx('yoabase.alerts.notPrBodyFile', '当前文件没有可打印正文文件。'), this.$tx('common.operationTip', '操作提示'), {
@@ -240207,11 +240196,11 @@ var PrintFilevue_type_template_id_db84b5ba_scoped_true_staticRenderFns = [];
 ;
 var PrintFile_component = normalizeComponent(
   components_PrintFilevue_type_script_lang_js,
-  PrintFilevue_type_template_id_db84b5ba_scoped_true_render,
-  PrintFilevue_type_template_id_db84b5ba_scoped_true_staticRenderFns,
+  PrintFilevue_type_template_id_a82d6028_scoped_true_render,
+  PrintFilevue_type_template_id_a82d6028_scoped_true_staticRenderFns,
   false,
   null,
-  "db84b5ba",
+  "a82d6028",
   null
   
 )

package/lib/ecyoabase.umd.js

@@ -239956,17 +239956,18 @@ 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=db84b5ba&scoped=true
-var PrintFilevue_type_template_id_db84b5ba_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=a82d6028&scoped=true
+var PrintFilevue_type_template_id_a82d6028_scoped_true_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
-  return _c('div', [_c('el-button', {
+  return _c('div', {
     directives: [{
       name: "show",
       rawName: "v-show",
-      value: false,
-      expression: "false"
-    }],
+      value: true,
+      expression: "true"
+    }]
+  }, [_c('el-button', {
     attrs: {
       "id": "btnSaveSignedfile",
       "type": "default"
@@ -239975,12 +239976,6 @@ var PrintFilevue_type_template_id_db84b5ba_scoped_true_render = function render(
       "click": _vm.btnSaveSignedfile
     }
   }), _c('el-button', {
-    directives: [{
-      name: "show",
-      rawName: "v-show",
-      value: false,
-      expression: "false"
-    }],
     attrs: {
       "id": "btnShowInstall",
       "type": "default"
@@ -239988,17 +239983,24 @@ var PrintFilevue_type_template_id_db84b5ba_scoped_true_render = function render(
     on: {
       "click": _vm.btnShowInstallClick
     }
-  }), _c('print', {
-    ref: "print",
+  }), _c('iframe', {
     attrs: {
-      "type": 'saveas',
-      "name": "print"
+      "id": "ifrmPrint"
+    }
+  }), _c('el-button', {
+    attrs: {
+      "id": "btnSaveAsDownloadClick",
+      "type": "default"
+    },
+    on: {
+      "click": _vm.btnSaveAsDownloadClick
     }
   })], 1);
 };
-var PrintFilevue_type_template_id_db84b5ba_scoped_true_staticRenderFns = [];
+var PrintFilevue_type_template_id_a82d6028_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
+
 /* harmony default export */ var PrintFilevue_type_script_lang_js = ({
   props: {},
   data: function data() {
@@ -240015,89 +240017,76 @@ var PrintFilevue_type_template_id_db84b5ba_scoped_true_staticRenderFns = [];
   computed: {},
   watch: {},
   created: function created() {
-    var _this2 = this;
-    this.$options.components['print'] = this.$loadComponent('@/wapp/workflow/wfInstance/mainform/print');
-    var $scope = this.$vnode.context;
+    this.$bus.on('btnSaveAsClick', this.btnSaveAsClick);
     this.$bus.on('btnPrintWebFormClick', this.btnPrintWebFormClick);
     this.$bus.on('btnPrintFileClick', this.btnPrintFileClick);
     this.$bus.on('btnPrintGzClick', this.btnPrintGzClick);
-    this.$bus.on('btnSaveAsClick', this.btnSaveAsClick);
     this.$bus.on('btnStampClick', this.btnStampClick);
     this.$bus.on('btnToDuBan', this.btnToDuBan);
-    this.$bus.on('dataurl', function (res) {
-      if (res) {
-        var _this = _this2;
-        _this2.dataURL = res;
-        _this2.$nextTick(function () {
-          if (_this2.dataURL) {
-            _this2.$bus.emit('showDoingDialog');
-
-            // this.dataURL = this.dataURL.split('data:image/png;base64,')[1]
-            _this2.$http({
-              method: 'POST',
-              url: '/gwgl/webForm/saveWebformBase64data',
-              params: {
-                busiDataId: $scope.wfInstance.busiDataId
-              },
-              data: {
-                formBase64data: _this2.dataURL
-              }
-            }).then(function (res) {
-              _this2.$bus.emit('closeDoingDialog');
-              if (res.code === 'success') {
-                _this.$parent.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 {
-                _this2.$message({
-                  message: res.message,
-                  type: 'warning'
-                });
-              }
-            }, function (err) {
-              _this2.$message.error(err);
-            });
-          }
-        });
-      }
-    });
   },
   beforeDestroy: function beforeDestroy() {
+    this.$bus.off('btnSaveAsClick', this.btnSaveAsClick);
     this.$bus.off('btnPrintWebFormClick', this.btnPrintWebFormClick);
     this.$bus.off('btnPrintFileClick', this.btnPrintFileClick);
     this.$bus.off('btnPrintGzClick', this.btnPrintGzClick);
-    this.$bus.off('btnSaveAsClick', this.btnSaveAsClick);
     this.$bus.off('btnStampClick', this.btnStampClick);
     this.$bus.off('btnToDuBan', this.btnToDuBan);
-    this.$bus.off('dataurl');
   },
   mounted: function mounted() {},
   methods: {
+    btnSaveAsClick: function btnSaveAsClick() {
+      this.$bus.emit('showDoingDialog');
+      ifrmPrint.src = location.href.replace('/wflow?', '/print?') + '&saveAs=true';
+    },
+    btnSaveAsDownloadClick: function btnSaveAsDownloadClick() {
+      var _this = this;
+      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'
+            });
+          }
+        }, function (err) {
+          _this.$message.error(err);
+        });
+      });
+    },
     btnToDuBan: function btnToDuBan($scope) {
       console.log(11, $scope);
       window.open('/#/wflow?wfEngineUrl=dbgl/itemApply&busiCode=itemApply&wfName=督办立项&startNodeName=&title=' + $scope.vo.flSubject);
     },
     btnPrintWebFormClick: function btnPrintWebFormClick($scope) {
-      console.log(91, $scope);
       // let url = process.env.VUE_APP_BASE_API + '/' + $scope.wfEngineUrl.split('/')[0] + '/webForm/print?inline=true&module=' + $scope.wfInstance.module + '&busiDataId=' + $scope.wfInstance.busiDataId
       // url += '&httpPort=' + location.port
       var params = location.href.split('?')[1];
       window.open('#/print?' + params);
     },
-    btnSaveAsClick: function btnSaveAsClick($scope) {
-      if ($scope.attachments.length === 0) {
-        this.$alert(this.$tx('yoabase.alerts.notAttach', '当前文件没有附件。'), this.$tx('common.operationTip', '操作提示'), {
-          type: 'warning'
-        });
-        return;
-      }
-      this.$scope = $scope;
-      // let url = process.env.VUE_APP_BASE_API + '/' + $scope.wfEngineUrl.split('/')[0] + '/webForm/download?module=' + $scope.wfInstance.module + '&busiDataId=' + $scope.wfInstance.busiDataId
-      // url += '&httpPort=' + location.port
-      // window.open(url)
-    },
     btnPrintFileClick: function btnPrintFileClick($scope) {
       if ($scope.bodyfile === null || $scope.bodyfile.id === undefined) {
         this.$alert(this.$tx('yoabase.alerts.notPrBodyFile', '当前文件没有可打印正文文件。'), this.$tx('common.operationTip', '操作提示'), {
@@ -240217,11 +240206,11 @@ var PrintFilevue_type_template_id_db84b5ba_scoped_true_staticRenderFns = [];
 ;
 var PrintFile_component = normalizeComponent(
   components_PrintFilevue_type_script_lang_js,
-  PrintFilevue_type_template_id_db84b5ba_scoped_true_render,
-  PrintFilevue_type_template_id_db84b5ba_scoped_true_staticRenderFns,
+  PrintFilevue_type_template_id_a82d6028_scoped_true_render,
+  PrintFilevue_type_template_id_a82d6028_scoped_true_staticRenderFns,
   false,
   null,
-  "db84b5ba",
+  "a82d6028",
   null
   
 )