hoeditor-web 3.1.164 → 3.1.166

package/lib/hoeditor.umd.js

@@ -65189,20 +65189,12 @@ var es_regexp_to_string = __webpack_require__(39714);
 var es_array_slice = __webpack_require__(47042);
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.json.stringify.js
 var es_json_stringify = __webpack_require__(38862);
-// EXTERNAL MODULE: ./node_modules/core-js/modules/es.regexp.exec.js
-var es_regexp_exec = __webpack_require__(74916);
-// EXTERNAL MODULE: ./node_modules/core-js/modules/es.string.replace.js
-var es_string_replace = __webpack_require__(15306);
-// 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: ./node_modules/core-js/modules/es.array.push.js
-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.splice.js
 var es_array_splice = __webpack_require__(40561);
+// 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.push.js
+var es_array_push = __webpack_require__(57658);
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.object.assign.js
 var es_object_assign = __webpack_require__(19601);
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.concat.js
@@ -65211,6 +65203,10 @@ var es_array_concat = __webpack_require__(92222);
 var es_number_constructor = __webpack_require__(9653);
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.error.cause.js
 var es_error_cause = __webpack_require__(21703);
+// 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/editor/draw/DrawLine.ts + 1 modules
 var DrawLine = __webpack_require__(96635);
 // EXTERNAL MODULE: ./src/editor/draw/SelectRange.ts
@@ -67002,8 +66998,6 @@ var PopQScoreNode = __webpack_require__(12790);
 
 
 
-
-
 
 
 
@@ -68226,40 +68220,39 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
           }
         });
       };
-      if (this.inputFieldType === InputFieldType.dropDownList) {
-        var _this$downListPropert;
-        text = "";
-        loopChildNodes(this);
-        if (text.replace(/\n/g, '') != this.text.replace(/\n/g, '') && isNeed && !this.text.includes("<span>") && !((_this$downListPropert = this.downListProperty.listItems) !== null && _this$downListPropert !== void 0 && _this$downListPropert.includes("<元素>")) && this.readType != 1) {
-          this.value = "";
-          if (this.text == '' && !this.keyValue) {
-            this.keyValue = "";
-          }
-          return text;
-        } else {
-          text = "";
-        }
-        var downListProperty = this.downListProperty;
-        if (downListProperty.listItems) {
-          var listItems = JSON.parse(downListProperty.listItems);
-          if (listItems.length === undefined) {
-            listItems = Array(JSON.parse(downListProperty.listItems));
-          }
-          var value = [];
-          var keyValue = this.keyValue.split(',');
-          for (var i = 0; i < listItems.length; i++) {
-            var listItem = listItems[i];
-            if (keyValue.includes(listItem.id.toString())) {
-              var index = listItem.text.indexOf('<元素>');
-              text += index === -1 ? listItem.text : listItem.text.substring(0, index);
-              text += this.downListProperty.splitCharacter;
-              String(listItem.value) && value.push(listItem.value);
-            }
-          }
-          text = text.substring(0, text.length - 1).replace('\r', '');
-          this.value = value.join(',');
-        }
-      }
+      // if (this.inputFieldType === InputFieldType.dropDownList) {
+      //     text = "";
+      //     loopChildNodes(this);
+      //     if (text.replace(/\n/g, '') != this.text.replace(/\n/g, '') && isNeed && !this.text.includes("<span>") && !this.downListProperty.listItems?.includes("<元素>") && this.readType != 1) {
+      //         this.value = "";
+      //         if (this.text == '' && !this.keyValue) {
+      //             this.keyValue = "";
+      //         }
+      //         return text;
+      //     } else {
+      //         text = "";
+      //     }
+      //     const downListProperty = this.downListProperty;
+      //     if (downListProperty.listItems) {
+      //         let listItems = JSON.parse(downListProperty.listItems);
+      //         if (listItems.length === undefined) {
+      //             listItems = Array(JSON.parse(downListProperty.listItems));
+      //         }
+      //         let value: string[] = [];
+      //         const keyValue: string[] = this.keyValue.split(',');
+      //         for (let i = 0; i < listItems.length; i++) {
+      //             const listItem = listItems[i];
+      //             if (keyValue.includes(listItem.id.toString())) {
+      //                 const index = listItem.text.indexOf('<元素>');
+      //                 text += index === -1 ? listItem.text : listItem.text.substring(0, index);
+      //                 text += this.downListProperty.splitCharacter;
+      //                 String(listItem.value) && value.push(listItem.value);
+      //             }
+      //         }
+      //         text = text.substring(0, text.length - 1).replace('\r', '');
+      //         this.value = value.join(',');
+      //     }
+      // }
       if (text === '') {
         loopChildNodes(this);
       }
