ecinc-cloud-yoabase 9.5.212 → 9.5.214

package/lib/ecyoabase.umd.js

@@ -1907,7 +1907,7 @@ ___CSS_LOADER_EXPORT___.push([module.id, ".top_title[data-v-6ad4aa7f]{line-heigh
 
 /***/ }),
 
-/***/ 7034:
+/***/ 2126:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -1921,7 +1921,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, ".home[data-v-e1ddc696]{background-color:#f0f2f8}.vue-grid-item[data-v-e1ddc696]{background:#fff;-webkit-box-shadow:0 0 8px 0 rgba(0,0,0,.05);box-shadow:0 0 8px 0 rgba(0,0,0,.05);overflow:hidden}.vue-grid-item .content-item[data-v-e1ddc696]{width:100%;height:100%;overflow:hidden}.layer-content[data-v-e1ddc696],.setting[data-v-e1ddc696]{position:absolute;top:0;bottom:0;left:0;right:0;background:rgba(83,168,255,.2)}.setting[data-v-e1ddc696]{display:none;z-index:400}.setting img[data-v-e1ddc696]{width:32px;height:32px;float:right;cursor:pointer;margin-top:5px;margin-right:5px}", ""]);
+___CSS_LOADER_EXPORT___.push([module.id, ".home[data-v-1fd5f8a5]{background-color:#f0f2f8}.vue-grid-item[data-v-1fd5f8a5]{background:#fff;-webkit-box-shadow:0 0 8px 0 rgba(0,0,0,.05);box-shadow:0 0 8px 0 rgba(0,0,0,.05);overflow:hidden}.vue-grid-item .content-item[data-v-1fd5f8a5]{width:100%;height:100%;overflow:hidden}.layer-content[data-v-1fd5f8a5],.setting[data-v-1fd5f8a5]{position:absolute;top:0;bottom:0;left:0;right:0;background:rgba(83,168,255,.2)}.setting[data-v-1fd5f8a5]{display:none;z-index:400}.setting img[data-v-1fd5f8a5]{width:32px;height:32px;float:right;cursor:pointer;margin-top:5px;margin-right:5px}", ""]);
 // Exports
 /* harmony default export */ __webpack_exports__["default"] = (___CSS_LOADER_EXPORT___);
 
@@ -3597,7 +3597,7 @@ ___CSS_LOADER_EXPORT___.push([module.id, "[data-v-1315a357]:export{stdMenuBgcolo
 
 /***/ }),
 
-/***/ 2884:
+/***/ 5231:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -3611,7 +3611,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, "[data-v-c40abdf0]:export{stdMenuBgcolor:var(--lmBgColor);stdMenuHover:var(--lmBgColorActive)!important;stdMenuText:var(--lmTextColor)!important;stdMenuAcitveText:var(--lmTextColorActive)!important;stdSubMenuBgcolor:var(--lmBgColor);stdSubMenuHover:hsla(193,8%,67%,.42);stdSubMenuActiveText:var(--lmTextColorActive)!important;darkMenuBgcolor:#304156;darkMenuHover:#263445;darkMenuText:#bfcbd9;darkMenuAcitveText:#ffd04b;darkSubMenuBgcolor:#384b63;darkSubMenuHover:#263445;darkSubMenuActiveText:#ffd04b;sideBarWidth:210px;formLabelWidth:133px;lightBlue:var(--subjectColor)}#AssociatedDocumentsSidebar .sidebar-area[data-v-c40abdf0]{border-bottom:1px solid #eee}#AssociatedDocumentsSidebar .sidebar-area-title[data-v-c40abdf0]{font-weight:600;line-height:24px;padding:10px}#AssociatedDocumentsSidebar .sidebar-area-title div[data-v-c40abdf0]{display:inline-block;vertical-align:top}#AssociatedDocumentsSidebar .sidebar-area-title[data-v-c40abdf0] .el-button--primary{width:6px;padding:0;margin-right:6px;margin-top:5px;border-radius:1px;height:14px;cursor:default;vertical-align:top;display:inline-block}#AssociatedDocumentsSidebar .sidebar-area-content[data-v-c40abdf0]{padding-left:20px;padding-right:10px}#AssociatedDocumentsSidebar .sidebar-area-content .attach-row[data-v-c40abdf0]{padding-top:10px;padding-bottom:5px;line-height:21px;border-bottom:1px solid #f3f3f3}#AssociatedDocumentsSidebar .sidebar-area-content .attach-row[data-v-c40abdf0]:last-child{border-bottom:none}#AssociatedDocumentsSidebar .sidebar-area-content .flex-row[data-v-c40abdf0]{display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap}#AssociatedDocumentsSidebar .sidebar-area-content .file-icon[data-v-c40abdf0]{font-size:16px;margin-right:5px;display:inline-block;line-height:22px}#AssociatedDocumentsSidebar .sidebar-area-content .file-icon img[data-v-c40abdf0]{width:12px}#AssociatedDocumentsSidebar .sidebar-area-content .file-info[data-v-c40abdf0]{width:100%;display:inline-block}#AssociatedDocumentsSidebar .sidebar-area-content .file-info .attach-name[data-v-c40abdf0]{margin-top:-3px;width:100%;overflow:hidden;text-overflow:ellipsis;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2}#AssociatedDocumentsSidebar .sidebar-area-content .file-info .file-info-detail[data-v-c40abdf0]{color:#a7a7a7}#AssociatedDocumentsSidebar .sidebar-area-content .file-info .file-info-detail .detail-right[data-v-c40abdf0]{display:inline-block;width:35%;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;-webkit-box-sizing:border-box;box-sizing:border-box}#AssociatedDocumentsSidebar .sidebar-area-content .file-info .file-info-detail .detail-left[data-v-c40abdf0]{display:inline-block;width:55%;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;-webkit-box-sizing:border-box;box-sizing:border-box}#AssociatedDocumentsSidebar .sidebar-area-content .file-info .svg-icon[data-v-c40abdf0]{width:1em;height:1em;vertical-align:-.15em;fill:currentColor;overflow:hidden}", ""]);
+___CSS_LOADER_EXPORT___.push([module.id, "[data-v-55135e9b]:export{stdMenuBgcolor:var(--lmBgColor);stdMenuHover:var(--lmBgColorActive)!important;stdMenuText:var(--lmTextColor)!important;stdMenuAcitveText:var(--lmTextColorActive)!important;stdSubMenuBgcolor:var(--lmBgColor);stdSubMenuHover:hsla(193,8%,67%,.42);stdSubMenuActiveText:var(--lmTextColorActive)!important;darkMenuBgcolor:#304156;darkMenuHover:#263445;darkMenuText:#bfcbd9;darkMenuAcitveText:#ffd04b;darkSubMenuBgcolor:#384b63;darkSubMenuHover:#263445;darkSubMenuActiveText:#ffd04b;sideBarWidth:210px;formLabelWidth:133px;lightBlue:var(--subjectColor)}#AssociatedDocumentsSidebar .sidebar-area[data-v-55135e9b]{border-bottom:1px solid #eee}#AssociatedDocumentsSidebar .sidebar-area-title[data-v-55135e9b]{font-weight:600;line-height:24px;padding:10px}#AssociatedDocumentsSidebar .sidebar-area-title div[data-v-55135e9b]{display:inline-block;vertical-align:top}#AssociatedDocumentsSidebar .sidebar-area-title[data-v-55135e9b] .el-button--primary{width:6px;padding:0;margin-right:6px;margin-top:5px;border-radius:1px;height:14px;cursor:default;vertical-align:top;display:inline-block}#AssociatedDocumentsSidebar .sidebar-area-content[data-v-55135e9b]{padding-left:20px;padding-right:10px}#AssociatedDocumentsSidebar .sidebar-area-content .attach-row[data-v-55135e9b]{padding-top:10px;padding-bottom:5px;line-height:21px;border-bottom:1px solid #f3f3f3}#AssociatedDocumentsSidebar .sidebar-area-content .attach-row[data-v-55135e9b]:last-child{border-bottom:none}#AssociatedDocumentsSidebar .sidebar-area-content .flex-row[data-v-55135e9b]{display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap}#AssociatedDocumentsSidebar .sidebar-area-content .file-icon[data-v-55135e9b]{font-size:16px;margin-right:5px;display:inline-block;line-height:22px}#AssociatedDocumentsSidebar .sidebar-area-content .file-icon img[data-v-55135e9b]{width:12px}#AssociatedDocumentsSidebar .sidebar-area-content .file-info[data-v-55135e9b]{width:100%;display:inline-block}#AssociatedDocumentsSidebar .sidebar-area-content .file-info .attach-name[data-v-55135e9b]{margin-top:-3px;width:100%;overflow:hidden;text-overflow:ellipsis;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2}#AssociatedDocumentsSidebar .sidebar-area-content .file-info .file-info-detail[data-v-55135e9b]{color:#a7a7a7}#AssociatedDocumentsSidebar .sidebar-area-content .file-info .file-info-detail .detail-right[data-v-55135e9b]{display:inline-block;width:35%;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;-webkit-box-sizing:border-box;box-sizing:border-box}#AssociatedDocumentsSidebar .sidebar-area-content .file-info .file-info-detail .detail-left[data-v-55135e9b]{display:inline-block;width:55%;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;-webkit-box-sizing:border-box;box-sizing:border-box}#AssociatedDocumentsSidebar .sidebar-area-content .file-info .svg-icon[data-v-55135e9b]{width:1em;height:1em;vertical-align:-.15em;fill:currentColor;overflow:hidden}", ""]);
 // Exports
 /* harmony default export */ __webpack_exports__["default"] = (___CSS_LOADER_EXPORT___);
 
