hoeditor-web 2.0.65 → 2.0.68

package/lib/hoeditor.common.js

@@ -27990,7 +27990,7 @@ var DownListNode = /*#__PURE__*/function (_ControlNode) {
         identifierFormat: this.identifierFormat,
         isSynchro: this.isSynchro,
         name: this.name,
-        text: this.text,
+        text: this.keyValue == "" ? "" : this.text,
         keyValue: this.keyValue,
         title: this.title,
         styleIndex: this.styleIndex,
@@ -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) {
@@ -46069,6 +46077,7 @@ var DrawCell = /*#__PURE__*/function (_DrawRect) {
       dParent.addChild(dPartCell);
       this.drawPageCells.push(dPartCell);
       dPartCell.paintArea(this._drawLines, startDline, valignTop);
+      dPartCell.valignTop = valignTop;
       ret = this._drawLines[this._drawLines.length - 1].dHeight + this._drawLines[this._drawLines.length - 1].dTop;
     }
   }, {
@@ -48261,7 +48270,7 @@ var DrawPageCell = /*#__PURE__*/function (_DrawArea) {
 
 
     return _this;
-  } // public get pageIndex(): number {
+  } // public ge t pageIndex(): number {
   //   return this._pageIndex;
   // }
   // public set pageIndex(value: number) {
