ecinc-cloud-yoaecoav9 9.6.286 → 9.6.288

package/lib/ecyoaecoa.umd.js

@@ -16486,12 +16486,23 @@ __webpack_require__.r(__webpack_exports__);
 
 var bUseHttps = false;
 var WpsInvoke = window.WpsInvoke;
+var wpsClientType = '';
 function _WpsInvoke(funcs, retry) {
   if (!retry) retry = 1;
+  if (funcs[0].OnlineEditDoc && funcs[0].OnlineEditDoc.uploadFileName) {
+    var uploadFileName = funcs[0].OnlineEditDoc.uploadFileName;
+    if (uploadFileName.indexOf('.xls') !== -1) {
+      wpsClientType = WpsInvoke.ClientType.et;
+    } else if (uploadFileName.indexOf('.ppt') !== -1) {
+      wpsClientType = WpsInvoke.ClientType.wpp;
+    } else {
+      wpsClientType = WpsInvoke.ClientType.wps;
+    }
+  }
   var info = {};
   info.funcs = funcs;
   var func = bUseHttps ? WpsInvoke.InvokeAsHttps : WpsInvoke.InvokeAsHttp;
-  func(WpsInvoke.ClientType.wps,
+  func(wpsClientType,
   // 组件类型
   'WpsOAAssist',
   // 插件名，与wps客户端加载的加载的插件名对应
@@ -16515,7 +16526,7 @@ function _WpsInvoke(funcs, retry) {
         _WpsInvoke(funcs, ++retry);
       }
     } else {
-      console.log(result.response);
+      console.log(wpsClientType, info, result.response);
       showresult(result.response);
     }
   });
@@ -16536,6 +16547,22 @@ WpsInvoke.RegWebNotify(WpsInvoke.ClientType.wps, 'WpsOAAssist', function (messag
     document.querySelector('#btnWpsSaved').click();
   }
 });
+WpsInvoke.RegWebNotify(WpsInvoke.ClientType.et, 'WpsOAAssist', function (messageText) {
+  var span = window.parent.document.getElementById('webnotifyspan');
+  span.innerHTML = messageText;
+  console.log('wps notify msg:', messageText);
+  if (messageText.indexOf('uploadPath') !== -1) {
+    document.querySelector('#btnWpsSaved').click();
+  }
+});
+WpsInvoke.RegWebNotify(WpsInvoke.ClientType.wpp, 'WpsOAAssist', function (messageText) {
+  var span = window.parent.document.getElementById('webnotifyspan');
+  span.innerHTML = messageText;
+  console.log('wps notify msg:', messageText);
+  if (messageText.indexOf('uploadPath') !== -1) {
+    document.querySelector('#btnWpsSaved').click();
+  }
+});
 
 /**
  * 处理WPS加载项的方法返回值
@@ -16561,10 +16588,11 @@ function showresult(resultData) {
  * 这是页面中针对代码显示的变量定义，开发者无需关心
  */
 window._WpsInvoke = _WpsInvoke;
-function wpsInstallAddin(callback) {
+function wpsInstallAddin(callback, addonType) {
+  if (!addonType) addonType = 'wps';
   var setting = {
     name: 'WpsOAAssist',
-    addonType: 'wps',
+    addonType: addonType,
     online: 'true',
     url: "".concat(location.href.split('#')[0], "plugins/wpsjs/wpsoaassit/")
   };
@@ -21689,7 +21717,7 @@ ___CSS_LOADER_EXPORT___.push([module.id, ".el-table td[data-v-2c87c469]{padding:
 
 /***/ }),
 
-/***/ 7414:
+/***/ 3995:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -21703,14 +21731,14 @@ __webpack_require__.r(__webpack_exports__);
 
 var ___CSS_LOADER_EXPORT___ = _node_modules_css_loader_dist_runtime_api_js__WEBPACK_IMPORTED_MODULE_1___default()((_node_modules_css_loader_dist_runtime_noSourceMaps_js__WEBPACK_IMPORTED_MODULE_0___default()));
 // Module
-___CSS_LOADER_EXPORT___.push([module.id, ".item .title[data-v-396e991e]{font-size:var(--portalFontSize14);font-weight:600}.item[data-v-396e991e] .el-upload--text{width:100%}.item[data-v-396e991e] .el-link{padding-right:10px}", ""]);
+___CSS_LOADER_EXPORT___.push([module.id, ".item .title[data-v-5639a90c]{font-size:var(--portalFontSize14);font-weight:600}.item[data-v-5639a90c] .el-upload--text{width:100%}.item[data-v-5639a90c] .el-link{padding-right:10px}", ""]);
 // Exports
 /* harmony default export */ __webpack_exports__["default"] = (___CSS_LOADER_EXPORT___);
 
 
 /***/ }),
 
-/***/ 7914:
+/***/ 7360:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -21724,7 +21752,7 @@ __webpack_require__.r(__webpack_exports__);
 
 var ___CSS_LOADER_EXPORT___ = _node_modules_css_loader_dist_runtime_api_js__WEBPACK_IMPORTED_MODULE_1___default()((_node_modules_css_loader_dist_runtime_noSourceMaps_js__WEBPACK_IMPORTED_MODULE_0___default()));
 // Module
-___CSS_LOADER_EXPORT___.push([module.id, ".weboffice-container[data-v-1cf10eb9]{margin:0}.isform .weboffice-container[data-v-1cf10eb9]{border:1px solid #999;border-top:0}", ""]);
+___CSS_LOADER_EXPORT___.push([module.id, ".weboffice-container[data-v-5b530424]{margin:0}.isform .weboffice-container[data-v-5b530424]{border:1px solid #999;border-top:0}", ""]);
 // Exports
 /* harmony default export */ __webpack_exports__["default"] = (___CSS_LOADER_EXPORT___);
 
@@ -61790,35 +61818,35 @@ var update = add("4ab28a72", content, true, {"sourceMap":false,"shadowMode":fals
 
 /***/ }),
 
