hoeditor-web 3.1.131 → 3.1.133

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -35224,7 +35224,6 @@ var PrintStatus = /*#__PURE__*/function () {
35224
35224
  */
35225
35225
  function get() {
35226
35226
  if (this.printRange == PrintRange.prNormal) return this._startIndex;
35227
- var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._hoEditorFactoryID);
35228
35227
  if (this.printRange == PrintRange.prSelected) return this.drawPrintSelected.pageIndex + 1;
35229
35228
  return this.DrawPrintRange().Position[0] + 1;
35230
35229
  },
@@ -36802,7 +36801,7 @@ var SubDocManger = /*#__PURE__*/function () {
36802
36801
  }
36803
36802
  }
36804
36803
  }
36805
- var dPage = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_16__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID).drawTree.drawPages[startPage];
36804
+ var dPage = hoEditorFactory.drawTree.drawPages[startPage];
36806
36805
  if (dPage) {
36807
36806
  var dArea = this.getSubDocCopyDrawArea(startPage, type);
36808
36807
  if (dArea) dPage.drawDocContainer.addChild(dArea);
@@ -38635,9 +38634,10 @@ var DocController = /*#__PURE__*/function () {
38635
38634
  value: function paraStyleChange(operateType, curDomRange, selectablePara) {
38636
38635
  var op = new _undoRedo_NodeStyleUndoUnit__WEBPACK_IMPORTED_MODULE_41__/* .Operate */ .p(operateType, selectablePara);
38637
38636
  var currDom = curDomRange;
38638
- _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_84__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID).undoService.begin();
38639
- _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_84__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID).undoService.add(new _undoRedo_LineStyleUndoUnit__WEBPACK_IMPORTED_MODULE_45__/* .LineStyleUndoUnit */ .d(this._hoEditorFactoryID, currDom.startPath, currDom.endPath, op));
38640
- _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_84__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID).undoService.commit();
38637
+ var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_84__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID);
38638
+ hoEditorFactory.undoService.begin();
38639
+ hoEditorFactory.undoService.add(new _undoRedo_LineStyleUndoUnit__WEBPACK_IMPORTED_MODULE_45__/* .LineStyleUndoUnit */ .d(this._hoEditorFactoryID, currDom.startPath, currDom.endPath, op));
38640
+ hoEditorFactory.undoService.commit();
38641
38641
  }
38642
38642
  }, {
38643
38643
  key: "copy",
@@ -38680,27 +38680,28 @@ var DocController = /*#__PURE__*/function () {
38680
38680
  value: function insertMenstrualHistory(operType, curDomRange, expressionStyle, menseDays, cycleDays, menarcheAge, menoPauseAge) {
38681
38681
  var domRange = curDomRange.normalize();
38682
38682
  var startPath = domRange.endPath;
38683
+ var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_84__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID);
38683
38684
  if (operType === 'update') {
38684
- var np = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_84__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID).docTree.findNodePositionByPath(startPath);
38685
+ var np = hoEditorFactory.docTree.findNodePositionByPath(startPath);
38685
38686
  if (np) {
38686
38687
  var node = np.node;
38687
38688
  if (node instanceof _treeNode_MedicalExpressionNode__WEBPACK_IMPORTED_MODULE_52__/* .MedicalExpressionNode */ .H) {
38688
- _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_84__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID).undoService.begin();
38689
- _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_84__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID).undoService.add(new _undoRedo_NodeDeleteUndoUnit__WEBPACK_IMPORTED_MODULE_44__/* .NodeDeleteUndoUnit */ .w(this._hoEditorFactoryID, node, startPath));
38690
- //HOEditorFactorys.instance().getFactory(this._hoEditorFactoryID).undoService.commit();
38691
- //startPath = HOEditorFactorys.instance().getFactory(this._hoEditorFactoryID).docTree.curDomRange.startPath;
38689
+ hoEditorFactory.undoService.begin();
38690
+ hoEditorFactory.undoService.add(new _undoRedo_NodeDeleteUndoUnit__WEBPACK_IMPORTED_MODULE_44__/* .NodeDeleteUndoUnit */ .w(this._hoEditorFactoryID, node, startPath));
38691
+ //hoEditorFactory.undoService.commit();
38692
+ //startPath = hoEditorFactory.docTree.curDomRange.startPath;
38692
38693
  startPath = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_84__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID).docTree.getNodeLastPath(node.previousLeaf());
38693
38694
  }
38694
38695
  }
38695
38696
  }
