hoeditor-web 2.0.51-rc.1 → 2.0.53

package/lib/hoeditor.common.js

@@ -13440,12 +13440,12 @@ var DocController = /*#__PURE__*/function () {
 
   }, {
     key: "insertNodeByPath",
-    value: function insertNodeByPath(path, node) {
+    value: function insertNodeByPath(path, node, isResetFieldText) {
       var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_77__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
       var curRange = hoEditorFactory.docTree.curDomRange.normalize();
       var parentNode = node.parentNode;
 
-      if (parentNode instanceof _treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_46__/* .TextInputFieldNode */ .re && parentNode.inputFieldType == 1) {
+      if (node instanceof _treeNode_TextNode__WEBPACK_IMPORTED_MODULE_27__/* .TextNode */ .R && parentNode instanceof _treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_46__/* .TextInputFieldNode */ .re && parentNode.inputFieldType == 1 && isResetFieldText) {
         var firstPath = parentNode.StartMarkNode.getNodePath();
         var lastPath = hoEditorFactory.docTree.getNodeLastPath(parentNode.EndMarkNode.previousLeaf());
         curRange = new _DomRange__WEBPACK_IMPORTED_MODULE_31__/* .DomRange */ .a(this._hoEditorFactoryID, firstPath, lastPath);
@@ -13629,7 +13629,7 @@ var DocController = /*#__PURE__*/function () {
                   } else {
                     var _textNode = new _treeNode_TextNode__WEBPACK_IMPORTED_MODULE_27__/* .TextNode */ .R(_this._hoEditorFactoryID, roots, pNode, _treeNode_BaseNode__WEBPACK_IMPORTED_MODULE_24__/* .NodeType.ntText */ .Jq.ntText, aText, hoEditorFactory.docTree.curStyleIndex);
 
-                    strPath = _this.insertNodeByPath(strPath, _textNode);
+                    strPath = _this.insertNodeByPath(strPath, _textNode, oldCanModifyContent == undefined ? false : true);
                   }
                 } else {
                   var styleIndex = hoEditorFactory.docTree.curStyleIndex;
@@ -13640,7 +13640,7 @@ var DocController = /*#__PURE__*/function () {
 
                   var _textNode2 = new _treeNode_TextNode__WEBPACK_IMPORTED_MODULE_27__/* .TextNode */ .R(_this._hoEditorFactoryID, roots, pNode, _treeNode_BaseNode__WEBPACK_IMPORTED_MODULE_24__/* .NodeType.ntText */ .Jq.ntText, aText, styleIndex);
 
-                  strPath = _this.insertNodeByPath(strPath, _textNode2);
+                  strPath = _this.insertNodeByPath(strPath, _textNode2, oldCanModifyContent == undefined ? false : true);
                 } // if (index === arrSubString.length - 1 && isEndLine && oldCanModifyContent !== undefined && pNode instanceof TextInputFieldNode) {
                 //   pNode.canModifyContent = oldCanModifyContent;
                 //   pNode.update();
@@ -14727,8 +14727,11 @@ var DocController = /*#__PURE__*/function () {
             node.update();
 
             if (node.parentNode instanceof _treeNode_CellNode__WEBPACK_IMPORTED_MODULE_57__/* .CellNode */ .D) {
-              node.parentNode.drawCell.needUpdate = true;
-              node.parentNode.table.update();
+              node.parentNode.drawCell.needUpdate = true; //增加判断只有多页表格才更新table.update,以处理编辑元素 卡慢问题
+
+              if (node.parentNode.drawCell.drawPageCells.length > 1) {
+                node.parentNode.table.update();
+              }
             }
 
             return "";
@@ -49203,6 +49206,11 @@ var DrawPageTable = /*#__PURE__*/function (_DrawRect) {
     value: function paint(dTop, dParent, restHeight) {
       var totalHeight = 0;
       var aTop = dTop;
+
+      if (this.table.tableProperty.fixedOnePage) {
+        restHeight = Infinity;
+      }
+
       var pageRestHeight = restHeight;
       var bStartRowFinished = true;
 
@@ -49696,21 +49704,6 @@ var DrawPageTable = /*#__PURE__*/function (_DrawRect) {
       var row = -1;
       var col = -1;
 
-      for (var r = this._startRow; r <= this._endRow; r++) {
-        var _this$_partRowHeights;
-
-        var rowHeight = (_this$_partRowHeights = this._partRowHeights.get(r)) === null || _this$_partRowHeights === void 0 ? void 0 : _this$_partRowHeights.rowHeight;
-
-        if (rowHeight) {
-          if (y >= top && y <= top + rowHeight) {
-            row = r;
-            break;
-          }
-
-          top += rowHeight;
-        }
-      }
-
       for (var c = 0; c < this._table.colCount; c++) {
         var colWidth = this._table.colInfos[c].colWidth;
 
@@ -49726,12 +49719,49 @@ var DrawPageTable = /*#__PURE__*/function (_DrawRect) {
         left += colWidth;
       }
 
+      var r = this._startRow;
+
+      while (r <= this._endRow) {
+        var _this$_partRowHeights;
+
+        //for (let r = this._startRow; r <= this._endRow; r++) {
+        var rowHeight = (_this$_partRowHeights = this._partRowHeights.get(r)) === null || _this$_partRowHeights === void 0 ? void 0 : _this$_partRowHeights.rowHeight;
+        var aHeight = rowHeight;
+        var rowSpan = 1;
+
+        if (this._table.tableProperty.isAutoChangeLine) {
+          var _this$_table$getMainC15 = this._table.getMainCell(r, col),
+              _this$_table$getMainC16 = (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z)(_this$_table$getMainC15, 3),
+              mainCell = _this$_table$getMainC16[0],
+              mr = _this$_table$getMainC16[1],
+              mc = _this$_table$getMainC16[2];
+
+          var partCell = mainCell.drawCell.getDrawPageCell(this);
+
+          if (partCell && aHeight) {
+            rowHeight = Math.max(aHeight, partCell.docHeight);
+          }
+        } //this._partRowHeights.get(r)?.rowHeight
+
+
+        if (aHeight && rowHeight) {
+          if (y >= top && y <= top + rowHeight) {
+            row = r;
+            break;
+          }
+
+          top += aHeight;
+        }
+
+        r += rowSpan;
+      }
+
       if (row >= 0 && col >= 0) {
-        var _this$_table$getMainC15 = this._table.getMainCell(row, col),
-            _this$_table$getMainC16 = (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z)(_this$_table$getMainC15, 3),
-            cell = _this$_table$getMainC16[0],
-            mr = _this$_table$getMainC16[1],
-            mc = _this$_table$getMainC16[2];
+        var _this$_table$getMainC17 = this._table.getMainCell(row, col),
+            _this$_table$getMainC18 = (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z)(_this$_table$getMainC17, 3),
+            cell = _this$_table$getMainC18[0],
+            _mr2 = _this$_table$getMainC18[1],
+            _mc2 = _this$_table$getMainC18[2];
 
         var ret = cell.drawCell.getDrawPageCell(this);
 
@@ -49764,11 +49794,11 @@ var DrawPageTable = /*#__PURE__*/function (_DrawRect) {
         var ar = r;
 
         if (!cell) {
-          var _this$_table$getMainC17 = this._table.getMainCell(r, c),
-              _this$_table$getMainC18 = (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z)(_this$_table$getMainC17, 3),
-              mainCell = _this$_table$getMainC18[0],
-              mr = _this$_table$getMainC18[1],
-              mc = _this$_table$getMainC18[2];
+          var _this$_table$getMainC19 = this._table.getMainCell(r, c),
+              _this$_table$getMainC20 = (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z)(_this$_table$getMainC19, 3),
+              mainCell = _this$_table$getMainC20[0],
+              mr = _this$_table$getMainC20[1],
+              mc = _this$_table$getMainC20[2];
 
           cell = mainCell;
           ar = mr;
@@ -49822,11 +49852,11 @@ var DrawPageTable = /*#__PURE__*/function (_DrawRect) {
         var rowPaintHeight = Math.min(rowRestHeight, pageRestHeight);
 
         for (var c = 0; c < this._table.colCount; c++) {
-          var _this$_table$getMainC19 = this._table.getMainCell(r, c),
-              _this$_table$getMainC20 = (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z)(_this$_table$getMainC19, 3),
-              cell = _this$_table$getMainC20[0],
-              mr = _this$_table$getMainC20[1],
-              mc = _this$_table$getMainC20[2];
+          var _this$_table$getMainC21 = this._table.getMainCell(r, c),
+              _this$_table$getMainC22 = (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z)(_this$_table$getMainC21, 3),
+              cell = _this$_table$getMainC22[0],
+              mr = _this$_table$getMainC22[1],
+              mc = _this$_table$getMainC22[2];
 
           var cellRestHeight = rowPaintHeight; //同一行的合并列只绘制一次
 
@@ -49887,11 +49917,7 @@ var DrawPageTable = /*#__PURE__*/function (_DrawRect) {
       var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_10__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this.table.hoEditorFactoryID);
 
       if (this.table.tableProperty.fixedOnePage) {
-        if (this.table.drawTable.dHeight + 28 > this._maxHeight) {
-          return;
-        } else {
-          dRestHeight = dRestHeight;
-        }
+        dRestHeight = Infinity;
       }
 
       var pageRestHeight = dRestHeight;
@@ -49955,11 +49981,11 @@ var DrawPageTable = /*#__PURE__*/function (_DrawRect) {
         var isEmptyRow = true; //是否绘制了一个单元格
 
         for (var c = 0; c < this._table.colCount; c++) {
-          var _this$_table$getMainC21 = this._table.getMainCell(r, c),
-              _this$_table$getMainC22 = (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z)(_this$_table$getMainC21, 3),
-              cell = _this$_table$getMainC22[0],
-              mr = _this$_table$getMainC22[1],
-              mc = _this$_table$getMainC22[2];
+          var _this$_table$getMainC23 = this._table.getMainCell(r, c),
+              _this$_table$getMainC24 = (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z)(_this$_table$getMainC23, 3),
+              cell = _this$_table$getMainC24[0],
+              mr = _this$_table$getMainC24[1],
+              mc = _this$_table$getMainC24[2];
 
           if (cell && mc === c && mr + cell.rowSpan - 1 === r) {
             isEmptyRow = false;
@@ -49980,18 +50006,18 @@ var DrawPageTable = /*#__PURE__*/function (_DrawRect) {
         }
 
         for (var _c2 = 0; _c2 < this._table.colCount; _c2++) {
-          var _this$_table$getMainC23 = this._table.getMainCell(r, _c2),
-              _this$_table$getMainC24 = (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z)(_this$_table$getMainC23, 3),
-              _cell2 = _this$_table$getMainC24[0],
-              _mr2 = _this$_table$getMainC24[1],
-              _mc2 = _this$_table$getMainC24[2];
+          var _this$_table$getMainC25 = this._table.getMainCell(r, _c2),
+              _this$_table$getMainC26 = (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z)(_this$_table$getMainC25, 3),
+              _cell2 = _this$_table$getMainC26[0],
+              _mr3 = _this$_table$getMainC26[1],
+              _mc3 = _this$_table$getMainC26[2];
 
-          if (_cell2 && _mc2 === _c2 && (_mr2 + _cell2.rowSpan - 1 == r || rowRestHeight > pageRestHeight - 10 || pageRestHeight - rowRestHeight < hoEditorFactory.defaultLineHeight)) {
+          if (_cell2 && _mc3 === _c2 && (_mr3 + _cell2.rowSpan - 1 == r || rowRestHeight > pageRestHeight - 10 || pageRestHeight - rowRestHeight < hoEditorFactory.defaultLineHeight)) {
             var startChildIndex = 0;
             var partCellindex = -1;
             var dPrevPartCell = null;
 
-            if (prevdPageTable && _mr2 <= this._startRow) {
+            if (prevdPageTable && _mr3 <= this._startRow) {
               dPrevPartCell = _cell2.drawCell.getDrawPageCell(prevdPageTable);
 
               if (dPrevPartCell) {
@@ -50046,7 +50072,7 @@ var DrawPageTable = /*#__PURE__*/function (_DrawRect) {
                   _cell2.drawCell.needUpdate = true;
                 }
 
-                if (r === _mr2) {
+                if (r === _mr3) {
                   dPartCell.maxHeight = pageRestHeight;
                   dPartCell.dHeight = Math.min(rowRestHeight, pageRestHeight);
                 } else {
@@ -50148,11 +50174,11 @@ var DrawPageTable = /*#__PURE__*/function (_DrawRect) {
           //跨行单元格只在绘制所跨最后一行时绘制
           continue;
         } else if (!cell) {
-          var _this$_table$getMainC25 = this._table.getMainCell(r, j),
-              _this$_table$getMainC26 = (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z)(_this$_table$getMainC25, 3),
-              mainCell = _this$_table$getMainC26[0],
-              mr = _this$_table$getMainC26[1],
-              mc = _this$_table$getMainC26[2];
+          var _this$_table$getMainC27 = this._table.getMainCell(r, j),
+              _this$_table$getMainC28 = (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z)(_this$_table$getMainC27, 3),
+              mainCell = _this$_table$getMainC28[0],
+              mr = _this$_table$getMainC28[1],
+              mc = _this$_table$getMainC28[2];
 
           if (mr + mainCell.rowSpan - 1 === r && mc === j) {
             cell = mainCell;
@@ -51162,7 +51188,7 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
                 bitmap.setTransform(bitmap.x, bitmap.y, scale, scale);
                 fingerBitmap.setTransform(fingerBitmap.x, fingerBitmap.y, fingerscale, fingerscale);
                 var hitArea = new createjs.Shape();
-                hitArea.graphics.beginFill("#000").drawRect(0, 0, hitWidth * scale, hitHeight * scale); //这里是图片大小
+                hitArea.graphics.beginFill("#000").drawRect(fingerBitmap.x, 0, fingerWidth * fingerscale, fingerHeight * fingerscale); //这里是图片大小
 
                 bitmap.hitArea = hitArea;
                 fingerBitmap.hitArea = hitArea;
@@ -62686,7 +62712,7 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
                 //if(nodes.length == 0) return;
 
                 if (!(hoEditorFactory.drawTree.paintStatus !== _draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_15__/* .PaintState.psDesign */ .Dh.psDesign && !this._isForceDelete)) {
-                  _context.next = 30;
+                  _context.next = 33;
                   break;
                 }
 
@@ -62694,19 +62720,29 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
 
               case 13:
                 if (!(n < nodes.length)) {
-                  _context.next = 30;
+                  _context.next = 33;
                   break;
                 }
 
                 node = nodes[n];
 
+                if (!(node instanceof _dom_treeNode_MarkNode__WEBPACK_IMPORTED_MODULE_21__/* .MarkNode */ .j && node.parentNode instanceof _dom_treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_20__/* .TextInputFieldNode */ .re && node.MarkNodeType === 1 && !node.parentNode.isAllowDelete)) {
+                  _context.next = 18;
+                  break;
+                }
+
+                element_ui_lib_message_box__WEBPACK_IMPORTED_MODULE_1___default().alert("元素已设置为不允许删除。请先右键元素属性设置成允许删除,再进行删除操作。", "系统提示");
+
+                return _context.abrupt("return", 0);
+
+              case 18:
                 if (!(node instanceof _dom_treeNode_ControlNode__WEBPACK_IMPORTED_MODULE_28__/* .ControlNode */ .w || node instanceof _dom_treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_20__/* .TextInputFieldNode */ .re)) {
-                  _context.next = 24;
+                  _context.next = 27;
                   break;
                 }
 
                 if (node.isAllowDelete) {
-                  _context.next = 24;
+                  _context.next = 27;
                   break;
                 }
 
@@ -62732,9 +62768,9 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
 
                 return _context.abrupt("return", 0);
 
-              case 24:
+              case 27:
                 if (!(node instanceof _dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_33__/* .SignNode */ .N && node.isTemplate && node.number === 0)) {
-                  _context.next = 27;
+                  _context.next = 30;
                   break;
                 }
 
@@ -62742,16 +62778,16 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
 
                 return _context.abrupt("return", 0);
 
-              case 27:
+              case 30:
                 n++;
                 _context.next = 13;
                 break;
 
-              case 30:
+              case 33:
                 pnode = (_currRange$npEnd$node = currRange.npEnd.node) === null || _currRange$npEnd$node === void 0 ? void 0 : _currRange$npEnd$node.parentNode;
 
                 if (!(pnode && pnode instanceof _dom_treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_20__/* .TextInputFieldNode */ .re && currRange.npEnd.path != hoEditorFactory.docTree.getNodeLastPath(pnode))) {
-                  _context.next = 36;
+                  _context.next = 39;
                   break;
                 }
 
@@ -62764,24 +62800,24 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
                 });
 
                 if (_res[0]) {
-                  _context.next = 36;
+                  _context.next = 39;
                   break;
                 }
 
                 return _context.abrupt("return");
 
-              case 36:
+              case 39:
                 changeEvent = new _events_NodeChangeEvent__WEBPACK_IMPORTED_MODULE_14__/* .NodeChangeEvent */ .G(this._hoEditorFactoryID, _editor_dom_DocTree__WEBPACK_IMPORTED_MODULE_12__/* .DocAction.daUndoInsert */ .gk.daUndoInsert, currRange.startPath, ""); //FIXME:deleteRange函数完成后调用这个
                 // hoEditorFactory.docTree.deleteRange(arange.startPath, arange.endPath);
 
                 if (currRange.npStart.node && currRange.npEnd.node) {
-                  _context.next = 39;
+                  _context.next = 42;
                   break;
                 }
 
                 throw _events_Exception__WEBPACK_IMPORTED_MODULE_22__/* .Exception.NodeNotFound */ .P.NodeNotFound();
 
-              case 39:
+              case 42:
                 // const [startPath, endPath] = DomRange.skipStartEndTablePath(
                 //   this._hoEditorFactory,
                 //   currRange.startPath,
@@ -62794,33 +62830,33 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
                 res = this.deleteRange(currRange.endPath, currRange.startPath);
 
                 if (!(res == 1)) {
-                  _context.next = 51;
+                  _context.next = 54;
                   break;
                 }
 
                 changeEvent.beforeChangePath = startPath;
                 changeEvent.afterChangePath = this._tmp.start;
-                _context.next = 49;
+                _context.next = 52;
                 return hoEditorFactory.docTree.change(changeEvent);
 
-              case 49:
+              case 52:
                 cgEvent = new _events_SelectionChangeEvent__WEBPACK_IMPORTED_MODULE_18__/* .SelectionChangeEvent */ .r(hoEditorFactory.docTree.curDomRange, new _dom_DomRange__WEBPACK_IMPORTED_MODULE_16__/* .DomRange */ .a(this._hoEditorFactoryID, this._tmp.start, this._tmp.start));
                 hoEditorFactory.docTree.selectChange(cgEvent);
 
-              case 51:
+              case 54:
                 hoEditorFactory.docTree.curDomRange.setSamePath(this._tmp.start);
                 hoEditorFactory.drawTree.moveCaretToPath(this._tmp.start);
                 aNode = currRange.npStart.node;
 
                 if (!(aNode && pnode)) {
-                  _context.next = 57;
+                  _context.next = 60;
                   break;
                 }
 
-                _context.next = 57;
+                _context.next = 60;
                 return this.ParentRepaint(pnode);
 
-              case 57:
+              case 60:
               case "end":
                 return _context.stop();
             }
@@ -206655,7 +206691,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.51-rc.1');
+/* harmony default export */ var version = ('2.0.53');
 ;// 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 = []
@@ -209567,6 +209603,14 @@ var HTMLconverter2 = /*#__PURE__*/function () {
         return tmp;
       } else {
         for (var i = 0; i < jnode.childNodes.length; i++) {
+          if (jnode.childNodes[i].nodeName.toLowerCase() == "img") {
+            var src = jnode.childNodes[i].src;
+
+            if (src && src.toString().substring(src.length - 4, src.length) === ".svg") {
+              continue;
+            }
+          }
+
           var fun = this.convert.get(jnode.childNodes[i].nodeName.toLowerCase());
 
           if (fun) {
@@ -209827,7 +209871,7 @@ var HTMLconverter2 = /*#__PURE__*/function () {
 
       var width = styleobj.width ? styleobj.width.replace("px", "") : 20;
       var height = styleobj.height ? styleobj.height.replace("px", "") : 20;
-      var node = new ImageNode/* ImageNode */.H(this._hoEditorFactoryID, HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID).docTree.activeNodes, null, BaseNode/* NodeType.ntImage */.Jq.ntImage, HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID).gernerateCode.generateID("IMG"), jquery_default()(jnode).attr("src") || "", width, height);
+      var node = new ImageNode/* ImageNode */.H(this._hoEditorFactoryID, HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID).docTree.activeNodes, null, BaseNode/* NodeType.ntImage */.Jq.ntImage, HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID).gernerateCode.generateID("IMG"), jquery_default()(jnode).attr("src") || "", Number(width), Number(height));
       return [node];
     }
   }, {
@@ -210041,7 +210085,8 @@ var HTMLconverter2 = /*#__PURE__*/function () {
       var textstyle = this.HTMLStyleToParsStyle(styleobj);
       if (textstyle.lineSpace === 0) textstyle.lineSpace = undefined;
       var index = hoEditorFactory.docTree.styleCompare(textstyle);
-      var node = new ParagraphNode/* ParagraphNode */.C(this._hoEditorFactoryID, hoEditorFactory.docTree.activeNodes, hoEditorFactory.docTree.getParentNode(HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID).docTree.curDomRange.normalize().startPath), index);
+      var node = new ParagraphNode/* ParagraphNode */.C(this._hoEditorFactoryID, hoEditorFactory.docTree.activeNodes, hoEditorFactory.docTree.getParentNode(HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID).docTree.curDomRange.normalize().startPath), index //hoEditorFactory.docTree.curParaNo
+      );
       tmp.push(node);
 
       if (jnode.childNodes.length == 0) {
@@ -213227,7 +213272,7 @@ var NodeConvert = /*#__PURE__*/function () {
           if (!uidArr[i]) continue;
 
           if (i > 0) {
-            var paraNode = new ParagraphNode/* ParagraphNode */.C(this._hoEditorFactoryID, hoEditorFactory.docTree.mainNodes, null, 0);
+            var paraNode = new ParagraphNode/* ParagraphNode */.C(this._hoEditorFactoryID, hoEditorFactory.docTree.mainNodes, null, hoEditorFactory.docTree.curParaNo);
             nodes.push(paraNode);
           }
 
@@ -219013,7 +219058,7 @@ var VueController = /*#__PURE__*/function () {
 
   }, {
     key: "getAllElements",
-    value: function getAllElements() {
+    value: function getAllElements(area) {
       var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID);
       var ret = [];
 
@@ -219023,21 +219068,29 @@ var VueController = /*#__PURE__*/function () {
 
           if (node instanceof TextInputFieldNode/* TextInputFieldNode */.re || node instanceof DownListNode/* DownListNode */.yF || node instanceof DateTimeNode/* DateTimeNode */.Z) {
             // if (node.readType === 1) {
-            var elementObj = {
-              id: "",
-              name: "",
-              text: "",
+            // const elementObj: Record<string, string | undefined | object> = {
+            // 	id: "",
+            // 	name: "",
+            // 	text: "",
+            // 	dataVerify: undefined,
+            // 	innerIdentifier: "",
+            // 	identifierFormat: "",
+            // };
+            // elementObj.id = node.id;
+            // elementObj.name = node.name;
+            // elementObj.text = node.text;
+            // elementObj.innerIdentifier = node.innerIdentifier;
+            // elementObj.identifierFormat = node.identifierFormat;
+            // elementObj.customProperty = node.customProperty;
+            ret.push({
+              id: node.id,
+              name: node.name,
+              text: node.text,
               dataVerify: undefined,
-              innerIdentifier: "",
-              identifierFormat: ""
-            };
-            elementObj.id = node.id;
-            elementObj.name = node.name;
-            elementObj.text = node.text;
-            elementObj.innerIdentifier = node.innerIdentifier;
-            elementObj.identifierFormat = node.identifierFormat;
-            elementObj.customProperty = node.customProperty;
-            ret.push(elementObj); // }
+              innerIdentifier: node.innerIdentifier,
+              identifierFormat: node.identifierFormat,
+              customProperty: node.customProperty
+            }); // }
           }
 
           if (node instanceof BaseCombineNode/* BaseCombineNode */.V) {
@@ -219046,20 +219099,27 @@ var VueController = /*#__PURE__*/function () {
         }
       };
 
-      var headerDocTree = hoEditorFactory.subDocManger.headerDocTree;
+      if (area == undefined || area == 'header') {
+        var headerDocTree = hoEditorFactory.subDocManger.headerDocTree;
 
-      for (var h = 0; h < headerDocTree.length; h++) {
-        if (!headerDocTree[h]) continue;
-        getAllNodes(headerDocTree[h].subDocNodes);
+        for (var h = 0; h < headerDocTree.length; h++) {
+          if (!headerDocTree[h]) continue;
+          getAllNodes(headerDocTree[h].subDocNodes);
+        }
       }
 
-      var mainNodes = hoEditorFactory.docTree.mainNodes;
-      getAllNodes(mainNodes);
-      var footerDocTree = hoEditorFactory.subDocManger.footerDocTree;
+      if (area == undefined || area == 'main') {
+        var mainNodes = hoEditorFactory.docTree.mainNodes;
+        getAllNodes(mainNodes);
+      }
 
-      for (var f = 0; f < footerDocTree.length; f++) {
-        if (!footerDocTree[f]) continue;
-        getAllNodes(footerDocTree[f].subDocNodes);
+      if (area == undefined || area == 'footer') {
+        var footerDocTree = hoEditorFactory.subDocManger.footerDocTree;
+
+        for (var f = 0; f < footerDocTree.length; f++) {
+          if (!footerDocTree[f]) continue;
+          getAllNodes(footerDocTree[f].subDocNodes);
+        }
       }
 
       return ret;
@@ -219137,7 +219197,7 @@ var VueController = /*#__PURE__*/function () {
       return allArr;
     }
     /**
-     * 获取当前病历中的所有元素
+     * 获取当前病历中的所有ca签名元素
      * @returns 返回元素是{id,name,text,json}的数据
      */
 
@@ -220086,12 +220146,20 @@ var VueController = /*#__PURE__*/function () {
       hoEditorFactory.docTree.curDomRange = newRange;
       hoEditorFactory.drawTree.moveCaretToPath(curDomRange.startPath);
     }
+    /**
+     * 初始化文档
+     */
+
   }, {
     key: "initBlankDoc",
     value: function initBlankDoc() {
       var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID);
       hoEditorFactory.docController.initBlankDoc();
     }
+    /**
+     * 清理病历文档树 触发浏览器内存回收
+     */
+
   }, {
     key: "destoryEditor",
     value: function destoryEditor() {
@@ -220099,12 +220167,23 @@ var VueController = /*#__PURE__*/function () {
       hoEditorFactory.clear();
       hoEditorFactory = null;
     }
+    /**
+     * 获取签名元素清理后的病历xml内容
+     * @returns xml
+     */
+
   }, {
     key: "clearSignNodes",
     value: function clearSignNodes() {
       var xml = this.getDocXml(true, true, true);
       return xml;
     }
+    /**
+     * // 获取当前病历中是否有未处理的批注
+     * @param area 0 --- 未处理        1 --- 已处理       undefined ----存在批注
+     * @returns boolean 是否查询到批注内容
+     */
+
   }, {
     key: "getDocComment",
     value: function getDocComment(area) {
@@ -220121,6 +220200,11 @@ var VueController = /*#__PURE__*/function () {
       });
       return ishandle;
     }
+    /**
+     * 批量修改当前病历中批注处理状态
+     * @param status 默认修改为  1==已处理
+     */
+
   }, {
     key: "setDocCommentIsHandle",
     value: function setDocCommentIsHandle(status) {
@@ -220134,6 +220218,11 @@ var VueController = /*#__PURE__*/function () {
       });
       drawTree.commentsMap = commentsMap;
     }
+    /**
+     * 查询是否存在医生签名
+     * @returns boolean
+     */
+
   }, {
     key: "getAllSignNode",
     value: function getAllSignNode() {
@@ -221162,6 +221251,10 @@ var EditController = /*#__PURE__*/function () {
         for (var n = 0; n < nodes.length; n++) {
           var node = nodes[n];
           if (node instanceof ParagraphNode/* ParagraphNode */.C || node instanceof TextNode/* TextNode */.R || node instanceof MarkNode/* MarkNode */.j || node instanceof ControlNode/* ControlNode */.w) node.styleIndex = hoeditorfactory.docTree.curStyleIndex;
+
+          if (node instanceof ParagraphNode/* ParagraphNode */.C) {
+            node.paraNo = hoeditorfactory.docTree.curParaNo;
+          }
         }
       }