@@ -3702,7 +3702,7 @@ ___CSS_LOADER_EXPORT___.push([module.id, ".el-form .el-table__body .tdcont[data-
 
 /***/ }),
 
-/***/ 8300:
+/***/ 7027:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -3716,7 +3716,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, ".bottombar[data-v-5666a904]{position:absolute;background-color:#f1f1f1;height:4px;width:100%;margin-top:-4px}#bodyfilebox[data-v-5666a904]{height:calc(100vh - 74px);border:0;text-align:center;font-size:16px}#bodyfilebox .bodyfile[data-v-5666a904]{height:100%;width:100%}.nobodyfile[data-v-5666a904]{background-color:#fff;height:calc(100% - 10px);margin:auto}.nobodyfile .nofile[data-v-5666a904]{width:76px!important;height:76px!important;margin-top:100px;opacity:.5}.nobodyfile .filename[data-v-5666a904]{display:inline-block;font-size:18px;font-weight:600;width:90%;text-align:center;margin-top:100px;margin-bottom:20px}@media (max-width:1569px){.nobodyfile[data-v-5666a904]{width:980px}}@media (min-width:1570px){.nobodyfile[data-v-5666a904]{width:1200px}}", ""]);
+___CSS_LOADER_EXPORT___.push([module.id, ".bottombar[data-v-21b98c3d]{position:absolute;background-color:#f1f1f1;height:4px;width:100%;margin-top:-4px}#bodyfilebox[data-v-21b98c3d]{height:calc(100vh - 74px);border:0;text-align:center;font-size:16px}#bodyfilebox .bodyfile[data-v-21b98c3d]{height:100%;width:100%}.nobodyfile[data-v-21b98c3d]{background-color:#fff;height:calc(100% - 10px);margin:auto}.nobodyfile .nofile[data-v-21b98c3d]{width:76px!important;height:76px!important;margin-top:100px;opacity:.5}.nobodyfile .filename[data-v-21b98c3d]{display:inline-block;font-size:18px;font-weight:600;width:90%;text-align:center;margin-top:100px;margin-bottom:20px}@media (max-width:1569px){.nobodyfile[data-v-21b98c3d]{width:980px}}@media (min-width:1570px){.nobodyfile[data-v-21b98c3d]{width:1200px}}", ""]);
 // Exports
 /* harmony default export */ __webpack_exports__["default"] = (___CSS_LOADER_EXPORT___);
 
@@ -77786,19 +77786,19 @@ var update = add("3ddf01ac", content, true, {"sourceMap":false,"shadowMode":fals
 
 /***/ }),
 
-/***/ 9310:
+/***/ 1858:
 /***/ (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__(7034);
+var content = __webpack_require__(2126);
 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("32156af1", content, true, {"sourceMap":false,"shadowMode":false});
+var update = add("79edb5fe", content, true, {"sourceMap":false,"shadowMode":false});
 
 /***/ }),
 
@@ -79034,19 +79034,19 @@ var update = add("d49101ce", content, true, {"sourceMap":false,"shadowMode":fals
 
 /***/ }),
 
-/***/ 9256:
+/***/ 9099:
 /***/ (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__(2884);
+var content = __webpack_require__(5231);
 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("43102282", content, true, {"sourceMap":false,"shadowMode":false});
+var update = add("8cd3119c", content, true, {"sourceMap":false,"shadowMode":false});
 
 /***/ }),
 