38696
- var parentNode = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_84__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID).docTree.getParentNode(startPath);
38697
+ var parentNode = hoEditorFactory.docTree.getParentNode(startPath);
38697
38698
  var menstrualHistoryNode = new _treeNode_MenstrualHistoryNode__WEBPACK_IMPORTED_MODULE_46__/* .MenstrualHistoryNode */ .n(this._hoEditorFactoryID, domRange.npStart.roots, parentNode, _treeNode_BaseNode__WEBPACK_IMPORTED_MODULE_32__/* .NodeType */ .Jq.ntMedicalExpression, expressionStyle, menseDays, cycleDays, menarcheAge, menoPauseAge);
38698
38699
  //插入该表达式节点
38699
38700
  if (operType === 'add') {
38700
- _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_84__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID).undoService.begin();
38701
+ hoEditorFactory.undoService.begin();
38701
38702
  }
38702
- _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_84__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID).undoService.add(new _undoRedo_NodeInsertUndoUnit__WEBPACK_IMPORTED_MODULE_33__/* .NodeInsertUndoUnit */ .R(this._hoEditorFactoryID, startPath, menstrualHistoryNode));
38703
- _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_84__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID).undoService.commit();
38703
+ hoEditorFactory.undoService.add(new _undoRedo_NodeInsertUndoUnit__WEBPACK_IMPORTED_MODULE_33__/* .NodeInsertUndoUnit */ .R(this._hoEditorFactoryID, startPath, menstrualHistoryNode));
38704
+ hoEditorFactory.undoService.commit();
38704
38705
  }
38705
38706
  /**
38706
38707
  * 插入 Pop-Q评分
@@ -39191,7 +39192,7 @@ var DocController = /*#__PURE__*/function () {
39191
39192
  }
