hoeditor-web 2.0.60 → 2.0.63

package/lib/hoeditor.common.js

@@ -11622,7 +11622,7 @@ var Print = /*#__PURE__*/function () {
 
                 if (index === hoEditorFactory.startPageNum && positionY) {
                   dShape = new createjs.Shape();
-                  dShape.graphics.beginFill('#fff').rect(0, 0, width, positionY).endFill();
+                  dShape.graphics.beginFill('#FFFFFF').rect(0, 0, width, positionY).endFill();
                   cpage.drawDocContainer.addChild(dShape);
                   cpage.drawFooter.alpha = 0; // 上一页还有空余时续打起始页隐藏页脚
                 } // 光标处续打
@@ -11635,7 +11635,7 @@ var Print = /*#__PURE__*/function () {
                   if (index === posIndex && posY) {
                     _dShape = new createjs.Shape();
 
-                    _dShape.graphics.beginFill('#fff').rect(0, 0, width, posY).endFill();
+                    _dShape.graphics.beginFill('#FFFFFF').rect(0, 0, width, posY).endFill();
 
                     cpage.drawDocContainer.addChild(_dShape);
                     cpage.drawFooter.alpha = 0;
@@ -11812,7 +11812,7 @@ var Print = /*#__PURE__*/function () {
                     return link.remove();
                   }, 100);
                 } else {
-                  if (height <= 560 && hoEditorFactory.isFixedPrintToA4 !== '2') {
+                  if (height <= 560 && hoEditorFactory.isFixedPrintToA4 === '') {
                     PDF === null || PDF === void 0 ? void 0 : PDF.deletePage(1);
                   }
 
@@ -44721,12 +44721,13 @@ var DrawArea = /*#__PURE__*/function (_DrawRect) {
       var container = new createjs.Container();
       container.x = docWidth + 15;
       container.y = commentY - comment.lineHeight / 2;
-      container.name = comment.id;
+      container.name = "record" + comment.id;
       var commentTextShape = null; // 批注内容
 
       var commentArr = comment.commentTextWarp(commentWidth, comment.text);
-      var text = commentArr[0];
-      var textLen = commentArr[1] > 1 ? commentArr[1] - 1 : commentArr[1];
+      var text = commentArr[0]; //const textLen = (commentArr[1] as number) > 1 ? (commentArr[1] as number) - 1 : (commentArr[1] as number);
+
+      var textLen = commentArr[1];
       comment.lineHeight = 20 * textLen + 10;
       commentTextShape = new createjs.Text(text, "12px 微软雅黑", "#666");
       commentTextShape.lineWidth = commentWidth - 25;
@@ -44745,12 +44746,12 @@ var DrawArea = /*#__PURE__*/function (_DrawRect) {
 
       var horizontalLine = new createjs.Shape();
       horizontalLine.graphics.setStrokeDash([4, 1], 0).setStrokeStyle(1).beginStroke("rgba(255, 0, 0, 1)").moveTo(nodeX, nodeY).lineTo(docWidth, nodeY);
-      horizontalLine.name = comment.id;
+      horizontalLine.name = "record" + comment.id;
       horizontalLine.alpha = 1; //指向线
 
       var guideLine = new createjs.Shape();
       guideLine.graphics.setStrokeDash([4, 1], 0).setStrokeStyle(1).beginStroke("rgba(255, 0, 0, 1)").moveTo(docWidth, nodeY).lineTo(docWidth + 15, commentY - comment.lineHeight / 4);
-      guideLine.name = comment.id;
+      guideLine.name = "record" + comment.id;
       guideLine.alpha = 1;
       container.addChild(backShape);
       container.addChild(commentTextShape);
@@ -46220,7 +46221,14 @@ var DrawCombineNode = /*#__PURE__*/function (_DrawContainer) {
                 _this2.on('mouseout', function (e) {
                   hoEditorFactory.nodeMouseMove.setNode(_this2.node, _editor_events_DmouseEvent__WEBPACK_IMPORTED_MODULE_6__/* .DmouseEventType.detOut */ .p.detOut);
                 });
-              }
+              } // if(this.node && this.node.drawNodes && this.node.drawNodes[0]) {
+              //     const paragraphNode = hoEditorFactory.drawTree.getDrawLineByDNode(this._node.drawNodes[0])?.paragraphNode;
+              //     const customProperty = paragraphNode && paragraphNode.customProperty;
+              //     if(['男', '女'].includes(customProperty.sex) || (customProperty.age && customProperty.age.select == '隐藏')) {
+              //         console.log({...paragraphNode.customProperty})
+              //     }
+              // }
+
 
               _this2.on('click', function (e) {
                 if (e.nativeEvent.button === 0) {
@@ -51274,9 +51282,9 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
     _this = _super.call(this, hoeditfactoryID, rootPath, node, 0);
     _this._number = 0;
     _this._type = 0;
-    _this._signName = "";
-    _this._imgSrc = "";
-    _this._fingerPrintSrc = "";
+    _this._signName = '';
+    _this._imgSrc = '';
+    _this._fingerPrintSrc = '';
     _this._fingerPosition = 0;
     _this._number = number;
     _this._imgSrc = imgSrc;
@@ -51290,7 +51298,7 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
     _this._textStyle = cbStyle.getStyleKey();
 
     if (_this.number > 0 && type === 2) {
-      var signArr = imgSrc.split("\n");
+      var signArr = imgSrc.split('\n');
 
       if (signArr.length > 1) {
         _this.dHeight = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_7__/* .HOEditorFactorys.instance */ .b.instance().getFactory(hoeditfactoryID).signHeight * signArr.length; // const textStyle = new TextStyle(hoeditfactoryID);
@@ -51309,10 +51317,10 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
     } //this._drawText = new DrawSimpleText('/', cbStyle.getStyleKey(), "#000000");
 
 
-    _this._drawText = new createjs.Text(node.connectMode, _this._textStyle, "#000000");
+    _this._drawText = new createjs.Text(node.connectMode, _this._textStyle, '#000000');
 
     if (_this.number === 0) {
-      var dText = new createjs.Text(_this.signName, _this._textStyle, "#000000");
+      var dText = new createjs.Text(_this.signName, _this._textStyle, '#000000');
       _this.dWidth = dText.getMeasuredWidth();
     } else {
       if (type === 1) {
@@ -51326,14 +51334,14 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
       }
 
       if (type === 2) {
-        var _signArr = imgSrc.split("\n");
+        var _signArr = imgSrc.split('\n');
 
-        var aText = new createjs.Text(_signArr[0], _this._textStyle, "#000000");
+        var aText = new createjs.Text(_signArr[0], _this._textStyle, '#000000');
         var maxWidth = aText.getMeasuredWidth();
 
         if (_signArr.length > 1) {
           for (var i = 1; i < _signArr.length; i++) {
-            aText = new createjs.Text(_signArr[i], _this._textStyle, "#000000");
+            aText = new createjs.Text(_signArr[i], _this._textStyle, '#000000');
             var aWidth = aText.getMeasuredWidth();
 
             if (aWidth > maxWidth) {
@@ -51348,7 +51356,7 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
           _this.dWidth = maxWidth;
         } else {
           //this.dWidth = dText.getMeasuredWidth() + this._drawText.getMeasuredWidth();
-          if (node.connectMode === "换行") {
+          if (node.connectMode === '换行') {
             _this.dWidth = maxWidth;
           } else {
             _this.dWidth = maxWidth + _this._drawText.getMeasuredWidth();
@@ -51357,7 +51365,7 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
       }
     }
 
-    if (imgWidth == 0 && imgHeight == 0 && imgSrc && type == 1 || type == 3) {
+    if (imgWidth == 0 && imgHeight == 0 && (imgSrc || fingerPrintSrc) && type == 1 || type == 3) {
       _this.drawWriteSignNode(node);
     } else {
       _this.drawSignNode();
@@ -51443,108 +51451,139 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
 
       this.clear();
       var drawNode = this;
-      var isFront = node.isFront;
       var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_7__/* .HOEditorFactorys.instance */ .b.instance().getFactory(drawNode.node.hoEditorFactoryID);
 
       var drawSign = function drawSign() {
         if (_this2.type === 1 || _this2.type === 3) {
-          var image = new Image();
-          image.src = _this2.imgSrc;
           var currentLineHeight = hoEditorFactory.drawTree.caret.height;
-          var bitmap = new createjs.Bitmap(image);
-          bitmap.y = 0;
-          bitmap.x = 0;
-
-          if (node.imgWidth) {
-            _this2._dWidth = node.imgWidth;
-          }
-
-          drawNode.addChildAt(bitmap, 0);
-          var fingerImage = new Image();
-          var fingerBitmap;
-
-          if (drawNode.fingerPrintSrc !== "") {
+          node.type = 3;
+
+          if (_this2.imgSrc == '' && _this2.fingerPrintSrc) {
+            var fingerscale = drawNode.fingerPosition == _editor_dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_5__/* .FingerPosition.center */ .d.center ? 0.3 : 0.15;
+            var fingerWidth = 256;
+            _this2._dWidth = fingerWidth * fingerscale;
+            node.imgWidth = _this2._dWidth;
+            var fingerImage = new Image();
+            var fingerBitmap;
             fingerImage.src = _this2.fingerPrintSrc;
             fingerBitmap = new createjs.Bitmap(fingerImage);
-            drawNode.addChildAt(fingerBitmap, 1);
+            drawNode.addChildAt(fingerBitmap, 0);
             hoEditorFactory.loadImageCount++;
 
             fingerImage.onerror = function () {
               return hoEditorFactory.loadImageCount--;
             };
-          }
 
-          hoEditorFactory.loadImageCount++;
+            fingerImage.onload = function () {
+              var fingerHeight = fingerImage.naturalHeight !== 0 ? fingerImage.naturalHeight : fingerImage.height;
+              fingerBitmap.y = -fingerHeight * fingerscale;
+              fingerBitmap.x = 0;
+              node.imgHeight = fingerHeight * fingerscale;
+              _this2._dHeight = node.imgHeight;
+              node.type = 3;
+              fingerBitmap.setTransform(fingerBitmap.x, fingerBitmap.y, fingerscale, fingerscale);
+              updateSign();
+            };
+          } else {
+            var image = new Image();
+            image.src = _this2.imgSrc;
+            var bitmap = new createjs.Bitmap(image);
+            bitmap.y = 0;
+            bitmap.x = 0;
 
-          image.onerror = function () {
-            return hoEditorFactory.loadImageCount--;
-          };
+            if (node.imgWidth) {
+              _this2._dWidth = node.imgWidth;
+            }
 
-          image.onload = function () {
-            var hitWidth = image.naturalWidth !== 0 ? image.naturalWidth : image.width;
-            var hitHeight = image.naturalHeight !== 0 ? image.naturalHeight : image.height;
-            var scale = hoEditorFactory.signHeight / hitHeight < 0.4 ? 0.4 : hoEditorFactory.signHeight / hitHeight > 0.7 ? 1 : hoEditorFactory.signHeight / hitHeight;
-
-            if (drawNode.fingerPosition == _editor_dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_5__/* .FingerPosition.center */ .d.center && hoEditorFactory.signHeight / hitHeight < 0.2) {
-              scale = hoEditorFactory.signHeight * 1.5 / hitHeight;
-            }
-
-            _this2._dWidth = hitWidth * scale;
-
-            if (drawNode.fingerPrintSrc !== "") {
-              fingerImage.onload = function () {
-                var fingerWidth = 256;
-                var fingerHeight = fingerImage.naturalHeight !== 0 ? fingerImage.naturalHeight : fingerImage.height;
-                var fingerscale = drawNode.fingerPosition == _editor_dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_5__/* .FingerPosition.center */ .d.center ? 0.3 : 0.15;
-                fingerBitmap.scaleX = fingerscale;
-                fingerBitmap.scaleY = fingerscale;
-                fingerBitmap.y = -fingerHeight * fingerscale;
-                bitmap.y = -hitHeight * scale;
-
-                if (drawNode.fingerPosition == _editor_dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_5__/* .FingerPosition.left */ .d.left) {
-                  bitmap.x = fingerWidth * fingerscale + 5;
-                  fingerBitmap.x = 0;
-                  _this2._dWidth = hitWidth * scale + 5 + fingerWidth * fingerscale;
-                  node.imgHeight = Math.floor(Math.max(fingerHeight * fingerscale, hitHeight * scale));
-                  _this2._dHeight = node.imgHeight;
-                } else if (drawNode.fingerPosition == _editor_dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_5__/* .FingerPosition.center */ .d.center) {
-                  fingerBitmap.x = (hitWidth * scale - fingerWidth * fingerscale) / 2;
-                  fingerBitmap.y = -(fingerHeight * fingerscale + currentLineHeight) / 2;
-                  bitmap.y = -(hitHeight * scale + currentLineHeight) / 2;
-                  node.imgHeight = hoEditorFactory.signHeight;
-                } else if (drawNode.fingerPosition == _editor_dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_5__/* .FingerPosition.right */ .d.right) {
-                  fingerBitmap.x = hitWidth * scale + 5;
-                  _this2._dWidth = hitWidth * scale + 5 + fingerWidth * fingerscale;
-                  node.imgHeight = Math.floor(Math.max(fingerHeight * fingerscale, hitHeight * scale));
-                  _this2._dHeight = node.imgHeight;
-                }
+            drawNode.addChildAt(bitmap, 0);
 
-                node.imgWidth = _this2._dWidth;
-                node.type = 3;
+            var _fingerImage = new Image();
 
-                if (drawNode.fingerPosition == _editor_dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_5__/* .FingerPosition.center */ .d.center) {
-                  _this2._dWidth = 0;
-                  _this2._dHeight = 0;
-                }
+            var _fingerBitmap;
 
-                bitmap.setTransform(bitmap.x, bitmap.y, scale, scale);
-                fingerBitmap.setTransform(fingerBitmap.x, fingerBitmap.y, fingerscale, fingerscale);
-                var hitArea = new createjs.Shape();
-                hitArea.graphics.beginFill("#000").drawRect(fingerBitmap.x, 0, fingerWidth * fingerscale, fingerHeight * fingerscale); //这里是图片大小
+            if (drawNode.fingerPrintSrc !== '') {
+              _fingerImage.src = _this2.fingerPrintSrc;
+              _fingerBitmap = new createjs.Bitmap(_fingerImage);
+              drawNode.addChildAt(_fingerBitmap, 1);
+              hoEditorFactory.loadImageCount++;
 
-                bitmap.hitArea = hitArea;
-                fingerBitmap.hitArea = hitArea;
-                updateSign();
+              _fingerImage.onerror = function () {
+                return hoEditorFactory.loadImageCount--;
               };
-            } else {
-              _this2._dWidth = hitWidth * scale;
-              node.imgWidth = _this2._dWidth;
-              node.imgHeight = hoEditorFactory.signHeight;
-              node.type = 3;
-              bitmap.setTransform(0, -(hitHeight * scale + currentLineHeight) / 2, scale, scale);
-              updateSign();
             }
-          };
+
+            hoEditorFactory.loadImageCount++;
+
+            image.onerror = function () {
+              return hoEditorFactory.loadImageCount--;
+            };
+
+            image.onload = function () {
+              var hitWidth = image.naturalWidth !== 0 ? image.naturalWidth : image.width;
+              var hitHeight = image.naturalHeight !== 0 ? image.naturalHeight : image.height;
+              var scale = hoEditorFactory.signHeight / hitHeight < 0.4 ? 0.4 : hoEditorFactory.signHeight / hitHeight > 0.7 ? 1 : hoEditorFactory.signHeight / hitHeight;
+
+              if (drawNode.fingerPosition == _editor_dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_5__/* .FingerPosition.center */ .d.center && hoEditorFactory.signHeight / hitHeight < 0.2) {
+                scale = hoEditorFactory.signHeight * 1.5 / hitHeight;
+              }
+
+              _this2._dWidth = hitWidth * scale;
+
+              if (drawNode.fingerPrintSrc !== '') {
+                _fingerImage.onload = function () {
+                  var fingerWidth = 256;
+                  var fingerHeight = _fingerImage.naturalHeight !== 0 ? _fingerImage.naturalHeight : _fingerImage.height;
+                  var fingerscale = drawNode.fingerPosition == _editor_dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_5__/* .FingerPosition.center */ .d.center ? 0.3 : 0.15;
+                  _fingerBitmap.scaleX = fingerscale;
+                  _fingerBitmap.scaleY = fingerscale;
+                  _fingerBitmap.y = -fingerHeight * fingerscale;
+                  bitmap.y = -hitHeight * scale;
+
+                  if (drawNode.fingerPosition == _editor_dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_5__/* .FingerPosition.left */ .d.left) {
+                    bitmap.x = fingerWidth * fingerscale + 5;
+                    _fingerBitmap.x = 0;
+                    _this2._dWidth = hitWidth * scale + 5 + fingerWidth * fingerscale;
+                    node.imgHeight = Math.floor(Math.max(fingerHeight * fingerscale, hitHeight * scale));
+                    _this2._dHeight = node.imgHeight;
+                  } else if (drawNode.fingerPosition == _editor_dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_5__/* .FingerPosition.center */ .d.center) {
+                    _fingerBitmap.x = (hitWidth * scale - fingerWidth * fingerscale) / 2;
+                    _fingerBitmap.y = -(fingerHeight * fingerscale + currentLineHeight) / 2;
+                    bitmap.y = -(hitHeight * scale + currentLineHeight) / 2;
+                    node.imgHeight = hoEditorFactory.signHeight;
+                  } else if (drawNode.fingerPosition == _editor_dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_5__/* .FingerPosition.right */ .d.right) {
+                    _fingerBitmap.x = hitWidth * scale + 5;
+                    _this2._dWidth = hitWidth * scale + 5 + fingerWidth * fingerscale;
+                    node.imgHeight = Math.floor(Math.max(fingerHeight * fingerscale, hitHeight * scale));
+                    _this2._dHeight = node.imgHeight;
+                  }
+
+                  node.imgWidth = _this2._dWidth;
+
+                  if (drawNode.fingerPosition == _editor_dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_5__/* .FingerPosition.center */ .d.center) {
+                    _this2._dWidth = 0;
+                    _this2._dHeight = 0;
+                  }
+
+                  bitmap.setTransform(bitmap.x, bitmap.y, scale, scale);
+
+                  _fingerBitmap.setTransform(_fingerBitmap.x, _fingerBitmap.y, fingerscale, fingerscale);
+
+                  var hitArea = new createjs.Shape();
+                  hitArea.graphics.beginFill('#000000').drawRect(_fingerBitmap.x, 0, fingerWidth * fingerscale, fingerHeight * fingerscale); //这里是图片大小
+
+                  bitmap.hitArea = hitArea;
+                  _fingerBitmap.hitArea = hitArea;
+                  updateSign();
+                };
+              } else {
+                _this2._dWidth = hitWidth * scale;
+                node.imgWidth = _this2._dWidth;
+                node.imgHeight = hoEditorFactory.signHeight;
+                bitmap.setTransform(0, -(hitHeight * scale + currentLineHeight) / 2, scale, scale);
+                updateSign();
+              }
+            };
+          }
         }
       };
 
@@ -51563,12 +51602,14 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
           } // hoEditorFactory.drawTree.updateDrawTreeFirstLine();
 
 
-          hoEditorFactory.drawTree.rebuildArea("main", false);
+          hoEditorFactory.drawTree.rebuildArea('main', false);
         }
 
-        hoEditorFactory.loadImageCount--;
+        if (drawNode.imgSrc) {
+          hoEditorFactory.loadImageCount--;
+        }
 
-        if (drawNode.fingerPrintSrc !== "") {
+        if (drawNode.fingerPrintSrc) {
           hoEditorFactory.loadImageCount--;
         }
       };
@@ -51617,19 +51658,19 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
 
             bitmap.setTransform(0, -hoEditorFactory.signHeight, width / hitWidth, drawNode.dHeight / hitHeight);
             var hitArea = new createjs.Shape();
-            hitArea.graphics.beginFill("#000").drawRect(0, 0, drawNode.dWidth, drawNode.dHeight); //这里是图片大小
+            hitArea.graphics.beginFill('#000').drawRect(0, 0, drawNode.dWidth, drawNode.dHeight); //这里是图片大小
 
             bitmap.hitArea = hitArea;
 
-            if (_this3.imgSrc.indexOf("data:image/") != -1 && _this3.imgSrc.indexOf("data:image/png") == -1) {
-              var canvas = document.createElement("canvas");
+            if (_this3.imgSrc.indexOf('data:image/') != -1 && _this3.imgSrc.indexOf('data:image/png') == -1) {
+              var canvas = document.createElement('canvas');
               canvas.width = image.naturalWidth;
               canvas.height = image.naturalHeight;
-              var ctx = canvas.getContext("2d");
-              ctx.fillStyle = "#FFFFFF";
+              var ctx = canvas.getContext('2d');
+              ctx.fillStyle = '#FFFFFF';
               ctx.fillRect(0, 0, image.naturalWidth, image.naturalHeight);
               ctx.drawImage(image, 0, 0, image.naturalWidth, image.naturalHeight);
-              _this3.node.imgSrc = canvas.toDataURL("image/png");
+              _this3.node.imgSrc = canvas.toDataURL('image/png');
               _this3.node.PNGToJPG = 1;
             }
 
@@ -51656,18 +51697,18 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
             return hoEditorFactory.loadImageCount--;
           };
         } else {
-          var signArr = _this3.imgSrc.split("\n");
+          var signArr = _this3.imgSrc.split('\n');
 
           if (signArr.length === 1) {
-            var drawText2 = new createjs.Text(_this3.imgSrc, _this3.textStyle, "#000000");
-            drawText2.textBaseline = "alphabetic";
-            drawText2.textAlign = "left";
+            var drawText2 = new createjs.Text(_this3.imgSrc, _this3.textStyle, '#000000');
+            drawText2.textBaseline = 'alphabetic';
+            drawText2.textAlign = 'left';
             var rect = drawText2.getBounds();
 
             if (rect) {
               drawText2.y = _this3.y;
 
-              if (_this3.number === 1 || isFront && _this3.number > 1 || _this3.node.connectMode === "换行") {
+              if (_this3.number === 1 || isFront && _this3.number > 1 || _this3.node.connectMode === '换行') {
                 drawText2.x = 0;
               } else {
                 drawText2.x = _this3._drawText.getMeasuredWidth();
@@ -51677,16 +51718,16 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
             _this3.addChild(drawText2);
           } else {
             for (var i = 0; i < signArr.length; i++) {
-              var aText = new createjs.Text(signArr[i], _this3.textStyle, "#000000");
-              aText.textBaseline = "alphabetic";
-              aText.textAlign = "left";
+              var aText = new createjs.Text(signArr[i], _this3.textStyle, '#000000');
+              aText.textBaseline = 'alphabetic';
+              aText.textAlign = 'left';
 
               var _rect = aText.getBounds();
 
               if (_rect) {
                 aText.y = _this3.dHeight / signArr.length * (i + 1) - _this3.dHeight; //aText.y = -this.dHeight / (i + 1);
 
-                if (_this3.number === 1 || isFront && _this3.number > 1 || _this3.node.connectMode === "换行") {
+                if (_this3.number === 1 || isFront && _this3.number > 1 || _this3.node.connectMode === '换行') {
                   aText.x = 0;
                 } else {
                   aText.x = _this3._drawText.getMeasuredWidth();
@@ -51700,9 +51741,9 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
       };
 
       if (this.number === 0) {
-        var drawText1 = new createjs.Text(this.signName, this.textStyle, "#838586");
-        drawText1.textBaseline = "alphabetic";
-        drawText1.textAlign = "left";
+        var drawText1 = new createjs.Text(this.signName, this.textStyle, '#838586');
+        drawText1.textBaseline = 'alphabetic';
+        drawText1.textAlign = 'left';
         var rect = drawText1.getBounds();
 
         if (rect) {
@@ -51730,37 +51771,37 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
       var connectMode = this.node.connectMode;
       var line = new createjs.Shape();
 
-      if (connectMode === "/") {
+      if (connectMode === '/') {
         if (this.type === 1) {
           if (isFront) {
-            line.graphics.beginStroke("#000000").moveTo(this.dWidth - this._drawText.getMeasuredWidth(), 0).lineTo(this.dWidth, -this.dHeight);
+            line.graphics.beginStroke('#000000').moveTo(this.dWidth - this._drawText.getMeasuredWidth(), 0).lineTo(this.dWidth, -this.dHeight);
           } else {
-            line.graphics.beginStroke("#000000").moveTo(0, 0).lineTo(this._drawText.getMeasuredWidth(), -this.dHeight);
+            line.graphics.beginStroke('#000000').moveTo(0, 0).lineTo(this._drawText.getMeasuredWidth(), -this.dHeight);
           }
         } else {
-          var signArr = this.imgSrc.split("\n");
-          var theHeight = new createjs.Text(this.imgSrc, this.textStyle, "#000000").getMeasuredHeight();
+          var signArr = this.imgSrc.split('\n');
+          var theHeight = new createjs.Text(this.imgSrc, this.textStyle, '#000000').getMeasuredHeight();
 
           if (signArr.length > 1) {
             for (var i = 1; i < signArr.length; i++) {
-              var aText = new createjs.Text(signArr[i], this.textStyle, "#000000");
+              var aText = new createjs.Text(signArr[i], this.textStyle, '#000000');
               theHeight = theHeight + aText.getMeasuredHeight();
             }
           }
 
           if (isFront) {
-            line.graphics.beginStroke("#000000").moveTo(this.dWidth - this._drawText.getMeasuredWidth(), 2).lineTo(this.dWidth, -theHeight - 2);
+            line.graphics.beginStroke('#000000').moveTo(this.dWidth - this._drawText.getMeasuredWidth(), 2).lineTo(this.dWidth, -theHeight - 2);
           } else {
-            line.graphics.beginStroke("#000000").moveTo(0, 2).lineTo(this._drawText.getMeasuredWidth(), -theHeight - 2);
+            line.graphics.beginStroke('#000000').moveTo(0, 2).lineTo(this._drawText.getMeasuredWidth(), -theHeight - 2);
           }
         }
 
         this.addChildAt(line);
-      } else if (connectMode === "换行") {
+      } else if (connectMode === '换行') {
         return;
       } else {
-        this._drawText.textBaseline = "alphabetic";
-        this._drawText.textAlign = "left";
+        this._drawText.textBaseline = 'alphabetic';
+        this._drawText.textAlign = 'left';
 
         var rect = this._drawText.getBounds();
 
@@ -54776,6 +54817,11 @@ var Caret = /*#__PURE__*/function () {
         this.div_cursor.style.height = Math.max(val, 12) * DrawConfig/* DrawConfig.instance */.f.instance().scaleXY + "px"; // this.updateCaret();
       }
     }
+  }, {
+    key: "X",
+    get: function get() {
+      return this.x;
+    }
   }, {
     key: "Y",
     get: function get() {
@@ -62479,7 +62525,7 @@ var NodeStyleUndoUnit = /*#__PURE__*/function () {
 /* 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);
 /* 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);
 /* 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);
-/* 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);
+/* 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);
 /* harmony import */ var core_js_modules_es_array_iterator_js__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(66992);
 /* 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__);
 /* harmony import */ var core_js_modules_es_map_js__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(51532);
@@ -62494,28 +62540,34 @@ var NodeStyleUndoUnit = /*#__PURE__*/function () {
 /* 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__);
 /* harmony import */ var core_js_modules_es_error_cause_js__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(21703);
 /* 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__);
-/* harmony import */ var _editor_dom_DocTree__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(23375);
-/* harmony import */ var _dom_treeNode_TextNode__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(91538);
-/* harmony import */ var _events_NodeChangeEvent__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(34534);
-/* harmony import */ var _draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(98199);
-/* harmony import */ var _dom_DomRange__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(66828);
-/* harmony import */ var _TextNodeSplitUndoUnit__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(58416);
-/* harmony import */ var _events_SelectionChangeEvent__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(13113);
-/* harmony import */ var _UndoService__WEBPACK_IMPORTED_MODULE_19__ = __webpack_require__(48508);
-/* harmony import */ var _dom_treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_20__ = __webpack_require__(34565);
-/* harmony import */ var _dom_treeNode_MarkNode__WEBPACK_IMPORTED_MODULE_21__ = __webpack_require__(15868);
-/* harmony import */ var _events_Exception__WEBPACK_IMPORTED_MODULE_22__ = __webpack_require__(88702);
-/* harmony import */ var _dom_treeNode_ParagraphNode__WEBPACK_IMPORTED_MODULE_23__ = __webpack_require__(14208);
-/* harmony import */ var _dom_treeNode_CellNode__WEBPACK_IMPORTED_MODULE_24__ = __webpack_require__(15798);
-/* harmony import */ var _draw_SelectRange__WEBPACK_IMPORTED_MODULE_25__ = __webpack_require__(1470);
-/* harmony import */ var _dom_treeNode_TableNode__WEBPACK_IMPORTED_MODULE_26__ = __webpack_require__(95883);
-/* harmony import */ var _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_27__ = __webpack_require__(41005);
-/* harmony import */ var _dom_treeNode_ControlNode__WEBPACK_IMPORTED_MODULE_28__ = __webpack_require__(8395);
-/* harmony import */ var _dom_treeNode_RadioAndCheckBoxNode__WEBPACK_IMPORTED_MODULE_29__ = __webpack_require__(89050);
-/* harmony import */ var _dom_treeNode_DateTimeNode__WEBPACK_IMPORTED_MODULE_30__ = __webpack_require__(36395);
-/* harmony import */ var _dom_treeNode_DownListNode__WEBPACK_IMPORTED_MODULE_31__ = __webpack_require__(98390);
-/* harmony import */ var _NodeInsertUndoUnit__WEBPACK_IMPORTED_MODULE_32__ = __webpack_require__(12019);
-/* harmony import */ var _dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_33__ = __webpack_require__(34450);
+/* harmony import */ var core_js_modules_es_array_includes_js__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(26699);
+/* 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__);
+/* harmony import */ var core_js_modules_es_string_includes_js__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(32023);
+/* 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__);
+/* harmony import */ var _editor_dom_DocTree__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(23375);
+/* harmony import */ var _dom_treeNode_TextNode__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(91538);
+/* harmony import */ var _events_NodeChangeEvent__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(34534);
+/* harmony import */ var _draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(98199);
+/* harmony import */ var _dom_DomRange__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(66828);
+/* harmony import */ var _TextNodeSplitUndoUnit__WEBPACK_IMPORTED_MODULE_19__ = __webpack_require__(58416);
+/* harmony import */ var _events_SelectionChangeEvent__WEBPACK_IMPORTED_MODULE_20__ = __webpack_require__(13113);
+/* harmony import */ var _UndoService__WEBPACK_IMPORTED_MODULE_21__ = __webpack_require__(48508);
+/* harmony import */ var _dom_treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_22__ = __webpack_require__(34565);
+/* harmony import */ var _dom_treeNode_MarkNode__WEBPACK_IMPORTED_MODULE_23__ = __webpack_require__(15868);
+/* harmony import */ var _events_Exception__WEBPACK_IMPORTED_MODULE_24__ = __webpack_require__(88702);
+/* harmony import */ var _dom_treeNode_ParagraphNode__WEBPACK_IMPORTED_MODULE_25__ = __webpack_require__(14208);
+/* harmony import */ var _dom_treeNode_CellNode__WEBPACK_IMPORTED_MODULE_26__ = __webpack_require__(15798);
+/* harmony import */ var _draw_SelectRange__WEBPACK_IMPORTED_MODULE_27__ = __webpack_require__(1470);
+/* harmony import */ var _dom_treeNode_TableNode__WEBPACK_IMPORTED_MODULE_28__ = __webpack_require__(95883);
+/* harmony import */ var _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_29__ = __webpack_require__(41005);
+/* harmony import */ var _dom_treeNode_ControlNode__WEBPACK_IMPORTED_MODULE_30__ = __webpack_require__(8395);
+/* harmony import */ var _dom_treeNode_RadioAndCheckBoxNode__WEBPACK_IMPORTED_MODULE_31__ = __webpack_require__(89050);
+/* harmony import */ var _dom_treeNode_DateTimeNode__WEBPACK_IMPORTED_MODULE_32__ = __webpack_require__(36395);
+/* harmony import */ var _dom_treeNode_DownListNode__WEBPACK_IMPORTED_MODULE_33__ = __webpack_require__(98390);
+/* harmony import */ var _NodeInsertUndoUnit__WEBPACK_IMPORTED_MODULE_34__ = __webpack_require__(12019);
+/* harmony import */ var _dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_35__ = __webpack_require__(34450);
+
+
 
 
 
@@ -62574,10 +62626,10 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
     this._startPath = startPath;
     this._endPath = endPath;
     this._isForceDelete = isForceDelete;
-    this._undo = new _UndoService__WEBPACK_IMPORTED_MODULE_19__/* .UndoService */ .O(this._hoEditorFactoryID); //hoEditorFactory.undoService;
+    this._undo = new _UndoService__WEBPACK_IMPORTED_MODULE_21__/* .UndoService */ .O(this._hoEditorFactoryID); //hoEditorFactory.undoService;
 
     this._undoNodes = new Map();
-    var aDomRange = new _dom_DomRange__WEBPACK_IMPORTED_MODULE_16__/* .DomRange */ .a(hoEditorFactoryID, startPath, endPath).normalize();
+    var aDomRange = new _dom_DomRange__WEBPACK_IMPORTED_MODULE_18__/* .DomRange */ .a(hoEditorFactoryID, startPath, endPath).normalize();
 
     var _aDomRange$inSameTabl = aDomRange.inSameTable(),
         _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 +62638,10 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
 
     this._bSameTable = bSametable;
     this._opTime = new Date();
-    this._affectText = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_27__/* .HOEditorFactorys.instance */ .b.instance().getFactory(hoEditorFactoryID).vueController.getRangeText(aDomRange);
+    this._affectText = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_29__/* .HOEditorFactorys.instance */ .b.instance().getFactory(hoEditorFactoryID).vueController.getRangeText(aDomRange);
   }
 
-  (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_34__/* ["default"] */ .Z)(NodesDeleteUndoUnit, [{
+  (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_36__/* ["default"] */ .Z)(NodesDeleteUndoUnit, [{
     key: "undo",
     value: function undo() {
       //2.插入删除的节点
@@ -62601,12 +62653,12 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
       var arr = Array.from(this._undoNodes).reverse();
       var i = 0;
       var prevIsTable = false;
-      var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_27__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
+      var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_29__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
 
       while (i < arr.length) {
         var value = arr[i];
 
-        if (value[1] instanceof _dom_treeNode_CellNode__WEBPACK_IMPORTED_MODULE_24__/* .CellNode */ .D) {// (value[1] as CellNode).redrawCell(true, DocAction.daInsert);
+        if (value[1] instanceof _dom_treeNode_CellNode__WEBPACK_IMPORTED_MODULE_26__/* .CellNode */ .D) {// (value[1] as CellNode).redrawCell(true, DocAction.daInsert);
         } else {
           if (prevIsTable) {
             hoEditorFactory.docTree.insertNodeAfterNode(arr[i - 1][1], arr[i][1]);
@@ -62614,12 +62666,12 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
             hoEditorFactory.docTree.insertNodeAfterPath(value[0], value[1]);
           }
 
-          if (value[1] instanceof _dom_treeNode_TableNode__WEBPACK_IMPORTED_MODULE_26__/* .TableNode */ .Fh) {
+          if (value[1] instanceof _dom_treeNode_TableNode__WEBPACK_IMPORTED_MODULE_28__/* .TableNode */ .Fh) {
             prevIsTable = true; // value[1].clearDrawNodes();
             // value[1].drawTable.drawPageTables.length = 0;
 
             var np = hoEditorFactory.docTree.findNodePositionByPath(value[0]);
-            if (np && np.node && np.node instanceof _dom_treeNode_ParagraphNode__WEBPACK_IMPORTED_MODULE_23__/* .ParagraphNode */ .C) value[1].drawTable.paragraphNode = np.node;
+            if (np && np.node && np.node instanceof _dom_treeNode_ParagraphNode__WEBPACK_IMPORTED_MODULE_25__/* .ParagraphNode */ .C) value[1].drawTable.paragraphNode = np.node;
           } else {
             prevIsTable = false;
           }
@@ -62629,7 +62681,7 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
       }
 
       var aendPaht = hoEditorFactory.docTree.getNodeLastPath(arr[arr.length - 1][1]);
-      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);
+      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);
       hoEditorFactory.docTree.change(changeEvent); //3.合并拆分节点
 
       while (!this._undo.atBottom()) {
@@ -62657,9 +62709,9 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
       //选中范围变化事件
 
 
-      var newRange = new _dom_DomRange__WEBPACK_IMPORTED_MODULE_16__/* .DomRange */ .a(this._hoEditorFactoryID, this._startPath, this._endPath).normalize();
+      var newRange = new _dom_DomRange__WEBPACK_IMPORTED_MODULE_18__/* .DomRange */ .a(this._hoEditorFactoryID, this._startPath, this._endPath).normalize();
       hoEditorFactory.docTree.curDomRange = newRange;
-      var cgEvent = new _events_SelectionChangeEvent__WEBPACK_IMPORTED_MODULE_18__/* .SelectionChangeEvent */ .r(hoEditorFactory.docTree.curDomRange, newRange);
+      var cgEvent = new _events_SelectionChangeEvent__WEBPACK_IMPORTED_MODULE_20__/* .SelectionChangeEvent */ .r(hoEditorFactory.docTree.curDomRange, newRange);
       hoEditorFactory.docTree.selectChange(cgEvent); //光标定位
 
       hoEditorFactory.drawTree.moveCaretToPath(newRange.endPath);
@@ -62678,7 +62730,7 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
   }, {
     key: "MoveCaret",
     value: function MoveCaret(path) {
-      _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_27__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID).drawTree.moveCaretToPath(path);
+      _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_29__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID).drawTree.moveCaretToPath(path);
     }
     /**
      * @description 返回前面一个node的开始结束选中范围  文本节点时候返回文本中单个文字的选中范围
@@ -62689,30 +62741,30 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
     key: "getPrevNodeDomRange",
     value: function getPrevNodeDomRange(Anode) {
       var spath;
-      var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_27__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
+      var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_29__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
       var prev = Anode.prevSibling();
 
       if (!prev) {
-        throw _events_Exception__WEBPACK_IMPORTED_MODULE_22__/* .Exception.NodeNotFound */ .P.NodeNotFound();
+        throw _events_Exception__WEBPACK_IMPORTED_MODULE_24__/* .Exception.NodeNotFound */ .P.NodeNotFound();
       }
 
       var epath = hoEditorFactory.docTree.getNodeLastPath(prev);
 
-      if (prev instanceof _dom_treeNode_TextNode__WEBPACK_IMPORTED_MODULE_13__/* .TextNode */ .R) {
+      if (prev instanceof _dom_treeNode_TextNode__WEBPACK_IMPORTED_MODULE_15__/* .TextNode */ .R) {
         spath = prev.prevPath(epath);
-      } else if (prev instanceof _dom_treeNode_ParagraphNode__WEBPACK_IMPORTED_MODULE_23__/* .ParagraphNode */ .C) {
+      } else if (prev instanceof _dom_treeNode_ParagraphNode__WEBPACK_IMPORTED_MODULE_25__/* .ParagraphNode */ .C) {
         spath = epath;
       } else {
         var prev1 = prev.previousLeaf();
 
         if (!prev1) {
-          throw _events_Exception__WEBPACK_IMPORTED_MODULE_22__/* .Exception.NodeNotFound */ .P.NodeNotFound();
+          throw _events_Exception__WEBPACK_IMPORTED_MODULE_24__/* .Exception.NodeNotFound */ .P.NodeNotFound();
         }
 
         spath = hoEditorFactory.docTree.getNodeLastPath(prev1);
       }
 
-      return new _dom_DomRange__WEBPACK_IMPORTED_MODULE_16__/* .DomRange */ .a(this._hoEditorFactoryID, spath, epath);
+      return new _dom_DomRange__WEBPACK_IMPORTED_MODULE_18__/* .DomRange */ .a(this._hoEditorFactoryID, spath, epath);
     }
     /**
      *
@@ -62726,23 +62778,23 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
   }, {
     key: "deleteRange",
     value: function deleteRange(endpath, startpath) {
-      var currRange = new _dom_DomRange__WEBPACK_IMPORTED_MODULE_16__/* .DomRange */ .a(this._hoEditorFactoryID, startpath, endpath).normalize(); //拆分更新节点，更新删除范围 this._tmp
+      var currRange = new _dom_DomRange__WEBPACK_IMPORTED_MODULE_18__/* .DomRange */ .a(this._hoEditorFactoryID, startpath, endpath).normalize(); //拆分更新节点，更新删除范围 this._tmp
 
       if (!this.spliteNode(currRange)) {
         return 0;
       }
 
-      var newDomRange = new _dom_DomRange__WEBPACK_IMPORTED_MODULE_16__/* .DomRange */ .a(this._hoEditorFactoryID, this._tmp.start, this._tmp.end);
-      if (!newDomRange.npStart.node) throw _events_Exception__WEBPACK_IMPORTED_MODULE_22__/* .Exception.NodeNotFound */ .P.NodeNotFound();
-      if (!newDomRange.npEnd.node) throw _events_Exception__WEBPACK_IMPORTED_MODULE_22__/* .Exception.NodeNotFound */ .P.NodeNotFound();
+      var newDomRange = new _dom_DomRange__WEBPACK_IMPORTED_MODULE_18__/* .DomRange */ .a(this._hoEditorFactoryID, this._tmp.start, this._tmp.end);
+      if (!newDomRange.npStart.node) throw _events_Exception__WEBPACK_IMPORTED_MODULE_24__/* .Exception.NodeNotFound */ .P.NodeNotFound();
+      if (!newDomRange.npEnd.node) throw _events_Exception__WEBPACK_IMPORTED_MODULE_24__/* .Exception.NodeNotFound */ .P.NodeNotFound();
       var aStart = newDomRange.npStart.node;
 
       if (currRange.startMainNode) {
         aStart = currRange.startMainNode;
       }
 
-      var nodes = _dom_DomRange__WEBPACK_IMPORTED_MODULE_16__/* .DomRange.getSelectDomNodesForDelete */ .a.getSelectDomNodesForDelete(this._hoEditorFactoryID, this._tmp.start, this._tmp.end);
-      var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_27__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID); // this.DeleteBaseCombineNodeContent(
+      var nodes = _dom_DomRange__WEBPACK_IMPORTED_MODULE_18__/* .DomRange.getSelectDomNodesForDelete */ .a.getSelectDomNodesForDelete(this._hoEditorFactoryID, this._tmp.start, this._tmp.end);
+      var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_29__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID); // this.DeleteBaseCombineNodeContent(
       //   newDomRange,
       //   newDomRange.npEnd.node,
       //   aStart,
@@ -62867,7 +62919,8 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
   }, {
     key: "spliteNode",
     value: function spliteNode(Arange) {
-      var _this = this;
+      var _this = this,
+          _s$parentNode$downLis;
 
       var s = Arange.npStart.node;
       var e = Arange.npEnd.node;
@@ -62877,10 +62930,10 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
        * @param Anode
        */
 
-      var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_27__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
+      var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_29__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
 
       var forMarkNode = function forMarkNode(Anode) {
-        if (Anode.parentNode instanceof _dom_treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_20__/* .TextInputFieldNode */ .re) {
+        if (Anode.parentNode instanceof _dom_treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_22__/* .TextInputFieldNode */ .re) {
           var pTINode = Anode.parentNode;
 
           if (pTINode.isEmpty() || !pTINode.canModifyContent) {
@@ -62888,11 +62941,11 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
             var tmp = pTINode.previousLeaf();
 
             if (!tmp) {
-              throw _events_Exception__WEBPACK_IMPORTED_MODULE_22__/* .Exception.NodeNotFound */ .P.NodeNotFound();
+              throw _events_Exception__WEBPACK_IMPORTED_MODULE_24__/* .Exception.NodeNotFound */ .P.NodeNotFound();
             }
 
             info[0] = 0;
-            info[1] = new _dom_DomRange__WEBPACK_IMPORTED_MODULE_16__/* .DomRange */ .a(_this._hoEditorFactoryID, hoEditorFactory.docTree.getNodeLastPath(tmp), hoEditorFactory.docTree.getNodeLastPath(pTINode));
+            info[1] = new _dom_DomRange__WEBPACK_IMPORTED_MODULE_18__/* .DomRange */ .a(_this._hoEditorFactoryID, hoEditorFactory.docTree.getNodeLastPath(tmp), hoEditorFactory.docTree.getNodeLastPath(pTINode));
           } else {
             if (Anode == pTINode.last()) {
               //递归调用删除
@@ -62918,18 +62971,20 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
       };
 
       if (!(s && e)) {
-        throw _events_Exception__WEBPACK_IMPORTED_MODULE_22__/* .Exception.NodeNotFound */ .P.NodeNotFound();
+        throw _events_Exception__WEBPACK_IMPORTED_MODULE_24__/* .Exception.NodeNotFound */ .P.NodeNotFound();
       }
 
       this._tmp.start = Arange.startPath;
-      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)) {
-      //   return true;
-      // }
+      this._tmp.end = Arange.endPath;
+
+      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("<元素>")) {
+        return true;
+      }
 
       if (s === e) {
-        if (s instanceof _dom_treeNode_TextNode__WEBPACK_IMPORTED_MODULE_13__/* .TextNode */ .R) {
+        if (s instanceof _dom_treeNode_TextNode__WEBPACK_IMPORTED_MODULE_15__/* .TextNode */ .R) {
           // HOEditorFactorys.instance().getFactory(this._hoEditorFactoryID).docTree.curDomRange = Arange;
-          var tmp = new _TextNodeSplitUndoUnit__WEBPACK_IMPORTED_MODULE_17__/* .TextNodeSplitUndoUnit */ .W(this._hoEditorFactoryID, Arange.startPath, s, Arange);
+          var tmp = new _TextNodeSplitUndoUnit__WEBPACK_IMPORTED_MODULE_19__/* .TextNodeSplitUndoUnit */ .W(this._hoEditorFactoryID, Arange.startPath, s, Arange);
 
           this._undo.begin();
 
@@ -62938,7 +62993,7 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
           this._undo.commit();
 
           this._tmp.end = hoEditorFactory.docTree.getNodeLastPath(tmp.theNode);
-        } else if (s instanceof _dom_treeNode_MarkNode__WEBPACK_IMPORTED_MODULE_21__/* .MarkNode */ .j) {
+        } else if (s instanceof _dom_treeNode_MarkNode__WEBPACK_IMPORTED_MODULE_23__/* .MarkNode */ .j) {
           forMarkNode(s);
 
           if (info[0] == 0 && info[1]) {
@@ -62955,8 +63010,8 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
       } else {
         var _tmp3 = null;
 
-        if (e instanceof _dom_treeNode_TextNode__WEBPACK_IMPORTED_MODULE_13__/* .TextNode */ .R && Arange.npEnd.childIndex >= 0 && Arange.npEnd.childIndex < e.getLength() - 1) {
-          _tmp3 = new _TextNodeSplitUndoUnit__WEBPACK_IMPORTED_MODULE_17__/* .TextNodeSplitUndoUnit */ .W(this._hoEditorFactoryID, Arange.endPath, e, Arange);
+        if (e instanceof _dom_treeNode_TextNode__WEBPACK_IMPORTED_MODULE_15__/* .TextNode */ .R && Arange.npEnd.childIndex >= 0 && Arange.npEnd.childIndex < e.getLength() - 1) {
+          _tmp3 = new _TextNodeSplitUndoUnit__WEBPACK_IMPORTED_MODULE_19__/* .TextNodeSplitUndoUnit */ .W(this._hoEditorFactoryID, Arange.endPath, e, Arange);
 
           this._undo.begin();
 
@@ -62965,22 +63020,22 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
           this._undo.commit();
         }
 
-        if (s instanceof _dom_treeNode_TextNode__WEBPACK_IMPORTED_MODULE_13__/* .TextNode */ .R && Arange.npStart.childIndex >= 0 && Arange.npStart.childIndex < s.getLength() - 1) {
+        if (s instanceof _dom_treeNode_TextNode__WEBPACK_IMPORTED_MODULE_15__/* .TextNode */ .R && Arange.npStart.childIndex >= 0 && Arange.npStart.childIndex < s.getLength() - 1) {
           this._undo.begin();
 
-          this._undo.add(new _TextNodeSplitUndoUnit__WEBPACK_IMPORTED_MODULE_17__/* .TextNodeSplitUndoUnit */ .W(this._hoEditorFactoryID, Arange.startPath, s, Arange));
+          this._undo.add(new _TextNodeSplitUndoUnit__WEBPACK_IMPORTED_MODULE_19__/* .TextNodeSplitUndoUnit */ .W(this._hoEditorFactoryID, Arange.startPath, s, Arange));
 
           this._undo.commit();
         }
 
-        if (e instanceof _dom_treeNode_MarkNode__WEBPACK_IMPORTED_MODULE_21__/* .MarkNode */ .j) {
+        if (e instanceof _dom_treeNode_MarkNode__WEBPACK_IMPORTED_MODULE_23__/* .MarkNode */ .j) {
           forMarkNode(e);
 
           if (info[0] == 0 && info[1]) {
             this._tmp.end = info[1].endPath; // return this.spliteNode(new DomRange(this._tmp.start, this._tmp.end));
           } else if ((info[0] == 1 || info[0] == 2) && info[1]) {
             this._tmp.end = info[1].endPath;
-            return this.spliteNode(new _dom_DomRange__WEBPACK_IMPORTED_MODULE_16__/* .DomRange */ .a(this._hoEditorFactoryID, this._tmp.start, this._tmp.end));
+            return this.spliteNode(new _dom_DomRange__WEBPACK_IMPORTED_MODULE_18__/* .DomRange */ .a(this._hoEditorFactoryID, this._tmp.start, this._tmp.end));
           }
         }
 
@@ -62996,15 +63051,15 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
   }, {
     key: "ParentRepaint",
     value: function ParentRepaint(Anode) {
-      if (Anode && Anode instanceof _dom_treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_20__/* .TextInputFieldNode */ .re) {
-        var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_27__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
+      if (Anode && Anode instanceof _dom_treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_22__/* .TextInputFieldNode */ .re) {
+        var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_29__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
 
         if (Anode.childNodes.length === 2) {
           var contentMarkNode = Anode.childNodes2[1];
           contentMarkNode.styleIndex = Anode.childNodes[0].styleIndex;
           var insertPath = hoEditorFactory.docTree.getNodeLastPath(Anode.childNodes[0]);
           hoEditorFactory.undoService.begin();
-          hoEditorFactory.undoService.add(new _NodeInsertUndoUnit__WEBPACK_IMPORTED_MODULE_32__/* .NodeInsertUndoUnit */ .R(this._hoEditorFactoryID, insertPath, contentMarkNode));
+          hoEditorFactory.undoService.add(new _NodeInsertUndoUnit__WEBPACK_IMPORTED_MODULE_34__/* .NodeInsertUndoUnit */ .R(this._hoEditorFactoryID, insertPath, contentMarkNode));
           hoEditorFactory.undoService.commit();
         }
 
@@ -63029,16 +63084,16 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
             switch (_context.prev = _context.next) {
               case 0:
                 this.initParam();
-                currRange = new _dom_DomRange__WEBPACK_IMPORTED_MODULE_16__/* .DomRange */ .a(this._hoEditorFactoryID, this._startPath, this._endPath).normalize();
-                hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_27__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
+                currRange = new _dom_DomRange__WEBPACK_IMPORTED_MODULE_18__/* .DomRange */ .a(this._hoEditorFactoryID, this._startPath, this._endPath).normalize();
+                hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_29__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
                 hoEditorFactory.docTree.curDomRange = currRange;
 
-                if (!(hoEditorFactory.drawTree.paintStatus === _draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_15__/* .PaintState.psReview */ .Dh.psReview)) {
+                if (!(hoEditorFactory.drawTree.paintStatus === _draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_17__/* .PaintState.psReview */ .Dh.psReview)) {
                   _context.next = 10;
                   break;
                 }
 
-                if (!(currRange.npEnd.node && currRange.npEnd.node instanceof _dom_treeNode_TextNode__WEBPACK_IMPORTED_MODULE_13__/* .TextNode */ .R)) {
+                if (!(currRange.npEnd.node && currRange.npEnd.node instanceof _dom_treeNode_TextNode__WEBPACK_IMPORTED_MODULE_15__/* .TextNode */ .R)) {
                   _context.next = 10;
                   break;
                 }
@@ -63055,7 +63110,7 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
                 return _context.abrupt("return");
 
               case 10:
-                nodes = _dom_DomRange__WEBPACK_IMPORTED_MODULE_16__/* .DomRange.getSelectDomNodesForDelete */ .a.getSelectDomNodesForDelete(this._hoEditorFactoryID, this._startPath, this._endPath); // const npFirst = hoEditorFactory.docTree.findNodePositionByPath(this._startPath);
+                nodes = _dom_DomRange__WEBPACK_IMPORTED_MODULE_18__/* .DomRange.getSelectDomNodesForDelete */ .a.getSelectDomNodesForDelete(this._hoEditorFactoryID, this._startPath, this._endPath); // const npFirst = hoEditorFactory.docTree.findNodePositionByPath(this._startPath);
                 // if (npFirst && npFirst.node) {
                 //   //const parentNode = hoEditorFactory.docTree.getParentNode(this._startPath);
                 //   //if (parentNode) {
@@ -63066,7 +63121,7 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
                 // }
                 //if(nodes.length == 0) return;
 
-                if (!(hoEditorFactory.drawTree.paintStatus !== _draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_15__/* .PaintState.psDesign */ .Dh.psDesign && !this._isForceDelete)) {
+                if (!(hoEditorFactory.drawTree.paintStatus !== _draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_17__/* .PaintState.psDesign */ .Dh.psDesign && !this._isForceDelete)) {
                   _context.next = 33;
                   break;
                 }
@@ -63081,7 +63136,7 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
 
                 node = nodes[n];
 
-                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)) {
+                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)) {
                   _context.next = 18;
                   break;
                 }
@@ -63091,7 +63146,7 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
                 return _context.abrupt("return", 0);
 
               case 18:
-                if (!(node instanceof _dom_treeNode_ControlNode__WEBPACK_IMPORTED_MODULE_28__/* .ControlNode */ .w || node instanceof _dom_treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_20__/* .TextInputFieldNode */ .re)) {
+                if (!(node instanceof _dom_treeNode_ControlNode__WEBPACK_IMPORTED_MODULE_30__/* .ControlNode */ .w || node instanceof _dom_treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_22__/* .TextInputFieldNode */ .re)) {
                   _context.next = 27;
                   break;
                 }
@@ -63103,19 +63158,19 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
 
                 tip = "";
 
-                if (node instanceof _dom_treeNode_RadioAndCheckBoxNode__WEBPACK_IMPORTED_MODULE_29__/* .RadioAndCheckBoxNode */ .Yh && node.controlStyle === "RadioBox") {
+                if (node instanceof _dom_treeNode_RadioAndCheckBoxNode__WEBPACK_IMPORTED_MODULE_31__/* .RadioAndCheckBoxNode */ .Yh && node.controlStyle === "RadioBox") {
                   tip = "单选框";
                 }
 
-                if (node instanceof _dom_treeNode_RadioAndCheckBoxNode__WEBPACK_IMPORTED_MODULE_29__/* .RadioAndCheckBoxNode */ .Yh && node.controlStyle === "CheckBox") {
+                if (node instanceof _dom_treeNode_RadioAndCheckBoxNode__WEBPACK_IMPORTED_MODULE_31__/* .RadioAndCheckBoxNode */ .Yh && node.controlStyle === "CheckBox") {
                   tip = "复选框";
                 }
 
-                if (node instanceof _dom_treeNode_DateTimeNode__WEBPACK_IMPORTED_MODULE_30__/* .DateTimeNode */ .Z) {
+                if (node instanceof _dom_treeNode_DateTimeNode__WEBPACK_IMPORTED_MODULE_32__/* .DateTimeNode */ .Z) {
                   tip = "日期时间";
                 }
 
-                if (node instanceof _dom_treeNode_DownListNode__WEBPACK_IMPORTED_MODULE_31__/* .DownListNode */ .yF) {
+                if (node instanceof _dom_treeNode_DownListNode__WEBPACK_IMPORTED_MODULE_33__/* .DownListNode */ .yF) {
                   tip = "下拉列表";
                 }
 
@@ -63124,7 +63179,7 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
                 return _context.abrupt("return", 0);
 
               case 27:
-                if (!(node instanceof _dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_33__/* .SignNode */ .N && node.isTemplate && node.number === 0)) {
+                if (!(node instanceof _dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_35__/* .SignNode */ .N && node.isTemplate && node.number === 0)) {
                   _context.next = 30;
                   break;
                 }
@@ -63141,7 +63196,7 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
               case 33:
                 pnode = (_currRange$npEnd$node = currRange.npEnd.node) === null || _currRange$npEnd$node === void 0 ? void 0 : _currRange$npEnd$node.parentNode;
 
-                if (!(pnode && pnode instanceof _dom_treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_20__/* .TextInputFieldNode */ .re && currRange.npEnd.path != hoEditorFactory.docTree.getNodeLastPath(pnode))) {
+                if (!(pnode && pnode instanceof _dom_treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_22__/* .TextInputFieldNode */ .re && currRange.npEnd.path != hoEditorFactory.docTree.getNodeLastPath(pnode))) {
                   _context.next = 39;
                   break;
                 }
@@ -63162,7 +63217,7 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
                 return _context.abrupt("return");
 
               case 39:
-                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函数完成后调用这个
+                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函数完成后调用这个
                 // hoEditorFactory.docTree.deleteRange(arange.startPath, arange.endPath);
 
                 if (currRange.npStart.node && currRange.npEnd.node) {
@@ -63170,7 +63225,7 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
                   break;
                 }
 
-                throw _events_Exception__WEBPACK_IMPORTED_MODULE_22__/* .Exception.NodeNotFound */ .P.NodeNotFound();
+                throw _events_Exception__WEBPACK_IMPORTED_MODULE_24__/* .Exception.NodeNotFound */ .P.NodeNotFound();
 
               case 42:
                 // const [startPath, endPath] = DomRange.skipStartEndTablePath(
@@ -63181,7 +63236,7 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
                 startPath = currRange.startPath;
                 endPath = currRange.endPath;
                 changeEvent.oldEndPath = endPath;
-                changeEvent.oldDrawTreeLines = new _draw_SelectRange__WEBPACK_IMPORTED_MODULE_25__/* .SelectRange */ .E(this._hoEditorFactoryID).getRangeDrawTreeLines(startPath, endPath);
+                changeEvent.oldDrawTreeLines = new _draw_SelectRange__WEBPACK_IMPORTED_MODULE_27__/* .SelectRange */ .E(this._hoEditorFactoryID).getRangeDrawTreeLines(startPath, endPath);
                 res = this.deleteRange(currRange.endPath, currRange.startPath);
 
                 if (!(res == 1)) {
@@ -63195,7 +63250,7 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
                 return hoEditorFactory.docTree.change(changeEvent);
 
               case 52:
-                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));
+                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));
                 hoEditorFactory.docTree.selectChange(cgEvent);
 
               case 54:
@@ -67281,8 +67336,8 @@ var dealImage = function dealImage(base64, callback, qualitys, size, img) {
   var imgWidth, imgHeight;
 
   newImage.onload = function () {
-    imgWidth = newImage.width;
-    imgHeight = newImage.height;
+    imgWidth = newImage.naturalWidth;
+    imgHeight = newImage.naturalHeight;
     var canvas = document.createElement("canvas");
     var ctx = canvas.getContext("2d");
 
@@ -99603,7 +99658,8 @@ out+=String.fromCharCode.apply(null,buf.subarray(i,i+ARRAY_APPLY_BATCH));}return
    * @returns jsPDF
    */jsPDFAPI.addImage=function(){// 自定义修改 处理签名图片打印
 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
-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;
+var filter=this.internal.getFilters();if(compression===undefined&&filter.indexOf("FlateEncode")!==-1){compression="SLOW";}// 自定义修改 调整 addImage 方法的 compression值压缩图片
+compression='SLOW';if(isNaN(x)||isNaN(y)){throw new Error("Invalid coordinates passed to jsPDF.addImage");}// if(posX) x += posX;
 // if(posY) y += posY;
 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
 if(notDefined(alias)){alias=generateAliasFromImageData(imageData);}result=checkImagesForAlias.call(this,alias);if(!result){if(supportsArrayBuffer()){// no need to convert if imageData is already uint8array
@@ -100404,7 +100460,7 @@ 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
 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);
 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;// 自定义修改 处理签名图片打印和普通图片打印
 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"){// 自定义修改
-this.pdf.addImage(img.toDataURL("image/jpg"),'',xRect.x,xRect.y,xRect.w,xRect.h);}else{// 自定义修改
+this.pdf.addImage(img.toDataURL("image/png"),'',xRect.x,xRect.y,xRect.w,xRect.h);}else{// 自定义修改
 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;};/**
    * Processes the paths
    *
@@ -199102,8 +199158,8 @@ var es_function_name = __webpack_require__(68309);
 // EXTERNAL MODULE: external {"commonjs":"vue","commonjs2":"vue","root":"Vue"}
 var external_commonjs_vue_commonjs2_vue_root_Vue_ = __webpack_require__(13797);
 var external_commonjs_vue_commonjs2_vue_root_Vue_default = /*#__PURE__*/__webpack_require__.n(external_commonjs_vue_commonjs2_vue_root_Vue_);
-;// 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&
-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()}
+;// 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&
+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()}
 var staticRenderFns = []
 
 
@@ -200028,9 +200084,9 @@ function isPromise(obj) {
     return obj instanceof Promise || (obj && typeof obj.then === 'function');
 }
 
-;// 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&
-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)}
-var HoDocvue_type_template_id_4a474bf6_staticRenderFns = []
+;// 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&
+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)}
+var HoDocvue_type_template_id_4a9748a4_staticRenderFns = []
 
 
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.string.includes.js
@@ -207085,7 +207141,7 @@ var SignNode = __webpack_require__(34450);
 // EXTERNAL MODULE: ./src/editor/dom/treeNode/ParagraphNode.ts
 var ParagraphNode = __webpack_require__(14208);
 ;// CONCATENATED MODULE: ./src/components/version.ts
-/* harmony default export */ var version = ('2.0.60');
+/* harmony default export */ var version = ('2.0.63');
 ;// 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&
 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)}
 var PoperTipTextvue_type_template_id_3fa4e4d3_scoped_true_staticRenderFns = []
@@ -207626,6 +207682,14 @@ var HoDoc = /*#__PURE__*/function (_Vue) {
 
       var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this.hoEditorId);
       if (!e.clickType || e.clickType === 'move') return false;
+      var hoParagrapghTipElementNode = document.querySelector('#ho_paragrapgh_tip');
+
+      if (hoParagrapghTipElementNode) {
+        var _hoParagrapghTipEleme;
+
+        (_hoParagrapghTipEleme = hoParagrapghTipElementNode.parentNode) === null || _hoParagrapghTipEleme === void 0 ? void 0 : _hoParagrapghTipEleme.removeChild(hoParagrapghTipElementNode);
+      }
+
       var node = e.node;
       this.poperClose();
 
@@ -208017,8 +208081,8 @@ HoDoc = __decorate([vue_class_component_esm({
 
 var HoDoc_component = normalizeComponent(
   components_HoDocvue_type_script_lang_ts_,
-  HoDocvue_type_template_id_4a474bf6_render,
-  HoDocvue_type_template_id_4a474bf6_staticRenderFns,
+  HoDocvue_type_template_id_4a9748a4_render,
+  HoDocvue_type_template_id_4a9748a4_staticRenderFns,
   false,
   null,
   null,
@@ -209311,6 +209375,8 @@ var NodeClickEvent = __webpack_require__(25445);
 
 
 
+
+
 var DmouseEventType;
 
 (function (DmouseEventType) {
@@ -209498,6 +209564,8 @@ var NodeMouseMoveEvent = /*#__PURE__*/function () {
   }, {
     key: "NodeClick",
     value: function NodeClick(node, moveType) {
+      var _this = this;
+
       var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID);
 
       if (node instanceof RadioAndCheckBoxNode/* RadioAndCheckBoxNode */.Yh && moveType === DmouseEventType.detClick) {
@@ -209506,6 +209574,44 @@ var NodeMouseMoveEvent = /*#__PURE__*/function () {
         hoEditorFactory.docTree.nodeClick(nodeClickEvent);
         node.drawNodes[0].parent = drawLine;
       }
+
+      if (hoEditorFactory.drawTree.paintStatus === DrawTree/* PaintState.psDesign */.Dh.psDesign) {
+        var paragraphNode = hoEditorFactory.drawTree.getDrawLineByDNode(node.drawNodes[0]).paragraphNode;
+
+        if (paragraphNode && paragraphNode.customProperty) {
+          var customProperty = paragraphNode.customProperty;
+          var paragraphTip = ['男', '女'].includes(customProperty.sex) || customProperty.age && customProperty.age.select == '隐藏';
+          var arr = [];
+
+          if (paragraphTip) {
+            if (['男', '女'].includes(customProperty.sex)) {
+              arr.push("\u60A3\u8005\u4E3A<span style=\"color:#f00\"> ".concat(customProperty.sex, " </span>\u6027\u65F6\uFF0C\u9690\u85CF\u5F53\u524D\u6BB5\u843D"));
+            }
+
+            if (customProperty.age && customProperty.age.select == '隐藏') {
+              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"));
+            }
+
+            if (arr.length > 0) {
+              setTimeout(function () {
+                _this.createParagraphTipHTML(hoEditorFactory.drawTree.caret, arr);
+              }, 0);
+            }
+          }
+        }
+      }
+    }
+  }, {
+    key: "createParagraphTipHTML",
+    value: function createParagraphTipHTML(caret, text) {
+      var _caret$cursor$parentN;
+
+      var tipdiv = document.createElement('div');
+      tipdiv.id = "ho_paragrapgh_tip";
+      tipdiv.style.left = caret.X + "px";
+      tipdiv.style.top = caret.Y + caret.height + "px";
+      tipdiv.innerHTML = text.join("<br />");
+      (_caret$cursor$parentN = caret.cursor.parentNode) === null || _caret$cursor$parentN === void 0 ? void 0 : _caret$cursor$parentN.appendChild(tipdiv);
     }
     /**
      * @param node moveNode
@@ -213061,8 +213167,14 @@ var StructureConvert = /*#__PURE__*/function () {
         var insertNode = function insertNode(array, prevNode) {
           var firstNode = array[0];
 
-          if (firstNode instanceof ParagraphNode/* ParagraphNode */.C && firstNode.paraNo !== 0 && prevNode instanceof ParagraphNode/* ParagraphNode */.C) {
-            prevNode.paraNo = firstNode.paraNo;
+          if (firstNode instanceof ParagraphNode/* ParagraphNode */.C && prevNode instanceof ParagraphNode/* ParagraphNode */.C) {
+            if (firstNode.paraNo !== 0) {
+              prevNode.paraNo = firstNode.paraNo;
+            }
+
+            if (firstNode.customProperty) {
+              prevNode.customProperty = firstNode.customProperty;
+            }
           }
 
           for (var j = 1; j < array.length; j++) {
@@ -220111,7 +220223,7 @@ var VueController = /*#__PURE__*/function () {
 
       if (node instanceof SignNode/* SignNode */.N) {
         if (node.isTemplate) {
-          if (node.imgSrc) {
+          if (node.imgSrc || node.fingerPrintSrc) {
             this.deleteNode(node);
             setTimeout(function () {
               var newcurDomRange = hoEditorFactory.docTree.curDomRange.normalize();
@@ -220145,7 +220257,7 @@ var VueController = /*#__PURE__*/function () {
         var changingEvent = new NodeChangingEvent/* NodeChangingEvent */.Q(DocTree/* DocAction.daInsert */.gk.daInsert, startPath, endPath, NodeChangingEvent/* OperType.insertSign */.y.insertSign);
 
         if (hoEditorFactory.docTree.changing(changingEvent)) {
-          Promise.all([hoEditorFactory.docController.insertSignNode(curDomRange, 1, "患者签名", "", "", "", imgSrc, 0, 0, {}, fingerPrintSrc, fingerPosition)]).then(function () {
+          Promise.all([hoEditorFactory.docController.insertSignNode(curDomRange, 3, "患者签名", "", "", "", imgSrc, 0, 0, {}, fingerPrintSrc, fingerPosition)]).then(function () {
             setTimeout(function () {
               callback && callback();
             }, 0);
@@ -220839,6 +220951,26 @@ var VueController = /*#__PURE__*/function () {
         }
       });
     }
+  }, {
+    key: "clearEditRecords",
+    value: function clearEditRecords() {
+      var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID);
+      var drawMainDocs = hoEditorFactory.drawPageTree.drawMainDocs;
+
+      for (var j = drawMainDocs.length - 1; j >= 0; j--) {
+        var children = drawMainDocs[j].children;
+
+        for (var i = children.length - 1; i >= 0; i--) {
+          var child = children[i];
+
+          if (child.name && child.name.indexOf("recordC") >= 0) {
+            children.splice(i, 1);
+          }
+        }
+
+        hoEditorFactory.drawPageTree.updateDrawPage(j);
+      }
+    }
   }, {
     key: "updateImageSrc",
     value: function updateImageSrc(node, src) {
@@ -224531,7 +224663,8 @@ var HOEditorFactory = /*#__PURE__*/function () {
     this._lastSaveTime = new Date(Date.now());
     this._superiorSigns = []; //上级医生签名
 
-    this._isEnabledGlobalColor = false;
+    this._isEnabledGlobalColor = false; //是否启用全局颜色
+
     this._hoEditorFactoryId = id;
   }
   /**
@@ -225595,9 +225728,9 @@ var HoFooter_component = normalizeComponent(
 )
 
 /* harmony default export */ var components_HoFooter = (HoFooter_component.exports);
-;// 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&
-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)}
-var ControlModalvue_type_template_id_35544190_staticRenderFns = []
+;// 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&
+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)}
+var ControlModalvue_type_template_id_36fbe7eb_staticRenderFns = []
 
 
 ;// 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 +229874,104 @@ var CanvasImageDialog_component = normalizeComponent(
 
 
 
+;// 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&
+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)])}
+var ParagraphDialogvue_type_template_id_461dae42_staticRenderFns = []
+
+
+;// 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&
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+
+/* harmony default export */ var ParagraphDialogvue_type_script_lang_js_ = ({
+  name: 'ParagraphDialog',
+  props: {
+    hoEditorFactoryId: {
+      type: String,
+      required: true
+    },
+    controlStatus: {
+      type: String,
+      required: true
+    },
+    controlProperty: {
+      type: Object,
+      required: true
+    }
+  },
+  inject: ['getParagraphCustomProperty'],
+  data: function data() {
+    return {
+      textActiveName: 'first',
+      animationClassNames: 'control-modal-contents paragraph-modal animation-in'
+    };
+  },
+  computed: {
+    domRange: function domRange() {
+      return this.controlProperty.domRange;
+    }
+  },
+  methods: {
+    sure: function sure() {
+      var _hoEditorFactory$vueC;
+
+      var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this.hoEditorFactoryId);
+      var node = (_hoEditorFactory$vueC = hoEditorFactory.vueController.findNodebyPath(this.domRange.endPath)) === null || _hoEditorFactory$vueC === void 0 ? void 0 : _hoEditorFactory$vueC.node;
+      var paragraphNode = hoEditorFactory.drawTree.getDrawLineByDNode(node.drawNodes[0]).paragraphNode;
+      paragraphNode.setCustomProperty(this.getParagraphCustomProperty());
+      this.handleClose();
+    },
+    handleClose: function handleClose() {
+      this.animationClassNames = 'control-modal-contents paragraph-modal animation-out';
+      this.$emit('closed');
+    }
+  }
+});
+;// CONCATENATED MODULE: ./src/components/controls/paragraph/ParagraphDialog.vue?vue&type=script&lang=js&
+ /* harmony default export */ var paragraph_ParagraphDialogvue_type_script_lang_js_ = (ParagraphDialogvue_type_script_lang_js_); 
+;// 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&
+// extracted by mini-css-extract-plugin
+
+;// CONCATENATED MODULE: ./src/components/controls/paragraph/ParagraphDialog.vue?vue&type=style&index=0&lang=scss&
+
+;// CONCATENATED MODULE: ./src/components/controls/paragraph/ParagraphDialog.vue
+
+
+
+;
+
+
+/* normalize component */
+
+var ParagraphDialog_component = normalizeComponent(
+  paragraph_ParagraphDialogvue_type_script_lang_js_,
+  ParagraphDialogvue_type_template_id_461dae42_render,
+  ParagraphDialogvue_type_template_id_461dae42_staticRenderFns,
+  false,
+  null,
+  null,
+  null
+  
+)
+
+/* harmony default export */ var ParagraphDialog = (ParagraphDialog_component.exports);
 ;// 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&
 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)])}
 var WaterSetvue_type_template_id_58b59c58_staticRenderFns = []
@@ -231416,6 +231647,7 @@ var TableCellProperty_component = normalizeComponent(
 
 
 
+
 
 
 var ControlModal = /*#__PURE__*/function (_Mixins) {
@@ -231526,7 +231758,8 @@ ControlModal = __decorate([vue_class_component_esm({
     PageInfoes: pageInfoes,
     Delimiter: delimiter,
     UploadImageDialog: upload_UploadImageDialog,
-    CanvasImageDialog: CanvasImageDialog
+    CanvasImageDialog: CanvasImageDialog,
+    ParagraphDialog: ParagraphDialog
   }
 })], ControlModal);
 /* harmony default export */ var ControlModalvue_type_script_lang_ts_ = (ControlModal);
@@ -231542,8 +231775,8 @@ ControlModal = __decorate([vue_class_component_esm({
 ;
 var ControlModal_component = normalizeComponent(
   controls_ControlModalvue_type_script_lang_ts_,
-  ControlModalvue_type_template_id_35544190_render,
-  ControlModalvue_type_template_id_35544190_staticRenderFns,
+  ControlModalvue_type_template_id_36fbe7eb_render,
+  ControlModalvue_type_template_id_36fbe7eb_staticRenderFns,
   false,
   null,
   null,
@@ -232667,12 +232900,6 @@ var json_font_namespaceObject = JSON.parse('{"TN":[{"ch":"宋体","en":"SimSun",
 
 
 
-
-
-
-
-
-
 
 
 
@@ -232799,6 +233026,11 @@ var HoDocs = /*#__PURE__*/function (_Mixins) {
     value: function getCustomProperty() {
       return this.customProperty;
     }
+  }, {
+    key: "getParagraphCustomProperty",
+    value: function getParagraphCustomProperty() {
+      return this.paragraphCustomProperty;
+    }
   }, {
     key: "textStyleChange",
     value: function textStyleChange(val) {
@@ -232816,7 +233048,7 @@ var HoDocs = /*#__PURE__*/function (_Mixins) {
   }, {
     key: "controlTypeChange",
     value: function controlTypeChange(newValue, oldValue) {
-      if (newValue === '' && ['text', 'date', 'comment'].includes(oldValue)) {
+      if (newValue === '' && ['text', 'date', 'comment', 'paragraph'].includes(oldValue)) {
         this.$emit('closeTextModal');
         this.customPropertyValue = {};
       }
@@ -232998,16 +233230,17 @@ var HoDocs = /*#__PURE__*/function (_Mixins) {
       var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this.activeDocId);
       nodeInfoes.rightTypeIsTable = hoEditorFactory.docTree.curDomRange.normalize().inSameTable()[0];
       nodeInfoes.rightPosition = rightPosition;
+      var node = nodeInfoes.node();
 
-      var getLabelNode = function getLabelNode() {
+      nodeInfoes.labelNode = function () {
         var labelNode = [];
         var isIncludes = '';
         var hoEditor = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(_this4.activeDocId);
         var currentDomRange = hoEditor.vueController.getDomRange();
 
         if (currentDomRange !== null && currentDomRange !== void 0 && currentDomRange.isEmpty) {
-          if (nodeInfoes.node() instanceof LabelNode/* LabelNode */.P) {
-            labelNode.push(nodeInfoes.node());
+          if (node instanceof LabelNode/* LabelNode */.P) {
+            labelNode.push(node);
             isIncludes = 'toText';
           }
         } else {
@@ -233030,16 +233263,20 @@ var HoDocs = /*#__PURE__*/function (_Mixins) {
           labelNode: [].concat(labelNode),
           isIncludes: isIncludes
         };
-      };
+      }; // 是否是元素类型;
 
-      nodeInfoes.labelNode = getLabelNode; // 是否是元素类型;
 
       nodeInfoes.isElement = false;
-      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 (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) {
-        nodeInfoes.isElement = true;
-      }
+      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 (
+      //     node instanceof TextInputFieldNode ||
+      //     node instanceof DateTimeNode ||
+      //     node instanceof DownListNode ||
+      //     node instanceof RadioAndCheckBoxNode ||
+      //     node instanceof MarkNode ||
+      //     (node instanceof TextNode && node.parentNode instanceof TextInputFieldNode)
+      // ) {
+      //     nodeInfoes.isElement = true;
+      // }
 
       nodeInfoes.isHideComments = hoEditorFactory.isHideComments;
       nodeInfoes.activePageIndex = this.activePageIndex;
@@ -233058,6 +233295,18 @@ var HoDocs = /*#__PURE__*/function (_Mixins) {
         };
       }
 
+      nodeInfoes.getParagraphNode = function () {
+        var _hoEditorFactory$vueC;
+
+        var node = (_hoEditorFactory$vueC = hoEditorFactory.vueController.findNodebyPath(_this4.domRange.endPath)) === null || _hoEditorFactory$vueC === void 0 ? void 0 : _hoEditorFactory$vueC.node;
+
+        if (node) {
+          return hoEditorFactory.drawTree.getDrawLineByDNode(node.drawNodes[0]).paragraphNode;
+        }
+
+        return null;
+      };
+
       this.$emit('rightClickEvent', nodeInfoes);
     }
     /**
@@ -233293,6 +233542,8 @@ __decorate([Prop()], HoDocs.prototype, "uploadImageParams", void 0);
 
 __decorate([Prop()], HoDocs.prototype, "customProperty", void 0);
 
+__decorate([Prop()], HoDocs.prototype, "paragraphCustomProperty", void 0);
+
 __decorate([Prop()], HoDocs.prototype, "deleteImageNodeList", void 0);
 
 __decorate([Prop()], HoDocs.prototype, "pageProperty", void 0);
@@ -233339,6 +233590,8 @@ __decorate([Watch('editJson')], HoDocs.prototype, "editJsonChange", null);
 
 __decorate([Provide()], HoDocs.prototype, "getCustomProperty", null);
 
+__decorate([Provide()], HoDocs.prototype, "getParagraphCustomProperty", null);
+
 __decorate([Watch('textStyle', {
   deep: true
 })], HoDocs.prototype, "textStyleChange", null);