hoeditor-web 2.0.61 → 2.0.64

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.
@@ -11668,6 +11668,8 @@ var Print = /*#__PURE__*/function () {
11668
11668
 
11669
11669
  PDF === null || PDF === void 0 ? void 0 : PDF.addPage();
11670
11670
  ctx = PDF === null || PDF === void 0 ? void 0 : PDF.context2d;
11671
+ ctx.posX = svg2pdfOptions.x;
11672
+ ctx.posY = svg2pdfOptions.y;
11671
11673
  window.printBlack = hoEditorFactory.printBlack;
11672
11674
 
11673
11675
  if (hoEditorFactory.isFixedPrintToA4 == '2' && format) {
@@ -11676,11 +11678,11 @@ var Print = /*#__PURE__*/function () {
11676
11678
  ctx.translate(0, 1122 / 2); // 由于旋转是默认以左上角为中心 所以需要先移动位置 改变起始点
11677
11679
 
11678
11680
  ctx.rotate(270 * Math.PI / 180); // 旋转 context2d
11681
+ // ctx.posX = 0;
11682
+ // ctx.posY = 1122 / 2;
11679
11683
  }
11680
11684
  }
11681
11685
 
11682
- ctx.posX = svg2pdfOptions.x;
11683
- ctx.posY = svg2pdfOptions.y;
11684
11686
  ctx && ((_cpage$drawDomLevel = cpage.drawDomLevel) === null || _cpage$drawDomLevel === void 0 ? void 0 : (_cpage$drawDomLevel$s = _cpage$drawDomLevel.stage) === null || _cpage$drawDomLevel$s === void 0 ? void 0 : _cpage$drawDomLevel$s.draw(ctx));
11685
11687
  ctx = null;
11686
11688
  _context3.next = 57;
@@ -11812,7 +11814,7 @@ var Print = /*#__PURE__*/function () {
11812
11814
  return link.remove();
11813
11815
  }, 100);