39192
39193
  }, {
39193
39194
  key: "insertTable",
39194
- value: function insertTable(arange, row, col) {
39195
+ value: function insertTable(arange, row, col, property) {
39195
39196
  var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_84__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID);
39196
39197
  var np = hoEditorFactory.docTree.findNodePositionByPath(arange.startPath);
39197
39198
  var parentNode = hoEditorFactory.docTree.getParentNode(arange.startPath);
@@ -39229,7 +39230,7 @@ var DocController = /*#__PURE__*/function () {
39229
39230
  // paraNode
39230
39231
  // );
39231
39232
  // }
39232
- var tableProperty = new _TableProperty__WEBPACK_IMPORTED_MODULE_65__/* .TableProperty */ .vE('');
39233
+ var tableProperty = new _TableProperty__WEBPACK_IMPORTED_MODULE_65__/* .TableProperty */ .vE(property ? property : "");
39233
39234
  var tableNode = new _treeNode_TableNode__WEBPACK_IMPORTED_MODULE_58__/* .TableNode */ .Fh(this._hoEditorFactoryID, np.roots, parentNode, row, col, tableProperty);
39234
39235
  hoEditorFactory.undoService.begin();
39235
39236
  hoEditorFactory.undoService.add(new _undoRedo_TableUndos_TableInsertUndoUnit__WEBPACK_IMPORTED_MODULE_68__/* .TableInsertUndoUnit */ .m(this._hoEditorFactoryID, arange.startPath, tableNode));
@@ -50356,13 +50357,13 @@ var CellNode = /*#__PURE__*/function (_RectNode) {
50356
50357
  value: function placeDNodeAfterDTop(droots, dTop) {
50357
50358
  var paragraphNode = this.childNodes[0];
50358
50359
  var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_22__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID);
50359
- var aline = paragraphNode.drawlines[0];
50360
+ // const aline = paragraphNode.drawlines[0];
50360
50361
  hoEditorFactory.drawTree.drawDocInsert(paragraphNode, 0, paragraphNode, -1, hoEditorFactory.docTree.getNodeLastPath(this));
50361
50362
  if (this._drawCell.drawLines.length > 0) {
50362
50363
  var dEndObj = this._drawCell.drawLines[this._drawCell.drawLines.length - 1];
50363
50364
  this._drawCell.docHeight = dEndObj.dTop + dEndObj.dHeight;
50364
50365
  }
50365
- var r = this._table.rows.indexOf(this._row);
50366
+ // const r = this._table.rows.indexOf(this._row);
50366
50367
  // this._table.drawTable.updateRow(r);
50367
50368
  // for (let i = 0; i < this._childNodes.length; i++) {
50368
50369
  // if (this._childNodes[i] instanceof ParagraphNode) {
@@ -54969,7 +54970,7 @@ var MarkNode = /*#__PURE__*/function (_BaseNode) {
54969
54970
  if (isCopy) {
54970
54971
  var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_19__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID);
54971
54972
  var combineStyle;
54972
- var style = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_19__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID).docTree.styles[this.styleIndex];
54973
+ var style = hoEditorFactory.docTree.styles[this.styleIndex];
54973
54974
  if (style) {
54974
54975
  combineStyle = style.combineStyle;
54975
54976
  } else {
@@ -58797,15 +58798,16 @@ var RadioAndCheckBoxNode = /*#__PURE__*/function (_ControlNode) {
58797
58798
  }, {
58798
58799
  key: "clear",
58799
58800
  value: function clear() {
58800
- var _HOEditorFactorys$ins;
58801
- _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_19__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID).docTree.radioAndCheckBoxsMap.delete(this.dataId);
58802
- var shapesColor = (_HOEditorFactorys$ins = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_19__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID).drawTree.activePage) === null || _HOEditorFactorys$ins === void 0 || (_HOEditorFactorys$ins = _HOEditorFactorys$ins.drawSelectLevel) === null || _HOEditorFactorys$ins === void 0 ? void 0 : _HOEditorFactorys$ins.shapesColor;
58801
+ var _hoEditorFactory$draw;
58802
+ var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_19__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID);
58803
+ hoEditorFactory.docTree.radioAndCheckBoxsMap.delete(this.dataId);
58804
+ var shapesColor = (_hoEditorFactory$draw = hoEditorFactory.drawTree.activePage) === null || _hoEditorFactory$draw === void 0 || (_hoEditorFactory$draw = _hoEditorFactory$draw.drawSelectLevel) === null || _hoEditorFactory$draw === void 0 ? void 0 : _hoEditorFactory$draw.shapesColor;
58803
58805
  if (shapesColor) {
58804
58806
  var shape = shapesColor.get(this.id);
58805
58807
  shapesColor.delete(this.id);
58806
58808
  if (shape) {
58807
- var _HOEditorFactorys$ins2;
58808
- (_HOEditorFactorys$ins2 = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_19__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID).drawTree.activePage) === null || _HOEditorFactorys$ins2 === void 0 ? void 0 : _HOEditorFactorys$ins2.selectContainer.removeChild(shape);
58809
+ var _hoEditorFactory$draw2;
58810
+ (_hoEditorFactory$draw2 = hoEditorFactory.drawTree.activePage) === null || _hoEditorFactory$draw2 === void 0 ? void 0 : _hoEditorFactory$draw2.selectContainer.removeChild(shape);
58809
58811
  }
58810
58812
  }
58811
58813
  }
@@ -60851,29 +60853,34 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
60851
60853
  var strValue = hoEditorFactory.unitConvert.replaceAll(cell.getCellText(), '\n', '');
60852
60854
  //如果单元格存在下拉项,取值为下拉项的value,而非节点的text
60853
60855
  if (cell.cellProperty.downListProperty) {
60854
- var listItems = JSON.parse(cell.cellProperty.downListProperty.listItems);
60855
- var itemObject = listItems.find(function (item) {
60856
- return item.text === strValue;
60857
- });
60858
- if (itemObject) {
60859
- strValue = itemObject.value;
60860
- if (strValue === '') {
60861
- strValue = itemObject.text;
60856
+ var tempListItems = cell.cellProperty.downListProperty.listItems;
60857
+ if (tempListItems) {
60858
+ var listItems = JSON.parse(tempListItems);
60859
+ var itemObject = listItems.find(function (item) {
60860
+ return item.text === strValue;
60861
+ });
60862
+ if (itemObject) {
60863
+ strValue = itemObject.value;
60864
+ if (strValue === '') {
60865
+ strValue = itemObject.text;
60866
+ }
60862
60867
  }
60863
60868
  }
60864
60869
  //针对单元格childNodes节点下嵌套的下拉选择处理
60865
60870
  } else if (cell.childNodes && cell.childNodes.length > 1) {
60866
60871
  var textInputFieldNode = cell.childNodes[1];
60867
60872
  if (textInputFieldNode instanceof _TextInputFieldNode__WEBPACK_IMPORTED_MODULE_40__/* .TextInputFieldNode */ .re) {
60868
- var tempListItems = textInputFieldNode.downListProperty.listItems;
60869
- var midListItems = JSON.parse(tempListItems);
60870
- var tempItemObject = midListItems.find(function (item) {
60871
- return item.text === strValue;
60872
- });
60873
- if (tempItemObject) {
60874
- strValue = tempItemObject.value;
60875
- if (strValue === '') {
60876
- strValue = tempItemObject.text;
60873
+ var _tempListItems = textInputFieldNode.downListProperty.listItems;
60874
+ if (_tempListItems) {
60875
+ var midListItems = JSON.parse(_tempListItems);
60876
+ var tempItemObject = midListItems.find(function (item) {
60877
+ return item.text === strValue;
60878
+ });
60879
+ if (tempItemObject) {
60880
+ strValue = tempItemObject.value;
60881
+ if (strValue === '') {
60882
+ strValue = tempItemObject.text;
60883
+ }
60877
60884
  }
60878
60885
  }
60879
60886
  }
@@ -69476,6 +69483,7 @@ var TextNode = /*#__PURE__*/function (_BaseNode) {
69476
69483
  aStart = aEnd;
69477
69484
  aEnd = tmp;
69478
69485
  }
69486
+ var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_27__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID);
69479
69487
  var selectedText = this.text.substring(aStart + 1, aEnd + 1); //获取该文本节点的选中区域文本
69480
69488
  var frontNodeText = this.text.substring(0, aStart + 1); //选中区域前的文本
69481
69489
  var behindNodeText = this.text.substring(aEnd + 1, this.text.length); //选中区域后的文本
@@ -69485,17 +69493,17 @@ var TextNode = /*#__PURE__*/function (_BaseNode) {
69485
69493
  var unSelectedTextNode = new TextNode(this._hoEditorFactoryID, this.rootNodes, this.parentNode, _BaseNode__WEBPACK_IMPORTED_MODULE_22__/* .NodeType */ .Jq.ntText, behindNodeText, this.styleIndex //原来的样式
69486
69494
  );
69487
69495
 
69488
- _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_27__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID).docTree.insertNodeAfterPath("".concat(this.getNodePath(), "/").concat(this.text.length - 1), unSelectedTextNode); //节点二
69496
+ hoEditorFactory.docTree.insertNodeAfterPath("".concat(this.getNodePath(), "/").concat(this.text.length - 1), unSelectedTextNode); //节点二
69489
69497
  ret.unshift(unSelectedTextNode);
69490
69498
  } else {
69491
69499
  //如果选中区域的结束节点在该文本节点的末端,也只用拆分出2个节点;若选中区域在文本节点的中间区域,需要拆分出三个节点
69492
69500
  this.deleteByIndex(frontNodeText.length, this.getLength() - 1); //节点一
69493
69501
  var selectedTextNode = new TextNode(this._hoEditorFactoryID, this.rootNodes, this.parentNode, _BaseNode__WEBPACK_IMPORTED_MODULE_22__/* .NodeType */ .Jq.ntText, selectedText, this.styleIndex);
69494
- _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_27__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID).docTree.insertNodeAfterPath("".concat(this.getNodePath(), "/").concat(this.text.length - 1), selectedTextNode); //节点二
69502
+ hoEditorFactory.docTree.insertNodeAfterPath("".concat(this.getNodePath(), "/").concat(this.text.length - 1), selectedTextNode); //节点二
69495
69503
  ret.unshift(selectedTextNode);
69496
69504
  if (behindNodeText.length > 0) {
69497
69505
  var behindTextNode = new TextNode(this._hoEditorFactoryID, this.rootNodes, this.parentNode, _BaseNode__WEBPACK_IMPORTED_MODULE_22__/* .NodeType */ .Jq.ntText, behindNodeText, this.styleIndex);
69498
- _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_27__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID).docTree.insertNodeAfterPath("".concat(selectedTextNode.getNodePath(), "/").concat(selectedTextNode.text.length - 1), behindTextNode); //节点三
69506
+ hoEditorFactory.docTree.insertNodeAfterPath("".concat(selectedTextNode.getNodePath(), "/").concat(selectedTextNode.text.length - 1), behindTextNode); //节点三
69499
69507
  ret.push(behindTextNode);
69500
69508
  }
69501
69509
  }
@@ -69533,7 +69541,8 @@ var TextNode = /*#__PURE__*/function (_BaseNode) {
69533
69541
  }, {
69534
69542
  key: "prevPath",
69535
69543
  value: function prevPath(path) {
69536
- var nodePosition = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_27__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID).docTree.findNodePositionByPath(path);
69544
+ var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_27__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID);
69545
+ var nodePosition = hoEditorFactory.docTree.findNodePositionByPath(path);
69537
69546
  var childIndex = nodePosition.childIndex;
69538
69547
  var topath = "";
69539
69548
  if (childIndex > 0) {
@@ -69543,7 +69552,7 @@ var TextNode = /*#__PURE__*/function (_BaseNode) {
69543
69552
  } else {
69544
69553
  var tmp = this.previousLeaf();
69545
69554
  if (tmp) {
69546
- topath = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_27__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID).docTree.getNodeLastPath(tmp);
69555
+ topath = hoEditorFactory.docTree.getNodeLastPath(tmp);
69547
69556
  } else {
69548
69557
  throw new Error("前面没有节点");
69549
69558
  }
@@ -69576,7 +69585,7 @@ var TextNode = /*#__PURE__*/function (_BaseNode) {
69576
69585
  }
69577
69586
  var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_27__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID);
69578
69587
  var combineStyle;
69579
- var style = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_27__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID).docTree.styles[this.styleIndex];
69588
+ var style = hoEditorFactory.docTree.styles[this.styleIndex];
69580
69589
  if (style) {
69581
69590
  combineStyle = style.combineStyle;
69582
69591
  } else {
@@ -72960,7 +72969,10 @@ var DrawFooter = /*#__PURE__*/function (_DrawPageHeaderFooter) {
72960
72969
  // this.drawLines = [...HOEditorFactorys.instance().getFactory(this._hoEditorFactoryID).drawTree.headerDNodes[parseInt(arr[1])]];
72961
72970
  // // HOEditorFactorys.instance().getFactory(this._hoEditorFactoryID).drawTree.buildDrawTree(this.rootPath);
72962
72971
  // }
72963
- var dWidth = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_7__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID).pageProperty.widthPixes - _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_7__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID).pageProperty.leftMarginPixes - _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_7__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID).pageProperty.rightMarginPixes;
72972
+ // const dWidth =
72973
+ // HOEditorFactorys.instance().getFactory(this._hoEditorFactoryID).pageProperty.widthPixes -
72974
+ // HOEditorFactorys.instance().getFactory(this._hoEditorFactoryID).pageProperty.leftMarginPixes -
72975
+ // HOEditorFactorys.instance().getFactory(this._hoEditorFactoryID).pageProperty.rightMarginPixes;
72964
72976
  // if (!this._sharp) this._sharp = new createjs.Shape();
72965
72977
  // this._sharp.graphics.clear();
72966
72978
  // this._sharp.graphics.beginFill("#FF0000").drawRect(
@@ -73090,8 +73102,11 @@ var DrawHeader = /*#__PURE__*/function (_DrawPageHeaderFooter) {
73090
73102
  }, {
73091
73103
  key: "paintBackground",
73092
73104
  value: function paintBackground() {
73093
- var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_9__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID);
73094
- var dWidth = hoEditorFactory.pageProperty.widthPixes - hoEditorFactory.pageProperty.leftMarginPixes - hoEditorFactory.pageProperty.rightMarginPixes;
73105
+ // const hoEditorFactory = HOEditorFactorys.instance().getFactory(this._hoEditorFactoryID);
73106
+ // const dWidth =
73107
+ // hoEditorFactory.pageProperty.widthPixes -
73108
+ // hoEditorFactory.pageProperty.leftMarginPixes -
73109
+ // hoEditorFactory.pageProperty.rightMarginPixes;
73095
73110
  // if (hoEditorFactory.drawTree.activePage?.drawDomLevel?.activeDrawRect != this)
73096
73111
  // return
73097
73112
  // if (!this._sharp) this._sharp = new createjs.Shape();
@@ -83487,15 +83502,15 @@ var EditorController = /*#__PURE__*/function () {
83487
83502
  }
83488
83503
  var startPath = '';
83489
83504
  var endPath = '';
83490
- var domRange = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._hoEditorFactoryID).docTree.curDomRange;
83491
- if (!HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._hoEditorFactoryID).docTree.curDomRange.isEmpty) {
83492
- domRange = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._hoEditorFactoryID).docTree.curDomRange.normalize();
83505
+ var domRange = hoeditorfactory.docTree.curDomRange;
83506
+ if (!hoeditorfactory.docTree.curDomRange.isEmpty) {
83507
+ domRange = hoeditorfactory.docTree.curDomRange.normalize();
83493
83508
  }
