hoeditor-web 3.1.191 → 3.1.192

package/lib/hoeditor.umd.js

@@ -145131,6 +145131,9 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
       for (var _i7 = 0; _i7 < cellNodes.length; _i7++) {
         var node = cellNodes[_i7];
         var rowNo = parseInt(node.rowNo);
+        if (isNaN(rowNo)) {
+          rowNo = Math.floor(_i7 / Number(json.colCount));
+        }
         var _aRow = new Array();
         var nodeRowSpan = node.rowSpan ? parseInt(node.rowSpan) : 1;
         var nodeColSpan = node.colSpan ? parseInt(node.colSpan) : 1;
@@ -145153,7 +145156,7 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
         _aRow.length = tableNode._colCount;
         rowsMap.set(rowNo, _aRow);
       }
-      rowsMap.delete(NaN);
+      // rowsMap.delete(NaN);
       //const defaultCellProperty = json.childNodes.defaultCellProperty;
       var aRow;
       var emptyCellNode = {
@@ -145171,7 +145174,7 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
       };
       var _loop2 = function _loop2() {
         var node = cellNodes[s];
-        if (!node && hoEditorFactory.drawTree.paintStatus == _editor_draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_42__/* .PaintState */ .ak.psDesign) {
+        if (!node && hoEditorFactory.useFixTableMerge) {
           var rowCount = Math.floor(s / Number(json.colCount));
           var colCount = s % Number(json.colCount);
           var isMerge = false;
@@ -237469,7 +237472,7 @@ var TextNode = __webpack_require__(32083);
 // EXTERNAL MODULE: ./src/editor/dom/treeNode/ParagraphNode.ts
 var ParagraphNode = __webpack_require__(40504);
 ;// ./src/components/version.ts
-/* harmony default export */ var version = ('3.1.191');
+/* harmony default export */ var version = ('3.1.192');
 // EXTERNAL MODULE: ./src/components/controls/poperTipText/PoperTipText.vue + 5 modules
 var PoperTipText = __webpack_require__(57221);
 ;// ./src/components/controls/poperTipText/index.ts
@@ -241091,7 +241094,7 @@ var HTMLconverter2 = /*#__PURE__*/function () {
         var _loop = function _loop(s) {
           var _loop2 = function _loop2(_k) {
             var cell = getitem(s, _k);
-            if (!cell) {
+            if (!cell && hoEditorFactory.useFixTableMerge) {
               var isMerge = false;
               rowSpanArr.forEach(function (rowSpanItem) {
                 if (s == rowSpanItem.rowCount && _k == rowSpanItem.colCount) {
@@ -267802,12 +267805,14 @@ var HOEditorFactory = /*#__PURE__*/function () {
     (0,esm_defineProperty/* default */.A)(this, "cleanUpChar", "[]");
     // 需要清理的字符列表 -- 获取xml方法中使用
     (0,esm_defineProperty/* default */.A)(this, "useSignLockTable", true);
+    // 默认启用签名锁定表格功能 --表格--表格行--表格列--单元格
+    (0,esm_defineProperty/* default */.A)(this, "useFixTableMerge", false);
     this._hoEditorFactoryId = id;
   }
   return (0,esm_createClass/* default */.A)(HOEditorFactory, [{
     key: "hoLocalStorage",
     get:
-    // 默认启用签名锁定表格功能 --表格--表格行--表格列--单元格
+    // 启用表格合并单元格问题修复功能
     /**
      * Getter hoLocalStorage
      * @return {HoLocalStorage}