hoeditor-web 3.1.217 → 3.1.219

package/lib/hoeditor.umd.js

@@ -73480,7 +73480,7 @@ module.exports = function shallowEqual(objA, objB, compare, compareContext) {
 
 /***/ }),
 
-/***/ 84066:
+/***/ 54584:
 /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -73492,7 +73492,7 @@ __webpack_require__.d(__webpack_exports__, {
   "default": function() { return /* binding */ ControlModal; }
 });
 
-;// ./node_modules/babel-loader/lib/index.js??ruleSet[1].rules[3].use[0]!./node_modules/unplugin/dist/webpack/loaders/transform.js?unpluginName=vite-plugin-i18n-helper!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[5]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/ControlModal.vue?vue&type=template&id=94bf3904
+;// ./node_modules/babel-loader/lib/index.js??ruleSet[1].rules[3].use[0]!./node_modules/unplugin/dist/webpack/loaders/transform.js?unpluginName=vite-plugin-i18n-helper!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[5]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/ControlModal.vue?vue&type=template&id=f2268b16
 var render = function render() {
   var _vm = this,
     _c = _vm._self._c;
@@ -73635,6 +73635,7 @@ var HOEditorFactorys = __webpack_require__(57703);
         gestation: 'gestation/Gestation',
         figure: 'figure/HoFigure',
         'edit-ho-figure': 'figure/EditHoFigure',
+        // 'ho-formula': 'hoformula/HoFormula',
         'ho-print': 'hoprint/HoPrint',
         'special-chars': 'specialChars/HoSpecialChars'
       }
@@ -104402,7 +104403,7 @@ const textParams = {
 /***/ (function(__unused_webpack_module, __webpack_exports__) {
 
 "use strict";
-/* harmony default export */ __webpack_exports__.A = ('3.1.217');
+/* harmony default export */ __webpack_exports__.A = ('3.1.219');
 
 /***/ }),
 
@@ -128540,6 +128541,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);
+
 
 
 
@@ -128940,7 +128943,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(`错误的插入位置或者错误的拷贝行`);
     }
@@ -129017,6 +129020,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];
@@ -130301,15 +130312,21 @@ class TableNode extends _RectNode__WEBPACK_IMPORTED_MODULE_17__/* .RectNode */ .
     const cellNodes = transArr(json); //table.childNodes.childNodes
     const existMap = new Map();
     const rowsMap = new Map();
