hoeditor-web 3.1.218 → 3.1.220

package/lib/hoeditor.umd.js

@@ -104403,7 +104403,7 @@ const textParams = {
 /***/ (function(__unused_webpack_module, __webpack_exports__) {
 
 "use strict";
-/* harmony default export */ __webpack_exports__.A = ('3.1.218');
+/* harmony default export */ __webpack_exports__.A = ('3.1.220');
 
 /***/ }),
 
@@ -107176,7 +107176,10 @@ class Print {
     let heightPixes = hoEditorFactory.unitConvert.mmConversionPx(hoEditorFactory.pageProperty.heightMm, true);
     let orientation = widthPixes > heightPixes ? 'l' : 'p';
     let formats = [widthPixes, heightPixes];
-    let format = a4Size[orientation];
+    let format = [widthPixes, heightPixes];
+    if (hoEditorFactory.isFixedPrintToA4 == '1') {
+      format = a4Size[orientation];
+    }
     const svg2pdfOptions = {
       x: 0,
       y: 0
@@ -128541,6 +128544,8 @@ class TableFormula extends _ControlNode__WEBPACK_IMPORTED_MODULE_27__/* .Control
 /* harmony import */ var _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_25__ = __webpack_require__(57703);
 /* harmony import */ var _editor_draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_26__ = __webpack_require__(58382);
 /* harmony import */ var _editor_draw_drawNode_DrawPageTable__WEBPACK_IMPORTED_MODULE_27__ = __webpack_require__(87523);
+/* harmony import */ var _TextNode__WEBPACK_IMPORTED_MODULE_28__ = __webpack_require__(32083);
+
 
 
 
@@ -128941,7 +128946,7 @@ class TableNode extends _RectNode__WEBPACK_IMPORTED_MODULE_17__/* .RectNode */ .
    * @param count 插入的行数
    * @param copyIndex 插入时复制行的一些信息
    */
-  insertRows(r, count, copyIndex) {
+  insertRows(r, count, copyIndex, copyColIndex) {
     if (r < 0 || r > this._rowCount || copyIndex < 0 || copyIndex > this._rowCount - 1) {
       throw new Error(`错误的插入位置或者错误的拷贝行`);
     }
@@ -129018,6 +129023,14 @@ class TableNode extends _RectNode__WEBPACK_IMPORTED_MODULE_17__/* .RectNode */ .
             newCell.initBlankDoc();
             newCell.childNodes[0].styleIndex = cell.childNodes[0].styleIndex;
             newCell.childNodes[0].paraNo = cell.childNodes[0].paraNo;
+            if (copyColIndex !== undefined && copyColIndex >= 0 && copyColIndex < this._rowCount && c <= copyColIndex) {
+              const copyCellNode = this._rows[mr][mc];
+              if (copyCellNode) {
+                const newText = copyCellNode.getCellText();
+                const textNode = new _TextNode__WEBPACK_IMPORTED_MODULE_28__/* .TextNode */ .E(this._hoEditorFactoryID, this.rootNodes, newCell, _BaseNode__WEBPACK_IMPORTED_MODULE_15__/* .NodeType */ .Z6.ntText, newText, copyCellNode.childNodes[0].styleIndex);
+                newCell.childNodes.push(textNode);
+              }
+            }
             newCell.drawCell.needUpdate = true;
           } else {
             const bcell = row[c];
@@ -222253,6 +222266,7 @@ const entry_lib_initLanguage = async (lang, languageList) => {
 
 
 
+
 
 
 // import pd from '@/plugins/pretty-data';
@@ -227094,7 +227108,7 @@ class entry_lib_VueController {
         } else if (node instanceof entry_lib_ParagraphNode/* ParagraphNode */.f) {
           docText += '\n';
         } else if (node instanceof entry_lib_SignNode/* SignNode */.u && node.customProperty && node.customProperty.bce03) {
-          docText += node.customProperty.bce03;
+          // docText += node.customProperty.bce03;
         }
       }
     };
@@ -230668,21 +230682,38 @@ class entry_lib_VueController {
   backFillTableData(index, data) {
     const hoEditorFactory = entry_lib_HOEditorFactorys/* HOEditorFactorys */.O.instance().getFactory(this._hoEditorFactoryID);
     let table = null;
-    let i = 0;
-    for (let k = 0; k < hoEditorFactory.docTree.mainNodes.length; k++) {
-      const node = hoEditorFactory.docTree.mainNodes[k];
-      if (node instanceof entry_lib_TableNode/* TableNode */.HA) {
-        i++;
-        if (i === index) {
-          table = node;
-          break;
+    if (index === -1) {
+      const hoEditorFactory = entry_lib_HOEditorFactorys/* HOEditorFactorys */.O.instance().getFactory(this._hoEditorFactoryID);
+      const [isInTable, tableNode] = hoEditorFactory.vueController.getDomRange().inSameTable();
+      table = tableNode;
+    } else {
+      let i = 0;
+      for (let k = 0; k < hoEditorFactory.docTree.mainNodes.length; k++) {
+        const node = hoEditorFactory.docTree.mainNodes[k];
+        if (node instanceof entry_lib_TableNode/* TableNode */.HA) {
+          i++;
+          if (i === index) {
+            table = node;
+            break;
+          }
         }
       }
     }
     if (table) {
       let rowIndex = this.getTableTitleMaxRowIndex(table);
+      const cellInfo = {
+        rowNo: [],
+        colNo: []
+      };
+      table.childNodes.forEach(cell => {
+        if (table && cell && cell instanceof entry_lib_CellNode/* CellNode */.H && cell.cellProperty.notAllowEdit) {
+          cellInfo.rowNo.push(table.rows.indexOf(cell.row));
+          cellInfo.colNo.push(cell.row.indexOf(cell));
+        }
+      });
+      const maxRowNo = Math.max(...cellInfo.rowNo);
       if (rowIndex === -1) {
-        rowIndex = 0;
+        rowIndex = maxRowNo || 0;
       }
       let rowCellNum = 0;
       for (let r = 0; r <= rowIndex; r++) {
@@ -230735,6 +230766,111 @@ class entry_lib_VueController {
       table.update();
     }
   }
+  /**
+   * 回填表格数据
+   * @param index 第几个表格
+   * @param data 回填的数据
+   */
+  backFillTableDataV2(data, direction) {
+    const hoEditorFactory = entry_lib_HOEditorFactorys/* HOEditorFactorys */.O.instance().getFactory(this._hoEditorFactoryID);
+    const [isInTable, tableNode] = hoEditorFactory.vueController.getDomRange().inSameTable();
+    if (data.length == 0) return false;
+    let maxCount = data[0].length; // 一组的最大数 行或者列
+    if (isInTable && tableNode) {
+      const cellInfo = {
+        rowNo: [],
+        colNo: []
+      };
+      tableNode.childNodes.forEach(cell => {
+        if (cell && cell instanceof entry_lib_CellNode/* CellNode */.H && cell.cellProperty.notAllowEdit) {
+          cellInfo.rowNo.push(tableNode.rows.indexOf(cell.row));
+          cellInfo.colNo.push(cell.row.indexOf(cell));
+        }
+      });
+      const maxRowNo = Math.max(...cellInfo.rowNo);
+      const maxColNo = Math.max(...cellInfo.colNo);
+      let hasTextColIndex = 0; // 找出最后一列不能回填的
+      let hasTextRowIndex = 0;
+      if (direction == "L") {
+        // 横向显示 查找标题行或者不可编辑的单元格行
+        let rowIndex = this.getTableTitleMaxRowIndex(tableNode);
+        rowIndex = Math.max(maxRowNo, rowIndex) + 1; // 标题行和包含不可编辑的单元格行对比取出最大的行号当做标题行的结束行
+        for (let r = rowIndex; r < tableNode.rowCount; r++) {
+          for (let c = 0; c < tableNode.colCount; c++) {
+            const cell = tableNode.rows[r][c];
+            if (cell && cell.getCellText()) {
+              hasTextColIndex = c;
+              hasTextRowIndex = r;
+            }
+          }
+        }
+        hasTextRowIndex++;
+        if (hasTextRowIndex != rowIndex) {
+          // 类标题行行号 不等于 有内容行行号时候 差值补空方便从正文行正常回填
+          for (let e = 0; e < hasTextRowIndex - rowIndex; e++) {
+            data.unshift(' '.repeat(maxCount - 1).split(" "));
+            if (e == hasTextRowIndex - rowIndex - 1 && hasTextColIndex > maxCount) {
+              data.unshift(' '.repeat(maxCount - 1).split(" "));
+            }
+          }
+        }
+        // 处理
+        this.backFillTableData(-1, data.flat());
+      } else if (direction == "V") {
+        // 纵向显示 查找不可编辑的单元格列
+        for (let r = 0; r < tableNode.rowCount; r++) {
+          for (let c = maxColNo + 1; c < tableNode.colCount; c++) {
+            const cell = tableNode.rows[r][c];
+            if (cell && cell.getCellText()) {
+              hasTextColIndex = c;
+              hasTextRowIndex = r;
+            }
+          }
+        }
+        hasTextColIndex++;
+        let colIndex = maxColNo + 1; // 包含不可编辑的单元格列当做标题列的结束列 -- 由于不存在标题列属性设置，以不可编辑单元格所在列当作标题列处理
+        if (hasTextColIndex != colIndex) {
+          // 类标题列行号 不等于 有内容列行号时候 差值补空方便从正文行正常回填
+          for (let e = 0; e < hasTextColIndex - colIndex; e++) {
+            data.unshift(' '.repeat(maxCount - 1).split(" "));
+          }
+        }
+        const diffCount = Math.ceil((data.length - (tableNode.colCount - colIndex) * tableNode.rowCount / maxCount) / (tableNode.colCount - colIndex));
+        for (let d = 0; d < diffCount; d++) {
+          for (let k = 0; k < maxCount; k++) {
+            tableNode.insertRows(tableNode.rowCount, 1, k, maxColNo);
+          }
+        }
+        // 判断起始行是否从第几组开始 回填内容多组
+        let startRowIndex = Math.floor(hasTextRowIndex / maxCount) * maxCount;
+        for (let k = 0; k < data.length; k++) {
+          let group = Math.floor(k / (tableNode.colCount - colIndex));
+          for (let y = 0; y < maxCount; y++) {
+            let rowNo = 0;
+            let colNo = 0;
+            rowNo = startRowIndex + group * maxCount + y;
+            colNo = colIndex + k % (tableNode.colCount - colIndex);
+            const newText = data[k][y];
+            if (newText && rowNo < tableNode.rowCount && colNo < tableNode.colCount) {
+              const cell = tableNode.rows[rowNo][colNo];
+              if (cell) {
+                cell.childNodes.splice(1, cell.childNodes.length);
+                const textNode = new entry_lib_TextNode/* TextNode */.E(this._hoEditorFactoryID, tableNode.rootNodes, cell, entry_lib_BaseNode/* NodeType */.Z6.ntText, newText, cell.childNodes[0].styleIndex);
+                cell.drawCell.needUpdate = true;
+                cell.childNodes.push(textNode);
+              }
+            } else {
+              // console.log(rowNo, colNo);
+            }
+          }
+        }
+        tableNode.update();
+      }
+      return true;
+    } else {
+      return false;
+    }
+  }
   clacFormula(cell, formulaStr) {
     const hoEditorFactory = entry_lib_HOEditorFactorys/* HOEditorFactorys */.O.instance().getFactory(this._hoEditorFactoryID);
     let strRet = '';