hoeditor-web 3.0.63 → 3.0.65

package/lib/hoeditor.umd.js

@@ -5776,7 +5776,7 @@ var component = (0,componentNormalizer/* default */.Z)(
 
 /***/ }),
 
-/***/ 45611:
+/***/ 99219:
 /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -5788,7 +5788,7 @@ __webpack_require__.d(__webpack_exports__, {
   "default": function() { return /* binding */ ExpressionForm; }
 });
 
-;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/expressionForm/ExpressionForm.vue?vue&type=template&id=3bd29308&
+;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/expressionForm/ExpressionForm.vue?vue&type=template&id=a290f012&
 var render = function render() {
   var _vm = this,
     _c = _vm._self._c;
@@ -6148,7 +6148,20 @@ var render = function render() {
       },
       expression: "isUseDate"
     }
-  }, [_vm._v("使用日期")])], 1), _vm.isUseDate ? _c('div', {
+  }, [_vm._v("使用日期")])], 1), _c('div', {
+    staticClass: "express-date-items"
+  }, [_c('a-checkbox', {
+    on: {
+      "change": _vm.useTextChange
+    },
+    model: {
+      value: _vm.useText,
+      callback: function callback($$v) {
+        _vm.useText = $$v;
+      },
+      expression: "useText"
+    }
+  }, [_vm._v("未来潮")])], 1), _vm.isUseDate ? _c('div', {
     staticClass: "express-date-items"
   }, [_c('a-select', {
     attrs: {
@@ -6698,7 +6711,7 @@ var staticRenderFns = [function () {
   }, [_c('li', [_vm._v("第二乳磨牙")]), _c('li', [_vm._v("第一乳磨牙")]), _c('li', [_vm._v("乳尖牙")]), _c('li', [_vm._v("乳侧切牙")]), _c('li', [_vm._v("乳中切牙")]), _c('li', [_vm._v("乳中切牙")]), _c('li', [_vm._v("乳侧切牙")]), _c('li', [_vm._v("乳尖牙")]), _c('li', [_vm._v("第一乳磨牙")]), _c('li', [_vm._v("第二乳磨牙")])]);
 }];
 
-;// CONCATENATED MODULE: ./src/components/controls/expressionForm/ExpressionForm.vue?vue&type=template&id=3bd29308&
+;// CONCATENATED MODULE: ./src/components/controls/expressionForm/ExpressionForm.vue?vue&type=template&id=a290f012&
 
 // EXTERNAL MODULE: ./node_modules/@babel/runtime/helpers/esm/objectSpread2.js
 var objectSpread2 = __webpack_require__(63442);
@@ -6764,6 +6777,7 @@ var zh_cn = __webpack_require__(83839);
       locale: zh_CN/* default */.Z,
       animationClassNames: 'control-modal-contents express-dialog animation-in',
       isUseDate: false,
+      useText: false,
       useDateFormat: 'yyyy-MM-DD',
       names: {
         style1: '经期史',
@@ -6822,7 +6836,7 @@ var zh_cn = __webpack_require__(83839);
         style8: 3,
         style9: 3
       },
-      menoPauseAgeText: '岁   '
+      menoPauseAgeText: '岁'
     };
   },
   inject: {
@@ -6868,6 +6882,17 @@ var zh_cn = __webpack_require__(83839);
         var nodes = updateNode;
         var regNumber = /^[0-9]*$/; // 数字校验
         var menoPauseAge = nodes[3];
+        var menarcheAge = nodes[2];
+        if (menarcheAge === '未来潮') {
+          this.useText = true;
+          this.menstrualHistory = {
+            menseDays: '',
+            cycleDays: '',
+            menarcheAge: '',
+            menoPauseAge: ''
+          };
+          return;
+        }
         if (menoPauseAge.includes('岁')) {
           menoPauseAge = menoPauseAge.replace('岁', '');
           this.menoPauseAgeText = '岁';
@@ -6924,6 +6949,7 @@ var zh_cn = __webpack_require__(83839);
         });
       }
     },
