hoeditor-web 3.1.158 → 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 (3) hide show
  1. package/lib/hoeditor.umd.js +180 -518
  2. package/lib/hoeditor.umd.min.js +3 -3
  3. package/package.json +1 -1
package/lib/hoeditor.umd.js CHANGED
@@ -17134,7 +17134,7 @@ var component = (0,componentNormalizer/* default */.Z)(
17134
17134
 
17135
17135
  /***/ }),
17136
17136
 
17137
- /***/ 97628:
17137
+ /***/ 19363:
17138
17138
  /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
17139
17139
 
17140
17140
  "use strict";
@@ -17154,7 +17154,7 @@ var es_string_includes = __webpack_require__(32023);
17154
17154
  var es_regexp_exec = __webpack_require__(74916);
17155
17155
  // EXTERNAL MODULE: ./node_modules/core-js/modules/es.string.replace.js
17156
17156
  var es_string_replace = __webpack_require__(15306);
17157
- ;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/table/TableCellPoper.vue?vue&type=template&id=bcd755a2&
17157
+ ;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/table/TableCellPoper.vue?vue&type=template&id=7a33549e&
17158
17158
 
17159
17159
 
17160
17160
 
@@ -17420,7 +17420,7 @@ var render = function render() {
17420
17420
  };
17421
17421
  var staticRenderFns = [];
17422
17422
 
17423
- ;// CONCATENATED MODULE: ./src/components/controls/table/TableCellPoper.vue?vue&type=template&id=bcd755a2&
17423
+ ;// CONCATENATED MODULE: ./src/components/controls/table/TableCellPoper.vue?vue&type=template&id=7a33549e&
17424
17424
 
17425
17425
  // EXTERNAL MODULE: ./node_modules/@babel/runtime/helpers/esm/toConsumableArray.js + 3 modules
17426
17426
  var toConsumableArray = __webpack_require__(61748);
@@ -17804,21 +17804,10 @@ var popper = __webpack_require__(95551);
17804
17804
  this.isCanSearch = true;
17805
17805
  }
17806
17806
  var _height = this.poperList.length * 36 + 72;
17807
- // if (this.isAllowMultiSelect) height += 36;
17808
17807
  if (this.isCanSearch) _height += 28;
17809
- // if (height < 360) {
17810
- // let posStyle = this.computedPoperPosition(height, this.poperPos);
17811
- // delete posStyle['height'];
17812
- // this.posStyle = posStyle;
17813
- // } else {
17814
- // let posStyle = this.computedPoperPosition(360, this.poperPos);
17815
- // delete posStyle['height'];
17816
- // this.posStyle = posStyle;
17817
- // }
17818
17808
  }
17819
17809
  },
17820
17810
  getTime: function getTime(val) {
17821
- this.date = val.value;
17822
17811
  if (val.type == 'dblclick') {
17823
17812
  this.sureDate();
17824
17813
  }
@@ -17930,10 +17919,10 @@ var popper = __webpack_require__(95551);
17930
17919
  });
17931
17920
  ;// CONCATENATED MODULE: ./src/components/controls/table/TableCellPoper.vue?vue&type=script&lang=js&
17932
17921
  /* harmony default export */ var table_TableCellPopervue_type_script_lang_js_ = (TableCellPopervue_type_script_lang_js_);
17933
- ;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-32.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-32.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-32.use[2]!./node_modules/less-loader/dist/cjs.js??clonedRuleSet-32.use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/table/TableCellPoper.vue?vue&type=style&index=0&id=bcd755a2&prod&lang=less&
17922
+ ;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-32.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-32.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-32.use[2]!./node_modules/less-loader/dist/cjs.js??clonedRuleSet-32.use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/table/TableCellPoper.vue?vue&type=style&index=0&id=7a33549e&prod&lang=less&
17934
17923
  // extracted by mini-css-extract-plugin
17935
17924
 
17936
- ;// CONCATENATED MODULE: ./src/components/controls/table/TableCellPoper.vue?vue&type=style&index=0&id=bcd755a2&prod&lang=less&
17925
+ ;// CONCATENATED MODULE: ./src/components/controls/table/TableCellPoper.vue?vue&type=style&index=0&id=7a33549e&prod&lang=less&
17937
17926
 
17938
17927
  // EXTERNAL MODULE: ./node_modules/@vue/vue-loader-v15/lib/runtime/componentNormalizer.js
17939
17928
  var componentNormalizer = __webpack_require__(70713);