83494
83509
  startPath = domRange.startPath;
83495
83510
  endPath = domRange.endPath;
83496
83511
  var changingEvent = new NodeChangingEvent/* NodeChangingEvent */.Q(DocTree/* DocAction */.gk.daInsert, startPath, endPath, NodeChangingEvent/* OperType */.y.keyBoardInput);
83497
- if (HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._hoEditorFactoryID).docTree.changing(changingEvent)) {
83498
- HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._hoEditorFactoryID).docController.insertPlainTextAfterPath(startPath, text);
83512
+ if (hoeditorfactory.docTree.changing(changingEvent)) {
83513
+ hoeditorfactory.docController.insertPlainTextAfterPath(startPath, text);
83499
83514
  }
83500
83515
  }
83501
83516
  }, {
@@ -88603,11 +88618,8 @@ var DrawTree = /*#__PURE__*/function () {
88603
88618
  }, {
88604
88619
  key: "updateDrawFormular",
88605
88620
  value: function updateDrawFormular(cell) {
88606
- var hoeditfactory = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._hoEditorFactoryID);
88607
- var _cell$table$getCellIn = cell.table.getCellInfos(cell),
88608
- _cell$table$getCellIn2 = (0,slicedToArray/* default */.Z)(_cell$table$getCellIn, 2),
88609
- r = _cell$table$getCellIn2[0],
88610
- c = _cell$table$getCellIn2[1];
88621
+ // const hoeditfactory = HOEditorFactorys.instance().getFactory(this._hoEditorFactoryID);
88622
+ // const [r, c] = cell.table.getCellInfos(cell);
88611
88623
  var isNeedUpdate = false;
88612
88624
  this.formularNodes.forEach(function (value, key) {
88613
88625
  var pnode = value.getParentCell();
@@ -207869,7 +207881,7 @@ var DrawSelectLevel = /*#__PURE__*/function () {
207869
207881
  }
207870
207882
  }
207871
207883
  hoeditorfactory.docTree.curOnDragNode = null;
207872
- HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._hoEditorFactoryID).drawPageTree.updateDrawPage(dPage.pageIndex);
207884
+ hoeditorfactory.drawPageTree.updateDrawPage(dPage.pageIndex);
207873
207885
  }
207874
207886
  }