+    useTextChange: function useTextChange() {},
     dateFormatChange: function dateFormatChange() {
       if (this.menstrualHistory.menoPauseAge) {
         this.menstrualHistory = (0,objectSpread2/* default */.Z)((0,objectSpread2/* default */.Z)({}, this.menstrualHistory), {}, {
@@ -7005,9 +7031,15 @@ var zh_cn = __webpack_require__(83839);
         if (!reg.test(this.menstrualHistory.menarcheAge)) {
           this.menstrualHistory.menarcheAge = this.menstrualHistory.menarcheAge + '岁';
         }
-        if (!this.isUseDate) {
+        if (!reg.test(this.menstrualHistory.menoPauseAge) && !this.isUseDate) {
           this.menstrualHistory.menoPauseAge += this.menoPauseAgeText;
         }
+        if (this.useText) {
+          this.menstrualHistory.menseDays = '';
+          this.menstrualHistory.cycleDays = '';
+          this.menstrualHistory.menarcheAge = '未来潮';
+          this.menstrualHistory.menoPauseAge = '';
+        }
         this.insertMenstrualHistory([this.controlStatus, this.expressStyle].concat((0,toConsumableArray/* default */.Z)(this.objectToArray(this.menstrualHistory))));
       } else if (this.expressStyle === 'style5') {
         this.insertPupilMap([this.controlStatus].concat((0,toConsumableArray/* default */.Z)(this.objectToArray(this.style567))));
@@ -7137,10 +7169,10 @@ var zh_cn = __webpack_require__(83839);
 });
 ;// CONCATENATED MODULE: ./src/components/controls/expressionForm/ExpressionForm.vue?vue&type=script&lang=js&
  /* harmony default export */ var expressionForm_ExpressionFormvue_type_script_lang_js_ = (ExpressionFormvue_type_script_lang_js_); 
-;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/expressionForm/ExpressionForm.vue?vue&type=style&index=0&id=3bd29308&prod&lang=scss&
+;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/expressionForm/ExpressionForm.vue?vue&type=style&index=0&id=a290f012&prod&lang=scss&
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/components/controls/expressionForm/ExpressionForm.vue?vue&type=style&index=0&id=3bd29308&prod&lang=scss&
+;// CONCATENATED MODULE: ./src/components/controls/expressionForm/ExpressionForm.vue?vue&type=style&index=0&id=a290f012&prod&lang=scss&
 
 // EXTERNAL MODULE: ./node_modules/@vue/vue-loader-v15/lib/runtime/componentNormalizer.js
 var componentNormalizer = __webpack_require__(70713);
@@ -20243,7 +20275,7 @@ var component = (0,componentNormalizer/* default */.Z)(
 
 /***/ }),
 
-/***/ 74353:
+/***/ 29238:
 /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -20257,7 +20289,7 @@ __webpack_require__.d(__webpack_exports__, {
 
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.function.name.js
 var es_function_name = __webpack_require__(68309);
-;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/textDialog/TextDialog.vue?vue&type=template&id=2e48f0d1&
+;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/textDialog/TextDialog.vue?vue&type=template&id=6a4b416e&
 
 var render = function render() {
   var _vm = this,
@@ -20669,11 +20701,11 @@ var render = function render() {
       "size": "small"
     },
     model: {
-      value: _vm.textParam.readType,
+      value: _vm.textParam.readTypeBool,
       callback: function callback($$v) {
-        _vm.$set(_vm.textParam, "readType", $$v);
+        _vm.$set(_vm.textParam, "readTypeBool", $$v);
       },
-      expression: "textParam.readType"
+      expression: "textParam.readTypeBool"
     }
   }, [_vm._v("自动回填")])], 1), _c('li', {
     staticClass: "control-item"
@@ -20734,7 +20766,7 @@ var render = function render() {
 };
 var staticRenderFns = [];
 
-;// CONCATENATED MODULE: ./src/components/controls/textDialog/TextDialog.vue?vue&type=template&id=2e48f0d1&
+;// CONCATENATED MODULE: ./src/components/controls/textDialog/TextDialog.vue?vue&type=template&id=6a4b416e&
 
 // EXTERNAL MODULE: ./node_modules/@babel/runtime/helpers/esm/objectSpread2.js
 var objectSpread2 = __webpack_require__(63442);
@@ -20760,6 +20792,10 @@ var es_json_stringify = __webpack_require__(38862);
 var es_array_push = __webpack_require__(57658);
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.join.js
 var es_array_join = __webpack_require__(69600);
+// EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.includes.js
+var es_array_includes = __webpack_require__(26699);
+// EXTERNAL MODULE: ./node_modules/core-js/modules/es.string.includes.js
+var es_string_includes = __webpack_require__(32023);
 // EXTERNAL MODULE: ./src/components/mixins/controlParams.ts
 var controlParams = __webpack_require__(63684);
 // EXTERNAL MODULE: ./src/editor/dom/treeNode/TextInputFieldNode.ts
@@ -20791,6 +20827,8 @@ var HOEditorFactorys = __webpack_require__(74089);
 
 
 
+
+
 
 /* harmony default export */ var TextDialogvue_type_script_lang_js_ = ({
   name: 'TextDialog',
@@ -20805,7 +20843,8 @@ var HOEditorFactorys = __webpack_require__(74089);
       isMax: false,
       animationClassNames: 'control-modal-contents text-modal animation-in',
       customPropertyValue: new Object(),
-      endPath: ''
+      endPath: '',
+      elementController: {}
     };
   },
   props: {
@@ -20839,6 +20878,7 @@ var HOEditorFactorys = __webpack_require__(74089);
     var _this = this;
     var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this.hoEditorFactoryId);
     this.endPath = hoEditorFactory.docTree.curDomRange.normalize().endPath;
+    this.elementController = hoEditorFactory.elementController;
     if (this.controlStatus === 'update') {
       var updateNode = this.getTextNode();
       Object.keys(this.textParam).forEach(function (v) {
@@ -20858,7 +20898,7 @@ var HOEditorFactorys = __webpack_require__(74089);
             });
             _this.customPropertyValue = (0,objectSpread2/* default */.Z)({}, property);
           } else if (key === 'readType') {
-            _this.textParam.readType = updateNode.readType == 1 ? true : false;
+            _this.textParam.readTypeBool = updateNode.readType == 1 ? true : false;
           } else if (key === 'hideDuringPrint') {
             _this.textParam.hideDuringPrint = updateNode.hideDuringPrint == 'undefined' || updateNode.hideDuringPrint == undefined ? false : updateNode.hideDuringPrint;
           } else {
@@ -20920,6 +20960,7 @@ var HOEditorFactorys = __webpack_require__(74089);
       this.hoEditorProvider.setIsCustoms(true);
     },
     sure: function sure() {
+      var _this2 = this;
       if (this.textParam.inputFieldType === 1) {
         this.textParam.downListProperty.source = this.listArrSource;
         this.textParam.downListProperty.listItems = JSON.stringify(this.hoEditorProvider.getListStyle());
@@ -20947,13 +20988,25 @@ var HOEditorFactorys = __webpack_require__(74089);
       this.textParam.labelText = this.textParam.name;
       var customProperty = this.getCustomProperty();
       this.textParam.customProperty = (0,objectSpread2/* default */.Z)({}, customProperty);
-      this.textParam.readType ? this.textParam.readType = 1 : this.textParam.readType = 0;
+      this.textParam.readType = this.textParam.readTypeBool ? 1 : 0;
       if (this.controlStatus === 'add') {
         this.vueController.insertTextInputField(this.controlStatus, this.textParam);
       } else if (this.controlStatus === 'update') {
         this.vueController.updateTextInputField(this.textParam);
       }
-      this.handleClose();
+      if (this.textParam.text.includes('<元素>')) {
+        setTimeout(function () {
+          var node = _this2.vueController.getNodeByID('main', _this2.textParam.id);
+          if (node) {
+            _this2.elementController.updateTextInputFieldValue(node, _this2.textParam.text, node.customProperty, _this2.textParam.keyValue, _this2.textParam.value);
+          }
+          setTimeout(function () {
+            _this2.handleClose();
+          }, 200);
+        }, 200);
+      } else {
+        this.handleClose();
+      }
     },
     handleClose: function handleClose() {
       this.animationClassNames = 'control-modal-contents text-modal animation-out';
@@ -20964,10 +21017,10 @@ var HOEditorFactorys = __webpack_require__(74089);
 });
 ;// CONCATENATED MODULE: ./src/components/controls/textDialog/TextDialog.vue?vue&type=script&lang=js&
  /* harmony default export */ var textDialog_TextDialogvue_type_script_lang_js_ = (TextDialogvue_type_script_lang_js_); 
-;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/textDialog/TextDialog.vue?vue&type=style&index=0&id=2e48f0d1&prod&lang=scss&
+;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/textDialog/TextDialog.vue?vue&type=style&index=0&id=6a4b416e&prod&lang=scss&
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/components/controls/textDialog/TextDialog.vue?vue&type=style&index=0&id=2e48f0d1&prod&lang=scss&
+;// CONCATENATED MODULE: ./src/components/controls/textDialog/TextDialog.vue?vue&type=style&index=0&id=6a4b416e&prod&lang=scss&
 
 // EXTERNAL MODULE: ./node_modules/@vue/vue-loader-v15/lib/runtime/componentNormalizer.js
 var componentNormalizer = __webpack_require__(70713);
@@ -28154,7 +28207,7 @@ var HOEditorFactorys = /*#__PURE__*/function () {
 
 /***/ }),
 
-/***/ 43041:
+/***/ 85687:
 /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -28166,18 +28219,18 @@ __webpack_require__.d(__webpack_exports__, {
 
 // EXTERNAL MODULE: ./node_modules/@babel/runtime/helpers/esm/objectSpread2.js
 var objectSpread2 = __webpack_require__(63442);
-// EXTERNAL MODULE: ./node_modules/core-js/modules/es.object.to-string.js
-var es_object_to_string = __webpack_require__(41539);
-// EXTERNAL MODULE: ./node_modules/core-js/modules/web.dom-collections.for-each.js
-var web_dom_collections_for_each = __webpack_require__(54747);
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.from.js
 var es_array_from = __webpack_require__(91038);
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.string.iterator.js
 var es_string_iterator = __webpack_require__(78783);
+// EXTERNAL MODULE: ./node_modules/core-js/modules/es.object.to-string.js
+var es_object_to_string = __webpack_require__(41539);
+// EXTERNAL MODULE: ./node_modules/core-js/modules/web.dom-collections.for-each.js
+var web_dom_collections_for_each = __webpack_require__(54747);
 // EXTERNAL MODULE: external {"commonjs":"vue","commonjs2":"vue","root":"Vue"}
 var external_commonjs_vue_commonjs2_vue_root_Vue_ = __webpack_require__(77203);
 var external_commonjs_vue_commonjs2_vue_root_Vue_default = /*#__PURE__*/__webpack_require__.n(external_commonjs_vue_commonjs2_vue_root_Vue_);
-;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/common/comment/index.vue?vue&type=template&id=d356ca08&
+;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/common/comment/index.vue?vue&type=template&id=54b18014&
 var render = function render() {
   var _vm = this,
     _c = _vm._self._c;
@@ -28187,7 +28240,8 @@ var render = function render() {
       top: _vm.y + 'px'
     },
     attrs: {
-      "id": _vm.commentID
+      "id": _vm.commentID,
+      "data-status": _vm.isHandle
     }
   }, [_vm.reviewParams.old || _vm.reviewParams.old === undefined ? _c('div', [_c('div', {
     staticClass: "comment-btn"
@@ -28330,10 +28384,10 @@ var commondata = __webpack_require__(76285);
 });
 ;// CONCATENATED MODULE: ./src/components/common/comment/index.vue?vue&type=script&lang=js&
  /* harmony default export */ var common_commentvue_type_script_lang_js_ = (commentvue_type_script_lang_js_); 
-;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/common/comment/index.vue?vue&type=style&index=0&id=d356ca08&prod&lang=scss&
+;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/common/comment/index.vue?vue&type=style&index=0&id=54b18014&prod&lang=scss&
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/components/common/comment/index.vue?vue&type=style&index=0&id=d356ca08&prod&lang=scss&
+;// CONCATENATED MODULE: ./src/components/common/comment/index.vue?vue&type=style&index=0&id=54b18014&prod&lang=scss&
 
 // EXTERNAL MODULE: ./node_modules/@vue/vue-loader-v15/lib/runtime/componentNormalizer.js
 var componentNormalizer = __webpack_require__(70713);
@@ -28386,18 +28440,27 @@ var createCommentInstance = function createCommentInstance(options) {
 var hoCreateComment = {
   options: null,
   open: function open(options) {
-    hoCreateComment.close();
-    this.options = options;
+    // hoCreateComment.close();
+    // this.options = options;
     return createCommentInstance(options);
   },
   close: function close() {
-    var hoCommentBoxList = document.querySelectorAll('.hoCommentBox');
-    if (hoCommentBoxList) {
+    var hoCommentBoxList = Array.from(document.querySelectorAll('.hoCommentBox'));
+    if (hoCommentBoxList.length) {
       Array.from(hoCommentBoxList).forEach(function (hoCommentBox) {
-        var _hoCommentBox$parentN;
-        (_hoCommentBox$parentN = hoCommentBox.parentNode) === null || _hoCommentBox$parentN === void 0 ? void 0 : _hoCommentBox$parentN.removeChild(hoCommentBox);
+        if (hoCommentBox.dataset.status !== '1') {
+          var _hoCommentBox$parentN;
+          (_hoCommentBox$parentN = hoCommentBox.parentNode) === null || _hoCommentBox$parentN === void 0 ? void 0 : _hoCommentBox$parentN.removeChild(hoCommentBox);
+        }
       });
     }
+  },
+  closeId: function closeId(commentID) {
+    var hoCommentBox = document.querySelector("#".concat(commentID));
+    if (hoCommentBox && hoCommentBox.dataset.status !== '1') {
+      var _hoCommentBox$parentN2;
+      (_hoCommentBox$parentN2 = hoCommentBox.parentNode) === null || _hoCommentBox$parentN2 === void 0 ? void 0 : _hoCommentBox$parentN2.removeChild(hoCommentBox);
+    }
   }
 };
 
@@ -29003,7 +29066,8 @@ var radioCheckBox = {
   innerIdentifier: "",
   dataMetaIdentifier: "",
   identifierFormat: "",
-  readType: false
+  readType: 0,
+  readTypeBool: false
 };
 // internalIdentifier 内部标识符
 // dataE1ementIdentifier 数据元标识符
@@ -29032,7 +29096,8 @@ var textParams = {
   innerIdentifier: "",
   dataMetaIdentifier: "",
   identifierFormat: "",
-  readType: false,
+  readType: 0,
+  readTypeBool: false,
   keyValue: '',
   value: '',
   insCheckSyncUpdateList: false,
@@ -40512,16 +40577,20 @@ var DocController = /*#__PURE__*/function () {
       }
       curArea.areaComments.set(commentID, comment);
       hoEditorFactory.drawTree.commentsMap.set(commentID, comment);
+      // 2023-05-23注释 25临时放开
       curArea.drawComments();
-      //const newEndpath = endNode.getNodePath();
       hoEditorFactory.undoService.begin();
       hoEditorFactory.undoService.add(new _undoRedo_NodeStyleUndoUnit__WEBPACK_IMPORTED_MODULE_33__/* .NodeStyleUndoUnit */ .o(this._hoEditorFactoryID, startPath, endPath, new _undoRedo_NodeStyleUndoUnit__WEBPACK_IMPORTED_MODULE_33__/* .Operate */ .p("insertComment", commentID)));
       hoEditorFactory.undoService.commit();
-      var newEndpath = endNode.getNodePath();
-      var newRange = new _DomRange__WEBPACK_IMPORTED_MODULE_30__/* .DomRange */ .a(this._hoEditorFactoryID, newEndpath, newEndpath);
-      var cgEvent = new _events_SelectionChangeEvent__WEBPACK_IMPORTED_MODULE_34__/* .SelectionChangeEvent */ .r(newRange, newRange); //选中范围变化事件
-      hoEditorFactory.docTree.selectChange(cgEvent);
-      hoEditorFactory.docTree.curDomRange = newRange;
+      // const newEndpath = endNode.getNodePath();
+      // const newRange = new DomRange(
+      //   this._hoEditorFactoryID,
+      //   newEndpath,
+      //   newEndpath
+      // );
+      // const cgEvent = new SelectionChangeEvent(newRange, newRange); //选中范围变化事件
+      // hoEditorFactory.docTree.selectChange(cgEvent);
+      // hoEditorFactory.docTree.curDomRange = newRange;
     }
     /**
      * 删除批注
@@ -41496,10 +41565,10 @@ var DocController = /*#__PURE__*/function () {
 /* harmony import */ var core_js_modules_es_error_cause_js__WEBPACK_IMPORTED_MODULE_13___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_error_cause_js__WEBPACK_IMPORTED_MODULE_13__);
 /* harmony import */ var core_js_modules_es_array_concat_js__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(92222);
 /* harmony import */ var core_js_modules_es_array_concat_js__WEBPACK_IMPORTED_MODULE_14___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_concat_js__WEBPACK_IMPORTED_MODULE_14__);
-/* harmony import */ var core_js_modules_web_dom_collections_for_each_js__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(54747);
-/* harmony import */ var core_js_modules_web_dom_collections_for_each_js__WEBPACK_IMPORTED_MODULE_15___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_web_dom_collections_for_each_js__WEBPACK_IMPORTED_MODULE_15__);
-/* harmony import */ var core_js_modules_es_json_stringify_js__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(38862);
-/* harmony import */ var core_js_modules_es_json_stringify_js__WEBPACK_IMPORTED_MODULE_16___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_json_stringify_js__WEBPACK_IMPORTED_MODULE_16__);
+/* harmony import */ var core_js_modules_es_json_stringify_js__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(38862);
+/* harmony import */ var core_js_modules_es_json_stringify_js__WEBPACK_IMPORTED_MODULE_15___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_json_stringify_js__WEBPACK_IMPORTED_MODULE_15__);
+/* harmony import */ var core_js_modules_web_dom_collections_for_each_js__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(54747);
+/* harmony import */ var core_js_modules_web_dom_collections_for_each_js__WEBPACK_IMPORTED_MODULE_16___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_web_dom_collections_for_each_js__WEBPACK_IMPORTED_MODULE_16__);
 /* harmony import */ var core_js_modules_es_regexp_to_string_js__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(39714);
 /* harmony import */ var core_js_modules_es_regexp_to_string_js__WEBPACK_IMPORTED_MODULE_17___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_regexp_to_string_js__WEBPACK_IMPORTED_MODULE_17__);
 /* harmony import */ var core_js_modules_es_array_join_js__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(69600);
@@ -42960,25 +43029,27 @@ var DocTree = /*#__PURE__*/function () {
       }
       var newStyleIndex = -1;
       if (newStyle instanceof _domNode_TextStyle__WEBPACK_IMPORTED_MODULE_25__/* .TextStyle */ .pn) {
-        this.styles.forEach(function (value, index) {
-          //遍历样式表 判断变更之后的样式是否已经存在
-          if (JSON.stringify(value.combineStyle, _domNode_TextStyle__WEBPACK_IMPORTED_MODULE_25__/* .CombineStyle.whiteList */ .xc.whiteList()) === JSON.stringify(newStyle.combineStyle, _domNode_TextStyle__WEBPACK_IMPORTED_MODULE_25__/* .CombineStyle.whiteList */ .xc.whiteList())) {
-            newStyleIndex = index;
+        //遍历样式表 判断变更之后的样式是否已经存在
+        for (var t = 0; t < this.styles.length; t++) {
+          var tvalue = this.styles[t];
+          if (JSON.stringify(tvalue.combineStyle, _domNode_TextStyle__WEBPACK_IMPORTED_MODULE_25__/* .CombineStyle.whiteList */ .xc.whiteList()) === JSON.stringify(newStyle.combineStyle, _domNode_TextStyle__WEBPACK_IMPORTED_MODULE_25__/* .CombineStyle.whiteList */ .xc.whiteList())) {
+            newStyleIndex = t;
             return newStyleIndex;
           }
-        });
+        }
         if (newStyleIndex === -1) {
           this.styles.push(newStyle);
           newStyleIndex = this.styles.length - 1;
         }
       } else if (newStyle instanceof _domNode_Paragraph__WEBPACK_IMPORTED_MODULE_20__/* .Paragraph */ .nv) {
-        this.paragraphs.forEach(function (value, index) {
-          //遍历样式表 判断变更之后的样式是否已经存在
-          if (JSON.stringify(value.combineStyle, _domNode_Paragraph__WEBPACK_IMPORTED_MODULE_20__/* .CombineParagraph.whiteList */ .kh.whiteList()) === JSON.stringify(newStyle.combineStyle, _domNode_Paragraph__WEBPACK_IMPORTED_MODULE_20__/* .CombineParagraph.whiteList */ .kh.whiteList())) {
-            newStyleIndex = index;
+        //遍历样式表 判断变更之后的样式是否已经存在
+        for (var p = 0; p < this.paragraphs.length; p++) {
+          var pvalue = this.paragraphs[p];
+          if (JSON.stringify(pvalue.combineStyle, _domNode_Paragraph__WEBPACK_IMPORTED_MODULE_20__/* .CombineParagraph.whiteList */ .kh.whiteList()) === JSON.stringify(newStyle.combineStyle, _domNode_Paragraph__WEBPACK_IMPORTED_MODULE_20__/* .CombineParagraph.whiteList */ .kh.whiteList())) {
+            newStyleIndex = p;
             return newStyleIndex;
           }
-        });
+        }
         if (newStyleIndex === -1) {
           this.paragraphs.push(newStyle);
           newStyleIndex = this.paragraphs.length - 1;
@@ -44764,7 +44835,7 @@ var NodePosition = /*#__PURE__*/function () {
 /*
  * @Author: your name
  * @Date: 2020-12-25 13:37:13
- * @LastEditTime: 2022-11-09 14:38:33
+ * @LastEditTime: 2023-06-02 10:52:16
  * @LastEditors: liyanan 2441631434@qq.com
  * @Description: In User Settings Edit
  * @FilePath: \hoeditor-web\src\editor\dom\PageProperty2.ts
@@ -44879,15 +44950,16 @@ var PageProperty = /*#__PURE__*/function () {
   (0,D_project_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_13__/* ["default"] */ .Z)(PageProperty, [{
     key: "mmConversionPx",
     value: function mmConversionPx() {
-      this._widthPixes = Math.round(_HOEditorFactorys__WEBPACK_IMPORTED_MODULE_8__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID).unitConvert.mmConversionPx(this._widthMm + this._commentWidthMm, true));
-      this._heightPixes = Math.round(_HOEditorFactorys__WEBPACK_IMPORTED_MODULE_8__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID).unitConvert.mmConversionPx(this._heightMm, false));
-      this._leftMarginPixes = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_8__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID).unitConvert.mmConversionPx(this._leftMarginMm, true);
-      this._rightMarginPixes = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_8__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID).unitConvert.mmConversionPx(this._rightMarginMm + this._commentWidthMm, true);
-      this._topMarginPixes = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_8__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID).unitConvert.mmConversionPx(this._topMarginMm, false);
-      this._bottomMarginPixes = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_8__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID).unitConvert.mmConversionPx(this._bottomMarginMm, false);
-      this._headerYPixes = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_8__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID).unitConvert.mmConversionPx(this._headerYMm, false);
-      this._footerYPixes = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_8__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID).unitConvert.mmConversionPx(this._footerYMm, false);
-      this._commentWidthPixes = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_8__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID).unitConvert.mmConversionPx(this._commentWidthMm, true);
+      var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_8__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
+      this._widthPixes = Math.round(hoEditorFactory.unitConvert.mmConversionPx(this._widthMm, true));
+      this._heightPixes = Math.round(hoEditorFactory.unitConvert.mmConversionPx(this._heightMm, false));
+      this._leftMarginPixes = hoEditorFactory.unitConvert.mmConversionPx(this._leftMarginMm, true);
+      this._rightMarginPixes = hoEditorFactory.unitConvert.mmConversionPx(this._rightMarginMm, true);
+      this._topMarginPixes = hoEditorFactory.unitConvert.mmConversionPx(this._topMarginMm, false);
+      this._bottomMarginPixes = hoEditorFactory.unitConvert.mmConversionPx(this._bottomMarginMm, false);
+      this._headerYPixes = hoEditorFactory.unitConvert.mmConversionPx(this._headerYMm, false);
+      this._footerYPixes = hoEditorFactory.unitConvert.mmConversionPx(this._footerYMm, false);
+      this._commentWidthPixes = hoEditorFactory.unitConvert.mmConversionPx(this._commentWidthMm, true);
     }
   }, {
     key: "setPageProperty",
@@ -44925,8 +44997,8 @@ var PageProperty = /*#__PURE__*/function () {
                 if (type === "text") {
                   defaultStyle = new _domNode_TextStyle__WEBPACK_IMPORTED_MODULE_11__/* .CombineStyle */ .xc(this._hoEditorFactoryID);
                   _domNode_TextStyle__WEBPACK_IMPORTED_MODULE_11__/* .CombineStyle.makeDefaultStyle */ .xc.makeDefaultStyle(this._hoEditorFactoryID, defaultStyle);
-                  firstStyle = new _domNode_TextStyle__WEBPACK_IMPORTED_MODULE_11__/* .TextStyle */ .pn(this._hoEditorFactoryID);
                   hoEditorFactory.docTree._defaultCombineStyle = defaultStyle;
+                  firstStyle = new _domNode_TextStyle__WEBPACK_IMPORTED_MODULE_11__/* .TextStyle */ .pn(this._hoEditorFactoryID);
                   hoEditorFactory.docTree.styles.splice(0, 1);
                   hoEditorFactory.docTree.styles.splice(0, 0, firstStyle);
                 }
@@ -45010,12 +45082,13 @@ var PageProperty = /*#__PURE__*/function () {
       if (value !== this._commentWidthMm) {
         var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_8__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
         this._commentWidthMm = value;
-        this._widthPixes = hoEditorFactory.unitConvert.mmConversionPx(this._widthMm + this._commentWidthMm, true);
+        this._widthPixes = hoEditorFactory.unitConvert.mmConversionPx(this._widthMm, true);
         this._commentWidthPixes = hoEditorFactory.unitConvert.mmConversionPx(this._commentWidthMm, true);
-        this._rightMarginPixes = hoEditorFactory.unitConvert.mmConversionPx(this._rightMarginMm + this._commentWidthMm, true);
+        this._rightMarginPixes = hoEditorFactory.unitConvert.mmConversionPx(this._rightMarginMm, true);
         var scaleXY = Math.max(_draw_DrawConfig__WEBPACK_IMPORTED_MODULE_9__/* .DrawConfig.instance */ .f.instance().scaleXY, _draw_DrawConfig__WEBPACK_IMPORTED_MODULE_9__/* .DrawConfig.instance */ .f.instance().transformScale);
         var width = Math.floor(this._widthPixes * scaleXY) % 2 === 1 ? Math.floor(this._widthPixes * scaleXY) + 1 : Math.floor(this._widthPixes * scaleXY);
         this._canvasParams.width = width;
+        this._canvasParams.commentWidth = this._commentWidthPixes;
       }
     }
   }, {
@@ -45027,7 +45100,7 @@ var PageProperty = /*#__PURE__*/function () {
       if (value !== this._widthMm) {
         var hoeditorfacotry = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_8__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
         this._widthMm = value;
-        this._widthPixes = hoeditorfacotry.unitConvert.mmConversionPx(this._widthMm + this._commentWidthMm, true);
+        this._widthPixes = hoeditorfacotry.unitConvert.mmConversionPx(this._widthMm, true);
         hoeditorfacotry.drawTree.updateDrawTreeFirstLine();
       }
       var scaleXY = Math.max(_draw_DrawConfig__WEBPACK_IMPORTED_MODULE_9__/* .DrawConfig.instance */ .f.instance().scaleXY, _draw_DrawConfig__WEBPACK_IMPORTED_MODULE_9__/* .DrawConfig.instance */ .f.instance().transformScale);
@@ -46416,7 +46489,7 @@ var CellProperty = /*#__PURE__*/function () {
 /*
  * @Author: your name
  * @Date: 2021-01-20 10:18:55
- * @LastEditTime: 2023-05-19 16:03:21
+ * @LastEditTime: 2023-05-23 11:29:52
  * @LastEditors: liyanan 2441631434@qq.com
  * @Description: In User Settings Edit
  * @FilePath: \hoeditor-web\src\editor\dom\domNode\Comment.ts
@@ -46625,6 +46698,23 @@ var Comment = /*#__PURE__*/function () {
       comment = arr.join('\n');
       return [comment, arr.length];
     }
+    //获取批注的位置信息 返回[页码,x坐标,y坐标]
+  }, {
+    key: "getPosition",
+    value: function getPosition() {
+      var result = [];
+      var endDrawNode = this.eNode.drawNodes[0];
+      var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_5__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
+      var drawArea = hoEditorFactory.drawPageTree.getMainRootArea(endDrawNode);
+      if (drawArea) {
+        result[0] = drawArea.index;
+        var dline = hoEditorFactory.drawTree.getDrawLineByDNode(endDrawNode); // 末尾标记节点所在行
+        var stagePos = dline.localToGlobal(endDrawNode.x, endDrawNode.y); // 末尾标记节点的stage坐标
+        result[1] = stagePos.x;
+        result[2] = stagePos.y - dline.dHeight / 2;
+      }
+      return result;
+    }
   }], [{
     key: "whiteList",
     value: function whiteList() {
@@ -51241,11 +51331,13 @@ var DateTimeNode = /*#__PURE__*/function (_ControlNode) {
             drawNode.children.splice(i, 1);
           }
         }
-        var color = hoEditorFactory.option.getColorByLevel(11);
-        var backColor = new createjs.Shape();
-        backColor.graphics.clear().beginFill(color).drawRect(0, -drawNode.dHeight + 2, drawNode.dWidth, drawNode.dHeight);
-        backColor.name = "backColor";
-        drawNode.addChildAt(backColor, 0);
+        if (hoEditorFactory.drawTree.paintStatus !== _editor_draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_17__/* .PaintState.psReview */ .Dh.psReview) {
+          var color = hoEditorFactory.option.getColorByLevel(11);
+          var backColor = new createjs.Shape();
+          backColor.graphics.clear().beginFill(color).drawRect(0, -drawNode.dHeight + 2, drawNode.dWidth, drawNode.dHeight);
+          backColor.name = "backColor";
+          drawNode.addChildAt(backColor, 0);
+        }
       } else {
         if (this.text === this.labelText) {
           drawNode.alpha = 0;
@@ -51992,48 +52084,50 @@ var DownListNode = /*#__PURE__*/function (_ControlNode) {
             drawNode.children.splice(i, 1);
           }
         }
-        var color = hoEditorFactory.option.getColorByLevel(120);
-        if (this.keyValue !== "") {
-          if (hoEditorFactory.isSameColorWithEmptyVlaue) {
-            var isDefault = false;
-            if (this._allowMultiSelect) {
-              var defaultValues = "";
-              for (var _i = 0; _i < this.downListContent.length; _i++) {
-                var item1 = this.downListContent[_i];
-                if (item1.default) {
-                  defaultValues += item1.id + ",";
+        if (hoEditorFactory.drawTree.paintStatus !== _editor_draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_17__/* .PaintState.psReview */ .Dh.psReview) {
+          var color = hoEditorFactory.option.getColorByLevel(120);
+          if (this.keyValue !== "") {
+            if (hoEditorFactory.isSameColorWithEmptyVlaue) {
+              var isDefault = false;
+              if (this._allowMultiSelect) {
+                var defaultValues = "";
+                for (var _i = 0; _i < this.downListContent.length; _i++) {
+                  var item1 = this.downListContent[_i];
+                  if (item1.default) {
+                    defaultValues += item1.id + ",";
+                  }
                 }
-              }
-              if (defaultValues.endsWith(',')) {
-                defaultValues = defaultValues.substring(0, defaultValues.length - 1);
-              }
-              var keyValue = this.keyValue;
-              if (keyValue.endsWith(',')) {
-                keyValue = keyValue.substring(0, keyValue.length - 1);
-              }
-              if (defaultValues === keyValue) {
-                isDefault = true;
-              }
-            } else {
-              for (var j = 0; j < this.downListContent.length; j++) {
-                var item2 = this.downListContent[j];
-                if (item2.id === this.keyValue.split(',')[0] && item2.default) {
+                if (defaultValues.endsWith(',')) {
+                  defaultValues = defaultValues.substring(0, defaultValues.length - 1);
+                }
+                var keyValue = this.keyValue;
+                if (keyValue.endsWith(',')) {
+                  keyValue = keyValue.substring(0, keyValue.length - 1);
+                }
+                if (defaultValues === keyValue) {
                   isDefault = true;
-                  break;
+                }
+              } else {
+                for (var j = 0; j < this.downListContent.length; j++) {
+                  var item2 = this.downListContent[j];
+                  if (item2.id === this.keyValue.split(',')[0] && item2.default) {
+                    isDefault = true;
+                    break;
+                  }
                 }
               }
-            }
-            if (!isDefault) {
+              if (!isDefault) {
+                color = hoEditorFactory.option.getColorByLevel(12);
+              }
+            } else {
               color = hoEditorFactory.option.getColorByLevel(12);
             }
-          } else {
-            color = hoEditorFactory.option.getColorByLevel(12);
           }
+          var backColor = new createjs.Shape();
+          backColor.graphics.clear().beginFill(color).drawRect(0, -drawNode.dHeight + 2, drawNode.dWidth, drawNode.dHeight);
+          backColor.name = "backColor";
+          drawNode.addChildAt(backColor, 0);
         }
-        var backColor = new createjs.Shape();
-        backColor.graphics.clear().beginFill(color).drawRect(0, -drawNode.dHeight + 2, drawNode.dWidth, drawNode.dHeight);
-        backColor.name = "backColor";
-        drawNode.addChildAt(backColor, 0);
       } else {
         //if (this.text === this.labelText) {
         if (this.keyValue === "") {
@@ -53504,7 +53598,7 @@ var LabelNode = /*#__PURE__*/function (_ControlNode) {
         return dline;
       }
       var drawNode = this._drawNodes[0];
-      if (hoEditorFactory.drawTree.paintStatus !== _editor_draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_9__/* .PaintState.psPreview */ .Dh.psPreview && hoEditorFactory.drawTree.paintStatus !== _editor_draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_9__/* .PaintState.psPrint */ .Dh.psPrint) {
+      if (hoEditorFactory.drawTree.paintStatus !== _editor_draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_9__/* .PaintState.psPreview */ .Dh.psPreview && hoEditorFactory.drawTree.paintStatus !== _editor_draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_9__/* .PaintState.psPrint */ .Dh.psPrint && hoEditorFactory.drawTree.paintStatus !== _editor_draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_9__/* .PaintState.psReview */ .Dh.psReview) {
         drawNode.alpha = 1;
         //const color = HOEditorFactorys.instance().getFactory(this._hoEditorFactoryID).option.getColorByLevel(0);
         for (var i = 0; i < drawNode.children.length; i++) {
@@ -53523,16 +53617,18 @@ var LabelNode = /*#__PURE__*/function (_ControlNode) {
             drawNode.children.splice(_i, 1);
           }
         }
-        if (this.associatedElement) {
-          var nodes = hoEditorFactory.vueController.getNodesById("main", true, this.associatedElement);
-          if (nodes.length > 0) {
-            for (var j = 0; j < nodes.length; j++) {
-              var node = nodes[j];
-              //const result = NodePosition.nodePositionCompare(this, node);
-              //if (result < 0 && node.text == "") {
-              if (node.text == "") {
-                drawNode.alpha = 0;
-                break;
+        if (hoEditorFactory.drawTree.paintStatus === _editor_draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_9__/* .PaintState.psPreview */ .Dh.psPreview || hoEditorFactory.drawTree.paintStatus === _editor_draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_9__/* .PaintState.psPrint */ .Dh.psPrint) {
+          if (this.associatedElement) {
+            var nodes = hoEditorFactory.vueController.getNodesById("main", true, this.associatedElement);
+            if (nodes.length > 0) {
+              for (var j = 0; j < nodes.length; j++) {
+                var node = nodes[j];
+                //const result = NodePosition.nodePositionCompare(this, node);
+                //if (result < 0 && node.text == "") {
+                if (node.text == "") {
+                  drawNode.alpha = 0;
+                  break;
+                }
               }
             }
           }
@@ -54508,7 +54604,7 @@ var MedicalExpressionNode = /*#__PURE__*/function (_BaseNode) {
 /*
  * @Author: your name
  * @Date: 2020-10-28 15:46:36
- * @LastEditTime: 2023-05-16 11:24:09
+ * @LastEditTime: 2023-06-02 09:51:25
  * @LastEditors: liyanan 2441631434@qq.com
  * @Description: 经期史
  * @FilePath: \hoeditor-web\src\editor\dom\treeNode\MenstrualHistory.ts
@@ -54653,7 +54749,14 @@ var MenstrualHistoryNode = /*#__PURE__*/function (_MedicalExpressionNod) {
       // }
       var dHeight = hoEditorFactory.getFontHeightByFontSize(cbStyle.size);
       var lineHight = dHeight;
-      if (this._expressStyle === ExpressStyle.style1 || this._expressStyle === ExpressStyle.style3) {
+      if (this._expressStyle === ExpressStyle.style1) {
+        if (this.menarcheAge === "未来潮") {
+          cbStyle = hoEditorFactory.docTree.styles[0].combineStyle;
+        } else {
+          lineHight = dHeight * 2;
+        }
+      }
+      if (this._expressStyle === ExpressStyle.style3) {
         lineHight = dHeight * 2;
       }
       if (this._expressStyle === ExpressStyle.style2) {
@@ -58189,7 +58292,7 @@ var RareCharNode = /*#__PURE__*/function (_ControlNode) {
       }
       var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID);
       var isDisPlay = true;
-      if (hoEditorFactory.drawTree.paintStatus === DrawTree/* PaintState.psPreview */.Dh.psPreview || hoEditorFactory.drawTree.paintStatus === DrawTree/* PaintState.psPrint */.Dh.psPrint) {
+      if (hoEditorFactory.drawTree.paintStatus === DrawTree/* PaintState.psPreview */.Dh.psPreview || hoEditorFactory.drawTree.paintStatus === DrawTree/* PaintState.psPrint */.Dh.psPrint || hoEditorFactory.drawTree.paintStatus === DrawTree/* PaintState.psReview */.Dh.psReview) {
         isDisPlay = false;
       }
       var drawNode = this._drawNodes[0];
@@ -58981,17 +59084,24 @@ var SignNode = /*#__PURE__*/function (_BaseNode) {
       var drawNode = this._drawNodes[0];
       if (isDisPlay) {
         drawNode.alpha = 1;
-        if (this.imgSrc === "" && this.fingerPrintSrc === "") {
-          // for (let i = drawNode.children.length - 1; i >= 0; i--) {
-          //     if (drawNode.children[i].name === "name") {
-          //         ((drawNode.children[i]) as createjs.Text).color = "#000"
-          //     }
-          // }
-          var color = hoEditorFactory.option.getColorByLevel(13);
-          var backColor = new createjs.Shape();
-          backColor.graphics.clear().beginFill(color).drawRect(0, -drawNode.dHeight + 2, drawNode.dWidth, drawNode.dHeight);
-          backColor.name = "backColor";
-          drawNode.addChildAt(backColor, 0);
+        for (var i = drawNode.children.length - 1; i >= 0; i--) {
+          if (drawNode.children[i].name === "backColor") {
+            drawNode.children.splice(i, 1);
+          }
+        }
+        if (hoEditorFactory.drawTree.paintStatus !== _editor_draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_13__/* .PaintState.psReview */ .Dh.psReview) {
+          if (this.imgSrc === "" && this.fingerPrintSrc === "") {
+            // for (let i = drawNode.children.length - 1; i >= 0; i--) {
+            //     if (drawNode.children[i].name === "name") {
+            //         ((drawNode.children[i]) as createjs.Text).color = "#000"
+            //     }
+            // }
+            var color = hoEditorFactory.option.getColorByLevel(13);
+            var backColor = new createjs.Shape();
+            backColor.graphics.clear().beginFill(color).drawRect(0, -drawNode.dHeight + 2, drawNode.dWidth, drawNode.dHeight);
+            backColor.name = "backColor";
+            drawNode.addChildAt(backColor, 0);
+          }
         }
       } else {
         if (this.imgSrc === "" && this.fingerPrintSrc === "") {
@@ -59005,9 +59115,9 @@ var SignNode = /*#__PURE__*/function (_BaseNode) {
           //     }
           // }
         } else {
-          for (var i = drawNode.children.length - 1; i >= 0; i--) {
-            if (drawNode.children[i].name === "backColor") {
-              drawNode.children.splice(i, 1);
+          for (var _i = drawNode.children.length - 1; _i >= 0; _i--) {
+            if (drawNode.children[_i].name === "backColor") {
+              drawNode.children.splice(_i, 1);
             }
             // if (drawNode.children[i].name === "name") {
             //     ((drawNode.children[i]) as createjs.Text).color = "#000"
@@ -59733,7 +59843,7 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
           var aNode = cell.childNodes[i];
           if (aNode instanceof _RadioAndCheckBoxNode__WEBPACK_IMPORTED_MODULE_35__/* .RadioAndCheckBoxNode */ .Yh) {
             bret = true;
-            if (aNode.isSelected && aNode.numericValue != "" && Number(aNode.numericValue) > 0) {
+            if (aNode.isSelected && aNode.numericValue !== "" && Number(aNode.numericValue) >= 0) {
               ret = aNode.numericValue;
             } else {
               ret = "";
@@ -59750,7 +59860,7 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
             var bNode = cell.childNodes[j];
             if (bNode instanceof _RadioAndCheckBoxNode__WEBPACK_IMPORTED_MODULE_35__/* .RadioAndCheckBoxNode */ .Yh) {
               bret = true;
-              if (bNode.isSelected && bNode.numericValue != "" && Number(bNode.numericValue) > 0) {
+              if (bNode.isSelected && bNode.numericValue !== "" && Number(bNode.numericValue) >= 0) {
                 ret = bNode.numericValue;
               } else {
                 ret = "";
@@ -61115,11 +61225,12 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
       for (var i = 0; i < count; i++) {
         var row = new Array();
         var rowProperty = new _TableProperty__WEBPACK_IMPORTED_MODULE_29__/* .RowProperty */ .Nr("");
-        //rowProperty.rowHeight = this._rowInfos[copyIndex].rowHeight;
+        rowProperty.rowHeight = copyRowProperty.rowHeight;
         rowProperty.isSpecifyHeight = copyRowProperty.isSpecifyHeight;
         rowProperty.isLockRowHeight = copyRowProperty.isLockRowHeight;
         var rowsInfo = new RowInfos(this, rowProperty);
         rowsInfo.rowHeight = this._rowInfos[copyIndex].rowHeight;
+        rowsInfo.heightFixed = this._rowInfos[copyIndex].heightFixed;
         this._rowInfos.splice(r + i, 0, rowsInfo);
         c = 0;
         while (c < this._colCount) {
@@ -68390,7 +68501,7 @@ var StagePosition = /*#__PURE__*/function () {
 /* harmony import */ var _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_19__ = __webpack_require__(74089);
 /* harmony import */ var _editor_dom_treeNode_TableNode__WEBPACK_IMPORTED_MODULE_20__ = __webpack_require__(5010);
 /* harmony import */ var _drawNode_DrawPageCell__WEBPACK_IMPORTED_MODULE_21__ = __webpack_require__(59105);
-/* harmony import */ var _components_common_comment__WEBPACK_IMPORTED_MODULE_22__ = __webpack_require__(43041);
+/* harmony import */ var _components_common_comment__WEBPACK_IMPORTED_MODULE_22__ = __webpack_require__(85687);
 
 
 
@@ -69139,8 +69250,10 @@ var DrawArea = /*#__PURE__*/function (_DrawRect) {
     key: "drawComments",
     value: function drawComments() {
       var _this2 = this;
-      var comments = new Map();
       var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_19__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
+      hoEditorFactory.commentParams.repaint++;
+      return;
+      var comments = new Map();
       var allComments = hoEditorFactory.drawTree.commentsMap;
       allComments.forEach(function (value) {
         var markDrawNode = value.eNode.drawNodes[0];
@@ -69386,31 +69499,39 @@ var DrawArea = /*#__PURE__*/function (_DrawRect) {
   }, {
     key: "onMouseDown",
     value: function onMouseDown(e, comment) {
+      var _this5 = this;
       var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_19__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
       hoEditorFactory.drawTree.curOnSelectedComment = comment;
       e.target.alpha = 1;
-      for (var i = 0; i < this.children.length; i++) {
-        var child = this.children[i];
+      var _loop = function _loop(i) {
+        var child = _this5.children[i];
         if (child.name == comment.id) {
           child.alpha = 1;
         }
-        if (child instanceof createjs.Container && comment.id == child.name && hoEditorFactory.drawTree.activePage) {
+        if (child instanceof createjs.Container && comment.id == child.name) {
           if (hoEditorFactory.reviewJson.editComment !== false || hoEditorFactory.reviewJson.deleteComment !== false) {
-            _components_common_comment__WEBPACK_IMPORTED_MODULE_22__/* .hoCreateComment.open */ .$.open({
-              x: child.x,
-              y: child.y + hoEditorFactory.drawTree.activePage.drawMainDoc.y,
-              width: 0,
-              height: 0,
-              pageIndex: hoEditorFactory.drawTree.caret.pageIndex,
-              editComment: hoEditorFactory.reviewJson.editComment,
-              deleteComment: hoEditorFactory.reviewJson.deleteComment,
-              commentID: comment.id,
-              review: false,
-              isHandle: comment.customProperty ? comment.customProperty.ishandle : '0',
-              reviewParams: hoEditorFactory.reviewParams
-            });
+            setTimeout(function () {
+              if (hoEditorFactory.drawTree.activePage) {
+                _components_common_comment__WEBPACK_IMPORTED_MODULE_22__/* .hoCreateComment.open */ .$.open({
+                  x: child.x,
+                  y: child.y + hoEditorFactory.drawTree.activePage.drawMainDoc.y,
+                  width: 0,
+                  height: 0,
+                  pageIndex: hoEditorFactory.drawTree.caret.pageIndex,
+                  editComment: hoEditorFactory.reviewJson.editComment,
+                  deleteComment: hoEditorFactory.reviewJson.deleteComment,
+                  commentID: comment.id,
+                  review: false,
+                  isHandle: comment.customProperty ? comment.customProperty.ishandle : '0',
+                  reviewParams: hoEditorFactory.reviewParams
+                });
+              }
+            }, 30);
           }
         }
+      };
+      for (var i = 0; i < this.children.length; i++) {
+        _loop(i);
       }
       hoEditorFactory.drawPageTree.updateDrawPage(this.index);
     }
@@ -69465,7 +69586,7 @@ var DrawArea = /*#__PURE__*/function (_DrawRect) {
   }, {
     key: "repaintRecored",
     value: function repaintRecored(comments, comment, nPath, spX, spY) {
-      var _this5 = this;
+      var _this6 = this;
       var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_19__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
       var topComments = new Array();
       var bottomComments = new Array();
@@ -69474,14 +69595,14 @@ var DrawArea = /*#__PURE__*/function (_DrawRect) {
         var endDrawNode = comment.eNode.drawNodes[0];
         var dline = hoEditorFactory.drawTree.getDrawLineByDNode(endDrawNode); // 末尾标记节点所在行
         var stagePos = dline.localToGlobal(endDrawNode.x, endDrawNode.y); // 末尾标记节点的stage坐标
-        var localPos = _this5.globalToLocal(stagePos.x, stagePos.y); // 末尾标记节点的stage坐标
+        var localPos = _this6.globalToLocal(stagePos.x, stagePos.y); // 末尾标记节点的stage坐标
         return [endDrawNode.x, localPos.y];
       };
       var commentY = spY;
       comments.forEach(function (value) {
         if (value.id !== comment.id) {
           var area = hoEditorFactory.drawPageTree.getMainRootArea(value.eNode.drawNodes[0]);
-          if (area && area.index == _this5.index) {
+          if (area && area.index == _this6.index) {
             tempArr.push(value);
           }
         }
@@ -69531,8 +69652,8 @@ var DrawArea = /*#__PURE__*/function (_DrawRect) {
           } else {
             commentY = nodeY;
           }
-          _this5.removeComment(commentObj, true);
-          _this5.drawEditRecords(commentObj, nodeX, nodeY, commentY);
+          _this6.removeComment(commentObj, true);
+          _this6.drawEditRecords(commentObj, nodeX, nodeY, commentY);
           if (bottomComments.length > 0) {
             var _minValue2 = getStagePos(bottomComments[0])[1];
             var _tempComment4 = bottomComments[0];
@@ -71759,8 +71880,8 @@ var DrawMarkNode = /*#__PURE__*/function (_DrawCombineNode) {
 /*
  * @Author: your name
  * @Date: 2020-10-29 15:22:36
- * @LastEditTime: 2021-10-08 17:07:47
- * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2023-06-02 09:37:54
+ * @LastEditors: liyanan 2441631434@qq.com
  * @Description: In User Settings Edit
  * @FilePath: \hoeditor-web\src\editor\draw\drawNode\DrawMedicalExpression.ts
  */
@@ -71864,7 +71985,11 @@ var DrawMedicalExpression = /*#__PURE__*/function (_DrawCombineNode) {
     key: "drawMenstrualHistoryStyle1",
     value: function drawMenstrualHistoryStyle1() {
       var menarcheAge = new createjs.Text(this._arrValues[2], this._textStyle.getStyleKey(), this._textStyle.color);
-      menarcheAge.y = -this.dHeight / 2 + menarcheAge.getMeasuredHeight() / 3;
+      if (this._arrValues[2] === "未来潮") {
+        menarcheAge.y = 0;
+      } else {
+        menarcheAge.y = -this.dHeight / 2 + menarcheAge.getMeasuredHeight() / 3;
+      }
       menarcheAge.x = 0;
       menarcheAge.textAlign = "left";
       menarcheAge.textBaseline = "alphabetic";
@@ -72402,9 +72527,11 @@ var ResizeDrawTableObj = /*#__PURE__*/function () {
     key: "isMouseOnRange",
     value: function isMouseOnRange(stageX, stageY) {
       var pos = this._dObj.globalToLocal(stageX, stageY);
+      // console.log("pos", pos.x, pos.y);
       var inYrange = false;
       var inXrange = false;
       var rect = this._dObj.getBounds();
+      // console.log("rect", rect.width, rect.height);
       if (rect) {
         var dWidth = rect.width;
         var dHeight = rect.height;
@@ -72416,6 +72543,7 @@ var ResizeDrawTableObj = /*#__PURE__*/function () {
           inXrange = true;
         }
       }
+      // console.log("测试", inXrange, inYrange);
       return [inXrange, inYrange];
     }
   }, {
@@ -78233,6 +78361,7 @@ var DrawTextNode = /*#__PURE__*/function (_DrawCombineNode) {
           }
         }
       }
+      var isReviewColor = false;
       if (hoEditorFactory.drawTree.paintStatus === DrawTree/* PaintState.psReview */.Dh.psReview
       //|| (hoEditorFactory.drawTree.paintStatus === PaintState.psReadOnly && !hoEditorFactory.isHideComments)
       || !hoEditorFactory.isHideComments) {
@@ -78258,6 +78387,9 @@ var DrawTextNode = /*#__PURE__*/function (_DrawCombineNode) {
           // } else {
           //   backColor = "#f3715c";
           // }
+          if (ilevel > 0) {
+            isReviewColor = true;
+          }
           backColor = hoEditorFactory.option.getColorByLevel(ilevel);
         }
       }
@@ -78270,7 +78402,7 @@ var DrawTextNode = /*#__PURE__*/function (_DrawCombineNode) {
         }
       }
       var hspaceing = 2;
-      if (backColor) {
+      if (backColor && (hoEditorFactory.drawTree.paintStatus !== DrawTree/* PaintState.psReview */.Dh.psReview || hoEditorFactory.drawTree.paintStatus === DrawTree/* PaintState.psReview */.Dh.psReview && isReviewColor)) {
         if (!this._bg) this._bg = new createjs.Shape();
         if (backColor == "transparent") {
           this._bg.graphics.clear();
@@ -82592,6 +82724,9 @@ var DrawTree = /*#__PURE__*/function () {
       var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID);
       if (e.node) {
         if (e.node instanceof RadioAndCheckBoxNode/* RadioAndCheckBoxNode */.Yh) {
+          if (hoEditorFactory.drawTree.paintStatus === PaintState.psReview) {
+            return true;
+          }
           var aNode = e.node;
           var groupName = aNode.groupName;
           var nodePathCur = aNode.getNodePath();
@@ -196278,7 +196413,7 @@ var map = {
 	"./dataSource/DataSource.vue": 9238,
 	"./dateDialog/DateDialog.vue": 12144,
 	"./delimiter/Delimiter.vue": 31861,
-	"./expressionForm/ExpressionForm.vue": 45611,
+	"./expressionForm/ExpressionForm.vue": 99219,
 	"./findReplace/FindReplace.vue": 25918,
 	"./gestation/Gestation.vue": 6251,
 	"./hoprint/HoPrint.vue": 62321,
@@ -196304,7 +196439,7 @@ var map = {
 	"./table/TableFormula.vue": 66591,
 	"./table/TableProperty.vue": 47130,
 	"./table/TableRowProperty.vue": 5218,
-	"./textDialog/TextDialog.vue": 74353,
+	"./textDialog/TextDialog.vue": 29238,
 	"./textDialog/TextToLabelDialog.vue": 35791,
 	"./upload/CanvasImageDialog.vue": 94116,
 	"./upload/HoFabric.vue": 43008,
@@ -232589,7 +232724,7 @@ Input.install = function (Vue) {
 
 
 /* harmony default export */ var antd = ([es_button, input, input_number, es_checkbox, date_picker, time_picker, es_radio, es_select, es_tabs, es_dropdown, es_menu, es_upload, tooltip, table, popover, es_icon/* default */.Z, config_provider]);
-;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/HoDocs.vue?vue&type=template&id=ccfac6dc&
+;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/HoDocs.vue?vue&type=template&id=1484bfac&
 var render = function render() {
   var _vm = this,
     _c = _vm._self._c;
@@ -232710,8 +232845,8 @@ var es_string_match = __webpack_require__(4723);
 var es_number_constructor = __webpack_require__(9653);
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.json.stringify.js
 var es_json_stringify = __webpack_require__(38862);
-;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/HoDoc.vue?vue&type=template&id=3b98bb65&
-var HoDocvue_type_template_id_3b98bb65_render = function render() {
+;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/HoDoc.vue?vue&type=template&id=55b1a93c&
+var HoDocvue_type_template_id_55b1a93c_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -232738,13 +232873,13 @@ var HoDocvue_type_template_id_3b98bb65_render = function render() {
         "docIndex": _vm.docIndex,
         "canvasWidth": _vm.canvasParams.width,
         "canvasHeight": _vm.canvasParams.height,
+        "commentWidth": _vm.canvasParams.commentWidth,
         "currentActivePages": _vm.activePageIndex.index,
         "hoEditorId": _vm.hoEditorId,
         "hoEditorFactoryIdList": _vm.hoEditorFactoryIdList,
         "viewableAreaObserver": _vm.viewableAreaObserver,
         "inViewPages": _vm.inViewPages,
         "canvasHeadFootPos": _vm.canvasHeadFootPos,
-        "poperTipPos": _vm.poperTipPos,
         "aiInfo": _vm.aiInfo,
         "textStyles": _vm.textStyles
       },
@@ -232856,7 +232991,7 @@ var HoDocvue_type_template_id_3b98bb65_render = function render() {
     }
   }, [_vm._v("v " + _vm._s(_vm.version))])])])], 1);
 };
-var HoDocvue_type_template_id_3b98bb65_staticRenderFns = [];
+var HoDocvue_type_template_id_55b1a93c_staticRenderFns = [];
 
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.filter.js
 var es_array_filter = __webpack_require__(57327);
@@ -232866,8 +233001,8 @@ var es_string_includes = __webpack_require__(32023);
 var es_array_sort = __webpack_require__(2707);
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.string.replace.js
 var es_string_replace = __webpack_require__(15306);
-;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/HoPage.vue?vue&type=template&id=f467d786&scoped=true&
-var HoPagevue_type_template_id_f467d786_scoped_true_render = function render() {
+;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/HoPage.vue?vue&type=template&id=32c20422&
+var HoPagevue_type_template_id_32c20422_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -232875,7 +233010,7 @@ var HoPagevue_type_template_id_f467d786_scoped_true_render = function render() {
     class: _vm.pageClassNames,
     style: {
       height: _vm.normalHeight + 'px',
-      width: _vm.normalWidth + 'px'
+      width: _vm.normalWidth + _vm.commentWidth + 'px'
     }
   }, [_c('canvas', {
     ref: "domcanvas",
@@ -232904,6 +233039,16 @@ var HoPagevue_type_template_id_f467d786_scoped_true_render = function render() {
         return _vm.canvasRightClick.apply(null, arguments);
       }
     }
+  }), _c('div', {
+    class: _vm.commentCanvasName,
+    style: {
+      height: _vm.normalHeight + 'px',
+      paddingTop: _vm.topMarginPixes + 'px',
+      width: _vm.commentWidth + 'px'
+    },
+    attrs: {
+      "id": 'ho-comment-box-' + _vm.index
+    }
   }), [_vm._t("hoAddCellButton")], _vm.index === _vm.aiInfo.pageIndex && _vm.aiInfo.aiText ? _c('AiModel', {
     attrs: {
       "textStyles": _vm.textStyles,
@@ -232931,7 +233076,7 @@ var HoPagevue_type_template_id_f467d786_scoped_true_render = function render() {
     }], null, true)
   }) : _vm._e()], 2);
 };
-var HoPagevue_type_template_id_f467d786_scoped_true_staticRenderFns = [];
+var HoPagevue_type_template_id_32c20422_staticRenderFns = [];
 
 // EXTERNAL MODULE: ./node_modules/@babel/runtime/helpers/esm/regeneratorRuntime.js
 var regeneratorRuntime = __webpack_require__(80543);
@@ -232993,6 +233138,8 @@ var TextInputFieldNode = __webpack_require__(90161);
 var DrawPageCell = __webpack_require__(59105);
 // EXTERNAL MODULE: ./src/editor/draw/drawNode/DrawTable.ts
 var DrawTable = __webpack_require__(74298);
+// EXTERNAL MODULE: ./src/components/common/comment/index.ts + 6 modules
+var comment = __webpack_require__(85687);
 ;// CONCATENATED MODULE: ./src/editor/draw/DrawSelectLevel.ts
 
 
@@ -233026,6 +233173,7 @@ var DrawTable = __webpack_require__(74298);
 
 
 
+
 
 
 var DrawSelectLevel = /*#__PURE__*/function () {
@@ -233402,6 +233550,7 @@ var DrawSelectLevel = /*#__PURE__*/function () {
         this._oldRange = hoeditorfactory.docTree.curDomRange.clone();
         var startPos = hoeditorfactory.drawTree.getStagePosition(dPage, dPage.activeDrawRect, aevent.stageX, aevent.stageY);
         if (startPos) {
+          // console.log('路径：' + startPos.path);
           if (aevent.nativeEvent.button === 0) {
             var curOnDragNode = hoeditorfactory.docTree.curOnDragNode;
             if (curOnDragNode) {
@@ -233477,7 +233626,7 @@ var DrawSelectLevel = /*#__PURE__*/function () {
       var hoeditorfactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID);
       var superiorSign = hoeditorfactory.structureConvert._superiorSign;
       hoeditorfactory.drawTree.caret.aiInfo.aiText = '';
-      // hoCreateComment.close();
+      comment/* hoCreateComment.close */.$.close();
       if (superiorSign.length > 0) {
         if (hoeditorfactory.drawTree.paintStatus === DrawTree/* PaintState.psEdit */.Dh.psEdit || hoeditorfactory.drawTree.paintStatus === DrawTree/* PaintState.psReview */.Dh.psReview) {
           if (this._pageIndex < superiorSign[1]) {
@@ -233549,6 +233698,7 @@ var DrawSelectLevel = /*#__PURE__*/function () {
         this._scrollYList = [];
         var startPos = hoeditorfactory.drawTree.selectRange.spStart;
         var endPos = hoeditorfactory.drawTree.selectRange.spEnd;
+        // console.log(`startPath:${hoeditorfactory.docTree.curDomRange.startPath}\nendPath:${hoeditorfactory.docTree.curDomRange.endPath}`);
         if (hoeditorfactory.drawTree.selectRange.beginRangeSelect) {
           if (startPos && startPos.page && endPos.dline === startPos.dline && endPos.index === startPos.index && endPos.path === startPos.path) {
             hoeditorfactory.docTree.curDomRange.setSamePath(startPos.path);
@@ -234063,6 +234213,9 @@ var AiModels_component = (0,componentNormalizer/* default */.Z)(
     canvasHeight: {
       required: true
     },
+    commentWidth: {
+      required: true
+    },
     index: {
       required: true
     },
@@ -234078,9 +234231,6 @@ var AiModels_component = (0,componentNormalizer/* default */.Z)(
     currentActivePages: {
       required: true
     },
-    // mouseMoveNodes: {
-    //     required: true,
-    // },
     viewableAreaObserver: {
       required: true
     },
@@ -234093,16 +234243,14 @@ var AiModels_component = (0,componentNormalizer/* default */.Z)(
     textStyles: {
       required: true
     }
-    // poperTipPos: {
-    //     required: true,
-    // },
   },
   data: function data() {
     return {
-      isHeadFoot: '' // 页眉页脚是否应该出现
+      isHeadFoot: '',
+      // 页眉页脚是否应该出现
+      topMarginPixes: 0
     };
   },
-
   computed: {
     pageClassNames: function pageClassNames() {
       return this.hoEditorFactoryIdList.length === 1 ? 'edit-container edit-container-margin' : 'edit-container';
@@ -234111,24 +234259,29 @@ var AiModels_component = (0,componentNormalizer/* default */.Z)(
       return this.canvasHeight;
     },
     scaleWidth: function scaleWidth() {
-      return this.canvasWidth;
+      var width = this.canvasWidth;
+      // if (width % 2 === 1) {
+      // 	return width - 1;
+      // }
+      return width;
     },
     normalWidth: function normalWidth() {
       var width = this.canvasWidth / DrawConfig/* DrawConfig.instance */.f.instance().transformScale;
-      if (width % 2 === 1) {
-        return width + 1;
-      }
+      var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this.hoEditorId);
+      this.topMarginPixes = hoEditorFactory.pageProperty.topMarginPixes;
+      // if (width % 2 === 1) {
+      // 	return width - 1;
+      // }
       return width;
     },
     normalHeight: function normalHeight() {
-      var height = this.canvasHeight / DrawConfig/* DrawConfig.instance */.f.instance().transformScale;
-      if (height % 2 === 1) {
-        return height + 1;
-      }
-      return height;
+      return this.canvasHeight / DrawConfig/* DrawConfig.instance */.f.instance().transformScale;
     },
     domCanvasName: function domCanvasName() {
       return this.currentActivePages === this.index ? 'domcanvas domcanvas-selected' : 'domcanvas';
+    },
+    commentCanvasName: function commentCanvasName() {
+      return this.currentActivePages === this.index ? 'ho-comment-box ho-comment-box-selected' : 'ho-comment-box';
     }
   },
   watch: {
@@ -234183,10 +234336,10 @@ var AiModels_component = (0,componentNormalizer/* default */.Z)(
 });
 ;// CONCATENATED MODULE: ./src/components/HoPage.vue?vue&type=script&lang=js&
  /* harmony default export */ var components_HoPagevue_type_script_lang_js_ = (HoPagevue_type_script_lang_js_); 
-;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-12.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-12.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-12.use[2]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/HoPage.vue?vue&type=style&index=0&id=f467d786&prod&scoped=true&lang=css&
+;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/HoPage.vue?vue&type=style&index=0&id=32c20422&prod&lang=scss&
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/components/HoPage.vue?vue&type=style&index=0&id=f467d786&prod&scoped=true&lang=css&
+;// CONCATENATED MODULE: ./src/components/HoPage.vue?vue&type=style&index=0&id=32c20422&prod&lang=scss&
 
 ;// CONCATENATED MODULE: ./src/components/HoPage.vue
 
@@ -234199,11 +234352,11 @@ var AiModels_component = (0,componentNormalizer/* default */.Z)(
 
 var HoPage_component = (0,componentNormalizer/* default */.Z)(
   components_HoPagevue_type_script_lang_js_,
-  HoPagevue_type_template_id_f467d786_scoped_true_render,
-  HoPagevue_type_template_id_f467d786_scoped_true_staticRenderFns,
+  HoPagevue_type_template_id_32c20422_render,
+  HoPagevue_type_template_id_32c20422_staticRenderFns,
   false,
   null,
-  "f467d786",
+  null,
   null
   
 )
@@ -235795,7 +235948,7 @@ var ParagraphNode = __webpack_require__(67945);
 // EXTERNAL MODULE: ./src/editor/dom/treeNode/MarkNode.ts
 var MarkNode = __webpack_require__(57727);
 ;// CONCATENATED MODULE: ./src/components/version.ts
-/* harmony default export */ var version = ('3.0.63');
+/* harmony default export */ var version = ('3.0.65');
 // EXTERNAL MODULE: ./src/components/controls/poperTipText/PoperTipText.vue + 5 modules
 var PoperTipText = __webpack_require__(15845);
 ;// CONCATENATED MODULE: ./src/components/controls/poperTipText/index.ts
@@ -235874,7 +236027,8 @@ var defaultHeight = Math.floor(1122 * scaleXY) % 2 === 1 ? Math.floor(1122 * sca
       dateFormat: plugins_util/* dateFormat */.vc,
       canvasParams: {
         width: defaultWidth,
-        height: defaultHeight
+        height: defaultHeight,
+        commentWidth: 0
       },
       canvasHeadFootPos: {
         headerY: 48,
@@ -235947,13 +236101,14 @@ var defaultHeight = Math.floor(1122 * scaleXY) % 2 === 1 ? Math.floor(1122 * sca
       return this.hoEditorFactoryIdList.length === 1 ? 'edit-area edit-area-padding' : 'edit-area';
     },
     normalWidth: function normalWidth() {
-      var width = this.canvasParams.width / DrawConfig/* DrawConfig.instance */.f.instance().transformScale;
-      if (width % 2 === 1) {
-        return width + 1;
-      }
-      return width;
+      return this.canvasParams.width / DrawConfig/* DrawConfig.instance */.f.instance().transformScale + this.canvasParams.commentWidth;
+      // if (width % 2 === 1) {
+      // 	return width + 1;
+      // }
+      // return width;
     }
   },
+
   watch: {
     drawPageCount: {
       deep: true,
@@ -235987,7 +236142,6 @@ var defaultHeight = Math.floor(1122 * scaleXY) % 2 === 1 ? Math.floor(1122 * sca
               this.isPoperText = false;
             }
           }
-          ;
         }
       }
     },
@@ -236219,6 +236373,7 @@ var defaultHeight = Math.floor(1122 * scaleXY) % 2 === 1 ? Math.floor(1122 * sca
 
         if (node.fingerPrintSrc || node.imgSrc && !node.fingerPrintSrc && node.customProperty && !node.customProperty.created_date) return false;
         this.$emit('dblNodeClick', {
+          setActiveDoc: this.setActiveDocIndex,
           node: this.getCurrentSelectNode,
           type: 'sign',
           paintStatus: paintStatus
@@ -236231,6 +236386,7 @@ var defaultHeight = Math.floor(1122 * scaleXY) % 2 === 1 ? Math.floor(1122 * sca
           var parentNode = node.parentNode;
           if (Number(parentNode.inputFieldType) === 0) {
             this.$emit('dblNodeClick', {
+              setActiveDoc: this.setActiveDocIndex,
               node: this.getCurrentSelectNode,
               type: 'modify_node',
               paintStatus: paintStatus
@@ -236272,6 +236428,7 @@ var defaultHeight = Math.floor(1122 * scaleXY) % 2 === 1 ? Math.floor(1122 * sca
         };
         if (node.customProperty && node.customProperty.hasThirdData == true) {
           this.$emit('dblNodeClick', {
+            setActiveDoc: this.setActiveDocIndex,
             node: this.getCurrentSelectNode,
             type: 'downlist',
             callback: callback,
@@ -236286,12 +236443,14 @@ var defaultHeight = Math.floor(1122 * scaleXY) % 2 === 1 ? Math.floor(1122 * sca
         if (Number(_parentNode.inputFieldType) === 0) {
           if (_parentNode.canModifyContent) {
             this.$emit('dblNodeClick', {
+              setActiveDoc: this.setActiveDocIndex,
               node: this.getCurrentSelectNode,
               type: 'text',
               paintStatus: paintStatus
             });
           } else {
             this.$emit('dblNodeClick', {
+              setActiveDoc: this.setActiveDocIndex,
               node: this.getCurrentSelectNode,
               type: 'modify_node',
               paintStatus: paintStatus
@@ -236325,6 +236484,7 @@ var defaultHeight = Math.floor(1122 * scaleXY) % 2 === 1 ? Math.floor(1122 * sca
           };
           if (_parentNode.customProperty && _parentNode.customProperty.hasThirdData == true) {
             this.$emit('dblNodeClick', {
+              setActiveDoc: this.setActiveDocIndex,
               node: this.getCurrentSelectNode,
               type: 'textlist',
               callback: _callback,
@@ -236341,6 +236501,7 @@ var defaultHeight = Math.floor(1122 * scaleXY) % 2 === 1 ? Math.floor(1122 * sca
       } else if (node instanceof ImageNode/* ImageNode */.H) {
         this.poperType = '';
         this.$emit('dblNodeClick', {
+          setActiveDoc: this.setActiveDocIndex,
           node: this.getCurrentSelectNode,
           type: 'edit-image',
           paintStatus: paintStatus
@@ -236510,10 +236671,10 @@ var defaultHeight = Math.floor(1122 * scaleXY) % 2 === 1 ? Math.floor(1122 * sca
 });
 ;// CONCATENATED MODULE: ./src/components/HoDoc.vue?vue&type=script&lang=js&
  /* harmony default export */ var components_HoDocvue_type_script_lang_js_ = (HoDocvue_type_script_lang_js_); 
-;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/HoDoc.vue?vue&type=style&index=0&id=3b98bb65&prod&lang=scss&
+;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/HoDoc.vue?vue&type=style&index=0&id=55b1a93c&prod&lang=scss&
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/components/HoDoc.vue?vue&type=style&index=0&id=3b98bb65&prod&lang=scss&
+;// CONCATENATED MODULE: ./src/components/HoDoc.vue?vue&type=style&index=0&id=55b1a93c&prod&lang=scss&
 
 ;// CONCATENATED MODULE: ./src/components/HoDoc.vue
 
@@ -236526,8 +236687,8 @@ var defaultHeight = Math.floor(1122 * scaleXY) % 2 === 1 ? Math.floor(1122 * sca
 
 var HoDoc_component = (0,componentNormalizer/* default */.Z)(
   components_HoDocvue_type_script_lang_js_,
-  HoDocvue_type_template_id_3b98bb65_render,
-  HoDocvue_type_template_id_3b98bb65_staticRenderFns,
+  HoDocvue_type_template_id_55b1a93c_render,
+  HoDocvue_type_template_id_55b1a93c_staticRenderFns,
   false,
   null,
   null,
@@ -237667,6 +237828,7 @@ var DrawPageTree = /*#__PURE__*/function () {
     key: "afterAreaFinishPaint",
     value: function afterAreaFinishPaint(drawArea) {
       var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID);
+      // 2023-05-23注释 25临时放开
       if (hoEditorFactory.drawTree.paintStatus === DrawTree/* PaintState.psReview */.Dh.psReview || (hoEditorFactory.drawTree.paintStatus === DrawTree/* PaintState.psEdit */.Dh.psEdit || hoEditorFactory.drawTree.paintStatus === DrawTree/* PaintState.psReadOnly */.Dh.psReadOnly) && !hoEditorFactory.isHideComments) {
         drawArea.drawComments();
       }
@@ -238666,11 +238828,12 @@ var HTMLconverter2 = /*#__PURE__*/function () {
           tmp.size = size;
         }
       }
-      if (jsondata['font_family'] && (0,jquery.trim)(jsondata['font_family'].toString()) !== '') {
-        tmp.font = jsondata['font_family'];
-      } else {
-        tmp.font = tmp.combineStyle.font;
-      }
+      // if (jsondata['font_family'] && trim(jsondata['font_family'].toString()) !== '') {
+      //     tmp.font = jsondata['font_family'];
+      // } else {
+      //     tmp.font = tmp.combineStyle.font;
+      // }
+      tmp.font = tmp.combineStyle.font;
       if (jsondata['font_weight']) tmp.bold = true;
       if (jsondata['font_style']) {
         if ((0,jquery.trim)(jsondata['font_style'].toString()) !== 'normal') tmp.italic = true;
@@ -240465,13 +240628,20 @@ var StructureConvert = /*#__PURE__*/function () {
           for (var s = 0; s < nodes.length; s++) {
             var node = nodes[s];
             if (styleType === 0) {
-              if (node instanceof TextNode/* TextNode */.R || node instanceof ControlNode/* ControlNode */.w || node instanceof MarkNode/* MarkNode */.j || node instanceof ParagraphNode/* ParagraphNode */.C) {
+              if (node instanceof TextNode/* TextNode */.R || node instanceof ControlNode/* ControlNode */.w || node instanceof MarkNode/* MarkNode */.j || node instanceof ParagraphNode/* ParagraphNode */.C || node instanceof SignNode/* SignNode */.N) {
                 if (oper === 0) {
                   if (Number(node.styleIndex) === i) {
                     isValid = true;
                     break;
                   }
+                } else if (oper === 1) {
+                  if (Number(node.styleIndex) > i) {
+                    node.styleIndex = Number(node.styleIndex) - 1;
+                  }
                 } else {
+                  if (Number(node.styleIndex) === i) {
+                    node.styleIndex = 0;
+                  }
                   if (Number(node.styleIndex) > i) {
                     node.styleIndex = Number(node.styleIndex) - 1;
                   }
@@ -240524,18 +240694,40 @@ var StructureConvert = /*#__PURE__*/function () {
       };
       //倒序遍历样式
       for (var i = styles.length - 1; i > 0; i--) {
-        var isValid = false;
-        isValid = forEachAllNodes("foot", 0, i, isValid);
-        if (!isValid) {
-          isValid = forEachAllNodes("main", 0, i, isValid);
-        }
-        if (!isValid) {
-          isValid = forEachAllNodes("head", 0, i, isValid);
-        }
-        //无效样式  页眉、正文和页脚均无此样式
-        if (!isValid) {
-          styles.splice(i, 1); //移除无效样式
-          forEachAllNodes("all", 1, i);
+        if (styleType === 0) {
+          var index = hoEditorFactory.docTree.styleCompare(styles[i]);
+          if (index === 0) {
+            styles.splice(i, 1); //移除空样式
+            forEachAllNodes("all", 2, i);
+          } else {
+            var isValid = false;
+            isValid = forEachAllNodes("foot", 0, i, isValid);
+            if (!isValid) {
+              isValid = forEachAllNodes("main", 0, i, isValid);
+            }
+            if (!isValid) {
+              isValid = forEachAllNodes("head", 0, i, isValid);
+            }
+            //无效样式  页眉、正文和页脚均无此样式
+            if (!isValid) {
+              styles.splice(i, 1); //移除无效样式
+              forEachAllNodes("all", 1, i);
+            }
+          }
+        } else {
+          var _isValid = false;
+          _isValid = forEachAllNodes("foot", 0, i, _isValid);
+          if (!_isValid) {
+            _isValid = forEachAllNodes("main", 0, i, _isValid);
+          }
+          if (!_isValid) {
+            _isValid = forEachAllNodes("head", 0, i, _isValid);
+          }
+          //无效样式  页眉、正文和页脚均无此样式
+          if (!_isValid) {
+            styles.splice(i, 1); //移除无效样式
+            forEachAllNodes("all", 1, i);
+          }
         }
       }
       return styles; //返回有效样式
@@ -240845,9 +241037,10 @@ var StructureConvert = /*#__PURE__*/function () {
         pageProperty.fontFormat = pageSettings.fontFormat ? pageSettings.fontFormat : "宋体";
         pageProperty.fontSize = pageSettings.fontSize ? Number(pageSettings.fontSize) : 14;
         pageProperty.fontColor = pageSettings.fontColor ? pageSettings.fontColor : "#000000";
-        pageProperty.backColor = pageSettings.backColor ? pageSettings.backColor : "transparent";
-        pageProperty.paraAlign = pageSettings.paraAlign ? Number(pageSettings.paraAlign) : 0;
-        pageProperty.charSpace = pageSettings.charSpace ? Number(pageSettings.charSpace) : 1;
+        //pageProperty.backColor = pageSettings.backColor ? pageSettings.backColor : "transparent";
+        pageProperty.backColor = "transparent";
+        pageProperty.paraAlign = pageSettings.paraAlign ? Number(pageSettings.paraAlign) : 3;
+        pageProperty.charSpace = pageSettings.charSpace ? Number(pageSettings.charSpace) : 0;
         pageProperty.lineHeight = pageSettings.lineHeight ? Number(pageSettings.lineHeight) : 1.25;
         //  hoEditorFactory.pageProperty = pageProperty;
       }
@@ -240911,9 +241104,9 @@ var StructureConvert = /*#__PURE__*/function () {
       var styles = xx.styles;
       hoEditorFactory.docTree.styles = [];
       var defaultTextStyle = new TextStyle/* TextStyle */.pn(this._hoEditorFactoryID);
-      if (defaultTextStyle.combineStyle.size != Number(styles.defaultFont["size"])) {
-        defaultTextStyle.size = Number(styles.defaultFont["size"]);
-      }
+      // if (defaultTextStyle.combineStyle.size != Number((styles.defaultFont)["size"])) {
+      //   defaultTextStyle.size = Number((styles.defaultFont)["size"]);
+      // }
       hoEditorFactory.docTree.styles.push(defaultTextStyle); //先把默认的样式放进去
       var fontStyles = styles.font ? styles.font : styles.fontStyle;
       var paraStyles = styles.para ? styles.para : styles.paraStyle;
@@ -240928,6 +241121,17 @@ var StructureConvert = /*#__PURE__*/function () {
           if (v && typeof v.font === 'string' && v.font.replace(/^\s+|\s+$/g, '') === '') {
             v.font = '宋体';
           }
+          if (v && typeof v.backColor === 'string') {
+            if (v.backColor.replace(/^\s+|\s+$/g, '') === '') {
+              v.backColor = defaultTextStyle.combineStyle.backColor;
+            }
+            if (v.backColor.replace(/^\s+|\s+$/g, '') === 'transparent') {
+              v.backColor = defaultTextStyle.combineStyle.backColor;
+            }
+            if (v.backColor.replace(/^\s+|\s+$/g, '') === '#FFFFFF') {
+              v.backColor = defaultTextStyle.combineStyle.backColor;
+            }
+          }
         });
       }
       if (fontStyles) {
@@ -241531,6 +241735,7 @@ var StructureConvert = /*#__PURE__*/function () {
             hoEditorFactory.drawTree.commentsMap.set(comment.id, comment);
             var mainArea = hoEditorFactory.drawPageTree.getMainRootArea(endNode.drawNodes[0]);
             mainArea === null || mainArea === void 0 ? void 0 : mainArea.areaComments.set(comment.id, comment);
+            var arr = comment.getPosition();
           };
           for (var _i13 = 0; _i13 < comments.length; _i13++) {
             var _ret = _loop(_i13);
@@ -242962,6 +243167,12 @@ var createForOfIteratorHelper = __webpack_require__(17519);
 var web_url = __webpack_require__(60285);
 // EXTERNAL MODULE: ./node_modules/core-js/modules/web.url-search-params.js
 var web_url_search_params = __webpack_require__(41637);
+// EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.map.js
+var es_array_map = __webpack_require__(21249);
+// EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.flat.js
+var es_array_flat = __webpack_require__(84944);
+// EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.unscopables.flat.js
+var es_array_unscopables_flat = __webpack_require__(33792);
 // EXTERNAL MODULE: ./src/editor/events/NodeChangingEvent.ts
 var NodeChangingEvent = __webpack_require__(10574);
 // EXTERNAL MODULE: ./src/plugins/pretty-data.js
@@ -242992,8 +243203,6 @@ var commonParamList = new Map();
   commonParamList.set(key, true);
 });
 
-// EXTERNAL MODULE: ./src/components/common/comment/index.ts + 6 modules
-var comment = __webpack_require__(43041);
 ;// CONCATENATED MODULE: ./src/editor/VueController.ts
 
 
@@ -243084,6 +243293,10 @@ var comment = __webpack_require__(43041);
 
 
 
+
+
+
+
 
 
 
@@ -245137,10 +245350,8 @@ var VueController = /*#__PURE__*/function () {
     key: "setEditorStatus",
     value: function setEditorStatus(status, printStatus) {
       var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID);
-      hoEditorFactory.isHideComments = true;
       hoEditorFactory.drawTree.paintStatus = status;
       hoEditorFactory.printStatus.printRange = 2;
-      //console.log("setEditorStatus ==> ", status, printStatus)
       if (status == 2 && printStatus != undefined) {
         hoEditorFactory.printStatus.printRange = printStatus;
       } else {
@@ -245149,8 +245360,15 @@ var VueController = /*#__PURE__*/function () {
       }
       var commentWidthMm = 0;
       if (status === 4) {
-        commentWidthMm = 55;
+        commentWidthMm = 80;
         hoEditorFactory.isHideComments = false; // 切换到审阅模式需要设置isHideComments为true
+        hoEditorFactory.commentParams.review = true;
+        hoEditorFactory.commentParams.hideComment = false;
+      } else {
+        hoEditorFactory.isHideComments = true;
+        hoEditorFactory.commentParams.review = false;
+        hoEditorFactory.commentParams.hideComment = true;
+        comment/* hoCreateComment.close */.$.close(); // 非审阅状态销毁选中批注创建的组件
       }
 
       if (commentWidthMm !== hoEditorFactory.pageProperty.commentWidthMm) {
@@ -245158,11 +245376,8 @@ var VueController = /*#__PURE__*/function () {
           commentWidthMm: commentWidthMm
         }));
       }
-      if (status !== 4) {
-        // 非审阅状态销毁选中批注创建的组件
-        comment/* hoCreateComment.close */.$.close();
-      }
       if (hoEditorFactory.structureConvert._superiorSign.length > 0) {
+        // 上级医生签名相关
         if (status === 1 || status === 4) {
           this.hiddenMask(false);
         } else {
@@ -245502,7 +245717,9 @@ var VueController = /*#__PURE__*/function () {
     value: function hideComments(isHidden) {
       var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID);
       var commentWidthMm = 0;
-      if (!isHidden) commentWidthMm = 55;
+      if (!isHidden) commentWidthMm = 80;
+      hoEditorFactory.commentParams.hideComment = isHidden;
+      // hoEditorFactory.commentParams.review = false;
       this.setPageProperty(JSON.stringify({
         commentWidthMm: commentWidthMm
       }));
@@ -248068,12 +248285,13 @@ var VueController = /*#__PURE__*/function () {
      */
   }, {
     key: "insertWriteSign",
-    value: function insertWriteSign(imgSrc, fingerPrintSrc, fingerPosition, callback) {
+    value: function insertWriteSign(imgSrc, fingerPrintSrc, fingerPosition, callback, customProperty) {
       var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID);
       var curDomRange = hoEditorFactory.docTree.curDomRange.normalize();
       var startPath = curDomRange.normalize().startPath;
       var endPath = curDomRange.normalize().endPath;
       var node = curDomRange.npEnd.node;
+      var customPropertys = customProperty ? customProperty : {};
       if (node instanceof SignNode/* SignNode */.N) {
         if (node.isTemplate) {
           if (node.imgSrc !== '' || node.fingerPrintSrc !== '') {
@@ -248082,7 +248300,7 @@ var VueController = /*#__PURE__*/function () {
               var newcurDomRange = hoEditorFactory.docTree.curDomRange.normalize();
               var newNode = newcurDomRange.npEnd.node;
               if (newNode instanceof SignNode/* SignNode */.N) {
-                Promise.all([hoEditorFactory.docController.updateSignNode(newNode, 3, '患者签名', '', '', imgSrc, 0, 0, {}, fingerPrintSrc, fingerPosition)]).then(function () {
+                Promise.all([hoEditorFactory.docController.updateSignNode(newNode, 3, '患者签名', '', '', imgSrc, 0, 0, customPropertys, fingerPrintSrc, fingerPosition)]).then(function () {
                   setTimeout(function () {
                     callback && callback();
                   }, 0);
@@ -248090,7 +248308,7 @@ var VueController = /*#__PURE__*/function () {
               }
             }, 0);
           } else {
-            Promise.all([hoEditorFactory.docController.updateSignNode(node, 3, '患者签名', '', '', imgSrc, 0, 0, {}, fingerPrintSrc, fingerPosition)]).then(function () {
+            Promise.all([hoEditorFactory.docController.updateSignNode(node, 3, '患者签名', '', '', imgSrc, 0, 0, customPropertys, fingerPrintSrc, fingerPosition)]).then(function () {
               setTimeout(function () {
                 callback && callback();
               }, 0);
@@ -248104,7 +248322,7 @@ var VueController = /*#__PURE__*/function () {
             var endPath = curDomRange.normalize().endPath;
             var changingEvent = new NodeChangingEvent/* NodeChangingEvent */.Q(DocTree/* DocAction.daInsert */.gk.daInsert, startPath, endPath, NodeChangingEvent/* OperType.insertSign */.y.insertSign);
             if (hoEditorFactory.docTree.changing(changingEvent)) {
-              Promise.all([hoEditorFactory.docController.insertSignNode(curDomRange, 1, '患者签名', node.signor, node.signTime, node.signTimeFormat, imgSrc, node.imgWidth, node.imgHeight, {}, fingerPrintSrc, fingerPosition)]).then(function () {
+              Promise.all([hoEditorFactory.docController.insertSignNode(curDomRange, 1, '患者签名', node.signor, node.signTime, node.signTimeFormat, imgSrc, node.imgWidth, node.imgHeight, customPropertys, fingerPrintSrc, fingerPosition)]).then(function () {
                 setTimeout(function () {
                   callback && callback();
                 }, 0);
@@ -248115,7 +248333,7 @@ var VueController = /*#__PURE__*/function () {
       } else {
         var changingEvent = new NodeChangingEvent/* NodeChangingEvent */.Q(DocTree/* DocAction.daInsert */.gk.daInsert, startPath, endPath, NodeChangingEvent/* OperType.insertSign */.y.insertSign);
         if (hoEditorFactory.docTree.changing(changingEvent)) {
-          Promise.all([hoEditorFactory.docController.insertSignNode(curDomRange, 3, '患者签名', '', '', '', imgSrc, 0, 0, {}, fingerPrintSrc, fingerPosition)]).then(function () {
+          Promise.all([hoEditorFactory.docController.insertSignNode(curDomRange, 3, '患者签名', '', '', '', imgSrc, 0, 0, customPropertys, fingerPrintSrc, fingerPosition)]).then(function () {
             setTimeout(function () {
               callback && callback();
             }, 0);
@@ -248674,7 +248892,37 @@ var VueController = /*#__PURE__*/function () {
     key: "getDocCommentValue",
     value: function getDocCommentValue() {
       var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID);
-      return hoEditorFactory.drawTree.commentsMap;
+      var commentsMap = hoEditorFactory.drawTree.commentsMap;
+      var arr = [];
+      var result = [];
+      commentsMap.forEach(function (comment) {
+        var pos = comment.getPosition();
+        if (arr[pos[0]] == undefined) {
+          arr[pos[0]] = [];
+        }
+        var obj = {
+          id: comment.id,
+          lineHeight: comment.lineHeight,
+          permissionLevel: comment.permissionLevel,
+          text: comment.text,
+          userID: comment.userID,
+          userName: comment.userName,
+          date: comment.date,
+          customProperty: comment.customProperty,
+          pageIndex: pos[0],
+          endNodeX: Math.floor(pos[1]),
+          endNodeY: Math.floor(pos[2]),
+          reviewJson: hoEditorFactory.reviewJson
+        };
+        arr[pos[0]].push(obj);
+      });
+      arr.map(function (v) {
+        v.sort(function (a, b) {
+          return a.endNodeY - b.endNodeY;
+        });
+        return v;
+      });
+      return arr.flat();
     }
     /**
      * 批量修改当前病历中批注处理状态
@@ -248697,7 +248945,7 @@ var VueController = /*#__PURE__*/function () {
       drawTree.commentsMap = commentsMap;
     }
     /**
-     * 批量修改当前病历中批注处理状态
+     * 单独修改指定批注处理状态
      * @param status   1 === 已处理  0 ===未处理
      * @param commentId   批注id
      */
@@ -248777,7 +249025,7 @@ var VueController = /*#__PURE__*/function () {
       var comments = [];
       var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID);
       hoEditorFactory.vueController.setPageProperty(JSON.stringify({
-        commentWidthMm: 55
+        commentWidthMm: 50
       }));
       for (var i = 0; i < objects.length; i++) {
         var object = objects[i];
@@ -249972,6 +250220,16 @@ var VueController = /*#__PURE__*/function () {
       }
       return false;
     }
+    //设置选中批注
+  }, {
+    key: "setSelectedComment",
+    value: function setSelectedComment(id) {
+      var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID);
+      var comment = hoEditorFactory.drawTree.commentsMap.get(id);
+      if (comment) {
+        hoEditorFactory.drawTree.curOnSelectedComment = comment;
+      }
+    }
   }]);
   return VueController;
 }();
@@ -255374,13 +255632,13 @@ var HOEditorFactory = /*#__PURE__*/function () {
     (0,esm_defineProperty/* default */.Z)(this, "_notAllowEditInReview", false);
     (0,esm_defineProperty/* default */.Z)(this, "_printSilently", false);
     (0,esm_defineProperty/* default */.Z)(this, "_limitCharNumber", 0);
-    (0,esm_defineProperty/* default */.Z)(this, "_reviewJson", void 0);
+    (0,esm_defineProperty/* default */.Z)(this, "_reviewJson", {});
     (0,esm_defineProperty/* default */.Z)(this, "_canvasListNode", void 0);
     (0,esm_defineProperty/* default */.Z)(this, "_numLetterOnOneLine", true);
     (0,esm_defineProperty/* default */.Z)(this, "_reviewParams", {
-      old: true // 是否使用完善后的批注界面
+      old: false // 是否使用完善后的批注界面
     });
-
+    (0,esm_defineProperty/* default */.Z)(this, "_commentParams", void 0);
     this._hoEditorFactoryId = id;
   }
   (0,esm_createClass/* default */.Z)(HOEditorFactory, [{
@@ -255426,6 +255684,7 @@ var HOEditorFactory = /*#__PURE__*/function () {
     //连续的数字或字母是否在一行显示
 
     // 审阅参数设置
+    // 批注相关动态变更
     /**
      * Getter hoLocalStorage
      * @return {HoLocalStorage}
@@ -255986,6 +256245,16 @@ var HOEditorFactory = /*#__PURE__*/function () {
         this._reviewParams = value;
       }
     }
+  }, {
+    key: "commentParams",
+    get: function get() {
+      return this._commentParams;
+    },
+    set: function set(value) {
+      if (this._commentParams !== value) {
+        this._commentParams = value;
+      }
+    }
   }, {
     key: "isHideComments",
     get: function get() {
@@ -256499,7 +256768,7 @@ var commondata = __webpack_require__(76285);
     uploadImageParams: {},
     customProperty: {},
     paragraphCustomProperty: {},
-    deleteImageNodeList: {},
+    // deleteImageNodeList: {},
     pageProperty: {
       default: function _default() {}
     },
@@ -256729,7 +256998,17 @@ var commondata = __webpack_require__(76285);
       },
       scrollDirection: 0,
       // 页面滚动方向：1表示向下，-1表示向上
-      scrollTimer: null // 鼠标滑动时页面滚动定时器
+      scrollTimer: null,
+      // 鼠标滑动时页面滚动定时器
+
+      commentParams: {
+        // 批注相关参数监听
+        repaint: '0',
+        // 批注触发重绘
+        review: false,
+        // 切换到审阅
+        hideComment: true // 隐藏批注切换
+      }
     };
   },
 
@@ -256898,6 +257177,19 @@ var commondata = __webpack_require__(76285);
         var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().hoEditorFactoryMap.get(activeDocId);
         hoEditorFactory && (hoEditorFactory.isSameColorWithEmptyVlaue = this.isSameColorWithEmptyVlaue);
       }
+    },
+    commentParams: {
+      deep: true,
+      handler: function handler() {
+        if (!this.commentParams.hideComment) {
+          this.$emit("commentChange", true);
+          if (this.commentParams.repaint != '0') {
+            this.$emit("commentChange", true);
+          }
+        } else {
+          this.$emit("commentChange", false);
+        }
+      }
     }
   },
   provide: function provide() {
@@ -256972,6 +257264,7 @@ var commondata = __webpack_require__(76285);
       hoEditor.isEnabledGlobalColor = _this4.isEnabledGlobalColor;
       hoEditor.isSameColorWithEmptyVlaue = _this4.isSameColorWithEmptyVlaue;
       hoEditor.contentIsModify = _this4.contentIsModify;
+      hoEditor.commentParams = _this4.commentParams;
       hoEditor.isCanEditHeadFoot = _this4.isCanEditHeadFoot;
       hoEditor.docTree.docProperty = _this4.defaultDocProperty;
       HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().hoEditorFactoryMap.set(id, hoEditor);
@@ -257130,8 +257423,12 @@ var commondata = __webpack_require__(76285);
       this.hoEditorProvider.activeDocId = activeDocId;
       var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this.hoEditorProvider.activeDocId);
       hoEditorFactory.hoLocalStorage.initHoWebSql();
-      window.vueController = hoEditorFactory.vueController;
-      window.printController = hoEditorFactory.printController;
+      if (!window.vueController) {
+        window.vueController = hoEditorFactory.vueController;
+      }
+      if (!window.printController) {
+        window.printController = hoEditorFactory.printController;
+      }
       this.$emit('docReady', {
         vueController: hoEditorFactory.vueController,
         baseController: hoEditorFactory.baseController,
@@ -257452,10 +257749,10 @@ var commondata = __webpack_require__(76285);
 });
 ;// CONCATENATED MODULE: ./src/components/HoDocs.vue?vue&type=script&lang=js&
  /* harmony default export */ var components_HoDocsvue_type_script_lang_js_ = (HoDocsvue_type_script_lang_js_); 
-;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/HoDocs.vue?vue&type=style&index=0&id=ccfac6dc&prod&lang=scss&media=print&
+;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/HoDocs.vue?vue&type=style&index=0&id=1484bfac&prod&lang=scss&media=print&
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/components/HoDocs.vue?vue&type=style&index=0&id=ccfac6dc&prod&lang=scss&media=print&
+;// CONCATENATED MODULE: ./src/components/HoDocs.vue?vue&type=style&index=0&id=1484bfac&prod&lang=scss&media=print&
 
 ;// CONCATENATED MODULE: ./src/components/HoDocs.vue
 
@@ -257478,8 +257775,8 @@ var HoDocs_component = (0,componentNormalizer/* default */.Z)(
 )
 
 /* harmony default export */ var HoDocs = (HoDocs_component.exports);
-;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/toolbar/ToolBar.vue?vue&type=template&id=13ecac50&
-var ToolBarvue_type_template_id_13ecac50_render = function render() {
+;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/toolbar/ToolBar.vue?vue&type=template&id=529bb754&
+var ToolBarvue_type_template_id_529bb754_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -257712,10 +258009,8 @@ var ToolBarvue_type_template_id_13ecac50_render = function render() {
     }, [_vm._v(_vm._s(item.title))]);
   }), 1)], 1) : _vm._e()], 1);
 };
-var ToolBarvue_type_template_id_13ecac50_staticRenderFns = [];
+var ToolBarvue_type_template_id_529bb754_staticRenderFns = [];
 
-// EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.map.js
-var es_array_map = __webpack_require__(21249);
 ;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/toolbar/insert/HoMedicalExpression.vue?vue&type=template&id=32d7d27f&
 var HoMedicalExpressionvue_type_template_id_32d7d27f_render = function render() {
   var _vm = this,
@@ -262878,7 +263173,7 @@ var ToolTable_component = (0,componentNormalizer/* default */.Z)(
         }
       });
       if (candeleteList.length == 0) {
-        this.$message.error('只能删除自己创建的批注!');
+        message/* default.error */.Z.error('只能删除自己创建的批注!');
         return;
       }
       this.$emit('insertComments', {
@@ -262930,10 +263225,10 @@ var ToolTable_component = (0,componentNormalizer/* default */.Z)(
 });
 ;// CONCATENATED MODULE: ./src/components/toolbar/ToolBar.vue?vue&type=script&lang=js&
  /* harmony default export */ var toolbar_ToolBarvue_type_script_lang_js_ = (ToolBarvue_type_script_lang_js_); 
-;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/toolbar/ToolBar.vue?vue&type=style&index=0&id=13ecac50&prod&lang=scss&
+;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/toolbar/ToolBar.vue?vue&type=style&index=0&id=529bb754&prod&lang=scss&
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/components/toolbar/ToolBar.vue?vue&type=style&index=0&id=13ecac50&prod&lang=scss&
+;// CONCATENATED MODULE: ./src/components/toolbar/ToolBar.vue?vue&type=style&index=0&id=529bb754&prod&lang=scss&
 
 ;// CONCATENATED MODULE: ./src/components/toolbar/ToolBar.vue
 
@@ -262946,8 +263241,8 @@ var ToolTable_component = (0,componentNormalizer/* default */.Z)(
 
 var ToolBar_component = (0,componentNormalizer/* default */.Z)(
   toolbar_ToolBarvue_type_script_lang_js_,
-  ToolBarvue_type_template_id_13ecac50_render,
-  ToolBarvue_type_template_id_13ecac50_staticRenderFns,
+  ToolBarvue_type_template_id_529bb754_render,
+  ToolBarvue_type_template_id_529bb754_staticRenderFns,
   false,
   null,
   null,
@@ -264587,6 +264882,9 @@ var HoRightMenu_component = (0,componentNormalizer/* default */.Z)(
     },
     getActiveDocId: function getActiveDocId() {
       return this.activeDocId;
+    },
+    setActiveDocId: function setActiveDocId(activeDocId) {
+      this.activeDocId = activeDocId;
     }
   }
 });