@@ -74164,7 +74157,7 @@ var DrawCell = /*#__PURE__*/function (_DrawRect) {
         var aHeight = this._cell.drawCell.calcCellHeight();
         var cellMaxHeigth = Math.min(maxHeight, aHeight);
         if (this._cell.cellProperty.align === _editor_dom_TableProperty__WEBPACK_IMPORTED_MODULE_15__/* .VAlign */ .TR.vatop) {
-          valignTop = 0;
+          valignTop = 1;
         } else if (this._cell.cellProperty.align === _editor_dom_TableProperty__WEBPACK_IMPORTED_MODULE_15__/* .VAlign */ .TR.vacenter && cellMaxHeigth > this._cell.drawCell.docHeight) {
           valignTop = (cellMaxHeigth - this._cell.drawCell.docHeight) / 2;
         } else if (this._cell.cellProperty.align === _editor_dom_TableProperty__WEBPACK_IMPORTED_MODULE_15__/* .VAlign */ .TR.vabottom && aHeight > this._cell.drawCell.docHeight) {
@@ -78864,7 +78857,6 @@ var DrawPageTable = /*#__PURE__*/function (_DrawRect) {
               if (_mc3 > 0) {
                 dPartCell.x = aleft;
               }
-              //this.drawItems.push(dPartCell);
               this.addChild(dPartCell);
               var ret = dPartCell.update(dPrevPartCell, _cell2.drawCell.drawLines, startChildIndex, dPartCell.valignTop, cellMaxHeight);
               dPartCell.y = cellRowTop;
@@ -78897,19 +78889,8 @@ var DrawPageTable = /*#__PURE__*/function (_DrawRect) {
               }
             }
           }
-          // cell.drawCell.update(
-          //   aPageIndex,
-          //   dPageTable,
-          //   0,
-          //   cell.drawCell.drawLines.length - 1,
-          //   adTop,
-          //   aRestHeight
-          // );
-          // }
         }
-        //const oldHeight = this._partRowHeights.get(r)?.rowHeight;
         rowHeight = Math.min(this.getAndUpdatePartRowHeight(r), pageRestHeight);
-        // if (oldHeight !== rowHeight)
         this._endRow = r;
         if (bRowHeightChanged) this.updateRowPartCellHeight(r, rowHeight);
         rowTop = rowTop + rowHeight + emptyRowHeight;
@@ -78922,9 +78903,6 @@ var DrawPageTable = /*#__PURE__*/function (_DrawRect) {
           break;
         }
       }
-      // if (!bRowHeightChanged) {
-      //   this.updateRowPartCellHeight(this._endRow, rowHeight)
-      // }
       //绘制最后一行的单元格存在结束行非当前页时，需要特殊处理
       this.updateLastLineMergeCrossCell(prevdPageTable, this._endRow, rowHeight, tableRestHeight);
       var aHeight = 0;
@@ -79614,20 +79592,6 @@ var DrawRect = /*#__PURE__*/function (_DrawContainer) {
       }
       this._borderShape.graphics.drawRect(0, this._dHeight, this._dWidth, 1);
     }
-    // /**
-    //  * @author xyl
-    //  * @param startPath  起始绘制点
-    //  * @param endPath  结束绘制点
-    //  * @returns 迭代绘制范围
-    //  */
-    // public *listDrawLineByPathRange(startLine: number, endLine: number) {
-    //   if (startLine === -1) {
-    //     return;
-    //   }
-    //   for (let i = startLine; i <= endLine; i++) {
-    //     yield i;
-    //   }
-    // }
   }, {
     key: "clearDrawAfterDline",
     value: function clearDrawAfterDline(aline) {
@@ -80134,7 +80098,7 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
                 if (node.parentNode instanceof _editor_dom_treeNode_CellNode__WEBPACK_IMPORTED_MODULE_9__/* .CellNode */ .D) {
                   var cellWidth = node.parentNode.drawCell.dWidth;
                   if (width > cellWidth - 5) {
-                    drawNode.dHeight = (cellWidth - 5) * drawNode.dHeight / width;
+                    drawNode.dHeight = (cellWidth - 5) * drawNode.dHeight / width - 2;
                     scale = (cellWidth - 5) / width * scale;
                     width = cellWidth - 5;
                   }
@@ -210512,7 +210476,7 @@ var TextNode = __webpack_require__(27198);
 // EXTERNAL MODULE: ./src/editor/dom/treeNode/ParagraphNode.ts
 var ParagraphNode = __webpack_require__(67945);
 ;// CONCATENATED MODULE: ./src/components/version.ts
-/* harmony default export */ var version = ('3.1.164');
+/* harmony default export */ var version = ('3.1.166');
 // EXTERNAL MODULE: ./src/components/controls/poperTipText/PoperTipText.vue + 5 modules
 var PoperTipText = __webpack_require__(84531);
 ;// CONCATENATED MODULE: ./src/components/controls/poperTipText/index.ts
@@ -224714,12 +224678,14 @@ var VueController = /*#__PURE__*/function () {
           if (anode instanceof ControlNode/* ControlNode */.w && anode.nodeType !== 10 && anode.nodeType !== 11 || anode instanceof TextInputFieldNode/* TextInputFieldNode */.re) {
             for (var m = 0, len = items.length - 1; m <= len; m++) {
               var item = items[m];
-              if (item.text !== '' && (item.name === anode.name || item.id === anode.id || item.dataId === anode.dataId) && anode.text.includes(item.text)) {
+              var isCurrent = item.name === anode.name || item.id === anode.id || item.dataId === anode.dataId || item.innerIdentifier === anode.innerIdentifier;
+              // console.log(isCurrent, anode.name, anode.innerIdentifier)
+              if (item.text !== '' && isCurrent && anode.text.includes(item.text)) {
                 var range = _this6.search(anode, item.text);
                 if (range.length > 0) {
                   selectRangeArr = selectRangeArr.concat(range);
                 }
-              } else if (item.text === '' && (item.name === anode.name || item.id === anode.id || item.dataId === anode.dataId)) {
+              } else if (item.text === '' && isCurrent) {
                 var _range = _this6.search(anode, anode.text);
                 if (_range.length > 0) {
                   selectRangeArr = selectRangeArr.concat(_range);