@@ -48312,6 +48321,9 @@ var DrawPageCell = /*#__PURE__*/function (_DrawArea) {
     key: "valignTop",
     get: function get() {
       return this._valignTop;
+    },
+    set: function set(val) {
+      this._valignTop = val;
     } // public get dPage(): DrawPage {
     //   return this._dPage;
     // }
@@ -48781,7 +48793,7 @@ var DrawPageCell = /*#__PURE__*/function (_DrawArea) {
           var adjustValignTop = newValignTop - this._valignTop;
           this._valignTop = newValignTop;
 
-          for (var i = 0; i < this.numChildren - 1; i++) {
+          for (var i = 0; i < this.numChildren; i++) {
             if (this.children[i] instanceof DrawLine/* DrawLine */.a || this.children[i] instanceof DrawPageTable/* DrawPageTable */.ox) {
               this.children[i].y += adjustValignTop;
             }
@@ -48824,12 +48836,10 @@ var DrawPageCell = /*#__PURE__*/function (_DrawArea) {
   }, {
     key: "update",
     value: function update(prevDrawArea, dlines, startIndex, dTop, restHeight) {
-      var valignTop = dTop;
-
-      if (startIndex === 0) {
-        valignTop = this.calcValignTop();
-        this._valignTop = valignTop;
-      }
+      var valignTop = dTop; // if (startIndex === 0) {
+      //    valignTop=this.calcValignTop();
+      //    this._valignTop=valignTop;
+      // }
 
       this._startDline = startIndex;
 
@@ -49425,7 +49435,7 @@ var DrawPageTable = /*#__PURE__*/function (_DrawRect) {
 
       partCell.dHeight = newHeight;
       partCell.maxHeight = newHeight;
-      partCell.update(dPrevPartCell, partCell.cell.drawCell.drawLines, startChildIndex, 0, newHeight);
+      partCell.update(dPrevPartCell, partCell.cell.drawCell.drawLines, startChildIndex, partCell.valignTop, newHeight);
       dPageTable.paintCellBorder(partCell, r, c, newHeight);
     }
   }, {
@@ -49916,7 +49926,7 @@ var DrawPageTable = /*#__PURE__*/function (_DrawRect) {
             dPartCell.x = aleft; //this.drawItems.push(dPartCell);
 
             this.addChild(dPartCell);
-            var ret = dPartCell.update(dPrevPartCell, cell.drawCell.drawLines, startChildIndex, 0, cellMaxHeight);
+            var ret = dPartCell.update(dPrevPartCell, cell.drawCell.drawLines, startChildIndex, dPartCell.valignTop, cellMaxHeight);
             dPartCell.y = cellRowTop;
           } else {
             dPartCell = cell.drawCell.drawPageCells[partCellindex + 1];
@@ -49940,7 +49950,7 @@ var DrawPageTable = /*#__PURE__*/function (_DrawRect) {
                 dPartCell.maxHeight = tableRestHeight - cellRowTop;
               }
 
-              var _ret = dPartCell.update(dPrevPartCell, cell.drawCell.drawLines, startChildIndex, 0, cellMaxHeight);
+              var _ret = dPartCell.update(dPrevPartCell, cell.drawCell.drawLines, startChildIndex, dPartCell.valignTop, cellMaxHeight);
             }
 
             dPartCell.y = cellRowTop;
@@ -50146,7 +50156,13 @@ var DrawPageTable = /*#__PURE__*/function (_DrawRect) {
           var partCell = mainCell.drawCell.getDrawPageCell(this);
 
           if (partCell && aHeight) {
-            rowHeight = Math.max(aHeight, partCell.docHeight);
+            var cellHeight = aHeight;
+
+            if (mainCell.rowSpan > 1) {
+              cellHeight = partCell.dHeight;
+            }
+
+            rowHeight = Math.max(cellHeight, partCell.docHeight);
             rowSpan = mainCell.rowSpan;
           }
         }
@@ -50469,7 +50485,7 @@ var DrawPageTable = /*#__PURE__*/function (_DrawRect) {
               dPartCell.x = aleft; //this.drawItems.push(dPartCell);
 
               this.addChild(dPartCell);
-              var ret = dPartCell.update(dPrevPartCell, _cell2.drawCell.drawLines, startChildIndex, 0, cellMaxHeight);
+              var ret = dPartCell.update(dPrevPartCell, _cell2.drawCell.drawLines, startChildIndex, dPartCell.valignTop, cellMaxHeight);
               dPartCell.y = cellRowTop;
               rowFinished = rowFinished && ret;
             } else {
@@ -50499,7 +50515,7 @@ var DrawPageTable = /*#__PURE__*/function (_DrawRect) {
 
                 bRowHeightChanged = true;
 
-                var _ret2 = dPartCell.update(dPrevPartCell, _cell2.drawCell.drawLines, startChildIndex, 0, cellMaxHeight);
+                var _ret2 = dPartCell.update(dPrevPartCell, _cell2.drawCell.drawLines, startChildIndex, dPartCell.valignTop, cellMaxHeight);
 
                 rowFinished = rowFinished && _ret2;
               } else if (_cell2.drawCell.drawPageCells.length > 1 && partCellindex + 1 < _cell2.drawCell.drawPageCells.length - 1 && !this._table.rowInfos[r].rowProperty.repeatAsTitleAtPageTop) {
@@ -53010,6 +53026,8 @@ var createSuper = __webpack_require__(28214);
 var es_regexp_exec = __webpack_require__(74916);
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.string.split.js
 var es_string_split = __webpack_require__(23123);
+// EXTERNAL MODULE: ./node_modules/core-js/modules/es.string.ends-with.js
+var es_string_ends_with = __webpack_require__(27852);
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.string.italics.js
 var es_string_italics = __webpack_require__(58734);
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.string.bold.js
@@ -53459,6 +53477,7 @@ var GestationNode = __webpack_require__(74873);
 
 
 
+
  // import {DrawNode} from "./DrawSimpleNode"
 
 
@@ -53680,17 +53699,68 @@ var DrawTextNode = /*#__PURE__*/function (_DrawCombineNode) {
 
       if (hoEditorFactory.drawTree.paintStatus !== DrawTree/* PaintState.psPreview */.Dh.psPreview && hoEditorFactory.drawTree.paintStatus !== DrawTree/* PaintState.psPrint */.Dh.psPrint) {
         if (this.node.parentNode instanceof TextInputFieldNode/* TextInputFieldNode */.re) {
-          if (this.node.parentNode.inputFieldType === 0) {
+          var parentNode = this.node.parentNode;
+
+          if (parentNode.inputFieldType === 0) {
             if (backColor === hoEditorFactory.pageProperty.backColor) {
               backColor = hoEditorFactory.option.getColorByLevel(10);
             }
           } else {
-            if (this.node.parentNode.keyValue == "") {
+            if (parentNode.keyValue == "") {
               backColor = hoEditorFactory.option.getColorByLevel(120);
             } else {
-              backColor = hoEditorFactory.option.getColorByLevel(12);
+              var downListProperty = parentNode.downListProperty;
+
+              if (hoEditorFactory.isSameColorWithEmptyVlaue && downListProperty.listItems) {
+                var isDefault = false;
+                var listItems = JSON.parse(downListProperty.listItems);
+
+                if (downListProperty.allowMultiSelected) {
+                  var defaultValues = "";
+
+                  for (var i = 0; i < listItems.length; i++) {
+                    var item1 = listItems[i];
+
+                    if (item1.default) {
+                      defaultValues += item1.id + ",";
+                    }
+                  }
+
+                  if (defaultValues.endsWith(',')) {
+                    defaultValues = defaultValues.substring(0, defaultValues.length - 1);
+                  }
+
+                  var keyValue = parentNode.keyValue;
+
+                  if (keyValue.endsWith(',')) {
+                    keyValue = keyValue.substring(0, keyValue.length - 1);
+                  }
+
+                  if (defaultValues === keyValue) {
+                    isDefault = true;
+                  }
+                } else {
+                  for (var j = 0; j < listItems.length; j++) {
+                    var item2 = listItems[j];
+
+                    if (item2.id === parentNode.keyValue.split(',')[0] && item2.default) {
+                      isDefault = true;
+                      break;
+                    }
+                  }
+                }
+
+                if (isDefault) {
+                  backColor = hoEditorFactory.option.getColorByLevel(120);
+                } else {
+                  backColor = hoEditorFactory.option.getColorByLevel(12);
+                }
+              } else {
+                backColor = hoEditorFactory.option.getColorByLevel(12);
+              }
             }
-          }
+          } //hoEditorFactory.isEnabledGlobalColor = true;
+
 
           if (hoEditorFactory.isEnabledGlobalColor) {
             if (!(this.node instanceof MarkNode/* MarkNode */.j) && this.node.parentNode.inputFieldType === 0) {
@@ -53704,7 +53774,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;
@@ -207215,7 +207285,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.65');
+/* 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 = []
@@ -209726,8 +209796,8 @@ var UserInfo = __webpack_require__(75013);
 /*
  * @Author: your name
  * @Date: 2021-06-21 17:47:51
- * @LastEditTime: 2022-04-22 14:24:28
- * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2022-07-08 23:50:19
+ * @LastEditors: liyanan 2441631434@qq.com
  * @Description: In User Settings Edit
  * @FilePath: \hoeditor-web\src\editor\runTimeInfo\Option.ts
  */
@@ -209747,7 +209817,7 @@ var Option = /*#__PURE__*/function () {
 
     this._downListColor = "#D2ECB1"; //下拉列表元素颜色//#D2ECB1
 
-    this._downListColor2 = "#D2ECB1"; //下拉列表默认元素颜色
+    this._downListColor2 = "#D2ACB1"; //下拉列表默认元素颜色
 
     this._hoEditorFactoryID = hoEditorFactoryID;
   }
@@ -220982,6 +221052,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];
@@ -221040,6 +221113,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--) {
@@ -223489,8 +223565,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);
           }
         }
@@ -223751,6 +223835,7 @@ var PrintController = /*#__PURE__*/function () {
                 hoEditorFactory.drawTree.paintStatus = DrawTree/* PaintState.psPreview */.Dh.psPreview;
                 xmlIndex = -1;
                 mergeList = [];
+                continuousid = '';
                 options = {
                   unit: 'px',
                   hotfixes: ['px_scaling'],
@@ -223802,6 +223887,10 @@ var PrintController = /*#__PURE__*/function () {
                                   position = {};
                                 }
 
+                                if (continuousid && xmlList[xmlIndex][2] !== continuousid) {
+                                  mergeList = [];
+                                }
+
                                 continuousid = xmlList[xmlIndex][2];
                                 mergeList.push([xmlList[xmlIndex][1], xmlList[xmlIndex][0]]);
 
@@ -223813,14 +223902,13 @@ var PrintController = /*#__PURE__*/function () {
                                     } else {
                                       hoEditorFactory.loadImageCallback = toPrint;
                                     }
-
-                                    mergeList = [];
                                   });
                                 } else {
                                   createSvg();
                                 }
                               } else {
                                 mergeList = [];
+                                continuousid = '';
                                 Promise.all([hoEditorFactory.vueController.openXml(xmlList[xmlIndex][0])]).then(function () {
                                   if (hoEditorFactory.loadImageCount === 0) {
                                     toPrint();
@@ -223856,7 +223944,7 @@ var PrintController = /*#__PURE__*/function () {
 
                 createSvg();
 
-              case 13:
+              case 14:
               case "end":
                 return _context8.stop();
             }