@@ -79114,19 +79114,19 @@ var update = add("4026bd22", content, true, {"sourceMap":false,"shadowMode":fals
 
 /***/ }),
 
-/***/ 64:
+/***/ 8551:
 /***/ (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__(8300);
+var content = __webpack_require__(7027);
 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("6dde5a02", content, true, {"sourceMap":false,"shadowMode":false});
+var update = add("124c75ad", content, true, {"sourceMap":false,"shadowMode":false});
 
 /***/ }),
 
@@ -84782,7 +84782,7 @@ var TopBtn_component = normalizeComponent(
 
 
 var _require = __webpack_require__(3844),
-  title = _require.title,
+  SimulateTestvue_type_script_lang_js_title = _require.title,
   logo = _require.logo;
 /* harmony default export */ var SimulateTestvue_type_script_lang_js = ({
   name: 'ConversationSimulateTest',
@@ -84798,7 +84798,7 @@ var _require = __webpack_require__(3844),
       // 模拟测试信息
       logVo: {},
       // 交互实例
-      title: title,
+      title: SimulateTestvue_type_script_lang_js_title,
       logo: logo,
       bout: 0 // 回合数
     };
@@ -220724,8 +220724,8 @@ var DefaultDialog_component = normalizeComponent(
 )
 
 /* harmony default export */ var DefaultDialog = (DefaultDialog_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/common/components/DragApplet/index.vue?vue&type=template&id=e1ddc696&scoped=true
-var DragAppletvue_type_template_id_e1ddc696_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/common/components/DragApplet/index.vue?vue&type=template&id=1fd5f8a5&scoped=true
+var DragAppletvue_type_template_id_1fd5f8a5_scoped_true_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -220787,7 +220787,7 @@ var DragAppletvue_type_template_id_e1ddc696_scoped_true_render = function render
       }
     }, [_vm._t("default", null, {
       "item": item
-    }), _vm.showApplet ? _c('applet', {
+    }), _vm.showApplet ? _c('PortalApplet', {
       attrs: {
         "applet-data": item,
         "app-columns": 'layoutData'
@@ -220812,7 +220812,7 @@ var DragAppletvue_type_template_id_e1ddc696_scoped_true_render = function render
     staticClass: "layer-content"
   }) : _vm._e()], 2) : _vm._e()], 1)]);
 };
-var DragAppletvue_type_template_id_e1ddc696_scoped_true_staticRenderFns = [];
+var DragAppletvue_type_template_id_1fd5f8a5_scoped_true_staticRenderFns = [];
 
 // EXTERNAL MODULE: ./node_modules/vue-grid-layout/dist/vue-grid-layout.common.js
 var vue_grid_layout_common = __webpack_require__(1965);
@@ -220937,7 +220937,6 @@ var GridItem = (vue_grid_layout_common_default()).GridItem;
   watch: {},
   // 生命周期 - 创建完成（可以访问当前this实例）
   created: function created() {
-    this.$options.components['applet'] = this.$loadComponent('@/wapp/portal/components/index/EcoaPortalComponentsIdxApplet');
     this.historyLayout = JSON.parse(JSON.stringify(this.layoutData));
   },
   // 生命周期 - 挂载完成（可以访问DOM元素）
@@ -221025,9 +221024,9 @@ var GridItem = (vue_grid_layout_common_default()).GridItem;
 });
 ;// CONCATENATED MODULE: ./packages/ecyoa/yoabase/src/common/components/DragApplet/index.vue?vue&type=script&lang=js
  /* harmony default export */ var components_DragAppletvue_type_script_lang_js = (DragAppletvue_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/yoabase/src/common/components/DragApplet/index.vue?vue&type=style&index=0&id=e1ddc696&prod&lang=scss&scoped=true
-var DragAppletvue_type_style_index_0_id_e1ddc696_prod_lang_scss_scoped_true = __webpack_require__(9310);
-;// CONCATENATED MODULE: ./packages/ecyoa/yoabase/src/common/components/DragApplet/index.vue?vue&type=style&index=0&id=e1ddc696&prod&lang=scss&scoped=true
+// 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/yoabase/src/common/components/DragApplet/index.vue?vue&type=style&index=0&id=1fd5f8a5&prod&lang=scss&scoped=true
+var DragAppletvue_type_style_index_0_id_1fd5f8a5_prod_lang_scss_scoped_true = __webpack_require__(1858);
+;// CONCATENATED MODULE: ./packages/ecyoa/yoabase/src/common/components/DragApplet/index.vue?vue&type=style&index=0&id=1fd5f8a5&prod&lang=scss&scoped=true
 
 ;// CONCATENATED MODULE: ./packages/ecyoa/yoabase/src/common/components/DragApplet/index.vue
 
@@ -221040,11 +221039,11 @@ var DragAppletvue_type_style_index_0_id_e1ddc696_prod_lang_scss_scoped_true = __
 
 var DragApplet_component = normalizeComponent(
   components_DragAppletvue_type_script_lang_js,
-  DragAppletvue_type_template_id_e1ddc696_scoped_true_render,
-  DragAppletvue_type_template_id_e1ddc696_scoped_true_staticRenderFns,
+  DragAppletvue_type_template_id_1fd5f8a5_scoped_true_render,
+  DragAppletvue_type_template_id_1fd5f8a5_scoped_true_staticRenderFns,
   false,
   null,
-  "e1ddc696",
+  "1fd5f8a5",
   null
   
 )
@@ -231056,8 +231055,8 @@ var echartR_component = normalizeComponent(
   MappWorkEchartZ: echartZ,
   MappWorkEchartR: echartR
 });
-;// 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/AddCalendar.vue?vue&type=template&id=70b42c55&scoped=true
-var AddCalendarvue_type_template_id_70b42c55_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/AddCalendar.vue?vue&type=template&id=7838b2b1&scoped=true
+var AddCalendarvue_type_template_id_7838b2b1_scoped_true_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _vm.formShow ? _c('Basicform', {
@@ -231075,7 +231074,7 @@ var AddCalendarvue_type_template_id_70b42c55_scoped_true_render = function rende
     scopedSlots: _vm._u([{
       key: "default",
       fn: function fn(slotProps) {
-        return [_c('EcoaPersonOrderForm', {
+        return [_c('PersonOrderForm', {
           ref: "busiforma",
           attrs: {
             "vo": slotProps.vo,
@@ -231084,10 +231083,10 @@ var AddCalendarvue_type_template_id_70b42c55_scoped_true_render = function rende
           }
         })];
       }
-    }], null, false, 356591633)
+    }], null, false, 2201892857)
   }) : _vm._e();
 };