-/***/ 8586:
+/***/ 8119:
 /***/ (function(module, __unused_webpack_exports, __webpack_require__) {
 
 // style-loader: Adds some css to the DOM by adding a <style> tag
 
 // load the styles
-var content = __webpack_require__(7414);
+var content = __webpack_require__(3995);
 if(content.__esModule) content = content.default;
 if(typeof content === 'string') content = [[module.id, content, '']];
 if(content.locals) module.exports = content.locals;
 // add the styles to the DOM
 var add = (__webpack_require__(9548)/* ["default"] */ .A)
-var update = add("2f0d70f6", content, true, {"sourceMap":false,"shadowMode":false});
+var update = add("083d53fc", content, true, {"sourceMap":false,"shadowMode":false});
 
 /***/ }),
 
-/***/ 7934:
+/***/ 4596:
 /***/ (function(module, __unused_webpack_exports, __webpack_require__) {
 
 // style-loader: Adds some css to the DOM by adding a <style> tag
 
 // load the styles
-var content = __webpack_require__(7914);
+var content = __webpack_require__(7360);
 if(content.__esModule) content = content.default;
 if(typeof content === 'string') content = [[module.id, content, '']];
 if(content.locals) module.exports = content.locals;
 // add the styles to the DOM
 var add = (__webpack_require__(9548)/* ["default"] */ .A)
-var update = add("4a9a839e", content, true, {"sourceMap":false,"shadowMode":false});
+var update = add("674dfc29", content, true, {"sourceMap":false,"shadowMode":false});
 
 /***/ }),
 
@@ -97345,8 +97373,8 @@ var H5Office_component = (0,componentNormalizer/* default */.A)(
 )
 
 /* harmony default export */ var H5Office = (H5Office_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/ecoa/src/webOffice/WebOffice.vue?vue&type=template&id=396e991e&scoped=true
-var WebOfficevue_type_template_id_396e991e_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/ecoa/src/webOffice/WebOffice.vue?vue&type=template&id=5639a90c&scoped=true
+var WebOfficevue_type_template_id_5639a90c_scoped_true_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _vm.showOffice ? _c('el-dialog', {
@@ -97684,7 +97712,7 @@ var WebOfficevue_type_template_id_396e991e_scoped_true_render = function render(
     }
   }, [_vm._v("上传")]) : _vm._e()], 1)]) : _vm._e();
 };
-var WebOfficevue_type_template_id_396e991e_scoped_true_staticRenderFns = [];
+var WebOfficevue_type_template_id_5639a90c_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/ecoa/src/webOffice/WebOffice.vue?vue&type=script&lang=js
 function WebOfficevue_type_script_lang_js_typeof(o) { "@babel/helpers - typeof"; return WebOfficevue_type_script_lang_js_typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, WebOfficevue_type_script_lang_js_typeof(o); }