11814
11816
  } else {
11815
- if (height <= 560 && hoEditorFactory.isFixedPrintToA4 !== '2') {
11817
+ if (height <= 560 && hoEditorFactory.isFixedPrintToA4 === '') {
11816
11818
  PDF === null || PDF === void 0 ? void 0 : PDF.deletePage(1);
11817
11819
  }
11818
11820
 
@@ -22241,7 +22243,7 @@ var CellProperty = /*#__PURE__*/function () {
22241
22243
  /*
22242
22244
  * @Author: your name
22243
22245
  * @Date: 2021-01-20 10:18:55
22244
- * @LastEditTime: 2022-05-20 18:56:55
22246
+ * @LastEditTime: 2022-07-08 13:55:38
22245
22247
  * @LastEditors: liyanan 2441631434@qq.com
22246
22248
  * @Description: In User Settings Edit
22247
22249
  * @FilePath: \hoeditor-web\src\editor\dom\domNode\Comment.ts
@@ -44495,15 +44497,24 @@ var DrawArea = /*#__PURE__*/function (_DrawRect) {
44495
44497
  }
44496
44498
  }, {
44497
44499
  key: "removeComment",
44498
- value: function removeComment(comment) {
44499
- for (var i = this.children.length - 1; i >= 0; i--) {
44500
- var child = this.children[i];
44500
+ value: function removeComment(comment, isRecord) {
44501
+ if (isRecord) {
44502
+ for (var i = this.children.length - 1; i >= 0; i--) {
44503
+ var child = this.children[i];
44501
44504
 
44502
- if (child.name === comment.id) {
44503
- this.children.splice(i, 1);
44505
+ if (child.name && child.name === "record" + comment.id) {
44506
+ this.children.splice(i, 1);
44507
+ }
44504
44508
  }
44505
- } //this.stage.update();
44509
+ } else {
44510
+ for (var _i = this.children.length - 1; _i >= 0; _i--) {
44511
+ var _child = this.children[_i];
44506
44512
 
44513
+ if (_child.name && _child.name === comment.id) {
44514
+ this.children.splice(_i, 1);
44515
+ }
44516
+ }
44517
+ }
44507
44518
 
44508
44519
  _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_17__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID).drawPageTree.updateDrawPage(this.index);
44509
44520
  }
@@ -44615,12 +44626,12 @@ var DrawArea = /*#__PURE__*/function (_DrawRect) {
44615
44626
  var minValue = getStagePos(bottomComments[0])[1];
44616
44627
  var _tempComment = bottomComments[0];
44617
44628
 
44618
- for (var _i = 1; _i < bottomComments.length; _i++) {
44619
- var _stageY2 = getStagePos(bottomComments[_i])[1];
44629
+ for (var _i2 = 1; _i2 < bottomComments.length; _i2++) {
44630
+ var _stageY2 = getStagePos(bottomComments[_i2])[1];
44620
44631
 
44621
44632
  if (_stageY2 < minValue) {
44622
44633
  minValue = _stageY2;
44623
- _tempComment = bottomComments[_i];
44634
+ _tempComment = bottomComments[_i2];
44624
44635
  }
44625
44636
  }
44626
44637
 
@@ -44721,12 +44732,13 @@ var DrawArea = /*#__PURE__*/function (_DrawRect) {
44721
44732
  var container = new createjs.Container();
44722
44733
  container.x = docWidth + 15;
44723
44734
  container.y = commentY - comment.lineHeight / 2;
44724
- container.name = comment.id;
44735
+ container.name = "record" + comment.id;
44725
44736
  var commentTextShape = null; // 批注内容
44726
44737
 
44727
44738
  var commentArr = comment.commentTextWarp(commentWidth, comment.text);
44728
- var text = commentArr[0];
44729
- var textLen = commentArr[1] > 1 ? commentArr[1] - 1 : commentArr[1];
44739
+ var text = commentArr[0]; //const textLen = (commentArr[1] as number) > 1 ? (commentArr[1] as number) - 1 : (commentArr[1] as number);
44740
+
44741
+ var textLen = commentArr[1];
44730
44742
  comment.lineHeight = 20 * textLen + 10;
44731
44743
  commentTextShape = new createjs.Text(text, "12px 微软雅黑", "#666");
44732
44744
  commentTextShape.lineWidth = commentWidth - 25;
@@ -44745,12 +44757,12 @@ var DrawArea = /*#__PURE__*/function (_DrawRect) {
44745
44757
 
44746
44758
  var horizontalLine = new createjs.Shape();
44747
44759
  horizontalLine.graphics.setStrokeDash([4, 1], 0).setStrokeStyle(1).beginStroke("rgba(255, 0, 0, 1)").moveTo(nodeX, nodeY).lineTo(docWidth, nodeY);
44748
- horizontalLine.name = comment.id;
44760
+ horizontalLine.name = "record" + comment.id;
44749
44761
  horizontalLine.alpha = 1; //指向线
44750
44762
 
44751
44763
  var guideLine = new createjs.Shape();
44752
44764
  guideLine.graphics.setStrokeDash([4, 1], 0).setStrokeStyle(1).beginStroke("rgba(255, 0, 0, 1)").moveTo(docWidth, nodeY).lineTo(docWidth + 15, commentY - comment.lineHeight / 4);
44753
- guideLine.name = comment.id;
44765
+ guideLine.name = "record" + comment.id;
44754
44766
  guideLine.alpha = 1;
44755
44767
  container.addChild(backShape);
44756
44768
  container.addChild(commentTextShape);
@@ -44764,13 +44776,14 @@ var DrawArea = /*#__PURE__*/function (_DrawRect) {
44764
44776
  value: function repaintRecored(comments, comment, nPath, spX, spY) {
44765
44777
  var _this5 = this;
44766
44778
 
44779
+ var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_17__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
44767
44780
  var topComments = new Array();
44768
44781
  var bottomComments = new Array();
44769
44782
  var tempArr = new Array();
44770
44783
 
44771
44784
  var getStagePos = function getStagePos(comment) {
44772
44785
  var endDrawNode = comment.eNode.drawNodes[0];
44773
- var dline = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_17__/* .HOEditorFactorys.instance */ .b.instance().getFactory(_this5._hoEditorFactoryID).drawTree.getDrawLineByDNode(endDrawNode); // 末尾标记节点所在行
44786
+ var dline = hoEditorFactory.drawTree.getDrawLineByDNode(endDrawNode); // 末尾标记节点所在行
44774
44787
 
44775
44788
  var stagePos = dline.localToGlobal(endDrawNode.x, endDrawNode.y); // 末尾标记节点的stage坐标
44776
44789
 
@@ -44783,7 +44796,11 @@ var DrawArea = /*#__PURE__*/function (_DrawRect) {
44783
44796
  var commentY = spY;
44784
44797
  comments.forEach(function (value) {
44785
44798
  if (value.id !== comment.id) {
44786
- tempArr.push(value);
44799
+ var area = hoEditorFactory.drawPageTree.getMainRootArea(value.eNode.drawNodes[0]);
44800
+
44801
+ if (area && area.index == _this5.index) {
44802
+ tempArr.push(value);
44803
+ }
44787
44804
  }
44788
44805
  });
44789
44806
  tempArr.forEach(function (value) {
@@ -44842,7 +44859,7 @@ var DrawArea = /*#__PURE__*/function (_DrawRect) {
44842
44859
  commentY = nodeY;
44843
44860
  }
44844
44861
 
44845
- _this5.removeComment(commentObj);
44862
+ _this5.removeComment(commentObj, true);
44846
44863
 
44847
44864
  _this5.drawEditRecords(commentObj, nodeX, nodeY, commentY);
44848
44865
 
@@ -44866,12 +44883,12 @@ var DrawArea = /*#__PURE__*/function (_DrawRect) {
44866
44883
  var minValue = getStagePos(bottomComments[0])[1];
44867
44884
  var _tempComment3 = bottomComments[0];
44868
44885
 
44869
- for (var _i2 = 1; _i2 < bottomComments.length; _i2++) {
44870
- var _stageY4 = getStagePos(bottomComments[_i2])[1];
44886
+ for (var _i3 = 1; _i3 < bottomComments.length; _i3++) {
44887
+ var _stageY4 = getStagePos(bottomComments[_i3])[1];
44871
44888
 
44872
44889
  if (_stageY4 < minValue) {
44873
44890
  minValue = _stageY4;
44874
- _tempComment3 = bottomComments[_i2];
44891
+ _tempComment3 = bottomComments[_i3];
44875
44892
  }
44876
44893
  }
44877
44894
 
@@ -46220,7 +46237,14 @@ var DrawCombineNode = /*#__PURE__*/function (_DrawContainer) {
46220
46237
  _this2.on('mouseout', function (e) {
46221
46238
  hoEditorFactory.nodeMouseMove.setNode(_this2.node, _editor_events_DmouseEvent__WEBPACK_IMPORTED_MODULE_6__/* .DmouseEventType.detOut */ .p.detOut);
46222
46239
  });
46223
- }
46240
+ } // if(this.node && this.node.drawNodes && this.node.drawNodes[0]) {
46241
+ // const paragraphNode = hoEditorFactory.drawTree.getDrawLineByDNode(this._node.drawNodes[0])?.paragraphNode;
46242
+ // const customProperty = paragraphNode && paragraphNode.customProperty;
46243
+ // if(['男', '女'].includes(customProperty.sex) || (customProperty.age && customProperty.age.select == '隐藏')) {
46244
+ // console.log({...paragraphNode.customProperty})
46245
+ // }
46246
+ // }
46247
+
46224
46248
 
46225
46249
  _this2.on('click', function (e) {
46226
46250
  if (e.nativeEvent.button === 0) {
@@ -51274,9 +51298,9 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
51274
51298
  _this = _super.call(this, hoeditfactoryID, rootPath, node, 0);
51275
51299
  _this._number = 0;
51276
51300
  _this._type = 0;
51277
- _this._signName = "";
51278
- _this._imgSrc = "";
51279
- _this._fingerPrintSrc = "";
51301
+ _this._signName = '';
51302
+ _this._imgSrc = '';
51303
+ _this._fingerPrintSrc = '';
51280
51304
  _this._fingerPosition = 0;
51281
51305
  _this._number = number;
51282
51306
  _this._imgSrc = imgSrc;
@@ -51290,7 +51314,7 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
51290
51314
  _this._textStyle = cbStyle.getStyleKey();
51291
51315
 
51292
51316
  if (_this.number > 0 && type === 2) {
51293
- var signArr = imgSrc.split("\n");
51317
+ var signArr = imgSrc.split('\n');
51294
51318
 
51295
51319
  if (signArr.length > 1) {
51296
51320
  _this.dHeight = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_7__/* .HOEditorFactorys.instance */ .b.instance().getFactory(hoeditfactoryID).signHeight * signArr.length; // const textStyle = new TextStyle(hoeditfactoryID);
@@ -51309,10 +51333,10 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
51309
51333
  } //this._drawText = new DrawSimpleText('/', cbStyle.getStyleKey(), "#000000");
51310
51334
 
51311
51335
 
51312
- _this._drawText = new createjs.Text(node.connectMode, _this._textStyle, "#000000");
51336
+ _this._drawText = new createjs.Text(node.connectMode, _this._textStyle, '#000000');
51313
51337
 
51314
51338
  if (_this.number === 0) {
51315
- var dText = new createjs.Text(_this.signName, _this._textStyle, "#000000");
51339
+ var dText = new createjs.Text(_this.signName, _this._textStyle, '#000000');
51316
51340
  _this.dWidth = dText.getMeasuredWidth();
51317
51341
  } else {
51318
51342
  if (type === 1) {
@@ -51326,14 +51350,14 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
51326
51350
  }
51327
51351
 
51328
51352
  if (type === 2) {
51329
- var _signArr = imgSrc.split("\n");
51353
+ var _signArr = imgSrc.split('\n');
51330
51354
 
51331
- var aText = new createjs.Text(_signArr[0], _this._textStyle, "#000000");
51355
+ var aText = new createjs.Text(_signArr[0], _this._textStyle, '#000000');
51332
51356
  var maxWidth = aText.getMeasuredWidth();
51333
51357
 
51334
51358
  if (_signArr.length > 1) {
51335
51359
  for (var i = 1; i < _signArr.length; i++) {
51336
- aText = new createjs.Text(_signArr[i], _this._textStyle, "#000000");
51360
+ aText = new createjs.Text(_signArr[i], _this._textStyle, '#000000');
51337
51361
  var aWidth = aText.getMeasuredWidth();
51338
51362
 
51339
51363
  if (aWidth > maxWidth) {
@@ -51348,7 +51372,7 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
51348
51372
  _this.dWidth = maxWidth;
51349
51373
  } else {
51350
51374
  //this.dWidth = dText.getMeasuredWidth() + this._drawText.getMeasuredWidth();
51351
- if (node.connectMode === "换行") {
51375
+ if (node.connectMode === '换行') {
51352
51376
  _this.dWidth = maxWidth;
51353
51377
  } else {
51354
51378
  _this.dWidth = maxWidth + _this._drawText.getMeasuredWidth();
@@ -51357,7 +51381,7 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
51357
51381
  }
51358
51382
  }
51359
51383
 
51360
- if (imgWidth == 0 && imgHeight == 0 && imgSrc && type == 1 || type == 3) {
51384
+ if (imgWidth == 0 && imgHeight == 0 && (imgSrc || fingerPrintSrc) && type == 1 || type == 3) {
51361
51385
  _this.drawWriteSignNode(node);
51362
51386
  } else {
51363
51387
  _this.drawSignNode();
@@ -51443,108 +51467,139 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
51443
51467
 
51444
51468
  this.clear();
51445
51469
  var drawNode = this;
51446
- var isFront = node.isFront;
51447
51470
  var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_7__/* .HOEditorFactorys.instance */ .b.instance().getFactory(drawNode.node.hoEditorFactoryID);
51448
51471
 
51449
51472
  var drawSign = function drawSign() {
51450
51473
  if (_this2.type === 1 || _this2.type === 3) {
51451
- var image = new Image();
51452
- image.src = _this2.imgSrc;
51453
51474
  var currentLineHeight = hoEditorFactory.drawTree.caret.height;
51454
- var bitmap = new createjs.Bitmap(image);
51455
- bitmap.y = 0;
51456
- bitmap.x = 0;
51457
-
51458
- if (node.imgWidth) {
51459
- _this2._dWidth = node.imgWidth;
51460
- }
51461
-
51462
- drawNode.addChildAt(bitmap, 0);
51463
- var fingerImage = new Image();
51464
- var fingerBitmap;
51465
-
51466
- if (drawNode.fingerPrintSrc !== "") {
51475
+ node.type = 3;
51476
+
51477
+ if (_this2.imgSrc == '' && _this2.fingerPrintSrc) {
51478
+ var fingerscale = drawNode.fingerPosition == _editor_dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_5__/* .FingerPosition.center */ .d.center ? 0.3 : 0.15;
51479
+ var fingerWidth = 256;
51480
+ _this2._dWidth = fingerWidth * fingerscale;
51481
+ node.imgWidth = _this2._dWidth;
51482
+ var fingerImage = new Image();
51483
+ var fingerBitmap;
51467
51484
  fingerImage.src = _this2.fingerPrintSrc;
51468
51485
  fingerBitmap = new createjs.Bitmap(fingerImage);
51469
- drawNode.addChildAt(fingerBitmap, 1);
51486
+ drawNode.addChildAt(fingerBitmap, 0);
51470
51487
  hoEditorFactory.loadImageCount++;
51471
51488
 
51472
51489
  fingerImage.onerror = function () {
51473
51490
  return hoEditorFactory.loadImageCount--;
51474
51491
  };
51475
- }
51476
51492
 
51477
- hoEditorFactory.loadImageCount++;
51493
+ fingerImage.onload = function () {
51494
+ var fingerHeight = fingerImage.naturalHeight !== 0 ? fingerImage.naturalHeight : fingerImage.height;
51495
+ fingerBitmap.y = -fingerHeight * fingerscale;
51496
+ fingerBitmap.x = 0;
51497
+ node.imgHeight = fingerHeight * fingerscale;
51498
+ _this2._dHeight = node.imgHeight;
51499
+ node.type = 3;
51500
+ fingerBitmap.setTransform(fingerBitmap.x, fingerBitmap.y, fingerscale, fingerscale);
51501
+ updateSign();
51502
+ };
51503
+ } else {
51504
+ var image = new Image();
51505
+ image.src = _this2.imgSrc;
51506
+ var bitmap = new createjs.Bitmap(image);
51507
+ bitmap.y = 0;
51508
+ bitmap.x = 0;
51478
51509
 
51479
- image.onerror = function () {
51480
- return hoEditorFactory.loadImageCount--;
51481
- };
51510
+ if (node.imgWidth) {
51511
+ _this2._dWidth = node.imgWidth;
51512
+ }
51482
51513
 
51483
- image.onload = function () {
51484
- var hitWidth = image.naturalWidth !== 0 ? image.naturalWidth : image.width;
51485
- var hitHeight = image.naturalHeight !== 0 ? image.naturalHeight : image.height;
51486
- var scale = hoEditorFactory.signHeight / hitHeight < 0.4 ? 0.4 : hoEditorFactory.signHeight / hitHeight > 0.7 ? 1 : hoEditorFactory.signHeight / hitHeight;
51487
-
51488
- if (drawNode.fingerPosition == _editor_dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_5__/* .FingerPosition.center */ .d.center && hoEditorFactory.signHeight / hitHeight < 0.2) {
51489
- scale = hoEditorFactory.signHeight * 1.5 / hitHeight;
51490
- }
51491
-
51492
- _this2._dWidth = hitWidth * scale;
51493
-
51494
- if (drawNode.fingerPrintSrc !== "") {
51495
- fingerImage.onload = function () {
51496
- var fingerWidth = 256;
51497
- var fingerHeight = fingerImage.naturalHeight !== 0 ? fingerImage.naturalHeight : fingerImage.height;
51498
- var fingerscale = drawNode.fingerPosition == _editor_dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_5__/* .FingerPosition.center */ .d.center ? 0.3 : 0.15;
51499
- fingerBitmap.scaleX = fingerscale;
51500
- fingerBitmap.scaleY = fingerscale;
51501
- fingerBitmap.y = -fingerHeight * fingerscale;
51502
- bitmap.y = -hitHeight * scale;
51503
-
51504
- if (drawNode.fingerPosition == _editor_dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_5__/* .FingerPosition.left */ .d.left) {
51505
- bitmap.x = fingerWidth * fingerscale + 5;
51506
- fingerBitmap.x = 0;
51507
- _this2._dWidth = hitWidth * scale + 5 + fingerWidth * fingerscale;
51508
- node.imgHeight = Math.floor(Math.max(fingerHeight * fingerscale, hitHeight * scale));
51509
- _this2._dHeight = node.imgHeight;
51510
- } else if (drawNode.fingerPosition == _editor_dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_5__/* .FingerPosition.center */ .d.center) {
51511
- fingerBitmap.x = (hitWidth * scale - fingerWidth * fingerscale) / 2;
51512
- fingerBitmap.y = -(fingerHeight * fingerscale + currentLineHeight) / 2;
51513
- bitmap.y = -(hitHeight * scale + currentLineHeight) / 2;
51514
- node.imgHeight = hoEditorFactory.signHeight;
51515
- } else if (drawNode.fingerPosition == _editor_dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_5__/* .FingerPosition.right */ .d.right) {
51516
- fingerBitmap.x = hitWidth * scale + 5;
51517
- _this2._dWidth = hitWidth * scale + 5 + fingerWidth * fingerscale;
51518
- node.imgHeight = Math.floor(Math.max(fingerHeight * fingerscale, hitHeight * scale));
51519
- _this2._dHeight = node.imgHeight;
51520
- }
51514
+ drawNode.addChildAt(bitmap, 0);
51521
51515
 
51522
- node.imgWidth = _this2._dWidth;
51523
- node.type = 3;
51516
+ var _fingerImage = new Image();
51524
51517
 
51525
- if (drawNode.fingerPosition == _editor_dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_5__/* .FingerPosition.center */ .d.center) {
51526
- _this2._dWidth = 0;
51527
- _this2._dHeight = 0;
51528
- }
51518
+ var _fingerBitmap;
51529
51519
 
51530
- bitmap.setTransform(bitmap.x, bitmap.y, scale, scale);
51531
- fingerBitmap.setTransform(fingerBitmap.x, fingerBitmap.y, fingerscale, fingerscale);
51532
- var hitArea = new createjs.Shape();
51533
- hitArea.graphics.beginFill("#000").drawRect(fingerBitmap.x, 0, fingerWidth * fingerscale, fingerHeight * fingerscale); //这里是图片大小
51520
+ if (drawNode.fingerPrintSrc !== '') {
51521
+ _fingerImage.src = _this2.fingerPrintSrc;
51522
+ _fingerBitmap = new createjs.Bitmap(_fingerImage);
51523
+ drawNode.addChildAt(_fingerBitmap, 1);
51524
+ hoEditorFactory.loadImageCount++;
51534
51525
 
51535
- bitmap.hitArea = hitArea;
51536
- fingerBitmap.hitArea = hitArea;
51537
- updateSign();
51526
+ _fingerImage.onerror = function () {
51527
+ return hoEditorFactory.loadImageCount--;
51538
51528
  };
51539
- } else {
51540
- _this2._dWidth = hitWidth * scale;
51541
- node.imgWidth = _this2._dWidth;
51542
- node.imgHeight = hoEditorFactory.signHeight;
51543
- node.type = 3;
51544
- bitmap.setTransform(0, -(hitHeight * scale + currentLineHeight) / 2, scale, scale);
51545
- updateSign();
51546
51529
  }
51547
- };
51530
+
51531
+ hoEditorFactory.loadImageCount++;
51532
+
51533
+ image.onerror = function () {
51534
+ return hoEditorFactory.loadImageCount--;
51535
+ };
51536
+
51537
+ image.onload = function () {
51538
+ var hitWidth = image.naturalWidth !== 0 ? image.naturalWidth : image.width;
51539
+ var hitHeight = image.naturalHeight !== 0 ? image.naturalHeight : image.height;
51540
+ var scale = hoEditorFactory.signHeight / hitHeight < 0.4 ? 0.4 : hoEditorFactory.signHeight / hitHeight > 0.7 ? 1 : hoEditorFactory.signHeight / hitHeight;
51541
+
51542
+ if (drawNode.fingerPosition == _editor_dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_5__/* .FingerPosition.center */ .d.center && hoEditorFactory.signHeight / hitHeight < 0.2) {
51543
+ scale = hoEditorFactory.signHeight * 1.5 / hitHeight;
51544
+ }
51545
+
51546
+ _this2._dWidth = hitWidth * scale;
51547
+
51548
+ if (drawNode.fingerPrintSrc !== '') {
51549
+ _fingerImage.onload = function () {
51550
+ var fingerWidth = 256;
51551
+ var fingerHeight = _fingerImage.naturalHeight !== 0 ? _fingerImage.naturalHeight : _fingerImage.height;
51552
+ var fingerscale = drawNode.fingerPosition == _editor_dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_5__/* .FingerPosition.center */ .d.center ? 0.3 : 0.15;
51553
+ _fingerBitmap.scaleX = fingerscale;
51554
+ _fingerBitmap.scaleY = fingerscale;
51555
+ _fingerBitmap.y = -fingerHeight * fingerscale;
51556
+ bitmap.y = -hitHeight * scale;
51557
+
51558
+ if (drawNode.fingerPosition == _editor_dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_5__/* .FingerPosition.left */ .d.left) {
51559
+ bitmap.x = fingerWidth * fingerscale + 5;
51560
+ _fingerBitmap.x = 0;
51561
+ _this2._dWidth = hitWidth * scale + 5 + fingerWidth * fingerscale;
51562
+ node.imgHeight = Math.floor(Math.max(fingerHeight * fingerscale, hitHeight * scale));
51563
+ _this2._dHeight = node.imgHeight;
51564
+ } else if (drawNode.fingerPosition == _editor_dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_5__/* .FingerPosition.center */ .d.center) {
51565
+ _fingerBitmap.x = (hitWidth * scale - fingerWidth * fingerscale) / 2;
51566
+ _fingerBitmap.y = -(fingerHeight * fingerscale + currentLineHeight) / 2;
51567
+ bitmap.y = -(hitHeight * scale + currentLineHeight) / 2;
51568
+ node.imgHeight = hoEditorFactory.signHeight;
51569
+ } else if (drawNode.fingerPosition == _editor_dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_5__/* .FingerPosition.right */ .d.right) {
51570
+ _fingerBitmap.x = hitWidth * scale + 5;
51571
+ _this2._dWidth = hitWidth * scale + 5 + fingerWidth * fingerscale;
51572
+ node.imgHeight = Math.floor(Math.max(fingerHeight * fingerscale, hitHeight * scale));
51573
+ _this2._dHeight = node.imgHeight;
51574
+ }
51575
+
51576
+ node.imgWidth = _this2._dWidth;
51577
+
51578
+ if (drawNode.fingerPosition == _editor_dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_5__/* .FingerPosition.center */ .d.center) {
51579
+ _this2._dWidth = 0;
51580
+ _this2._dHeight = 0;
51581
+ }
51582
+
51583
+ bitmap.setTransform(bitmap.x, bitmap.y, scale, scale);
51584
+
51585
+ _fingerBitmap.setTransform(_fingerBitmap.x, _fingerBitmap.y, fingerscale, fingerscale);
51586
+
51587
+ var hitArea = new createjs.Shape();
51588
+ hitArea.graphics.beginFill('#000000').drawRect(_fingerBitmap.x, 0, fingerWidth * fingerscale, fingerHeight * fingerscale); //这里是图片大小
51589
+
51590
+ bitmap.hitArea = hitArea;
51591
+ _fingerBitmap.hitArea = hitArea;
51592
+ updateSign();
51593
+ };
51594
+ } else {
51595
+ _this2._dWidth = hitWidth * scale;
51596
+ node.imgWidth = _this2._dWidth;
51597
+ node.imgHeight = hoEditorFactory.signHeight;
51598
+ bitmap.setTransform(0, -(hitHeight * scale + currentLineHeight) / 2, scale, scale);
51599
+ updateSign();
51600
+ }
51601
+ };
51602
+ }
51548
51603
  }
51549
51604
  };
51550
51605
 
@@ -51563,12 +51618,14 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
51563
51618
  } // hoEditorFactory.drawTree.updateDrawTreeFirstLine();
51564
51619
 
51565
51620
 
51566
- hoEditorFactory.drawTree.rebuildArea("main", false);
51621
+ hoEditorFactory.drawTree.rebuildArea('main', false);
51567
51622
  }
51568
51623
 
51569
- hoEditorFactory.loadImageCount--;
51624
+ if (drawNode.imgSrc) {
51625
+ hoEditorFactory.loadImageCount--;
51626
+ }
51570
51627
 
51571
- if (drawNode.fingerPrintSrc !== "") {
51628
+ if (drawNode.fingerPrintSrc) {
51572
51629
  hoEditorFactory.loadImageCount--;
51573
51630
  }
51574
51631
  };
@@ -51617,19 +51674,19 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
51617
51674
 
51618
51675
  bitmap.setTransform(0, -hoEditorFactory.signHeight, width / hitWidth, drawNode.dHeight / hitHeight);
51619
51676
  var hitArea = new createjs.Shape();
51620
- hitArea.graphics.beginFill("#000").drawRect(0, 0, drawNode.dWidth, drawNode.dHeight); //这里是图片大小
51677
+ hitArea.graphics.beginFill('#000').drawRect(0, 0, drawNode.dWidth, drawNode.dHeight); //这里是图片大小
51621
51678
 
51622
51679
  bitmap.hitArea = hitArea;
51623
51680
 
51624
- if (_this3.imgSrc.indexOf("data:image/") != -1 && _this3.imgSrc.indexOf("data:image/png") == -1) {
51625
- var canvas = document.createElement("canvas");
51681
+ if (_this3.imgSrc.indexOf('data:image/') != -1 && _this3.imgSrc.indexOf('data:image/png') == -1) {
51682
+ var canvas = document.createElement('canvas');
51626
51683
  canvas.width = image.naturalWidth;
51627
51684
  canvas.height = image.naturalHeight;
51628
- var ctx = canvas.getContext("2d");
51629
- ctx.fillStyle = "#FFFFFF";
51685
+ var ctx = canvas.getContext('2d');
51686
+ ctx.fillStyle = '#FFFFFF';
51630
51687
  ctx.fillRect(0, 0, image.naturalWidth, image.naturalHeight);
51631
51688
  ctx.drawImage(image, 0, 0, image.naturalWidth, image.naturalHeight);
51632
- _this3.node.imgSrc = canvas.toDataURL("image/png");
51689
+ _this3.node.imgSrc = canvas.toDataURL('image/png');
51633
51690
  _this3.node.PNGToJPG = 1;
51634
51691
  }
51635
51692
 
@@ -51656,18 +51713,18 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
51656
51713
  return hoEditorFactory.loadImageCount--;
51657
51714
  };
51658
51715
  } else {
51659
- var signArr = _this3.imgSrc.split("\n");
51716
+ var signArr = _this3.imgSrc.split('\n');
51660
51717
 
51661
51718
  if (signArr.length === 1) {
51662
- var drawText2 = new createjs.Text(_this3.imgSrc, _this3.textStyle, "#000000");
51663
- drawText2.textBaseline = "alphabetic";
51664
- drawText2.textAlign = "left";
51719
+ var drawText2 = new createjs.Text(_this3.imgSrc, _this3.textStyle, '#000000');
51720
+ drawText2.textBaseline = 'alphabetic';
51721
+ drawText2.textAlign = 'left';
51665
51722
  var rect = drawText2.getBounds();
51666
51723
 
51667
51724
  if (rect) {
51668
51725
  drawText2.y = _this3.y;
51669
51726
 
51670
- if (_this3.number === 1 || isFront && _this3.number > 1 || _this3.node.connectMode === "换行") {
51727
+ if (_this3.number === 1 || isFront && _this3.number > 1 || _this3.node.connectMode === '换行') {
51671
51728
  drawText2.x = 0;
51672
51729
  } else {
51673
51730
  drawText2.x = _this3._drawText.getMeasuredWidth();
@@ -51677,16 +51734,16 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
51677
51734
  _this3.addChild(drawText2);
51678
51735
  } else {
51679
51736
  for (var i = 0; i < signArr.length; i++) {
51680
- var aText = new createjs.Text(signArr[i], _this3.textStyle, "#000000");
51681
- aText.textBaseline = "alphabetic";
51682
- aText.textAlign = "left";
51737
+ var aText = new createjs.Text(signArr[i], _this3.textStyle, '#000000');
51738
+ aText.textBaseline = 'alphabetic';
51739
+ aText.textAlign = 'left';
51683
51740
 
51684
51741
  var _rect = aText.getBounds();
51685
51742
 
51686
51743
  if (_rect) {
51687
51744
  aText.y = _this3.dHeight / signArr.length * (i + 1) - _this3.dHeight; //aText.y = -this.dHeight / (i + 1);
51688
51745
 
51689
- if (_this3.number === 1 || isFront && _this3.number > 1 || _this3.node.connectMode === "换行") {
51746
+ if (_this3.number === 1 || isFront && _this3.number > 1 || _this3.node.connectMode === '换行') {
51690
51747
  aText.x = 0;
51691
51748
  } else {
51692
51749
  aText.x = _this3._drawText.getMeasuredWidth();
@@ -51700,9 +51757,9 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
51700
51757
  };
51701
51758
 
51702
51759
  if (this.number === 0) {
51703
- var drawText1 = new createjs.Text(this.signName, this.textStyle, "#838586");
51704
- drawText1.textBaseline = "alphabetic";
51705
- drawText1.textAlign = "left";
51760
+ var drawText1 = new createjs.Text(this.signName, this.textStyle, '#838586');
51761
+ drawText1.textBaseline = 'alphabetic';
51762
+ drawText1.textAlign = 'left';
51706
51763
  var rect = drawText1.getBounds();
51707
51764
 
51708
51765
  if (rect) {
@@ -51730,37 +51787,37 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
51730
51787
  var connectMode = this.node.connectMode;
51731
51788
  var line = new createjs.Shape();
51732
51789
 
51733
- if (connectMode === "/") {
51790
+ if (connectMode === '/') {
51734
51791
  if (this.type === 1) {
51735
51792
  if (isFront) {
51736
- line.graphics.beginStroke("#000000").moveTo(this.dWidth - this._drawText.getMeasuredWidth(), 0).lineTo(this.dWidth, -this.dHeight);
51793
+ line.graphics.beginStroke('#000000').moveTo(this.dWidth - this._drawText.getMeasuredWidth(), 0).lineTo(this.dWidth, -this.dHeight);
51737
51794
  } else {
51738
- line.graphics.beginStroke("#000000").moveTo(0, 0).lineTo(this._drawText.getMeasuredWidth(), -this.dHeight);
51795
+ line.graphics.beginStroke('#000000').moveTo(0, 0).lineTo(this._drawText.getMeasuredWidth(), -this.dHeight);
51739
51796
  }
51740
51797
  } else {
51741
- var signArr = this.imgSrc.split("\n");
51742
- var theHeight = new createjs.Text(this.imgSrc, this.textStyle, "#000000").getMeasuredHeight();
51798
+ var signArr = this.imgSrc.split('\n');
51799
+ var theHeight = new createjs.Text(this.imgSrc, this.textStyle, '#000000').getMeasuredHeight();
51743
51800
 
51744
51801
  if (signArr.length > 1) {
51745
51802
  for (var i = 1; i < signArr.length; i++) {
51746
- var aText = new createjs.Text(signArr[i], this.textStyle, "#000000");
51803
+ var aText = new createjs.Text(signArr[i], this.textStyle, '#000000');
51747
51804
  theHeight = theHeight + aText.getMeasuredHeight();
51748
51805
  }
51749
51806
  }
51750
51807
 
51751
51808
  if (isFront) {
51752
- line.graphics.beginStroke("#000000").moveTo(this.dWidth - this._drawText.getMeasuredWidth(), 2).lineTo(this.dWidth, -theHeight - 2);
51809
+ line.graphics.beginStroke('#000000').moveTo(this.dWidth - this._drawText.getMeasuredWidth(), 2).lineTo(this.dWidth, -theHeight - 2);
51753
51810
  } else {
51754
- line.graphics.beginStroke("#000000").moveTo(0, 2).lineTo(this._drawText.getMeasuredWidth(), -theHeight - 2);
51811
+ line.graphics.beginStroke('#000000').moveTo(0, 2).lineTo(this._drawText.getMeasuredWidth(), -theHeight - 2);
51755
51812
  }
51756
51813
  }
51757
51814
 
51758
51815
  this.addChildAt(line);
51759
- } else if (connectMode === "换行") {
51816
+ } else if (connectMode === '换行') {
51760
51817
  return;
51761
51818
  } else {
51762
- this._drawText.textBaseline = "alphabetic";
51763
- this._drawText.textAlign = "left";
51819
+ this._drawText.textBaseline = 'alphabetic';
51820
+ this._drawText.textAlign = 'left';
51764
51821
 
51765
51822
  var rect = this._drawText.getBounds();
51766
51823
 
@@ -54776,6 +54833,11 @@ var Caret = /*#__PURE__*/function () {
54776
54833
  this.div_cursor.style.height = Math.max(val, 12) * DrawConfig/* DrawConfig.instance */.f.instance().scaleXY + "px"; // this.updateCaret();
54777
54834
  }
54778
54835
  }
54836
+ }, {
54837
+ key: "X",
54838
+ get: function get() {
54839
+ return this.x;
54840
+ }
54779
54841
  }, {
54780
54842
  key: "Y",
54781
54843
  get: function get() {
@@ -62479,7 +62541,7 @@ var NodeStyleUndoUnit = /*#__PURE__*/function () {
62479
62541
  /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_asyncToGenerator_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(39873);
62480
62542
  /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(37174);
62481
62543
  /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_classCallCheck_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(35671);
62482
- /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_34__ = __webpack_require__(22342);
62544
+ /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_36__ = __webpack_require__(22342);
62483
62545
  /* harmony import */ var core_js_modules_es_array_iterator_js__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(66992);
62484
62546
  /* harmony import */ var core_js_modules_es_array_iterator_js__WEBPACK_IMPORTED_MODULE_5___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_iterator_js__WEBPACK_IMPORTED_MODULE_5__);
62485
62547
  /* harmony import */ var core_js_modules_es_map_js__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(51532);
@@ -62494,28 +62556,34 @@ var NodeStyleUndoUnit = /*#__PURE__*/function () {
62494
62556
  /* harmony import */ var core_js_modules_es_array_from_js__WEBPACK_IMPORTED_MODULE_10___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_from_js__WEBPACK_IMPORTED_MODULE_10__);
62495
62557
  /* harmony import */ var core_js_modules_es_error_cause_js__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(21703);
62496
62558
  /* harmony import */ var core_js_modules_es_error_cause_js__WEBPACK_IMPORTED_MODULE_11___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_error_cause_js__WEBPACK_IMPORTED_MODULE_11__);
62497
- /* harmony import */ var _editor_dom_DocTree__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(23375);
62498
- /* harmony import */ var _dom_treeNode_TextNode__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(91538);
62499
- /* harmony import */ var _events_NodeChangeEvent__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(34534);
62500
- /* harmony import */ var _draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(98199);
62501
- /* harmony import */ var _dom_DomRange__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(66828);
62502
- /* harmony import */ var _TextNodeSplitUndoUnit__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(58416);
62503
- /* harmony import */ var _events_SelectionChangeEvent__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(13113);
62504
- /* harmony import */ var _UndoService__WEBPACK_IMPORTED_MODULE_19__ = __webpack_require__(48508);
62505
- /* harmony import */ var _dom_treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_20__ = __webpack_require__(34565);
62506
- /* harmony import */ var _dom_treeNode_MarkNode__WEBPACK_IMPORTED_MODULE_21__ = __webpack_require__(15868);
62507
- /* harmony import */ var _events_Exception__WEBPACK_IMPORTED_MODULE_22__ = __webpack_require__(88702);
62508
- /* harmony import */ var _dom_treeNode_ParagraphNode__WEBPACK_IMPORTED_MODULE_23__ = __webpack_require__(14208);
62509
- /* harmony import */ var _dom_treeNode_CellNode__WEBPACK_IMPORTED_MODULE_24__ = __webpack_require__(15798);
62510
- /* harmony import */ var _draw_SelectRange__WEBPACK_IMPORTED_MODULE_25__ = __webpack_require__(1470);
62511
- /* harmony import */ var _dom_treeNode_TableNode__WEBPACK_IMPORTED_MODULE_26__ = __webpack_require__(95883);
62512
- /* harmony import */ var _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_27__ = __webpack_require__(41005);
62513
- /* harmony import */ var _dom_treeNode_ControlNode__WEBPACK_IMPORTED_MODULE_28__ = __webpack_require__(8395);
62514
- /* harmony import */ var _dom_treeNode_RadioAndCheckBoxNode__WEBPACK_IMPORTED_MODULE_29__ = __webpack_require__(89050);
62515
- /* harmony import */ var _dom_treeNode_DateTimeNode__WEBPACK_IMPORTED_MODULE_30__ = __webpack_require__(36395);
62516
- /* harmony import */ var _dom_treeNode_DownListNode__WEBPACK_IMPORTED_MODULE_31__ = __webpack_require__(98390);
62517
- /* harmony import */ var _NodeInsertUndoUnit__WEBPACK_IMPORTED_MODULE_32__ = __webpack_require__(12019);
62518
- /* harmony import */ var _dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_33__ = __webpack_require__(34450);
62559
+ /* harmony import */ var core_js_modules_es_array_includes_js__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(26699);
62560
+ /* harmony import */ var core_js_modules_es_array_includes_js__WEBPACK_IMPORTED_MODULE_12___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_includes_js__WEBPACK_IMPORTED_MODULE_12__);
62561
+ /* harmony import */ var core_js_modules_es_string_includes_js__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(32023);
62562
+ /* harmony import */ var core_js_modules_es_string_includes_js__WEBPACK_IMPORTED_MODULE_13___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_string_includes_js__WEBPACK_IMPORTED_MODULE_13__);
62563
+ /* harmony import */ var _editor_dom_DocTree__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(23375);
62564
+ /* harmony import */ var _dom_treeNode_TextNode__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(91538);
62565
+ /* harmony import */ var _events_NodeChangeEvent__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(34534);
62566
+ /* harmony import */ var _draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(98199);
62567
+ /* harmony import */ var _dom_DomRange__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(66828);
62568
+ /* harmony import */ var _TextNodeSplitUndoUnit__WEBPACK_IMPORTED_MODULE_19__ = __webpack_require__(58416);
62569
+ /* harmony import */ var _events_SelectionChangeEvent__WEBPACK_IMPORTED_MODULE_20__ = __webpack_require__(13113);
62570
+ /* harmony import */ var _UndoService__WEBPACK_IMPORTED_MODULE_21__ = __webpack_require__(48508);
62571
+ /* harmony import */ var _dom_treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_22__ = __webpack_require__(34565);
62572
+ /* harmony import */ var _dom_treeNode_MarkNode__WEBPACK_IMPORTED_MODULE_23__ = __webpack_require__(15868);
62573
+ /* harmony import */ var _events_Exception__WEBPACK_IMPORTED_MODULE_24__ = __webpack_require__(88702);
62574
+ /* harmony import */ var _dom_treeNode_ParagraphNode__WEBPACK_IMPORTED_MODULE_25__ = __webpack_require__(14208);
62575
+ /* harmony import */ var _dom_treeNode_CellNode__WEBPACK_IMPORTED_MODULE_26__ = __webpack_require__(15798);
62576
+ /* harmony import */ var _draw_SelectRange__WEBPACK_IMPORTED_MODULE_27__ = __webpack_require__(1470);
62577
+ /* harmony import */ var _dom_treeNode_TableNode__WEBPACK_IMPORTED_MODULE_28__ = __webpack_require__(95883);
62578
+ /* harmony import */ var _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_29__ = __webpack_require__(41005);
62579
+ /* harmony import */ var _dom_treeNode_ControlNode__WEBPACK_IMPORTED_MODULE_30__ = __webpack_require__(8395);
62580
+ /* harmony import */ var _dom_treeNode_RadioAndCheckBoxNode__WEBPACK_IMPORTED_MODULE_31__ = __webpack_require__(89050);
62581
+ /* harmony import */ var _dom_treeNode_DateTimeNode__WEBPACK_IMPORTED_MODULE_32__ = __webpack_require__(36395);
62582
+ /* harmony import */ var _dom_treeNode_DownListNode__WEBPACK_IMPORTED_MODULE_33__ = __webpack_require__(98390);
62583
+ /* harmony import */ var _NodeInsertUndoUnit__WEBPACK_IMPORTED_MODULE_34__ = __webpack_require__(12019);
62584
+ /* harmony import */ var _dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_35__ = __webpack_require__(34450);
62585
+
62586
+
62519
62587
 
62520
62588
 
62521
62589
 
@@ -62574,10 +62642,10 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
62574
62642
  this._startPath = startPath;
62575
62643
  this._endPath = endPath;
62576
62644
  this._isForceDelete = isForceDelete;
62577
- this._undo = new _UndoService__WEBPACK_IMPORTED_MODULE_19__/* .UndoService */ .O(this._hoEditorFactoryID); //hoEditorFactory.undoService;
62645
+ this._undo = new _UndoService__WEBPACK_IMPORTED_MODULE_21__/* .UndoService */ .O(this._hoEditorFactoryID); //hoEditorFactory.undoService;
62578
62646
 
62579
62647
  this._undoNodes = new Map();
62580
- var aDomRange = new _dom_DomRange__WEBPACK_IMPORTED_MODULE_16__/* .DomRange */ .a(hoEditorFactoryID, startPath, endPath).normalize();
62648
+ var aDomRange = new _dom_DomRange__WEBPACK_IMPORTED_MODULE_18__/* .DomRange */ .a(hoEditorFactoryID, startPath, endPath).normalize();
62581
62649
 
62582
62650
  var _aDomRange$inSameTabl = aDomRange.inSameTable(),
62583
62651
  _aDomRange$inSameTabl2 = (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_3__/* ["default"] */ .Z)(_aDomRange$inSameTabl, 2),
@@ -62586,10 +62654,10 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
62586
62654
 
62587
62655
  this._bSameTable = bSametable;
62588
62656
  this._opTime = new Date();
62589
- this._affectText = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_27__/* .HOEditorFactorys.instance */ .b.instance().getFactory(hoEditorFactoryID).vueController.getRangeText(aDomRange);
62657
+ this._affectText = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_29__/* .HOEditorFactorys.instance */ .b.instance().getFactory(hoEditorFactoryID).vueController.getRangeText(aDomRange);
62590
62658
  }
62591
62659
 
62592
- (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_34__/* ["default"] */ .Z)(NodesDeleteUndoUnit, [{
62660
+ (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_36__/* ["default"] */ .Z)(NodesDeleteUndoUnit, [{
62593
62661
  key: "undo",
62594
62662
  value: function undo() {
62595
62663
  //2.插入删除的节点
@@ -62601,12 +62669,12 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
62601
62669
  var arr = Array.from(this._undoNodes).reverse();
62602
62670
  var i = 0;
62603
62671
  var prevIsTable = false;
62604
- var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_27__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
62672
+ var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_29__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
62605
62673
 
62606
62674
  while (i < arr.length) {
62607
62675
  var value = arr[i];
62608
62676
 
62609
- if (value[1] instanceof _dom_treeNode_CellNode__WEBPACK_IMPORTED_MODULE_24__/* .CellNode */ .D) {// (value[1] as CellNode).redrawCell(true, DocAction.daInsert);
62677
+ if (value[1] instanceof _dom_treeNode_CellNode__WEBPACK_IMPORTED_MODULE_26__/* .CellNode */ .D) {// (value[1] as CellNode).redrawCell(true, DocAction.daInsert);
62610
62678
  } else {
62611
62679
  if (prevIsTable) {
62612
62680
  hoEditorFactory.docTree.insertNodeAfterNode(arr[i - 1][1], arr[i][1]);
@@ -62614,12 +62682,12 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
62614
62682
  hoEditorFactory.docTree.insertNodeAfterPath(value[0], value[1]);
62615
62683
  }
62616
62684
 
62617
- if (value[1] instanceof _dom_treeNode_TableNode__WEBPACK_IMPORTED_MODULE_26__/* .TableNode */ .Fh) {
62685
+ if (value[1] instanceof _dom_treeNode_TableNode__WEBPACK_IMPORTED_MODULE_28__/* .TableNode */ .Fh) {
62618
62686
  prevIsTable = true; // value[1].clearDrawNodes();
62619
62687
  // value[1].drawTable.drawPageTables.length = 0;
62620
62688
 
62621
62689
  var np = hoEditorFactory.docTree.findNodePositionByPath(value[0]);
62622
- if (np && np.node && np.node instanceof _dom_treeNode_ParagraphNode__WEBPACK_IMPORTED_MODULE_23__/* .ParagraphNode */ .C) value[1].drawTable.paragraphNode = np.node;
62690
+ if (np && np.node && np.node instanceof _dom_treeNode_ParagraphNode__WEBPACK_IMPORTED_MODULE_25__/* .ParagraphNode */ .C) value[1].drawTable.paragraphNode = np.node;
62623
62691
  } else {
62624
62692
  prevIsTable = false;
62625
62693
  }
@@ -62629,7 +62697,7 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
62629
62697
  }
62630
62698
 
62631
62699
  var aendPaht = hoEditorFactory.docTree.getNodeLastPath(arr[arr.length - 1][1]);
62632
- var changeEvent = new _events_NodeChangeEvent__WEBPACK_IMPORTED_MODULE_14__/* .NodeChangeEvent */ .G(this._hoEditorFactoryID, _editor_dom_DocTree__WEBPACK_IMPORTED_MODULE_12__/* .DocAction.daInsert */ .gk.daInsert, arr[0][0], aendPaht);
62700
+ var changeEvent = new _events_NodeChangeEvent__WEBPACK_IMPORTED_MODULE_16__/* .NodeChangeEvent */ .G(this._hoEditorFactoryID, _editor_dom_DocTree__WEBPACK_IMPORTED_MODULE_14__/* .DocAction.daInsert */ .gk.daInsert, arr[0][0], aendPaht);
62633
62701
  hoEditorFactory.docTree.change(changeEvent); //3.合并拆分节点
62634
62702
 
62635
62703
  while (!this._undo.atBottom()) {
@@ -62657,9 +62725,9 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
62657
62725
  //选中范围变化事件
62658
62726
 
62659
62727
 
62660
- var newRange = new _dom_DomRange__WEBPACK_IMPORTED_MODULE_16__/* .DomRange */ .a(this._hoEditorFactoryID, this._startPath, this._endPath).normalize();
62728
+ var newRange = new _dom_DomRange__WEBPACK_IMPORTED_MODULE_18__/* .DomRange */ .a(this._hoEditorFactoryID, this._startPath, this._endPath).normalize();
62661
62729
  hoEditorFactory.docTree.curDomRange = newRange;
62662
- var cgEvent = new _events_SelectionChangeEvent__WEBPACK_IMPORTED_MODULE_18__/* .SelectionChangeEvent */ .r(hoEditorFactory.docTree.curDomRange, newRange);
62730
+ var cgEvent = new _events_SelectionChangeEvent__WEBPACK_IMPORTED_MODULE_20__/* .SelectionChangeEvent */ .r(hoEditorFactory.docTree.curDomRange, newRange);
62663
62731
  hoEditorFactory.docTree.selectChange(cgEvent); //光标定位
62664
62732
 
62665
62733
  hoEditorFactory.drawTree.moveCaretToPath(newRange.endPath);
@@ -62678,7 +62746,7 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
62678
62746
  }, {
62679
62747
  key: "MoveCaret",
62680
62748
  value: function MoveCaret(path) {
62681
- _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_27__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID).drawTree.moveCaretToPath(path);
62749
+ _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_29__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID).drawTree.moveCaretToPath(path);
62682
62750
  }
62683
62751
  /**
62684
62752
  * @description 返回前面一个node的开始结束选中范围 文本节点时候返回文本中单个文字的选中范围
@@ -62689,30 +62757,30 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
62689
62757
  key: "getPrevNodeDomRange",
62690
62758
  value: function getPrevNodeDomRange(Anode) {
62691
62759
  var spath;
62692
- var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_27__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
62760
+ var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_29__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
62693
62761
  var prev = Anode.prevSibling();
62694
62762
 
62695
62763
  if (!prev) {
62696
- throw _events_Exception__WEBPACK_IMPORTED_MODULE_22__/* .Exception.NodeNotFound */ .P.NodeNotFound();
62764
+ throw _events_Exception__WEBPACK_IMPORTED_MODULE_24__/* .Exception.NodeNotFound */ .P.NodeNotFound();
62697
62765
  }
62698
62766
 
62699
62767
  var epath = hoEditorFactory.docTree.getNodeLastPath(prev);
62700
62768
 
62701
- if (prev instanceof _dom_treeNode_TextNode__WEBPACK_IMPORTED_MODULE_13__/* .TextNode */ .R) {
62769
+ if (prev instanceof _dom_treeNode_TextNode__WEBPACK_IMPORTED_MODULE_15__/* .TextNode */ .R) {
62702
62770
  spath = prev.prevPath(epath);
62703
- } else if (prev instanceof _dom_treeNode_ParagraphNode__WEBPACK_IMPORTED_MODULE_23__/* .ParagraphNode */ .C) {
62771
+ } else if (prev instanceof _dom_treeNode_ParagraphNode__WEBPACK_IMPORTED_MODULE_25__/* .ParagraphNode */ .C) {
62704
62772
  spath = epath;
62705
62773
  } else {
62706
62774
  var prev1 = prev.previousLeaf();
62707
62775
 
62708
62776
  if (!prev1) {
62709
- throw _events_Exception__WEBPACK_IMPORTED_MODULE_22__/* .Exception.NodeNotFound */ .P.NodeNotFound();
62777
+ throw _events_Exception__WEBPACK_IMPORTED_MODULE_24__/* .Exception.NodeNotFound */ .P.NodeNotFound();
62710
62778
  }
62711
62779
 
62712
62780
  spath = hoEditorFactory.docTree.getNodeLastPath(prev1);
62713
62781
  }
62714
62782
 
62715
- return new _dom_DomRange__WEBPACK_IMPORTED_MODULE_16__/* .DomRange */ .a(this._hoEditorFactoryID, spath, epath);
62783
+ return new _dom_DomRange__WEBPACK_IMPORTED_MODULE_18__/* .DomRange */ .a(this._hoEditorFactoryID, spath, epath);
62716
62784
  }
62717
62785
  /**
62718
62786
  *
@@ -62726,23 +62794,23 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
62726
62794
  }, {
62727
62795
  key: "deleteRange",
62728
62796
  value: function deleteRange(endpath, startpath) {
62729
- var currRange = new _dom_DomRange__WEBPACK_IMPORTED_MODULE_16__/* .DomRange */ .a(this._hoEditorFactoryID, startpath, endpath).normalize(); //拆分更新节点,更新删除范围 this._tmp
62797
+ var currRange = new _dom_DomRange__WEBPACK_IMPORTED_MODULE_18__/* .DomRange */ .a(this._hoEditorFactoryID, startpath, endpath).normalize(); //拆分更新节点,更新删除范围 this._tmp
62730
62798
 
62731
62799
  if (!this.spliteNode(currRange)) {
62732
62800
  return 0;
62733
62801
  }
62734
62802
 
62735
- var newDomRange = new _dom_DomRange__WEBPACK_IMPORTED_MODULE_16__/* .DomRange */ .a(this._hoEditorFactoryID, this._tmp.start, this._tmp.end);
62736
- if (!newDomRange.npStart.node) throw _events_Exception__WEBPACK_IMPORTED_MODULE_22__/* .Exception.NodeNotFound */ .P.NodeNotFound();
62737
- if (!newDomRange.npEnd.node) throw _events_Exception__WEBPACK_IMPORTED_MODULE_22__/* .Exception.NodeNotFound */ .P.NodeNotFound();
62803
+ var newDomRange = new _dom_DomRange__WEBPACK_IMPORTED_MODULE_18__/* .DomRange */ .a(this._hoEditorFactoryID, this._tmp.start, this._tmp.end);
62804
+ if (!newDomRange.npStart.node) throw _events_Exception__WEBPACK_IMPORTED_MODULE_24__/* .Exception.NodeNotFound */ .P.NodeNotFound();
62805
+ if (!newDomRange.npEnd.node) throw _events_Exception__WEBPACK_IMPORTED_MODULE_24__/* .Exception.NodeNotFound */ .P.NodeNotFound();
62738
62806
  var aStart = newDomRange.npStart.node;
62739
62807
 
62740
62808
  if (currRange.startMainNode) {
62741
62809
  aStart = currRange.startMainNode;
62742
62810
  }
62743
62811
 
62744
- var nodes = _dom_DomRange__WEBPACK_IMPORTED_MODULE_16__/* .DomRange.getSelectDomNodesForDelete */ .a.getSelectDomNodesForDelete(this._hoEditorFactoryID, this._tmp.start, this._tmp.end);
62745
- var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_27__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID); // this.DeleteBaseCombineNodeContent(
62812
+ var nodes = _dom_DomRange__WEBPACK_IMPORTED_MODULE_18__/* .DomRange.getSelectDomNodesForDelete */ .a.getSelectDomNodesForDelete(this._hoEditorFactoryID, this._tmp.start, this._tmp.end);
62813
+ var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_29__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID); // this.DeleteBaseCombineNodeContent(
62746
62814
  // newDomRange,
62747
62815
  // newDomRange.npEnd.node,
62748
62816
  // aStart,
@@ -62867,7 +62935,8 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
62867
62935
  }, {
62868
62936
  key: "spliteNode",
62869
62937
  value: function spliteNode(Arange) {
62870
- var _this = this;
62938
+ var _this = this,
62939
+ _s$parentNode$downLis;
62871
62940
 
62872
62941
  var s = Arange.npStart.node;
62873
62942
  var e = Arange.npEnd.node;
@@ -62877,10 +62946,10 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
62877
62946
  * @param Anode
62878
62947
  */
62879
62948
 
62880
- var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_27__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
62949
+ var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_29__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
62881
62950
 
62882
62951
  var forMarkNode = function forMarkNode(Anode) {
62883
- if (Anode.parentNode instanceof _dom_treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_20__/* .TextInputFieldNode */ .re) {
62952
+ if (Anode.parentNode instanceof _dom_treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_22__/* .TextInputFieldNode */ .re) {
62884
62953
  var pTINode = Anode.parentNode;
62885
62954
 
62886
62955
  if (pTINode.isEmpty() || !pTINode.canModifyContent) {
@@ -62888,11 +62957,11 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
62888
62957
  var tmp = pTINode.previousLeaf();
62889
62958
 
62890
62959
  if (!tmp) {
62891
- throw _events_Exception__WEBPACK_IMPORTED_MODULE_22__/* .Exception.NodeNotFound */ .P.NodeNotFound();
62960
+ throw _events_Exception__WEBPACK_IMPORTED_MODULE_24__/* .Exception.NodeNotFound */ .P.NodeNotFound();
62892
62961
  }
62893
62962
 
62894
62963
  info[0] = 0;
62895
- info[1] = new _dom_DomRange__WEBPACK_IMPORTED_MODULE_16__/* .DomRange */ .a(_this._hoEditorFactoryID, hoEditorFactory.docTree.getNodeLastPath(tmp), hoEditorFactory.docTree.getNodeLastPath(pTINode));
62964
+ info[1] = new _dom_DomRange__WEBPACK_IMPORTED_MODULE_18__/* .DomRange */ .a(_this._hoEditorFactoryID, hoEditorFactory.docTree.getNodeLastPath(tmp), hoEditorFactory.docTree.getNodeLastPath(pTINode));
62896
62965
  } else {
62897
62966
  if (Anode == pTINode.last()) {
62898
62967
  //递归调用删除
@@ -62918,18 +62987,20 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
62918
62987
  };
62919
62988
 
62920
62989
  if (!(s && e)) {
62921
- throw _events_Exception__WEBPACK_IMPORTED_MODULE_22__/* .Exception.NodeNotFound */ .P.NodeNotFound();
62990
+ throw _events_Exception__WEBPACK_IMPORTED_MODULE_24__/* .Exception.NodeNotFound */ .P.NodeNotFound();
62922
62991
  }
62923
62992
 
62924
62993
  this._tmp.start = Arange.startPath;
62925
- this._tmp.end = Arange.endPath; // if (s instanceof MarkNode && s.parentNode == hoEditorFactory.docTree.getParentNode(Arange.endPath) && Arange.endPath != hoEditorFactory.docTree.getNodeFirstPath(s.nextLeaf() as BaseNode)) {
62926
- // return true;
62927
- // }
62994
+ this._tmp.end = Arange.endPath;
62995
+
62996
+ if (s instanceof _dom_treeNode_MarkNode__WEBPACK_IMPORTED_MODULE_23__/* .MarkNode */ .j && s.parentNode instanceof _dom_treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_22__/* .TextInputFieldNode */ .re && s.parentNode.inputFieldType === 1 && (_s$parentNode$downLis = s.parentNode.downListProperty.listItems) !== null && _s$parentNode$downLis !== void 0 && _s$parentNode$downLis.includes("<元素>")) {
62997
+ return true;
62998
+ }
62928
62999
 
62929
63000
  if (s === e) {
62930
- if (s instanceof _dom_treeNode_TextNode__WEBPACK_IMPORTED_MODULE_13__/* .TextNode */ .R) {
63001
+ if (s instanceof _dom_treeNode_TextNode__WEBPACK_IMPORTED_MODULE_15__/* .TextNode */ .R) {
62931
63002
  // HOEditorFactorys.instance().getFactory(this._hoEditorFactoryID).docTree.curDomRange = Arange;
62932
- var tmp = new _TextNodeSplitUndoUnit__WEBPACK_IMPORTED_MODULE_17__/* .TextNodeSplitUndoUnit */ .W(this._hoEditorFactoryID, Arange.startPath, s, Arange);
63003
+ var tmp = new _TextNodeSplitUndoUnit__WEBPACK_IMPORTED_MODULE_19__/* .TextNodeSplitUndoUnit */ .W(this._hoEditorFactoryID, Arange.startPath, s, Arange);
62933
63004
 
62934
63005
  this._undo.begin();
62935
63006
 
@@ -62938,7 +63009,7 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
62938
63009
  this._undo.commit();
62939
63010
 
62940
63011
  this._tmp.end = hoEditorFactory.docTree.getNodeLastPath(tmp.theNode);
62941
- } else if (s instanceof _dom_treeNode_MarkNode__WEBPACK_IMPORTED_MODULE_21__/* .MarkNode */ .j) {
63012
+ } else if (s instanceof _dom_treeNode_MarkNode__WEBPACK_IMPORTED_MODULE_23__/* .MarkNode */ .j) {
62942
63013
  forMarkNode(s);
62943
63014
 
62944
63015
  if (info[0] == 0 && info[1]) {
@@ -62955,8 +63026,8 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
62955
63026
  } else {
62956
63027
  var _tmp3 = null;
62957
63028
 
62958
- if (e instanceof _dom_treeNode_TextNode__WEBPACK_IMPORTED_MODULE_13__/* .TextNode */ .R && Arange.npEnd.childIndex >= 0 && Arange.npEnd.childIndex < e.getLength() - 1) {
62959
- _tmp3 = new _TextNodeSplitUndoUnit__WEBPACK_IMPORTED_MODULE_17__/* .TextNodeSplitUndoUnit */ .W(this._hoEditorFactoryID, Arange.endPath, e, Arange);
63029
+ if (e instanceof _dom_treeNode_TextNode__WEBPACK_IMPORTED_MODULE_15__/* .TextNode */ .R && Arange.npEnd.childIndex >= 0 && Arange.npEnd.childIndex < e.getLength() - 1) {
63030
+ _tmp3 = new _TextNodeSplitUndoUnit__WEBPACK_IMPORTED_MODULE_19__/* .TextNodeSplitUndoUnit */ .W(this._hoEditorFactoryID, Arange.endPath, e, Arange);
62960
63031
 
62961
63032
  this._undo.begin();
62962
63033
 
@@ -62965,22 +63036,22 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
62965
63036
  this._undo.commit();
62966
63037
  }
62967
63038
 
62968
- if (s instanceof _dom_treeNode_TextNode__WEBPACK_IMPORTED_MODULE_13__/* .TextNode */ .R && Arange.npStart.childIndex >= 0 && Arange.npStart.childIndex < s.getLength() - 1) {
63039
+ if (s instanceof _dom_treeNode_TextNode__WEBPACK_IMPORTED_MODULE_15__/* .TextNode */ .R && Arange.npStart.childIndex >= 0 && Arange.npStart.childIndex < s.getLength() - 1) {
62969
63040
  this._undo.begin();
62970
63041
 
62971
- this._undo.add(new _TextNodeSplitUndoUnit__WEBPACK_IMPORTED_MODULE_17__/* .TextNodeSplitUndoUnit */ .W(this._hoEditorFactoryID, Arange.startPath, s, Arange));
63042
+ this._undo.add(new _TextNodeSplitUndoUnit__WEBPACK_IMPORTED_MODULE_19__/* .TextNodeSplitUndoUnit */ .W(this._hoEditorFactoryID, Arange.startPath, s, Arange));
62972
63043
 
62973
63044
  this._undo.commit();
62974
63045
  }
62975
63046
 
62976
- if (e instanceof _dom_treeNode_MarkNode__WEBPACK_IMPORTED_MODULE_21__/* .MarkNode */ .j) {
63047
+ if (e instanceof _dom_treeNode_MarkNode__WEBPACK_IMPORTED_MODULE_23__/* .MarkNode */ .j) {
62977
63048
  forMarkNode(e);
62978
63049
 
62979
63050
  if (info[0] == 0 && info[1]) {
62980
63051
  this._tmp.end = info[1].endPath; // return this.spliteNode(new DomRange(this._tmp.start, this._tmp.end));
62981
63052
  } else if ((info[0] == 1 || info[0] == 2) && info[1]) {
62982
63053
  this._tmp.end = info[1].endPath;
62983
- return this.spliteNode(new _dom_DomRange__WEBPACK_IMPORTED_MODULE_16__/* .DomRange */ .a(this._hoEditorFactoryID, this._tmp.start, this._tmp.end));
63054
+ return this.spliteNode(new _dom_DomRange__WEBPACK_IMPORTED_MODULE_18__/* .DomRange */ .a(this._hoEditorFactoryID, this._tmp.start, this._tmp.end));
62984
63055
  }
62985
63056
  }
62986
63057
 
@@ -62996,15 +63067,15 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
62996
63067
  }, {
62997
63068
  key: "ParentRepaint",
62998
63069
  value: function ParentRepaint(Anode) {
62999
- if (Anode && Anode instanceof _dom_treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_20__/* .TextInputFieldNode */ .re) {
63000
- var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_27__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
63070
+ if (Anode && Anode instanceof _dom_treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_22__/* .TextInputFieldNode */ .re) {
63071
+ var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_29__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
63001
63072
 
63002
63073
  if (Anode.childNodes.length === 2) {
63003
63074
  var contentMarkNode = Anode.childNodes2[1];
63004
63075
  contentMarkNode.styleIndex = Anode.childNodes[0].styleIndex;
63005
63076
  var insertPath = hoEditorFactory.docTree.getNodeLastPath(Anode.childNodes[0]);
63006
63077
  hoEditorFactory.undoService.begin();
63007
- hoEditorFactory.undoService.add(new _NodeInsertUndoUnit__WEBPACK_IMPORTED_MODULE_32__/* .NodeInsertUndoUnit */ .R(this._hoEditorFactoryID, insertPath, contentMarkNode));
63078
+ hoEditorFactory.undoService.add(new _NodeInsertUndoUnit__WEBPACK_IMPORTED_MODULE_34__/* .NodeInsertUndoUnit */ .R(this._hoEditorFactoryID, insertPath, contentMarkNode));
63008
63079
  hoEditorFactory.undoService.commit();
63009
63080
  }
63010
63081
 
@@ -63029,16 +63100,16 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
63029
63100
  switch (_context.prev = _context.next) {
63030
63101
  case 0:
63031
63102
  this.initParam();
63032
- currRange = new _dom_DomRange__WEBPACK_IMPORTED_MODULE_16__/* .DomRange */ .a(this._hoEditorFactoryID, this._startPath, this._endPath).normalize();
63033
- hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_27__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
63103
+ currRange = new _dom_DomRange__WEBPACK_IMPORTED_MODULE_18__/* .DomRange */ .a(this._hoEditorFactoryID, this._startPath, this._endPath).normalize();
63104
+ hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_29__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
63034
63105
  hoEditorFactory.docTree.curDomRange = currRange;
63035
63106
 
63036
- if (!(hoEditorFactory.drawTree.paintStatus === _draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_15__/* .PaintState.psReview */ .Dh.psReview)) {
63107
+ if (!(hoEditorFactory.drawTree.paintStatus === _draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_17__/* .PaintState.psReview */ .Dh.psReview)) {
63037
63108
  _context.next = 10;
63038
63109
  break;
63039
63110
  }
63040
63111
 
63041
- if (!(currRange.npEnd.node && currRange.npEnd.node instanceof _dom_treeNode_TextNode__WEBPACK_IMPORTED_MODULE_13__/* .TextNode */ .R)) {
63112
+ if (!(currRange.npEnd.node && currRange.npEnd.node instanceof _dom_treeNode_TextNode__WEBPACK_IMPORTED_MODULE_15__/* .TextNode */ .R)) {
63042
63113
  _context.next = 10;
63043
63114
  break;
63044
63115
  }
@@ -63055,7 +63126,7 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
63055
63126
  return _context.abrupt("return");
63056
63127
 
63057
63128
  case 10:
63058
- nodes = _dom_DomRange__WEBPACK_IMPORTED_MODULE_16__/* .DomRange.getSelectDomNodesForDelete */ .a.getSelectDomNodesForDelete(this._hoEditorFactoryID, this._startPath, this._endPath); // const npFirst = hoEditorFactory.docTree.findNodePositionByPath(this._startPath);
63129
+ nodes = _dom_DomRange__WEBPACK_IMPORTED_MODULE_18__/* .DomRange.getSelectDomNodesForDelete */ .a.getSelectDomNodesForDelete(this._hoEditorFactoryID, this._startPath, this._endPath); // const npFirst = hoEditorFactory.docTree.findNodePositionByPath(this._startPath);
63059
63130
  // if (npFirst && npFirst.node) {
63060
63131
  // //const parentNode = hoEditorFactory.docTree.getParentNode(this._startPath);
63061
63132
  // //if (parentNode) {
@@ -63066,7 +63137,7 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
63066
63137
  // }
63067
63138
  //if(nodes.length == 0) return;
63068
63139
 
63069
- if (!(hoEditorFactory.drawTree.paintStatus !== _draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_15__/* .PaintState.psDesign */ .Dh.psDesign && !this._isForceDelete)) {
63140
+ if (!(hoEditorFactory.drawTree.paintStatus !== _draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_17__/* .PaintState.psDesign */ .Dh.psDesign && !this._isForceDelete)) {
63070
63141
  _context.next = 33;
63071
63142
  break;
63072
63143
  }
@@ -63081,7 +63152,7 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
63081
63152
 
63082
63153
  node = nodes[n];
63083
63154
 
63084
- if (!(node instanceof _dom_treeNode_MarkNode__WEBPACK_IMPORTED_MODULE_21__/* .MarkNode */ .j && node.parentNode instanceof _dom_treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_20__/* .TextInputFieldNode */ .re && node.MarkNodeType === 1 && !node.parentNode.isAllowDelete)) {
63155
+ if (!(node instanceof _dom_treeNode_MarkNode__WEBPACK_IMPORTED_MODULE_23__/* .MarkNode */ .j && node.parentNode instanceof _dom_treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_22__/* .TextInputFieldNode */ .re && node.MarkNodeType === 1 && !node.parentNode.isAllowDelete)) {
63085
63156
  _context.next = 18;
63086
63157
  break;
63087
63158
  }
@@ -63091,7 +63162,7 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
63091
63162
  return _context.abrupt("return", 0);
63092
63163
 
63093
63164
  case 18:
63094
- if (!(node instanceof _dom_treeNode_ControlNode__WEBPACK_IMPORTED_MODULE_28__/* .ControlNode */ .w || node instanceof _dom_treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_20__/* .TextInputFieldNode */ .re)) {
63165
+ if (!(node instanceof _dom_treeNode_ControlNode__WEBPACK_IMPORTED_MODULE_30__/* .ControlNode */ .w || node instanceof _dom_treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_22__/* .TextInputFieldNode */ .re)) {
63095
63166
  _context.next = 27;
63096
63167
  break;
63097
63168
  }
@@ -63103,19 +63174,19 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
63103
63174
 
63104
63175
  tip = "";
63105
63176
 
63106
- if (node instanceof _dom_treeNode_RadioAndCheckBoxNode__WEBPACK_IMPORTED_MODULE_29__/* .RadioAndCheckBoxNode */ .Yh && node.controlStyle === "RadioBox") {
63177
+ if (node instanceof _dom_treeNode_RadioAndCheckBoxNode__WEBPACK_IMPORTED_MODULE_31__/* .RadioAndCheckBoxNode */ .Yh && node.controlStyle === "RadioBox") {
63107
63178
  tip = "单选框";
63108
63179
  }
63109
63180
 
63110
- if (node instanceof _dom_treeNode_RadioAndCheckBoxNode__WEBPACK_IMPORTED_MODULE_29__/* .RadioAndCheckBoxNode */ .Yh && node.controlStyle === "CheckBox") {
63181
+ if (node instanceof _dom_treeNode_RadioAndCheckBoxNode__WEBPACK_IMPORTED_MODULE_31__/* .RadioAndCheckBoxNode */ .Yh && node.controlStyle === "CheckBox") {
63111
63182
  tip = "复选框";
63112
63183
  }
63113
63184
 
63114
- if (node instanceof _dom_treeNode_DateTimeNode__WEBPACK_IMPORTED_MODULE_30__/* .DateTimeNode */ .Z) {
63185
+ if (node instanceof _dom_treeNode_DateTimeNode__WEBPACK_IMPORTED_MODULE_32__/* .DateTimeNode */ .Z) {
63115
63186
  tip = "日期时间";
63116
63187
  }
63117
63188
 
63118
- if (node instanceof _dom_treeNode_DownListNode__WEBPACK_IMPORTED_MODULE_31__/* .DownListNode */ .yF) {
63189
+ if (node instanceof _dom_treeNode_DownListNode__WEBPACK_IMPORTED_MODULE_33__/* .DownListNode */ .yF) {
63119
63190
  tip = "下拉列表";
63120
63191
  }
63121
63192
 
@@ -63124,7 +63195,7 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
63124
63195
  return _context.abrupt("return", 0);
63125
63196
 
63126
63197
  case 27:
63127
- if (!(node instanceof _dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_33__/* .SignNode */ .N && node.isTemplate && node.number === 0)) {
63198
+ if (!(node instanceof _dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_35__/* .SignNode */ .N && node.isTemplate && node.number === 0)) {
63128
63199
  _context.next = 30;
63129
63200
  break;
63130
63201
  }
@@ -63141,7 +63212,7 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
63141
63212
  case 33:
63142
63213
  pnode = (_currRange$npEnd$node = currRange.npEnd.node) === null || _currRange$npEnd$node === void 0 ? void 0 : _currRange$npEnd$node.parentNode;
63143
63214
 
63144
- if (!(pnode && pnode instanceof _dom_treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_20__/* .TextInputFieldNode */ .re && currRange.npEnd.path != hoEditorFactory.docTree.getNodeLastPath(pnode))) {
63215
+ if (!(pnode && pnode instanceof _dom_treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_22__/* .TextInputFieldNode */ .re && currRange.npEnd.path != hoEditorFactory.docTree.getNodeLastPath(pnode))) {
63145
63216
  _context.next = 39;
63146
63217
  break;
63147
63218
  }
@@ -63162,7 +63233,7 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
63162
63233
  return _context.abrupt("return");
63163
63234
 
63164
63235
  case 39:
63165
- changeEvent = new _events_NodeChangeEvent__WEBPACK_IMPORTED_MODULE_14__/* .NodeChangeEvent */ .G(this._hoEditorFactoryID, _editor_dom_DocTree__WEBPACK_IMPORTED_MODULE_12__/* .DocAction.daUndoInsert */ .gk.daUndoInsert, currRange.startPath, ""); //FIXME:deleteRange函数完成后调用这个
63236
+ changeEvent = new _events_NodeChangeEvent__WEBPACK_IMPORTED_MODULE_16__/* .NodeChangeEvent */ .G(this._hoEditorFactoryID, _editor_dom_DocTree__WEBPACK_IMPORTED_MODULE_14__/* .DocAction.daUndoInsert */ .gk.daUndoInsert, currRange.startPath, ""); //FIXME:deleteRange函数完成后调用这个
63166
63237
  // hoEditorFactory.docTree.deleteRange(arange.startPath, arange.endPath);
63167
63238
 
63168
63239
  if (currRange.npStart.node && currRange.npEnd.node) {
@@ -63170,7 +63241,7 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
63170
63241
  break;
63171
63242
  }
63172
63243
 
63173
- throw _events_Exception__WEBPACK_IMPORTED_MODULE_22__/* .Exception.NodeNotFound */ .P.NodeNotFound();
63244
+ throw _events_Exception__WEBPACK_IMPORTED_MODULE_24__/* .Exception.NodeNotFound */ .P.NodeNotFound();
63174
63245
 
63175
63246
  case 42:
63176
63247
  // const [startPath, endPath] = DomRange.skipStartEndTablePath(
@@ -63181,7 +63252,7 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
63181
63252
  startPath = currRange.startPath;
63182
63253
  endPath = currRange.endPath;
63183
63254
  changeEvent.oldEndPath = endPath;
63184
- changeEvent.oldDrawTreeLines = new _draw_SelectRange__WEBPACK_IMPORTED_MODULE_25__/* .SelectRange */ .E(this._hoEditorFactoryID).getRangeDrawTreeLines(startPath, endPath);
63255
+ changeEvent.oldDrawTreeLines = new _draw_SelectRange__WEBPACK_IMPORTED_MODULE_27__/* .SelectRange */ .E(this._hoEditorFactoryID).getRangeDrawTreeLines(startPath, endPath);
63185
63256
  res = this.deleteRange(currRange.endPath, currRange.startPath);
63186
63257
 
63187
63258
  if (!(res == 1)) {
@@ -63195,7 +63266,7 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
63195
63266
  return hoEditorFactory.docTree.change(changeEvent);
63196
63267
 
63197
63268
  case 52:
63198
- cgEvent = new _events_SelectionChangeEvent__WEBPACK_IMPORTED_MODULE_18__/* .SelectionChangeEvent */ .r(hoEditorFactory.docTree.curDomRange, new _dom_DomRange__WEBPACK_IMPORTED_MODULE_16__/* .DomRange */ .a(this._hoEditorFactoryID, this._tmp.start, this._tmp.start));
63269
+ cgEvent = new _events_SelectionChangeEvent__WEBPACK_IMPORTED_MODULE_20__/* .SelectionChangeEvent */ .r(hoEditorFactory.docTree.curDomRange, new _dom_DomRange__WEBPACK_IMPORTED_MODULE_18__/* .DomRange */ .a(this._hoEditorFactoryID, this._tmp.start, this._tmp.start));
63199
63270
  hoEditorFactory.docTree.selectChange(cgEvent);
63200
63271
 
63201
63272
  case 54:
@@ -67281,8 +67352,8 @@ var dealImage = function dealImage(base64, callback, qualitys, size, img) {
67281
67352
  var imgWidth, imgHeight;
67282
67353
 
67283
67354
  newImage.onload = function () {
67284
- imgWidth = newImage.width;
67285
- imgHeight = newImage.height;
67355
+ imgWidth = newImage.naturalWidth;
67356
+ imgHeight = newImage.naturalHeight;
67286
67357
  var canvas = document.createElement("canvas");
67287
67358
  var ctx = canvas.getContext("2d");
67288
67359
 
@@ -99492,7 +99563,8 @@ if(element.nodeName==="IMG"&&element.hasAttribute("src")){var src=""+element.get
99492
99563
  if(src.indexOf("data:image/")===0){return atob(unescape(src).split("base64,").pop());}//it is probably an url, try to load it
99493
99564
  var tmpImageData=jsPDFAPI.loadFile(src,true);if(tmpImageData!==undefined){return tmpImageData;}}if(element.nodeName==="CANVAS"){if(element.width===0||element.height===0){throw new Error("Given canvas must have data. Canvas width: "+element.width+", height: "+element.height);}var mimeType;switch(format){case"PNG":mimeType="image/png";break;case"WEBP":mimeType="image/webp";break;case"JPEG":case"JPG":default:mimeType="image/jpeg";break;}return atob(element.toDataURL(mimeType,1.0).split("base64,").pop());}};var checkImagesForAlias=function checkImagesForAlias(alias){var images=this.internal.collections[namespace+"images"];if(images){for(var e in images){if(alias===images[e].alias){return images[e];}}}};var determineWidthAndHeight=function determineWidthAndHeight(width,height,image){if(!width&&!height){width=-96;height=-96;}if(width<0){width=-1*image.width*72/width/this.internal.scaleFactor;}if(height<0){height=-1*image.height*72/height/this.internal.scaleFactor;}if(width===0){width=height*image.width/image.height;}if(height===0){height=width*image.height/image.width;}return[width,height];};var writeImageToPDF=function writeImageToPDF(x,y,width,height,image,rotation){var dims=determineWidthAndHeight.call(this,width,height,image),coord=this.internal.getCoordinateString,vcoord=this.internal.getVerticalCoordinateString;var images=getImages.call(this);width=dims[0];height=dims[1];images[image.index]=image;if(rotation){rotation*=Math.PI/180;var c=Math.cos(rotation);var s=Math.sin(rotation);//like in pdf Reference do it 4 digits instead of 2
99494
99565
  var f4=function f4(number){return number.toFixed(4);};var rotationTransformationMatrix=[f4(c),f4(s),f4(s*-1),f4(c),0,0,"cm"];}this.internal.write("q");//Save graphics state
99495
- if(rotation){this.internal.write([1,"0","0",1,coord(x),vcoord(y+height),"cm"].join(" "));//Translate
99566
+ if(rotation){// 自定义修改 修复图片旋转后位置错误问题 水平方向增加自身宽度 减去的 18px 来源未知 垂直方向减去自身高度
99567
+ x+=width-18;y-=height;this.internal.write([1,"0","0",1,coord(x),vcoord(y+height),"cm"].join(" "));//Translate
99496
99568
  this.internal.write(rotationTransformationMatrix.join(" "));//Rotate
99497
99569
  this.internal.write([coord(width),"0","0",coord(height),"0","0","cm"].join(" "));//Scale
99498
99570
  }else{this.internal.write([coord(width),"0","0",coord(height),coord(x),vcoord(y+height),"cm"].join(" "));//Translate and Scale
@@ -99602,8 +99674,9 @@ out+=String.fromCharCode.apply(null,buf.subarray(i,i+ARRAY_APPLY_BATCH));}return
99602
99674
  *
99603
99675
  * @returns jsPDF
99604
99676
  */jsPDFAPI.addImage=function(){// 自定义修改 处理签名图片打印
99605
- var imageData,format,x,y,w,h,alias,compression,rotation,posX,posY;imageData=arguments[0];if(typeof arguments[1]==="number"){format=UNKNOWN;x=arguments[1];y=arguments[2];w=arguments[3];h=arguments[4];alias=arguments[5];compression=arguments[6];rotation=arguments[7];posX=arguments[8];posY=arguments[9];}else{format=arguments[1];x=arguments[2];y=arguments[3];w=arguments[4];h=arguments[5];alias=arguments[6];compression=arguments[7];rotation=arguments[8];posX=arguments[9];posY=arguments[10];}if((0,esm_typeof/* default */.Z)(imageData)==="object"&&!isDOMElement(imageData)&&"imageData"in imageData){var options=imageData;imageData=options.imageData;format=options.format||format||UNKNOWN;x=options.x||x||0;y=options.y||y||0;w=options.w||options.width||w;h=options.h||options.height||h;alias=options.alias||alias;compression=options.compression||compression;rotation=options.rotation||options.angle||rotation;}//If compression is not explicitly set, determine if we should use compression
99606
- var filter=this.internal.getFilters();if(compression===undefined&&filter.indexOf("FlateEncode")!==-1){compression="SLOW";}if(isNaN(x)||isNaN(y)){throw new Error("Invalid coordinates passed to jsPDF.addImage");}// if(posX) x += posX;
99677
+ var imageData,format,x,y,w,h,alias,compression,rotation,posX,posY;imageData=arguments[0];if(typeof arguments[1]==="number"){format=UNKNOWN;x=arguments[1];y=arguments[2];w=arguments[3];h=arguments[4];alias=arguments[5];compression=arguments[6];rotation=arguments[7];posX=arguments[8];posY=arguments[9];}else{format=arguments[1];x=arguments[2];y=arguments[3];w=arguments[4];h=arguments[5];alias=arguments[6];compression=arguments[7];rotation=arguments[8];posX=arguments[9];posY=arguments[10];}console.log(rotation);if((0,esm_typeof/* default */.Z)(imageData)==="object"&&!isDOMElement(imageData)&&"imageData"in imageData){var options=imageData;imageData=options.imageData;format=options.format||format||UNKNOWN;x=options.x||x||0;y=options.y||y||0;w=options.w||options.width||w;h=options.h||options.height||h;alias=options.alias||alias;compression=options.compression||compression;rotation=options.rotation||options.angle||rotation;}//If compression is not explicitly set, determine if we should use compression
99678
+ var filter=this.internal.getFilters();if(compression===undefined&&filter.indexOf("FlateEncode")!==-1){compression="SLOW";}// 自定义修改 调整 addImage 方法的 compression值压缩图片
99679
+ compression='SLOW';if(isNaN(x)||isNaN(y)){throw new Error("Invalid coordinates passed to jsPDF.addImage");}// if(posX) x += posX;
99607
99680
  // if(posY) y += posY;
99608
99681
  initialize.call(this);var image=processImageData.call(this,imageData,format,alias,compression);writeImageToPDF.call(this,x,y,w,h,image,rotation);return this;};var processImageData=function processImageData(imageData,format,alias,compression){var result,dataAsBinaryString;if(typeof imageData==="string"&&getImageFileTypeByImageData(imageData)===UNKNOWN){imageData=unescape(imageData);var tmpImageData=convertBase64ToBinaryString(imageData,false);if(tmpImageData!==""){imageData=tmpImageData;}else{tmpImageData=jsPDFAPI.loadFile(imageData,true);if(tmpImageData!==undefined){imageData=tmpImageData;}}}if(isDOMElement(imageData)){imageData=getImageDataFromElement(imageData,format);}format=getImageFileTypeByImageData(imageData,format);if(!isImageTypeSupported(format)){throw new Error("addImage does not support files of type '"+format+"', please ensure that a plugin for '"+format+"' support is added.");}// now do the heavy lifting
99609
99682
  if(notDefined(alias)){alias=generateAliasFromImageData(imageData);}result=checkImagesForAlias.call(this,alias);if(!result){if(supportsArrayBuffer()){// no need to convert if imageData is already uint8array
@@ -100402,9 +100475,10 @@ a=isNaN(a)?1:a;b=isNaN(b)?0:b;c=isNaN(c)?0:c;d=isNaN(d)?1:d;e=isNaN(e)?0:e;f=isN
100402
100475
  * @param height {Number} Optional. The height of the image to use (stretch or reduce the image)
100403
100476
  */Context2D.prototype.drawImage=function(img,sx,sy,swidth,sheight,x,y,width,height){var imageProperties=this.pdf.getImageProperties(img);var factorX=1;var factorY=1;var clipFactorX=1;var clipFactorY=1;if(typeof swidth!=="undefined"&&typeof width!=="undefined"){clipFactorX=width/swidth;clipFactorY=height/sheight;factorX=imageProperties.width/swidth*width/swidth;factorY=imageProperties.height/sheight*height/sheight;}//is sx and sy are set and x and y not, set x and y with values of sx and sy
100404
100477
  if(typeof x==="undefined"){x=sx;y=sy;sx=0;sy=0;}if(typeof swidth!=="undefined"&&typeof width==="undefined"){width=swidth;height=sheight;}if(typeof swidth==="undefined"&&typeof width==="undefined"){width=imageProperties.width;height=imageProperties.height;}var decomposedTransformationMatrix=this.ctx.transform.decompose();// console.log("transform.decompose",decomposedTransformationMatrix.scale);
100405
- var angle=rad2deg(decomposedTransformationMatrix.rotate.shx);var matrix=new Matrix();matrix=matrix.multiply(decomposedTransformationMatrix.translate);matrix=matrix.multiply(decomposedTransformationMatrix.skew);matrix=matrix.multiply(decomposedTransformationMatrix.scale);if(!swidth){swidth=width;}if(!sheight){sheight=height;}var xRect;// 自定义修改 处理签名图片打印和普通图片打印
100478
+ // 自定义修改 修复图片旋转角度错误问题
100479
+ var angle=rad2deg(decomposedTransformationMatrix.rotate.rotation);var matrix=new Matrix();matrix=matrix.multiply(decomposedTransformationMatrix.translate);matrix=matrix.multiply(decomposedTransformationMatrix.skew);matrix=matrix.multiply(decomposedTransformationMatrix.scale);if(!swidth){swidth=width;}if(!sheight){sheight=height;}var xRect;// 自定义修改 处理签名图片打印和普通图片打印
100406
100480
  if(img.nodeName&&img.nodeName=="CANVAS"){xRect=matrix.applyToRectangle(new Rectangle(x+this.posX-sx*clipFactorX,y+this.posY-sy*clipFactorY,swidth*factorX,sheight*factorY));}else{xRect=matrix.applyToRectangle(new Rectangle(x-sx*clipFactorX,y-sy*clipFactorY,swidth*factorX,sheight*factorY));}var pageArray=getPagesByPath.call(this,xRect);var pages=[];for(var ii=0;ii<pageArray.length;ii+=1){if(pages.indexOf(pageArray[ii])===-1){pages.push(pageArray[ii]);}}sortPages(pages);var clipPath;if(this.autoPaging){var min=pages[0];var max=pages[pages.length-1];for(var i=min;i<max+1;i++){this.pdf.setPage(i);var pageWidthMinusMargins=this.pdf.internal.pageSize.width-this.margin[3]-this.margin[1];var topMargin=i===1?this.posY+this.margin[0]:this.margin[0];var firstPageHeight=this.pdf.internal.pageSize.height-this.posY-this.margin[0]-this.margin[2];var pageHeightMinusMargins=this.pdf.internal.pageSize.height-this.margin[0]-this.margin[2];var previousPageHeightSum=i===1?0:firstPageHeight+(i-2)*pageHeightMinusMargins;if(this.ctx.clip_path.length!==0){var tmpPaths=this.path;clipPath=JSON.parse(JSON.stringify(this.ctx.clip_path));this.path=pathPositionRedo(clipPath,this.posX+this.margin[3],-previousPageHeightSum+topMargin+this.ctx.prevPageLastElemOffset);drawPaths.call(this,"fill",true);this.path=tmpPaths;}var tmpRect=JSON.parse(JSON.stringify(xRect));tmpRect=pathPositionRedo([tmpRect],this.posX+this.margin[3],-previousPageHeightSum+topMargin+this.ctx.prevPageLastElemOffset)[0];var needsClipping=(i>min||i<max)&&hasMargins.call(this);if(needsClipping){this.pdf.saveGraphicsState();this.pdf.rect(this.margin[3],this.margin[0],pageWidthMinusMargins,pageHeightMinusMargins,null).clip().discardPath();}this.pdf.addImage(img,"JPEG",tmpRect.x,tmpRect.y,tmpRect.w,tmpRect.h,null,null,angle);if(needsClipping){this.pdf.restoreGraphicsState();}}}else{if(img.nodeName&&img.nodeName=="CANVAS"){// 自定义修改
100407
- this.pdf.addImage(img.toDataURL("image/jpg"),'',xRect.x,xRect.y,xRect.w,xRect.h);}else{// 自定义修改
100481
+ this.pdf.addImage(img.toDataURL("image/png"),'',xRect.x,xRect.y,xRect.w,xRect.h);}else{// 自定义修改
100408
100482
  this.pdf.addImage(img,"JPEG",xRect.x+this.posX,xRect.y+this.posY,xRect.w,xRect.h,null,null,angle,this.posX,this.posY);}}};var getPagesByPath=function getPagesByPath(path,pageWrapX,pageWrapY){var result=[];pageWrapX=pageWrapX||this.pdf.internal.pageSize.width;pageWrapY=pageWrapY||this.pdf.internal.pageSize.height-this.margin[0]-this.margin[2];var yOffset=this.posY+this.ctx.prevPageLastElemOffset;switch(path.type){default:case"mt":case"lt":result.push(Math.floor((path.y+yOffset)/pageWrapY)+1);break;case"arc":result.push(Math.floor((path.y+yOffset-path.radius)/pageWrapY)+1);result.push(Math.floor((path.y+yOffset+path.radius)/pageWrapY)+1);break;case"qct":var rectOfQuadraticCurve=getQuadraticCurveBoundary(this.ctx.lastPoint.x,this.ctx.lastPoint.y,path.x1,path.y1,path.x,path.y);result.push(Math.floor((rectOfQuadraticCurve.y+yOffset)/pageWrapY)+1);result.push(Math.floor((rectOfQuadraticCurve.y+rectOfQuadraticCurve.h+yOffset)/pageWrapY)+1);break;case"bct":var rectOfBezierCurve=getBezierCurveBoundary(this.ctx.lastPoint.x,this.ctx.lastPoint.y,path.x1,path.y1,path.x2,path.y2,path.x,path.y);result.push(Math.floor((rectOfBezierCurve.y+yOffset)/pageWrapY)+1);result.push(Math.floor((rectOfBezierCurve.y+rectOfBezierCurve.h+yOffset)/pageWrapY)+1);break;case"rect":result.push(Math.floor((path.y+yOffset)/pageWrapY)+1);result.push(Math.floor((path.y+path.h+yOffset)/pageWrapY)+1);}for(var i=0;i<result.length;i+=1){while(this.pdf.internal.getNumberOfPages()<result[i]){addPage.call(this);}}return result;};var addPage=function addPage(){var fillStyle=this.fillStyle;var strokeStyle=this.strokeStyle;var font=this.font;var lineCap=this.lineCap;var lineWidth=this.lineWidth;var lineJoin=this.lineJoin;this.pdf.addPage();this.fillStyle=fillStyle;this.strokeStyle=strokeStyle;this.font=font;this.lineCap=lineCap;this.lineWidth=lineWidth;this.lineJoin=lineJoin;};var pathPositionRedo=function pathPositionRedo(paths,x,y){for(var i=0;i<paths.length;i++){switch(paths[i].type){case"bct":paths[i].x2+=x;paths[i].y2+=y;case"qct":paths[i].x1+=x;paths[i].y1+=y;case"mt":case"lt":case"arc":default:paths[i].x+=x;paths[i].y+=y;}}return paths;};var sortPages=function sortPages(pages){return pages.sort(function(a,b){return a-b;});};var pathPreProcess=function pathPreProcess(rule,isClip){var fillStyle=this.fillStyle;var strokeStyle=this.strokeStyle;var lineCap=this.lineCap;var oldLineWidth=this.lineWidth;var lineWidth=Math.abs(oldLineWidth*this.ctx.transform.scaleX);var lineJoin=this.lineJoin;var origPath=JSON.parse(JSON.stringify(this.path));var xPath=JSON.parse(JSON.stringify(this.path));var clipPath;var tmpPath;var pages=[];for(var i=0;i<xPath.length;i++){if(typeof xPath[i].x!=="undefined"){var page=getPagesByPath.call(this,xPath[i]);for(var ii=0;ii<page.length;ii+=1){if(pages.indexOf(page[ii])===-1){pages.push(page[ii]);}}}}for(var j=0;j<pages.length;j++){while(this.pdf.internal.getNumberOfPages()<pages[j]){addPage.call(this);}}sortPages(pages);if(this.autoPaging){var min=pages[0];var max=pages[pages.length-1];for(var k=min;k<max+1;k++){this.pdf.setPage(k);this.fillStyle=fillStyle;this.strokeStyle=strokeStyle;this.lineCap=lineCap;this.lineWidth=lineWidth;this.lineJoin=lineJoin;var pageWidthMinusMargins=this.pdf.internal.pageSize.width-this.margin[3]-this.margin[1];var topMargin=k===1?this.posY+this.margin[0]:this.margin[0];var firstPageHeight=this.pdf.internal.pageSize.height-this.posY-this.margin[0]-this.margin[2];var pageHeightMinusMargins=this.pdf.internal.pageSize.height-this.margin[0]-this.margin[2];var previousPageHeightSum=k===1?0:firstPageHeight+(k-2)*pageHeightMinusMargins;if(this.ctx.clip_path.length!==0){var tmpPaths=this.path;clipPath=JSON.parse(JSON.stringify(this.ctx.clip_path));this.path=pathPositionRedo(clipPath,this.posX+this.margin[3],-previousPageHeightSum+topMargin+this.ctx.prevPageLastElemOffset);drawPaths.call(this,rule,true);this.path=tmpPaths;}tmpPath=JSON.parse(JSON.stringify(origPath));this.path=pathPositionRedo(tmpPath,this.posX+this.margin[3],-previousPageHeightSum+topMargin+this.ctx.prevPageLastElemOffset);if(isClip===false||k===0){var needsClipping=(k>min||k<max)&&hasMargins.call(this);if(needsClipping){this.pdf.saveGraphicsState();this.pdf.rect(this.margin[3],this.margin[0],pageWidthMinusMargins,pageHeightMinusMargins,null).clip().discardPath();}drawPaths.call(this,rule,isClip);if(needsClipping){this.pdf.restoreGraphicsState();}}this.lineWidth=oldLineWidth;}}else{this.lineWidth=lineWidth;drawPaths.call(this,rule,isClip);this.lineWidth=oldLineWidth;}this.path=origPath;};/**
100409
100483
  * Processes the paths
100410
100484
  *
@@ -199102,8 +199176,8 @@ var es_function_name = __webpack_require__(68309);
199102
199176
  // EXTERNAL MODULE: external {"commonjs":"vue","commonjs2":"vue","root":"Vue"}
199103
199177
  var external_commonjs_vue_commonjs2_vue_root_Vue_ = __webpack_require__(13797);
199104
199178
  var external_commonjs_vue_commonjs2_vue_root_Vue_default = /*#__PURE__*/__webpack_require__.n(external_commonjs_vue_commonjs2_vue_root_Vue_);
199105
- ;// CONCATENATED MODULE: ./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/HoDocs.vue?vue&type=template&id=78774540&
199106
- var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return (_vm.hoEditorFactoryIdList.length > 0)?_c('div',{staticClass:"ho-docs"},[_c('section',{class:_vm.defaultEditJson.isFooter ? 'ho-editor-list' : 'ho-editor-list editor-no-footer',on:{"contextmenu":function($event){return _vm.blankAreaRightClick.apply(null, arguments)}}},[_vm._l((_vm.hoEditorFactoryIdList),function(hoEditorId,index){return [_c('HoDoc',{key:index,attrs:{"docIndex":index,"hoEditorId":hoEditorId,"hoEditorFactoryIdList":_vm.hoEditorFactoryIdList,"activeDocId":_vm.activeDocId,"editJson":_vm.defaultEditJson,"isUseTipText":_vm.isUseTipText,"textStyle":_vm.textStyle},on:{"dblNodeClick":_vm.dblNodeClick,"setFontStyles":_vm.setFontStyles,"rightClickEvent":_vm.rightClickEvent,"setActiveDocIndex":_vm.setActiveDocIndex,"setActivePageIndex":_vm.setActivePageIndex,"drawPagesLengthChange":_vm.drawPagesLengthChange},scopedSlots:_vm._u([{key:"hoDocHead",fn:function(){return [_vm._t("hoHead")]},proxy:true},{key:"hoDocFoot",fn:function(){return [_vm._t("hoFoot")]},proxy:true}],null,true)})]})],2),(_vm.notUseModal)?_c('ControlModal',{attrs:{"hoEditorFactoryId":_vm.activeDocId,"controlProperty":_vm.controlProperty,"isDataSource":_vm.isDataSource,"isCustoms":_vm.isCustoms,"isTableProperty":_vm.isTableProperty,"isListStyle":_vm.isListStyle,"uploadImageParams":_vm.uploadImageParams},on:{"insertComments":_vm.insertComments,"closeControlmodal":_vm.closeControlModal},scopedSlots:_vm._u([{key:"hoTextModal",fn:function(){return [_vm._t("hoTextField")]},proxy:true},{key:"hoComment",fn:function(){return [_vm._t("hoTextComment")]},proxy:true}],null,true)}):_vm._e(),(_vm.controlFindType)?_c('FindReplaceDialog',{attrs:{"hoEditorFactoryId":_vm.activeDocId}}):_vm._e(),(_vm.defaultEditJson.isFooter)?_c('HoFooter',{attrs:{"docProperty":_vm.defaultDocProperty,"hoEditorFactoryId":_vm.activeDocId,"drawPages":_vm.drawPageLength,"currentActivePages":_vm.activePageIndex}}):_vm._e(),_c('ViewContinuousXml',{attrs:{"hoEditorFactoryId":_vm.activeDocId}})],1):_vm._e()}
199179
+ ;// CONCATENATED MODULE: ./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/HoDocs.vue?vue&type=template&id=83a638fc&
199180
+ var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return (_vm.hoEditorFactoryIdList.length > 0)?_c('div',{staticClass:"ho-docs"},[_c('section',{class:_vm.defaultEditJson.isFooter ? 'ho-editor-list' : 'ho-editor-list editor-no-footer',on:{"contextmenu":function($event){return _vm.blankAreaRightClick.apply(null, arguments)}}},[_vm._l((_vm.hoEditorFactoryIdList),function(hoEditorId,index){return [_c('HoDoc',{key:index,attrs:{"docIndex":index,"hoEditorId":hoEditorId,"hoEditorFactoryIdList":_vm.hoEditorFactoryIdList,"activeDocId":_vm.activeDocId,"editJson":_vm.defaultEditJson,"isUseTipText":_vm.isUseTipText,"textStyle":_vm.textStyle},on:{"dblNodeClick":_vm.dblNodeClick,"setFontStyles":_vm.setFontStyles,"rightClickEvent":_vm.rightClickEvent,"setActiveDocIndex":_vm.setActiveDocIndex,"setActivePageIndex":_vm.setActivePageIndex,"drawPagesLengthChange":_vm.drawPagesLengthChange},scopedSlots:_vm._u([{key:"hoDocHead",fn:function(){return [_vm._t("hoHead")]},proxy:true},{key:"hoDocFoot",fn:function(){return [_vm._t("hoFoot")]},proxy:true}],null,true)})]})],2),(_vm.notUseModal)?_c('ControlModal',{attrs:{"hoEditorFactoryId":_vm.activeDocId,"controlProperty":_vm.controlProperty,"isDataSource":_vm.isDataSource,"isCustoms":_vm.isCustoms,"isTableProperty":_vm.isTableProperty,"isListStyle":_vm.isListStyle,"uploadImageParams":_vm.uploadImageParams},on:{"insertComments":_vm.insertComments,"closeControlmodal":_vm.closeControlModal},scopedSlots:_vm._u([{key:"hoTextModal",fn:function(){return [_vm._t("hoTextField")]},proxy:true},{key:"hoParagraphModal",fn:function(){return [_vm._t("hoParagraphField")]},proxy:true},{key:"hoComment",fn:function(){return [_vm._t("hoTextComment")]},proxy:true}],null,true)}):_vm._e(),(_vm.controlFindType)?_c('FindReplaceDialog',{attrs:{"hoEditorFactoryId":_vm.activeDocId}}):_vm._e(),(_vm.defaultEditJson.isFooter)?_c('HoFooter',{attrs:{"docProperty":_vm.defaultDocProperty,"hoEditorFactoryId":_vm.activeDocId,"drawPages":_vm.drawPageLength,"currentActivePages":_vm.activePageIndex}}):_vm._e()],1):_vm._e()}
199107
199181
  var staticRenderFns = []
199108
199182
 
199109
199183
 
@@ -200028,9 +200102,9 @@ function isPromise(obj) {
200028
200102
  return obj instanceof Promise || (obj && typeof obj.then === 'function');
200029
200103
  }
200030
200104
 
200031
- ;// CONCATENATED MODULE: ./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/HoDoc.vue?vue&type=template&id=4a474bf6&
200032
- var HoDocvue_type_template_id_4a474bf6_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{class:_vm.docClassNames},[_c('div',{ref:"editorArea",staticClass:"editors"},[(_vm.drawPageLength > 0)?_c('div',{staticClass:"editor",on:{"click":function($event){return _vm.setActiveDocIndex(_vm.hoEditorId)}}},[_vm._l((_vm.drawPageCount.count),function(pgIndex){return [_c('HoPage',{key:pgIndex - 1,attrs:{"data-id":pgIndex - 1,"index":pgIndex - 1,"docIndex":_vm.docIndex,"canvasWidth":_vm.canvasParams.width,"canvasHeight":_vm.canvasParams.height,"currentActivePages":_vm.activePageIndex.index,"hoEditorId":_vm.hoEditorId,"hoEditorFactoryIdList":_vm.hoEditorFactoryIdList,"mouseMoveNodes":_vm.mouseMoveNodes,"viewableAreaObserver":_vm.viewableAreaObserver,"inViewPages":_vm.inViewPages,"canvasHeadFootPos":_vm.canvasHeadFootPos,"poperTipPos":_vm.poperTipPos,"textStyle":_vm.textStyle,"aiInfo":_vm.aiInfo},on:{"pageReady":_vm.pageReady,"canvasRightClick":_vm.mouseRightClickEvent},scopedSlots:_vm._u([{key:"hoPageHead",fn:function(){return [_vm._t("hoDocHead")]},proxy:true},{key:"hoPageFoot",fn:function(){return [_vm._t("hoDocFoot")]},proxy:true}],null,true)})]})],2):_vm._e()]),(_vm.poperType === 'datePoper' || _vm.poperType === 'selectPoper')?_c('PoperSelectModal',{attrs:{"poperType":_vm.poperType,"poperSelectList":_vm.poperSelectList,"poperPos":_vm.poperPos,"hoEditorId":_vm.hoEditorId},on:{"poperClose":_vm.poperClose}}):_vm._e(),_c('PoperMark',{directives:[{name:"show",rawName:"v-show",value:(_vm.poperType === 'datePoper' || _vm.poperType === 'selectPoper' || _vm.poperType === 'table-cell-poper'),expression:"poperType === 'datePoper' || poperType === 'selectPoper' || poperType === 'table-cell-poper'"}]}),(_vm.poperType === 'table-cell-poper')?_c('TableCellPoper',{attrs:{"poperNode":_vm.nodeValue,"poperPos":_vm.poperPos},on:{"poperClose":_vm.poperClose}}):_vm._e(),_c('HoToPage',{attrs:{"hoEditorId":_vm.hoEditorId,"inViewPages":_vm.inViewPages}}),_c('PoperTipText',{attrs:{"isPoperText":_vm.isPoperText,"poperText":_vm.poperText,"poperPos":_vm.poperTextPos},on:{"poperTextClose":_vm.poperTextClose}}),_c('ul',{directives:[{name:"click-outside",rawName:"v-click-outside",value:(function () { return (_vm.isCreateRightMenuModal = false); }),expression:"() => (isCreateRightMenuModal = false)"},{name:"show",rawName:"v-show",value:(_vm.isCreateRightMenuModal),expression:"isCreateRightMenuModal"}],ref:"rightMenuModal",staticClass:"create-right-menu"},[(_vm.showCommentsBtn)?_c('li',{staticClass:"mouse-menu-item",on:{"click":_vm.hideComments}},[_vm._v(_vm._s(_vm.isHideComments ? '显示' : '隐藏')+"批注")]):_vm._e(),_c('li',{staticClass:"mouse-menu-item"},[_vm._v(" 编辑器内核版本:   "),_c('span',{staticStyle:{"font-size":"14px","color":"#0a77e3"}},[_vm._v("v "+_vm._s(_vm.version))])])])],1)}
200033
- var HoDocvue_type_template_id_4a474bf6_staticRenderFns = []
200105
+ ;// CONCATENATED MODULE: ./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/HoDoc.vue?vue&type=template&id=4a9748a4&
200106
+ var HoDocvue_type_template_id_4a9748a4_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{class:_vm.docClassNames},[_c('div',{ref:"editorArea",staticClass:"editors"},[(_vm.drawPageLength > 0)?_c('div',{staticClass:"editor",on:{"click":function($event){return _vm.setActiveDocIndex(_vm.hoEditorId)}}},[_vm._l((_vm.drawPageCount.count),function(pgIndex){return [_c('HoPage',{key:pgIndex - 1,attrs:{"data-id":pgIndex - 1,"index":pgIndex - 1,"docIndex":_vm.docIndex,"canvasWidth":_vm.canvasParams.width,"canvasHeight":_vm.canvasParams.height,"currentActivePages":_vm.activePageIndex.index,"hoEditorId":_vm.hoEditorId,"hoEditorFactoryIdList":_vm.hoEditorFactoryIdList,"mouseMoveNodes":_vm.mouseMoveNodes,"viewableAreaObserver":_vm.viewableAreaObserver,"inViewPages":_vm.inViewPages,"canvasHeadFootPos":_vm.canvasHeadFootPos,"poperTipPos":_vm.poperTipPos,"textStyle":_vm.textStyle,"aiInfo":_vm.aiInfo},on:{"pageReady":_vm.pageReady,"canvasRightClick":_vm.mouseRightClickEvent},scopedSlots:_vm._u([{key:"hoPageHead",fn:function(){return [_vm._t("hoDocHead")]},proxy:true},{key:"hoPageFoot",fn:function(){return [_vm._t("hoDocFoot")]},proxy:true}],null,true)})]})],2):_vm._e()]),(_vm.poperType === 'datePoper' || _vm.poperType === 'selectPoper')?_c('PoperSelectModal',{attrs:{"poperType":_vm.poperType,"poperSelectList":_vm.poperSelectList,"poperPos":_vm.poperPos,"hoEditorId":_vm.hoEditorId},on:{"poperClose":_vm.poperClose}}):_vm._e(),_c('PoperMark',{directives:[{name:"show",rawName:"v-show",value:(_vm.poperType === 'datePoper' || _vm.poperType === 'selectPoper' || _vm.poperType === 'table-cell-poper'),expression:"poperType === 'datePoper' || poperType === 'selectPoper' || poperType === 'table-cell-poper'"}]}),(_vm.poperType === 'table-cell-poper')?_c('TableCellPoper',{attrs:{"poperNode":_vm.nodeValue,"poperPos":_vm.poperPos},on:{"poperClose":_vm.poperClose}}):_vm._e(),_c('HoToPage',{attrs:{"hoEditorId":_vm.hoEditorId,"inViewPages":_vm.inViewPages}}),_c('PoperTipText',{attrs:{"isPoperText":_vm.isPoperText,"poperText":_vm.poperText,"poperPos":_vm.poperTextPos},on:{"poperTextClose":_vm.poperTextClose}}),_c('ul',{directives:[{name:"click-outside",rawName:"v-click-outside",value:(function () { return (_vm.isCreateRightMenuModal = false); }),expression:"() => (isCreateRightMenuModal = false)"},{name:"show",rawName:"v-show",value:(_vm.isCreateRightMenuModal),expression:"isCreateRightMenuModal"}],ref:"rightMenuModal",staticClass:"create-right-menu"},[(_vm.showCommentsBtn)?_c('li',{staticClass:"mouse-menu-item",on:{"click":_vm.hideComments}},[_vm._v(_vm._s(_vm.isHideComments ? '显示' : '隐藏')+"批注")]):_vm._e(),_c('li',{staticClass:"mouse-menu-item"},[_vm._v(" 编辑器内核版本:   "),_c('span',{staticStyle:{"font-size":"14px","color":"#0a77e3"}},[_vm._v("v "+_vm._s(_vm.version))])])])],1)}
200107
+ var HoDocvue_type_template_id_4a9748a4_staticRenderFns = []
200034
200108
 
200035
200109
 
200036
200110
  // EXTERNAL MODULE: ./node_modules/core-js/modules/es.string.includes.js
@@ -207085,7 +207159,7 @@ var SignNode = __webpack_require__(34450);
207085
207159
  // EXTERNAL MODULE: ./src/editor/dom/treeNode/ParagraphNode.ts
207086
207160
  var ParagraphNode = __webpack_require__(14208);
207087
207161
  ;// CONCATENATED MODULE: ./src/components/version.ts
207088
- /* harmony default export */ var version = ('2.0.61');
207162
+ /* harmony default export */ var version = ('2.0.64');
207089
207163
  ;// CONCATENATED MODULE: ./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/poperTipText/PoperTipText.vue?vue&type=template&id=3fa4e4d3&scoped=true&
207090
207164
  var PoperTipTextvue_type_template_id_3fa4e4d3_scoped_true_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{directives:[{name:"show",rawName:"v-show",value:(_vm.isShow),expression:"isShow"},{name:"click-outside",rawName:"v-click-outside",value:(_vm.handleClose),expression:"handleClose"}],ref:"poperTextNode",staticClass:"poper-text-modal animation-in",style:(_vm.posStyle),on:{"mouseenter":_vm.mouseEnter,"mouseleave":_vm.mouseLeave}},_vm._l((_vm.poperText),function(text){return _c('div',{key:text + Math.random(0, 1),staticClass:"poper-text"},[_vm._v(" "+_vm._s(text)+" ")])}),0)}
207091
207165
  var PoperTipTextvue_type_template_id_3fa4e4d3_scoped_true_staticRenderFns = []
@@ -207626,6 +207700,14 @@ var HoDoc = /*#__PURE__*/function (_Vue) {
207626
207700
 
207627
207701
  var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this.hoEditorId);
207628
207702
  if (!e.clickType || e.clickType === 'move') return false;
207703
+ var hoParagrapghTipElementNode = document.querySelector('#ho_paragrapgh_tip');
207704
+
207705
+ if (hoParagrapghTipElementNode) {
207706
+ var _hoParagrapghTipEleme;
207707
+
207708
+ (_hoParagrapghTipEleme = hoParagrapghTipElementNode.parentNode) === null || _hoParagrapghTipEleme === void 0 ? void 0 : _hoParagrapghTipEleme.removeChild(hoParagrapghTipElementNode);
207709
+ }
207710
+
207629
207711
  var node = e.node;
207630
207712
  this.poperClose();
207631
207713
 
@@ -208017,8 +208099,8 @@ HoDoc = __decorate([vue_class_component_esm({
208017
208099
 
208018
208100
  var HoDoc_component = normalizeComponent(
208019
208101
  components_HoDocvue_type_script_lang_ts_,
208020
- HoDocvue_type_template_id_4a474bf6_render,
208021
- HoDocvue_type_template_id_4a474bf6_staticRenderFns,
208102
+ HoDocvue_type_template_id_4a9748a4_render,
208103
+ HoDocvue_type_template_id_4a9748a4_staticRenderFns,
208022
208104
  false,
208023
208105
  null,
208024
208106
  null,
@@ -209311,6 +209393,8 @@ var NodeClickEvent = __webpack_require__(25445);
209311
209393
 
209312
209394
 
209313
209395
 
209396
+
209397
+
209314
209398
  var DmouseEventType;
209315
209399
 
209316
209400
  (function (DmouseEventType) {
@@ -209498,6 +209582,8 @@ var NodeMouseMoveEvent = /*#__PURE__*/function () {
209498
209582
  }, {
209499
209583
  key: "NodeClick",
209500
209584
  value: function NodeClick(node, moveType) {
209585
+ var _this = this;
209586
+
209501
209587
  var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID);
209502
209588
 
209503
209589
  if (node instanceof RadioAndCheckBoxNode/* RadioAndCheckBoxNode */.Yh && moveType === DmouseEventType.detClick) {
@@ -209506,6 +209592,44 @@ var NodeMouseMoveEvent = /*#__PURE__*/function () {
209506
209592
  hoEditorFactory.docTree.nodeClick(nodeClickEvent);
209507
209593
  node.drawNodes[0].parent = drawLine;
209508
209594
  }
209595
+
209596
+ if (hoEditorFactory.drawTree.paintStatus === DrawTree/* PaintState.psDesign */.Dh.psDesign) {
209597
+ var paragraphNode = hoEditorFactory.drawTree.getDrawLineByDNode(node.drawNodes[0]).paragraphNode;
209598
+
209599
+ if (paragraphNode && paragraphNode.customProperty) {
209600
+ var customProperty = paragraphNode.customProperty;
209601
+ var paragraphTip = ['男', '女'].includes(customProperty.sex) || customProperty.age && customProperty.age.select == '隐藏';
209602
+ var arr = [];
209603
+
209604
+ if (paragraphTip) {
209605
+ if (['男', '女'].includes(customProperty.sex)) {
209606
+ arr.push("\u60A3\u8005\u4E3A<span style=\"color:#f00\"> ".concat(customProperty.sex, " </span>\u6027\u65F6\uFF0C\u9690\u85CF\u5F53\u524D\u6BB5\u843D"));
209607
+ }
209608
+
209609
+ if (customProperty.age && customProperty.age.select == '隐藏') {
209610
+ arr.push("\u60A3\u8005\u5E74\u9F84\u5728<span style=\"color:#f00\"> ".concat(customProperty.age.minAge, " </span>\u5C81\u5230<span style=\"color:#f00\"> ").concat(customProperty.age.maxAge, " </span>\u4E4B\u95F4\u65F6\uFF0C\u9690\u85CF\u5F53\u524D\u6BB5\u843D"));
209611
+ }
209612
+
209613
+ if (arr.length > 0) {
209614
+ setTimeout(function () {
209615
+ _this.createParagraphTipHTML(hoEditorFactory.drawTree.caret, arr);
209616
+ }, 0);
209617
+ }
209618
+ }
209619
+ }
209620
+ }
209621
+ }
209622
+ }, {
209623
+ key: "createParagraphTipHTML",
209624
+ value: function createParagraphTipHTML(caret, text) {
209625
+ var _caret$cursor$parentN;
209626
+
209627
+ var tipdiv = document.createElement('div');
209628
+ tipdiv.id = "ho_paragrapgh_tip";
209629
+ tipdiv.style.left = caret.X + "px";
209630
+ tipdiv.style.top = caret.Y + caret.height + "px";
209631
+ tipdiv.innerHTML = text.join("<br />");
209632
+ (_caret$cursor$parentN = caret.cursor.parentNode) === null || _caret$cursor$parentN === void 0 ? void 0 : _caret$cursor$parentN.appendChild(tipdiv);
209509
209633
  }
209510
209634
  /**
209511
209635
  * @param node moveNode
@@ -213061,8 +213185,14 @@ var StructureConvert = /*#__PURE__*/function () {
213061
213185
  var insertNode = function insertNode(array, prevNode) {
213062
213186
  var firstNode = array[0];
213063
213187
 
213064
- if (firstNode instanceof ParagraphNode/* ParagraphNode */.C && firstNode.paraNo !== 0 && prevNode instanceof ParagraphNode/* ParagraphNode */.C) {
213065
- prevNode.paraNo = firstNode.paraNo;
213188
+ if (firstNode instanceof ParagraphNode/* ParagraphNode */.C && prevNode instanceof ParagraphNode/* ParagraphNode */.C) {
213189
+ if (firstNode.paraNo !== 0) {
213190
+ prevNode.paraNo = firstNode.paraNo;
213191
+ }
213192
+
213193
+ if (firstNode.customProperty) {
213194
+ prevNode.customProperty = firstNode.customProperty;
213195
+ }
213066
213196
  }
213067
213197
 
213068
213198
  for (var j = 1; j < array.length; j++) {
@@ -220111,7 +220241,7 @@ var VueController = /*#__PURE__*/function () {
220111
220241
 
220112
220242
  if (node instanceof SignNode/* SignNode */.N) {
220113
220243
  if (node.isTemplate) {
220114
- if (node.imgSrc) {
220244
+ if (node.imgSrc || node.fingerPrintSrc) {
220115
220245
  this.deleteNode(node);
220116
220246
  setTimeout(function () {
220117
220247
  var newcurDomRange = hoEditorFactory.docTree.curDomRange.normalize();
@@ -220145,7 +220275,7 @@ var VueController = /*#__PURE__*/function () {
220145
220275
  var changingEvent = new NodeChangingEvent/* NodeChangingEvent */.Q(DocTree/* DocAction.daInsert */.gk.daInsert, startPath, endPath, NodeChangingEvent/* OperType.insertSign */.y.insertSign);
220146
220276
 
220147
220277
  if (hoEditorFactory.docTree.changing(changingEvent)) {
220148
- Promise.all([hoEditorFactory.docController.insertSignNode(curDomRange, 1, "患者签名", "", "", "", imgSrc, 0, 0, {}, fingerPrintSrc, fingerPosition)]).then(function () {
220278
+ Promise.all([hoEditorFactory.docController.insertSignNode(curDomRange, 3, "患者签名", "", "", "", imgSrc, 0, 0, {}, fingerPrintSrc, fingerPosition)]).then(function () {
220149
220279
  setTimeout(function () {
220150
220280
  callback && callback();
220151
220281
  }, 0);
@@ -220805,10 +220935,17 @@ var VueController = /*#__PURE__*/function () {
220805
220935
 
220806
220936
  for (var j = 0; j < elements.length; j++) {
220807
220937
  var element = elements[j];
220938
+ var commentID = hoEditorFactory.gernerateCode.generateID("C");
220939
+ var comment = void 0;
220808
220940
 
220809
220941
  if (element instanceof TextInputFieldNode/* TextInputFieldNode */.re) {
220810
- var commentID = hoEditorFactory.gernerateCode.generateID("C");
220811
- var comment = new Comment/* Comment */.s(this._hoEditorFactoryID, commentID, oldValue, element.EndMarkNode);
220942
+ comment = new Comment/* Comment */.s(this._hoEditorFactoryID, commentID, oldValue, element.EndMarkNode);
220943
+ comment.lineHeight = comment.lineHeight - 20;
220944
+ comments.push(comment);
220945
+ }
220946
+
220947
+ if (element instanceof DateTimeNode/* DateTimeNode */.Z || element instanceof DownListNode/* DownListNode */.yF) {
220948
+ comment = new Comment/* Comment */.s(this._hoEditorFactoryID, commentID, oldValue, element);
220812
220949
  comment.lineHeight = comment.lineHeight - 20;
220813
220950
  comments.push(comment);
220814
220951
  }
@@ -220827,9 +220964,13 @@ var VueController = /*#__PURE__*/function () {
220827
220964
 
220828
220965
  var spX = dline.parent instanceof DrawPageCell/* DrawPageCell */.k ? localPos.x : endDrawNode.x;
220829
220966
  var spY = localPos.y;
220830
- drawArea.removeComment(comment);
220967
+ drawArea.removeComment(comment, true);
220831
220968
  var path = comment.eNode.getNodePath();
220832
220969
 
220970
+ if (comment.eNode instanceof DateTimeNode/* DateTimeNode */.Z || comment.eNode instanceof DownListNode/* DownListNode */.yF) {
220971
+ spX = spX + comment.eNode.drawNodes[0].dWidth;
220972
+ }
220973
+
220833
220974
  if (index === 1) {
220834
220975
  drawArea.drawEditRecords(comment, spX, spY, spY);
220835
220976
  }
@@ -220839,6 +220980,26 @@ var VueController = /*#__PURE__*/function () {
220839
220980
  }
220840
220981
  });
220841
220982
  }
220983
+ }, {
220984
+ key: "clearEditRecords",
220985
+ value: function clearEditRecords() {
220986
+ var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID);
220987
+ var drawMainDocs = hoEditorFactory.drawPageTree.drawMainDocs;
220988
+
220989
+ for (var j = drawMainDocs.length - 1; j >= 0; j--) {
220990
+ var children = drawMainDocs[j].children;
220991
+
220992
+ for (var i = children.length - 1; i >= 0; i--) {
220993
+ var child = children[i];
220994
+
220995
+ if (child.name && child.name.indexOf("recordC") >= 0) {
220996
+ children.splice(i, 1);
220997
+ }
220998
+ }
220999
+
221000
+ hoEditorFactory.drawPageTree.updateDrawPage(j);
221001
+ }
221002
+ }
220842
221003
  }, {
220843
221004
  key: "updateImageSrc",
220844
221005
  value: function updateImageSrc(node, src) {
@@ -224531,7 +224692,8 @@ var HOEditorFactory = /*#__PURE__*/function () {
224531
224692
  this._lastSaveTime = new Date(Date.now());
224532
224693
  this._superiorSigns = []; //上级医生签名
224533
224694
 
224534
- this._isEnabledGlobalColor = false;
224695
+ this._isEnabledGlobalColor = false; //是否启用全局颜色
224696
+
224535
224697
  this._hoEditorFactoryId = id;
224536
224698
  }
224537
224699
  /**
@@ -225595,9 +225757,9 @@ var HoFooter_component = normalizeComponent(
225595
225757
  )
225596
225758
 
225597
225759
  /* harmony default export */ var components_HoFooter = (HoFooter_component.exports);
225598
- ;// CONCATENATED MODULE: ./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/ControlModal.vue?vue&type=template&id=35544190&
225599
- var ControlModalvue_type_template_id_35544190_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{ref:"toolModals",staticClass:"control-modal",on:{"mousedown":_vm.toolModalDown}},[(_vm.controlType === 'barcode')?_c('Barcode',{attrs:{"vueController":_vm.vueController,"controlStatus":_vm.controlStatus,"hoEditorFactoryId":_vm.hoEditorFactoryId},on:{"closed":_vm.handleClose}}):_vm._e(),(_vm.controlType === 'qrcode')?_c('QrCode',{attrs:{"vueController":_vm.vueController,"controlStatus":_vm.controlStatus,"hoEditorFactoryId":_vm.hoEditorFactoryId},on:{"closed":_vm.handleClose}}):_vm._e(),(_vm.controlType === 'express')?_c('ExpressionForm',{attrs:{"hoEditorFactoryId":_vm.hoEditorFactoryId,"vueController":_vm.vueController,"controlStatus":_vm.controlStatus,"controlProperty":_vm.controlProperty},on:{"closed":_vm.handleClose}}):_vm._e(),(_vm.controlType === 'text')?_c('TextDialog',{attrs:{"vueController":_vm.vueController,"controlStatus":_vm.controlStatus,"hoEditorFactoryId":_vm.hoEditorFactoryId},on:{"closed":_vm.handleClose},scopedSlots:_vm._u([{key:"hoTextFieldModal",fn:function(){return [_vm._t("hoTextModal")]},proxy:true}],null,true)}):_vm._e(),(_vm.controlType === 'date')?_c('DateDialog',{attrs:{"vueController":_vm.vueController,"controlStatus":_vm.controlStatus,"hoEditorFactoryId":_vm.hoEditorFactoryId},on:{"closed":_vm.handleClose},scopedSlots:_vm._u([{key:"hoDateFieldModal",fn:function(){return [_vm._t("hoDateModal")]},proxy:true},{key:"hoTextFieldModal",fn:function(){return [_vm._t("hoTextModal")]},proxy:true}],null,true)}):_vm._e(),(_vm.controlType === 'select')?_c('SelectDialog',{attrs:{"hoEditorFactoryId":_vm.hoEditorFactoryId,"vueController":_vm.vueController,"controlStatus":_vm.controlStatus},on:{"closed":_vm.handleClose}}):_vm._e(),(_vm.controlType === 'gestation')?_c('Gestation',{attrs:{"hoEditorFactoryId":_vm.hoEditorFactoryId,"controlStatus":_vm.controlStatus},on:{"closed":_vm.handleClose}}):_vm._e(),(_vm.controlType === 'table')?_c('TableProperty',{attrs:{"hoEditorFactoryId":_vm.hoEditorFactoryId,"vueController":_vm.vueController},on:{"closed":_vm.handleClose}}):_vm._e(),(_vm.controlType === 'table-row')?_c('TableRowProperty',{attrs:{"hoEditorFactoryId":_vm.hoEditorFactoryId,"vueController":_vm.vueController},on:{"closed":_vm.handleClose}}):_vm._e(),(_vm.controlType === 'table-cell')?_c('TableCellProperty',{attrs:{"hoEditorFactoryId":_vm.hoEditorFactoryId,"vueController":_vm.vueController},on:{"closed":_vm.handleClose}}):_vm._e(),(_vm.controlType === 'table-col')?_c('TableColProperty',{attrs:{"hoEditorFactoryId":_vm.hoEditorFactoryId,"vueController":_vm.vueController},on:{"closed":_vm.handleClose}}):_vm._e(),(_vm.isCustoms)?_c('CustomAttributes',{attrs:{"isTableProperty":_vm.isTableProperty},on:{"closed":_vm.handleClose}}):_vm._e(),(_vm.isDataSource)?_c('DataSourceDialog',{on:{"closed":_vm.handleClose}}):_vm._e(),(_vm.isListStyle)?_c('ListSource',{on:{"closed":_vm.handleClose}}):_vm._e(),(_vm.controlType === 'RadioBox' || _vm.controlType === 'CheckBox')?_c('RadioCheckbox',{attrs:{"vueController":_vm.vueController,"controlStatus":_vm.controlStatus,"hoEditorFactoryId":_vm.hoEditorFactoryId,"controlProperty":_vm.controlProperty},on:{"closed":_vm.handleClose}}):_vm._e(),(_vm.controlType === 'waterset')?_c('WaterSetDialog',{attrs:{"vueController":_vm.vueController},on:{"closed":_vm.handleClose}}):_vm._e(),(_vm.controlType === 'comment')?_c('CommentDialog',{attrs:{"vueController":_vm.vueController,"controlStatus":_vm.controlStatus},on:{"insertComments":_vm.insertComments,"closed":_vm.handleClose},scopedSlots:_vm._u([{key:"hoCommentModal",fn:function(){return [_vm._t("hoComment")]},proxy:true}],null,true)}):_vm._e(),(_vm.controlType === 'pageInfoes')?_c('PageInfoes',{attrs:{"vueController":_vm.vueController},on:{"closed":_vm.handleClose}}):_vm._e(),(_vm.controlType === 'delimiter')?_c('Delimiter',{attrs:{"vueController":_vm.vueController},on:{"closed":_vm.handleClose}}):_vm._e(),(_vm.controlType === 'sign')?_c('Sign',{attrs:{"vueController":_vm.vueController,"controlStatus":_vm.controlStatus},on:{"closed":_vm.handleClose}}):_vm._e(),(_vm.controlType === 'upload-image')?_c('UploadImageDialog',{attrs:{"uploadImageParams":_vm.uploadImageParams,"vueController":_vm.vueController,"controlStatus":_vm.controlStatus},on:{"closed":_vm.handleClose}}):_vm._e(),(_vm.controlType === 'edit-image')?_c('CanvasImageDialog',{attrs:{"vueController":_vm.vueController,"hoEditorFactoryId":_vm.hoEditorFactoryId,"controlStatus":_vm.controlStatus},on:{"closed":_vm.handleClose}}):_vm._e()],1)}
225600
- var ControlModalvue_type_template_id_35544190_staticRenderFns = []
225760
+ ;// CONCATENATED MODULE: ./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/ControlModal.vue?vue&type=template&id=36fbe7eb&
225761
+ var ControlModalvue_type_template_id_36fbe7eb_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{ref:"toolModals",staticClass:"control-modal",on:{"mousedown":_vm.toolModalDown}},[(_vm.controlType === 'barcode')?_c('Barcode',{attrs:{"vueController":_vm.vueController,"controlStatus":_vm.controlStatus,"hoEditorFactoryId":_vm.hoEditorFactoryId},on:{"closed":_vm.handleClose}}):_vm._e(),(_vm.controlType === 'qrcode')?_c('QrCode',{attrs:{"vueController":_vm.vueController,"controlStatus":_vm.controlStatus,"hoEditorFactoryId":_vm.hoEditorFactoryId},on:{"closed":_vm.handleClose}}):_vm._e(),(_vm.controlType === 'express')?_c('ExpressionForm',{attrs:{"hoEditorFactoryId":_vm.hoEditorFactoryId,"vueController":_vm.vueController,"controlStatus":_vm.controlStatus,"controlProperty":_vm.controlProperty},on:{"closed":_vm.handleClose}}):_vm._e(),(_vm.controlType === 'text')?_c('TextDialog',{attrs:{"vueController":_vm.vueController,"controlStatus":_vm.controlStatus,"hoEditorFactoryId":_vm.hoEditorFactoryId},on:{"closed":_vm.handleClose},scopedSlots:_vm._u([{key:"hoTextFieldModal",fn:function(){return [_vm._t("hoTextModal")]},proxy:true}],null,true)}):_vm._e(),(_vm.controlType === 'date')?_c('DateDialog',{attrs:{"vueController":_vm.vueController,"controlStatus":_vm.controlStatus,"hoEditorFactoryId":_vm.hoEditorFactoryId},on:{"closed":_vm.handleClose},scopedSlots:_vm._u([{key:"hoDateFieldModal",fn:function(){return [_vm._t("hoDateModal")]},proxy:true},{key:"hoTextFieldModal",fn:function(){return [_vm._t("hoTextModal")]},proxy:true}],null,true)}):_vm._e(),(_vm.controlType === 'select')?_c('SelectDialog',{attrs:{"hoEditorFactoryId":_vm.hoEditorFactoryId,"vueController":_vm.vueController,"controlStatus":_vm.controlStatus},on:{"closed":_vm.handleClose}}):_vm._e(),(_vm.controlType === 'gestation')?_c('Gestation',{attrs:{"hoEditorFactoryId":_vm.hoEditorFactoryId,"controlStatus":_vm.controlStatus},on:{"closed":_vm.handleClose}}):_vm._e(),(_vm.controlType === 'table')?_c('TableProperty',{attrs:{"hoEditorFactoryId":_vm.hoEditorFactoryId,"vueController":_vm.vueController},on:{"closed":_vm.handleClose}}):_vm._e(),(_vm.controlType === 'table-row')?_c('TableRowProperty',{attrs:{"hoEditorFactoryId":_vm.hoEditorFactoryId,"vueController":_vm.vueController},on:{"closed":_vm.handleClose}}):_vm._e(),(_vm.controlType === 'table-cell')?_c('TableCellProperty',{attrs:{"hoEditorFactoryId":_vm.hoEditorFactoryId,"vueController":_vm.vueController},on:{"closed":_vm.handleClose}}):_vm._e(),(_vm.controlType === 'table-col')?_c('TableColProperty',{attrs:{"hoEditorFactoryId":_vm.hoEditorFactoryId,"vueController":_vm.vueController},on:{"closed":_vm.handleClose}}):_vm._e(),(_vm.isCustoms)?_c('CustomAttributes',{attrs:{"isTableProperty":_vm.isTableProperty},on:{"closed":_vm.handleClose}}):_vm._e(),(_vm.isDataSource)?_c('DataSourceDialog',{on:{"closed":_vm.handleClose}}):_vm._e(),(_vm.isListStyle)?_c('ListSource',{on:{"closed":_vm.handleClose}}):_vm._e(),(_vm.controlType === 'RadioBox' || _vm.controlType === 'CheckBox')?_c('RadioCheckbox',{attrs:{"vueController":_vm.vueController,"controlStatus":_vm.controlStatus,"hoEditorFactoryId":_vm.hoEditorFactoryId,"controlProperty":_vm.controlProperty},on:{"closed":_vm.handleClose}}):_vm._e(),(_vm.controlType === 'waterset')?_c('WaterSetDialog',{attrs:{"vueController":_vm.vueController},on:{"closed":_vm.handleClose}}):_vm._e(),(_vm.controlType === 'comment')?_c('CommentDialog',{attrs:{"vueController":_vm.vueController,"controlStatus":_vm.controlStatus},on:{"insertComments":_vm.insertComments,"closed":_vm.handleClose},scopedSlots:_vm._u([{key:"hoCommentModal",fn:function(){return [_vm._t("hoComment")]},proxy:true}],null,true)}):_vm._e(),(_vm.controlType === 'pageInfoes')?_c('PageInfoes',{attrs:{"vueController":_vm.vueController},on:{"closed":_vm.handleClose}}):_vm._e(),(_vm.controlType === 'delimiter')?_c('Delimiter',{attrs:{"vueController":_vm.vueController},on:{"closed":_vm.handleClose}}):_vm._e(),(_vm.controlType === 'sign')?_c('Sign',{attrs:{"vueController":_vm.vueController,"controlStatus":_vm.controlStatus},on:{"closed":_vm.handleClose}}):_vm._e(),(_vm.controlType === 'upload-image')?_c('UploadImageDialog',{attrs:{"uploadImageParams":_vm.uploadImageParams,"vueController":_vm.vueController,"controlStatus":_vm.controlStatus},on:{"closed":_vm.handleClose}}):_vm._e(),(_vm.controlType === 'edit-image')?_c('CanvasImageDialog',{attrs:{"vueController":_vm.vueController,"hoEditorFactoryId":_vm.hoEditorFactoryId,"controlStatus":_vm.controlStatus},on:{"closed":_vm.handleClose}}):_vm._e(),(_vm.controlType === 'paragraph')?_c('ParagraphDialog',{attrs:{"vueController":_vm.vueController,"controlProperty":_vm.controlProperty,"controlStatus":_vm.controlStatus,"hoEditorFactoryId":_vm.hoEditorFactoryId},on:{"closed":_vm.handleClose},scopedSlots:_vm._u([{key:"hoParagraph",fn:function(){return [_vm._t("hoParagraphModal")]},proxy:true}],null,true)}):_vm._e()],1)}
225762
+ var ControlModalvue_type_template_id_36fbe7eb_staticRenderFns = []
225601
225763
 
225602
225764
 
225603
225765
  ;// CONCATENATED MODULE: ./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/selectDialog/SelectDialog.vue?vue&type=template&id=3b6d4c1e&scoped=true&
@@ -229741,6 +229903,104 @@ var CanvasImageDialog_component = normalizeComponent(
229741
229903
 
229742
229904
 
229743
229905
 
229906
+ ;// CONCATENATED MODULE: ./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/paragraph/ParagraphDialog.vue?vue&type=template&id=461dae42&
229907
+ var ParagraphDialogvue_type_template_id_461dae42_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{class:_vm.animationClassNames},[_c('header',{staticClass:"modal-title"},[_c('span',[_vm._v("段落属性设置")]),_c('i',{staticClass:"el-icon-close modal-title-close",on:{"click":_vm.handleClose}})]),_c('section',{staticClass:"modal-content"},[_c('ul',{staticClass:"control-list"},[_vm._t("hoParagraph")],2)]),_c('footer',{staticClass:"ho-modal-footer"},[_c('el-button',{attrs:{"size":"small","type":"primary"},on:{"click":_vm.sure}},[_vm._v("确定")]),_c('el-button',{staticStyle:{"margin-left":"30px"},attrs:{"size":"small"},on:{"click":_vm.handleClose}},[_vm._v("取消")])],1)])}
229908
+ var ParagraphDialogvue_type_template_id_461dae42_staticRenderFns = []
229909
+
229910
+
229911
+ ;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40[0].rules[0].use[0]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/paragraph/ParagraphDialog.vue?vue&type=script&lang=js&
229912
+ //
229913
+ //
229914
+ //
229915
+ //
229916
+ //
229917
+ //
229918
+ //
229919
+ //
229920
+ //
229921
+ //
229922
+ //
229923
+ //
229924
+ //
229925
+ //
229926
+ //
229927
+ //
229928
+ //
229929
+ //
229930
+ //
229931
+
229932
+ /* harmony default export */ var ParagraphDialogvue_type_script_lang_js_ = ({
229933
+ name: 'ParagraphDialog',
229934
+ props: {
229935
+ hoEditorFactoryId: {
229936
+ type: String,
229937
+ required: true
229938
+ },
229939
+ controlStatus: {
229940
+ type: String,
229941
+ required: true
229942
+ },
229943
+ controlProperty: {
229944
+ type: Object,
229945
+ required: true
229946
+ }
229947
+ },
229948
+ inject: ['getParagraphCustomProperty'],
229949
+ data: function data() {
229950
+ return {
229951
+ textActiveName: 'first',
229952
+ animationClassNames: 'control-modal-contents paragraph-modal animation-in'
229953
+ };
229954
+ },
229955
+ computed: {
229956
+ domRange: function domRange() {
229957
+ return this.controlProperty.domRange;
229958
+ }
229959
+ },
229960
+ methods: {
229961
+ sure: function sure() {
229962
+ var _hoEditorFactory$vueC;
229963
+
229964
+ var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this.hoEditorFactoryId);
229965
+ var node = (_hoEditorFactory$vueC = hoEditorFactory.vueController.findNodebyPath(this.domRange.endPath)) === null || _hoEditorFactory$vueC === void 0 ? void 0 : _hoEditorFactory$vueC.node;
229966
+ var paragraphNode = hoEditorFactory.drawTree.getDrawLineByDNode(node.drawNodes[0]).paragraphNode;
229967
+ paragraphNode.setCustomProperty(this.getParagraphCustomProperty());
229968
+ this.handleClose();
229969
+ },
229970
+ handleClose: function handleClose() {
229971
+ this.animationClassNames = 'control-modal-contents paragraph-modal animation-out';
229972
+ this.$emit('closed');
229973
+ }
229974
+ }
229975
+ });
229976
+ ;// CONCATENATED MODULE: ./src/components/controls/paragraph/ParagraphDialog.vue?vue&type=script&lang=js&
229977
+ /* harmony default export */ var paragraph_ParagraphDialogvue_type_script_lang_js_ = (ParagraphDialogvue_type_script_lang_js_);
229978
+ ;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-22[0].rules[0].use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22[0].rules[0].use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22[0].rules[0].use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22[0].rules[0].use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/paragraph/ParagraphDialog.vue?vue&type=style&index=0&lang=scss&
229979
+ // extracted by mini-css-extract-plugin
229980
+
229981
+ ;// CONCATENATED MODULE: ./src/components/controls/paragraph/ParagraphDialog.vue?vue&type=style&index=0&lang=scss&
229982
+
229983
+ ;// CONCATENATED MODULE: ./src/components/controls/paragraph/ParagraphDialog.vue
229984
+
229985
+
229986
+
229987
+ ;
229988
+
229989
+
229990
+ /* normalize component */
229991
+
229992
+ var ParagraphDialog_component = normalizeComponent(
229993
+ paragraph_ParagraphDialogvue_type_script_lang_js_,
229994
+ ParagraphDialogvue_type_template_id_461dae42_render,
229995
+ ParagraphDialogvue_type_template_id_461dae42_staticRenderFns,
229996
+ false,
229997
+ null,
229998
+ null,
229999
+ null
230000
+
230001
+ )
230002
+
230003
+ /* harmony default export */ var ParagraphDialog = (ParagraphDialog_component.exports);
229744
230004
  ;// CONCATENATED MODULE: ./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/watermark/WaterSet.vue?vue&type=template&id=58b59c58&
229745
230005
  var WaterSetvue_type_template_id_58b59c58_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"control-modal-contents water-set animation-in"},[_c('header',{staticClass:"modal-title"},[_c('span',[_vm._v("水印")]),_c('i',{staticClass:"el-icon-close modal-title-close",on:{"click":_vm.handleClose}})]),_c('section',{staticClass:"modal-content"},[_c('ul',{staticClass:"control-list"},[_c('li',{staticClass:"control-item"},[_c('span',{staticClass:"label",staticStyle:{"width":"50px"}},[_vm._v("内容")]),_c('el-input',{attrs:{"type":"text","size":"mini","clearable":"","placeholder":"文本内容","maxlength":"20","show-word-limit":""},on:{"input":_vm.codeChange},model:{value:(_vm.textContent),callback:function ($$v) {_vm.textContent=$$v},expression:"textContent"}})],1),_c('li',{staticClass:"control-item"},[_c('span',{staticClass:"label",staticStyle:{"width":"50px"}},[_vm._v("角度")]),_c('el-radio-group',{attrs:{"size":"mini"},on:{"change":_vm.codeChange},model:{value:(_vm.rotate),callback:function ($$v) {_vm.rotate=$$v},expression:"rotate"}},[_c('el-radio-button',{attrs:{"label":0}},[_vm._v("水平")]),_c('el-radio-button',{attrs:{"label":1}},[_vm._v("倾斜")])],1)],1),_c('li',{staticClass:"control-item"},[_c('span',{staticClass:"label",staticStyle:{"width":"50px"}},[_vm._v("颜色")]),_c('el-color-picker',{attrs:{"show-alpha":""},on:{"change":_vm.codeChange},model:{value:(_vm.color),callback:function ($$v) {_vm.color=$$v},expression:"color"}})],1)]),_c('div',{staticClass:"section-right"},[_c('fieldset',{staticClass:"fieldset"},[_c('legend',[_vm._v("预 览")]),_c('div',{attrs:{"id":"water"}},[_c('img',{directives:[{name:"show",rawName:"v-show",value:(_vm.waterUrl),expression:"waterUrl"}],attrs:{"src":_vm.waterUrl,"alt":"背景水印"}})])])])]),_c('footer',{staticClass:"ho-modal-footer"},[_c('el-button',{attrs:{"size":"small","type":"primary"},on:{"click":_vm.sure}},[_vm._v("确定")]),_c('el-button',{staticStyle:{"margin-left":"30px"},attrs:{"size":"small"},on:{"click":_vm.handleClose}},[_vm._v("取消")])],1)])}
229746
230006
  var WaterSetvue_type_template_id_58b59c58_staticRenderFns = []
@@ -231416,6 +231676,7 @@ var TableCellProperty_component = normalizeComponent(
231416
231676
 
231417
231677
 
231418
231678
 
231679
+
231419
231680
 
231420
231681
 
231421
231682
  var ControlModal = /*#__PURE__*/function (_Mixins) {
@@ -231526,7 +231787,8 @@ ControlModal = __decorate([vue_class_component_esm({
231526
231787
  PageInfoes: pageInfoes,
231527
231788
  Delimiter: delimiter,
231528
231789
  UploadImageDialog: upload_UploadImageDialog,
231529
- CanvasImageDialog: CanvasImageDialog
231790
+ CanvasImageDialog: CanvasImageDialog,
231791
+ ParagraphDialog: ParagraphDialog
231530
231792
  }
231531
231793
  })], ControlModal);
231532
231794
  /* harmony default export */ var ControlModalvue_type_script_lang_ts_ = (ControlModal);
@@ -231542,8 +231804,8 @@ ControlModal = __decorate([vue_class_component_esm({
231542
231804
  ;
231543
231805
  var ControlModal_component = normalizeComponent(
231544
231806
  controls_ControlModalvue_type_script_lang_ts_,
231545
- ControlModalvue_type_template_id_35544190_render,
231546
- ControlModalvue_type_template_id_35544190_staticRenderFns,
231807
+ ControlModalvue_type_template_id_36fbe7eb_render,
231808
+ ControlModalvue_type_template_id_36fbe7eb_staticRenderFns,
231547
231809
  false,
231548
231810
  null,
231549
231811
  null,
@@ -232667,12 +232929,6 @@ var json_font_namespaceObject = JSON.parse('{"TN":[{"ch":"宋体","en":"SimSun",
232667
232929
 
232668
232930
 
232669
232931
 
232670
-
232671
-
232672
-
232673
-
232674
-
232675
-
232676
232932
 
232677
232933
 
232678
232934
 
@@ -232799,6 +233055,11 @@ var HoDocs = /*#__PURE__*/function (_Mixins) {
232799
233055
  value: function getCustomProperty() {
232800
233056
  return this.customProperty;
232801
233057
  }
233058
+ }, {
233059
+ key: "getParagraphCustomProperty",
233060
+ value: function getParagraphCustomProperty() {
233061
+ return this.paragraphCustomProperty;
233062
+ }
232802
233063
  }, {
232803
233064
  key: "textStyleChange",
232804
233065
  value: function textStyleChange(val) {
@@ -232816,7 +233077,7 @@ var HoDocs = /*#__PURE__*/function (_Mixins) {
232816
233077
  }, {
232817
233078
  key: "controlTypeChange",
232818
233079
  value: function controlTypeChange(newValue, oldValue) {
232819
- if (newValue === '' && ['text', 'date', 'comment'].includes(oldValue)) {
233080
+ if (newValue === '' && ['text', 'date', 'comment', 'paragraph'].includes(oldValue)) {
232820
233081
  this.$emit('closeTextModal');
232821
233082
  this.customPropertyValue = {};
232822
233083
  }
@@ -232998,16 +233259,17 @@ var HoDocs = /*#__PURE__*/function (_Mixins) {
232998
233259
  var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this.activeDocId);
232999
233260
  nodeInfoes.rightTypeIsTable = hoEditorFactory.docTree.curDomRange.normalize().inSameTable()[0];
233000
233261
  nodeInfoes.rightPosition = rightPosition;
233262
+ var node = nodeInfoes.node();
233001
233263
 
233002
- var getLabelNode = function getLabelNode() {
233264
+ nodeInfoes.labelNode = function () {
233003
233265
  var labelNode = [];
233004
233266
  var isIncludes = '';
233005
233267
  var hoEditor = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(_this4.activeDocId);
233006
233268
  var currentDomRange = hoEditor.vueController.getDomRange();
233007
233269
 
233008
233270
  if (currentDomRange !== null && currentDomRange !== void 0 && currentDomRange.isEmpty) {
233009
- if (nodeInfoes.node() instanceof LabelNode/* LabelNode */.P) {
233010
- labelNode.push(nodeInfoes.node());
233271
+ if (node instanceof LabelNode/* LabelNode */.P) {
233272
+ labelNode.push(node);
233011
233273
  isIncludes = 'toText';
233012
233274
  }
233013
233275
  } else {
@@ -233030,16 +233292,20 @@ var HoDocs = /*#__PURE__*/function (_Mixins) {
233030
233292
  labelNode: [].concat(labelNode),
233031
233293
  isIncludes: isIncludes
233032
233294
  };
233033
- };
233295
+ }; // 是否是元素类型;
233034
233296
 
233035
- nodeInfoes.labelNode = getLabelNode; // 是否是元素类型;
233036
233297
 
233037
233298
  nodeInfoes.isElement = false;
233038
- nodeInfoes.canShowComment = hoEditorFactory.drawTree.paintStatus === DrawTree/* PaintState.psEdit */.Dh.psEdit || hoEditorFactory.drawTree.paintStatus === DrawTree/* PaintState.psReview */.Dh.psReview || hoEditorFactory.drawTree.paintStatus === DrawTree/* PaintState.psReadOnly */.Dh.psReadOnly;
233039
-
233040
- if (nodeInfoes.node instanceof TextInputFieldNode/* TextInputFieldNode */.re || nodeInfoes.node instanceof DateTimeNode/* DateTimeNode */.Z || nodeInfoes.node instanceof DownListNode/* DownListNode */.yF || nodeInfoes.node instanceof RadioAndCheckBoxNode/* RadioAndCheckBoxNode */.Yh || nodeInfoes.node instanceof MarkNode/* MarkNode */.j || nodeInfoes.node instanceof TextNode/* TextNode */.R && nodeInfoes.node.parentNode instanceof TextInputFieldNode/* TextInputFieldNode */.re) {
233041
- nodeInfoes.isElement = true;
233042
- }
233299
+ nodeInfoes.canShowComment = hoEditorFactory.drawTree.paintStatus === DrawTree/* PaintState.psEdit */.Dh.psEdit || hoEditorFactory.drawTree.paintStatus === DrawTree/* PaintState.psReview */.Dh.psReview || hoEditorFactory.drawTree.paintStatus === DrawTree/* PaintState.psReadOnly */.Dh.psReadOnly; // if (
233300
+ // node instanceof TextInputFieldNode ||
233301
+ // node instanceof DateTimeNode ||
233302
+ // node instanceof DownListNode ||
233303
+ // node instanceof RadioAndCheckBoxNode ||
233304
+ // node instanceof MarkNode ||
233305
+ // (node instanceof TextNode && node.parentNode instanceof TextInputFieldNode)
233306
+ // ) {
233307
+ // nodeInfoes.isElement = true;
233308
+ // }
233043
233309
 
233044
233310
  nodeInfoes.isHideComments = hoEditorFactory.isHideComments;
233045
233311
  nodeInfoes.activePageIndex = this.activePageIndex;
@@ -233058,6 +233324,18 @@ var HoDocs = /*#__PURE__*/function (_Mixins) {
233058
233324
  };
233059
233325
  }
233060
233326
 
233327
+ nodeInfoes.getParagraphNode = function () {
233328
+ var _hoEditorFactory$vueC;
233329
+
233330
+ var node = (_hoEditorFactory$vueC = hoEditorFactory.vueController.findNodebyPath(_this4.domRange.endPath)) === null || _hoEditorFactory$vueC === void 0 ? void 0 : _hoEditorFactory$vueC.node;
233331
+
233332
+ if (node) {
233333
+ return hoEditorFactory.drawTree.getDrawLineByDNode(node.drawNodes[0]).paragraphNode;
233334
+ }
233335
+
233336
+ return null;
233337
+ };
233338
+
233061
233339
  this.$emit('rightClickEvent', nodeInfoes);
233062
233340
  }
233063
233341
  /**
@@ -233293,6 +233571,8 @@ __decorate([Prop()], HoDocs.prototype, "uploadImageParams", void 0);
233293
233571
 
233294
233572
  __decorate([Prop()], HoDocs.prototype, "customProperty", void 0);
233295
233573
 
233574
+ __decorate([Prop()], HoDocs.prototype, "paragraphCustomProperty", void 0);
233575
+
233296
233576
  __decorate([Prop()], HoDocs.prototype, "deleteImageNodeList", void 0);
233297
233577
 
233298
233578
  __decorate([Prop()], HoDocs.prototype, "pageProperty", void 0);
@@ -233339,6 +233619,8 @@ __decorate([Watch('editJson')], HoDocs.prototype, "editJsonChange", null);
233339
233619
 
233340
233620
  __decorate([Provide()], HoDocs.prototype, "getCustomProperty", null);
233341
233621
 
233622
+ __decorate([Provide()], HoDocs.prototype, "getParagraphCustomProperty", null);
233623
+
233342
233624
  __decorate([Watch('textStyle', {
233343
233625
  deep: true
233344
233626
  })], HoDocs.prototype, "textStyleChange", null);