@@ -56341,7 +56330,6 @@ var ParagraphNode = /*#__PURE__*/function (_BaseNode) {
56341
56330
  value: function getParagraphLeftWidth() {
56342
56331
  //如果父文档节点派生于rectNode(用于表格基类),则取
56343
56332
  var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_20__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID);
56344
- var pNode = this._parentNode;
56345
56333
  var aLeft;
56346
56334
  var aWidth;
56347
56335
  var bRectAlign = false;
@@ -56357,11 +56345,6 @@ var ParagraphNode = /*#__PURE__*/function (_BaseNode) {
56357
56345
  aWidth = aWidth - aLeft - hoEditorFactory.unitConvert.mmConversionPx(pRectNode.cellProperty.cellInnerMargin[3] * 10, true);
56358
56346
  bRectAlign = true;
56359
56347
  }
56360
- // aLeft = this._combineParagraph.leftMarginPixes;
56361
- // aWidth =
56362
- // pRectNode.width -
56363
- // this._combineParagraph.leftMarginPixes -
56364
- // this._combineParagraph.rightMarginPixes;
56365
56348
  } else {
56366
56349
  aLeft = 0;
56367
56350
  aWidth = hoEditorFactory.pageProperty.widthPixes - hoEditorFactory.pageProperty.leftMarginPixes - hoEditorFactory.pageProperty.rightMarginPixes;
@@ -56392,10 +56375,6 @@ var ParagraphNode = /*#__PURE__*/function (_BaseNode) {
56392
56375
  key: "getParentLeftWidthNode",
56393
56376
  value: function getParentLeftWidthNode() {
56394
56377
  var pNode = this.parentNode;
56395
- //let para = HOEditorFactorys.instance().getFactory(this._hoEditorFactoryID).docTree.paragraphs[this._paraNo];
56396
- // if (!para) {
56397
- // para = HOEditorFactorys.instance().getFactory(this._hoEditorFactoryID).docTree.paragraphs[0];
56398
- // }
56399
56378
  while (pNode) {
56400
56379
  if (pNode instanceof _RectNode__WEBPACK_IMPORTED_MODULE_15__/* .RectNode */ .z) {
56401
56380
  return pNode;
@@ -56449,10 +56428,13 @@ var ParagraphNode = /*#__PURE__*/function (_BaseNode) {
56449
56428
  var paragraphWidth = leftTopInfos[1];
56450
56429
  var index = this._drawLines.length;
56451
56430
  if (index > 0) {
56452
- var prevLine = this._drawLines[index - 1];
56453
- prevLine.x = this.combineParagraph.leftMarginPixes + ileft;
56454
- prevLine.dWidth = paragraphWidth - this.combineParagraph.leftMarginPixes - this.combineParagraph.rightMarginPixes;
56455
- 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
+ // }
56456
56438
  }
56457
56439
  var aline = new _editor_draw_DrawLine__WEBPACK_IMPORTED_MODULE_16__/* .DrawLine */ .a(this._rootPath, this, index, paragraphWidth);
56458
56440
  aline.dTop = itop;
@@ -56462,6 +56444,7 @@ var ParagraphNode = /*#__PURE__*/function (_BaseNode) {
56462
56444
  aline.dWidth = paragraphWidth - this.combineParagraph.leftMarginPixes - this.combineParagraph.rightMarginPixes;
56463
56445
  this._drawLines.push(aline);
56464
56446
  var rootIndex = this.drootNodes.indexOf(this._drawLines[0]) + this._drawLines.length - 1;
56447
+ // console.log(aline, rootIndex, ileft, this, '----');
56465
56448
  this.drootNodes.splice(rootIndex, 0, aline);
56466
56449
  this._dHeight = this._dHeight + aline.dHeight;
56467
56450
  return aline;
@@ -56528,37 +56511,15 @@ var ParagraphNode = /*#__PURE__*/function (_BaseNode) {
56528
56511
  this._dTop = itop;
56529
56512
  aline.dLeft = ileft;
56530
56513
  aline.dTop = itop;
56531
- aline.x = this.combineParagraph.leftMarginPixes;
56532
- aline.x += ileft;
56514
+ aline.x = this.combineParagraph.leftMarginPixes + ileft;
56533
56515
  aline.dWidth = paragraphWidth - this.combineParagraph.leftMarginPixes - this.combineParagraph.rightMarginPixes;
56534
- // for (let i=nodes.indexOf(this)+1;i<nodes.length-1;i++){
56535
- // if (nodes[i] instanceof ParagraphNode){
56536
- // break;
56537
- // }
56538
- // nodes[i].node2DrawNode(drawTree,dParagraphNodes,aline);
56539
- // for (let j=0;j<aDrawItems.length;j++){
56540
- // if(aDrawItems[j].children.length>0 ){
56541
- // if (aline.restWidth>=aDrawItems[j].getBounds().width){
56542
- // aline.appendItem(aDrawItems[i]);
56543
- // }else {
56544
- // dParagraph.appendLine(aline);
56545
- // aline=new DrawLine(dParagraph,0,dParagraph.height+1,paragraphWidth);
56546
- // aline.appendItem(aDrawItems[i]);
56547
- // }
56548
- // }
56549
- // }
56550
- // return dParagraph;
56551
56516
  }
56552
56517
  }, {
56553
56518
  key: "placeDNodeAfterDline",
56554
56519
  value: function placeDNodeAfterDline(dline) {
56555
- // if (this.drootNodes.length === 0) {
56556
- // this.drootNodes.push(this.drawlines[0]);
56557
- // }
56558
56520
  if (dline) {
56559
56521
  var dTop = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_20__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID).drawTree.getParagraphStartTop(this);
56560
56522
  this.placeDNodeAfterDTop(dTop, dline);
56561
- // HOEditorFactorys.instance().getFactory(this._hoEditorFactoryID).drawTree.insertDline(droots,index+1,this._drawLines[0]);
56562
56523
  }
56563
56524
  }
56564
56525
  }, {
@@ -56589,12 +56550,6 @@ var ParagraphNode = /*#__PURE__*/function (_BaseNode) {
56589
56550
  this.drootNodes.push(this._drawLines[0]);
56590
56551
  } else this.drootNodes.splice(index + 1, 0, this._drawLines[0]);
56591
56552
  }
56592
- // public add2DrawTree(dRoots: DrawLine[]){
56593
- // if (this._drawLines.length===0){
56594
- // this.node2DrawNode();
56595
- // }
56596
- // dRoots.push(this._drawLines[0]);
56597
- // }
56598
56553
  }, {
56599
56554
  key: "dTop",
56600
56555
  get: function get() {
@@ -56642,14 +56597,6 @@ var ParagraphNode = /*#__PURE__*/function (_BaseNode) {
56642
56597
  set: function set(value) {
56643
56598
  this._docId = value;
56644
56599
  }
56645
- // get lineDeleted(){
56646
- // return this._lineDeleted;
56647
- // }
56648
- // set lineDeleted(value: boolean){
56649
- // if (value!==this._lineDeleted){
56650
- // this._lineDeleted=value;
56651
- // }
56652
- // }
56653
56600
  }, {
56654
56601
  key: "isInCell",
56655
56602
  value: function isInCell() {
@@ -56663,7 +56610,6 @@ var ParagraphNode = /*#__PURE__*/function (_BaseNode) {
56663
56610
  }, {
56664
56611
  key: "adjustNextDline",
56665
56612
  value: function adjustNextDline(dline, index) {
56666
- var droots = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_20__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID).drawTree.getDrawRootsByPath(dline.rootPath);
56667
56613
  var dNextLine = this.getNextDline(dline);
56668
56614
  for (var i = index; i < dline.drawItems.length; i++) {
56669
56615
  dNextLine.addChildAt(i - index, dline.drawItems[i]);
@@ -56674,39 +56620,6 @@ var ParagraphNode = /*#__PURE__*/function (_BaseNode) {
56674
56620
  key: "getParagraphLastNodePath",
56675
56621
  value: function getParagraphLastNodePath() {
56676
56622
  return _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_20__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID).docTree.getParaNodeLastPath(this);
56677
- // return this.getParagraphLastNode().getNodePath()
56678
- // const pNode = this._parentNode;
56679
- // if (pNode) {
56680
- // const index = pNode.childNodes.indexOf(this);
56681
- // let aNode: BaseNode | null = null;
56682
- // for (let i = index + 1; i < pNode.childNodes.length; i++) {
56683
- // if (pNode.childNodes[i] instanceof ParagraphNode) {
56684
- // break;
56685
- // }
56686
- // aNode = pNode.childNodes[i];
56687
- // }
56688
- // if (aNode) {
56689
- // return HOEditorFactorys.instance().getFactory(this._hoEditorFactoryID).docTree.getNodeLastPath(aNode);
56690
- // } else {
56691
- // return this.getNodePath();
56692
- // }
56693
- // } else {
56694
- // let ret = this.nextSibling();
56695
- // let prevNode = ret;
56696
- // while (
56697
- // ret &&
56698
- // !(ret instanceof ParagraphNode) &&
56699
- // !(ret instanceof RectNode)
56700
- // ) {
56701
- // prevNode = ret;
56702
- // ret = ret.nextSibling();
56703
- // }
56704
- // if (prevNode) {
56705
- // return HOEditorFactorys.instance().getFactory(this._hoEditorFactoryID).docTree.getNodeLastPath(prevNode);
56706
- // } else {
56707
- // return this.getNodePath();
56708
- // }
56709
- // }
56710
56623
  }
56711
56624
  }, {
56712
56625
  key: "updateDrawLineStyle",
@@ -56715,7 +56628,6 @@ var ParagraphNode = /*#__PURE__*/function (_BaseNode) {
56715
56628
  var dline = this._drawLines[i];
56716
56629
  if (dline instanceof _editor_draw_DrawLine__WEBPACK_IMPORTED_MODULE_16__/* .DrawLine */ .a) dline.updateLineStyle();
56717
56630
  }
56718
- // if (dline instanceof DrawLine) dline.updateLineStyle();
56719
56631
  }
56720
56632
  }, {
56721
56633
  key: "updateDrawInfos",
@@ -56723,7 +56635,6 @@ var ParagraphNode = /*#__PURE__*/function (_BaseNode) {
56723
56635
  var aHeight = 0;
56724
56636
  for (var i = 0; i < this._drawLines.length; i++) {
56725
56637
  var dline = this._drawLines[i];
56726
- // if (dline instanceof DrawLine) dline.updateLineStyle();
56727
56638
  dline.dTop = this.dTop + aHeight;
56728
56639
  aHeight += dline.dHeight;
56729
56640
  this.dTop + aHeight;
@@ -56768,17 +56679,10 @@ var ParagraphNode = /*#__PURE__*/function (_BaseNode) {
56768
56679
  return paga;
56769
56680
  }
56770
56681
  var paraNode = {
56771
- //"ParagraphNode": {
56772
56682
  nodeType: _BaseNode__WEBPACK_IMPORTED_MODULE_13__/* .NodeType */ .Jq[this.nodeType],
56773
56683
  styleIndex: this._paraNo,
56774
56684
  textStyleNo: this.styleIndex
56775
- //printAsSinglePage: this.printAsSinglePage,
56776
- //forceChangeHeader: this.forceChangeHeader,
56777
- //docId: this.docId,
56778
- //customProperty: this.customProperty
56779
- //}
56780
56685
  };
56781
-
56782
56686
  if (this.printAsSinglePage) {
56783
56687
  paraNode.printAsSinglePage = this.printAsSinglePage;
56784
56688
  }
@@ -56803,10 +56707,6 @@ var ParagraphNode = /*#__PURE__*/function (_BaseNode) {
56803
56707
  }, {
56804
56708
  key: "delete",
56805
56709
  value: function _delete(operType) {
56806
- // const prevNode = this.prevSibling();
56807
- // if (prevNode && prevNode instanceof TableNode) {
56808
- // return false;
56809
- // }
56810
56710
  var parentNodes = this.getParentNodes();
56811
56711
  try {
56812
56712
  var index = parentNodes.indexOf(this);
@@ -56851,7 +56751,6 @@ var ParagraphNode = /*#__PURE__*/function (_BaseNode) {
56851
56751
  paragraphNode.printAsSinglePage = json.printAsSinglePage ? json.printAsSinglePage === "true" ? true : false : false;
56852
56752
  paragraphNode.forceChangeHeader = json.forceChangeHeader ? json.forceChangeHeader === "true" ? true : false : false;
56853
56753
  paragraphNode.styleIndex = json.textStyleNo ? Number(json.textStyleNo) : 0;
56854
- //paragraphNode.styleIndex = 0;
56855
56754
  return paragraphNode;
56856
56755
  }
56857
56756
  }]);
@@ -69096,7 +68995,7 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
69096
68995
  if (this.alignWithBlocked && this.StartMarkNode && this.StartMarkNode.drawNodes.length > 0) {
69097
68996
  var dNode = this.StartMarkNode.drawNodes[0];
69098
68997
  var dline = hoEditorFactory.drawTree.getDrawLineByDNode(dNode);
69099
- var x = this.StartMarkNode.drawNodes[0].x + hoEditorFactory.docTree.combineParagraph.leftMarginPixes + 1;
68998
+ var x = Math.floor(dNode.x) + hoEditorFactory.docTree.combineParagraph.leftMarginPixes + 1;
69100
68999
  var width = dline.dWidth - x;
69101
69000
  return [x, width, true];
69102
69001
  }
@@ -69181,7 +69080,6 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
69181
69080
  json.includesKeyword = !json.includesKeyword ? "[]" : json.includesKeyword;
69182
69081
  json.valueArea = !json.valueArea ? "[]" : json.valueArea;
69183
69082
  json.isElementLink = !json.isElementLink ? false : json.isElementLink;
69184
- if (this.name == '窒息后选择') {}
69185
69083
  var temp = new TextInputFieldNode(hoEditorFactoryID, rootNodes, pNode ? pNode : null, BaseNode/* NodeType */.Jq.ntField, json);
69186
69084
  // this.insertChild
69187
69085
  if (json.childNodes) {
@@ -69624,37 +69522,47 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
69624
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__);
69625
69523
  /* harmony import */ var core_js_modules_es_array_splice_js__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(40561);
69626
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__);
69627
- /* harmony import */ var core_js_modules_es_array_push_js__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(57658);
69628
- /* 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__);
69629
- /* harmony import */ var core_js_modules_es_number_constructor_js__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(9653);
69630
- /* 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__);
69631
- /* harmony import */ var core_js_modules_es_array_concat_js__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(92222);
69632
- /* 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__);
69633
- /* harmony import */ var core_js_modules_es_array_join_js__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(69600);
69634
- /* 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__);
69635
- /* harmony import */ var core_js_modules_es_error_cause_js__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(21703);
69636
- /* 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__);
69637
- /* harmony import */ var core_js_modules_es_object_keys_js__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(47941);
69638
- /* 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__);
69639
- /* harmony import */ var core_js_modules_es_json_stringify_js__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(38862);
69640
- /* 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__);
69641
- /* harmony import */ var core_js_modules_es_string_bold_js__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(50915);
69642
- /* 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__);
69643
- /* harmony import */ var core_js_modules_es_string_italics_js__WEBPACK_IMPORTED_MODULE_19__ = __webpack_require__(58734);
69644
- /* 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__);
69645
- /* harmony import */ var core_js_modules_es_object_assign_js__WEBPACK_IMPORTED_MODULE_20__ = __webpack_require__(19601);
69646
- /* 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__);
69647
- /* harmony import */ var core_js_modules_es_string_replace_all_js__WEBPACK_IMPORTED_MODULE_21__ = __webpack_require__(68757);
69648
- /* 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__);
69649
- /* harmony import */ var _BaseNode__WEBPACK_IMPORTED_MODULE_22__ = __webpack_require__(62358);
69650
- /* harmony import */ var _editor_draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_23__ = __webpack_require__(51760);
69651
- /* harmony import */ var _editor_draw_DrawLine__WEBPACK_IMPORTED_MODULE_24__ = __webpack_require__(96635);
69652
- /* harmony import */ var _editor_draw_drawNode_DrawTextNode__WEBPACK_IMPORTED_MODULE_25__ = __webpack_require__(24492);
69653
- /* harmony import */ var _domNode_TextStyle__WEBPACK_IMPORTED_MODULE_26__ = __webpack_require__(29899);
69654
- /* harmony import */ var _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_27__ = __webpack_require__(74089);
69655
- /* harmony import */ var _editor_utils_UnitConvert__WEBPACK_IMPORTED_MODULE_28__ = __webpack_require__(91404);
69656
- /* harmony import */ var _TextInputFieldNode__WEBPACK_IMPORTED_MODULE_29__ = __webpack_require__(65043);
69657
- /* 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
+
69658
69566
 
69659
69567
 
69660
69568
 
@@ -69786,7 +69694,7 @@ var TextNode = /*#__PURE__*/function (_BaseNode) {
69786
69694
  this._text = this._text.substr(0, start) + this._text.substr(end + 1, this._text.length);
69787
69695
  for (var i = 0; i < this.drawNodes.length; i++) {
69788
69696
  var dNode = this.drawNodes[i];
69789
- 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) {
69790
69698
  var dtext = dNode.dText;
69791
69699
  if (start >= dtext.startIndex && start <= dtext.endIndex) {
69792
69700
  dNode.text = this._text.substr(dtext.startIndex, start);
@@ -69827,25 +69735,6 @@ var TextNode = /*#__PURE__*/function (_BaseNode) {
69827
69735
  }, {
69828
69736
  key: "node2DrawNodeRange",
69829
69737
  value: function node2DrawNodeRange(startIndex, endIndex) {
69830
- // super.node2DrawNode(firstLineWidth,secondLineWidth,firstPageHeight,secondPageHeight);
69831
- //item数目
69832
- // this.refreshDrawStyle();
69833
- // const istart = Math.max(startIndex, 0);
69834
- // const iend = Math.min(endIndex, this.getLength() - 1);
69835
- // const bIsInsert = startIndex < this._text.length - 1;
69836
- // for (let i = istart; i <= iend; i++) {
69837
- // const dNode = new DrawTextNode(
69838
- // this._hoEditorFactory,
69839
- // this._rootPath,
69840
- // this,
69841
- // i
69842
- // );
69843
- // if (bIsInsert) {
69844
- // this._drawNodes.splice(i, 0, dNode);
69845
- // } else {
69846
- // this._drawNodes.push(dNode);
69847
- // }
69848
- // }
69849
69738
  return;
69850
69739
  }
69851
69740
  }, {
@@ -69854,7 +69743,7 @@ var TextNode = /*#__PURE__*/function (_BaseNode) {
69854
69743
  // this._dCombineStyle = HOEditorFactorys.instance().getFactory(this._hoEditorFactoryID).docTree.styles[
69855
69744
  // this._styleIndex
69856
69745
  // ].combineStyle;
69857
- 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);
69858
69747
  var textStyle = hoEditorFactory.docTree.styles[this._styleIndex];
69859
69748
  if (textStyle) {
69860
69749
  this._dCombineStyle = textStyle.combineStyle;
@@ -69870,8 +69759,6 @@ var TextNode = /*#__PURE__*/function (_BaseNode) {
69870
69759
  key: "node2DrawNode",
69871
69760
  value: function node2DrawNode() {
69872
69761
  return;
69873
- // this.clearDrawNodes(0, this.text.length - 1);
69874
- // this.node2DrawNodeRange(0, this.text.length - 1);
69875
69762
  }
69876
69763
  }, {
69877
69764
  key: "getFristDitemInDline",
@@ -69879,7 +69766,7 @@ var TextNode = /*#__PURE__*/function (_BaseNode) {
69879
69766
  var ret = start;
69880
69767
  for (var i = dline.drawItems.length - 1; i >= 0; i--) {
69881
69768
  var ditem = dline.drawItems[i];
69882
- 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) {
69883
69770
  if (ditem.startIndex < start) {
69884
69771
  ret = ditem.startIndex;
69885
69772
  }
@@ -69890,24 +69777,42 @@ var TextNode = /*#__PURE__*/function (_BaseNode) {
69890
69777
  }, {
69891
69778
  key: "adjustRectAlignLine",
69892
69779
  value: function adjustRectAlignLine(dline) {
69893
- if (this._parentNode && this._parentNode instanceof _TextInputFieldNode__WEBPACK_IMPORTED_MODULE_29__/* .TextInputFieldNode */ .re && dline.paragraphNode.parentNode !== this._parentNode) {
69894
- var _this$_parentNode$get = this._parentNode.getLeftWidth(),
69895
- _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),
69896
- ileft = _this$_parentNode$get2[0],
69897
- paragraphWidth = _this$_parentNode$get2[1],
69898
- 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];
69899
69787
  if (bAlignWithRect) {
69900
- var index = dline.paragraphNode.drawlines.length;
69901
- if (index - 2 > 0) {
69902
- var prevLine = dline.paragraphNode.drawlines[index - 2];
69903
- prevLine.x = dline.paragraphNode.combineParagraph.leftMarginPixes + ileft;
69904
- prevLine.dWidth = paragraphWidth - dline.paragraphNode.combineParagraph.leftMarginPixes - dline.paragraphNode.combineParagraph.rightMarginPixes;
69905
- 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
+ });
69906
69812
  }
69907
- dline.dLeft = ileft;
69908
- dline.x = dline.paragraphNode.combineParagraph.leftMarginPixes;
69909
- dline.x += ileft;
69910
- 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;
69911
69816
  }
69912
69817
  }
69913
69818
  }
@@ -69923,38 +69828,31 @@ var TextNode = /*#__PURE__*/function (_BaseNode) {
69923
69828
  key: "placeDNode2DrawLine",
69924
69829
  value: function placeDNode2DrawLine(droots, paragraphNode, dline, start, endIndex) {
69925
69830
  this.refreshDrawStyle();
69926
- 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);
69927
69832
  var startIndex = this.getFristDitemInDline(start, dline);
69928
69833
  if (startIndex >= this.text.length) {
69929
69834
  return dline;
69930
69835
  }
69931
69836
  this.clearNeedRedrawDitems(startIndex);
69932
- // super.node2DrawNode(firstLineWidth,secondLineWidth,firstPageHeight,secondPageHeight);
69933
69837
  var istart = Math.max(startIndex, 0);
69934
- // const dStarts=dline.drawItems.slice(0,inLineIndex-1);
69935
- // const dEnds=dline.drawItems.slice(inLineIndex,dline.drawItems.length-1);
69936
- // const dMids=this._drawNodes.slice(istart,iend);
69937
- // dline.drawItems.splice(0,dline.drawItems.length);
69938
- // dline.drawItems.concat(dMids).concat(dEnds);
69939
- // dline.insert(this._drawNodes.slice(istart,iend+1),inLineIndex);
69940
69838
  var style = hoeditorfacotry.docTree.styles[this.styleIndex];
69941
69839
  if (!style) {
69942
69840
  style = hoeditorfacotry.docTree.styles[0];
69943
69841
  this.styleIndex = 0;
69944
69842
  }
69945
69843
  var isDelete = style.deleterIndex === undefined || style.deleterIndex === -1 ? false : true; //是否是逻辑删除的状态
69946
- 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; //逻辑删除的节点是否显示
69947
69845
  //const commentID = style.commentID === undefined ? "0" : style.commentID;
69948
69846
  if (!isDelete || isDisplay || !hoeditorfacotry.isHideComments) {
69949
69847
  var iend = istart;
69950
69848
  var irestLength = 0;
69951
- //是否标点
69952
- 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]);
69953
69851
  var bForceAppend = false;
69954
69852
  while (istart <= this.text.length - 1) {
69955
69853
  bForceAppend = false;
69956
69854
  irestLength = dline.calcRestWidth();
69957
- 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);
69958
69856
  if (irestLength < dFirst.getMeasuredWidth()) {
69959
69857
  if (istart == 0 && bIsPunctuation) {
69960
69858
  bForceAppend = true;
@@ -69966,7 +69864,7 @@ var TextNode = /*#__PURE__*/function (_BaseNode) {
69966
69864
  irestLength = dline.calcRestWidth();
69967
69865
  }
69968
69866
  }
69969
- 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);
69970
69868
  if (dItem.endIndex < 0) {
69971
69869
  if (iend < this.text.length - 1) {
69972
69870
  dline.fitLines();
@@ -69976,7 +69874,7 @@ var TextNode = /*#__PURE__*/function (_BaseNode) {
69976
69874
  continue;
69977
69875
  }
69978
69876
  dItem.dWidth = dItem.dText.dWidth;
69979
- dItem.dWidth = dItem.dWidth;
69877
+ // (dItem as DrawInfos).dWidth = dItem.dWidth;
69980
69878
  dline.addChild(dItem);
69981
69879
  dline.drawItems.push(dItem);
69982
69880
  this._drawNodes.push(dItem);
@@ -69984,10 +69882,10 @@ var TextNode = /*#__PURE__*/function (_BaseNode) {
69984
69882
  if (iend < this.text.length - 1) {
69985
69883
  dline.fitLines();
69986
69884
  dline = dline.paragraphNode.getNextDline(dline);
69987
- 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) {
69988
69886
  var index = dline.paragraphNode.drawlines.indexOf(dline);
69989
69887
  var prevLine = dline.paragraphNode.drawlines[index - 1];
69990
- 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) {
69991
69889
  var _dline$paragraphNode$ = dline.paragraphNode.parentNode.getLeftWidth(),
69992
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),
69993
69891
  ileft = _dline$paragraphNode$2[0],
@@ -70003,28 +69901,7 @@ var TextNode = /*#__PURE__*/function (_BaseNode) {
70003
69901
  istart = iend + 1;
70004
69902
  }
70005
69903
  }
70006
- // dline.update();
70007
69904
  return dline.paragraphNode.getLastDrawline();
70008
- // dline.drawItems.splice(inLineIndex,0,this._drawNodes.slice(istart,iend))
70009
- // for(let i=istart;i<=iend;i++){
70010
- // const awidth= (this._drawNodes[i] as DrawTextNode).dWidth;
70011
- // if ( (usedWidth+awidth>lineWidth)&&usedWidth>0){
70012
- // //当前是行中的最后一个节点，
70013
- // if (i===aline.drawItems.length-1){
70014
- // aline=aline.paragraphNode.getNextDline(droots,aline);
70015
- // }else {
70016
- // const anextLine=aline.paragraphNode.getNextDline(droots,aline);
70017
- // anextLine.drawItems.unshift(aline.drawItems[aline.drawItems.length-1]);
70018
- // const ditem=aline.drawItems.pop();
70019
- // }
70020
- // aline.update();
70021
- // aline=paragraphNode.getNextDline(droots,aline);
70022
- // usedWidth=0;
70023
- // }
70024
- // aline.drawItems.push(this._drawNodes[i]);
70025
- // usedWidth+=awidth+charSpace;
70026
- // }
70027
- // aline.update();
70028
69905
  }
70029
69906
  }, {
70030
69907
  key: "clearNeedRedrawDitems",
@@ -70033,7 +69910,7 @@ var TextNode = /*#__PURE__*/function (_BaseNode) {
70033
69910
  var dItem = this._drawNodes[i];
70034
69911
  if (dItem.startIndex >= start || dItem.startIndex < start && dItem.endIndex >= start) {
70035
69912
  if (dItem.parent) {
70036
- 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) {
70037
69914
  var index = dItem.parent.drawItems.indexOf(dItem);
70038
69915
  if (index >= 0) dItem.parent.drawItems.splice(index, 1);
70039
69916
  }
@@ -70044,13 +69921,6 @@ var TextNode = /*#__PURE__*/function (_BaseNode) {
70044
69921
  }
70045
69922
  }
70046
69923
  }
70047
- // public add2DrawTree(dRoots: DrawLine[]) {
70048
- // if (this._drawNodes.length === 0) {
70049
- // this.node2DrawNode();
70050
- // const dline = HOEditorFactorys.instance().getFactory(this._hoEditorFactoryID).docTree.getNodeParaNode(this).getLastDline();
70051
- // // this.placeDNode2DrawLine(dRoots,dline.paragraphNode, 0,this._text.length-1);
70052
- // }
70053
- // }
70054
69924
  }, {
70055
69925
  key: "hoEditorFactoryID",
70056
69926
  get: function get() {
@@ -70111,14 +69981,14 @@ var TextNode = /*#__PURE__*/function (_BaseNode) {
70111
69981
  aStart = aEnd;
70112
69982
  aEnd = tmp;
70113
69983
  }
70114
- 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);
70115
69985
  var selectedText = this.text.substring(aStart + 1, aEnd + 1); //获取该文本节点的选中区域文本
70116
69986
  var frontNodeText = this.text.substring(0, aStart + 1); //选中区域前的文本
70117
69987
  var behindNodeText = this.text.substring(aEnd + 1, this.text.length); //选中区域后的文本
70118
69988
  if (aStart < 0) {
70119
69989
  //情况一：首尾是同一节点且从文本最开始选中；情况二：尾节点
70120
69990
  this.deleteByIndex(selectedText.length, this.getLength() - 1); //节点一
70121
- 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 //原来的样式
70122
69992
  );
70123
69993
 
70124
69994
  hoEditorFactory.docTree.insertNodeAfterPath("".concat(this.getNodePath(), "/").concat(this.text.length - 1), unSelectedTextNode); //节点二
@@ -70126,11 +69996,11 @@ var TextNode = /*#__PURE__*/function (_BaseNode) {
70126
69996
  } else {
70127
69997
  //如果选中区域的结束节点在该文本节点的末端，也只用拆分出2个节点;若选中区域在文本节点的中间区域，需要拆分出三个节点
70128
69998
  this.deleteByIndex(frontNodeText.length, this.getLength() - 1); //节点一
70129
- 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);
70130
70000
  hoEditorFactory.docTree.insertNodeAfterPath("".concat(this.getNodePath(), "/").concat(this.text.length - 1), selectedTextNode); //节点二
70131
70001
  ret.unshift(selectedTextNode);
70132
70002
  if (behindNodeText.length > 0) {
70133
- 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);
70134
70004
  hoEditorFactory.docTree.insertNodeAfterPath("".concat(selectedTextNode.getNodePath(), "/").concat(selectedTextNode.text.length - 1), behindTextNode); //节点三
70135
70005
  ret.push(behindTextNode);
70136
70006
  }
@@ -70157,7 +70027,7 @@ var TextNode = /*#__PURE__*/function (_BaseNode) {
70157
70027
  var ilen = arr.length;
70158
70028
  for (var i = 1; i < ilen; i++) {
70159
70029
  textNode.insertText(arr[i]._text, textNode._text.length);
70160
- _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]);
70161
70031
  }
70162
70032
  return textNode;
70163
70033
  }
@@ -70169,7 +70039,7 @@ var TextNode = /*#__PURE__*/function (_BaseNode) {
70169
70039
  }, {
70170
70040
  key: "prevPath",
70171
70041
  value: function prevPath(path) {
70172
- 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);
70173
70043
  var nodePosition = hoEditorFactory.docTree.findNodePositionByPath(path);
70174
70044
  var childIndex = nodePosition.childIndex;
70175
70045
  var topath = "";
@@ -70211,7 +70081,7 @@ var TextNode = /*#__PURE__*/function (_BaseNode) {
70211
70081
  var t = parseInt(arr[arr.length - 1]);
70212
70082
  copytxt = this.text.substr(s, t - s + 1);
70213
70083
  }
70214
- 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);
70215
70085
  var combineStyle;
70216
70086
  var style = hoEditorFactory.docTree.styles[this.styleIndex];
70217
70087
  if (style) {
@@ -70221,9 +70091,9 @@ var TextNode = /*#__PURE__*/function (_BaseNode) {
70221
70091
  this.styleIndex = 0;
70222
70092
  }
70223
70093
  if (isCopy) {
70224
- 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()));
70225
70095
  var json = {
70226
- nodeType: _BaseNode__WEBPACK_IMPORTED_MODULE_22__/* .NodeType */ .Jq[this.nodeType],
70096
+ nodeType: _BaseNode__WEBPACK_IMPORTED_MODULE_24__/* .NodeType */ .Jq[this.nodeType],
70227
70097
  style: styleJson,
70228
70098
  text: copytxt,
70229
70099
  styleIndex: this._styleIndex
@@ -70240,7 +70110,7 @@ var TextNode = /*#__PURE__*/function (_BaseNode) {
70240
70110
  }
70241
70111
  return {
70242
70112
  "TextNode": {
70243
- nodeType: _BaseNode__WEBPACK_IMPORTED_MODULE_22__/* .NodeType */ .Jq[this.nodeType],
70113
+ nodeType: _BaseNode__WEBPACK_IMPORTED_MODULE_24__/* .NodeType */ .Jq[this.nodeType],
70244
70114
  text: copytxt,
70245
70115
  styleIndex: this._styleIndex
70246
70116
  }
@@ -70274,7 +70144,7 @@ var TextNode = /*#__PURE__*/function (_BaseNode) {
70274
70144
  var dItem = this._drawNodes[i];
70275
70145
  if (dItem.startIndex >= index) {
70276
70146
  if (dItem.parent) {
70277
- 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) {
70278
70148
  var _index = dItem.parent.drawItems.indexOf(dItem);
70279
70149
  if (_index >= 0) dItem.parent.drawItems.splice(_index, 1);
70280
70150
  }
@@ -70305,13 +70175,13 @@ var TextNode = /*#__PURE__*/function (_BaseNode) {
70305
70175
  key: "json2Node",
70306
70176
  value: function json2Node(hoEditorFactoryID, json, rootNodes, pNode) {
70307
70177
  //解析样式
70308
- 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);
70309
70179
  var styleIndex = Number(json.styleIndex);
70310
70180
  if (json["style"]) {
70311
70181
  var styleJson = json.style;
70312
70182
  this.transType(styleJson);
70313
70183
  //styleJson["script"] = StyleScriptType[styleJson.script];
70314
- 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);
70315
70185
  var combineStyle = textStyle.combineStyle;
70316
70186
  //样式赋值
70317
70187
  if (styleJson["size"] === combineStyle.size) {
@@ -70365,7 +70235,7 @@ var TextNode = /*#__PURE__*/function (_BaseNode) {
70365
70235
  }
70366
70236
  var text = json.text.replace("<上标>", "").replace("</上标>", "").replace("<下标>", "").replace("</下标>", "");
70367
70237
  text = text.replaceAll("(span)", "").replaceAll("(/span)", "");
70368
- 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);
70369
70239
  var search = function search(index) {
70370
70240
  var sindex = json.text.indexOf("(span)", index);
70371
70241
  if (sindex >= 0) {
@@ -70391,7 +70261,7 @@ var TextNode = /*#__PURE__*/function (_BaseNode) {
70391
70261
  }
70392
70262
  }]);
70393
70263
  return TextNode;
70394
- }(_BaseNode__WEBPACK_IMPORTED_MODULE_22__/* .BaseNode */ .Hd);
70264
+ }(_BaseNode__WEBPACK_IMPORTED_MODULE_24__/* .BaseNode */ .Hd);
70395
70265
 
70396
70266
  /***/ }),
70397
70267
 
@@ -70568,8 +70438,8 @@ var HOEditorFactorys = __webpack_require__(74089);
70568
70438
  var SeparateCharNode = __webpack_require__(39385);
70569
70439
  // EXTERNAL MODULE: ./src/editor/utils/UnitConvert.ts
70570
70440
  var UnitConvert = __webpack_require__(91404);
70571
- // EXTERNAL MODULE: ./src/editor/dom/treeNode/BaseNode.ts
70572
- var BaseNode = __webpack_require__(62358);
70441
+ // EXTERNAL MODULE: ./src/editor/dom/treeNode/CellNode.ts
70442
+ var CellNode = __webpack_require__(68598);
70573
70443
  // EXTERNAL MODULE: ./src/editor/draw/drawNode/DrawDownListNode.ts
70574
70444
  var DrawDownListNode = __webpack_require__(93541);
70575
70445
  // EXTERNAL MODULE: ./src/editor/dom/treeNode/TextInputFieldNode.ts + 1 modules
@@ -70641,33 +70511,8 @@ var DrawLine = /*#__PURE__*/function (_DrawContainer) {
70641
70511
  _this._dBaseY = 0;
70642
70512
  _this._docHeight = hoEditorFactory.defaultLineHeight;
70643
70513
  _this._dHeight = _this._docHeight;
70644
- // const shape = new createjs.Shape();
70645
- // shape.x = 0;
70646
- // shape.y = 0;
70647
- // shape.graphics
70648
- // .clear()
70649
- // .beginFill("#FFEE90")
70650
- // .drawRect(
70651
- // 0,
70652
- // 0,
70653
- // this._dWidth,
70654
- // this._dHeight + this.paragraphNode.combineParagraph.lineSpace
70655
- // );
70656
- // shape.alpha = 0.5;
70657
- // // const y = this._dTop;
70658
- // // this.removeAllChildren();
70659
- // this.addChildAt(shape, 0);
70660
- // this.setBounds(x,y,width,gLineHeight);
70661
70514
  return _this;
70662
70515
  }
70663
- // public appendItem(ditem: DrawLineNode){
70664
- // this.addChild(ditem);
70665
- // const rect= ditem.getBounds();
70666
- // this._actualWidth=this._actualWidth+rect.width+g_CharSpace;
70667
- // if (this._height<rect.height) {x
70668
- // this._height=rect.height;
70669
- // }
70670
- // }
70671
70516
  (0,createClass/* default */.Z)(DrawLine, [{
70672
70517
  key: "dWidth",
70673
70518
  get: function get() {
@@ -70714,6 +70559,9 @@ var DrawLine = /*#__PURE__*/function (_DrawContainer) {
70714
70559
  },
70715
70560
  set: function set(val) {
70716
70561
  if (val !== this._charSpace) {
70562
+ if (val < 0) {
70563
+ console.warn("charSpace不能为负数", val);
70564
+ }
70717
70565
  this._charSpace = val;
70718
70566
  }
70719
70567
  }
@@ -70886,9 +70734,8 @@ var DrawLine = /*#__PURE__*/function (_DrawContainer) {
70886
70734
  }, {
70887
70735
  key: "adjustDHeight",
70888
70736
  value: function adjustDHeight(dHeight) {
70889
- if (this.paragraphNode.parentNode && this.paragraphNode.parentNode.nodeType === BaseNode/* NodeType */.Jq.ntCell && this.paragraphNode.parentNode.table.tableProperty.isAutoChangeLine) {
70890
- var cell = this.paragraphNode.parentNode;
70891
- //const [r, c] = cell.table.getCellInfos(cell);
70737
+ var cell = this.paragraphNode.parentNode;
70738
+ if (cell instanceof CellNode/* CellNode */.D && cell.table.tableProperty.isAutoChangeLine) {
70892
70739
  if (cell.needPaintLineGrid() && dHeight, cell.table.tableProperty.autoLineHeightPx) {
70893
70740
  dHeight = Math.max(dHeight, cell.table.tableProperty.autoLineHeightPx - this.paragraphNode.combineParagraph.lineSpace - this.paragraphNode.combineParagraph.topMarginPixes);
70894
70741
  }
@@ -70911,17 +70758,11 @@ var DrawLine = /*#__PURE__*/function (_DrawContainer) {
70911
70758
  var iCount = 0; //文本节点数量
70912
70759
  //FIXME:去掉左边距后真实的宽度,后续还要去掉margin的的left right
70913
70760
  var lwidth = this._dWidth;
70914
- // this.paragraphNode.getParagraphLeftWidth()[1] - this.paragraphNode.combineParagraph.leftMarginPixes
70915
- // - this.paragraphNode.combineParagraph.rightMarginPixes;
70916
- // if (this.paragraphNode.parentNode instanceof TextInputFieldNode)
70917
- //this.x = this.paragraphNode.getParagraphLeftWidth()[0] + this.paragraphNode.combineParagraph.leftMarginPixes;
70918
- //else this.x = this.paragraphNode.combineParagraph.leftMarginPixes
70919
70761
  //文字摆放开始位置
70920
70762
  //this.paragraphNode.combineParagraph.leftMarginPixes;
70921
70763
  //字间距，分散对齐:计算宽度时候使用默认字间距
70922
70764
  var charspace = this._paragraphNode.combineParagraph.charSpace;
70923
70765
  var spacing = 0;
70924
- var imageHeight = 0;
70925
70766
  var maxFontHeight = 0;
70926
70767
  //1.返回dWidth并计算actualWidth（实际需要占用的宽度）,dHeight
70927
70768
  for (var i = 0; i < this.drawItems.length; i++) {
@@ -70947,21 +70788,14 @@ var DrawLine = /*#__PURE__*/function (_DrawContainer) {
70947
70788
  dWidth = this.drawItems[i].dWidth;
70948
70789
  iCount += 1;
70949
70790
  spacing = charspace;
70950
- // if (dItem instanceof DrawImageNode || dItem instanceof DrawBarcodeNode || dItem instanceof DrawQrcodeNode) {
70951
- // imageHeight = Math.max(imageHeight, dItem.dHeight);
70952
- // }
70953
70791
  }
70954
-
70955
70792
  dHeight = Math.max(this.drawItems[i].dHeight, dHeight);
70956
70793
  if (this._drawItems[0] instanceof DrawCombineNode/* DrawCombineNode */.o && this._drawItems[0].node instanceof SeparateCharNode/* SeparateCharNode */.O) {
70957
- //dHeight = 2;
70958
70794
  dHeight = this._drawItems[0].node.width;
70959
70795
  }
70960
70796
  if (!(this.drawItems[i] instanceof DrawMarkNode/* DrawMarkNode */.I) && !(this._drawItems[i] instanceof DrawTextNode/* DrawTextNode */.v)) {
70961
70797
  iCount++;
70962
70798
  }
70963
- // if (((this.drawItems[i] as unknown) as DrawInfos).dHeight > dHeight)
70964
- // dHeight = ((this.drawItems[i] as unknown) as DrawInfos).dHeight;
70965
70799
  if (actualWidth + dWidth > lwidth && actualWidth > 0) {
70966
70800
  if (this.drawItems[i] instanceof DrawTextNode/* DrawTextNode */.v && UnitConvert/* UnitConvert */.P.isPuctuation(this._drawItems[i].text)) {} else {
70967
70801
  var nextLine = this._paragraphNode.getNextDline(this);
@@ -70970,7 +70804,6 @@ var DrawLine = /*#__PURE__*/function (_DrawContainer) {
70970
70804
  for (var n = i; n < this.drawItems.length; n++) {
70971
70805
  var ditem = this.drawItems[n];
70972
70806
  if (ditem) {
70973
- // this._islastline = false;
70974
70807
  this.removeChild(ditem);
70975
70808
  nextLine.addChild(ditem);
70976
70809
  }
@@ -70982,10 +70815,7 @@ var DrawLine = /*#__PURE__*/function (_DrawContainer) {
70982
70815
  }
70983
70816
  this._charCount = iCount;
70984
70817
  actualWidth += dWidth + spacing; //charspace;
70985
- // if (imageHeight === dHeight) {
70986
- // this._isImgHeightForMax = true;
70987
- // }
70988
- // this._actualWidth+=this.children[i]
70818
+ // console.log(dWidth, spacing, '------');
70989
70819
  }
70990
70820
 
70991
70821
  this._maxFontHeight = maxFontHeight;
@@ -70998,195 +70828,55 @@ var DrawLine = /*#__PURE__*/function (_DrawContainer) {
70998
70828
  this._charSpace = this._paragraphNode.combineParagraph.charSpace;
70999
70829
  this.dWidth = this._dWidth;
71000
70830
  this.dHeight = this._dHeight;
71001
- // if (restWidth > 0&& this.drawItems.length>1) {
71002
- // this._charSpace = restWidth / this.drawItems.length - 1;
71003
- // }
71004
- // this.setBounds(this._dLeft, this._dTop, this._dWidth, this._dHeight);
71005
- // const shape = new createjs.Shape();
71006
- // shape.x = 0;
71007
- // shape.y = 0;
71008
- // shape.graphics
71009
- // .clear()
71010
- // .beginFill("#FFEE90")
71011
- // .drawRect(
71012
- // 0,
71013
- // 0,
71014
- // this._dWidth,
71015
- // this._dHeight + this.paragraphNode.combineParagraph.lineSpace
71016
- // );
71017
- // shape.alpha = 0.5;
71018
- // const y = this._dTop;
71019
- // this.removeAllChildren();
71020
- // this.uncache();
71021
- // // this.addChildAt(shape, 0);
71022
- // //2.计算起始位置
71023
- // switch (this._paragraphNode.combineParagraph.align) {
71024
- // case Align.alleft: {
71025
- // break;
71026
- // }
71027
- // case Align.alright: {
71028
- // usedWidth += lwidth - this.actualWidth;
71029
- // break;
71030
- // }
71031
- // case Align.alcenter: {
71032
- // usedWidth += (lwidth - this.actualWidth) / 2;
71033
- // break;
71034
- // }
71035
- // case Align.alSpaceEqually: {
71036
- // //更新字间距,目标是让字的宽度相同
71037
- // if (iCount > 1) {
71038
- // spacing = (lwidth - this.actualWidth) / (iCount - 1);
71039
- // }
71040
- // // if (this.drawItems.length > 1) {
71041
- // // spacing = (lwidth - this.actualWidth) / (this.drawItems.length - 1);
71042
- // // }
71043
- // this.charSpace += spacing;
71044
- // usedWidth += 0;
71045
- // break;
71046
- // }
71047
- // }
71048
- // /**
71049
- // * 返回字间距
71050
- // * @param index 字序号
71051
- // */
71052
- // const spaceEqu = (dline: DrawLine, index: number): number => {
71053
- // if (dline.drawItems[index] instanceof DrawMarkNode) {
71054
- // return 0;
71055
- // }
71056
- // if (dline._paragraphNode.combineParagraph.align != Align.alSpaceEqually)
71057
- // return dline.charSpace;
71058
- // if (isLastLine) return gCharSpace;
71059
- // //oldcharspace;
71060
- // else return dline.charSpace;
71061
- // };
71062
- // //3.放置
71063
- // //DONE:行高
71064
- // this._dHeight = this.paragraphNode.combineParagraph.lineSpace * dHeight;
71065
- // ((this as unknown) as DrawInfos).dHeight = this._dHeight;
71066
- // const bottompos = dHeight + (this._dHeight - dHeight) / 2;
71067
- // for (let j = 0; j < this.drawItems.length; j++) {
71068
- // if (this.drawItems[j] instanceof DrawContainer) {
71069
- // //更新绘制实例
71070
- // const charSpace = spaceEqu(this, j);
71071
- // const tmp = new DrawChangeEvent(charSpace, dHeight, dBaseY);
71072
- // // tmp.space = spaceEqu(j);
71073
- // // tmp.height = dHeight;
71074
- // // tmp.baseY = dBaseY;
71075
- // (this.drawItems[j] as DrawContainer).refresh(tmp);
71076
- // const dwidth = ((this.drawItems[j] as unknown) as DrawInfos).dWidth;
71077
- // //((this.drawItems[j] as unknown) as DrawInfos).dHeight = this._dHeight;
71078
- // this.drawItems[j].x = usedWidth; // + 1;
71079
- // this.drawItems[j].y = bottompos;
71080
- // usedWidth +=
71081
- // ((this.drawItems[j] as unknown) as DrawInfos).dWidth + charSpace;
71082
- // // this._charSpace;
71083
- // }
71084
- // }
71085
- // //4.前一个字符需要在下一个字符的上层,处理斜体被遮盖的问题
71086
- // let level = 0;
71087
- // for (let j = this.drawItems.length - 1; j > -1; j--) {
71088
- // this.addChildAt(this.drawItems[j], level);
71089
- // if (this.drawItems[j] instanceof DrawMarkNode) {
71090
- // this.addChildAt(this.drawItems[j], this.numChildren);
71091
- // }
71092
- // level++;
71093
- // }
71094
- // if (
71095
- // this._paragraphNode.hoEditorFactory.drawTree.paintStatus !==
71096
- // PaintState.psPreview &&
71097
- // this._paragraphNode.hoEditorFactory.drawTree.paintStatus !==
71098
- // PaintState.psPrint
71099
- // )
71100
- // this.cache(
71101
- // 0,
71102
- // 0,
71103
- // this._dWidth,
71104
- // this._dHeight //+ lineSpace * 2 + 1
71105
- // );
71106
70831
  }
71107
70832
  }, {
71108
70833
  key: "updateLineStyle",
71109
- value: function updateLineStyle() {
71110
- // let dHeight = this._paragraphNode.hoEditorFactory.defaultLineHeight;
70834
+ value: function updateLineStyle(isUpdate) {
71111
70835
  //FIXME:去掉左边距后真实的宽度,后续还要去掉margin的的left right
71112
70836
  //处理段落的缩进2024-02-19
71113
70837
  var leftWidthInfos = this.paragraphNode.getParagraphLeftWidth();
71114
70838
  var ileft = leftWidthInfos[0];
71115
- this.x = this.paragraphNode.combineParagraph.leftMarginPixes;
71116
- if (leftWidthInfos[2]) this.x += ileft;
71117
- // const lwidth =
71118
- // leftWidthInfos[1] -
71119
- // this.paragraphNode.combineParagraph.leftMarginPixes -
71120
- // 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
+ }
71121
70845
  var lwidth = this._dWidth;
70846
+ // console.log(this.x, this.dLeft, '+++++++++++++++', leftWidthInfos);
71122
70847
  //文字摆放开始位置
71123
- var usedWidth = 0; //this.paragraphNode.combineParagraph.leftMarginPixes;
71124
- //字间距，分散对齐:计算宽度时候使用默认字间距
71125
- // const charspace =
71126
- // this._paragraphNode.combineParagraph.align == Align.alSpaceEqually
71127
- // ? gCharSpace
71128
- // : this.charSpace;
70848
+ var usedWidth = 0;
71129
70849
  var spacing = 0;
71130
70850
  //最后一个字不计算字间距位置
71131
- // this._dHeight = dHeight;
71132
70851
  var isLastLine = this === this._paragraphNode.drawlines[this._paragraphNode.drawlines.length - 1];
71133
70852
  this._charSpace = this._paragraphNode.combineParagraph.charSpace;
71134
- // if (restWidth > 0&& this.drawItems.length>1) {
71135
- // this._charSpace = restWidth / this.drawItems.length - 1;
71136
- // }
71137
- // this.setBounds(this._dLeft, this._dTop, this._dWidth, this._dHeight);
71138
- // const shape = new createjs.Shape();
71139
- // shape.x = 0;
71140
- // shape.y = 0;
71141
- // shape.graphics
71142
- // .clear()
71143
- // .beginFill("#FFEE90")
71144
- // .drawRect(
71145
- // 0,
71146
- // 0,
71147
- // this._dWidth,
71148
- // this._dHeight + this.paragraphNode.combineParagraph.lineSpace
71149
- // );
71150
- // shape.alpha = 0.5;
71151
- // const y = this._dTop;
71152
- // this.removeAllChildren();
71153
- // this.uncache();
71154
- // this.addChildAt(shape, 0);
71155
70853
  //2.计算起始位置
71156
70854
  switch (this._paragraphNode.combineParagraph.align) {
71157
70855
  case Paragraph/* Align */.xM.alleft:
71158
- {
71159
- break;
71160
- }
70856
+ break;
71161
70857
  case Paragraph/* Align */.xM.alright:
71162
- {
71163
- if (lwidth - this.actualWidth > 0) {
71164
- usedWidth += lwidth - this.actualWidth;
71165
- }
71166
- break;
70858
+ if (lwidth - this.actualWidth > 0) {
70859
+ usedWidth += lwidth - this.actualWidth;
71167
70860
  }
70861
+ break;
71168
70862
  case Paragraph/* Align */.xM.alcenter:
71169
- {
71170
- if (lwidth - this.actualWidth > 0) {
71171
- usedWidth += (lwidth - this.actualWidth) / 2;
71172
- }
71173
- break;
70863
+ if (lwidth - this.actualWidth > 0) {
70864
+ usedWidth += (lwidth - this.actualWidth) / 2;
71174
70865
  }
70866
+ break;
71175
70867
  case Paragraph/* Align */.xM.alSpaceEqually:
71176
- {
71177
- //更新字间距,目标是让字的宽度相同
71178
- if (this._charCount > 1 && !isLastLine) {
71179
- spacing = Math.floor((lwidth - this.actualWidth) / (this._charCount - 1) * 100) / 100;
71180
- } else {
71181
- spacing = this._paragraphNode.combineParagraph.charSpace;
71182
- }
71183
- // if (this.drawItems.length > 1) {
71184
- // spacing = (lwidth - this.actualWidth) / (this.drawItems.length - 1);
71185
- // }
71186
- this.charSpace += spacing;
71187
- usedWidth += 0;
71188
- 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;
71189
70873
  }
70874
+ if (spacing < 0) {
70875
+ spacing = 0;
70876
+ }
70877
+ this.charSpace += spacing;
70878
+ usedWidth += 0;
70879
+ break;
71190
70880
  }
71191
70881
  if (Paragraph/* Align */.xM.alright && this.paragraphNode.parentNode instanceof TextInputFieldNode/* TextInputFieldNode */.re && this.paragraphNode.parentNode.alignWithBlocked) {
71192
70882
  usedWidth = 0;
@@ -71200,9 +70890,11 @@ var DrawLine = /*#__PURE__*/function (_DrawContainer) {
71200
70890
  return 0;
71201
70891
  }
71202
70892
  if (dline._paragraphNode.combineParagraph.align != Paragraph/* Align */.xM.alSpaceEqually) return dline.charSpace;
71203
- if (isLastLine) return dline._paragraphNode.combineParagraph.charSpace;
71204
- //oldcharspace;
71205
- else return dline.charSpace;
70893
+ if (isLastLine) {
70894
+ return dline._paragraphNode.combineParagraph.charSpace;
70895
+ } else {
70896
+ return dline.charSpace;
70897
+ }
71206
70898
  };
71207
70899
  //3.放置
71208
70900
  //DONE:行高
@@ -71213,9 +70905,6 @@ var DrawLine = /*#__PURE__*/function (_DrawContainer) {
71213
70905
  if (aHeight <= this._docHeight) {
71214
70906
  this._dHeight = aHeight + this._maxFontHeight * (this.paragraphNode.combineParagraph.lineSpace - 1);
71215
70907
  }
71216
- // } else {
71217
- //this._dHeight = this.paragraphNode.combineParagraph.lineSpace * dHeight;
71218
- // }
71219
70908
  this.dHeight = this._dHeight;
71220
70909
  var bottompos = dHeight + (this._dHeight - dHeight) / 2;
71221
70910
  for (var j = 0; j < this.drawItems.length; j++) {
@@ -71223,22 +70912,12 @@ var DrawLine = /*#__PURE__*/function (_DrawContainer) {
71223
70912
  //更新绘制实例
71224
70913
  var charSpace = spaceEqu(this, j);
71225
70914
  var tmp = new DrawChangeEvent(charSpace, dHeight, this._dBaseY);
71226
- // tmp.space = spaceEqu(j);
71227
- // tmp.height = dHeight;
71228
- // tmp.baseY = dBaseY;
71229
- // if (this.drawItems[j] instanceof DrawDownListNode) {
71230
- // const drawItem = this.drawItems[j] as DrawDownListNode;
71231
- // const dText = new DrawSimpleText(drawItem.text, drawItem.textStyle.getStyleKey(), drawItem.textStyle.color);
71232
- // (this.drawItems[j] as DrawDownListNode).dWidth = dText.getMeasuredWidth() + (dText.text.length - 1) * charSpace;
71233
- // }
71234
70915
  this.drawItems[j].refresh(tmp);
71235
70916
  var dwidth = this.drawItems[j].dWidth;
71236
70917
  //((this.drawItems[j] as unknown) as DrawInfos).dHeight = this._dHeight;
71237
70918
  this.drawItems[j].x = usedWidth;
71238
70919
  this.drawItems[j].y = bottompos;
71239
70920
  usedWidth += dwidth + charSpace;
71240
- // + 1;
71241
- // this._charSpace;
71242
70921
  }
71243
70922
  }
71244
70923
  //4.前一个字符需要在下一个字符的上层,处理斜体被遮盖的问题
@@ -71250,18 +70929,6 @@ var DrawLine = /*#__PURE__*/function (_DrawContainer) {
71250
70929
  }
71251
70930
  level++;
71252
70931
  }
71253
- // if (
71254
- // this._paragraphNode.hoEditorFactory.drawTree.paintStatus !==
71255
- // PaintState.psPreview &&
71256
- // this._paragraphNode.hoEditorFactory.drawTree.paintStatus !==
71257
- // PaintState.psPrint
71258
- // )
71259
- // this.cache(
71260
- // 0,
71261
- // 0,
71262
- // this._dWidth,
71263
- // this._dHeight //+ lineSpace * 2 + 1
71264
- // );
71265
70932
  }
71266
70933
  }, {
71267
70934
  key: "isFullNumEnglish",
@@ -71715,7 +71382,7 @@ var DrawResize = /*#__PURE__*/function () {
71715
71382
  /* harmony export */ });
71716
71383
  var gDrawIntfID = 'I-AM-IDrawInfos';
71717
71384
  function instanceOfIDrawInfos(object) {
71718
- return object.discriminator === 'I-AM-IDrawInfos';
71385
+ return object && object.discriminator === 'I-AM-IDrawInfos';
71719
71386
  }
71720
71387
 
71721
71388
  /***/ }),
@@ -74632,8 +74299,10 @@ var DrawCombineNode = /*#__PURE__*/function (_DrawContainer) {
74632
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);
74633
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);
74634
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);
74635
74303
  _this._hoEditorFactoryID = hoeditfactoryID;
74636
74304
  _this._node = node;
74305
+ _this.MarkNodeType = node.MarkNodeType;
74637
74306
  _this._discriminator = _IDrawInfos__WEBPACK_IMPORTED_MODULE_13__/* .gDrawIntfID */ .t;
74638
74307
  _this._charSpace = 0;
74639
74308
  _this.bindEvent();
@@ -85821,7 +85490,9 @@ var DrawTree = /*#__PURE__*/function () {
85821
85490
  }
85822
85491
  }
85823
85492
  }
85824
- 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
+ }
85825
85496
  // if (node === npEnd.node) {
85826
85497
  // break;
85827
85498
  // }
@@ -85840,20 +85511,7 @@ var DrawTree = /*#__PURE__*/function () {
85840
85511
  // dline = paraNode.getLastDrawline();
85841
85512
  // dline = dline.paragraphNode.getLastDrawline();
85842
85513
  }
85843
- // const arr = aEndPath.split("/");
85844
- // const endIndex = parseInt(arr[arr.length - 1]);
85845
- // if (node instanceof ParagraphNode) {
85846
- // (node as ParagraphNode).placeDNodeAfterDline(dlines, dline);
85847
- // } else {
85848
- // node?.placeDNode2DrawLine(
85849
- // dlines,
85850
- // paraNode,
85851
- // dline,
85852
- // index,
85853
- // 0,
85854
- // endIndex
85855
- // );
85856
- // }
85514
+
85857
85515
  if (dline instanceof DrawLine/* DrawLine */.a) {
85858
85516
  dline.fitLines();
85859
85517
  dline.paragraphNode.updateDrawLineStyle();
@@ -170203,7 +169861,7 @@ var map = {
170203
169861
  "./selectDialog/SelectDialog.vue": 73791,
170204
169862
  "./sign/Sign.vue": 67218,
170205
169863
  "./specialChars/HoSpecialChars.vue": 75058,
170206
- "./table/TableCellPoper.vue": 97628,
169864
+ "./table/TableCellPoper.vue": 19363,
170207
169865
  "./table/TableCellPoper1.vue": 44645,
170208
169866
  "./table/TableCellProperty.vue": 90546,
170209
169867
  "./table/TableColProperty.vue": 16154,
@@ -209447,7 +209105,7 @@ var PoperMark = __webpack_require__(20734);
209447
209105
 
209448
209106
 
209449
209107
  // EXTERNAL MODULE: ./src/components/controls/table/TableCellPoper.vue + 6 modules
209450
- var TableCellPoper = __webpack_require__(97628);
209108
+ var TableCellPoper = __webpack_require__(19363);
209451
209109
  // EXTERNAL MODULE: ./src/editor/dom/treeNode/DateTimeNode.ts
209452
209110
  var DateTimeNode = __webpack_require__(92501);
209453
209111
  // EXTERNAL MODULE: ./src/editor/dom/treeNode/DownListNode.ts
@@ -210844,7 +210502,7 @@ var TextNode = __webpack_require__(27198);
210844
210502
  // EXTERNAL MODULE: ./src/editor/dom/treeNode/ParagraphNode.ts
210845
210503
  var ParagraphNode = __webpack_require__(67945);
210846
210504
  ;// CONCATENATED MODULE: ./src/components/version.ts
210847
- /* harmony default export */ var version = ('3.1.158');
210505
+ /* harmony default export */ var version = ('3.1.160');
210848
210506
  // EXTERNAL MODULE: ./src/components/controls/poperTipText/PoperTipText.vue + 5 modules
210849
210507
  var PoperTipText = __webpack_require__(84531);
210850
210508
  ;// CONCATENATED MODULE: ./src/components/controls/poperTipText/index.ts
@@ -214100,8 +213758,8 @@ var HTMLconverter2 = /*#__PURE__*/function () {
214100
213758
  key: "HTMLStyleToCombineStyle",
214101
213759
  value: function HTMLStyleToCombineStyle(jsondata) {
214102
213760
  //NOTE:DomElement中的style中的样式后面的部分
214103
- var hoeditorfactory = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._hoEditorFactoryID);
214104
- var tmp = hoeditorfactory.docTree.styles[0].clone(); // new TextStyle();
213761
+ var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._hoEditorFactoryID);
213762
+ var tmp = hoEditorFactory.docTree.styles[0].clone(); // new TextStyle();
214105
213763
  if (jsondata['font_size']) {
214106
213764
  tmp.size = Number(jsondata['font_size']) || tmp.combineStyle.size;
214107
213765
  var str = jsondata['font_size'];
@@ -214112,7 +213770,7 @@ var HTMLconverter2 = /*#__PURE__*/function () {
214112
213770
  //size = Math.round(hoeditorfactory.unitConvert.pxConversionMm(size, true) );
214113
213771
  size = size / 96 * 72;
214114
213772
  }
214115
- size = hoeditorfactory.unitConvert.getCorrectFontSize(size);
213773
+ size = hoEditorFactory.unitConvert.getCorrectFontSize(size);
214116
213774
  tmp.size = size;
214117
213775
  }
214118
213776
  }
@@ -214289,7 +213947,8 @@ var HTMLconverter2 = /*#__PURE__*/function () {
214289
213947
  }
214290
213948
  if (!width) width = '20';
214291
213949
  if (!height) height = '20';
214292
- var node = new ImageNode/* ImageNode */.H(this._hoEditorFactoryID, HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._hoEditorFactoryID).docTree.activeNodes, null, BaseNode/* NodeType */.Jq.ntImage, HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._hoEditorFactoryID).gernerateCode.generateID('IMG'), src,
213950
+ var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._hoEditorFactoryID);
213951
+ var node = new ImageNode/* ImageNode */.H(this._hoEditorFactoryID, hoEditorFactory.docTree.activeNodes, null, BaseNode/* NodeType */.Jq.ntImage, hoEditorFactory.gernerateCode.generateID('IMG'), src,
214293
213952
  //$(jnode).attr('src') || '',
214294
213953
  Number(width), Number(height));
214295
213954
  return [node];
@@ -214478,7 +214137,8 @@ var HTMLconverter2 = /*#__PURE__*/function () {
214478
214137
  }, {
214479
214138
  key: "TransHTMLTABLE",
214480
214139
  value: function TransHTMLTABLE(jnode, style) {
214481
- var pnode = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._hoEditorFactoryID).docTree.getParentNode(HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._hoEditorFactoryID).docTree.curDomRange.normalize().startPath);
214140
+ var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._hoEditorFactoryID);
214141
+ var pnode = hoEditorFactory.docTree.getParentNode(hoEditorFactory.docTree.curDomRange.normalize().startPath);
214482
214142
  if (pnode instanceof TableNode/* TableNode */.Fh || pnode instanceof CellNode/* CellNode */.D) {
214483
214143
  message/* default */.Z.warn('不能在表格中插入表格');
214484
214144
  return [];
@@ -214511,7 +214171,7 @@ var HTMLconverter2 = /*#__PURE__*/function () {
214511
214171
  }
214512
214172
  }
214513
214173
  //2.创建表格节点
214514
- var lntable = new TableNode/* TableNode */.Fh(this._hoEditorFactoryID, HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._hoEditorFactoryID).docTree.activeNodes, pnode, irow, icol, this.generateTableProperty(jnode));
214174
+ var lntable = new TableNode/* TableNode */.Fh(this._hoEditorFactoryID, hoEditorFactory.docTree.activeNodes, pnode, irow, icol, this.generateTableProperty(jnode));
214515
214175
  //3.设置表格属性
214516
214176
  //this.SetTableProperty(jnode, lntable)
214517
214177
  //4:生成表格内容
@@ -214595,7 +214255,7 @@ var HTMLconverter2 = /*#__PURE__*/function () {
214595
214255
  var textstyle = this.HTMLStyleToParsStyle(styleobj);
214596
214256
  if (textstyle.lineSpace === 0) textstyle.lineSpace = undefined;
214597
214257
  var index = hoEditorFactory.docTree.styleCompare(textstyle);
214598
- var node = new ParagraphNode/* ParagraphNode */.C(this._hoEditorFactoryID, hoEditorFactory.docTree.activeNodes, hoEditorFactory.docTree.getParentNode(HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._hoEditorFactoryID).docTree.curDomRange.normalize().startPath), index
214258
+ var node = new ParagraphNode/* ParagraphNode */.C(this._hoEditorFactoryID, hoEditorFactory.docTree.activeNodes, hoEditorFactory.docTree.getParentNode(hoEditorFactory.docTree.curDomRange.normalize().startPath), index
214599
214259
  //hoEditorFactory.docTree.curParaNo
214600
214260
  );
214601
214261
 
@@ -214723,7 +214383,7 @@ var HTMLconverter2 = /*#__PURE__*/function () {
214723
214383
  }
214724
214384
  var textstyle = this.HTMLStyleToCombineStyle(style);
214725
214385
  var styleindex = hoEditorFactory.docTree.styleCompare(textstyle);
214726
- var node = new TextNode/* TextNode */.R(this._hoEditorFactoryID, hoEditorFactory.docTree.activeNodes, hoEditorFactory.docTree.getParentNode(HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._hoEditorFactoryID).docTree.curDomRange.normalize().startPath), BaseNode/* NodeType */.Jq.ntText, text, styleindex);
214386
+ var node = new TextNode/* TextNode */.R(this._hoEditorFactoryID, hoEditorFactory.docTree.activeNodes, hoEditorFactory.docTree.getParentNode(hoEditorFactory.docTree.curDomRange.normalize().startPath), BaseNode/* NodeType */.Jq.ntText, text, styleindex);
214727
214387
  return node;
214728
214388
  }
214729
214389
  /**
@@ -223744,6 +223404,8 @@ var VueController = /*#__PURE__*/function () {
223744
223404
  loopChildNodes(node.childNodes);
223745
223405
  } else if (node instanceof ParagraphNode/* ParagraphNode */.C) {
223746
223406
  docText += '\n';
223407
+ } else if (node instanceof SignNode/* SignNode */.N && node.customProperty && node.customProperty.bce03) {
223408
+ docText += node.customProperty.bce03;
223747
223409
  }
223748
223410
  }
223749
223411
  };