hoeditor-web 3.1.159 → 3.1.160

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.
Files changed (4) hide show
  1. package/lib/hoeditor.css +18038 -1
  2. package/lib/hoeditor.umd.js +163 -337
  3. package/lib/hoeditor.umd.min.js +2 -2
  4. package/package.json +1 -1
package/lib/hoeditor.umd.js CHANGED
@@ -56330,7 +56330,6 @@ var ParagraphNode = /*#__PURE__*/function (_BaseNode) {
56330
56330
  value: function getParagraphLeftWidth() {
56331
56331
  //如果父文档节点派生于rectNode(用于表格基类),则取
56332
56332
  var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_20__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID);
56333
- var pNode = this._parentNode;
56334
56333
  var aLeft;
56335
56334
  var aWidth;
56336
56335
  var bRectAlign = false;
@@ -56346,11 +56345,6 @@ var ParagraphNode = /*#__PURE__*/function (_BaseNode) {
56346
56345
  aWidth = aWidth - aLeft - hoEditorFactory.unitConvert.mmConversionPx(pRectNode.cellProperty.cellInnerMargin[3] * 10, true);
56347
56346
  bRectAlign = true;
56348
56347
  }
56349
- // aLeft = this._combineParagraph.leftMarginPixes;
56350
- // aWidth =
56351
- // pRectNode.width -
56352
- // this._combineParagraph.leftMarginPixes -
56353
- // this._combineParagraph.rightMarginPixes;
56354
56348
  } else {
56355
56349
  aLeft = 0;
56356
56350
  aWidth = hoEditorFactory.pageProperty.widthPixes - hoEditorFactory.pageProperty.leftMarginPixes - hoEditorFactory.pageProperty.rightMarginPixes;
@@ -56381,10 +56375,6 @@ var ParagraphNode = /*#__PURE__*/function (_BaseNode) {
56381
56375
  key: "getParentLeftWidthNode",
56382
56376
  value: function getParentLeftWidthNode() {
56383
56377
  var pNode = this.parentNode;
56384
- //let para = HOEditorFactorys.instance().getFactory(this._hoEditorFactoryID).docTree.paragraphs[this._paraNo];
56385
- // if (!para) {
56386
- // para = HOEditorFactorys.instance().getFactory(this._hoEditorFactoryID).docTree.paragraphs[0];
56387
- // }
56388
56378
  while (pNode) {
56389
56379
  if (pNode instanceof _RectNode__WEBPACK_IMPORTED_MODULE_15__/* .RectNode */ .z) {
56390
56380
  return pNode;
@@ -56438,10 +56428,13 @@ var ParagraphNode = /*#__PURE__*/function (_BaseNode) {
56438
56428
  var paragraphWidth = leftTopInfos[1];
56439
56429
  var index = this._drawLines.length;
56440
56430
  if (index > 0) {
56441
- var prevLine = this._drawLines[index - 1];
56442
- prevLine.x = this.combineParagraph.leftMarginPixes + ileft;
56443
- prevLine.dWidth = paragraphWidth - this.combineParagraph.leftMarginPixes - this.combineParagraph.rightMarginPixes;
56444
- if (prevLine instanceof _editor_draw_DrawLine__WEBPACK_IMPORTED_MODULE_16__/* .DrawLine */ .a) prevLine.updateLineStyle();
56431
+ // const prevLine = this._drawLines[index - 1];
56432
+ // console.log(prevLine, leftTopInfos);
56433
+ // prevLine.x = this.combineParagraph.leftMarginPixes + ileft;
56434
+ // prevLine.dWidth = paragraphWidth - this.combineParagraph.leftMarginPixes - this.combineParagraph.rightMarginPixes;
56435
+ // if (prevLine instanceof DrawLine) {
56436
+ // prevLine.updateLineStyle();
56437
+ // }
56445
56438
  }
56446
56439
  var aline = new _editor_draw_DrawLine__WEBPACK_IMPORTED_MODULE_16__/* .DrawLine */ .a(this._rootPath, this, index, paragraphWidth);
56447
56440
  aline.dTop = itop;
@@ -56451,6 +56444,7 @@ var ParagraphNode = /*#__PURE__*/function (_BaseNode) {
56451
56444
  aline.dWidth = paragraphWidth - this.combineParagraph.leftMarginPixes - this.combineParagraph.rightMarginPixes;
56452
56445
  this._drawLines.push(aline);
56453
56446
  var rootIndex = this.drootNodes.indexOf(this._drawLines[0]) + this._drawLines.length - 1;
56447
+ // console.log(aline, rootIndex, ileft, this, '----');
56454
56448
  this.drootNodes.splice(rootIndex, 0, aline);
56455
56449
  this._dHeight = this._dHeight + aline.dHeight;
56456
56450
  return aline;
@@ -56517,37 +56511,15 @@ var ParagraphNode = /*#__PURE__*/function (_BaseNode) {
56517
56511
  this._dTop = itop;
56518
56512
  aline.dLeft = ileft;
56519
56513
  aline.dTop = itop;
56520
- aline.x = this.combineParagraph.leftMarginPixes;
56521
- aline.x += ileft;
56514
+ aline.x = this.combineParagraph.leftMarginPixes + ileft;
56522
56515
  aline.dWidth = paragraphWidth - this.combineParagraph.leftMarginPixes - this.combineParagraph.rightMarginPixes;
56523
- // for (let i=nodes.indexOf(this)+1;i<nodes.length-1;i++){
56524
- // if (nodes[i] instanceof ParagraphNode){
56525
- // break;
56526
- // }
56527
- // nodes[i].node2DrawNode(drawTree,dParagraphNodes,aline);
56528
- // for (let j=0;j<aDrawItems.length;j++){
56529
- // if(aDrawItems[j].children.length>0 ){
56530
- // if (aline.restWidth>=aDrawItems[j].getBounds().width){
56531
- // aline.appendItem(aDrawItems[i]);
56532
- // }else {
56533
- // dParagraph.appendLine(aline);
56534
- // aline=new DrawLine(dParagraph,0,dParagraph.height+1,paragraphWidth);
56535
- // aline.appendItem(aDrawItems[i]);
56536
- // }
56537
- // }
56538
- // }
56539
- // return dParagraph;
56540
56516
  }
56541
56517
  }, {
56542
56518
  key: "placeDNodeAfterDline",
56543
56519
  value: function placeDNodeAfterDline(dline) {
56544
- // if (this.drootNodes.length === 0) {
56545
- // this.drootNodes.push(this.drawlines[0]);
56546
- // }
56547
56520
  if (dline) {
56548
56521
  var dTop = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_20__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID).drawTree.getParagraphStartTop(this);
56549
56522
  this.placeDNodeAfterDTop(dTop, dline);
56550
- // HOEditorFactorys.instance().getFactory(this._hoEditorFactoryID).drawTree.insertDline(droots,index+1,this._drawLines[0]);
56551
56523
  }
56552
56524
  }
56553
56525
  }, {
@@ -56578,12 +56550,6 @@ var ParagraphNode = /*#__PURE__*/function (_BaseNode) {
56578
56550
  this.drootNodes.push(this._drawLines[0]);
56579
56551
  } else this.drootNodes.splice(index + 1, 0, this._drawLines[0]);
56580
56552
  }
56581
- // public add2DrawTree(dRoots: DrawLine[]){
56582
- // if (this._drawLines.length===0){
56583
- // this.node2DrawNode();
56584
- // }
56585
- // dRoots.push(this._drawLines[0]);
56586
- // }
56587
56553
  }, {
56588
56554
  key: "dTop",
56589
56555
  get: function get() {
@@ -56631,14 +56597,6 @@ var ParagraphNode = /*#__PURE__*/function (_BaseNode) {
56631
56597
  set: function set(value) {
56632
56598
  this._docId = value;
56633
56599
  }
56634
- // get lineDeleted(){
56635
- // return this._lineDeleted;
56636
- // }
56637
- // set lineDeleted(value: boolean){
56638
- // if (value!==this._lineDeleted){
56639
- // this._lineDeleted=value;
56640
- // }
56641
- // }
56642
56600
  }, {
56643
56601
  key: "isInCell",
56644
56602
  value: function isInCell() {
@@ -56652,7 +56610,6 @@ var ParagraphNode = /*#__PURE__*/function (_BaseNode) {
56652
56610
  }, {
56653
56611
  key: "adjustNextDline",
56654
56612
  value: function adjustNextDline(dline, index) {
56655
- var droots = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_20__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID).drawTree.getDrawRootsByPath(dline.rootPath);
56656
56613
  var dNextLine = this.getNextDline(dline);
56657
56614
  for (var i = index; i < dline.drawItems.length; i++) {
56658
56615
  dNextLine.addChildAt(i - index, dline.drawItems[i]);
@@ -56663,39 +56620,6 @@ var ParagraphNode = /*#__PURE__*/function (_BaseNode) {
56663
56620
  key: "getParagraphLastNodePath",
56664
56621
  value: function getParagraphLastNodePath() {
56665
56622
  return _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_20__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID).docTree.getParaNodeLastPath(this);
56666
- // return this.getParagraphLastNode().getNodePath()
56667
- // const pNode = this._parentNode;
56668
- // if (pNode) {
56669
- // const index = pNode.childNodes.indexOf(this);
56670
- // let aNode: BaseNode | null = null;
56671
- // for (let i = index + 1; i < pNode.childNodes.length; i++) {
56672
- // if (pNode.childNodes[i] instanceof ParagraphNode) {
56673
- // break;
56674
- // }
56675
- // aNode = pNode.childNodes[i];
56676
- // }
56677
- // if (aNode) {
56678
- // return HOEditorFactorys.instance().getFactory(this._hoEditorFactoryID).docTree.getNodeLastPath(aNode);
56679
- // } else {
56680
- // return this.getNodePath();
56681
- // }
56682
- // } else {
56683
- // let ret = this.nextSibling();
56684
- // let prevNode = ret;
56685
- // while (
56686
- // ret &&
56687
- // !(ret instanceof ParagraphNode) &&
56688
- // !(ret instanceof RectNode)
56689
- // ) {
56690
- // prevNode = ret;
56691
- // ret = ret.nextSibling();
56692
- // }
56693
- // if (prevNode) {
56694
- // return HOEditorFactorys.instance().getFactory(this._hoEditorFactoryID).docTree.getNodeLastPath(prevNode);
56695
- // } else {
56696
- // return this.getNodePath();
56697
- // }
56698
- // }
56699
56623
  }
56700
56624
  }, {
56701
56625
  key: "updateDrawLineStyle",
@@ -56704,7 +56628,6 @@ var ParagraphNode = /*#__PURE__*/function (_BaseNode) {
56704
56628
  var dline = this._drawLines[i];
56705
56629
  if (dline instanceof _editor_draw_DrawLine__WEBPACK_IMPORTED_MODULE_16__/* .DrawLine */ .a) dline.updateLineStyle();
56706
56630
  }
56707
- // if (dline instanceof DrawLine) dline.updateLineStyle();
56708
56631
  }
56709
56632
  }, {
56710
56633
  key: "updateDrawInfos",
@@ -56712,7 +56635,6 @@ var ParagraphNode = /*#__PURE__*/function (_BaseNode) {
56712
56635
  var aHeight = 0;
56713
56636
  for (var i = 0; i < this._drawLines.length; i++) {
56714
56637
  var dline = this._drawLines[i];
56715
- // if (dline instanceof DrawLine) dline.updateLineStyle();
56716
56638
  dline.dTop = this.dTop + aHeight;
56717
56639
  aHeight += dline.dHeight;
56718
56640
  this.dTop + aHeight;
@@ -56757,17 +56679,10 @@ var ParagraphNode = /*#__PURE__*/function (_BaseNode) {
56757
56679
  return paga;
56758
56680
  }
56759
56681
  var paraNode = {
56760
- //"ParagraphNode": {
56761
56682
  nodeType: _BaseNode__WEBPACK_IMPORTED_MODULE_13__/* .NodeType */ .Jq[this.nodeType],
56762
56683
  styleIndex: this._paraNo,
56763
56684
  textStyleNo: this.styleIndex
56764
- //printAsSinglePage: this.printAsSinglePage,
56765
- //forceChangeHeader: this.forceChangeHeader,
56766
- //docId: this.docId,
56767
- //customProperty: this.customProperty
56768
- //}
56769
56685
  };
56770
-
56771
56686
  if (this.printAsSinglePage) {
56772
56687
  paraNode.printAsSinglePage = this.printAsSinglePage;
56773
56688
  }
@@ -56792,10 +56707,6 @@ var ParagraphNode = /*#__PURE__*/function (_BaseNode) {
56792
56707
  }, {
56793
56708
  key: "delete",
56794
56709
  value: function _delete(operType) {
56795
- // const prevNode = this.prevSibling();
56796
- // if (prevNode && prevNode instanceof TableNode) {
56797
- // return false;
56798
- // }
56799
56710
  var parentNodes = this.getParentNodes();
56800
56711
  try {
56801
56712
  var index = parentNodes.indexOf(this);
@@ -56840,7 +56751,6 @@ var ParagraphNode = /*#__PURE__*/function (_BaseNode) {
56840
56751
  paragraphNode.printAsSinglePage = json.printAsSinglePage ? json.printAsSinglePage === "true" ? true : false : false;
56841
56752
  paragraphNode.forceChangeHeader = json.forceChangeHeader ? json.forceChangeHeader === "true" ? true : false : false;
56842
56753
  paragraphNode.styleIndex = json.textStyleNo ? Number(json.textStyleNo) : 0;
56843
- //paragraphNode.styleIndex = 0;
56844
56754
  return paragraphNode;
56845
56755
  }
56846
56756
  }]);
@@ -69085,7 +68995,7 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
69085
68995
  if (this.alignWithBlocked && this.StartMarkNode && this.StartMarkNode.drawNodes.length > 0) {
69086
68996
  var dNode = this.StartMarkNode.drawNodes[0];
69087
68997
  var dline = hoEditorFactory.drawTree.getDrawLineByDNode(dNode);
69088
- var x = this.StartMarkNode.drawNodes[0].x + hoEditorFactory.docTree.combineParagraph.leftMarginPixes + 1;
68998
+ var x = Math.floor(dNode.x) + hoEditorFactory.docTree.combineParagraph.leftMarginPixes + 1;
69089
68999
  var width = dline.dWidth - x;
69090
69000
  return [x, width, true];
69091
69001
  }
@@ -69170,7 +69080,6 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
69170
69080
  json.includesKeyword = !json.includesKeyword ? "[]" : json.includesKeyword;
69171
69081
  json.valueArea = !json.valueArea ? "[]" : json.valueArea;
69172
69082
  json.isElementLink = !json.isElementLink ? false : json.isElementLink;
69173
- if (this.name == '窒息后选择') {}
69174
69083
  var temp = new TextInputFieldNode(hoEditorFactoryID, rootNodes, pNode ? pNode : null, BaseNode/* NodeType */.Jq.ntField, json);
69175
69084
  // this.insertChild
69176
69085
  if (json.childNodes) {
@@ -69613,37 +69522,47 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
69613
69522
  /* harmony import */ var core_js_modules_es_array_slice_js__WEBPACK_IMPORTED_MODULE_9___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_slice_js__WEBPACK_IMPORTED_MODULE_9__);
69614
69523
  /* harmony import */ var core_js_modules_es_array_splice_js__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(40561);
69615
69524
  /* harmony import */ var core_js_modules_es_array_splice_js__WEBPACK_IMPORTED_MODULE_10___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_splice_js__WEBPACK_IMPORTED_MODULE_10__);
69616
- /* harmony import */ var core_js_modules_es_array_push_js__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(57658);
69617
- /* harmony import */ var core_js_modules_es_array_push_js__WEBPACK_IMPORTED_MODULE_11___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_push_js__WEBPACK_IMPORTED_MODULE_11__);
69618
- /* harmony import */ var core_js_modules_es_number_constructor_js__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(9653);
69619
- /* harmony import */ var core_js_modules_es_number_constructor_js__WEBPACK_IMPORTED_MODULE_12___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_number_constructor_js__WEBPACK_IMPORTED_MODULE_12__);
69620
- /* harmony import */ var core_js_modules_es_array_concat_js__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(92222);
69621
- /* harmony import */ var core_js_modules_es_array_concat_js__WEBPACK_IMPORTED_MODULE_13___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_concat_js__WEBPACK_IMPORTED_MODULE_13__);
69622
- /* harmony import */ var core_js_modules_es_array_join_js__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(69600);
69623
- /* harmony import */ var core_js_modules_es_array_join_js__WEBPACK_IMPORTED_MODULE_14___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_join_js__WEBPACK_IMPORTED_MODULE_14__);
69624
- /* harmony import */ var core_js_modules_es_error_cause_js__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(21703);
69625
- /* harmony import */ var core_js_modules_es_error_cause_js__WEBPACK_IMPORTED_MODULE_15___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_error_cause_js__WEBPACK_IMPORTED_MODULE_15__);
69626
- /* harmony import */ var core_js_modules_es_object_keys_js__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(47941);
69627
- /* harmony import */ var core_js_modules_es_object_keys_js__WEBPACK_IMPORTED_MODULE_16___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_object_keys_js__WEBPACK_IMPORTED_MODULE_16__);
69628
- /* harmony import */ var core_js_modules_es_json_stringify_js__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(38862);
69629
- /* harmony import */ var core_js_modules_es_json_stringify_js__WEBPACK_IMPORTED_MODULE_17___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_json_stringify_js__WEBPACK_IMPORTED_MODULE_17__);
69630
- /* harmony import */ var core_js_modules_es_string_bold_js__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(50915);
69631
- /* harmony import */ var core_js_modules_es_string_bold_js__WEBPACK_IMPORTED_MODULE_18___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_string_bold_js__WEBPACK_IMPORTED_MODULE_18__);
69632
- /* harmony import */ var core_js_modules_es_string_italics_js__WEBPACK_IMPORTED_MODULE_19__ = __webpack_require__(58734);
69633
- /* harmony import */ var core_js_modules_es_string_italics_js__WEBPACK_IMPORTED_MODULE_19___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_string_italics_js__WEBPACK_IMPORTED_MODULE_19__);
69634
- /* harmony import */ var core_js_modules_es_object_assign_js__WEBPACK_IMPORTED_MODULE_20__ = __webpack_require__(19601);
69635
- /* harmony import */ var core_js_modules_es_object_assign_js__WEBPACK_IMPORTED_MODULE_20___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_object_assign_js__WEBPACK_IMPORTED_MODULE_20__);
69636
- /* harmony import */ var core_js_modules_es_string_replace_all_js__WEBPACK_IMPORTED_MODULE_21__ = __webpack_require__(68757);
69637
- /* harmony import */ var core_js_modules_es_string_replace_all_js__WEBPACK_IMPORTED_MODULE_21___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_string_replace_all_js__WEBPACK_IMPORTED_MODULE_21__);
69638
- /* harmony import */ var _BaseNode__WEBPACK_IMPORTED_MODULE_22__ = __webpack_require__(62358);
69639
- /* harmony import */ var _editor_draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_23__ = __webpack_require__(51760);
69640
- /* harmony import */ var _editor_draw_DrawLine__WEBPACK_IMPORTED_MODULE_24__ = __webpack_require__(96635);
69641
- /* harmony import */ var _editor_draw_drawNode_DrawTextNode__WEBPACK_IMPORTED_MODULE_25__ = __webpack_require__(24492);
69642
- /* harmony import */ var _domNode_TextStyle__WEBPACK_IMPORTED_MODULE_26__ = __webpack_require__(29899);
69643
- /* harmony import */ var _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_27__ = __webpack_require__(74089);
69644
- /* harmony import */ var _editor_utils_UnitConvert__WEBPACK_IMPORTED_MODULE_28__ = __webpack_require__(91404);
69645
- /* harmony import */ var _TextInputFieldNode__WEBPACK_IMPORTED_MODULE_29__ = __webpack_require__(65043);
69646
- /* harmony import */ var _editor_utils_DrawSimpleText__WEBPACK_IMPORTED_MODULE_30__ = __webpack_require__(57590);
69525
+ /* harmony import */ var core_js_modules_es_object_to_string_js__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(41539);
69526
+ /* harmony import */ var core_js_modules_es_object_to_string_js__WEBPACK_IMPORTED_MODULE_11___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_object_to_string_js__WEBPACK_IMPORTED_MODULE_11__);
69527
+ /* harmony import */ var core_js_modules_web_dom_collections_for_each_js__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(54747);
69528
+ /* harmony import */ var core_js_modules_web_dom_collections_for_each_js__WEBPACK_IMPORTED_MODULE_12___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_web_dom_collections_for_each_js__WEBPACK_IMPORTED_MODULE_12__);
69529
+ /* harmony import */ var core_js_modules_es_array_push_js__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(57658);
69530
+ /* harmony import */ var core_js_modules_es_array_push_js__WEBPACK_IMPORTED_MODULE_13___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_push_js__WEBPACK_IMPORTED_MODULE_13__);
69531
+ /* harmony import */ var core_js_modules_es_number_constructor_js__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(9653);
69532
+ /* harmony import */ var core_js_modules_es_number_constructor_js__WEBPACK_IMPORTED_MODULE_14___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_number_constructor_js__WEBPACK_IMPORTED_MODULE_14__);
69533
+ /* harmony import */ var core_js_modules_es_array_concat_js__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(92222);
69534
+ /* harmony import */ var core_js_modules_es_array_concat_js__WEBPACK_IMPORTED_MODULE_15___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_concat_js__WEBPACK_IMPORTED_MODULE_15__);
69535
+ /* harmony import */ var core_js_modules_es_array_join_js__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(69600);
69536
+ /* harmony import */ var core_js_modules_es_array_join_js__WEBPACK_IMPORTED_MODULE_16___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_join_js__WEBPACK_IMPORTED_MODULE_16__);
69537
+ /* harmony import */ var core_js_modules_es_error_cause_js__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(21703);
69538
+ /* harmony import */ var core_js_modules_es_error_cause_js__WEBPACK_IMPORTED_MODULE_17___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_error_cause_js__WEBPACK_IMPORTED_MODULE_17__);
69539
+ /* harmony import */ var core_js_modules_es_object_keys_js__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(47941);
69540
+ /* harmony import */ var core_js_modules_es_object_keys_js__WEBPACK_IMPORTED_MODULE_18___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_object_keys_js__WEBPACK_IMPORTED_MODULE_18__);
69541
+ /* harmony import */ var core_js_modules_es_json_stringify_js__WEBPACK_IMPORTED_MODULE_19__ = __webpack_require__(38862);
69542
+ /* harmony import */ var core_js_modules_es_json_stringify_js__WEBPACK_IMPORTED_MODULE_19___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_json_stringify_js__WEBPACK_IMPORTED_MODULE_19__);
69543
+ /* harmony import */ var core_js_modules_es_string_bold_js__WEBPACK_IMPORTED_MODULE_20__ = __webpack_require__(50915);
69544
+ /* harmony import */ var core_js_modules_es_string_bold_js__WEBPACK_IMPORTED_MODULE_20___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_string_bold_js__WEBPACK_IMPORTED_MODULE_20__);
69545
+ /* harmony import */ var core_js_modules_es_string_italics_js__WEBPACK_IMPORTED_MODULE_21__ = __webpack_require__(58734);
69546
+ /* harmony import */ var core_js_modules_es_string_italics_js__WEBPACK_IMPORTED_MODULE_21___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_string_italics_js__WEBPACK_IMPORTED_MODULE_21__);
69547
+ /* harmony import */ var core_js_modules_es_object_assign_js__WEBPACK_IMPORTED_MODULE_22__ = __webpack_require__(19601);
69548
+ /* harmony import */ var core_js_modules_es_object_assign_js__WEBPACK_IMPORTED_MODULE_22___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_object_assign_js__WEBPACK_IMPORTED_MODULE_22__);
69549
+ /* harmony import */ var core_js_modules_es_string_replace_all_js__WEBPACK_IMPORTED_MODULE_23__ = __webpack_require__(68757);
69550
+ /* harmony import */ var core_js_modules_es_string_replace_all_js__WEBPACK_IMPORTED_MODULE_23___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_string_replace_all_js__WEBPACK_IMPORTED_MODULE_23__);
69551
+ /* harmony import */ var _BaseNode__WEBPACK_IMPORTED_MODULE_24__ = __webpack_require__(62358);
69552
+ /* harmony import */ var _editor_draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_25__ = __webpack_require__(51760);
69553
+ /* harmony import */ var _editor_draw_DrawLine__WEBPACK_IMPORTED_MODULE_26__ = __webpack_require__(96635);
69554
+ /* harmony import */ var _editor_draw_drawNode_DrawTextNode__WEBPACK_IMPORTED_MODULE_27__ = __webpack_require__(24492);
69555
+ /* harmony import */ var _domNode_TextStyle__WEBPACK_IMPORTED_MODULE_28__ = __webpack_require__(29899);
69556
+ /* harmony import */ var _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_29__ = __webpack_require__(74089);
69557
+ /* harmony import */ var _editor_utils_UnitConvert__WEBPACK_IMPORTED_MODULE_30__ = __webpack_require__(91404);
69558
+ /* harmony import */ var _TextInputFieldNode__WEBPACK_IMPORTED_MODULE_31__ = __webpack_require__(65043);
69559
+ /* harmony import */ var _editor_utils_DrawSimpleText__WEBPACK_IMPORTED_MODULE_32__ = __webpack_require__(57590);
69560
+ /* harmony import */ var _MarkNode__WEBPACK_IMPORTED_MODULE_33__ = __webpack_require__(57727);
69561
+ /* harmony import */ var _editor_draw_drawNode_DrawMarkNode__WEBPACK_IMPORTED_MODULE_34__ = __webpack_require__(57732);
69562
+
69563
+
69564
+
69565
+
69647
69566
 