@@ -97706,6 +97734,10 @@ var _require = __webpack_require__(3844),
     accept: {
       type: String,
       default: '.doc,.docx,.pdf'
+    },
+    saveToPdf: {
+      type: Boolean,
+      default: true
     }
   },
   data: function data() {
@@ -98089,29 +98121,31 @@ var _require = __webpack_require__(3844),
      */
     btnOpenWordClick: function btnOpenWordClick($scope, openType, fbUrl, attach) {
       var _this6 = this;
-      if ($scope.officeType !== 'ecexe') {
-        return;
-      } else if (!this.downloadHint) {
+      if (!this.downloadHint) {
         //未执行版本检测
         new Promise(function (resolve) {
-          _this6.queryWebOfficeVersion(resolve);
+          if (_this6.accept.indexOf('.xls') !== -1 || _this6.accept.indexOf('.ppt') !== -1 || _this6.accept.indexOf('.wps') !== -1) {
+            //优先使用wpsjs
+            _this6.loadWpsOffice(resolve);
+          } else {
+            //优先使用ecexe
+            _this6.queryWebOfficeVersion(resolve, $scope, attach);
+          }
         }).then(function (res) {
-          _this6.btnOpenWordClick($scope, openType, fbUrl, attach);
+          if (!res) {
+            _this6.downloadHint = _this6.$tx('ecoa.webOffice.noFindEditor', '没有检测到正文编辑器');
+          }
+          _this6.$nextTick(function () {
+            _this6.$bus.emit('btnOpenWordClick', $scope, openType, fbUrl, attach);
+          });
         });
         return;
+      } else if ($scope.officeType !== 'ecexe') {
+        return;
       } else if (this.downloadHint === this.$tx('ecoa.webOffice.hasNewEditor', '检测到有新版正文编辑器')) {
         this.dialogTitle = this.$tx('ecoa.webOffice.updateTip', '更新提示');
         this.showOffice = true;
         return;
-      } else if (!this.installedVer && window.wpsInstalled) {
-        setTimeout(function () {
-          $scope.officeType = 'wpsjs';
-          console.log($scope.officeType, ' window.wpsInstalled');
-          _this6.$nextTick(function () {
-            _this6.$bus.emit('btnOpenWordClick', $scope, openType, fbUrl, attach);
-          });
-        }, 0);
-        return;
       } else if (!this.installedVer && !window.wpsInstalled) {
         this.showOffice = true;
         return;
@@ -98275,7 +98309,7 @@ var _require = __webpack_require__(3844),
               _context.next = 66;
               break;
             case 51:
-              if (!(openType !== undefined && openType !== 'OpenTwoDoc')) {
+              if (!(openType !== undefined && openType !== 'OpenTwoDoc' && openType !== 'Approve' && openType !== 'ReadDocEditFile' && openType !== 'ReadDocFile')) {
                 _context.next = 65;
                 break;
               }
@@ -98533,7 +98567,7 @@ var _require = __webpack_require__(3844),
                     }
                     dataJson.showBtnToolbar = '1';
                     dataJson.showRevisions = '0';
-                    dataJson.showBtnSaveExit = '1';
+                    dataJson.showBtnSaveExit = openType === 'ReadDocFile' ? '0' : '1';
                     dataJson.showBtnSavePdf = '0';
                     dataJson.showBtnRevisions = '1';
                     dataJson.showBtnSave = '1';
@@ -98754,9 +98788,9 @@ var _require = __webpack_require__(3844),
       }
     },
     loadWpsOffice: function loadWpsOffice(resolve) {
+      var _this = this;
       var $scope = this.$vnode.context;
       if (!$scope.$options.components['WpsOffice']) {
-        $scope.officeType = '';
         var js = document.createElement('script');
         js.id = 'wps-js';
         js.src = 'plugins/wpsjs/wpsaddons/wpsjsrpcsdk.js';
@@ -98768,19 +98802,29 @@ var _require = __webpack_require__(3844),
             } else {
               $scope.$options.components['WpsOffice'] = $scope.$loadComponent('@/wapp/workflow/webOffice/WpsOffice');
             }
-            $scope.officeType = 'wpsjs';
             $scope.$forceUpdate();
-            setTimeout(function () {
+            var _require2 = __webpack_require__(8686),
+              wpsInstallAddin = _require2.wpsInstallAddin;
+            wpsInstallAddin(function (res) {
+              console.log('检测是否安装WPS', res);
               if (window.wpsInstalled !== undefined) {
                 //已经安装过
-                resolve(true);
+                if (window.wpsInstalled) {
+                  $scope.officeType = 'wpsjs';
+                  _this.downloadHint = _this.$tx('ecoa.webOffice.isInstallFile', '正文编辑器已安装');
+                }
+                resolve(window.wpsInstalled);
               } else {
                 //首次安装，大约需要6秒
                 $scope.$bus.emit('showDoingDialog', '正在检测WPS安装版本，请稍候...');
                 var times = 0;
                 var timer = setInterval(function () {
                   if (window.wpsInstalled !== undefined) {
-                    resolve(true);
+                    if (window.wpsInstalled) {
+                      $scope.officeType = 'wpsjs';
+                      _this.downloadHint = _this.$tx('ecoa.webOffice.isInstallFile', '正文编辑器已安装');
+                    }
+                    resolve(window.wpsInstalled);
                     clearInterval(timer);
                     $scope.$bus.emit('closeDoingDialog');
                   } else if (times >= 50) {
@@ -98792,14 +98836,18 @@ var _require = __webpack_require__(3844),
                 }, 200);
                 $scope.$bus.emit('showDoingDialog', '正在检测WPS安装版本，请稍候...');
               }
-            }, 100);
+            });
           } else {
-            resolve(true);
+            resolve(false);
           }
           js.onload = js.onreadystatechange = null;
         };
-      } else {
+      } else if (window.wpsInstalled) {
+        $scope.officeType = 'wpsjs';
+        _this.downloadHint = _this.$tx('ecoa.webOffice.isInstallFile', '正文编辑器已安装');
         resolve(true);
+      } else {
+        resolve(false);
       }
     },
     /**
@@ -98908,7 +98956,7 @@ var _require = __webpack_require__(3844),
       attach.fileType = 'BODY';
       attach.uploadBy = this.loginUser.personName;
       attach.uploadTime = '待上传';
-      attach.saveToPdf = !!(extName === '.doc' || extName === '.docx');
+      attach.saveToPdf = this.saveToPdf;
       attach.file = file;
       if (this.openType === 'SignedFile') {
         if (extName !== '.pdf') {
@@ -98945,9 +98993,9 @@ var _require = __webpack_require__(3844),
 });
 ;// CONCATENATED MODULE: ./packages/ecyoa/ecoa/src/webOffice/WebOffice.vue?vue&type=script&lang=js
  /* harmony default export */ var webOffice_WebOfficevue_type_script_lang_js = (WebOfficevue_type_script_lang_js); 
-// EXTERNAL MODULE: ./node_modules/vue-style-loader/index.js??clonedRuleSet-64.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-64.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-64.use[2]!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-64.use[3]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-64.use[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecyoa/ecoa/src/webOffice/WebOffice.vue?vue&type=style&index=0&id=396e991e&prod&scoped=true&lang=scss
-var WebOfficevue_type_style_index_0_id_396e991e_prod_scoped_true_lang_scss = __webpack_require__(8586);
-;// CONCATENATED MODULE: ./packages/ecyoa/ecoa/src/webOffice/WebOffice.vue?vue&type=style&index=0&id=396e991e&prod&scoped=true&lang=scss
+// EXTERNAL MODULE: ./node_modules/vue-style-loader/index.js??clonedRuleSet-64.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-64.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-64.use[2]!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-64.use[3]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-64.use[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecyoa/ecoa/src/webOffice/WebOffice.vue?vue&type=style&index=0&id=5639a90c&prod&scoped=true&lang=scss
+var WebOfficevue_type_style_index_0_id_5639a90c_prod_scoped_true_lang_scss = __webpack_require__(8119);
+;// CONCATENATED MODULE: ./packages/ecyoa/ecoa/src/webOffice/WebOffice.vue?vue&type=style&index=0&id=5639a90c&prod&scoped=true&lang=scss
 
 ;// CONCATENATED MODULE: ./packages/ecyoa/ecoa/src/webOffice/WebOffice.vue
 
@@ -98960,18 +99008,18 @@ var WebOfficevue_type_style_index_0_id_396e991e_prod_scoped_true_lang_scss = __w
 
 var WebOffice_component = (0,componentNormalizer/* default */.A)(
   webOffice_WebOfficevue_type_script_lang_js,
-  WebOfficevue_type_template_id_396e991e_scoped_true_render,
-  WebOfficevue_type_template_id_396e991e_scoped_true_staticRenderFns,
+  WebOfficevue_type_template_id_5639a90c_scoped_true_render,
+  WebOfficevue_type_template_id_5639a90c_scoped_true_staticRenderFns,
   false,
   null,
-  "396e991e",
+  "5639a90c",
   null
   
 )
 
 /* harmony default export */ var WebOffice = (WebOffice_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/ecoa/src/webOffice/WpsOffice.vue?vue&type=template&id=1cf10eb9&scoped=true
-var WpsOfficevue_type_template_id_1cf10eb9_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/ecoa/src/webOffice/WpsOffice.vue?vue&type=template&id=5b530424&scoped=true
+var WpsOfficevue_type_template_id_5b530424_scoped_true_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -99023,7 +99071,7 @@ var WpsOfficevue_type_template_id_1cf10eb9_scoped_true_render = function render(
     }
   }, [_vm._v("正在打开，请稍后...")])])], 1);
 };