207875
207887
  var curComment = hoeditorfactory.drawTree.curOnSelectedComment;
@@ -207891,7 +207903,7 @@ var DrawSelectLevel = /*#__PURE__*/function () {
207891
207903
  }
207892
207904
  }
207893
207905
  hoeditorfactory.drawTree.curOnSelectedComment = null;
207894
- HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._hoEditorFactoryID).drawPageTree.updateDrawPage(dPage.pageIndex);
207906
+ hoeditorfactory.drawPageTree.updateDrawPage(dPage.pageIndex);
207895
207907
  }
207896
207908
  }
207897
207909
  hoeditorfactory.drawTree.selectRange.spStart = startPos;
@@ -210279,7 +210291,7 @@ var TextNode = __webpack_require__(27198);
210279
210291
  // EXTERNAL MODULE: ./src/editor/dom/treeNode/ParagraphNode.ts
210280
210292
  var ParagraphNode = __webpack_require__(67945);
210281
210293
  ;// CONCATENATED MODULE: ./src/components/version.ts
210282
- /* harmony default export */ var version = ('3.1.131');
210294
+ /* harmony default export */ var version = ('3.1.133');
210283
210295
  // EXTERNAL MODULE: ./src/components/controls/poperTipText/PoperTipText.vue + 5 modules