69648
69567
 
69649
69568
 
@@ -69775,7 +69694,7 @@ var TextNode = /*#__PURE__*/function (_BaseNode) {
69775
69694
  this._text = this._text.substr(0, start) + this._text.substr(end + 1, this._text.length);
69776
69695
  for (var i = 0; i < this.drawNodes.length; i++) {
69777
69696
  var dNode = this.drawNodes[i];
69778
- if (dNode instanceof _editor_draw_drawNode_DrawTextNode__WEBPACK_IMPORTED_MODULE_25__/* .DrawTextNode */ .v) {
69697
+ if (dNode instanceof _editor_draw_drawNode_DrawTextNode__WEBPACK_IMPORTED_MODULE_27__/* .DrawTextNode */ .v) {
69779
69698
  var dtext = dNode.dText;
69780
69699
  if (start >= dtext.startIndex && start <= dtext.endIndex) {
69781
69700
  dNode.text = this._text.substr(dtext.startIndex, start);
@@ -69816,25 +69735,6 @@ var TextNode = /*#__PURE__*/function (_BaseNode) {
69816
69735
  }, {
69817
69736
  key: "node2DrawNodeRange",
69818
69737
  value: function node2DrawNodeRange(startIndex, endIndex) {
69819
- // super.node2DrawNode(firstLineWidth,secondLineWidth,firstPageHeight,secondPageHeight);
69820
- //item数目
69821
- // this.refreshDrawStyle();
69822
- // const istart = Math.max(startIndex, 0);
69823
- // const iend = Math.min(endIndex, this.getLength() - 1);
69824
- // const bIsInsert = startIndex < this._text.length - 1;
69825
- // for (let i = istart; i <= iend; i++) {
69826
- // const dNode = new DrawTextNode(
69827
- // this._hoEditorFactory,
69828
- // this._rootPath,
69829
- // this,
69830
- // i
69831
- // );
69832
- // if (bIsInsert) {
69833
- // this._drawNodes.splice(i, 0, dNode);
69834
- // } else {
69835
- // this._drawNodes.push(dNode);
69836
- // }
69837
- // }
69838
69738
  return;
69839
69739
  }
69840
69740
  }, {
@@ -69843,7 +69743,7 @@ var TextNode = /*#__PURE__*/function (_BaseNode) {
69843
69743
  // this._dCombineStyle = HOEditorFactorys.instance().getFactory(this._hoEditorFactoryID).docTree.styles[
69844
69744
  // this._styleIndex
69845
69745
  // ].combineStyle;
69846
- var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_27__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID);
69746
+ var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_29__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID);
69847
69747
  var textStyle = hoEditorFactory.docTree.styles[this._styleIndex];
69848
69748
  if (textStyle) {
69849
69749
  this._dCombineStyle = textStyle.combineStyle;
@@ -69859,8 +69759,6 @@ var TextNode = /*#__PURE__*/function (_BaseNode) {
69859
69759
  key: "node2DrawNode",
69860
69760
  value: function node2DrawNode() {
69861
69761
  return;
69862
- // this.clearDrawNodes(0, this.text.length - 1);
69863
- // this.node2DrawNodeRange(0, this.text.length - 1);
69864
69762
  }
69865
69763
  }, {
69866
69764
  key: "getFristDitemInDline",
@@ -69868,7 +69766,7 @@ var TextNode = /*#__PURE__*/function (_BaseNode) {
69868
69766
  var ret = start;
69869
69767
  for (var i = dline.drawItems.length - 1; i >= 0; i--) {
69870
69768
  var ditem = dline.drawItems[i];
69871
- if (ditem instanceof _editor_draw_drawNode_DrawTextNode__WEBPACK_IMPORTED_MODULE_25__/* .DrawTextNode */ .v && ditem.node === this) {
69769
+ if (ditem instanceof _editor_draw_drawNode_DrawTextNode__WEBPACK_IMPORTED_MODULE_27__/* .DrawTextNode */ .v && ditem.node === this) {
69872
69770
  if (ditem.startIndex < start) {
69873
69771
  ret = ditem.startIndex;
69874
69772
  }
@@ -69879,24 +69777,42 @@ var TextNode = /*#__PURE__*/function (_BaseNode) {
69879
69777
  }, {
69880
69778
  key: "adjustRectAlignLine",
69881
69779
  value: function adjustRectAlignLine(dline) {
69882
- if (this._parentNode && this._parentNode instanceof _TextInputFieldNode__WEBPACK_IMPORTED_MODULE_29__/* .TextInputFieldNode */ .re && dline.paragraphNode.parentNode !== this._parentNode) {
69883
- var _this$_parentNode$get = this._parentNode.getLeftWidth(),
69884
- _this$_parentNode$get2 = (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z)(_this$_parentNode$get, 3),
69885
- ileft = _this$_parentNode$get2[0],
69886
- paragraphWidth = _this$_parentNode$get2[1],
69887
- bAlignWithRect = _this$_parentNode$get2[2];
69780
+ if (this._parentNode && this._parentNode instanceof _TextInputFieldNode__WEBPACK_IMPORTED_MODULE_31__/* .TextInputFieldNode */ .re && dline.paragraphNode.parentNode !== this._parentNode) {
69781
+ var parentNode = this._parentNode;
69782
+ var _parentNode$getLeftWi = parentNode.getLeftWidth(),
69783
+ _parentNode$getLeftWi2 = (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z)(_parentNode$getLeftWi, 3),
69784
+ ileft = _parentNode$getLeftWi2[0],
69785
+ paragraphWidth = _parentNode$getLeftWi2[1],
69786
+ bAlignWithRect = _parentNode$getLeftWi2[2];
69888
69787
  if (bAlignWithRect) {
69889
- var index = dline.paragraphNode.drawlines.length;
69890
- if (index - 2 > 0) {
69891
- var prevLine = dline.paragraphNode.drawlines[index - 2];
69892
- prevLine.x = dline.paragraphNode.combineParagraph.leftMarginPixes + ileft;
69893
- prevLine.dWidth = paragraphWidth - dline.paragraphNode.combineParagraph.leftMarginPixes - dline.paragraphNode.combineParagraph.rightMarginPixes;
69894
- if (prevLine instanceof _editor_draw_DrawLine__WEBPACK_IMPORTED_MODULE_24__/* .DrawLine */ .a) prevLine.updateLineStyle();
69788
+ var len = dline.paragraphNode.drawlines.length;
69789
+ var combineParagraph = dline.paragraphNode.combineParagraph;
69790
+ if (len > 1) {
69791
+ dline.paragraphNode.drawlines.forEach(function (line, lineIndex) {
69792
+ if (line.children.length > 1) {
69793
+ line.children.forEach(function (child, childIndex) {
69794
+ if (child instanceof _editor_draw_drawNode_DrawMarkNode__WEBPACK_IMPORTED_MODULE_34__/* .DrawMarkNode */ .I && child.node instanceof _MarkNode__WEBPACK_IMPORTED_MODULE_33__/* .MarkNode */ .j && child.node.parentNode instanceof _TextInputFieldNode__WEBPACK_IMPORTED_MODULE_31__/* .TextInputFieldNode */ .re) {
69795
+ if (child.node.parentNode.alignWithBlocked && child.node.MarkNodeType === _MarkNode__WEBPACK_IMPORTED_MODULE_33__/* .MarkNodeType */ .q.mtStart) {
69796
+ line.x = combineParagraph.leftMarginPixes + ileft;
69797
+ line.dWidth = Math.max(line.dWidth, paragraphWidth);
69798
+ if (line instanceof _editor_draw_DrawLine__WEBPACK_IMPORTED_MODULE_26__/* .DrawLine */ .a) {
69799
+ // 块对齐的文本域起始行变更后需要更新样式且重新计算
69800
+ line.updateLineStyle();
69801
+ var _parentNode$getLeftWi3 = parentNode.getLeftWidth();
69802
+ var _parentNode$getLeftWi4 = (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z)(_parentNode$getLeftWi3, 3);
69803
+ ileft = _parentNode$getLeftWi4[0];
69804
+ paragraphWidth = _parentNode$getLeftWi4[1];
69805
+ bAlignWithRect = _parentNode$getLeftWi4[2];
69806
+ }
69807
+ }
69808
+ }
69809
+ });
69810
+ }
69811
+ });
69895
69812
  }
69896
- dline.dLeft = ileft;
69897
- dline.x = dline.paragraphNode.combineParagraph.leftMarginPixes;
69898
- dline.x += ileft;
69899
- dline.dWidth = paragraphWidth - dline.paragraphNode.combineParagraph.leftMarginPixes - dline.paragraphNode.combineParagraph.rightMarginPixes;
69813
+ dline.dLeft = combineParagraph.leftMarginPixes + ileft;
69814
+ dline.x = combineParagraph.leftMarginPixes + ileft;
69815
+ dline.dWidth = paragraphWidth - combineParagraph.leftMarginPixes - combineParagraph.rightMarginPixes;
69900
69816
  }
69901
69817
  }
69902
69818
  }
@@ -69912,38 +69828,31 @@ var TextNode = /*#__PURE__*/function (_BaseNode) {
69912
69828
  key: "placeDNode2DrawLine",
69913
69829
  value: function placeDNode2DrawLine(droots, paragraphNode, dline, start, endIndex) {
69914
69830
  this.refreshDrawStyle();
69915
- var hoeditorfacotry = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_27__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID);
69831
+ var hoeditorfacotry = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_29__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID);
69916
69832
  var startIndex = this.getFristDitemInDline(start, dline);
69917
69833
  if (startIndex >= this.text.length) {
69918
69834
  return dline;
69919
69835
  }
69920
69836
  this.clearNeedRedrawDitems(startIndex);
69921
- // super.node2DrawNode(firstLineWidth,secondLineWidth,firstPageHeight,secondPageHeight);
69922
69837
  var istart = Math.max(startIndex, 0);
69923
- // const dStarts=dline.drawItems.slice(0,inLineIndex-1);
69924
- // const dEnds=dline.drawItems.slice(inLineIndex,dline.drawItems.length-1);
69925
- // const dMids=this._drawNodes.slice(istart,iend);
69926
- // dline.drawItems.splice(0,dline.drawItems.length);
69927
- // dline.drawItems.concat(dMids).concat(dEnds);
69928
- // dline.insert(this._drawNodes.slice(istart,iend+1),inLineIndex);
69929
69838
  var style = hoeditorfacotry.docTree.styles[this.styleIndex];
69930
69839
  if (!style) {
69931
69840
  style = hoeditorfacotry.docTree.styles[0];
69932
69841
  this.styleIndex = 0;
69933
69842
  }
69934
69843
  var isDelete = style.deleterIndex === undefined || style.deleterIndex === -1 ? false : true; //是否是逻辑删除的状态
69935
- var isDisplay = hoeditorfacotry.drawTree.paintStatus === _editor_draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_23__/* .PaintState */ .Dh.psReview || hoeditorfacotry.drawTree.paintStatus === _editor_draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_23__/* .PaintState */ .Dh.psTrace ? true : false; //逻辑删除的节点是否显示
69844
+ var isDisplay = hoeditorfacotry.drawTree.paintStatus === _editor_draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_25__/* .PaintState */ .Dh.psReview || hoeditorfacotry.drawTree.paintStatus === _editor_draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_25__/* .PaintState */ .Dh.psTrace ? true : false; //逻辑删除的节点是否显示
69936
69845
  //const commentID = style.commentID === undefined ? "0" : style.commentID;
69937
69846
  if (!isDelete || isDisplay || !hoeditorfacotry.isHideComments) {
69938
69847
  var iend = istart;
69939
69848
  var irestLength = 0;
69940
- //是否标点
69941
- var bIsPunctuation = _editor_utils_UnitConvert__WEBPACK_IMPORTED_MODULE_28__/* .UnitConvert */ .P.isPuctuation(this._text[0]);
69849
+ // 检测结尾字符为标点符号时 符号默认跟随不再换行
69850
+ var bIsPunctuation = _editor_utils_UnitConvert__WEBPACK_IMPORTED_MODULE_30__/* .UnitConvert */ .P.isPuctuation(this._text[0]);
69942
69851
  var bForceAppend = false;
69943
69852
  while (istart <= this.text.length - 1) {
69944
69853
  bForceAppend = false;
69945
69854
  irestLength = dline.calcRestWidth();
69946
- var dFirst = new _editor_utils_DrawSimpleText__WEBPACK_IMPORTED_MODULE_30__/* .DrawSimpleText */ .b(this._text[0], this._dStyleKey, this._dColor);
69855
+ var dFirst = new _editor_utils_DrawSimpleText__WEBPACK_IMPORTED_MODULE_32__/* .DrawSimpleText */ .b(this._text[0], this._dStyleKey, this._dColor);
69947
69856
  if (irestLength < dFirst.getMeasuredWidth()) {
69948
69857
  if (istart == 0 && bIsPunctuation) {
69949
69858
  bForceAppend = true;
@@ -69955,7 +69864,7 @@ var TextNode = /*#__PURE__*/function (_BaseNode) {
69955
69864
  irestLength = dline.calcRestWidth();
69956
69865
  }
69957
69866
  }
69958
- var dItem = new _editor_draw_drawNode_DrawTextNode__WEBPACK_IMPORTED_MODULE_25__/* .DrawTextNode */ .v(this._hoEditorFactoryID, this._rootPath, this, istart, irestLength, this._text.length - 1, paragraphNode.combineParagraph.charSpace, dline);
69867
+ var dItem = new _editor_draw_drawNode_DrawTextNode__WEBPACK_IMPORTED_MODULE_27__/* .DrawTextNode */ .v(this._hoEditorFactoryID, this._rootPath, this, istart, irestLength, this._text.length - 1, paragraphNode.combineParagraph.charSpace, dline);
69959
69868
  if (dItem.endIndex < 0) {
69960
69869
  if (iend < this.text.length - 1) {
69961
69870
  dline.fitLines();
@@ -69965,7 +69874,7 @@ var TextNode = /*#__PURE__*/function (_BaseNode) {
69965
69874
  continue;
69966
69875
  }
69967
69876
  dItem.dWidth = dItem.dText.dWidth;
69968
- dItem.dWidth = dItem.dWidth;
69877
+ // (dItem as DrawInfos).dWidth = dItem.dWidth;
69969
69878
  dline.addChild(dItem);
69970
69879
  dline.drawItems.push(dItem);
69971
69880
  this._drawNodes.push(dItem);
@@ -69973,10 +69882,10 @@ var TextNode = /*#__PURE__*/function (_BaseNode) {
69973
69882
  if (iend < this.text.length - 1) {
69974
69883
  dline.fitLines();
69975
69884
  dline = dline.paragraphNode.getNextDline(dline);
69976
- if (dline.paragraphNode.parentNode instanceof _TextInputFieldNode__WEBPACK_IMPORTED_MODULE_29__/* .TextInputFieldNode */ .re) {
69885
+ if (dline.paragraphNode.parentNode instanceof _TextInputFieldNode__WEBPACK_IMPORTED_MODULE_31__/* .TextInputFieldNode */ .re) {
69977
69886
  var index = dline.paragraphNode.drawlines.indexOf(dline);
69978
69887
  var prevLine = dline.paragraphNode.drawlines[index - 1];
69979
- if (prevLine && prevLine instanceof _editor_draw_DrawLine__WEBPACK_IMPORTED_MODULE_24__/* .DrawLine */ .a) {
69888
+ if (prevLine && prevLine instanceof _editor_draw_DrawLine__WEBPACK_IMPORTED_MODULE_26__/* .DrawLine */ .a) {
69980
69889
  var _dline$paragraphNode$ = dline.paragraphNode.parentNode.getLeftWidth(),
69981
69890
  _dline$paragraphNode$2 = (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z)(_dline$paragraphNode$, 3),
69982
69891
  ileft = _dline$paragraphNode$2[0],
@@ -69992,28 +69901,7 @@ var TextNode = /*#__PURE__*/function (_BaseNode) {
69992
69901
  istart = iend + 1;
69993
69902
  }
69994
69903
  }
69995
- // dline.update();
69996
69904
  return dline.paragraphNode.getLastDrawline();
69997
- // dline.drawItems.splice(inLineIndex,0,this._drawNodes.slice(istart,iend))
69998
- // for(let i=istart;i<=iend;i++){
69999
- // const awidth= (this._drawNodes[i] as DrawTextNode).dWidth;
70000
- // if ( (usedWidth+awidth>lineWidth)&&usedWidth>0){
70001
- // //当前是行中的最后一个节点，
70002
- // if (i===aline.drawItems.length-1){
70003
- // aline=aline.paragraphNode.getNextDline(droots,aline);
70004
- // }else {
70005
- // const anextLine=aline.paragraphNode.getNextDline(droots,aline);
70006
- // anextLine.drawItems.unshift(aline.drawItems[aline.drawItems.length-1]);
70007
- // const ditem=aline.drawItems.pop();
70008
- // }
70009
- // aline.update();
70010
- // aline=paragraphNode.getNextDline(droots,aline);
70011
- // usedWidth=0;
70012
- // }
70013
- // aline.drawItems.push(this._drawNodes[i]);
70014
- // usedWidth+=awidth+charSpace;
70015
- // }
70016
- // aline.update();
70017
69905
  }
70018
69906
  }, {
70019
69907
  key: "clearNeedRedrawDitems",
@@ -70022,7 +69910,7 @@ var TextNode = /*#__PURE__*/function (_BaseNode) {
70022
69910
  var dItem = this._drawNodes[i];
70023
69911
  if (dItem.startIndex >= start || dItem.startIndex < start && dItem.endIndex >= start) {
70024
69912
  if (dItem.parent) {
70025
- if (dItem.parent instanceof _editor_draw_DrawLine__WEBPACK_IMPORTED_MODULE_24__/* .DrawLine */ .a) {
69913
+ if (dItem.parent instanceof _editor_draw_DrawLine__WEBPACK_IMPORTED_MODULE_26__/* .DrawLine */ .a) {
70026
69914
  var index = dItem.parent.drawItems.indexOf(dItem);
70027
69915
  if (index >= 0) dItem.parent.drawItems.splice(index, 1);
70028
69916
  }
@@ -70033,13 +69921,6 @@ var TextNode = /*#__PURE__*/function (_BaseNode) {
70033
69921
  }
70034
69922
  }
70035
69923
  }
70036
- // public add2DrawTree(dRoots: DrawLine[]) {
70037
- // if (this._drawNodes.length === 0) {
70038
- // this.node2DrawNode();
70039
- // const dline = HOEditorFactorys.instance().getFactory(this._hoEditorFactoryID).docTree.getNodeParaNode(this).getLastDline();
70040
- // // this.placeDNode2DrawLine(dRoots,dline.paragraphNode, 0,this._text.length-1);
70041
- // }
70042
- // }
70043
69924
  }, {
70044
69925
  key: "hoEditorFactoryID",
70045
69926
  get: function get() {
@@ -70100,14 +69981,14 @@ var TextNode = /*#__PURE__*/function (_BaseNode) {
70100
69981
  aStart = aEnd;
70101
69982
  aEnd = tmp;
70102
69983
  }
70103
- var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_27__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID);
69984
+ var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_29__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID);
70104
69985
  var selectedText = this.text.substring(aStart + 1, aEnd + 1); //获取该文本节点的选中区域文本
70105
69986
  var frontNodeText = this.text.substring(0, aStart + 1); //选中区域前的文本
70106
69987
  var behindNodeText = this.text.substring(aEnd + 1, this.text.length); //选中区域后的文本
70107
69988
  if (aStart < 0) {
70108
69989
  //情况一：首尾是同一节点且从文本最开始选中；情况二：尾节点
70109
69990
  this.deleteByIndex(selectedText.length, this.getLength() - 1); //节点一
70110
- var unSelectedTextNode = new TextNode(this._hoEditorFactoryID, this.rootNodes, this.parentNode, _BaseNode__WEBPACK_IMPORTED_MODULE_22__/* .NodeType */ .Jq.ntText, behindNodeText, this.styleIndex //原来的样式
69991
+ var unSelectedTextNode = new TextNode(this._hoEditorFactoryID, this.rootNodes, this.parentNode, _BaseNode__WEBPACK_IMPORTED_MODULE_24__/* .NodeType */ .Jq.ntText, behindNodeText, this.styleIndex //原来的样式
70111
69992
  );
70112
69993
 
70113
69994
  hoEditorFactory.docTree.insertNodeAfterPath("".concat(this.getNodePath(), "/").concat(this.text.length - 1), unSelectedTextNode); //节点二
@@ -70115,11 +69996,11 @@ var TextNode = /*#__PURE__*/function (_BaseNode) {
70115
69996
  } else {
70116
69997
  //如果选中区域的结束节点在该文本节点的末端，也只用拆分出2个节点;若选中区域在文本节点的中间区域，需要拆分出三个节点
70117
69998
  this.deleteByIndex(frontNodeText.length, this.getLength() - 1); //节点一
70118
- var selectedTextNode = new TextNode(this._hoEditorFactoryID, this.rootNodes, this.parentNode, _BaseNode__WEBPACK_IMPORTED_MODULE_22__/* .NodeType */ .Jq.ntText, selectedText, this.styleIndex);
69999
+ var selectedTextNode = new TextNode(this._hoEditorFactoryID, this.rootNodes, this.parentNode, _BaseNode__WEBPACK_IMPORTED_MODULE_24__/* .NodeType */ .Jq.ntText, selectedText, this.styleIndex);
70119
70000
  hoEditorFactory.docTree.insertNodeAfterPath("".concat(this.getNodePath(), "/").concat(this.text.length - 1), selectedTextNode); //节点二
70120
70001
  ret.unshift(selectedTextNode);
70121
70002
  if (behindNodeText.length > 0) {
70122
- var behindTextNode = new TextNode(this._hoEditorFactoryID, this.rootNodes, this.parentNode, _BaseNode__WEBPACK_IMPORTED_MODULE_22__/* .NodeType */ .Jq.ntText, behindNodeText, this.styleIndex);
70003
+ var behindTextNode = new TextNode(this._hoEditorFactoryID, this.rootNodes, this.parentNode, _BaseNode__WEBPACK_IMPORTED_MODULE_24__/* .NodeType */ .Jq.ntText, behindNodeText, this.styleIndex);
70123
70004
  hoEditorFactory.docTree.insertNodeAfterPath("".concat(selectedTextNode.getNodePath(), "/").concat(selectedTextNode.text.length - 1), behindTextNode); //节点三
70124
70005
  ret.push(behindTextNode);
70125
70006
  }
@@ -70146,7 +70027,7 @@ var TextNode = /*#__PURE__*/function (_BaseNode) {
70146
70027
  var ilen = arr.length;
70147
70028
  for (var i = 1; i < ilen; i++) {
70148
70029
  textNode.insertText(arr[i]._text, textNode._text.length);
70149
- _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_27__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID).docTree.deleteNode(arr[i]);
70030
+ _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_29__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID).docTree.deleteNode(arr[i]);
70150
70031
  }
70151
70032
  return textNode;
70152
70033
  }
@@ -70158,7 +70039,7 @@ var TextNode = /*#__PURE__*/function (_BaseNode) {
70158
70039
  }, {
70159
70040
  key: "prevPath",
70160
70041
  value: function prevPath(path) {
70161
- var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_27__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID);
70042
+ var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_29__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID);
70162
70043
  var nodePosition = hoEditorFactory.docTree.findNodePositionByPath(path);
70163
70044
  var childIndex = nodePosition.childIndex;
70164
70045
  var topath = "";
@@ -70200,7 +70081,7 @@ var TextNode = /*#__PURE__*/function (_BaseNode) {
70200
70081
  var t = parseInt(arr[arr.length - 1]);
70201
70082
  copytxt = this.text.substr(s, t - s + 1);
70202
70083
  }
70203
- var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_27__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID);
70084
+ var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_29__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID);
70204
70085
  var combineStyle;
70205
70086
  var style = hoEditorFactory.docTree.styles[this.styleIndex];
70206
70087
  if (style) {
@@ -70210,9 +70091,9 @@ var TextNode = /*#__PURE__*/function (_BaseNode) {
70210
70091
  this.styleIndex = 0;
70211
70092
  }
70212
70093
  if (isCopy) {
70213
- var styleJson = JSON.parse(JSON.stringify(combineStyle, _domNode_TextStyle__WEBPACK_IMPORTED_MODULE_26__/* .CombineStyle */ .xc.whiteList()));
70094
+ var styleJson = JSON.parse(JSON.stringify(combineStyle, _domNode_TextStyle__WEBPACK_IMPORTED_MODULE_28__/* .CombineStyle */ .xc.whiteList()));
70214
70095
  var json = {
70215
- nodeType: _BaseNode__WEBPACK_IMPORTED_MODULE_22__/* .NodeType */ .Jq[this.nodeType],
70096
+ nodeType: _BaseNode__WEBPACK_IMPORTED_MODULE_24__/* .NodeType */ .Jq[this.nodeType],
70216
70097
  style: styleJson,
70217
70098
  text: copytxt,
70218
70099
  styleIndex: this._styleIndex
@@ -70229,7 +70110,7 @@ var TextNode = /*#__PURE__*/function (_BaseNode) {
70229
70110
  }
70230
70111
  return {
70231
70112
  "TextNode": {
70232
- nodeType: _BaseNode__WEBPACK_IMPORTED_MODULE_22__/* .NodeType */ .Jq[this.nodeType],
70113
+ nodeType: _BaseNode__WEBPACK_IMPORTED_MODULE_24__/* .NodeType */ .Jq[this.nodeType],
70233
70114
  text: copytxt,
70234
70115
  styleIndex: this._styleIndex
70235
70116
  }
@@ -70263,7 +70144,7 @@ var TextNode = /*#__PURE__*/function (_BaseNode) {
70263
70144
  var dItem = this._drawNodes[i];
70264
70145
  if (dItem.startIndex >= index) {
70265
70146
  if (dItem.parent) {
70266
- if (dItem.parent instanceof _editor_draw_DrawLine__WEBPACK_IMPORTED_MODULE_24__/* .DrawLine */ .a) {
70147
+ if (dItem.parent instanceof _editor_draw_DrawLine__WEBPACK_IMPORTED_MODULE_26__/* .DrawLine */ .a) {
70267
70148
  var _index = dItem.parent.drawItems.indexOf(dItem);
70268
70149
  if (_index >= 0) dItem.parent.drawItems.splice(_index, 1);
70269
70150
  }
@@ -70294,13 +70175,13 @@ var TextNode = /*#__PURE__*/function (_BaseNode) {
70294
70175
  key: "json2Node",
70295
70176
  value: function json2Node(hoEditorFactoryID, json, rootNodes, pNode) {
70296
70177
  //解析样式
70297
- var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_27__/* .HOEditorFactorys */ .b.instance().getFactory(hoEditorFactoryID);
70178
+ var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_29__/* .HOEditorFactorys */ .b.instance().getFactory(hoEditorFactoryID);
70298
70179
  var styleIndex = Number(json.styleIndex);
70299
70180
  if (json["style"]) {
70300
70181
  var styleJson = json.style;
70301
70182
  this.transType(styleJson);
70302
70183
  //styleJson["script"] = StyleScriptType[styleJson.script];
70303
- var textStyle = new _domNode_TextStyle__WEBPACK_IMPORTED_MODULE_26__/* .TextStyle */ .pn(hoEditorFactoryID);
70184
+ var textStyle = new _domNode_TextStyle__WEBPACK_IMPORTED_MODULE_28__/* .TextStyle */ .pn(hoEditorFactoryID);
70304
70185
  var combineStyle = textStyle.combineStyle;
70305
70186
  //样式赋值
70306
70187
  if (styleJson["size"] === combineStyle.size) {
@@ -70354,7 +70235,7 @@ var TextNode = /*#__PURE__*/function (_BaseNode) {
70354
70235
  }
70355
70236
  var text = json.text.replace("<上标>", "").replace("</上标>", "").replace("<下标>", "").replace("</下标>", "");
70356
70237
  text = text.replaceAll("(span)", "").replaceAll("(/span)", "");
70357
- var textNode = new TextNode(hoEditorFactoryID, rootNodes, pNode ? pNode : null, _BaseNode__WEBPACK_IMPORTED_MODULE_22__/* .NodeType */ .Jq.ntText, text, styleIndex, json.errorIndex ? Number(json.errorIndex) : undefined);
70238
+ var textNode = new TextNode(hoEditorFactoryID, rootNodes, pNode ? pNode : null, _BaseNode__WEBPACK_IMPORTED_MODULE_24__/* .NodeType */ .Jq.ntText, text, styleIndex, json.errorIndex ? Number(json.errorIndex) : undefined);
70358
70239
  var search = function search(index) {
70359
70240
  var sindex = json.text.indexOf("(span)", index);
70360
70241
  if (sindex >= 0) {
@@ -70380,7 +70261,7 @@ var TextNode = /*#__PURE__*/function (_BaseNode) {
70380
70261
  }
70381
70262
  }]);
70382
70263
  return TextNode;
70383
- }(_BaseNode__WEBPACK_IMPORTED_MODULE_22__/* .BaseNode */ .Hd);
70264
+ }(_BaseNode__WEBPACK_IMPORTED_MODULE_24__/* .BaseNode */ .Hd);
70384
70265
 
70385
70266
  /***/ }),
70386
70267
 
@@ -70557,8 +70438,8 @@ var HOEditorFactorys = __webpack_require__(74089);
70557
70438
  var SeparateCharNode = __webpack_require__(39385);
70558
70439
  // EXTERNAL MODULE: ./src/editor/utils/UnitConvert.ts
70559
70440
  var UnitConvert = __webpack_require__(91404);
70560
- // EXTERNAL MODULE: ./src/editor/dom/treeNode/BaseNode.ts
70561
- var BaseNode = __webpack_require__(62358);
70441
+ // EXTERNAL MODULE: ./src/editor/dom/treeNode/CellNode.ts
70442
+ var CellNode = __webpack_require__(68598);
70562
70443
  // EXTERNAL MODULE: ./src/editor/draw/drawNode/DrawDownListNode.ts
70563
70444
  var DrawDownListNode = __webpack_require__(93541);
70564
70445
  // EXTERNAL MODULE: ./src/editor/dom/treeNode/TextInputFieldNode.ts + 1 modules
@@ -70678,6 +70559,9 @@ var DrawLine = /*#__PURE__*/function (_DrawContainer) {
70678
70559
  },
70679
70560
  set: function set(val) {
70680
70561
  if (val !== this._charSpace) {
70562
+ if (val < 0) {
70563
+ console.warn("charSpace不能为负数", val);
70564
+ }
70681
70565
  this._charSpace = val;
70682
70566
  }
70683
70567
  }
@@ -70850,9 +70734,8 @@ var DrawLine = /*#__PURE__*/function (_DrawContainer) {
70850
70734
  }, {
70851
70735
  key: "adjustDHeight",
70852
70736
  value: function adjustDHeight(dHeight) {
70853
- if (this.paragraphNode.parentNode && this.paragraphNode.parentNode.nodeType === BaseNode/* NodeType */.Jq.ntCell && this.paragraphNode.parentNode.table.tableProperty.isAutoChangeLine) {
70854
- var cell = this.paragraphNode.parentNode;
70855
- //const [r, c] = cell.table.getCellInfos(cell);
70737
+ var cell = this.paragraphNode.parentNode;
70738
+ if (cell instanceof CellNode/* CellNode */.D && cell.table.tableProperty.isAutoChangeLine) {
70856
70739
  if (cell.needPaintLineGrid() && dHeight, cell.table.tableProperty.autoLineHeightPx) {
70857
70740
  dHeight = Math.max(dHeight, cell.table.tableProperty.autoLineHeightPx - this.paragraphNode.combineParagraph.lineSpace - this.paragraphNode.combineParagraph.topMarginPixes);
70858
70741
  }
@@ -70932,6 +70815,7 @@ var DrawLine = /*#__PURE__*/function (_DrawContainer) {
70932
70815
  }
70933
70816
  this._charCount = iCount;
70934
70817
  actualWidth += dWidth + spacing; //charspace;
70818
+ // console.log(dWidth, spacing, '------');
70935
70819
  }
70936
70820
 
70937
70821
  this._maxFontHeight = maxFontHeight;
@@ -70947,87 +70831,52 @@ var DrawLine = /*#__PURE__*/function (_DrawContainer) {
70947
70831
  }
70948
70832
  }, {
70949
70833
  key: "updateLineStyle",
70950
- value: function updateLineStyle() {
70951
- // let dHeight = this._paragraphNode.hoEditorFactory.defaultLineHeight;
70834
+ value: function updateLineStyle(isUpdate) {
70952
70835
  //FIXME:去掉左边距后真实的宽度,后续还要去掉margin的的left right
70953
70836
  //处理段落的缩进2024-02-19
70954
70837
  var leftWidthInfos = this.paragraphNode.getParagraphLeftWidth();
70955
70838
  var ileft = leftWidthInfos[0];
70956
- this.x = this.paragraphNode.combineParagraph.leftMarginPixes;
70957
- if (leftWidthInfos[2]) this.x += ileft;
70958
- // const lwidth =
70959
- // leftWidthInfos[1] -
70960
- // this.paragraphNode.combineParagraph.leftMarginPixes -
70961
- // this.paragraphNode.combineParagraph.rightMarginPixes;
70839
+ // this.x = ;
70840
+ if (leftWidthInfos[2]) {
70841
+ this.x = this.paragraphNode.combineParagraph.leftMarginPixes + ileft;
70842
+ } else {
70843
+ this.x = this.paragraphNode.combineParagraph.leftMarginPixes + this.dLeft;
70844
+ }
70962
70845
  var lwidth = this._dWidth;
70846
+ // console.log(this.x, this.dLeft, '+++++++++++++++', leftWidthInfos);
70963
70847
  //文字摆放开始位置
70964
- var usedWidth = 0; //this.paragraphNode.combineParagraph.leftMarginPixes;
70965
- //字间距，分散对齐:计算宽度时候使用默认字间距
70966
- // const charspace =
70967
- // this._paragraphNode.combineParagraph.align == Align.alSpaceEqually
70968
- // ? gCharSpace
70969
- // : this.charSpace;
70848
+ var usedWidth = 0;
70970
70849
  var spacing = 0;
70971
70850
  //最后一个字不计算字间距位置
70972
- // this._dHeight = dHeight;
70973
70851
  var isLastLine = this === this._paragraphNode.drawlines[this._paragraphNode.drawlines.length - 1];
70974
70852
  this._charSpace = this._paragraphNode.combineParagraph.charSpace;
70975
- // if (restWidth > 0&& this.drawItems.length>1) {
70976
- // this._charSpace = restWidth / this.drawItems.length - 1;
70977
- // }
70978
- // this.setBounds(this._dLeft, this._dTop, this._dWidth, this._dHeight);
70979
- // const shape = new createjs.Shape();
70980
- // shape.x = 0;
70981
- // shape.y = 0;
70982
- // shape.graphics
70983
- // .clear()
70984
- // .beginFill("#FFEE90")
70985
- // .drawRect(
70986
- // 0,
70987
- // 0,
70988
- // this._dWidth,
70989
- // this._dHeight + this.paragraphNode.combineParagraph.lineSpace
70990
- // );
70991
- // shape.alpha = 0.5;
70992
- // const y = this._dTop;
70993
- // this.removeAllChildren();
70994
- // this.uncache();
70995
- // this.addChildAt(shape, 0);
70996
70853
  //2.计算起始位置
70997
70854
  switch (this._paragraphNode.combineParagraph.align) {
70998
70855
  case Paragraph/* Align */.xM.alleft:
70999
- {
71000
- break;
71001
- }
70856
+ break;
71002
70857
  case Paragraph/* Align */.xM.alright:
71003
- {
71004
- if (lwidth - this.actualWidth > 0) {
71005
- usedWidth += lwidth - this.actualWidth;
71006
- }
71007
- break;
70858
+ if (lwidth - this.actualWidth > 0) {
70859
+ usedWidth += lwidth - this.actualWidth;
71008
70860
  }
70861
+ break;
71009
70862
  case Paragraph/* Align */.xM.alcenter:
71010
- {
71011
- if (lwidth - this.actualWidth > 0) {
71012
- usedWidth += (lwidth - this.actualWidth) / 2;
71013
- }
71014
- break;
70863
+ if (lwidth - this.actualWidth > 0) {
70864
+ usedWidth += (lwidth - this.actualWidth) / 2;
71015
70865
  }
70866
+ break;
71016
70867
  case Paragraph/* Align */.xM.alSpaceEqually:
71017
- {
71018
- //更新字间距,目标是让字的宽度相同
71019
- if (this._charCount > 1 && !isLastLine) {
71020
- spacing = Math.floor((lwidth - this.actualWidth) / (this._charCount - 1) * 100) / 100;
71021
- } else {
71022
- spacing = this._paragraphNode.combineParagraph.charSpace;
71023
- }
71024
- // if (this.drawItems.length > 1) {
71025
- // spacing = (lwidth - this.actualWidth) / (this.drawItems.length - 1);
71026
- // }
71027
- this.charSpace += spacing;
71028
- usedWidth += 0;
71029
- break;
70868
+ //更新字间距,目标是让字的宽度相同
70869
+ if (this._charCount > 1 && !isLastLine) {
70870
+ spacing = Math.floor((lwidth - this.actualWidth) / (this._charCount - 1) * 100) / 100;
70871
+ } else {
70872
+ spacing = this._paragraphNode.combineParagraph.charSpace;
70873
+ }
70874
+ if (spacing < 0) {
70875
+ spacing = 0;
71030
70876
  }
70877
+ this.charSpace += spacing;
70878
+ usedWidth += 0;
70879
+ break;
71031
70880
  }
71032
70881
  if (Paragraph/* Align */.xM.alright && this.paragraphNode.parentNode instanceof TextInputFieldNode/* TextInputFieldNode */.re && this.paragraphNode.parentNode.alignWithBlocked) {
71033
70882
  usedWidth = 0;
@@ -71041,9 +70890,11 @@ var DrawLine = /*#__PURE__*/function (_DrawContainer) {
71041
70890
  return 0;
71042
70891
  }
71043
70892
  if (dline._paragraphNode.combineParagraph.align != Paragraph/* Align */.xM.alSpaceEqually) return dline.charSpace;
71044
- if (isLastLine) return dline._paragraphNode.combineParagraph.charSpace;
71045
- //oldcharspace;
71046
- else return dline.charSpace;
70893
+ if (isLastLine) {
70894
+ return dline._paragraphNode.combineParagraph.charSpace;
70895
+ } else {
70896
+ return dline.charSpace;
70897
+ }
71047
70898
  };
71048
70899
  //3.放置
71049
70900
  //DONE:行高
@@ -71054,9 +70905,6 @@ var DrawLine = /*#__PURE__*/function (_DrawContainer) {
71054
70905
  if (aHeight <= this._docHeight) {
71055
70906
  this._dHeight = aHeight + this._maxFontHeight * (this.paragraphNode.combineParagraph.lineSpace - 1);
71056
70907
  }
71057
- // } else {
71058
- //this._dHeight = this.paragraphNode.combineParagraph.lineSpace * dHeight;
71059
- // }
71060
70908
  this.dHeight = this._dHeight;
71061
70909
  var bottompos = dHeight + (this._dHeight - dHeight) / 2;
71062
70910
  for (var j = 0; j < this.drawItems.length; j++) {
@@ -71070,8 +70918,6 @@ var DrawLine = /*#__PURE__*/function (_DrawContainer) {
71070
70918
  this.drawItems[j].x = usedWidth;
71071
70919
  this.drawItems[j].y = bottompos;
71072
70920
  usedWidth += dwidth + charSpace;
71073
- // + 1;
71074
- // this._charSpace;
71075
70921
  }
71076
70922
  }
71077
70923
  //4.前一个字符需要在下一个字符的上层,处理斜体被遮盖的问题
@@ -71083,18 +70929,6 @@ var DrawLine = /*#__PURE__*/function (_DrawContainer) {
71083
70929
  }
71084
70930
  level++;
71085
70931
  }
71086
- // if (
71087
- // this._paragraphNode.hoEditorFactory.drawTree.paintStatus !==
71088
- // PaintState.psPreview &&
71089
- // this._paragraphNode.hoEditorFactory.drawTree.paintStatus !==
71090
- // PaintState.psPrint
71091
- // )
71092
- // this.cache(
71093
- // 0,
71094
- // 0,
71095
- // this._dWidth,
71096
- // this._dHeight //+ lineSpace * 2 + 1
71097
- // );
71098
70932
  }
71099
70933
  }, {
71100
70934
  key: "isFullNumEnglish",
@@ -71548,7 +71382,7 @@ var DrawResize = /*#__PURE__*/function () {
71548
71382
  /* harmony export */ });
71549
71383
  var gDrawIntfID = 'I-AM-IDrawInfos';
71550
71384
  function instanceOfIDrawInfos(object) {
71551
- return object.discriminator === 'I-AM-IDrawInfos';
71385
+ return object && object.discriminator === 'I-AM-IDrawInfos';
71552
71386
  }
71553
71387
 
71554
71388
  /***/ }),
@@ -73760,7 +73594,6 @@ var DrawPageMainDoc = /*#__PURE__*/function (_DrawArea) {
73760
73594
  this._dWidth = this._maxWidth;
73761
73595
  this._dHeight = this._maxHeight;
73762
73596
  this._docHeight = 0;
73763
-
73764
73597
  //检测边框变化情况，如有变化则重绘
73765
73598
  }
73766
73599
  }]);
@@ -74466,8 +74299,10 @@ var DrawCombineNode = /*#__PURE__*/function (_DrawContainer) {
74466
74299
  (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_5__/* ["default"] */ .Z)((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z)(_this), "_discriminator", void 0);
74467
74300
  (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_5__/* ["default"] */ .Z)((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z)(_this), "_event", void 0);
74468
74301
  (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_5__/* ["default"] */ .Z)((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z)(_this), "_hoEditorFactoryID", void 0);
74302
+ (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_5__/* ["default"] */ .Z)((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z)(_this), "MarkNodeType", void 0);
74469
74303
  _this._hoEditorFactoryID = hoeditfactoryID;
74470
74304
  _this._node = node;
74305
+ _this.MarkNodeType = node.MarkNodeType;
74471
74306
  _this._discriminator = _IDrawInfos__WEBPACK_IMPORTED_MODULE_13__/* .gDrawIntfID */ .t;
74472
74307
  _this._charSpace = 0;
74473
74308
  _this.bindEvent();
@@ -85655,7 +85490,9 @@ var DrawTree = /*#__PURE__*/function () {
85655
85490
  }
85656
85491
  }
85657
85492
  }
85658
- if (NodePosition/* NodePosition */.F.treePathCompare(aEndPath, hoeditorFactory.docTree.getNodeLastPath(node)) <= 0) break;
85493
+ if (NodePosition/* NodePosition */.F.treePathCompare(aEndPath, hoeditorFactory.docTree.getNodeLastPath(node)) <= 0) {
85494
+ break;
85495
+ }
85659
85496
  // if (node === npEnd.node) {
85660
85497
  // break;
85661
85498
  // }
@@ -85674,20 +85511,7 @@ var DrawTree = /*#__PURE__*/function () {
85674
85511
  // dline = paraNode.getLastDrawline();
85675
85512
  // dline = dline.paragraphNode.getLastDrawline();
85676
85513
  }
85677
- // const arr = aEndPath.split("/");
85678
- // const endIndex = parseInt(arr[arr.length - 1]);
85679
- // if (node instanceof ParagraphNode) {
85680
- // (node as ParagraphNode).placeDNodeAfterDline(dlines, dline);
85681
- // } else {
85682
- // node?.placeDNode2DrawLine(
85683
- // dlines,
85684
- // paraNode,
85685
- // dline,
85686
- // index,
85687
- // 0,
85688
- // endIndex
85689
- // );
85690
- // }
85514
+
85691
85515
  if (dline instanceof DrawLine/* DrawLine */.a) {
85692
85516
  dline.fitLines();
85693
85517
  dline.paragraphNode.updateDrawLineStyle();
@@ -210678,7 +210502,7 @@ var TextNode = __webpack_require__(27198);
210678
210502
  // EXTERNAL MODULE: ./src/editor/dom/treeNode/ParagraphNode.ts
210679
210503
  var ParagraphNode = __webpack_require__(67945);
210680
210504
  ;// CONCATENATED MODULE: ./src/components/version.ts
210681
- /* harmony default export */ var version = ('3.1.159');
210505
+ /* harmony default export */ var version = ('3.1.160');
210682
210506
  // EXTERNAL MODULE: ./src/components/controls/poperTipText/PoperTipText.vue + 5 modules
210683
210507
  var PoperTipText = __webpack_require__(84531);
210684
210508
  ;// CONCATENATED MODULE: ./src/components/controls/poperTipText/index.ts
@@ -223580,6 +223404,8 @@ var VueController = /*#__PURE__*/function () {
223580
223404
  loopChildNodes(node.childNodes);
223581
223405
  } else if (node instanceof ParagraphNode/* ParagraphNode */.C) {
223582
223406
  docText += '\n';
223407
+ } else if (node instanceof SignNode/* SignNode */.N && node.customProperty && node.customProperty.bce03) {
223408
+ docText += node.customProperty.bce03;
223583
223409
  }
223584
223410
  }
223585
223411
  };