-var WpsOfficevue_type_template_id_1cf10eb9_scoped_true_staticRenderFns = [];
+var WpsOfficevue_type_template_id_5b530424_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/ecoa/src/webOffice/WpsOffice.vue?vue&type=script&lang=js
 function WpsOfficevue_type_script_lang_js_typeof(o) { "@babel/helpers - typeof"; return WpsOfficevue_type_script_lang_js_typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, WpsOfficevue_type_script_lang_js_typeof(o); }
@@ -99037,7 +99085,7 @@ function WpsOfficevue_type_script_lang_js_arrayLikeToArray(r, a) { (null == a ||
 function WpsOfficevue_type_script_lang_js_regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ WpsOfficevue_type_script_lang_js_regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == WpsOfficevue_type_script_lang_js_typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator.return && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(WpsOfficevue_type_script_lang_js_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, catch: function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
 function WpsOfficevue_type_script_lang_js_asyncGeneratorStep(n, t, e, r, o, a, c) { try { var i = n[a](c), u = i.value; } catch (n) { return void e(n); } i.done ? t(u) : Promise.resolve(u).then(r, o); }
 function WpsOfficevue_type_script_lang_js_asyncToGenerator(n) { return function () { var t = this, e = arguments; return new Promise(function (r, o) { var a = n.apply(t, e); function _next(n) { WpsOfficevue_type_script_lang_js_asyncGeneratorStep(a, r, o, _next, _throw, "next", n); } function _throw(n) { WpsOfficevue_type_script_lang_js_asyncGeneratorStep(a, r, o, _next, _throw, "throw", n); } _next(void 0); }); }; }
-// import { wpsInstallAddin } from './wpsInit'
+//import { wpsInstallAddin } from './wpsInit'
 
 var WpsOfficevue_type_script_lang_js_require = __webpack_require__(3844),
   WpsOfficevue_type_script_lang_js_bodyDocHistoryVer = WpsOfficevue_type_script_lang_js_require.bodyDocHistoryVer;
@@ -99050,11 +99098,13 @@ var WpsOfficevue_type_script_lang_js_require = __webpack_require__(3844),
         return null;
       }
     },
-    commandBar: {
-      type: Array,
-      default: function _default() {
-        return null;
-      }
+    accept: {
+      type: String,
+      default: '.doc,.docx,.pdf'
+    },
+    saveToPdf: {
+      type: Boolean,
+      default: true
     }
   },
   data: function data() {
@@ -99088,14 +99138,7 @@ var WpsOfficevue_type_script_lang_js_require = __webpack_require__(3844),
     this.$bus.off('btnPreviewAttachClick', this.btnPreviewAttachClick);
     this.$bus.off('btnEditAttachClick', this.btnEditAttachClick);
   },
-  mounted: function mounted() {
-    var _require2 = __webpack_require__(8686),
-      wpsInstallAddin = _require2.wpsInstallAddin;
-    wpsInstallAddin(function (res) {
-      console.log('检测是否安装WPS', res);
-      document.querySelector('#webnotifyspan').innerText = '';
-    });
-  },
+  mounted: function mounted() {},
   methods: {
     btnEditAttachClick: function btnEditAttachClick(attach, officeType) {
       var $scope = this.$vnode.context;
@@ -99275,28 +99318,75 @@ var WpsOfficevue_type_script_lang_js_require = __webpack_require__(3844),
       this.btnOpenWpsClick($scope, openType);
     },
     btnOpenWpsClick: function btnOpenWpsClick($scope, openType, fbUrl, attach) {
+      var _this4 = this;
       this.fanwen_url = fbUrl;
       // 安装了wps并且officeType==='wpsjs'
-      if (window.wpsInstalled && $scope.officeType === 'wpsjs') {
-        this.btnOpenWpsClickReal($scope, openType, fbUrl, attach);
+      var _require2 = __webpack_require__(8686),
+        wpsInstallAddin = _require2.wpsInstallAddin;
+      var wpsClientType = 'wps';
+      var fileName = '';
+      if (attach) {
+        fileName = attach.fileName;
+      } else if ($scope.bodyfile && $scope.bodyfile.fileName) {
+        if ($scope.bodyfile.fileName.indexOf('.doc') !== -1 || $scope.bodyfile.fileName.indexOf('.xls') !== -1 || $scope.bodyfile.fileName.indexOf('.ppt') !== -1) {
+          fileName = $scope.bodyfile.fileName;
+        } else {
+          var docBodyfiles = $scope.attachments.filter(function (attach) {
+            if (attach.id !== $scope.bodyfile.id && attach.originalName.split('.')[0] === $scope.bodyfile.originalName.split('.')[0]) {
+              return true;
+            }
+          });
+          if (docBodyfiles.length > 0) {
+            fileName = docBodyfiles[0].fileName;
+          }
+        }
+      }
+      if (fileName.indexOf('.xls') !== -1) {
+        wpsClientType = 'et';
+      } else if (fileName.indexOf('.ppt') !== -1) {
+        wpsClientType = 'wpp';
       }
+      wpsInstallAddin(function (res) {
+        console.log('检测是否安装WPS', res);
+        document.querySelector('#webnotifyspan').innerText = '';
+        if (window.wpsInstalled && $scope.officeType === 'wpsjs') {
+          _this4.btnOpenWpsClickReal($scope, openType, fbUrl, attach);
+        }
+      }, wpsClientType);
     },
     btnOpenWpsClickReal: function btnOpenWpsClickReal($scope, openType, fbUrl, attach) {
-      var _this4 = this;
+      var _this5 = this;
       // 编辑正文事件
       $scope.formValidate( /*#__PURE__*/WpsOfficevue_type_script_lang_js_asyncToGenerator( /*#__PURE__*/WpsOfficevue_type_script_lang_js_regeneratorRuntime().mark(function _callee() {
-        var appUrl, WFBusiDataId, WFBodyDocId, WfModule, attachsType, attachsName, saveAs, bOpenRevision, uploadPath, downUrl, oldFileDownUrl, approveFileDownUrl, insertFileUrl, productCode, attachNames, index, blankDiv;
+        var fileExtName, docBodyfiles, appUrl, WFBusiDataId, WFBodyDocId, WfModule, attachsType, attachsName, saveAs, bOpenRevision, uploadPath, downUrl, oldFileDownUrl, approveFileDownUrl, insertFileUrl, productCode, attachNames, index, blankDiv;
         return WpsOfficevue_type_script_lang_js_regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
+              fileExtName = '.doc'; //编辑文件格式
+              if (attach) {
+                fileExtName = '.' + attach.fileName.split('.')[1];
+              } else if ($scope.bodyfile && $scope.bodyfile.fileName) {
+                if ($scope.bodyfile.fileName.indexOf('.doc') !== -1 || $scope.bodyfile.fileName.indexOf('.xls') !== -1 || $scope.bodyfile.fileName.indexOf('.ppt') !== -1) {
+                  fileExtName = '.' + $scope.bodyfile.fileName.split('.')[1];
+                } else {
+                  docBodyfiles = $scope.attachments.filter(function (attach) {
+                    if (attach.id !== $scope.bodyfile.id && attach.originalName.split('.')[0] === $scope.bodyfile.originalName.split('.')[0]) {
+                      return true;
+                    }
+                  });
+                  if (docBodyfiles.length > 0) {
+                    fileExtName = '.' + docBodyfiles[0].originalName.split('.')[1];
+                  }
+                }
+              }
               appUrl = location.href.split('#')[0];
               WFBusiDataId = $scope.vo.id;
               WFBodyDocId = $scope.wfInstance.bodyDocId ? $scope.wfInstance.bodyDocId : '';
-              _this4.WFBodyDocId = WFBodyDocId;
+              _this5.WFBodyDocId = WFBodyDocId;
               WfModule = $scope.wfInstance.module ? $scope.wfInstance.module : '';
               attachsType = 'BODY';
-              attachsName = WFBodyDocId + '.doc'; //Wpsjs编辑器，标题栏显示使用saveAs下载保存到本机的文件名，上传使用attachNames
-              saveAs = $scope.vo.flSubject + '.doc';
+              attachsName = WFBodyDocId + fileExtName; //Wpsjs编辑器，标题栏显示使用saveAs下载保存到本机的文件名，上传使用attachNames
+              saveAs = $scope.vo.flSubject + fileExtName;
               if (attach) {
                 attachsType = attach.fileType;
                 attachsName = encodeURI(attach.fileName);
@@ -99315,7 +99405,7 @@ var WpsOfficevue_type_script_lang_js_require = __webpack_require__(3844),
               if ($scope.wfInstance.status > 0) {
                 bOpenRevision = true;
               }
-              _this4.openType = openType;
+              _this5.openType = openType;
 
               // 使用正文pdf，测试核稿
               /* $scope.approveFile = $scope.bodyfile
@@ -99331,8 +99421,8 @@ var WpsOfficevue_type_script_lang_js_require = __webpack_require__(3844),
                 if ($scope.wfInstance.passenger.docEditMode === 'NoTitle') {
                   openType = undefined;
                   //将智能写作生成的文件做为范文
-                  _this4.fanwen_url = fbUrl + '&fileName=' + WFBodyDocId + '.doc';
-                  console.log(appUrl + "/apigw".substring(1) + _this4.fanwen_url);
+                  _this5.fanwen_url = fbUrl + '&fileName=' + WFBodyDocId + '.doc';
+                  console.log(appUrl + "/apigw".substring(1) + _this5.fanwen_url);
                 } else {
                   openType = 'Redlining';
                   //将智能写作生成的文件插入到红头模板中
@@ -99341,62 +99431,62 @@ var WpsOfficevue_type_script_lang_js_require = __webpack_require__(3844),
                 }
               }
               if (!(openType === 'NoTracks')) {
-                _context.next = 24;
+                _context.next = 26;
                 break;
               }
               //清稿
               if ($scope.noTracksFile && $scope.noTracksFile.fileName) {
-                downUrl = appUrl + "/apigw".substring(1) + '/' + $scope.wfAttachUrl + '/downloadByName?busiDataId=' + WFBusiDataId + '&attachsName=NoTracks_' + WFBodyDocId + '.doc&attachsType=BODY';
+                downUrl = appUrl + "/apigw".substring(1) + '/' + $scope.wfAttachUrl + '/downloadByName?busiDataId=' + WFBusiDataId + '&attachsName=NoTracks_' + WFBodyDocId + fileExtName + '&attachsType=BODY';
               } else {
-                downUrl = appUrl + "/apigw".substring(1) + '/' + $scope.wfAttachUrl + '/downloadByName?busiDataId=' + WFBusiDataId + '&attachsName=' + WFBodyDocId + '.doc&attachsType=BODY';
+                downUrl = appUrl + "/apigw".substring(1) + '/' + $scope.wfAttachUrl + '/downloadByName?busiDataId=' + WFBusiDataId + '&attachsName=' + WFBodyDocId + fileExtName + '&attachsType=BODY';
               }
-              _context.next = 74;
+              _context.next = 76;
               break;
-            case 24:
+            case 26:
               if (!attach) {
-                _context.next = 29;
+                _context.next = 31;
                 break;
               }
               bOpenRevision = false;
               downUrl = appUrl + "/apigw".substring(1) + '/' + $scope.wfAttachUrl + '/downloadById?busiDataId=' + attach.busiDataId + '&attachIds=' + attach.id + '&attachsType=ATTACH';
-              _context.next = 74;
+              _context.next = 76;
               break;
-            case 29:
+            case 31:
               if (!(openType === 'OpenTwoDoc')) {
-                _context.next = 36;
+                _context.next = 38;
                 break;
               }
               bOpenRevision = false;
               if ($scope.noTracksFile) {
-                oldFileDownUrl = appUrl + "/apigw".substring(1) + '/' + $scope.wfAttachUrl + '/downloadByName?busiDataId=' + WFBusiDataId + '&attachsName=NoTracks_' + WFBodyDocId + '.doc&attachsType=BODY';
+                oldFileDownUrl = appUrl + "/apigw".substring(1) + '/' + $scope.wfAttachUrl + '/downloadByName?busiDataId=' + WFBusiDataId + '&attachsName=NoTracks_' + WFBodyDocId + fileExtName + '&attachsType=BODY';
               } else {
-                oldFileDownUrl = appUrl + "/apigw".substring(1) + '/' + $scope.wfAttachUrl + '/downloadByName?busiDataId=' + WFBusiDataId + '&attachsName=' + WFBodyDocId + '.doc&attachsType=BODY';
+                oldFileDownUrl = appUrl + "/apigw".substring(1) + '/' + $scope.wfAttachUrl + '/downloadByName?busiDataId=' + WFBusiDataId + '&attachsName=' + WFBodyDocId + fileExtName + '&attachsType=BODY';
               }
-              oldFileDownUrl += '&saveAs=旧文件.doc';
+              oldFileDownUrl += '&saveAs=旧文件' + fileExtName;
               if ($scope.vo.gwmbId !== undefined && $scope.vo.gwmbId !== null && $scope.vo.gwmbId !== '') {
                 downUrl = appUrl + "/apigw".substring(1) + '/gwgl/fwmb/download?id=' + $scope.vo.gwmbId + '&dataField=fileContent&nameField=mbFileName';
               } else {
                 downUrl = appUrl + 'templates/Editor.doc?t=1';
               }
-              _context.next = 74;
+              _context.next = 76;
               break;
-            case 36:
+            case 38:
               if (!(openType === 'Approve' && $scope.approveFile)) {
-                _context.next = 42;
+                _context.next = 44;
                 break;
               }
               bOpenRevision = false;
               approveFileDownUrl = appUrl + "/apigw".substring(1) + '/' + $scope.wfAttachUrl + '/downloadById?inline=true&attachIds=' + $scope.approveFile.id + '&widthType=pageWidth';
               if ($scope.noTracksFile) {
-                downUrl = appUrl + "/apigw".substring(1) + '/' + $scope.wfAttachUrl + '/downloadByName?busiDataId=' + WFBusiDataId + '&attachsName=NoTracks_' + WFBodyDocId + '.doc&attachsType=BODY';
+                downUrl = appUrl + "/apigw".substring(1) + '/' + $scope.wfAttachUrl + '/downloadByName?busiDataId=' + WFBusiDataId + '&attachsName=NoTracks_' + WFBodyDocId + fileExtName + '&attachsType=BODY';
               } else {
-                downUrl = appUrl + "/apigw".substring(1) + '/' + $scope.wfAttachUrl + '/downloadByName?busiDataId=' + WFBusiDataId + '&attachsName=' + WFBodyDocId + '.doc&attachsType=BODY';
+                downUrl = appUrl + "/apigw".substring(1) + '/' + $scope.wfAttachUrl + '/downloadByName?busiDataId=' + WFBusiDataId + '&attachsName=' + WFBodyDocId + fileExtName + '&attachsType=BODY';
               }
-              _context.next = 74;
+              _context.next = 76;
               break;
-            case 42:
+            case 44:
               if (!(openType === 'Redlining' || openType === 'RedliningOnce')) {
-                _context.next = 48;
+                _context.next = 50;
                 break;
               }
               uploadPath = appUrl + "/apigw".substring(1) + '/' + $scope.wfAttachUrl + '/upload?busiDataId=' + WFBusiDataId + '&module=' + WfModule;
@@ -99408,50 +99498,50 @@ var WpsOfficevue_type_script_lang_js_require = __webpack_require__(3844),
               } else if ($scope.wfInstance.haveDoc === 1) {
                 // 首次套红  Redlining
                 if ($scope.noTracksFile && $scope.noTracksFile.fileName) {
-                  insertFileUrl = appUrl + "/apigw".substring(1) + '/' + $scope.wfAttachUrl + '/downloadByName?busiDataId=' + WFBusiDataId + '&attachsName=NoTracks_' + WFBodyDocId + '.doc&attachsType=BODY';
+                  insertFileUrl = appUrl + "/apigw".substring(1) + '/' + $scope.wfAttachUrl + '/downloadByName?busiDataId=' + WFBusiDataId + '&attachsName=NoTracks_' + WFBodyDocId + fileExtName + '&attachsType=BODY';
                 } else {
-                  insertFileUrl = appUrl + "/apigw".substring(1) + '/' + $scope.wfAttachUrl + '/downloadByName?busiDataId=' + WFBusiDataId + '&attachsName=' + WFBodyDocId + '.doc&attachsType=BODY';
+                  insertFileUrl = appUrl + "/apigw".substring(1) + '/' + $scope.wfAttachUrl + '/downloadByName?busiDataId=' + WFBusiDataId + '&attachsName=' + WFBodyDocId + fileExtName + '&attachsType=BODY';
                 }
                 uploadPath += '&Redlining=Redlining';
               } else if ($scope.wfInstance.haveDoc === 2) {
                 // 再次套红  RedliningOnce
                 if ($scope.noTracksFile && $scope.noTracksFile.fileName) {
-                  insertFileUrl = appUrl + "/apigw".substring(1) + '/' + $scope.wfAttachUrl + '/downloadByName?busiDataId=' + WFBusiDataId + '&attachsName=NoTracks_' + WFBodyDocId + '.doc&attachsType=BODY';
+                  insertFileUrl = appUrl + "/apigw".substring(1) + '/' + $scope.wfAttachUrl + '/downloadByName?busiDataId=' + WFBusiDataId + '&attachsName=NoTracks_' + WFBodyDocId + fileExtName + '&attachsType=BODY';
                 } else {
-                  insertFileUrl = appUrl + "/apigw".substring(1) + '/' + $scope.wfAttachUrl + '/downloadByName?busiDataId=' + WFBusiDataId + '&attachsName=' + WFBodyDocId + '.doc&attachsType=BODY';
+                  insertFileUrl = appUrl + "/apigw".substring(1) + '/' + $scope.wfAttachUrl + '/downloadByName?busiDataId=' + WFBusiDataId + '&attachsName=' + WFBodyDocId + fileExtName + '&attachsType=BODY';
                 }
                 uploadPath += '&Redlining=RedliningOnce';
               }
-              _context.next = 74;
+              _context.next = 76;
               break;
-            case 48:
+            case 50:
               if (!(openType === 'attachEdit')) {
-                _context.next = 54;
+                _context.next = 56;
                 break;
               }
               //编辑红头文件模板附件
               saveAs = $scope.vo.id ? $scope.vo.id + '.docx' : $scope.vo.mbFileName;
               downUrl = $scope.downUrl + '&attachsName=' + WFBodyDocId;
               uploadPath = appUrl + "/apigw".substring(1) + '/' + $scope.wfAttachUrl + '/upload';
-              _context.next = 74;
+              _context.next = 76;
               break;
-            case 54:
-              if (!(openType !== undefined && openType !== 'OpenTwoDoc' && openType !== 'Approve')) {
-                _context.next = 73;
+            case 56:
+              if (!(openType !== undefined && openType !== 'OpenTwoDoc' && openType !== 'Approve' && openType !== 'ReadDocEditFile' && openType !== 'ReadDocFile')) {
+                _context.next = 75;
                 break;
               }
               if (!($scope.wfInstance.status === -1)) {
-                _context.next = 60;
+                _context.next = 62;
                 break;
               }
               // this.$alert('请先保存文件。', '操作提示', { type: 'warning' })
-              _this4.$alert(_this4.$tx('ecoa.webOffice.saveFileAlert', '请先保存文件。'), _this4.$tx('common.operationTip', '操作提示'), {
+              _this5.$alert(_this5.$tx('ecoa.webOffice.saveFileAlert', '请先保存文件。'), _this5.$tx('common.operationTip', '操作提示'), {
                 type: 'warning'
               });
               return _context.abrupt("return");
-            case 60:
+            case 62:
               if (!($scope.vo.flCpbTemplateId && $scope.vo.flCpbTemplateId !== '')) {
-                _context.next = 69;
+                _context.next = 71;
                 break;
               }
               bOpenRevision = false;
@@ -99462,18 +99552,18 @@ var WpsOfficevue_type_script_lang_js_require = __webpack_require__(3844),
                 productCode = window.productCode;
               }
               downUrl = appUrl + "/apigw".substring(1) + '/gwgl/cpbFile/printCpbFileDoc?busiDataId=' + $scope.vo.id + '&cpbTemplateId=' + $scope.vo.flCpbTemplateId + "&productCode=".concat(productCode);
-              _context.next = 71;
+              _context.next = 73;
               break;
-            case 69:
+            case 71:
               // this.$alert('当前文件没有关联呈批表/拟稿纸模板。', '操作提示', { type: 'warning' })
-              _this4.$alert(_this4.$tx('ecoa.webOffice.errorLinkFormAlert', '当前文件没有关联呈批表/拟稿纸模板。'), _this4.$tx('common.operationTip', '操作提示'), {
+              _this5.$alert(_this5.$tx('ecoa.webOffice.errorLinkFormAlert', '当前文件没有关联呈批表/拟稿纸模板。'), _this5.$tx('common.operationTip', '操作提示'), {
                 type: 'warning'
               });
               return _context.abrupt("return");
-            case 71:
-              _context.next = 74;
-              break;
             case 73:
+              _context.next = 76;
+              break;
+            case 75:
               if ($scope.wfInstance.haveDoc === 0) {
                 // 初始进来 haveDoc = 0
                 if ($scope.wfInstance.passenger.docEditMode === 'NoTitle') {
@@ -99486,15 +99576,15 @@ var WpsOfficevue_type_script_lang_js_require = __webpack_require__(3844),
                   }
                 }
               } else {
-                downUrl = appUrl + "/apigw".substring(1) + '/' + $scope.wfAttachUrl + '/downloadByName?busiDataId=' + WFBusiDataId + '&attachsName=' + WFBodyDocId + '.doc&attachsType=BODY';
+                downUrl = appUrl + "/apigw".substring(1) + '/' + $scope.wfAttachUrl + '/downloadByName?busiDataId=' + WFBusiDataId + '&attachsName=' + WFBodyDocId + fileExtName + '&attachsType=BODY';
               }
-            case 74:
+            case 76:
               if (downUrl.indexOf('&saveAs=') === -1) {
                 downUrl += '&saveAs=' + saveAs;
               }
 
               // 使用范文
-              if (_this4.fanwen_url) downUrl = appUrl + "/apigw".substring(1) + _this4.fanwen_url;
+              if (_this5.fanwen_url) downUrl = appUrl + "/apigw".substring(1) + _this5.fanwen_url;
 
               // 文件附件，每个附件一行
               attachNames = '';
@@ -99515,7 +99605,7 @@ var WpsOfficevue_type_script_lang_js_require = __webpack_require__(3844),
                 blankDiv.innerHTML = attachNames;
                 attachNames = blankDiv.innerText;
               }
-              _this4.$http({
+              _this5.$http({
                 method: 'GET',
                 params: {
                   timeLength: 60
@@ -99544,15 +99634,15 @@ var WpsOfficevue_type_script_lang_js_require = __webpack_require__(3844),
 
                   //启用编辑正文历史版本保存功能
                   if (!openType) {
-                    if (_this4.bodyDocHistoryVer === 'everySave') {
+                    if (_this5.bodyDocHistoryVer === 'everySave') {
                       //每次编辑正文保存一个版本
                       uploadPath += '&fileId=' + WFBodyDocId + '&fileVer=' + (0,utils/* formatTime */.fU)(new Date(), 'YYYYMMDDHHmmss');
-                    } else if (_this4.bodyDocHistoryVer === 'everyTaskNode' && $scope.curTN.tnStartTime) {
+                    } else if (_this5.bodyDocHistoryVer === 'everyTaskNode' && $scope.curTN.tnStartTime) {
                       //版本号为当前环节开始时间，一个环节处理人只保留一个历史版本
                       uploadPath += '&fileId=' + WFBodyDocId + '&fileVer=' + $scope.curTN.tnStartTime.replaceAll('-', '').replaceAll(' ', '').replaceAll(':', '').replace('.', '');
                     }
                   }
-                  var uploadAppendPath = uploadPath.replace(WFBodyDocId + '.doc', WFBodyDocId + '.pdf');
+                  var uploadAppendPath = uploadPath.replace(WFBodyDocId + fileExtName, WFBodyDocId + '.pdf');
                   if (attach || openType === 'PrintFile') uploadAppendPath = '';
                   var filePath = downUrl + '&tSessionId=' + res.body.tSessionId;
                   var uploadFieldName = 'file';
@@ -99700,6 +99790,8 @@ var WpsOfficevue_type_script_lang_js_require = __webpack_require__(3844),
                   if ($scope.wfInstance.passenger.znhgAgent) {
                     disableHgbtn = false;
                   }
+                  //window.open(filePath, '_blank')
+                  document.querySelector('#webnotifyspan').innerText = '';
                   window._WpsInvoke([{
                     OnlineEditDoc: {
                       docId: attachsName,
@@ -99718,7 +99810,7 @@ var WpsOfficevue_type_script_lang_js_require = __webpack_require__(3844),
                       uploadFieldName: uploadFieldName,
                       buttonGroups: disableBtns,
                       // 屏蔽功能按钮
-                      userName: $scope.curTN && $scope.curTN.userName ? $scope.curTN.userName : _this4.loginUser.personName,
+                      userName: $scope.curTN && $scope.curTN.userName ? $scope.curTN.userName : _this5.loginUser.personName,
                       revisionCtrl: {
                         bOpenRevision: bOpenRevision,
                         // true 打开修订，false关闭修订
@@ -99729,16 +99821,18 @@ var WpsOfficevue_type_script_lang_js_require = __webpack_require__(3844),
                       // 套红书签位置
                       insertFileUrl: insertFileUrl,
                       // 套红插入的正文
-                      evenNumberPageSize: String(_this4.isEvenNumberPage),
+                      evenNumberPageSize: String(_this5.isEvenNumberPage),
                       // 最后一页是否必须偶数页，1：是，0：否
                       disableHgbtn: disableHgbtn,
+                      disableSavebtn: openType === 'ReadDocFile' ? '1' : '0',
+                      //禁用保存按钮
                       productCode: _productCode,
                       ecwebTicket: window.$auth.getTicket()
                     }
                   }]); // onlineEditDoc方法对应于OA助手dispatcher支持的方法名
                 }
               });
-            case 79:
+            case 81:
             case "end":
               return _context.stop();
           }
@@ -99837,7 +99931,7 @@ var WpsOfficevue_type_script_lang_js_require = __webpack_require__(3844),
           window._WpsInvoke([{
             ExitWPS: {}
           }]);
-          $scope.$message.success(this.$tx('ecoa.webOffice.fileSaveSuccessMsg'));
+          $scope.$message.success(this.$tx('ecoa.webOffice.fileSaveSuccessMsg', '文件已保存成功！'));
         } else if (saveInfo.code === 'success' && saveInfo.afterPDF && saveInfo.attachsType === 'BODY') {
           window._WpsInvoke([{
             ExitWPS: {}
@@ -99903,9 +99997,9 @@ var WpsOfficevue_type_script_lang_js_require = __webpack_require__(3844),
 });
 ;// CONCATENATED MODULE: ./packages/ecyoa/ecoa/src/webOffice/WpsOffice.vue?vue&type=script&lang=js
  /* harmony default export */ var webOffice_WpsOfficevue_type_script_lang_js = (WpsOfficevue_type_script_lang_js); 
-// EXTERNAL MODULE: ./node_modules/vue-style-loader/index.js??clonedRuleSet-64.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-64.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-64.use[2]!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-64.use[3]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-64.use[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecyoa/ecoa/src/webOffice/WpsOffice.vue?vue&type=style&index=0&id=1cf10eb9&prod&scoped=true&lang=scss
-var WpsOfficevue_type_style_index_0_id_1cf10eb9_prod_scoped_true_lang_scss = __webpack_require__(7934);
-;// CONCATENATED MODULE: ./packages/ecyoa/ecoa/src/webOffice/WpsOffice.vue?vue&type=style&index=0&id=1cf10eb9&prod&scoped=true&lang=scss
+// EXTERNAL MODULE: ./node_modules/vue-style-loader/index.js??clonedRuleSet-64.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-64.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-64.use[2]!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-64.use[3]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-64.use[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecyoa/ecoa/src/webOffice/WpsOffice.vue?vue&type=style&index=0&id=5b530424&prod&scoped=true&lang=scss
+var WpsOfficevue_type_style_index_0_id_5b530424_prod_scoped_true_lang_scss = __webpack_require__(4596);
+;// CONCATENATED MODULE: ./packages/ecyoa/ecoa/src/webOffice/WpsOffice.vue?vue&type=style&index=0&id=5b530424&prod&scoped=true&lang=scss
 
 ;// CONCATENATED MODULE: ./packages/ecyoa/ecoa/src/webOffice/WpsOffice.vue
 
@@ -99918,11 +100012,11 @@ var WpsOfficevue_type_style_index_0_id_1cf10eb9_prod_scoped_true_lang_scss = __w
 
 var WpsOffice_component = (0,componentNormalizer/* default */.A)(
   webOffice_WpsOfficevue_type_script_lang_js,
-  WpsOfficevue_type_template_id_1cf10eb9_scoped_true_render,
-  WpsOfficevue_type_template_id_1cf10eb9_scoped_true_staticRenderFns,
+  WpsOfficevue_type_template_id_5b530424_scoped_true_render,
+  WpsOfficevue_type_template_id_5b530424_scoped_true_staticRenderFns,
   false,
   null,
-  "1cf10eb9",
+  "5b530424",
   null
   
 )