hoeditor-web 2.0.66 → 2.0.67

package/lib/hoeditor.common.js

@@ -44497,7 +44497,10 @@ var DrawArea = /*#__PURE__*/function (_DrawRect) {
         var curArea = hoEditorFactory.drawPageTree.getMainRootArea(markDrawNode);
 
         if (curArea) {
-          if (curArea.topDline === _this2.topDline) {
+          // if (curArea.topDline === this.topDline) {
+          //   comments.set(value.id, value);
+          // }
+          if (curArea.index === _this2.index) {
             comments.set(value.id, value);
           }
         }
@@ -44575,6 +44578,7 @@ var DrawArea = /*#__PURE__*/function (_DrawRect) {
     value: function repaint(comment, nPath, spX, spY) {
       var _this3 = this;
 
+      var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_17__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
       var comments = this.areaComments;
       var topComments = new Array();
       var bottomComments = new Array();
@@ -44582,7 +44586,7 @@ var DrawArea = /*#__PURE__*/function (_DrawRect) {
 
       var getStagePos = function getStagePos(comment) {
         var endDrawNode = comment.eNode.drawNodes[0];
-        var dline = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_17__/* .HOEditorFactorys.instance */ .b.instance().getFactory(_this3._hoEditorFactoryID).drawTree.getDrawLineByDNode(endDrawNode); // 末尾标记节点所在行
+        var dline = hoEditorFactory.drawTree.getDrawLineByDNode(endDrawNode); // 末尾标记节点所在行
 
         var stagePos = dline.localToGlobal(endDrawNode.x, endDrawNode.y); // 末尾标记节点的stage坐标
 
@@ -44595,7 +44599,11 @@ var DrawArea = /*#__PURE__*/function (_DrawRect) {
       var commentY = spY;
       comments.forEach(function (value) {
         if (value.id !== comment.id) {
-          tempArr.push(value);
+          var area = hoEditorFactory.drawPageTree.getMainRootArea(value.eNode.drawNodes[0]);
+
+          if (area && area.index == _this3.index) {
+            tempArr.push(value);
+          }
         }
       });
       tempArr.forEach(function (value) {
@@ -53758,7 +53766,7 @@ var DrawTextNode = /*#__PURE__*/function (_DrawCombineNode) {
         }
       }
 
-      if (hoEditorFactory.drawTree.paintStatus === DrawTree/* PaintState.psReview */.Dh.psReview) {
+      if (hoEditorFactory.drawTree.paintStatus === DrawTree/* PaintState.psReview */.Dh.psReview || hoEditorFactory.drawTree.paintStatus === DrawTree/* PaintState.psReadOnly */.Dh.psReadOnly && !hoEditorFactory.isHideComments) {
         var commentID = this._textNode.dCombineStyle.commentID;
         var createID = this._textNode.dCombineStyle.creatorIndex;
         var deleteID = this._textNode.dCombineStyle.deleterIndex;
@@ -207269,7 +207277,7 @@ var SignNode = __webpack_require__(34450);
 // EXTERNAL MODULE: ./src/editor/dom/treeNode/ParagraphNode.ts
 var ParagraphNode = __webpack_require__(14208);
 ;// CONCATENATED MODULE: ./src/components/version.ts
-/* harmony default export */ var version = ('2.0.66');
+/* harmony default export */ var version = ('2.0.67');
 ;// CONCATENATED MODULE: ./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/poperTipText/PoperTipText.vue?vue&type=template&id=3fa4e4d3&scoped=true&
 var PoperTipTextvue_type_template_id_3fa4e4d3_scoped_true_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{directives:[{name:"show",rawName:"v-show",value:(_vm.isShow),expression:"isShow"},{name:"click-outside",rawName:"v-click-outside",value:(_vm.handleClose),expression:"handleClose"}],ref:"poperTextNode",staticClass:"poper-text-modal animation-in",style:(_vm.posStyle),on:{"mouseenter":_vm.mouseEnter,"mouseleave":_vm.mouseLeave}},_vm._l((_vm.poperText),function(text){return _c('div',{key:text + Math.random(0, 1),staticClass:"poper-text"},[_vm._v(" "+_vm._s(text)+" ")])}),0)}
 var PoperTipTextvue_type_template_id_3fa4e4d3_scoped_true_staticRenderFns = []
@@ -221036,6 +221044,9 @@ var VueController = /*#__PURE__*/function () {
     value: function showElementsEditRecord(objects) {
       var comments = [];
       var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID);
+      hoEditorFactory.vueController.setPageProperty(JSON.stringify({
+        commentWidthMm: 50
+      }));
 
       for (var i = 0; i < objects.length; i++) {
         var object = objects[i];
@@ -221094,6 +221105,9 @@ var VueController = /*#__PURE__*/function () {
     key: "clearEditRecords",
     value: function clearEditRecords() {
       var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID);
+      hoEditorFactory.vueController.setPageProperty(JSON.stringify({
+        commentWidthMm: 0
+      }));
       var drawMainDocs = hoEditorFactory.drawPageTree.drawMainDocs;
 
       for (var j = drawMainDocs.length - 1; j >= 0; j--) {
@@ -223543,8 +223557,16 @@ var PrintController = /*#__PURE__*/function () {
             hoEditorFactory.vueController.openXml(xml);
           } else {
             hoEditorFactory.drawTree.paintStatus = beforeStatus;
-            hoEditorFactory.printStatus.clearArea();
-            hoEditorFactory.printStatus.drawPrintRecord.clear();
+            hoEditorFactory.drawTree.drawPages.forEach(function (dPage) {
+              var _dPage$selectContaine;
+
+              if (dPage.drawSelectLevel && !dPage.drawSelectLevel.stage) {
+                dPage.drawSelectLevel.bindStage();
+              }
+
+              dPage.selectContainer.children = [];
+              (_dPage$selectContaine = dPage.selectContainer.stage) === null || _dPage$selectContaine === void 0 ? void 0 : _dPage$selectContaine.update();
+            });
             hoEditorFactory.vueController.rebuildAll(true);
           }
         }