-var AddCalendarvue_type_template_id_70b42c55_scoped_true_staticRenderFns = [];
+var AddCalendarvue_type_template_id_7838b2b1_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/AddCalendar.vue?vue&type=script&lang=js
 /* harmony default export */ var AddCalendarvue_type_script_lang_js = ({
@@ -231122,9 +231121,9 @@ var AddCalendarvue_type_template_id_70b42c55_scoped_true_staticRenderFns = [];
   },
   mounted: function mounted() {},
   methods: {
-    openAddCalendar: function openAddCalendar(title) {
+    openAddCalendar: function openAddCalendar() {
       var _this = this;
-      this.formTitle = title;
+      this.formTitle = '个人日程';
       this.formShow = true;
       this.$nextTick(function () {
         _this.$bus.emit('openBusiform', _this.moduleInfo, null, 1, function (res) {
@@ -231215,11 +231214,11 @@ var AddCalendarvue_type_template_id_70b42c55_scoped_true_staticRenderFns = [];
 ;
 var AddCalendar_component = normalizeComponent(
   components_AddCalendarvue_type_script_lang_js,
-  AddCalendarvue_type_template_id_70b42c55_scoped_true_render,
-  AddCalendarvue_type_template_id_70b42c55_scoped_true_staticRenderFns,
+  AddCalendarvue_type_template_id_7838b2b1_scoped_true_render,
+  AddCalendarvue_type_template_id_7838b2b1_scoped_true_staticRenderFns,
   false,
   null,
-  "70b42c55",
+  "7838b2b1",
   null
   
 )
@@ -231815,8 +231814,8 @@ var AssociatedDocuments_component = normalizeComponent(
 )
 
 /* harmony default export */ var AssociatedDocuments = (AssociatedDocuments_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/AssociatedDocumentsSidebar.vue?vue&type=template&id=c40abdf0&scoped=true
-var AssociatedDocumentsSidebarvue_type_template_id_c40abdf0_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/AssociatedDocumentsSidebar.vue?vue&type=template&id=55135e9b&scoped=true
+var AssociatedDocumentsSidebarvue_type_template_id_55135e9b_scoped_true_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -231916,6 +231915,9 @@ var AssociatedDocumentsSidebarvue_type_template_id_c40abdf0_scoped_true_render =
       }
     })])])], 1)], 1)])];
   }), _vm.linkedOtherList.length === 0 ? [_c('el-col', {
+    staticStyle: {
+      "padding-bottom": "12px"
+    },
     attrs: {
       "span": "24"
     }
@@ -231973,7 +231975,7 @@ var AssociatedDocumentsSidebarvue_type_template_id_c40abdf0_scoped_true_render =
     }
   }, [_vm._v("暂无关联文件")])] : _vm._e()], 2)], 1)])]);
 };