-    const colSpanArr = new Array();
-    const rowSpanArr = new Array();
+    let colSpanArr = new Array();
+    let rowSpanArr = new Array();
+    // console.clear();
     for (let i = 0; i < cellNodes.length; i++) {
       const node = cellNodes[i];
       let rowNo = parseInt(node.rowNo);
-      //   if(isNaN(rowNo)) {
-      //     rowNo = Math.floor(i / Number(json.colCount));
-      //   }
       const aRow = new Array();
+      if (node && hoEditorFactory.useFixTableMerge) {
+        if (node.rowSpan && Number(node.rowSpan) + Number(node.rowNo) - 1 > tableNode._rowCount) {
+          node.rowSpan = tableNode._rowCount - Number(node.rowNo) - 1;
+        }
+        if (node.colSpan && Number(node.colSpan) + Number(node.colNo) - 1 > tableNode._colCount) {
+          node.colSpan = tableNode._colCount - Number(node.colNo) - 1;
+        }
+      }
       const nodeRowSpan = node.rowSpan ? parseInt(node.rowSpan) : 1;
       const nodeColSpan = node.colSpan ? parseInt(node.colSpan) : 1;
       if (nodeRowSpan > 1 && nodeColSpan > 1) {
@@ -130342,7 +130359,6 @@ class TableNode extends _RectNode__WEBPACK_IMPORTED_MODULE_17__/* .RectNode */ .
       rowsMap.set(rowNo, aRow);
     }
     rowsMap.delete(NaN);
-    //const defaultCellProperty = json.childNodes.defaultCellProperty;
     let aRow;
     let emptyCellNode = {
       nodeType: "ntCell",
@@ -130363,13 +130379,13 @@ class TableNode extends _RectNode__WEBPACK_IMPORTED_MODULE_17__/* .RectNode */ .
         const rowCount = Math.floor(s / Number(json.colCount));
         const colCount = s % Number(json.colCount);
         let isMerge = false;
-        rowSpanArr.forEach(rowSpanItem => {
-          if (rowCount == rowSpanItem.rowCount && colCount == rowSpanItem.colCount) {
+        rowSpanArr.forEach(item => {
+          if (rowCount == item.rowCount && colCount == item.colCount) {
             isMerge = true;
           }
         });
-        colSpanArr.forEach(colSpanItem => {
-          if (rowCount == colSpanItem.rowCount && colCount == colSpanItem.colCount) {
+        colSpanArr.forEach(item => {
+          if (rowCount == item.rowCount && colCount == item.colCount) {
             isMerge = true;
           }
         });
@@ -134163,26 +134179,7 @@ class TextInputFieldNode extends BaseCombineNode/* BaseCombineNode */.h {
       // await hoEditorFactory.docController.insertPlainTextAfterPath(startPath, text, oldValue);
     }
     if (/[\u0F00-\u0FFF]/.test(textStr)) {
-      const nodes = [];
-      const analysisText = (0,common/* analyzeTibetanText */.P)(textStr);
-      let curStyleIndex = hoEditorFactory.docTree.curStyleIndex;
-      let curTextStyle = hoEditorFactory.docTree.styles[curStyleIndex];
-      analysisText.forEach(item => {
-        if (item.iszw) {
-          let styleIndex = curStyleIndex;
-          let style = curTextStyle;
-          if (curTextStyle.combineStyle.font != "himalaya") {
-            styleIndex = curTextStyle.changeStyleString('fontFormat', "himalaya");
-            style = hoEditorFactory.docTree.styles[styleIndex];
-          }
-          const styleindex = hoEditorFactory.docTree.styleCompare(style);
-          const textNode = new TextNode/* TextNode */.E(this._hoEditorFactoryID, hoEditorFactory.docTree.mainNodes, null, BaseNode/* NodeType */.Z6.ntText, item.text, styleindex, undefined, item.combination);
-          nodes.push(textNode);
-        } else {
-          const textNode = new TextNode/* TextNode */.E(this._hoEditorFactoryID, hoEditorFactory.docTree.mainNodes, null, BaseNode/* NodeType */.Z6.ntText, item.text, curStyleIndex, undefined, item.combination);
-          nodes.push(textNode);
-        }
-      });
+      const nodes = this.formatZwNode(textStr);
       hoEditorFactory.docController.parseNodeData(nodes);
     } else {
       await hoEditorFactory.docController.insertPlainTextAfterPath(startPath, textStr, oldValue, isTrace);
@@ -134194,29 +134191,30 @@ class TextInputFieldNode extends BaseCombineNode/* BaseCombineNode */.h {
     //this._canModifyContent = await oldValue;
     //this.update(0);
   }
-  // public dataVerify(): string {
-  //   let errMsg = "";
-  //   const customProperty = this.customProperty as any;
-  //   if (customProperty.dataVerify) {
-  //     if (customProperty.dataVerify.format) {
-  //     }
-  //     if (customProperty.dataVerify.maxValue || customProperty.dataVerify.minValue) {
-  //       if (!isNumber(this.text)) {
-  //         errMsg = "元素(" + this.name + ")值不符合规则，请检查并纠正!";
-  //       } else {
-  //         if (customProperty.dataVerify.maxValue) {
-  //           if (Number(this.text) > Number(customProperty.dataVerify.maxValue)) {
-  //             errMsg = "元素(" + this.name + ")值超出最大允许值" + customProperty.dataVerify.maxValue + "，请检查并纠正!";
-  //           }
-  //         }
-  //         if (Number(this.text) < Number(customProperty.dataVerify.maxValue)) {
-  //           errMsg = "元素(" + this.name + ")值低于最小允许值" + customProperty.dataVerify.maxValue + "，请检查并纠正!";
-  //         }
-  //       }
-  //     }
-  //   }
-  //   return errMsg;
-  // }
+  formatZwNode(textStr, rootNodes, pNode) {
+    const hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.O.instance().getFactory(this._hoEditorFactoryID);
+    const nodes = [];
+    const formatZwText = (0,common/* formatZwTextNode */.u)(textStr);
+    let curStyleIndex = hoEditorFactory.docTree.curStyleIndex;
+    let curTextStyle = hoEditorFactory.docTree.styles[curStyleIndex];
+    formatZwText.forEach(item => {
+      if (item.iszw) {
+        let styleIndex = curStyleIndex;
+        let style = curTextStyle;
+        if (curTextStyle.combineStyle.font != "himalaya") {
+          styleIndex = curTextStyle.changeStyleString('fontFormat', "himalaya");
+          style = hoEditorFactory.docTree.styles[styleIndex];
+        }
+        const styleindex = hoEditorFactory.docTree.styleCompare(style);
+        const textNode = new TextNode/* TextNode */.E(this._hoEditorFactoryID, rootNodes ? rootNodes : hoEditorFactory.docTree.mainNodes, pNode ? pNode : null, BaseNode/* NodeType */.Z6.ntText, item.text, styleindex, undefined, item.combination);
+        nodes.push(textNode);
+      } else {
+        const textNode = new TextNode/* TextNode */.E(this._hoEditorFactoryID, rootNodes ? rootNodes : hoEditorFactory.docTree.mainNodes, pNode ? pNode : null, BaseNode/* NodeType */.Z6.ntText, item.text, curStyleIndex, undefined, item.combination);
+        nodes.push(textNode);
+      }
+    });
+    return nodes;
+  }
   /**
    *
    * @param drawTree 绘制树
@@ -134962,8 +134960,13 @@ class TextInputFieldNode extends BaseCombineNode/* BaseCombineNode */.h {
               }
               for (let i = 0; i < lineArr.length; i++) {
                 const lineText = lineArr[i];
-                const textNode = new TextNode/* TextNode */.E(hoEditorFactoryID, rootNodes, temp, BaseNode/* NodeType */.Z6.ntText, lineText, styleIndex);
-                temp.childNodes.splice(temp.childNodes.length - 1, 0, textNode);
+                if (/[\u0F00-\u0FFF]/.test(lineText)) {
+                  const textNodes = temp.formatZwNode(lineText, rootNodes, temp);
+                  temp.childNodes.splice(temp.childNodes.length - 1, 0, ...textNodes);
+                } else {
+                  const textNode = new TextNode/* TextNode */.E(hoEditorFactoryID, rootNodes, temp, BaseNode/* NodeType */.Z6.ntText, lineText, styleIndex);
+                  temp.childNodes.splice(temp.childNodes.length - 1, 0, textNode);
+                }
                 if (i < lineArr.length - 1) {
                   const paraNode = new ParagraphNode/* ParagraphNode */.f(hoEditorFactoryID, rootNodes, temp, 0);
                   paraNode.styleIndex = styleIndex;
@@ -135076,8 +135079,15 @@ class TextInputFieldNode extends BaseCombineNode/* BaseCombineNode */.h {
                       const rareCharNode = new RareCharNode/* RareCharNode */.P(temp.hoEditorFactoryID, rootNodes, temp, BaseNode/* NodeType */.Z6.ntRareChar, textArr[0], styleIndex);
                       temp.childNodes.splice(temp.childNodes.length - 1, 0, rareCharNode);
                     } else {
-                      const textNode1 = new TextNode/* TextNode */.E(hoEditorFactoryID, rootNodes, temp, BaseNode/* NodeType */.Z6.ntText, textArr[0], styleIndex);
-                      temp.childNodes.splice(temp.childNodes.length - 1, 0, textNode1);
+                      if (/[\u0F00-\u0FFF]/.test(textArr[0])) {
+                        const textNodes = temp.formatZwNode(textArr[0], rootNodes, temp);
+                        temp.childNodes.splice(temp.childNodes.length - 1, 0, ...textNodes);
+                      } else {
+                        const textNode1 = new TextNode/* TextNode */.E(hoEditorFactoryID, rootNodes, temp, BaseNode/* NodeType */.Z6.ntText, textArr[0], styleIndex);
+                        temp.childNodes.splice(temp.childNodes.length - 1, 0, textNode1);
+                      }
+                      // const textNode1 = new TextNode(hoEditorFactoryID, rootNodes, temp, NodeType.ntText, textArr[0], styleIndex);
+                      // temp.childNodes.splice(temp.childNodes.length - 1, 0, textNode1);
                     }
                   }
                 }
@@ -135104,8 +135114,15 @@ class TextInputFieldNode extends BaseCombineNode/* BaseCombineNode */.h {
                           }
                         }
                       } else {
-                        const textNode = new TextNode/* TextNode */.E(hoEditorFactoryID, rootNodes, temp, BaseNode/* NodeType */.Z6.ntText, textArr[i], styleIndex);
-                        temp.childNodes.splice(temp.childNodes.length - 1, 0, textNode);
+                        if (/[\u0F00-\u0FFF]/.test(textArr[i])) {
+                          const textNodes = temp.formatZwNode(textArr[i], rootNodes, temp);
+                          temp.childNodes.splice(temp.childNodes.length - 1, 0, ...textNodes);
+                        } else {
+                          const textNode = new TextNode/* TextNode */.E(hoEditorFactoryID, rootNodes, temp, BaseNode/* NodeType */.Z6.ntText, textArr[i], styleIndex);
+                          temp.childNodes.splice(temp.childNodes.length - 1, 0, textNode);
+                        }
+                        // const textNode = new TextNode(hoEditorFactoryID, rootNodes, temp, NodeType.ntText, textArr[i], styleIndex);
+                        // temp.childNodes.splice(temp.childNodes.length - 1, 0, textNode);
                       }
                     }
                   }
@@ -144513,8 +144530,13 @@ class DrawTable extends _DrawRect__WEBPACK_IMPORTED_MODULE_10__/* .DrawRect */ .
   updateRowHeight(r) {
     let dHeight = _editor_dom_treeNode_TableNode__WEBPACK_IMPORTED_MODULE_6__/* .gDefaultRowHeight */ .ip;
     let bottonAlignCell = new Array();
-    const rowPorpertyHeight = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_7__/* .HOEditorFactorys */ .O.instance().getFactory(this._hoEditorFactoryID).unitConvert.mmConversionPx(this._table.rowInfos[r].rowProperty.rowHeight * 10, false);
-    if (this._table.rowInfos[r].rowProperty.isSpecifyHeight) {
+    const hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_7__/* .HOEditorFactorys */ .O.instance().getFactory(this._hoEditorFactoryID);
+    const row = this._table.rowInfos[r];
+    if (!row) {
+      return dHeight;
+    }
+    const rowPorpertyHeight = hoEditorFactory.unitConvert.mmConversionPx(row.rowProperty.rowHeight * 10, false);
+    if (row && row.rowProperty.isSpecifyHeight) {
       dHeight = rowPorpertyHeight;
     }
     for (let c = 0; c < this._table.colCount; c++) {
@@ -144537,7 +144559,7 @@ class DrawTable extends _DrawRect__WEBPACK_IMPORTED_MODULE_10__/* .DrawRect */ .
         }
       }
     }
-    if (dHeight !== this._table.rowInfos[r].rowHeight) {
+    if (dHeight !== row.rowHeight) {
       if (this._table.rowInfos[r].rowProperty.isSpecifyHeight) {
         if (dHeight > rowPorpertyHeight) {
           this._table.rowInfos[r].rowHeight = rowPorpertyHeight;
@@ -148963,8 +148985,8 @@ class DrawTree {
       aCell.drawCell.updateHeight();
       const [r, c] = aCell.table.getCellInfos(aCell);
       if (r >= 0) {
-        const rowPorperty = aCell.table.rowInfos[r + aCell.rowSpan - 1].rowProperty;
-        if (rowPorperty.rowHeight > 0 && rowPorperty.isLockRowHeight) {
+        const row = aCell.table.rowInfos[r + aCell.rowSpan - 1];
+        if (row && row.rowProperty.rowHeight > 0 && row.rowProperty.isLockRowHeight) {
           canChangeHeight = false;
         }
       }
@@ -156042,23 +156064,28 @@ class NodeConvert {
           const paraNode = new _dom_treeNode_ParagraphNode__WEBPACK_IMPORTED_MODULE_13__/* .ParagraphNode */ .f(this._hoEditorFactoryID, hoEditorFactory.docTree.mainNodes, null, hoEditorFactory.docTree.curParaNo);
           nodes.push(paraNode);
         }
-        const analysisText = (0,_common__WEBPACK_IMPORTED_MODULE_25__/* .analyzeTibetanText */ .P)(uidArr[i]);
-        analysisText.forEach(item => {
-          if (item.iszw) {
-            let styleIndex = 0;
-            let style = hoEditorFactory.docTree.styles[styleIndex];
-            if (style.combineStyle.font != "himalaya") {
-              styleIndex = style.changeStyleString('fontFormat', "himalaya");
-              style = hoEditorFactory.docTree.styles[styleIndex];
-            }
-            const styleindex = hoEditorFactory.docTree.styleCompare(style);
-            const textNode = new _dom_treeNode_TextNode__WEBPACK_IMPORTED_MODULE_14__/* .TextNode */ .E(this._hoEditorFactoryID, hoEditorFactory.docTree.mainNodes, null, _dom_treeNode_BaseNode__WEBPACK_IMPORTED_MODULE_12__/* .NodeType */ .Z6.ntText, item.text, styleindex, undefined, item.combination);
-            nodes.push(textNode);
-          } else {
-            const textNode = new _dom_treeNode_TextNode__WEBPACK_IMPORTED_MODULE_14__/* .TextNode */ .E(this._hoEditorFactoryID, hoEditorFactory.docTree.mainNodes, null, _dom_treeNode_BaseNode__WEBPACK_IMPORTED_MODULE_12__/* .NodeType */ .Z6.ntText, item.text, 0);
-            nodes.push(textNode);
-          }
-        });
+        if (/[\u0F00-\u0FFF]/.test(uidArr[i])) {
+          const formatZwText = (0,_common__WEBPACK_IMPORTED_MODULE_25__/* .formatZwTextNode */ .u)(uidArr[i]);
+          formatZwText.forEach(item => {
+            if (item.iszw) {
+              let styleIndex = 0;
+              let style = hoEditorFactory.docTree.styles[styleIndex];
+              if (style.combineStyle.font != "himalaya") {
+                styleIndex = style.changeStyleString('fontFormat', "himalaya");
+                style = hoEditorFactory.docTree.styles[styleIndex];
+              }
+              const styleindex = hoEditorFactory.docTree.styleCompare(style);
+              const textNode = new _dom_treeNode_TextNode__WEBPACK_IMPORTED_MODULE_14__/* .TextNode */ .E(this._hoEditorFactoryID, hoEditorFactory.docTree.mainNodes, null, _dom_treeNode_BaseNode__WEBPACK_IMPORTED_MODULE_12__/* .NodeType */ .Z6.ntText, item.text, styleindex, undefined, item.combination);
+              nodes.push(textNode);
+            } else {
+              const textNode = new _dom_treeNode_TextNode__WEBPACK_IMPORTED_MODULE_14__/* .TextNode */ .E(this._hoEditorFactoryID, hoEditorFactory.docTree.mainNodes, null, _dom_treeNode_BaseNode__WEBPACK_IMPORTED_MODULE_12__/* .NodeType */ .Z6.ntText, item.text, 0);
+              nodes.push(textNode);
+            }
+          });
+        } else {
+          const textNode = new _dom_treeNode_TextNode__WEBPACK_IMPORTED_MODULE_14__/* .TextNode */ .E(this._hoEditorFactoryID, hoEditorFactory.docTree.mainNodes, null, _dom_treeNode_BaseNode__WEBPACK_IMPORTED_MODULE_12__/* .NodeType */ .Z6.ntText, uidArr[i], 0);
+          nodes.push(textNode);
+        }
       }
     }
     return nodes;
@@ -156637,8 +156664,8 @@ class UnitConvert {
 
 "use strict";
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
-/* harmony export */   P: function() { return /* binding */ analyzeTibetanText; },
-/* harmony export */   q: function() { return /* binding */ appendPrevTextResult; }
+/* harmony export */   q: function() { return /* binding */ appendPrevTextResult; },
+/* harmony export */   u: function() { return /* binding */ formatZwTextNode; }
 /* harmony export */ });
 /* harmony import */ var core_js_modules_es_array_push_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(44114);
 /* harmony import */ var core_js_modules_es_array_push_js__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_push_js__WEBPACK_IMPORTED_MODULE_0__);
@@ -156680,7 +156707,7 @@ const appendPrevTextResult = (prevText, prevCombination, nextText) => {
  * @param text 要分析的字符串
  * @returns 包含分类结果的对象
  */
-const analyzeTibetanText = text => {
+const formatZwTextNode = text => {
   const chars = Array.from(text);
   const result = [];
   let prev = true;
@@ -158362,7 +158389,7 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
 /***/ (function(module, __unused_webpack_exports, __webpack_require__) {
 
 var map = {
-	"./ControlModal.vue": 84066,
+	"./ControlModal.vue": 54584,
 	"./barCode/BarCodes.vue": 41685,
 	"./colorPicker/HoColorPicker.vue": 53071,
 	"./colorPicker/HoColorPickers.vue": 2637,
@@ -217329,8 +217356,8 @@ class entry_lib_HTMLconverter2 {
       const node = this.generateTextNode(text, styleobj);
       if (!combination && /[\u0F00-\u0FFF]/.test(text)) {
         // 阿萨德发生ཅྕཻཅ༢༣ཻཆཻའཻasdfasdf12312
-        const analysisText = (0,entry_lib_common/* analyzeTibetanText */.P)(text);
-        const nodes = this.generateTextNodeList(analysisText, styleobj);
+        const formatZwText = (0,entry_lib_common/* formatZwTextNode */.u)(text);
+        const nodes = this.generateTextNodeList(formatZwText, styleobj);
         return nodes;
       } else if (combination && ctext && node) {
         node.combination = combination.split(",");
@@ -222236,6 +222263,7 @@ const entry_lib_initLanguage = async (lang, languageList) => {
 
 
 
+
 
 
 // import pd from '@/plugins/pretty-data';
@@ -224816,8 +224844,8 @@ class entry_lib_VueController {
         const lines = text.split('\n');
         for (let i = 0; i < lines.length; i++) {
           if (lines[i] != '') {
-            const analysisText = (0,entry_lib_common/* analyzeTibetanText */.P)(lines[i]);
-            analysisText.forEach(item => {
+            const formatZwText = (0,entry_lib_common/* formatZwTextNode */.u)(lines[i]);
+            formatZwText.forEach(item => {
               if (item.iszw) {
                 let styleIndex = curStyleIndex;
                 let style = curTextStyle;
@@ -227601,6 +227629,114 @@ class entry_lib_VueController {
       console.warn('未找到对应的元素');
     }
   }
+  async updateEelementTextByInnercode(innerIdentifier, text) {
+    const nodes = this.getNodesByInnercode('all', true, innerIdentifier);
+    await this.updateElementTextXml(nodes, text);
+  }
+  //元素替换
+  async updateElementTextXml(nodes, text) {
+    const hoEditorFactory = entry_lib_HOEditorFactorys/* HOEditorFactorys */.O.instance().getFactory(this._hoEditorFactoryID);
+    const xml = hoEditorFactory.structureConvert.replaceNodesName(text);
+    const x2js = new (entry_lib_x2js_default())({
+      stripWhitespaces: false
+    });
+    if (nodes.length > 0) {
+      for (let i = nodes.length - 1; i >= 0; i--) {
+        const node = nodes[i];
+        if (node) {
+          if (node instanceof entry_lib_DateTimeNode/* DateTimeNode */.Y || node instanceof entry_lib_DownListNode/* DownListNode */.dS || node instanceof entry_lib_TextInputFieldNode/* TextInputFieldNode */.IM) {
+            if (node.notReplaceElement) {
+              continue;
+            }
+            if (node instanceof entry_lib_TextInputFieldNode/* TextInputFieldNode */.IM) {
+              if (text.includes("<TextInputFieldNode>")) {
+                const json = x2js.xml2js(xml);
+                const childNodes = new Array();
+                const getChildNodes = item => {
+                  if (Array.isArray(item)) {
+                    //数组
+                    for (let i = 1; i < item.length - 1; i++) {
+                      const anode = hoEditorFactory.structureConvert.convertNode(item[i], node.rootNodes, node);
+                      if (anode) {
+                        if (anode instanceof entry_lib_TextNode/* TextNode */.E) {
+                          if (anode.text.length > [...anode.text].length) {
+                            //特殊处理生僻字
+                            const rareCharNode = new entry_lib_RareCharNode/* RareCharNode */.P(node.hoEditorFactoryID, anode.rootNodes, node, entry_lib_BaseNode/* NodeType */.Z6.ntRareChar, anode.text, anode.styleIndex);
+                            childNodes.push(rareCharNode);
+                          } else {
+                            if (anode.text !== '' && anode.text !== '‌‌' && anode.text !== '‌‌‌‌' && anode.text !== '‌‌‌‌‌' && anode.text !== '‌‌‌' && anode.text !== '‌') {
+                              childNodes.push(anode);
+                            }
+                          }
+                        } else {
+                          childNodes.push(anode);
+                        }
+                      }
+                    }
+                  } else {
+                    //单个对象
+                    const bnode = hoEditorFactory.structureConvert.convertNode(item, node.rootNodes, node);
+                    if (bnode) {
+                      if (bnode instanceof entry_lib_TextNode/* TextNode */.E) {
+                        if (bnode.text.length > [...bnode.text].length) {
+                          //特殊处理生僻字
+                          const rareCharNode = new entry_lib_RareCharNode/* RareCharNode */.P(node.hoEditorFactoryID, bnode.rootNodes, node, entry_lib_BaseNode/* NodeType */.Z6.ntRareChar, bnode.text, bnode.styleIndex);
+                          childNodes.push(rareCharNode);
+                        } else {
+                          if (bnode.text !== '' && bnode.text !== '‌‌' && bnode.text !== '‌‌‌‌' && bnode.text !== '‌‌‌‌‌' && bnode.text !== '‌‌‌' && bnode.text !== '‌') {
+                            childNodes.push(bnode);
+                          }
+                        }
+                      } else {
+                        childNodes.push(bnode);
+                      }
+                    }
+                  }
+                };
+                getChildNodes(json.node.childNodes.node);
+                const spath = node.StartMarkNode.getNodePath();
+                const epath = node.EndMarkNode.getNodePath();
+                const range = new entry_lib_DomRange/* DomRange */.g(this._hoEditorFactoryID, spath, epath);
+                hoEditorFactory.docController.deleteRange(range, true, "update");
+                node.childNodes.splice(1, 0, ...childNodes);
+                node.update(0);
+              } else {
+                if (text.includes("<MedicalExpress>")) {
+                  node.childNodes.splice(1, node.childNodes.length - 2);
+                  const nodes = this.text2MedicalExpress(text, node.StartMarkNode, node.StartMarkNode.styleIndex);
+                  for (let k = 0; k < nodes.length; k++) {
+                    node.childNodes.splice(1 + k, 0, nodes[k]);
+                  }
+                  node.update(0);
+                  return;
+                } else {
+                  await node.setFieldText(text);
+                }
+              }
+            } else if (node instanceof entry_lib_DateTimeNode/* DateTimeNode */.Y) {
+              if (text.includes("<DateTimeNode>")) {
+                const json = x2js.xml2js(xml);
+                text = json.node.text;
+              }
+              await node.setDateTimeText(text);
+            } else if (node instanceof entry_lib_DownListNode/* DownListNode */.dS) {
+              if (text.includes("<DownListNode>")) {
+                const json = x2js.xml2js(xml);
+                text = json.node.text;
+              }
+              await node.setDownListText(text);
+            }
+          } else {
+            console.warn(`非文本域和日期元素`);
+          }
+        } else {
+          console.warn('未找到对应的元素');
+        }
+      }
+    } else {
+      console.warn('未找到对应的元素');
+    }
+  }
   updateFirstPageHeader() {
     const hoEditorFactory = entry_lib_HOEditorFactorys/* HOEditorFactorys */.O.instance().getFactory(this._hoEditorFactoryID);
     const area = hoEditorFactory.drawPageTree.drawHeaders[0];
@@ -230543,21 +230679,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++) {
@@ -230610,6 +230763,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 = '';
@@ -242179,7 +242437,7 @@ var entry_lib_HoFooter_component = (0,entry_lib_componentNormalizer/* default */
 
 /* harmony default export */ var entry_lib_HoFooter = (entry_lib_HoFooter_component.exports);
 // EXTERNAL MODULE: ./src/components/controls/ControlModal.vue + 3 modules
-var entry_lib_ControlModal = __webpack_require__(84066);
+var entry_lib_ControlModal = __webpack_require__(54584);
 // EXTERNAL MODULE: ./src/components/controls/findReplace/FindReplace.vue + 6 modules
 var entry_lib_FindReplace = __webpack_require__(12004);
 ;// ./src/components/controls/findReplace/index.ts
@@ -245977,9 +246235,9 @@ var entry_lib_ToolBarChild_component = (0,entry_lib_componentNormalizer/* defaul
 )
 
 /* harmony default export */ var entry_lib_ToolBarChild = (entry_lib_ToolBarChild_component.exports);
-;// ./node_modules/babel-loader/lib/index.js??ruleSet[1].rules[3].use[0]!./node_modules/unplugin/dist/webpack/loaders/transform.js?unpluginName=vite-plugin-i18n-helper!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[5]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/toolbar/insert/ToolControl.vue?vue&type=template&id=0739e56c
+;// ./node_modules/babel-loader/lib/index.js??ruleSet[1].rules[3].use[0]!./node_modules/unplugin/dist/webpack/loaders/transform.js?unpluginName=vite-plugin-i18n-helper!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[5]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/toolbar/insert/ToolControl.vue?vue&type=template&id=20b75142
 
-var entry_lib_ToolControlvue_type_template_id_0739e56c_render = function render() {
+var entry_lib_ToolControlvue_type_template_id_20b75142_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -246320,9 +246578,9 @@ var entry_lib_ToolControlvue_type_template_id_0739e56c_render = function render(
     }
   }, [_c('span', [_vm._v(/*#__PURE__*/(0,entry_lib_i18n/* i18nHelper */.p)("04-001-009-EMR.3.3.324", null, "特殊字符"))])]) : _vm._e()], 2);
 };
-var entry_lib_ToolControlvue_type_template_id_0739e56c_staticRenderFns = [];
+var entry_lib_ToolControlvue_type_template_id_20b75142_staticRenderFns = [];
 
-;// ./src/components/toolbar/insert/ToolControl.vue?vue&type=template&id=0739e56c
+;// ./src/components/toolbar/insert/ToolControl.vue?vue&type=template&id=20b75142
 
 ;// ./node_modules/babel-loader/lib/index.js??ruleSet[1].rules[3].use[0]!./node_modules/unplugin/dist/webpack/loaders/transform.js?unpluginName=vite-plugin-i18n-helper!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[5]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/toolbar/insert/HoDateTime.vue?vue&type=template&id=6b089050
 
@@ -246624,6 +246882,8 @@ var entry_lib_ajax = __webpack_require__(46887);
 
 
 
+// import { $HoFormula } from '@/components/common/hoformula';
+
 /* harmony default export */ var entry_lib_ToolControlvue_type_script_lang_js = ({
   name: 'ToolControl',
   components: {
@@ -246776,8 +247036,8 @@ var entry_lib_ajax = __webpack_require__(46887);
 ;
 var entry_lib_ToolControl_component = (0,entry_lib_componentNormalizer/* default */.A)(
   entry_lib_insert_ToolControlvue_type_script_lang_js,
-  entry_lib_ToolControlvue_type_template_id_0739e56c_render,
-  entry_lib_ToolControlvue_type_template_id_0739e56c_staticRenderFns,
+  entry_lib_ToolControlvue_type_template_id_20b75142_render,
+  entry_lib_ToolControlvue_type_template_id_20b75142_staticRenderFns,
   false,
   null,
   null,