ecinc-cloud-yoabase 9.6.265 → 9.6.267

package/lib/ecyoabase.common.js

@@ -240114,8 +240114,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=50d6bb8c&scoped=true
-var PrintFilevue_type_template_id_50d6bb8c_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=db84b5ba&scoped=true
+var PrintFilevue_type_template_id_db84b5ba_scoped_true_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', [_c('el-button', {
@@ -240154,7 +240154,7 @@ var PrintFilevue_type_template_id_50d6bb8c_scoped_true_render = function render(
     }
   })], 1);
 };
-var PrintFilevue_type_template_id_50d6bb8c_scoped_true_staticRenderFns = [];
+var PrintFilevue_type_template_id_db84b5ba_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 = ({
@@ -240184,39 +240184,41 @@ var PrintFilevue_type_template_id_50d6bb8c_scoped_true_staticRenderFns = [];
     this.$bus.on('btnToDuBan', this.btnToDuBan);
     this.$bus.on('dataurl', function (res) {
       if (res) {
-        if (res) {
-          var _this = _this2;
-          _this2.dataURL = res;
-          _this2.$nextTick(function () {
-            if (_this2.dataURL) {
-              // 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) {
-                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;
-                  url += '&httpPort=' + location.port;
-                  window.open(url);
-                } else {
-                  _this2.$message({
-                    message: res.message,
-                    type: 'warning'
-                  });
-                }
-              }, function (err) {
-                _this2.$message.error(err);
-              });
-            }
-          });
-        }
+        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);
+            });
+          }
+        });
       }
     });
   },
@@ -240373,11 +240375,11 @@ var PrintFilevue_type_template_id_50d6bb8c_scoped_true_staticRenderFns = [];
 ;
 var PrintFile_component = normalizeComponent(
   components_PrintFilevue_type_script_lang_js,
-  PrintFilevue_type_template_id_50d6bb8c_scoped_true_render,
-  PrintFilevue_type_template_id_50d6bb8c_scoped_true_staticRenderFns,
+  PrintFilevue_type_template_id_db84b5ba_scoped_true_render,
+  PrintFilevue_type_template_id_db84b5ba_scoped_true_staticRenderFns,
   false,
   null,
-  "50d6bb8c",
+  "db84b5ba",
   null
   
 )

package/lib/ecyoabase.umd.js

@@ -240124,8 +240124,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=50d6bb8c&scoped=true
-var PrintFilevue_type_template_id_50d6bb8c_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=db84b5ba&scoped=true
+var PrintFilevue_type_template_id_db84b5ba_scoped_true_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', [_c('el-button', {
@@ -240164,7 +240164,7 @@ var PrintFilevue_type_template_id_50d6bb8c_scoped_true_render = function render(
     }
   })], 1);
 };
-var PrintFilevue_type_template_id_50d6bb8c_scoped_true_staticRenderFns = [];
+var PrintFilevue_type_template_id_db84b5ba_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 = ({
@@ -240194,39 +240194,41 @@ var PrintFilevue_type_template_id_50d6bb8c_scoped_true_staticRenderFns = [];
     this.$bus.on('btnToDuBan', this.btnToDuBan);
     this.$bus.on('dataurl', function (res) {
       if (res) {
-        if (res) {
-          var _this = _this2;
-          _this2.dataURL = res;
-          _this2.$nextTick(function () {
-            if (_this2.dataURL) {
-              // 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) {
-                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;
-                  url += '&httpPort=' + location.port;
-                  window.open(url);
-                } else {
-                  _this2.$message({
-                    message: res.message,
-                    type: 'warning'
-                  });
-                }
-              }, function (err) {
-                _this2.$message.error(err);
-              });
-            }
-          });
-        }
+        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);
+            });
+          }
+        });
       }
     });
   },
@@ -240383,11 +240385,11 @@ var PrintFilevue_type_template_id_50d6bb8c_scoped_true_staticRenderFns = [];
 ;
 var PrintFile_component = normalizeComponent(
   components_PrintFilevue_type_script_lang_js,
-  PrintFilevue_type_template_id_50d6bb8c_scoped_true_render,
-  PrintFilevue_type_template_id_50d6bb8c_scoped_true_staticRenderFns,
+  PrintFilevue_type_template_id_db84b5ba_scoped_true_render,
+  PrintFilevue_type_template_id_db84b5ba_scoped_true_staticRenderFns,
   false,
   null,
-  "50d6bb8c",
+  "db84b5ba",
   null
   
 )