-var AssociatedDocumentsSidebarvue_type_template_id_c40abdf0_scoped_true_staticRenderFns = [];
+var AssociatedDocumentsSidebarvue_type_template_id_55135e9b_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/AssociatedDocumentsSidebar.vue?vue&type=script&lang=js
 /* harmony default export */ var AssociatedDocumentsSidebarvue_type_script_lang_js = ({
@@ -232254,9 +232256,9 @@ var AssociatedDocumentsSidebarvue_type_template_id_c40abdf0_scoped_true_staticRe
 });
 ;// CONCATENATED MODULE: ./packages/ecyoa/yoabase/src/workflow/wfInstance/mainform/components/AssociatedDocumentsSidebar.vue?vue&type=script&lang=js
  /* harmony default export */ var components_AssociatedDocumentsSidebarvue_type_script_lang_js = (AssociatedDocumentsSidebarvue_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/yoabase/src/workflow/wfInstance/mainform/components/AssociatedDocumentsSidebar.vue?vue&type=style&index=0&id=c40abdf0&prod&lang=scss&scoped=true
-var AssociatedDocumentsSidebarvue_type_style_index_0_id_c40abdf0_prod_lang_scss_scoped_true = __webpack_require__(9256);
-;// CONCATENATED MODULE: ./packages/ecyoa/yoabase/src/workflow/wfInstance/mainform/components/AssociatedDocumentsSidebar.vue?vue&type=style&index=0&id=c40abdf0&prod&lang=scss&scoped=true
+// 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/yoabase/src/workflow/wfInstance/mainform/components/AssociatedDocumentsSidebar.vue?vue&type=style&index=0&id=55135e9b&prod&lang=scss&scoped=true
+var AssociatedDocumentsSidebarvue_type_style_index_0_id_55135e9b_prod_lang_scss_scoped_true = __webpack_require__(9099);
+;// CONCATENATED MODULE: ./packages/ecyoa/yoabase/src/workflow/wfInstance/mainform/components/AssociatedDocumentsSidebar.vue?vue&type=style&index=0&id=55135e9b&prod&lang=scss&scoped=true
 
 ;// CONCATENATED MODULE: ./packages/ecyoa/yoabase/src/workflow/wfInstance/mainform/components/AssociatedDocumentsSidebar.vue
 
@@ -232269,18 +232271,18 @@ var AssociatedDocumentsSidebarvue_type_style_index_0_id_c40abdf0_prod_lang_scss_
 
 var AssociatedDocumentsSidebar_component = normalizeComponent(
   components_AssociatedDocumentsSidebarvue_type_script_lang_js,
-  AssociatedDocumentsSidebarvue_type_template_id_c40abdf0_scoped_true_render,
-  AssociatedDocumentsSidebarvue_type_template_id_c40abdf0_scoped_true_staticRenderFns,
+  AssociatedDocumentsSidebarvue_type_template_id_55135e9b_scoped_true_render,
+  AssociatedDocumentsSidebarvue_type_template_id_55135e9b_scoped_true_staticRenderFns,
   false,
   null,
-  "c40abdf0",
+  "55135e9b",
   null
   
 )
 
 /* harmony default export */ var AssociatedDocumentsSidebar = (AssociatedDocumentsSidebar_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/nullifyRecords.vue?vue&type=template&id=44d2cb92&scoped=true
-var nullifyRecordsvue_type_template_id_44d2cb92_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/nullifyRecords.vue?vue&type=template&id=7738cd1b&scoped=true
+var nullifyRecordsvue_type_template_id_7738cd1b_scoped_true_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', [_vm.nullifyRecordsDialog ? _c('el-dialog', {
@@ -232323,109 +232325,7 @@ var nullifyRecordsvue_type_template_id_44d2cb92_scoped_true_render = function re
       "cellpadding": "0",
       "border": "0"
     }
-  }, [_c('tbody', [_c('tr', [_c('td', {
-    ref: "tdlbl_操作人",
-    staticClass: "el-table__cell tdlbl tdw17",
-    attrs: {
-      "colspan": "1"
-    }
-  }, [_c('span', {
-    directives: [{
-      name: "field-lbl",
-      rawName: "v-field-lbl",
-      value: 'creator',
-      expression: "'creator'"
-    }],
-    staticClass: "field"
-  }, [_vm._v("操作人")])]), _c('td', {
-    staticClass: "el-table__cell tdcont tdw33",
-    attrs: {
-      "colspan": "2"
-    }
-  }, [_c('form-item', {
-    ref: "creator",
-    attrs: {
-      "field": {
-        'defaultValue': null,
-        'elementCanEdit': '0',
-        'elementCssHeight': null,
-        'elementCssWidth': null,
-        'elementFormatter': null,
-        'elementReadonly': 0,
-        'elementType': 'input',
-        'emptyMessage': '请输入操作人',
-        'errorMessage': null,
-        'formTdAlign': 'text-left',
-        'formTdColspan': 0,
-        'isRequired': 0,
-        'onClickEvent': null,
-        'passenger': {},
-        'propComment': '操作人',
-        'propName': 'creator',
-        'propType': 'String',
-        'textFormatter': 'textfield',
-        'valueMaxLength': null,
-        'valueMinLength': null,
-        'model': 'vo.creator',
-        'option': [],
-        'autocomplete': 'off',
-        'showWordLimit': false
-      },
-      "vo": _vm.vo,
-      "can-edit": _vm.canEdit
-    }
-  })], 1), _c('td', {
-    ref: "tdlbl_操作时间",
-    staticClass: "el-table__cell tdlbl tdw17",
-    attrs: {
-      "colspan": "1"
-    }
-  }, [_c('span', {
-    directives: [{
-      name: "field-lbl",
-      rawName: "v-field-lbl",
-      value: 'createTime',
-      expression: "'createTime'"
-    }],
-    staticClass: "field"
-  }, [_vm._v("操作时间")])]), _c('td', {
-    staticClass: "el-table__cell tdcont tdw33",
-    attrs: {
-      "colspan": "2"
-    }
-  }, [_c('form-item', {
-    ref: "createTime",
-    attrs: {
-      "field": {
-        'defaultValue': null,
-        'elementCanEdit': '0',
-        'elementCssHeight': null,
-        'elementCssWidth': null,
-        'elementFormatter': null,
-        'elementReadonly': 1,
-        'elementType': 'date',
-        'emptyMessage': '请输入操作时间',
-        'errorMessage': null,
-        'formTdAlign': 'text-left',
-        'formTdColspan': 0,
-        'isRequired': 0,
-        'onClickEvent': null,
-        'passenger': {},
-        'propComment': '操作时间',
-        'propName': 'createTime',
-        'propType': 'java.util.Date',
-        'textFormatter': 'yyyy-MM-dd HH:mm',
-        'valueMaxLength': null,
-        'valueMinLength': null,
-        'model': 'vo.createTime',
-        'option': [],
-        'weekday': 0,
-        'stepNum': 5
-      },
-      "vo": _vm.vo,
-      "can-edit": _vm.canEdit
-    }
-  })], 1)]), _vm.isWf ? _c('tr', [_c('td', {
+  }, [_c('tbody', [_vm.isWf ? _c('tr', [_c('td', {
     ref: "tdlbl_文件标题",
     staticClass: "el-table__cell tdlbl tdw17",
     attrs: {
@@ -232551,7 +232451,7 @@ var nullifyRecordsvue_type_template_id_44d2cb92_scoped_true_render = function re
     }
   }, [_vm._v("确 定")])], 1)]) : _vm._e()], 1);
 };
-var nullifyRecordsvue_type_template_id_44d2cb92_scoped_true_staticRenderFns = [];
+var nullifyRecordsvue_type_template_id_7738cd1b_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/nullifyRecords.vue?vue&type=script&lang=js
 /* harmony default export */ var nullifyRecordsvue_type_script_lang_js = ({
@@ -232673,11 +232573,11 @@ var nullifyRecordsvue_type_template_id_44d2cb92_scoped_true_staticRenderFns = []
 ;
 var nullifyRecords_component = normalizeComponent(
   components_nullifyRecordsvue_type_script_lang_js,
-  nullifyRecordsvue_type_template_id_44d2cb92_scoped_true_render,
-  nullifyRecordsvue_type_template_id_44d2cb92_scoped_true_staticRenderFns,
+  nullifyRecordsvue_type_template_id_7738cd1b_scoped_true_render,
+  nullifyRecordsvue_type_template_id_7738cd1b_scoped_true_staticRenderFns,
   false,
   null,
-  "44d2cb92",
+  "7738cd1b",
   null
   
 )
@@ -234780,20 +234680,11 @@ var HandleIdea1_component = normalizeComponent(
 )
 
 /* harmony default export */ var HandleIdea1 = (HandleIdea1_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/InlineTextEditor.vue?vue&type=template&id=5666a904&scoped=true
-var InlineTextEditorvue_type_template_id_5666a904_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/InlineTextEditor.vue?vue&type=template&id=21b98c3d&scoped=true
+var InlineTextEditorvue_type_template_id_21b98c3d_scoped_true_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
-  return _vm.ecweboffice && _vm.bodyFileEditor === 2 && _vm.officeType === 'ech5' ? _c('div', {
-    staticStyle: {
-      "display": "flex",
-      "height": "calc(100vh - 71px)"
-    }
-  }, [_c('div', {
-    staticStyle: {
-      "flex": "1"
-    }
-  }, [_c('el-button', {
+  return _c('div', [_c('el-button', {
     directives: [{
       name: "show",
       rawName: "v-show",
@@ -234821,7 +234712,16 @@ var InlineTextEditorvue_type_template_id_5666a904_scoped_true_render = function
     on: {
       "click": _vm.windowOpen
     }
-  }), _vm.ecweboffice && _vm.bodyFileEditor === 2 && _vm.officeType === 'ech5' ? _c('ecweboffice', {
+  }), _vm.ecweboffice && _vm.bodyFileEditor === 2 && _vm.officeType === 'ech5' ? _c('div', {
+    staticStyle: {
+      "display": "flex",
+      "height": "calc(100vh - 71px)"
+    }
+  }, [_c('div', {
+    staticStyle: {
+      "flex": "1"
+    }
+  }, [_vm.ecweboffice && _vm.bodyFileEditor === 2 && _vm.officeType === 'ech5' ? _c('ecweboffice', {
     ref: "ecweboffice",
     staticStyle: {
       "width": "100%"
@@ -234833,9 +234733,9 @@ var InlineTextEditorvue_type_template_id_5666a904_scoped_true_render = function
     staticStyle: {
       "background-color": "#fff"
     }
-  }, [_vm._t("right-sidebar")], 2)]) : _vm._e();
+  }, [_vm._t("right-sidebar")], 2)]) : _vm._e()], 1);
 };
-var InlineTextEditorvue_type_template_id_5666a904_scoped_true_staticRenderFns = [];
+var InlineTextEditorvue_type_template_id_21b98c3d_scoped_true_staticRenderFns = [];
 
 // EXTERNAL MODULE: ./node_modules/moment/moment.js
 var moment_moment = __webpack_require__(5093);
@@ -234888,15 +234788,13 @@ function InlineTextEditorvue_type_script_lang_js_asyncToGenerator(n) { return fu
       WFBodyDocId: '',
       editorUrl: '',
       // 编辑地址
-      mbDownUrl: '',
-      // 模版
-      isNoTracks: false
+      mbDownUrl: '' // 模版
     };
   },
   computed: {},
   watch: {},
   created: function created() {
-    this.$options.components['ecweboffice'] = this.$loadComponent('@/wapp/workflow/webOffice/ecweboffice');
+    // this.$options.components['ecweboffice'] = this.$loadComponent('@/wapp/workflow/webOffice/ecweboffice')
     if (this.curTN === null) this.curTN = this.$vnode.context.curTN;
     this.$bus.on('btnOpenWordClick', this.btnOpenWordClick);
     this.$bus.on('btnNoTitleModifyFlTypeClick', this.btnNoTitleModifyFlTypeClick);
@@ -235113,8 +235011,6 @@ function InlineTextEditorvue_type_script_lang_js_asyncToGenerator(n) { return fu
       console.log(openType, 'openType');
       var module = $scope.wfInstance.module;
       this.openType = openType;
-      // 判断是否处理清稿状态
-      this.isNoTracks = $scope.isNoTracks;
       $scope.formValidate(function () {
         var bookmarks = [];
         if ($scope.wfInstance.haveDoc === 0 || openType === 'OpenTwoDoc' || openType === 'Redlining' || openType === 'RedliningOnce') {
@@ -235268,6 +235164,12 @@ function InlineTextEditorvue_type_script_lang_js_asyncToGenerator(n) { return fu
         var WFBusiDataId = $scope.vo.id;
         var WFBodyDocId = $scope.wfInstance.bodyDocId;
         _this5.WFBodyDocId = WFBodyDocId;
+        var saveAs = WFBodyDocId + '.doc';
+        if (openType === 'NoTracks') {
+          saveAs = 'NoTracks_' + saveAs;
+        } else if (openType === 'Redlining' || openType === 'RedliningOnce') {
+          saveAs = 'RedTitle_' + saveAs;
+        }
         var fileId = '';
         var fileVer = '';
         var downUrl = '';
@@ -235286,36 +235188,41 @@ function InlineTextEditorvue_type_script_lang_js_asyncToGenerator(n) { return fu
         if ($scope.wfInstance.haveDoc === 0) {
           // 初始无正文
           if (_this5.fanwen_url) {
-            downUrl = "/apigw".substring(1) + _this5.fanwen_url;
+            downUrl = "/apigw".substring(1) + _this5.fanwen_url + '&saveAs=' + saveAs;
           } else if ($scope.wfInstance.passenger.docEditMode === 'NoTitle' && module !== 'htsp') {
             // NoTitle 直接启用空白模版进行正文编辑 合同审批流程直接套模版，无NoTitle模式
             downUrl = 'templates/Editor.doc';
           } else if (mbId && mbId !== null && mbId !== '') {
-            downUrl = "/apigw".substring(1) + '/' + mbDownUrl + 'download?id=' + mbId + '&dataField=fileContent&nameField=mbFileName';
+            downUrl = "/apigw".substring(1) + '/' + mbDownUrl + 'download?id=' + mbId + '&dataField=fileContent&nameField=mbFileName&saveAs=' + saveAs;
           } else {
             downUrl = 'templates/Editor.doc';
           }
-        } else {
-          // 有正文
+        } else if (openType === 'NoTracks') {
           if ($scope.noTracksFile && $scope.noTracksFile.fileName) {
+            // 清稿在优先选择已清稿文件
+            downUrl = "/apigw".substring(1) + '/' + $scope.wfAttachUrl + '/downloadByName?busiDataId=' + WFBusiDataId + '&attachsName=NoTracks_' + WFBodyDocId + '.doc&attachsType=BODY&saveAs=' + saveAs;
+          } else {
+            // 编辑正文取源文件
+            downUrl = "/apigw".substring(1) + '/' + $scope.wfAttachUrl + '/downloadByName?busiDataId=' + WFBusiDataId + '&attachsName=' + WFBodyDocId + '.doc&attachsType=BODY&saveAs=' + saveAs;
+          }
+        } else if (openType === 'Redlining' || openType === 'RedliningOnce') {
+          if ($scope.noTracksFile && $scope.noTracksFile.fileName && $scope.wfInstance.passenger.docEditMode === 'NoTitle') {
             downUrl = "/apigw".substring(1) + '/' + $scope.wfAttachUrl + '/downloadByName?busiDataId=' + WFBusiDataId + '&attachsName=NoTracks_' + WFBodyDocId + '.doc&attachsType=BODY';
           } else {
+            // 编辑正文取源文件
             downUrl = "/apigw".substring(1) + '/' + $scope.wfAttachUrl + '/downloadByName?busiDataId=' + WFBusiDataId + '&attachsName=' + WFBodyDocId + '.doc&attachsType=BODY';
           }
-          if ((openType === 'Redlining' || openType === 'RedliningOnce') && $scope.wfInstance.passenger.docEditMode === 'NoTitle') {
-            // 套红功能
-            insertFileUrl = "/apigw".substring(1) + '/' + mbDownUrl + 'download?id=' + mbId + '&dataField=fileContent&nameField=mbFileName';
-          } else if (openType === 'OpenTwoDoc') {
-            // 修改红头功能
-            downUrl = "/apigw".substring(1) + '/' + mbDownUrl + 'download?id=' + mbId + '&dataField=fileContent&nameField=mbFileName';
-          }
-          var bodyDocFiles = $scope.attachments.filter(function (attach) {
-            if (attach.fileType === 'BODY' && (attach.originalName.indexOf(WFBodyDocId + '.doc') !== -1 || attach.originalName.indexOf(WFBodyDocId + '.docx') !== -1)) return true;
-          });
-          if (bodyDocFiles.length > 0) {
-            fileId = bodyDocFiles[0].fileId;
-            fileVer = bodyDocFiles[0].fileVer;
-          }
+          insertFileUrl = "/apigw".substring(1) + '/gwgl/fwmb/download?id=' + $scope.vo.gwmbId + '&dataField=fileContent&nameField=mbFileName&saveAs=' + saveAs;
+        } else {
+          // 有正文
+          downUrl = "/apigw".substring(1) + '/' + $scope.wfAttachUrl + '/downloadByName?busiDataId=' + WFBusiDataId + '&attachsName=' + WFBodyDocId + '.doc&attachsType=BODY&saveAs=' + saveAs;
+        }
+        var bodyDocFiles = $scope.attachments.filter(function (attach) {
+          if (attach.fileType === 'BODY' && (attach.originalName.indexOf(WFBodyDocId + '.doc') !== -1 || attach.originalName.indexOf(WFBodyDocId + '.docx') !== -1)) return true;
+        });
+        if (bodyDocFiles.length > 0) {
+          fileId = bodyDocFiles[0].fileId;
+          fileVer = bodyDocFiles[0].fileVer;
         }
         if (downUrl.indexOf('/Editor.doc') === -1) {
           // downUrl += '&saveAs=' + $scope.vo.flSubject.trim() + '.doc'
@@ -235336,23 +235243,11 @@ function InlineTextEditorvue_type_script_lang_js_asyncToGenerator(n) { return fu
           fileVersionId: ''
         };
         if (openType === 'Redlining' || openType === 'RedliningOnce') {
-          // openType = 'Redlining' // 类型 临时为 test调试
           data.insertFileUrl = insertFileUrl; // 红头模版地址
           data.bkInsertFile = 'Body'; // 套红书签位置
           data.bookmarks = bookmarks; // 书签合集
           data.fileName = WFBodyDocId + '.doc';
         }
-
-        // if (this.officeType === 'wpsh5') {
-        //     bookmarks.forEach(bookmark => {
-        //         bookmark.name = bookmark.bookName
-        //         bookmark.value = bookmark.bookValue
-        //         bookmark.type = 'text'
-        //     })
-        //     this.btnOpenWpsEditorClick($scope, bookmarks, downUrl, fileId, fileVer)
-        // } else if (this.officeType === 'yzh5') {
-        //     this.btnOpenYzdocEditorClick($scope, bookmarks, data, params, openType)
-        // } else
         if (_this5.officeType === 'ech5') {
           _this5.btnOpenEcdocEditorClick($scope, bookmarks, data, downUrl, fileId, fileVer, openType);
         }
@@ -235481,7 +235376,7 @@ function InlineTextEditorvue_type_script_lang_js_asyncToGenerator(n) { return fu
                   if (_this6.openType === 'Redlining' || _this6.openType === 'RedliningOnce') {
                     attachsName = 'RedTitle_' + _this6.WFBodyDocId + '.doc';
                     msg = '正在套红，请稍候...';
-                  } else if (_this6.isNoTracks) {
+                  } else if (_this6.openType === 'NoTracks') {
                     attachsName = 'NoTracks_' + _this6.WFBodyDocId + '.doc';
                   } else {
                     attachsName = _this6.WFBodyDocId + '.doc';
@@ -235492,7 +235387,6 @@ function InlineTextEditorvue_type_script_lang_js_asyncToGenerator(n) { return fu
                   uploadUrl += '&saveAs=' + _this6.WFBodyDocId + '.doc';
                   uploadUrl += '&r=' + Math.random();
                   document.querySelector('#btnEcdocSaved').uploadUrl = uploadUrl;
-                  console.log(document.querySelector('#btnEcdocSaved'), 'btnEcdocSaved');
                   document.querySelector('#btnEcdocSaved').checkSave = false;
                 } else {
                   _this6.$alert(res.message, '操作提示', {
@@ -235510,7 +235404,7 @@ function InlineTextEditorvue_type_script_lang_js_asyncToGenerator(n) { return fu
     btnEcdocSavedClick: function btnEcdocSavedClick(closed) {
       if (this.officeType !== 'ech5') return;
       var messageBtn = document.querySelector('#btnEcdocSaved');
-      console.log(messageBtn.srcEvent);
+      console.log(messageBtn.srcEvent, 'messageBtn.srcEvent  554');
       if (!messageBtn.srcEvent) return;
       var msg = messageBtn.srcEvent.data;
       if (!msg) {
@@ -235569,45 +235463,28 @@ function InlineTextEditorvue_type_script_lang_js_asyncToGenerator(n) { return fu
             _this7.waiting = true;
             if (attachType === 'BODY') {
               var haveDoc = $scope.wfInstance.haveDoc;
-              var noTracksFile = $scope.noTracksFile && $scope.noTracksFile.fileName ? $scope.noTracksFile.fileName : null;
-              if ($scope.wfInstance.passenger.docEditMode === 'NoTitle') {
-                // NoTitle 模式
-                if (!_this7.openType) {
-                  // 编辑正文且无红头
+              if (_this7.openType === 'NoTracks') {
+                // 清稿结束
+                $scope.wfInstance.haveDoc = 1;
+                if ($scope.vo.signedFileName) $scope.vo.signedFileName = null;
+              } else if (_this7.openType === 'Redlining' || _this7.openType === 'RedliningOnce') {
+                // 套红或重新套红
+                $scope.wfInstance.haveDoc = 2;
+                if ($scope.vo.signedFileName) $scope.vo.signedFileName = null;
+              } else if (_this7.openType === 'SignedFile') {
+                // 盖章
+                $scope.vo.signedFileName = attachs[0].fileName;
+              } else {
+                // 编辑正文
+                if ($scope.wfInstance.passenger.docEditMode === 'NoTitle') {
+                  // NoTitle 模式下 haveDoc 编辑后为 1
                   $scope.wfInstance.haveDoc = 1;
-                  if ($scope.noTracksFile && $scope.noTracksFile.fileName && !_this7.isNoTracks) {
-                    $scope.noTracksFile = null;
-                  } else if (_this7.isNoTracks) {
-                    $scope.noTracksFile.fileName = 'NoTracks_' + _this7.WFBodyDocId + '.doc';
-                  }
-                } else if (_this7.openType === 'Redlining' || _this7.openType === 'RedliningOnce') {
-                  // 套红
+                } else {
                   $scope.wfInstance.haveDoc = 2;
                 }
-              } else {
-                // RedTitle 模式
-                $scope.wfInstance.haveDoc = 2;
-                // redtitle 无清稿概念，默认编辑正文时候干掉清稿文件（防止模式切换导致数据异常）
-                if ($scope.noTracksFile && $scope.noTracksFile.fileName && !_this7.isNoTracks) {
-                  $scope.noTracksFile = null;
-                } else if (_this7.isNoTracks) {
-                  //  $scope.noTracksFile = 'NoTracks_' + this.WFBodyDocId + '.doc'
-                }
+                if ($scope.vo.signedFileName) $scope.vo.signedFileName = null;
               }
-              if ($scope.vo.signedFileName) $scope.vo.signedFileName = null;
-              if ($scope.wfInstance.status === -1 || haveDoc !== $scope.wfInstance.haveDoc || noTracksFile !== ($scope.noTracksFile && $scope.noTracksFile.fileName) || _this7.openType === 'Redlining' || _this7.openType === 'RedliningOnce') {
-                // 拟稿状态需保存流程
-                _this7.waiting = false;
-                $scope.embeddedEditorToggle(false);
-                localStorage.setItem('activeName', 1);
-                $scope.btnSubmitClick('SaveAndReload');
-              } else if ($scope.actionType !== 'AutoSave' && $scope.actionType !== '') {
-                // 表单保存或提交时调用
-                _this7.waiting = false;
-                $scope.embeddedEditorToggle(false);
-                $scope.btnSubmitClick($scope.actionType);
-              } else {
-                // 正文编辑内部保存调用
+              if (haveDoc === $scope.wfInstance.haveDoc && $scope.wfInstance.haveDoc === 1 && !$scope.noTracksFile && _this7.openType !== 'NoTracks') {
                 _this7.waiting = false;
                 $scope.btnSubmitClick('AutoSave', function (saveRst, a, b, c) {
                   if (saveRst) {
@@ -235619,7 +235496,40 @@ function InlineTextEditorvue_type_script_lang_js_asyncToGenerator(n) { return fu
                     });
                   }
                 });
+              } else if ($scope.actionType !== 'AutoSave' && $scope.actionType !== '') {
+                // 表单保存或提交时调用
+                _this7.waiting = false;
+                $scope.embeddedEditorToggle(false);
+                $scope.btnSubmitClick($scope.actionType);
+              } else {
+                _this7.waiting = false;
+                $scope.embeddedEditorToggle(false);
+                localStorage.setItem('activeName', 1);
+                $scope.btnSubmitClick('SaveAndReload');
               }
+
+              // if ($scope.wfInstance.status === -1 || haveDoc !== $scope.wfInstance.haveDoc || noTracksFile !== ($scope.noTracksFile && $scope.noTracksFile.fileName) || this.openType === 'Redlining' || this.openType === 'RedliningOnce') { // 拟稿状态需保存流程
+              //     this.waiting = false
+              //     $scope.embeddedEditorToggle(false)
+              //     localStorage.setItem('activeName', 1)
+              //     $scope.btnSubmitClick('SaveAndReload')
+              // } else if (($scope.actionType !== 'AutoSave' && $scope.actionType !== '')) { // 表单保存或提交时调用
+              //     this.waiting = false
+              //     $scope.embeddedEditorToggle(false)
+              //     $scope.btnSubmitClick($scope.actionType)
+              // } else { // 正文编辑内部保存调用
+              //     this.waiting = false
+              //     $scope.btnSubmitClick('AutoSave', (saveRst, a, b, c) => {
+              //         if (saveRst) {
+              //             this.$bus.emit('reloadBodyFile')
+              //             this.$bus.emit('closeDoingDialog')
+              //             this.$nextTick(() => {
+              //                 this.editorUrl = ''
+              //                 $scope.embeddedEditorToggle(false)
+              //             })
+              //         }
+              //     })
+              // }
             } else {
               _this7.$bus.emit('closeDoingDialog');
             }
@@ -235685,9 +235595,9 @@ function InlineTextEditorvue_type_script_lang_js_asyncToGenerator(n) { return fu
 });
 ;// CONCATENATED MODULE: ./packages/ecyoa/yoabase/src/workflow/wfInstance/mainform/components/InlineTextEditor.vue?vue&type=script&lang=js
  /* harmony default export */ var components_InlineTextEditorvue_type_script_lang_js = (InlineTextEditorvue_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/yoabase/src/workflow/wfInstance/mainform/components/InlineTextEditor.vue?vue&type=style&index=0&id=5666a904&prod&scoped=true&lang=scss
-var InlineTextEditorvue_type_style_index_0_id_5666a904_prod_scoped_true_lang_scss = __webpack_require__(64);
-;// CONCATENATED MODULE: ./packages/ecyoa/yoabase/src/workflow/wfInstance/mainform/components/InlineTextEditor.vue?vue&type=style&index=0&id=5666a904&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/yoabase/src/workflow/wfInstance/mainform/components/InlineTextEditor.vue?vue&type=style&index=0&id=21b98c3d&prod&scoped=true&lang=scss
+var InlineTextEditorvue_type_style_index_0_id_21b98c3d_prod_scoped_true_lang_scss = __webpack_require__(8551);
+;// CONCATENATED MODULE: ./packages/ecyoa/yoabase/src/workflow/wfInstance/mainform/components/InlineTextEditor.vue?vue&type=style&index=0&id=21b98c3d&prod&scoped=true&lang=scss
 
 ;// CONCATENATED MODULE: ./packages/ecyoa/yoabase/src/workflow/wfInstance/mainform/components/InlineTextEditor.vue
 
@@ -235700,11 +235610,11 @@ var InlineTextEditorvue_type_style_index_0_id_5666a904_prod_scoped_true_lang_scs
 
 var InlineTextEditor_component = normalizeComponent(
   components_InlineTextEditorvue_type_script_lang_js,
-  InlineTextEditorvue_type_template_id_5666a904_scoped_true_render,
-  InlineTextEditorvue_type_template_id_5666a904_scoped_true_staticRenderFns,
+  InlineTextEditorvue_type_template_id_21b98c3d_scoped_true_render,
+  InlineTextEditorvue_type_template_id_21b98c3d_scoped_true_staticRenderFns,
   false,
   null,
-  "5666a904",
+  "21b98c3d",
   null
   
 )