hoeditor-web 3.1.40 → 3.1.41

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.
@@ -31562,8 +31562,8 @@ var Caret = /*#__PURE__*/function () {
31562
31562
  key: "setStagePosition",
31563
31563
  value: function setStagePosition(stageX, stageY) {
31564
31564
  // console.log("光标在文档中的坐标(默认Y轴从上往下):", stageX, stageY);
31565
- this._stageX = stageX;
31566
- this._stageY = stageY;
31565
+ this._stageX = stageX * _draw_DrawConfig__WEBPACK_IMPORTED_MODULE_4__/* .DrawConfig */ .f.instance().scale;
31566
+ this._stageY = stageY * _draw_DrawConfig__WEBPACK_IMPORTED_MODULE_4__/* .DrawConfig */ .f.instance().scale;
31567
31567
  }
31568
31568
  /**
31569
31569
  * @author xyl
@@ -31576,16 +31576,16 @@ var Caret = /*#__PURE__*/function () {
31576
31576
  value: function moveTo(pageIndex, x, y) {
31577
31577
  var _this = this;
31578
31578
  this.div_cursor.className = "";
31579
- this.x = x;
31580
- this.y = y;
31579
+ this.x = x * _draw_DrawConfig__WEBPACK_IMPORTED_MODULE_4__/* .DrawConfig */ .f.instance().scaleXY;
31580
+ this.y = y * _draw_DrawConfig__WEBPACK_IMPORTED_MODULE_4__/* .DrawConfig */ .f.instance().scaleXY;
31581
31581
  if (this._aiInfo) {
31582
- this._aiInfo.x = x;
31583
- this._aiInfo.y = y;
31582
+ this._aiInfo.x = x * _draw_DrawConfig__WEBPACK_IMPORTED_MODULE_4__/* .DrawConfig */ .f.instance().scaleXY;
31583
+ this._aiInfo.y = y * _draw_DrawConfig__WEBPACK_IMPORTED_MODULE_4__/* .DrawConfig */ .f.instance().scaleXY;
31584
31584
  this._aiInfo.pageIndex = pageIndex;
31585
31585
  this._aiInfo.height = this._height;
31586
31586
  }
31587
- this.div_cursor.style.left = x + "px";
31588
- this.div_cursor.style.top = y + "px";
31587
+ this.div_cursor.style.left = x * _draw_DrawConfig__WEBPACK_IMPORTED_MODULE_4__/* .DrawConfig */ .f.instance().scaleXY + "px";
31588
+ this.div_cursor.style.top = y * _draw_DrawConfig__WEBPACK_IMPORTED_MODULE_4__/* .DrawConfig */ .f.instance().scaleXY + "px";
31589
31589
  this.div_cursor.style.opacity = "1";
31590
31590
  // this.div_cursor.style.width = "0.1px";
31591
31591
  setTimeout(function () {
@@ -47727,7 +47727,7 @@ var PageProperty = /*#__PURE__*/function () {
47727
47727
  this._widthPixes = hoEditorFactory.unitConvert.mmConversionPx(this._widthMm, true);
47728
47728
  this._commentWidthPixes = hoEditorFactory.unitConvert.mmConversionPx(this._commentWidthMm, true);
47729
47729
  this._rightMarginPixes = hoEditorFactory.unitConvert.mmConversionPx(this._rightMarginMm, true);
47730
- var scaleXY = Math.max(_draw_DrawConfig__WEBPACK_IMPORTED_MODULE_12__/* .DrawConfig */ .f.instance().scaleXY, _draw_DrawConfig__WEBPACK_IMPORTED_MODULE_12__/* .DrawConfig */ .f.instance().transformScale);
47730
+ var scaleXY = _draw_DrawConfig__WEBPACK_IMPORTED_MODULE_12__/* .DrawConfig */ .f.instance().scale;
47731
47731
  var width = Math.floor(this._widthPixes * scaleXY) % 2 === 1 ? Math.floor(this._widthPixes * scaleXY) + 1 : Math.floor(this._widthPixes * scaleXY);
47732
47732
  this._canvasParams.width = width;
47733
47733
  this._canvasParams.commentWidth = this._commentWidthPixes;
@@ -47745,7 +47745,7 @@ var PageProperty = /*#__PURE__*/function () {
47745
47745
  this._widthPixes = hoeditorfacotry.unitConvert.mmConversionPx(this._widthMm, true);
47746
47746
  hoeditorfacotry.drawTree.updateDrawTreeFirstLine();
47747
47747
  }
47748
- var scaleXY = Math.max(_draw_DrawConfig__WEBPACK_IMPORTED_MODULE_12__/* .DrawConfig */ .f.instance().scaleXY, _draw_DrawConfig__WEBPACK_IMPORTED_MODULE_12__/* .DrawConfig */ .f.instance().transformScale);
47748
+ var scaleXY = _draw_DrawConfig__WEBPACK_IMPORTED_MODULE_12__/* .DrawConfig */ .f.instance().scale;
47749
47749
  var width = Math.floor(this._widthPixes * scaleXY) % 2 === 1 ? Math.floor(this._widthPixes * scaleXY) + 1 : Math.floor(this._widthPixes * scaleXY);
47750
47750
  this._canvasParams.width = width;
47751
47751
  }
@@ -47759,7 +47759,7 @@ var PageProperty = /*#__PURE__*/function () {
47759
47759
  this._heightMm = value;
47760
47760
  this._heightPixes = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_11__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID).unitConvert.mmConversionPx(this._heightMm, false);
47761
47761
  }
47762
- var scaleXY = Math.max(_draw_DrawConfig__WEBPACK_IMPORTED_MODULE_12__/* .DrawConfig */ .f.instance().scaleXY, _draw_DrawConfig__WEBPACK_IMPORTED_MODULE_12__/* .DrawConfig */ .f.instance().transformScale);
47762
+ var scaleXY = _draw_DrawConfig__WEBPACK_IMPORTED_MODULE_12__/* .DrawConfig */ .f.instance().scale;
47763
47763
  var height = Math.floor(this._heightPixes * scaleXY) % 2 === 1 ? Math.floor(this._heightPixes * scaleXY) + 1 : Math.floor(this._heightPixes * scaleXY);
47764
47764
  this._canvasParams.height = height;
47765
47765
  }
@@ -69801,6 +69801,18 @@ var DrawConfig = /*#__PURE__*/function () {
69801
69801
  set: function set(scale) {
69802
69802
  this._transformScale = scale;
69803
69803
  }
69804
+ }, {
69805
+ key: "scale",
69806
+ get: function get() {
69807
+ // return Math.max(this._scaleXY, this._transformScale);
69808
+ if (this._scaleXY !== 1) {
69809
+ return this._scaleXY;
69810
+ } else if (this._transformScale !== 1) {
69811
+ return this._transformScale;
69812
+ } else {
69813
+ return 1;
69814
+ }
69815
+ }
69804
69816
  }], [{
69805
69817
  key: "instance",
69806
69818
  value: function instance() {
@@ -83003,6 +83015,8 @@ var DrawContainer = __webpack_require__(47535);
83003
83015
  var Caret = __webpack_require__(35279);
83004
83016
  // EXTERNAL MODULE: ./src/HOEditorFactorys.ts
83005
83017
  var HOEditorFactorys = __webpack_require__(74089);
83018
+ // EXTERNAL MODULE: ./src/editor/draw/DrawConfig.ts
83019
+ var DrawConfig = __webpack_require__(37616);
83006
83020
  // EXTERNAL MODULE: ./node_modules/core-js/modules/es.number.constructor.js
83007
83021
  var es_number_constructor = __webpack_require__(9653);
83008
83022
  // EXTERNAL MODULE: ./src/editor/events/NodeChangingEvent.ts
@@ -83472,6 +83486,7 @@ var EditorController = /*#__PURE__*/function () {
83472
83486
 
83473
83487
 
83474
83488
 
83489
+
83475
83490
  var Editor = /*#__PURE__*/function () {
83476
83491
  function Editor(hoEditorFactoryID) {
83477
83492
  (0,classCallCheck/* default */.Z)(this, Editor);
@@ -83549,8 +83564,8 @@ var Editor = /*#__PURE__*/function () {
83549
83564
  key: "moveTo",
83550
83565
  value: function moveTo(pageIndex, x, y) {
83551
83566
  this.setPage(pageIndex);
83552
- this.input.style.left = x + 'px';
83553
- this.input.style.top = y + 'px';
83567
+ this.input.style.left = x * DrawConfig/* DrawConfig */.f.instance().scaleXY + 'px';
83568
+ this.input.style.top = y * DrawConfig/* DrawConfig */.f.instance().scaleXY + 'px';
83554
83569
  this.input.focus();
83555
83570
  }
83556
83571
  }]);
@@ -84209,8 +84224,6 @@ var DrawPageMainDoc = __webpack_require__(77441);
84209
84224
  var DrawTextNode = __webpack_require__(24492);
84210
84225
  // EXTERNAL MODULE: ./src/editor/dom/treeNode/TableFormula.ts
84211
84226
  var TableFormula = __webpack_require__(90832);
84212
- // EXTERNAL MODULE: ./src/editor/draw/DrawConfig.ts
84213
- var DrawConfig = __webpack_require__(37616);
84214
84227
  // EXTERNAL MODULE: ./src/editor/draw/drawNode/DrawSignNode.ts
84215
84228
  var DrawSignNode = __webpack_require__(75638);
84216
84229
  // EXTERNAL MODULE: ./src/editor/dom/TableProperty.ts
@@ -84283,7 +84296,6 @@ var JumpButtonNode = __webpack_require__(330);
84283
84296
 
84284
84297
 
84285
84298
 
84286
-
84287
84299
 
84288
84300
 
84289
84301
  //当前的显示状态,psDesign为设计状态,psEdit为正常编辑状态 psPreview为打印预览态态 psPrint 正在打印状态, psReview审阅状态
@@ -86606,16 +86618,15 @@ var DrawTree = /*#__PURE__*/function () {
86606
86618
  var pos = dline.localToLocal(dright, 0, dPage.drawDocContainer);
86607
86619
  this._caret.height = dline.dHeight + dline.paragraphNode.combineParagraph.lineSpace;
86608
86620
  if (dPage && dPage.drawSelectLevel) {
86609
- var scaleXY = DrawConfig/* DrawConfig */.f.instance().scaleXY;
86610
86621
  if (this.selectRange.isEmpty || hoEditorFactory.docController.findContent !== "") {
86611
- this._editor.moveTo(dPage.pageIndex, pos.x * scaleXY, pos.y * scaleXY);
86622
+ this._editor.moveTo(dPage.pageIndex, pos.x, pos.y);
86612
86623
  }
86613
86624
  if (dNode instanceof DrawSignNode/* DrawSignNode */.V) {
86614
- this._caret.setStagePosition((pos.x - dNode.dWidth) * scaleXY, pos.y * scaleXY);
86625
+ this._caret.setStagePosition(pos.x - dNode.dWidth, pos.y);
86615
86626
  } else {
86616
- this._caret.setStagePosition(pos.x * scaleXY, pos.y * scaleXY);
86627
+ this._caret.setStagePosition(pos.x, pos.y);
86617
86628
  }
86618
- this._caret.moveTo(dPage.pageIndex, pos.x * scaleXY, pos.y * scaleXY);
86629
+ this._caret.moveTo(dPage.pageIndex, pos.x, pos.y);
86619
86630
  }
86620
86631
  return;
86621
86632
  }
@@ -86661,7 +86672,7 @@ var DrawTree = /*#__PURE__*/function () {
86661
86672
  value: function moveEditTo(pageIndex, x, y) {
86662
86673
  var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._hoEditorFactoryID);
86663
86674
  if (this.selectRange.beginRangeSelect === undefined || this.selectRange.isEmpty || hoEditorFactory.docController.findContent !== "") {
86664
- this._editor.moveTo(pageIndex, x * DrawConfig/* DrawConfig */.f.instance().scaleXY, y * DrawConfig/* DrawConfig */.f.instance().scaleXY);
86675
+ this._editor.moveTo(pageIndex, x, y);
86665
86676
  }
86666
86677
  }
86667
86678
  }, {
@@ -86696,8 +86707,8 @@ var DrawTree = /*#__PURE__*/function () {
86696
86707
  this._caret.height = dLine.dHeight + dLine.paragraphNode.combineParagraph.lineSpace;
86697
86708
  // 只读模式
86698
86709
  if (this._paintStatus !== PaintState.psReadOnly) {
86699
- this._caret.setStagePosition(dest.x * DrawConfig/* DrawConfig */.f.instance().scaleXY, dest.y * DrawConfig/* DrawConfig */.f.instance().scaleXY);
86700
- this._caret.moveTo(dPage.pageIndex, dest.x * DrawConfig/* DrawConfig */.f.instance().scaleXY, dest.y * DrawConfig/* DrawConfig */.f.instance().scaleXY);
86710
+ this._caret.setStagePosition(dest.x, dest.y);
86711
+ this._caret.moveTo(dPage.pageIndex, dest.x, dest.y);
86701
86712
  }
86702
86713
  this.moveEditTo(dPage.pageIndex, dest.x, dest.y);
86703
86714
  } else {
@@ -86731,11 +86742,11 @@ var DrawTree = /*#__PURE__*/function () {
86731
86742
  // }
86732
86743
  if (this._paintStatus !== PaintState.psReadOnly) {
86733
86744
  if (dNode instanceof DrawSignNode/* DrawSignNode */.V) {
86734
- this._caret.setStagePosition((_dest.x - dNode.dWidth) * DrawConfig/* DrawConfig */.f.instance().scaleXY, _dest.y * DrawConfig/* DrawConfig */.f.instance().scaleXY);
86745
+ this._caret.setStagePosition(_dest.x - dNode.dWidth, _dest.y);
86735
86746
  } else {
86736
- this._caret.setStagePosition(_dest.x * DrawConfig/* DrawConfig */.f.instance().scaleXY, _dest.y * DrawConfig/* DrawConfig */.f.instance().scaleXY);
86747
+ this._caret.setStagePosition(_dest.x, _dest.y);
86737
86748
  }
86738
- this._caret.moveTo(dPage.pageIndex, _dest.x * DrawConfig/* DrawConfig */.f.instance().scaleXY, _dest.y * DrawConfig/* DrawConfig */.f.instance().scaleXY);
86749
+ this._caret.moveTo(dPage.pageIndex, _dest.x, _dest.y);
86739
86750
  }
86740
86751
  this.moveEditTo(dPage.pageIndex, _dest.x, _dest.y);
86741
86752
  }
@@ -215436,8 +215447,8 @@ var es_string_match = __webpack_require__(4723);
215436
215447
  var es_number_constructor = __webpack_require__(9653);
215437
215448
  // EXTERNAL MODULE: ./node_modules/core-js/modules/es.json.stringify.js
215438
215449
  var es_json_stringify = __webpack_require__(38862);
215439
- ;// 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/HoDoc.vue?vue&type=template&id=145d8080&
215440
- var HoDocvue_type_template_id_145d8080_render = function render() {
215450
+ ;// 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/HoDoc.vue?vue&type=template&id=454bbda9&
215451
+ var HoDocvue_type_template_id_454bbda9_render = function render() {
215441
215452
  var _vm = this,
215442
215453
  _c = _vm._self._c;
215443
215454
  return _c('div', {
@@ -215512,16 +215523,28 @@ var HoDocvue_type_template_id_145d8080_render = function render() {
215512
215523
  }, {
215513
215524
  key: "hoAddSelectMark",
215514
215525
  fn: function fn() {
215515
- return [_c('a-icon', {
215526
+ return [_c('svg', {
215516
215527
  staticClass: "ho-select-mark-icon",
215517
215528
  style: _vm.selectMarkStyle,
215518
215529
  attrs: {
215519
- "type": "down-square"
215530
+ "viewBox": "0 0 1024 1024",
215531
+ "version": "1.1",
215532
+ "xmlns": "http://www.w3.org/2000/svg",
215533
+ "width": "16",
215534
+ "height": "16"
215520
215535
  },
215521
215536
  on: {
215522
215537
  "click": _vm.selectMarkClick
215523
215538
  }
215524
- })];
215539
+ }, [_c('path', {
215540
+ attrs: {
215541
+ "d": "M896 0H128a128 128 0 0 0-128 128v768a128 128 0 0 0 128 128h768a128 128 0 0 0 128-128V128a128 128 0 0 0-128-128z m64 896a64 64 0 0 1-64 64H128a64 64 0 0 1-64-64V128a64 64 0 0 1 64-64h768a64 64 0 0 1 64 64z"
215542
+ }
215543
+ }), _c('path', {
215544
+ attrs: {
215545
+ "d": "M535.04 609.28a32.64 32.64 0 0 1-45.44 0l-256-256-45.44 45.44 256 256a95.36 95.36 0 0 0 135.68 0l256-256-44.8-44.8z"
215546
+ }
215547
+ })])];
215525
215548
  },
215526
215549
  proxy: true
215527
215550
  }], null, true)
@@ -215608,7 +215631,7 @@ var HoDocvue_type_template_id_145d8080_render = function render() {
215608
215631
  }
215609
215632
  }, [_vm._v("v " + _vm._s(_vm.version))])])])], 1);
215610
215633
  };