210284
210296
  var PoperTipText = __webpack_require__(84531);
210285
210297
  ;// CONCATENATED MODULE: ./src/components/controls/poperTipText/index.ts
@@ -212961,7 +212973,7 @@ var NodeMouseMoveEvent = /*#__PURE__*/function () {
212961
212973
  var drawLine = hoEditorFactory.drawTree.getDrawLineByDNode(nodePos);
212962
212974
  if (drawLine) {
212963
212975
  var docPos = drawLine.localToGlobal(nodePos.x, nodePos.y === 0 ? drawLine.dHeight : nodePos.y);
212964
- this._pageIndex = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._hoEditorFactoryID).drawTree.activePage.pageIndex;
212976
+ this._pageIndex = hoEditorFactory.drawTree.activePage.pageIndex;
212965
212977
  this._poperTipPos.width = nodePos.dWidth ? nodePos.dWidth : 0; // // 目标元素 width
212966
212978
  this._poperTipPos.height = drawLine.dHeight; // 目标元素所在行的 height
212967
212979
  this._poperTipPos.pageIndex = this._pageIndex; // 目标元素所在页
@@ -218254,7 +218266,7 @@ var VueController = /*#__PURE__*/function () {
218254
218266
  (0,esm_defineProperty/* default */.Z)(this, "_combineStyle", void 0);
218255
218267
  (0,esm_defineProperty/* default */.Z)(this, "_hoEditorFactoryID", void 0);
218256
218268
  (0,esm_defineProperty/* default */.Z)(this, "autoSelect", void 0);
218257
- (0,esm_defineProperty/* default */.Z)(this, "emptyXml", "<?xml version='1.0' encoding='utf-8'?><root xml:space='preserve'><docProperty><version>2.0.36-2</version><type>0</type><title /><docID /><patientID /><patientName /><lastEditTime /><lastEditorID /><lastEditorName /></docProperty><pageSettings><printDirection>0</printDirection><borderColor>#000000</borderColor><isPaintBorder>false</isPaintBorder><paintRowLine>0</paintRowLine><pageSize>A4</pageSize><widthMm>210</widthMm><heightMm>297</heightMm><source /><topMarginMm>25</topMarginMm><bottomMarginMm>10</bottomMarginMm><leftMarginMm>15</leftMarginMm><rightMarginMm>15</rightMarginMm><headerYMm>3</headerYMm><footerYMm>3</footerYMm><showFirstPageHead>true</showFirstPageHead><showFirstPageFoot>true</showFirstPageFoot><pageNumber>0</pageNumber><isHaveBgImage>false</isHaveBgImage><commentWidthMm>0</commentWidthMm><fontFormat>宋体</fontFormat><fontSize>14</fontSize><fontColor>#000000</fontColor><backColor>transparent</backColor><paraAlign>3</paraAlign><charSpace>0</charSpace><lineHeight>1.25</lineHeight></pageSettings><styles><defaultFont><size>14</size><font>宋体</font><color>#000000</color><backColor>transparent</backColor><bold>false</bold><italic>false</italic><underline>false</underline><strikeout>false</strikeout><script>0</script><creatorIndex>-1</creatorIndex><deleterIndex>-1</deleterIndex><commentID>0</commentID></defaultFont><fontStyle /><defaultPara><charSpace>0</charSpace><lineSpace>1.25</lineSpace><leftMarginMm>0</leftMarginMm><topMarginMm>0</topMarginMm><bottomMarginMm>0</bottomMarginMm><rightMarginMm>0</rightMarginMm><align>3</align></defaultPara><paraStyle /></styles><comments><comment /></comments><userHistories><userHistory /></userHistories><headers><header><index>0</index><ParagraphNode><nodeType>ntParagraph</nodeType><styleIndex>0</styleIndex><textStyleNo>0</textStyleNo><printAsSinglePage>false</printAsSinglePage><docId /></ParagraphNode></header></headers><main><ParagraphNode><nodeType>ntParagraph</nodeType><styleIndex>0</styleIndex><textStyleNo>0</textStyleNo><printAsSinglePage>false</printAsSinglePage><docId /></ParagraphNode><TextNode><nodeType>ntText</nodeType><text></text><styleIndex>0</styleIndex></TextNode></main><footers><footer><index>0</index><ParagraphNode><nodeType>ntParagraph</nodeType><styleIndex>0</styleIndex><textStyleNo>0</textStyleNo><printAsSinglePage>false</printAsSinglePage><docId /></ParagraphNode></footer></footers><docText> </docText></root>");
218269
+ (0,esm_defineProperty/* default */.Z)(this, "emptyXml", "<?xml version='1.0' encoding='utf-8'?><root xml:space='preserve'><docProperty><version>3.1.131</version><type>0</type><title /><docID /><patientID /><patientName /><lastEditTime /><lastEditorID /><lastEditorName /></docProperty><pageSettings><printDirection>0</printDirection><borderColor>#000000</borderColor><isPaintBorder>false</isPaintBorder><paintRowLine>0</paintRowLine><pageSize>A4</pageSize><widthMm>210</widthMm><heightMm>297</heightMm><source /><topMarginMm>25</topMarginMm><bottomMarginMm>10</bottomMarginMm><leftMarginMm>15</leftMarginMm><rightMarginMm>15</rightMarginMm><headerYMm>3</headerYMm><footerYMm>3</footerYMm><showFirstPageHead>true</showFirstPageHead><showFirstPageFoot>true</showFirstPageFoot><pageNumber>0</pageNumber><isHaveBgImage>false</isHaveBgImage><commentWidthMm>0</commentWidthMm><fontFormat>宋体</fontFormat><fontSize>14</fontSize><fontColor>#000000</fontColor><backColor>transparent</backColor><paraAlign>3</paraAlign><charSpace>0</charSpace><lineHeight>1.25</lineHeight></pageSettings><styles><defaultFont><size>14</size><font>宋体</font><color>#000000</color><backColor>transparent</backColor><bold>false</bold><italic>false</italic><underline>false</underline><strikeout>false</strikeout><script>0</script><creatorIndex>-1</creatorIndex><deleterIndex>-1</deleterIndex><commentID>0</commentID></defaultFont><fontStyle /><defaultPara><charSpace>0</charSpace><lineSpace>1.25</lineSpace><leftMarginMm>0</leftMarginMm><topMarginMm>0</topMarginMm><bottomMarginMm>0</bottomMarginMm><rightMarginMm>0</rightMarginMm><align>3</align></defaultPara><paraStyle /></styles><comments><comment /></comments><userHistories><userHistory /></userHistories><headers><header><index>0</index><ParagraphNode><nodeType>ntParagraph</nodeType><styleIndex>0</styleIndex><textStyleNo>0</textStyleNo><printAsSinglePage>false</printAsSinglePage><docId /></ParagraphNode></header></headers><main><ParagraphNode><nodeType>ntParagraph</nodeType><styleIndex>0</styleIndex><textStyleNo>0</textStyleNo><printAsSinglePage>false</printAsSinglePage><docId /></ParagraphNode><TextNode><nodeType>ntText</nodeType><text></text><styleIndex>0</styleIndex></TextNode></main><footers><footer><index>0</index><ParagraphNode><nodeType>ntParagraph</nodeType><styleIndex>0</styleIndex><textStyleNo>0</textStyleNo><printAsSinglePage>false</printAsSinglePage><docId /></ParagraphNode></footer></footers><docText> </docText></root>");
218258
218270
  this._hoEditorFactoryID = hoEditorFactoryID;
218259
218271
  }
218260
218272
  /**
@@ -218832,7 +218844,7 @@ var VueController = /*#__PURE__*/function () {
218832
218844
  var endPath = _curDomRange.normalize().endPath;
218833
218845
  var changingEvent = new NodeChangingEvent/* NodeChangingEvent */.Q(DocTree/* DocAction */.gk.daInsert, startPath, endPath, NodeChangingEvent/* OperType */.y.insertTable);
218834
218846
  if (hoEditorFactory.docTree.changing(changingEvent)) {
218835
- hoEditorFactory.docController.insertTable(_curDomRange, irow, icol);
218847
+ hoEditorFactory.docController.insertTable(_curDomRange, irow, icol, property);
218836
218848
  }
218837
218849
  }
218838
218850
  /**
@@ -219638,7 +219650,7 @@ var VueController = /*#__PURE__*/function () {
219638
219650
  var endPath = _curDomRange.normalize().endPath;
219639
219651
  var changingEvent = new NodeChangingEvent/* NodeChangingEvent */.Q(DocTree/* DocAction */.gk.daInsert, startPath, endPath, NodeChangingEvent/* OperType */.y.insertRadioAndCheckBox);
219640
219652
  if (hoEditorFactory.docTree.changing(changingEvent)) {
219641
- HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._hoEditorFactoryID).docController.insertRadioAndCheckBox('add', _curDomRange, valuesObject, hoEditorFactory.docTree.curStyleIndex);
219653
+ hoEditorFactory.docController.insertRadioAndCheckBox('add', _curDomRange, valuesObject, hoEditorFactory.docTree.curStyleIndex);
219642
219654
  }
219643
219655
  }
219644
219656
  /**
@@ -219668,7 +219680,7 @@ var VueController = /*#__PURE__*/function () {
219668
219680
  var endPath = _curDomRange.normalize().endPath;
219669
219681
  var changingEvent = new NodeChangingEvent/* NodeChangingEvent */.Q(DocTree/* DocAction */.gk.daInsert, startPath, endPath, NodeChangingEvent/* OperType */.y.updateRadioAndCheckBox);
219670
219682
  if (hoEditorFactory.docTree.changing(changingEvent)) {
219671
- HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._hoEditorFactoryID).docController.insertRadioAndCheckBox('update', _curDomRange, valuesObject, hoEditorFactory.docTree.curStyleIndex);
219683
+ hoEditorFactory.docController.insertRadioAndCheckBox('update', _curDomRange, valuesObject, hoEditorFactory.docTree.curStyleIndex);
219672
219684
  }
219673
219685
  }
219674
219686
  }, {