215611
- var HoDocvue_type_template_id_145d8080_staticRenderFns = [];
215634
+ var HoDocvue_type_template_id_454bbda9_staticRenderFns = [];
215612
215635
 
215613
215636
  // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.filter.js
215614
215637
  var es_array_filter = __webpack_require__(57327);
@@ -215838,8 +215861,8 @@ var DrawSelectLevel = /*#__PURE__*/function () {
215838
215861
  this._selectCanvas.width = hoEditorFactory.pageProperty.canvasParams.width;
215839
215862
  this._selectCanvas.height = hoEditorFactory.pageProperty.canvasParams.height; // if (hoEditorFactory.drawTree.paintStatus === PaintState.psReview) {
215840
215863
  this._selectStage = new createjs.Stage(this._selectCanvas);
215841
- this._selectStage.scaleX = Math.max(DrawConfig/* DrawConfig */.f.instance().scaleXY, DrawConfig/* DrawConfig */.f.instance().transformScale);
215842
- this._selectStage.scaleY = Math.max(DrawConfig/* DrawConfig */.f.instance().scaleXY, DrawConfig/* DrawConfig */.f.instance().transformScale);
215864
+ this._selectStage.scaleX = DrawConfig/* DrawConfig */.f.instance().scale;
215865
+ this._selectStage.scaleY = DrawConfig/* DrawConfig */.f.instance().scale;
215843
215866
  var dPage = hoEditorFactory.drawTree.drawPages[this._pageIndex];
215844
215867
  if ((_dPage$drawDomLevel = dPage.drawDomLevel) !== null && _dPage$drawDomLevel !== void 0 && _dPage$drawDomLevel.stage) this._selectStage.nextStage = (_dPage$drawDomLevel2 = dPage.drawDomLevel) === null || _dPage$drawDomLevel2 === void 0 ? void 0 : _dPage$drawDomLevel2.stage;
215845
215868
  dPage.setEnableMouseOver(5);
@@ -216481,8 +216504,8 @@ var DrawDomLevel = /*#__PURE__*/function () {
216481
216504
  this._domCanvas.width = hoeditorfactory.pageProperty.canvasParams.width;
216482
216505
  this._domCanvas.height = hoeditorfactory.pageProperty.canvasParams.height;
216483
216506
  this._domStage = new createjs.Stage(this._domCanvas);
216484
- this._domStage.scaleX = Math.max(DrawConfig/* DrawConfig */.f.instance().scaleXY, DrawConfig/* DrawConfig */.f.instance().transformScale);
216485
- this._domStage.scaleY = Math.max(DrawConfig/* DrawConfig */.f.instance().scaleXY, DrawConfig/* DrawConfig */.f.instance().transformScale);
216507
+ this._domStage.scaleX = DrawConfig/* DrawConfig */.f.instance().scale;
216508
+ this._domStage.scaleY = DrawConfig/* DrawConfig */.f.instance().scale;
216486
216509
  var dPage = hoeditorfactory.drawTree.drawPages[this._pageIndex];
216487
216510
  var keys = (0,esm_toConsumableArray/* default */.Z)(hoeditorfactory.drawPageTree.needUpdateMainDocInfo.keys()).sort(function (a, b) {
216488
216511
  if (a > b) {
@@ -216610,7 +216633,7 @@ var DrawDomLevel = /*#__PURE__*/function () {
216610
216633
  value: function getDrawPlaceByPos(x, y) {
216611
216634
  var hoeditorfactory = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._hoEditorFactoryID);
216612
216635
  var dPage = hoeditorfactory.drawTree.drawPages[this._pageIndex];
216613
- var adjy = y / Math.max(DrawConfig/* DrawConfig */.f.instance().scaleXY, DrawConfig/* DrawConfig */.f.instance().transformScale);
216636
+ var adjy = y / DrawConfig/* DrawConfig */.f.instance().scale;
216614
216637
  if (adjy >= 0 && adjy <= this._mainDocTop) {
216615
216638
  return dPage.drawHeader;
216616
216639
  } else if (adjy > this._mainDocTop && adjy < this._footerTop) {
@@ -218613,7 +218636,7 @@ var TextNode = __webpack_require__(27198);
218613
218636
  // EXTERNAL MODULE: ./src/editor/dom/treeNode/ParagraphNode.ts
218614
218637
  var ParagraphNode = __webpack_require__(67945);
218615
218638
  ;// CONCATENATED MODULE: ./src/components/version.ts
218616
- /* harmony default export */ var version = ('3.1.40');
218639
+ /* harmony default export */ var version = ('3.1.41');
218617
218640
  // EXTERNAL MODULE: ./src/components/controls/poperTipText/PoperTipText.vue + 5 modules
218618
218641
  var PoperTipText = __webpack_require__(50987);
218619
218642
  ;// CONCATENATED MODULE: ./src/components/controls/poperTipText/index.ts
@@ -218661,7 +218684,7 @@ var ImageNode = __webpack_require__(97186);
218661
218684
 
218662
218685
 
218663
218686
 
218664
- var scaleXY = Math.max(DrawConfig/* DrawConfig */.f.instance().scaleXY, DrawConfig/* DrawConfig */.f.instance().transformScale);
218687
+ var scaleXY = DrawConfig/* DrawConfig */.f.instance().scale;
218665
218688
  var defaultWidth = Math.floor(793 * scaleXY) % 2 === 1 ? Math.floor(793 * scaleXY) + 1 : Math.floor(793 * scaleXY);
218666
218689
  var defaultHeight = Math.floor(1122 * scaleXY) % 2 === 1 ? Math.floor(1122 * scaleXY) + 1 : Math.floor(1122 * scaleXY);
218667
218690
  /* harmony default export */ var HoDocvue_type_script_lang_js_ = ({
@@ -218963,9 +218986,9 @@ var defaultHeight = Math.floor(1122 * scaleXY) % 2 === 1 ? Math.floor(1122 * sca
218963
218986
  this.hoEditorProvider.autoSelectElementId = '';
218964
218987
  this.isAutoPoper = false;
218965
218988
  }
218966
- if (this.selectMarkStyle.display == 'block') {
218967
- this.updateSelectMark();
218968
- }
218989
+ // if (this.selectMarkStyle.display == 'block') {
218990
+ // this.updateSelectMark();
218991
+ // }
218969
218992
  },
218970
218993
  /**
218971
218994
  * 鼠标click事件
@@ -219026,9 +219049,9 @@ var defaultHeight = Math.floor(1122 * scaleXY) % 2 === 1 ? Math.floor(1122 * sca
219026
219049
  nodeType: node.parentNode.nodeType,
219027
219050
  type: 'TextInputFieldNode'
219028
219051
  });
219029
- // this.$nextTick(() => {
219030
- // this.createSelectMark(node, hoEditorFactory.drawTree.paintStatus, pageIndex);
219031
- // })
219052
+ // this.$nextTick(() => {
219053
+ // this.createSelectMark(node, hoEditorFactory.drawTree.paintStatus, pageIndex);
219054
+ // })
219032
219055
  }
219033
219056
  }
219034
219057
  } else if (e.clickType === 'rightClick') {
@@ -219177,7 +219200,7 @@ var defaultHeight = Math.floor(1122 * scaleXY) % 2 === 1 ? Math.floor(1122 * sca
219177
219200
  },
219178
219201
  updateSelectMark: function updateSelectMark() {
219179
219202
  var _this6 = this;
219180
- this.selectMarkStyle.display = 'none';
219203
+ // this.selectMarkStyle.display = 'none';
219181
219204
  var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this.hoEditorProvider.activeDocId);
219182
219205
  var paintStatus = hoEditorFactory.drawTree.paintStatus;
219183
219206
  var node = hoEditorFactory.vueController.getNodeByDataID('main', this.selectMarkStyle.dataid);
@@ -219193,12 +219216,12 @@ var defaultHeight = Math.floor(1122 * scaleXY) % 2 === 1 ? Math.floor(1122 * sca
219193
219216
  parentNode = node.parentNode;
219194
219217
  }
219195
219218
  var index = 5;
219196
- var flag = true;
219197
- while (flag && index >= 0) {
219219
+ var flag = false;
219220
+ while (!flag && index >= 0) {
219198
219221
  var currentNode = parentNode.parentNode;
219199
219222
  index--;
219200
219223
  flag = parentNode.parentNode instanceof TextInputFieldNode/* TextInputFieldNode */.re && parentNode.parentNode.inputFieldType == 1 && parentNode.parentNode.downListProperty.listItems.includes("<元素>");
219201
- if (flag) {
219224
+ if (!flag) {
219202
219225
  parentNode = parentNode.parentNode;
219203
219226
  }
219204
219227
  }
@@ -219399,7 +219422,7 @@ var defaultHeight = Math.floor(1122 * scaleXY) % 2 === 1 ? Math.floor(1122 * sca
219399
219422
  var nodePos = node.drawNodes[0];
219400
219423
  var drawLine = hoEditorFactory.drawTree.getDrawLineByDNode(nodePos);
219401
219424
  var docPos = drawLine.localToGlobal(nodePos.x, nodePos.y === 0 ? drawLine.dHeight : nodePos.y);
219402
- var scaleXY = Math.max(DrawConfig/* DrawConfig */.f.instance().scaleXY, DrawConfig/* DrawConfig */.f.instance().transformScale);
219425
+ var scaleXY = DrawConfig/* DrawConfig */.f.instance().scale;
219403
219426
  var pos = {
219404
219427
  x: docPos.x / scaleXY,
219405
219428
  // 目标元素所在行的 x
@@ -219502,10 +219525,10 @@ var defaultHeight = Math.floor(1122 * scaleXY) % 2 === 1 ? Math.floor(1122 * sca
219502
219525
  });
219503
219526
  ;// CONCATENATED MODULE: ./src/components/HoDoc.vue?vue&type=script&lang=js&
219504
219527
  /* harmony default export */ var components_HoDocvue_type_script_lang_js_ = (HoDocvue_type_script_lang_js_);
219505
- ;// 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/HoDoc.vue?vue&type=style&index=0&id=145d8080&prod&lang=less&
219528
+ ;// 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/HoDoc.vue?vue&type=style&index=0&id=454bbda9&prod&lang=less&
219506
219529
  // extracted by mini-css-extract-plugin
219507
219530
 
219508
- ;// CONCATENATED MODULE: ./src/components/HoDoc.vue?vue&type=style&index=0&id=145d8080&prod&lang=less&
219531
+ ;// CONCATENATED MODULE: ./src/components/HoDoc.vue?vue&type=style&index=0&id=454bbda9&prod&lang=less&
219509
219532
 
219510
219533
  ;// CONCATENATED MODULE: ./src/components/HoDoc.vue
219511
219534
 
@@ -219518,8 +219541,8 @@ var defaultHeight = Math.floor(1122 * scaleXY) % 2 === 1 ? Math.floor(1122 * sca
219518
219541
 
219519
219542
  var HoDoc_component = (0,componentNormalizer/* default */.Z)(
219520
219543
  components_HoDocvue_type_script_lang_js_,
219521
- HoDocvue_type_template_id_145d8080_render,
219522
- HoDocvue_type_template_id_145d8080_staticRenderFns,
219544
+ HoDocvue_type_template_id_454bbda9_render,
219545
+ HoDocvue_type_template_id_454bbda9_staticRenderFns,
219523
219546
  false,
219524
219547
  null,
219525
219548
  null,
@@ -231398,12 +231421,12 @@ var VueController = /*#__PURE__*/function () {
231398
231421
  if (anode instanceof ControlNode/* ControlNode */.w || anode instanceof TextInputFieldNode/* TextInputFieldNode */.re) {
231399
231422
  for (var m = 0, len = items.length - 1; m <= len; m++) {
231400
231423
  var item = items[m];
231401
- if (item.text !== '' && item.name === anode.name && anode.text.indexOf(item.text) !== -1) {
231424
+ if (item.text !== '' && (item.name === anode.name || item.id === anode.id || item.dataId === anode.dataId) && anode.text.indexOf(item.text) !== -1) {
231402
231425
  var range = _this4.search(anode, item.text);
231403
231426
  if (range.length > 0) {
231404
231427
  selectRangeArr = selectRangeArr.concat(range);
231405
231428
  }
231406
- } else if (item.text === '' && item.name === anode.name) {
231429
+ } else if (item.text === '' && (item.name === anode.name || item.id === anode.id || item.dataId === anode.dataId)) {
231407
231430
  var _range = _this4.search(anode, anode.text);
231408
231431
  if (_range.length > 0) {
231409
231432
  selectRangeArr = selectRangeArr.concat(_range);