hoeditor-web 2.0.67 → 2.0.71

package/lib/hoeditor.umd.js

@@ -13514,8 +13514,11 @@ var DocController = /*#__PURE__*/function () {
 
       if (node instanceof _treeNode_TextNode__WEBPACK_IMPORTED_MODULE_27__/* .TextNode */ .R && parentNode instanceof _treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_46__/* .TextInputFieldNode */ .re && parentNode.inputFieldType == 1 && isResetFieldText) {
         var firstPath = parentNode.StartMarkNode.getNodePath();
-        var lastPath = hoEditorFactory.docTree.getNodeLastPath(parentNode.EndMarkNode.previousLeaf());
-        curRange = new _DomRange__WEBPACK_IMPORTED_MODULE_31__/* .DomRange */ .a(this._hoEditorFactoryID, firstPath, lastPath);
+
+        if (curRange.isEmpty && curRange.endPath == firstPath) {
+          var lastPath = hoEditorFactory.docTree.getNodeLastPath(parentNode.EndMarkNode.previousLeaf());
+          curRange.endPath = lastPath;
+        }
       }
 
       if (!curRange.isEmpty) {
@@ -14071,7 +14074,7 @@ var DocController = /*#__PURE__*/function () {
                   var preNode = node.previousLeaf();
                   var nextNode = node.nextLeaf();
 
-                  if (node.imgSrc !== "" && node.isTemplate && !(preNode instanceof _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_83__/* .SignNode */ .N) && !(nextNode instanceof _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_83__/* .SignNode */ .N)) {
+                  if ((node.imgSrc !== "" || node.fingerPrintSrc !== "") && node.isTemplate && !(preNode instanceof _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_83__/* .SignNode */ .N) && !(nextNode instanceof _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_83__/* .SignNode */ .N)) {
                     var path = hoEditorFactory.docTree.getNodeLastPath(preNode);
                     var signNode = new _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_83__/* .SignNode */ .N(this._hoEditorFactoryID, node.rootNodes, node.parentNode, _treeNode_BaseNode__WEBPACK_IMPORTED_MODULE_24__/* .NodeType.ntSign */ .Jq.ntSign, 0, 0, node.name === "" ? "医师签名" : node.name, node.signType, node.signFormat, "", "", node.signTimeFormat, "", 0, 0, {}, true, node.styleIndex, node.connectMode, node.isFront, node.allowEditSignTime);
                     hoEditorFactory.undoService.begin();
@@ -16781,11 +16784,11 @@ var DocController = /*#__PURE__*/function () {
 
   }, {
     key: "insertEmptySignNode",
-    value: function insertEmptySignNode(domRange, name, signType, signFormat, signTimeFormat, connectMode, isFront, allowEditSignTime) {
+    value: function insertEmptySignNode(domRange, name, signType, signFormat, signTimeFormat, connectMode, isFront, allowEditSignTime, attribute) {
       var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_77__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
       var startPath = domRange.startPath;
       var parentNode = hoEditorFactory.docTree.getParentNode(startPath);
-      var signNode = new _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_83__/* .SignNode */ .N(this._hoEditorFactoryID, domRange.npStart.roots, parentNode, _treeNode_BaseNode__WEBPACK_IMPORTED_MODULE_24__/* .NodeType.ntSign */ .Jq.ntSign, 0, 0, name, signType, signFormat, "", "", signTimeFormat, "", 0, 0, {}, true, hoEditorFactory.docTree.curStyleIndex, connectMode, isFront, allowEditSignTime); //插入该表达式节点
+      var signNode = new _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_83__/* .SignNode */ .N(this._hoEditorFactoryID, domRange.npStart.roots, parentNode, _treeNode_BaseNode__WEBPACK_IMPORTED_MODULE_24__/* .NodeType.ntSign */ .Jq.ntSign, 0, 0, name, signType, signFormat, "", "", signTimeFormat, "", 0, 0, {}, true, hoEditorFactory.docTree.curStyleIndex, connectMode, isFront, allowEditSignTime, undefined, undefined, attribute); //插入该表达式节点
 
       hoEditorFactory.undoService.begin();
       hoEditorFactory.undoService.add(new _undoRedo_NodeInsertUndoUnit__WEBPACK_IMPORTED_MODULE_25__/* .NodeInsertUndoUnit */ .R(this._hoEditorFactoryID, startPath, signNode));
@@ -16806,7 +16809,15 @@ var DocController = /*#__PURE__*/function () {
     value: function insertSignNode(domRange, type, name, signor, signTime, signTimeFormat, imgSrc, imgWidth, imgHeight, customProperty, fingerPrintSrc, fingerPosition) {
       var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_77__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
       var startPath = domRange.startPath;
-      var parentNode = hoEditorFactory.docTree.getParentNode(startPath);
+      var parentNode = hoEditorFactory.docTree.getParentNode(startPath); // if (type == 1 && imgSrc != "" && imgWidth > 0 && parentNode instanceof CellNode) {
+      //   const cellWidth = parentNode.drawCell.dWidth;
+      //   const cellHeight = parentNode.getCellHeight();
+      //   if (cellWidth < imgWidth) {
+      //     imgHeight = ((cellWidth - 10) / imgWidth) * cellHeight;
+      //     imgWidth = (cellWidth - 10);
+      //   }
+      // }
+
       var signNode = new _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_83__/* .SignNode */ .N(this._hoEditorFactoryID, domRange.npStart.roots, parentNode, _treeNode_BaseNode__WEBPACK_IMPORTED_MODULE_24__/* .NodeType.ntSign */ .Jq.ntSign, 1, type, name, 0, "医师签名", signor, signTime, signTimeFormat, imgSrc, imgWidth, imgHeight, customProperty, false, hoEditorFactory.docTree.curStyleIndex, undefined, undefined, undefined, fingerPrintSrc, fingerPosition); //插入该表达式节点
 
       hoEditorFactory.undoService.begin();
@@ -26344,7 +26355,7 @@ var CellNode = /*#__PURE__*/function (_RectNode) {
     }
   }], [{
     key: "json2Node",
-    value: function json2Node(hoEditorFactoryID, json, rootNodes, tableNode, aRow, rowsMap, rows, defaultCellProperty, isPaste) {
+    value: function json2Node(hoEditorFactoryID, json, rootNodes, tableNode, aRow, rowsMap, rows, defaultCellProperty, isPaste, isClearSign) {
       var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_21__/* .HOEditorFactorys.instance */ .b.instance().getFactory(hoEditorFactoryID);
       var rowNo = parseInt(json.rowNo);
       var colNo = parseInt(json.colNo);
@@ -26415,7 +26426,7 @@ var CellNode = /*#__PURE__*/function (_RectNode) {
           cellNode.childNodes[0].styleIndex = Number(item[0].textStyleNo ? item[0].textStyleNo : 0);
 
           for (var j = 1; j < item.length; j++) {
-            var convertNode = hoEditorFactory.structureConvert.convertNode(item[j], rootNodes, cellNode, undefined, isPaste);
+            var convertNode = hoEditorFactory.structureConvert.convertNode(item[j], rootNodes, cellNode, undefined, isPaste, isClearSign);
 
             if (convertNode) {
               if (convertNode instanceof _TextNode__WEBPACK_IMPORTED_MODULE_36__/* .TextNode */ .R) {
@@ -26423,7 +26434,17 @@ var CellNode = /*#__PURE__*/function (_RectNode) {
                   cellNode.addChild(convertNode);
                 }
               } else {
-                cellNode.addChild(convertNode);
+                if (isClearSign) {
+                  if (convertNode instanceof _SignNode__WEBPACK_IMPORTED_MODULE_33__/* .SignNode */ .N) {
+                    if (convertNode.isTemplate) {
+                      cellNode.addChild(convertNode);
+                    }
+                  } else {
+                    cellNode.addChild(convertNode);
+                  }
+                } else {
+                  cellNode.addChild(convertNode);
+                }
               }
             }
 
@@ -33874,7 +33895,7 @@ var SignNode = /*#__PURE__*/function (_BaseNode) {
 
   var _super = (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createSuper_js__WEBPACK_IMPORTED_MODULE_3__/* ["default"] */ .Z)(SignNode);
 
-  function SignNode(hoEditorFactoryID, rootNodes, pNode, nodeType, number, type, name, signType, signFormat, signor, signTime, signTimeFormat, imgSrc, imgWidth, imgHeight, customProperty, isTemplate, styleIndex, connectMode, isFront, allowEditSignTime, fingerPrintSrc, fingerPosition) {
+  function SignNode(hoEditorFactoryID, rootNodes, pNode, nodeType, number, type, name, signType, signFormat, signor, signTime, signTimeFormat, imgSrc, imgWidth, imgHeight, customProperty, isTemplate, styleIndex, connectMode, isFront, allowEditSignTime, fingerPrintSrc, fingerPosition, attribute) {
     var _this;
 
     (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_classCallCheck_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)(this, SignNode);
@@ -33918,11 +33939,22 @@ var SignNode = /*#__PURE__*/function (_BaseNode) {
 
     _this._PNGToJPG = 0; // 当前签名图片是否已转成jpg  0代表未转换 1代表已转换
 
+    _this._attribute = 0; //签名属性 0:医生签名  1:患者签名 2:ca签名(职称+签名图片)
+
     _this.number = number;
     _this._type = type;
     _this._signor = signor;
     _this._signTime = signTime;
     _this._imgSrc = imgSrc;
+    _this._attribute = attribute === undefined ? 0 : attribute;
+
+    if (type == 3) {
+      // 兼容旧的患者签名
+      _this._attribute = 1;
+    } // if(attribute == 1) { // 患者签名修改 type == 3
+    //     this._type = 3;
+    // }
+
 
     if (fingerPrintSrc) {
       _this._fingerPrintSrc = fingerPrintSrc;
@@ -33968,7 +34000,9 @@ var SignNode = /*#__PURE__*/function (_BaseNode) {
       });
     };
 
-    assignvalue(_this._customProperty, customProperty);
+    if (customProperty) {
+      assignvalue(_this._customProperty, customProperty);
+    }
 
     _this.node2DrawNodeRange(0, 0);
 
@@ -34178,6 +34212,16 @@ var SignNode = /*#__PURE__*/function (_BaseNode) {
         this.node2DrawNodeRange(0, 0);
       }
     }
+  }, {
+    key: "attribute",
+    get: function get() {
+      return this._attribute;
+    },
+    set: function set(value) {
+      if (this._attribute !== value) {
+        this._attribute = value;
+      }
+    }
     /**
     *
     * @param drawTree 绘制树
@@ -34199,7 +34243,7 @@ var SignNode = /*#__PURE__*/function (_BaseNode) {
         this.styleIndex = 0;
       }
 
-      var dNode = new _editor_draw_drawNode_DrawSignNode__WEBPACK_IMPORTED_MODULE_10__/* .DrawSignNode */ .V(this._hoEditorFactoryID, this._rootPath, this, this.number, this.type, this.name, this.imgSrc, this.imgWidth, this.imgHeight, cbStyle, this.fingerPrintSrc, this.fingerPosition);
+      var dNode = new _editor_draw_drawNode_DrawSignNode__WEBPACK_IMPORTED_MODULE_10__/* .DrawSignNode */ .V(this._hoEditorFactoryID, this._rootPath, this, this.number, this.type, this.name, this.imgSrc, this.imgWidth, this.imgHeight, cbStyle, this.fingerPrintSrc, this.fingerPosition, this.attribute, this.customProperty);
 
       this._drawNodes.push(dNode);
     }
@@ -34233,15 +34277,15 @@ var SignNode = /*#__PURE__*/function (_BaseNode) {
       if (isDisPlay) {
         drawNode.alpha = 1;
 
-        if (this.imgSrc === "") {
-          var color = hoEditorFactory.option.getColorByLevel(0);
+        if (this.imgSrc === "" && this.fingerPrintSrc === "") {
+          var color = hoEditorFactory.option.getColorByLevel(13);
           var backColor = new createjs.Shape();
           backColor.graphics.clear().beginFill(color).drawRect(0, -drawNode.dHeight + 2, drawNode.dWidth, drawNode.dHeight);
           backColor.name = "backColor";
           drawNode.addChildAt(backColor, 0);
         }
       } else {
-        if (this.imgSrc === "") {
+        if (this.imgSrc === "" && this.fingerPrintSrc === "") {
           drawNode.alpha = 0;
         } else {
           for (var i = drawNode.children.length - 1; i >= 0; i--) {
@@ -34282,7 +34326,8 @@ var SignNode = /*#__PURE__*/function (_BaseNode) {
         isFront: this.isFront,
         allowEditSignTime: this.allowEditSignTime,
         fingerPrintSrc: clearSign ? "" : this.fingerPrintSrc,
-        fingerPosition: clearSign ? 0 : this.fingerPosition
+        fingerPosition: clearSign ? 0 : this.fingerPosition,
+        attribute: this.attribute
       };
 
       if (isCopy) {
@@ -34303,14 +34348,15 @@ var SignNode = /*#__PURE__*/function (_BaseNode) {
     }
   }], [{
     key: "json2Node",
-    value: function json2Node(hoEditorFactoryID, json, rootNodes, pNode) {
+    value: function json2Node(hoEditorFactoryID, json, rootNodes, pNode, isClearSign) {
       //const width = Number(json.width);
-      var number = Number(json.number);
-      var type = Number(json.type);
-      var imgWidth = Number(json.imgWidth);
-      var imgHeight = Number(json.imgHeight);
+      var number = isClearSign ? 0 : Number(json.number);
+      var type = isClearSign ? 0 : Number(json.type);
+      var imgWidth = isClearSign ? 0 : Number(json.imgWidth);
+      var imgHeight = isClearSign ? 0 : Number(json.imgHeight);
       var isTemplate = json.isTemplate === true || json.isTemplate === "true" ? true : false;
-      var signNode = new SignNode(hoEditorFactoryID, rootNodes, pNode ? pNode : null, _BaseNode__WEBPACK_IMPORTED_MODULE_13__/* .NodeType.ntSign */ .Jq.ntSign, number, type, json.name, json.signType ? Number(json.signType) : 0, json.signFormat ? json.signFormat : "签名医师", json.signor, json.signTime, json.signTimeFormat ? json.signTimeFormat : "yyyy-MM-dd HH:mm", json.imgSrc, imgWidth, imgHeight, json.customProperty, isTemplate, json.styleIndex ? Number(json.styleIndex) : undefined, json.connectMode, json.isFront, json.allowEditSignTime, json.fingerPrintSrc, json.fingerPosition);
+      var attribute = json.attribute ? Number(json.attribute) : 0;
+      var signNode = new SignNode(hoEditorFactoryID, rootNodes, pNode ? pNode : null, _BaseNode__WEBPACK_IMPORTED_MODULE_13__/* .NodeType.ntSign */ .Jq.ntSign, number, type, json.name, json.signType ? Number(json.signType) : 0, json.signFormat ? json.signFormat : "签名医师", isClearSign ? "" : json.signor, isClearSign ? "" : json.signTime, json.signTimeFormat ? json.signTimeFormat : "yyyy-MM-dd HH:mm", isClearSign ? "" : json.imgSrc, imgWidth, imgHeight, isClearSign ? undefined : json.customProperty, isTemplate, json.styleIndex ? Number(json.styleIndex) : undefined, json.connectMode, json.isFront, json.allowEditSignTime, isClearSign ? "" : json.fingerPrintSrc, isClearSign ? 0 : json.fingerPosition, attribute);
       signNode.PNGToJPG = json.PNGToJPG == 1 ? 1 : 0; //signNode.number = number;
       //signNode.width = width;
 
@@ -38360,7 +38406,7 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
     }
   }], [{
     key: "json2Node",
-    value: function json2Node(hoEditorFactoryID, json, rootNodes, pNode, isPaste) {
+    value: function json2Node(hoEditorFactoryID, json, rootNodes, pNode, isPaste, isClearSign) {
       json = this.transType(json);
       var tableProperty = json.tableProperty;
       tableProperty.customProperties = Array.isArray(tableProperty.customProperties.customProperty) ? tableProperty.customProperties.customProperty : Array(tableProperty.customProperties.customProperty);
@@ -38581,7 +38627,7 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
 
           var colNo = parseInt(_node.colNo);
           existMap.set(_rowNo + "-" + colNo, 1);
-          aRow = _CellNode__WEBPACK_IMPORTED_MODULE_26__/* .CellNode.json2Node */ .D.json2Node(hoEditorFactoryID, _node, rootNodes, tableNode, aRow, rowsMap, rows, defaultCellProperty, isPaste);
+          aRow = _CellNode__WEBPACK_IMPORTED_MODULE_26__/* .CellNode.json2Node */ .D.json2Node(hoEditorFactoryID, _node, rootNodes, tableNode, aRow, rowsMap, rows, defaultCellProperty, isPaste, isClearSign);
         }
       } // console.log("json2node", 8);
       //console.log(existMap);
@@ -38774,7 +38820,7 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
 /*
  * @Author: your name
  * @Date: 2020-11-03 15:17:54
- * @LastEditTime: 2022-05-18 20:22:59
+ * @LastEditTime: 2022-07-13 14:11:55
  * @LastEditors: liyanan 2441631434@qq.com
  * @Description: In User Settings Edit
  * @FilePath: \hoeditor-web\src\editor\dom\treeNode\TextInputFieldNode.ts
@@ -40600,7 +40646,7 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
     }
   }], [{
     key: "json2Node",
-    value: function json2Node(hoEditorFactoryID, json, rootNodes, pNode, isPaste) {
+    value: function json2Node(hoEditorFactoryID, json, rootNodes, pNode, isPaste, isClearSign) {
       var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_32__/* .HOEditorFactorys.instance */ .b.instance().getFactory(hoEditorFactoryID);
       delete json.nodeType;
       this.transType(json);
@@ -40631,7 +40677,7 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
           if (Array.isArray(item)) {
             //数组
             for (var i = 0; i < item.length; i++) {
-              var node = hoEditorFactory.structureConvert.convertNode(item[i], rootNodes, temp);
+              var node = hoEditorFactory.structureConvert.convertNode(item[i], rootNodes, temp, undefined, undefined, isClearSign);
 
               if (node) {
                 if (node instanceof _TextNode__WEBPACK_IMPORTED_MODULE_51__/* .TextNode */ .R) {
@@ -40639,7 +40685,17 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
                     nodes.push(node);
                   }
                 } else {
-                  nodes.push(node);
+                  if (isClearSign) {
+                    if (node instanceof _SignNode__WEBPACK_IMPORTED_MODULE_48__/* .SignNode */ .N) {
+                      if (node.isTemplate) {
+                        nodes.push(node);
+                      }
+                    } else {
+                      nodes.push(node);
+                    }
+                  } else {
+                    nodes.push(node);
+                  }
                 }
               }
 
@@ -40653,7 +40709,7 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
             }
           } else {
             //单个对象
-            var _node2 = hoEditorFactory.structureConvert.convertNode(item, rootNodes, temp);
+            var _node2 = hoEditorFactory.structureConvert.convertNode(item, rootNodes, temp, undefined, undefined, isClearSign);
 
             if (_node2) {
               if (_node2 instanceof _TextNode__WEBPACK_IMPORTED_MODULE_51__/* .TextNode */ .R) {
@@ -40661,7 +40717,18 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
                   nodes.push(_node2);
                 }
               } else {
-                nodes.push(_node2);
+                //nodes.push(node);
+                if (isClearSign) {
+                  if (_node2 instanceof _SignNode__WEBPACK_IMPORTED_MODULE_48__/* .SignNode */ .N) {
+                    if (_node2.isTemplate) {
+                      nodes.push(_node2);
+                    }
+                  } else {
+                    nodes.push(_node2);
+                  }
+                } else {
+                  nodes.push(_node2);
+                }
               }
             }
 
@@ -46087,6 +46154,7 @@ var DrawCell = /*#__PURE__*/function (_DrawRect) {
       dParent.addChild(dPartCell);
       this.drawPageCells.push(dPartCell);
       dPartCell.paintArea(this._drawLines, startDline, valignTop);
+      dPartCell.valignTop = valignTop;
       ret = this._drawLines[this._drawLines.length - 1].dHeight + this._drawLines[this._drawLines.length - 1].dTop;
     }
   }, {
@@ -48279,7 +48347,7 @@ var DrawPageCell = /*#__PURE__*/function (_DrawArea) {
 
 
     return _this;
-  } // public get pageIndex(): number {
+  } // public ge t pageIndex(): number {
   //   return this._pageIndex;
   // }
   // public set pageIndex(value: number) {
@@ -48330,6 +48398,9 @@ var DrawPageCell = /*#__PURE__*/function (_DrawArea) {
     key: "valignTop",
     get: function get() {
       return this._valignTop;
+    },
+    set: function set(val) {
+      this._valignTop = val;
     } // public get dPage(): DrawPage {
     //   return this._dPage;
     // }
@@ -48799,7 +48870,7 @@ var DrawPageCell = /*#__PURE__*/function (_DrawArea) {
           var adjustValignTop = newValignTop - this._valignTop;
           this._valignTop = newValignTop;
 
-          for (var i = 0; i < this.numChildren - 1; i++) {
+          for (var i = 0; i < this.numChildren; i++) {
             if (this.children[i] instanceof DrawLine/* DrawLine */.a || this.children[i] instanceof DrawPageTable/* DrawPageTable */.ox) {
               this.children[i].y += adjustValignTop;
             }
@@ -48842,12 +48913,10 @@ var DrawPageCell = /*#__PURE__*/function (_DrawArea) {
   }, {
     key: "update",
     value: function update(prevDrawArea, dlines, startIndex, dTop, restHeight) {
-      var valignTop = dTop;
-
-      if (startIndex === 0) {
-        valignTop = this.calcValignTop();
-        this._valignTop = valignTop;
-      }
+      var valignTop = dTop; // if (startIndex === 0) {
+      //    valignTop=this.calcValignTop();
+      //    this._valignTop=valignTop;
+      // }
 
       this._startDline = startIndex;
 
@@ -49443,7 +49512,7 @@ var DrawPageTable = /*#__PURE__*/function (_DrawRect) {
 
       partCell.dHeight = newHeight;
       partCell.maxHeight = newHeight;
-      partCell.update(dPrevPartCell, partCell.cell.drawCell.drawLines, startChildIndex, 0, newHeight);
+      partCell.update(dPrevPartCell, partCell.cell.drawCell.drawLines, startChildIndex, partCell.valignTop, newHeight);
       dPageTable.paintCellBorder(partCell, r, c, newHeight);
     }
   }, {
@@ -49934,7 +50003,7 @@ var DrawPageTable = /*#__PURE__*/function (_DrawRect) {
             dPartCell.x = aleft; //this.drawItems.push(dPartCell);
 
             this.addChild(dPartCell);
-            var ret = dPartCell.update(dPrevPartCell, cell.drawCell.drawLines, startChildIndex, 0, cellMaxHeight);
+            var ret = dPartCell.update(dPrevPartCell, cell.drawCell.drawLines, startChildIndex, dPartCell.valignTop, cellMaxHeight);
             dPartCell.y = cellRowTop;
           } else {
             dPartCell = cell.drawCell.drawPageCells[partCellindex + 1];
@@ -49958,7 +50027,7 @@ var DrawPageTable = /*#__PURE__*/function (_DrawRect) {
                 dPartCell.maxHeight = tableRestHeight - cellRowTop;
               }
 
-              var _ret = dPartCell.update(dPrevPartCell, cell.drawCell.drawLines, startChildIndex, 0, cellMaxHeight);
+              var _ret = dPartCell.update(dPrevPartCell, cell.drawCell.drawLines, startChildIndex, dPartCell.valignTop, cellMaxHeight);
             }
 
             dPartCell.y = cellRowTop;
@@ -50164,7 +50233,13 @@ var DrawPageTable = /*#__PURE__*/function (_DrawRect) {
           var partCell = mainCell.drawCell.getDrawPageCell(this);
 
           if (partCell && aHeight) {
-            rowHeight = Math.max(aHeight, partCell.docHeight);
+            var cellHeight = aHeight;
+
+            if (mainCell.rowSpan > 1) {
+              cellHeight = partCell.dHeight;
+            }
+
+            rowHeight = Math.max(cellHeight, partCell.docHeight);
             rowSpan = mainCell.rowSpan;
           }
         }
@@ -50487,7 +50562,7 @@ var DrawPageTable = /*#__PURE__*/function (_DrawRect) {
               dPartCell.x = aleft; //this.drawItems.push(dPartCell);
 
               this.addChild(dPartCell);
-              var ret = dPartCell.update(dPrevPartCell, _cell2.drawCell.drawLines, startChildIndex, 0, cellMaxHeight);
+              var ret = dPartCell.update(dPrevPartCell, _cell2.drawCell.drawLines, startChildIndex, dPartCell.valignTop, cellMaxHeight);
               dPartCell.y = cellRowTop;
               rowFinished = rowFinished && ret;
             } else {
@@ -50517,7 +50592,7 @@ var DrawPageTable = /*#__PURE__*/function (_DrawRect) {
 
                 bRowHeightChanged = true;
 
-                var _ret2 = dPartCell.update(dPrevPartCell, _cell2.drawCell.drawLines, startChildIndex, 0, cellMaxHeight);
+                var _ret2 = dPartCell.update(dPrevPartCell, _cell2.drawCell.drawLines, startChildIndex, dPartCell.valignTop, cellMaxHeight);
 
                 rowFinished = rowFinished && _ret2;
               } else if (_cell2.drawCell.drawPageCells.length > 1 && partCellindex + 1 < _cell2.drawCell.drawPageCells.length - 1 && !this._table.rowInfos[r].rowProperty.repeatAsTitleAtPageTop) {
@@ -51349,7 +51424,7 @@ var DrawRect = /*#__PURE__*/function (_DrawContainer) {
 /*
  * @Author: your name
  * @Date: 2021-09-01 16:51:49
- * @LastEditTime: 2022-05-23 13:51:45
+ * @LastEditTime: 2022-07-18 16:38:54
  * @LastEditors: liyanan 2441631434@qq.com
  * @Description: In User Settings Edit
  * @FilePath: \hoeditor-web\src\editor\draw\drawNode\DrawSignNode.ts
@@ -51360,7 +51435,7 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
 
   var _super = (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createSuper_js__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z)(DrawSignNode);
 
-  function DrawSignNode(hoeditfactoryID, rootPath, node, number, type, name, imgSrc, imgWidth, imgHeight, cbStyle, fingerPrintSrc, fingerPosition) {
+  function DrawSignNode(hoeditfactoryID, rootPath, node, number, type, name, imgSrc, imgWidth, imgHeight, cbStyle, fingerPrintSrc, fingerPosition, attribute, customProperty) {
     var _this;
 
     (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_classCallCheck_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z)(this, DrawSignNode);
@@ -51372,12 +51447,17 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
     _this._imgSrc = '';
     _this._fingerPrintSrc = '';
     _this._fingerPosition = 0;
+    _this._attribute = 0; //签名属性 0:医生签名  1:患者签名 2:ca签名(职称+签名图片)
+
+    _this._abi02 = "";
     _this._number = number;
     _this._imgSrc = imgSrc;
     _this._type = type;
     _this._signName = name;
     _this._fingerPrintSrc = fingerPrintSrc;
-    _this._fingerPosition = fingerPosition; //this._textStyle = cbStyle.;
+    _this._fingerPosition = fingerPosition;
+    _this._attribute = attribute;
+    _this._abi02 = customProperty && customProperty.abi02 ? customProperty.abi02 : ""; //this._textStyle = cbStyle.;
 
     _this.dHeight = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_7__/* .HOEditorFactorys.instance */ .b.instance().getFactory(hoeditfactoryID).signHeight; //this.dHeight = 40;
 
@@ -51417,6 +51497,11 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
         } else {
           _this.dWidth = imgWidth * scale + _this._drawText.getMeasuredWidth();
         }
+
+        if (_this.attribute === 2 && _this._abi02 !== "") {
+          _this._drawAbi02 = new createjs.Text(customProperty.abi02 + ":", _this._textStyle, '#000000');
+          _this.dWidth += _this._drawAbi02.getMeasuredWidth();
+        }
       }
 
       if (type === 2) {
@@ -51530,6 +51615,26 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
         this._textStyle = value;
       }
     }
+  }, {
+    key: "attribute",
+    get: function get() {
+      return this._attribute;
+    },
+    set: function set(value) {
+      if (this._attribute !== value) {
+        this._attribute = value;
+      }
+    }
+  }, {
+    key: "abi02",
+    get: function get() {
+      return this._abi02;
+    },
+    set: function set(value) {
+      if (this._abi02 !== value) {
+        this._abi02 = value;
+      }
+    }
   }, {
     key: "drawWriteSignNode",
     value: function drawWriteSignNode(node) {
@@ -51727,22 +51832,54 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
             }
           }
 
-          _this3.addChildAt(bitmap, 0);
+          if (_this3.attribute === 2 && _this3.abi02 !== "") {
+            var abi02Text = new createjs.Text(_this3.abi02 + ":", _this3.textStyle, '#000000');
+            abi02Text.textBaseline = 'alphabetic';
+            abi02Text.textAlign = 'left';
+
+            _this3.addChildAt(abi02Text, 0);
+
+            bitmap.x = abi02Text.getMeasuredWidth();
+
+            _this3.addChildAt(bitmap);
+          } else {
+            _this3.addChildAt(bitmap, 0);
+          }
 
           var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_7__/* .HOEditorFactorys.instance */ .b.instance().getFactory(drawNode.node.hoEditorFactoryID);
           hoEditorFactory.loadImageCount++;
 
           image.onload = function () {
             var hitWidth = image.naturalWidth !== 0 ? image.naturalWidth : image.width;
-            var hitHeight = image.naturalHeight !== 0 ? image.naturalHeight : image.height;
-            drawNode.dWidth = hitWidth * hoEditorFactory.signHeight / image.naturalHeight + _this3._drawText.getMeasuredWidth();
-            var width = drawNode.dWidth;
+            var hitHeight = image.naturalHeight !== 0 ? image.naturalHeight : image.height; // 处理宽高和实际宽高相反的问题  --- 2.0.66版本问题 --2.0.68后版本临时处理  再过几个版本后可以删掉
+
+            var node = _this3.node;
+            var nodeImageWidth = node.imgWidth;
+            var nodeImageHeight = node.imgHeight;
+
+            if (image.naturalWidth > image.naturalHeight && nodeImageWidth < nodeImageHeight || image.naturalWidth < image.naturalHeight && node.imgWidth > node.imgHeight) {
+              node.imgWidth = nodeImageHeight;
+              node.imgHeight = nodeImageWidth;
+            }
+
+            var width = hitWidth * hoEditorFactory.signHeight / image.naturalHeight; //+ this._drawText.getMeasuredWidth();
+
+            drawNode.dWidth = width;
+
+            if (drawNode.attribute === 2 && drawNode.abi02 !== "") {
+              drawNode.dWidth += drawNode._drawAbi02.getMeasuredWidth();
+            }
 
             if (_this3.number === 2) {
-              width = width - drawNode._drawText.getMeasuredWidth();
+              drawNode.dWidth += _this3._drawText.getMeasuredWidth();
+            }
+
+            if (drawNode.attribute === 2 && drawNode.abi02 !== "") {
+              bitmap.setTransform(drawNode._drawAbi02.getMeasuredWidth(), -hoEditorFactory.signHeight + 2, width / hitWidth, drawNode.dHeight / hitHeight);
+            } else {
+              bitmap.setTransform(0, -hoEditorFactory.signHeight, width / hitWidth, drawNode.dHeight / hitHeight);
             }
 
-            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); //这里是图片大小
 
@@ -57558,7 +57695,7 @@ var DrawTree = /*#__PURE__*/function () {
       var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID);
 
       try {
-        //   console.time("文档change事件");
+        //console.time("文档change事件");
         this._inChanging = true;
         var startUpdateLine;
         this.adjustEventPath(e);
@@ -57953,7 +58090,7 @@ var DrawTree = /*#__PURE__*/function () {
 
       if (hoEditorFactory.docTree.curOnDragNode) {
         this._caret.visible = false;
-      } // console.timeEnd("文档change事件");
+      } //console.timeEnd("文档change事件");
 
 
       return true;
@@ -59636,8 +59773,8 @@ var DrawTree = /*#__PURE__*/function () {
             }
 
             if (dPage && dPage.selectContainer) {
-              var shape = new DrawSelect(this._hoEditorFactoryID, dPage.pageIndex, dnextDline, left, right, bInSameRect, aRange.spStart.dline.paragraphNode.parentNode, aRange.spEnd.dline.paragraphNode.parentNode, "#FFF07E");
-              shape.alpha = 0.5;
+              var shape = new DrawSelect(this._hoEditorFactoryID, dPage.pageIndex, dnextDline, left, right, bInSameRect, aRange.spStart.dline.paragraphNode.parentNode, aRange.spEnd.dline.paragraphNode.parentNode, "#FB0451");
+              shape.alpha = 0.3;
               dPage.selectContainer.addChild(shape);
 
               if (dPages.indexOf(dPage) < 0) {
@@ -62665,7 +62802,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__(60199);
 /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(91347);
 /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_classCallCheck_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(42015);
-/* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_36__ = __webpack_require__(16296);
+/* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_37__ = __webpack_require__(16296);
 /* 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);
@@ -62706,6 +62843,8 @@ var NodeStyleUndoUnit = /*#__PURE__*/function () {
 /* harmony import */ var _dom_treeNode_DownListNode__WEBPACK_IMPORTED_MODULE_33__ = __webpack_require__(76771);
 /* harmony import */ var _NodeInsertUndoUnit__WEBPACK_IMPORTED_MODULE_34__ = __webpack_require__(11438);
 /* harmony import */ var _dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_35__ = __webpack_require__(78975);
+/* harmony import */ var _dom_NodePosition__WEBPACK_IMPORTED_MODULE_36__ = __webpack_require__(14245);
+
 
 
 
@@ -62781,7 +62920,7 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
     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_36__/* ["default"] */ .Z)(NodesDeleteUndoUnit, [{
+  (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_37__/* ["default"] */ .Z)(NodesDeleteUndoUnit, [{
     key: "undo",
     value: function undo() {
       //2.插入删除的节点
@@ -63060,7 +63199,7 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
     key: "spliteNode",
     value: function spliteNode(Arange) {
       var _this = this,
-          _s$parentNode$downLis;
+          _pnode$downListProper;
 
       var s = Arange.npStart.node;
       var e = Arange.npEnd.node;
@@ -63116,8 +63255,21 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
 
       this._tmp.start = Arange.startPath;
       this._tmp.end = Arange.endPath;
+      var spnode = s.parentNode;
+      var epnode = e.parentNode;
+      var pnode = epnode;
+
+      if (spnode instanceof _dom_treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_22__/* .TextInputFieldNode */ .re && epnode instanceof _dom_treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_22__/* .TextInputFieldNode */ .re && spnode != epnode) {
+        var result = _dom_NodePosition__WEBPACK_IMPORTED_MODULE_36__/* .NodePosition.nodePositionCompare */ .F.nodePositionCompare(spnode.StartMarkNode, epnode.StartMarkNode);
 
-      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("<元素>")) {
+        if (result < 0) {
+          pnode = spnode;
+        }
+      }
+
+      if (this._isForceDelete && pnode instanceof _dom_treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_22__/* .TextInputFieldNode */ .re && pnode.inputFieldType === 1 && (_pnode$downListProper = pnode.downListProperty.listItems) !== null && _pnode$downListProper !== void 0 && _pnode$downListProper.includes("<元素>")) {
+        this._tmp.start = pnode.StartMarkNode.getNodePath();
+        this._tmp.end = hoEditorFactory.docTree.getNodeLastPath(pnode.EndMarkNode.previousLeaf());
         return true;
       }
 
@@ -207287,7 +207439,7 @@ var SignNode = __webpack_require__(78975);
 // EXTERNAL MODULE: ./src/editor/dom/treeNode/ParagraphNode.ts
 var ParagraphNode = __webpack_require__(13880);
 ;// CONCATENATED MODULE: ./src/components/version.ts
-/* harmony default export */ var version = ('2.0.67');
+/* harmony default export */ var version = ('2.0.71');
 ;// 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 = []
@@ -209798,7 +209950,7 @@ var UserInfo = __webpack_require__(82084);
 /*
  * @Author: your name
  * @Date: 2021-06-21 17:47:51
- * @LastEditTime: 2022-07-08 23:50:19
+ * @LastEditTime: 2022-07-18 14:39:07
  * @LastEditors: liyanan 2441631434@qq.com
  * @Description: In User Settings Edit
  * @FilePath: \hoeditor-web\src\editor\runTimeInfo\Option.ts
@@ -209821,6 +209973,8 @@ var Option = /*#__PURE__*/function () {
 
     this._downListColor2 = "#D2ACB1"; //下拉列表默认元素颜色
 
+    this._signColor = "transparent"; //签名元素颜色
+
     this._hoEditorFactoryID = hoEditorFactoryID;
   }
 
@@ -209888,9 +210042,17 @@ var Option = /*#__PURE__*/function () {
     set: function set(value) {
       this._downListColor2 = value;
     }
+  }, {
+    key: "signColor",
+    get: function get() {
+      return this._signColor;
+    },
+    set: function set(value) {
+      this._signColor = value;
+    }
   }, {
     key: "setReviewLevelColor",
-    value: function setReviewLevelColor(Lev1Color, Lev2Color, Lev3Color, fieldColor, dateTimeColor, downListColor, downListColor2) {
+    value: function setReviewLevelColor(Lev1Color, Lev2Color, Lev3Color, fieldColor, dateTimeColor, downListColor, downListColor2, signColor) {
       Lev1Color && (this._reviewLev1Color = Lev1Color);
       Lev2Color && (this._reviewLev2Color = Lev2Color);
       Lev3Color && (this._reviewLev3Color = Lev3Color);
@@ -209898,6 +210060,7 @@ var Option = /*#__PURE__*/function () {
       dateTimeColor && (this._dateTimeColor = dateTimeColor);
       downListColor && (this._downListColor = downListColor);
       downListColor2 && (this._downListColor2 = downListColor2);
+      signColor && (this._signColor = signColor);
     }
   }, {
     key: "getColorByLevel",
@@ -209916,6 +210079,8 @@ var Option = /*#__PURE__*/function () {
         return this._reviewLev2Color;
       } else if (level === 3) {
         return this._reviewLev3Color;
+      } else if (level === 13) {
+        return this._signColor;
       } else {
         return "transparent";
       }
@@ -211936,7 +212101,7 @@ var StructureConvert = /*#__PURE__*/function () {
     }
   }, {
     key: "xml2Doc",
-    value: function xml2Doc(xml) {
+    value: function xml2Doc(xml, isClearSign) {
       // xml = this.replaceNodesName(xml);
       // const x2js = new X2JS({ stripWhitespaces: false });
       // const object = x2js.xml2js(xml);
@@ -211988,7 +212153,7 @@ var StructureConvert = /*#__PURE__*/function () {
       var aobject = this.xml2Object(xml);
 
       if (aobject) {
-        return this.json2Doc(aobject);
+        return this.json2Doc(aobject, isClearSign);
       } // if (json.rvxml) {
       //   const rvxml = json.rvxml;
       //   return;
@@ -212580,7 +212745,7 @@ var StructureConvert = /*#__PURE__*/function () {
     }
   }, {
     key: "json2Doc",
-    value: function json2Doc(xx) {
+    value: function json2Doc(xx, isClearSign) {
       var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID);
       /*
       const pushChildNodes = (
@@ -212707,11 +212872,15 @@ var StructureConvert = /*#__PURE__*/function () {
       var histories = xx.userHistories;
       var historiesArr = histories.userHistory;
 
+      if (historiesArr.length == undefined) {
+        historiesArr = Array(historiesArr);
+      }
+
       for (var _i10 = 0; _i10 < historiesArr.length; _i10++) {
         var historyObj = historiesArr[_i10];
         var history = new UserHistory/* UserHistory */.R(this._hoEditorFactoryID, UserHistory/* HistoryEditType.hetCreate */.N.hetCreate);
         Object.assign(history, historyObj);
-        history.permissionLevel = Number(historyObj._permissionLevel);
+        history.permissionLevel = Number(historyObj.permissionLevel);
         hoEditorFactory.docTree.userHistories.push(history);
       }
 
@@ -212853,7 +213022,7 @@ var StructureConvert = /*#__PURE__*/function () {
               }
 
               var node = hoEditorFactory.structureConvert.convertNode(header, //headerNodes[hi],
-              headerDocTree.subDocNodes, null, headerNode.subDocNodes);
+              headerDocTree.subDocNodes, null, headerNode.subDocNodes, undefined, isClearSign);
 
               if (node) {
                 node.rootPath = "header/" + hi.toString(); //   if (node instanceof BaseCombineNode) {
@@ -212913,7 +213082,7 @@ var StructureConvert = /*#__PURE__*/function () {
               }
 
               var _node2 = hoEditorFactory.structureConvert.convertNode(footer, //footerNodes[fi],
-              footSubDocTree.subDocNodes, null, footerNode.subDocNodes);
+              footSubDocTree.subDocNodes, null, footerNode.subDocNodes, undefined, isClearSign);
 
               if (_node2) {
                 _node2.rootPath = "footer/" + fi.toString(); // if (node instanceof BaseCombineNode) {
@@ -212958,7 +213127,7 @@ var StructureConvert = /*#__PURE__*/function () {
           continue;
         }
 
-        var _node3 = hoEditorFactory.structureConvert.convertNode(temp, hoEditorFactory.docTree.mainNodes, null, mainNodes);
+        var _node3 = hoEditorFactory.structureConvert.convertNode(temp, hoEditorFactory.docTree.mainNodes, null, mainNodes, undefined, isClearSign);
 
         if (_node3) {
           // if (node instanceof BaseCombineNode && temp.childNode) {
@@ -213102,7 +213271,7 @@ var StructureConvert = /*#__PURE__*/function () {
     }
   }, {
     key: "convertNode",
-    value: function convertNode(temp, rootNodes, parentNode, nodes, isPaste) {
+    value: function convertNode(temp, rootNodes, parentNode, nodes, isPaste, isClearSign) {
       if (temp === "") {
         return undefined;
       }
@@ -213138,7 +213307,7 @@ var StructureConvert = /*#__PURE__*/function () {
           return undefined;
         }
 
-        var node = TableNode/* TableNode.json2Node */.Fh.json2Node(this._hoEditorFactoryID, temp, rootNodes, parentNode, isPaste);
+        var node = TableNode/* TableNode.json2Node */.Fh.json2Node(this._hoEditorFactoryID, temp, rootNodes, parentNode, isPaste, isClearSign);
         return node;
       } else if (temp.nodeType == BaseNode/* NodeType.ntParagraph */.Jq.ntParagraph) {
         return ParagraphNode/* ParagraphNode.json2Node */.C.json2Node(this._hoEditorFactoryID, temp, rootNodes, parentNode);
@@ -213175,7 +213344,7 @@ var StructureConvert = /*#__PURE__*/function () {
           return RadioAndCheckBoxNode/* RadioAndCheckBoxNode.json2Node */.Yh.json2Node(this._hoEditorFactoryID, temp, rootNodes, parentNode, isPaste);
         }
       } else if (temp.nodeType == BaseNode/* NodeType.ntField */.Jq.ntField) {
-        return TextInputFieldNode/* TextInputFieldNode.json2Node */.re.json2Node(this._hoEditorFactoryID, temp, rootNodes, parentNode, isPaste);
+        return TextInputFieldNode/* TextInputFieldNode.json2Node */.re.json2Node(this._hoEditorFactoryID, temp, rootNodes, parentNode, isPaste, isClearSign);
       } else if (temp.nodeType == BaseNode/* NodeType.ntSpecialChar */.Jq.ntSpecialChar) {
         return SpecialCharsNode/* SpecialCharsNode.json2Node */.y.json2Node(this._hoEditorFactoryID, temp, rootNodes, parentNode);
       } else if (temp.nodeType == BaseNode/* NodeType.ntMark */.Jq.ntMark) {
@@ -213191,7 +213360,7 @@ var StructureConvert = /*#__PURE__*/function () {
       } else if (temp.nodeType == BaseNode/* NodeType.ntLabel */.Jq.ntLabel) {
         return LabelNode/* LabelNode.json2Node */.P.json2Node(this._hoEditorFactoryID, temp, rootNodes, parentNode);
       } else if (temp.nodeType == BaseNode/* NodeType.ntSign */.Jq.ntSign) {
-        return SignNode/* SignNode.json2Node */.N.json2Node(this._hoEditorFactoryID, temp, rootNodes, parentNode);
+        return SignNode/* SignNode.json2Node */.N.json2Node(this._hoEditorFactoryID, temp, rootNodes, parentNode, isClearSign);
       } else if (temp.nodeType == BaseNode/* NodeType.ntGestation */.Jq.ntGestation) {
         return GestationNode/* GestationNode.json2Node */.G.json2Node(this._hoEditorFactoryID, temp, rootNodes, parentNode);
       }
@@ -213285,13 +213454,13 @@ var StructureConvert = /*#__PURE__*/function () {
     }
   }, {
     key: "openXml",
-    value: function openXml(xml, callback, isDelBlockLine) {
+    value: function openXml(xml, callback, isDelBlockLine, isClearSign) {
       var _this4 = this;
 
       var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID);
       this._superiorSign = [];
       hoEditorFactory.isThrowError = false;
-      var nodes = hoEditorFactory.structureConvert.xml2Doc(xml);
+      var nodes = hoEditorFactory.structureConvert.xml2Doc(xml, isClearSign);
       Promise.resolve().then(function () {
         hoEditorFactory.drawTree.updateDrawTreeFirstLine();
 
@@ -217140,7 +217309,7 @@ var VueController = /*#__PURE__*/function () {
     value: function setReviewLevelColor(option) {
       var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID);
       var opt = new Option(this.hoEditorFactoryID);
-      opt.setReviewLevelColor(option.reviewLev1Color, option.reviewLev2Color, option.reviewLev3Color, option.fieldColor, option.dateTimeColor, option.downListColor, option.downListColor2);
+      opt.setReviewLevelColor(option.reviewLev1Color, option.reviewLev2Color, option.reviewLev3Color, option.fieldColor, option.dateTimeColor, option.downListColor, option.downListColor2, option.signColor);
       hoEditorFactory.option = opt;
     }
     /**
@@ -218991,12 +219160,16 @@ var VueController = /*#__PURE__*/function () {
     /**
      * 读取 xml
      * @param xml
+     * @param callback 是否回调
+     * @param isDelBlockLine 是否删掉正文末尾的空行
+     * @param isRender
+     * @param isClearSign 加载时是否清空签名元素内容
      */
 
   }, {
     key: "openXml",
     value: function () {
-      var _openXml = (0,asyncToGenerator/* default */.Z)( /*#__PURE__*/(0,regeneratorRuntime/* default */.Z)().mark(function _callee5(xml, callback, isDelBlockLine, isRender) {
+      var _openXml = (0,asyncToGenerator/* default */.Z)( /*#__PURE__*/(0,regeneratorRuntime/* default */.Z)().mark(function _callee5(xml, callback, isDelBlockLine, isRender, isClearSign) {
         var hoEditorFactory, _curDomRange, startPath, endPath, changingEvent;
 
         return (0,regeneratorRuntime/* default */.Z)().wrap(function _callee5$(_context5) {
@@ -219041,7 +219214,7 @@ var VueController = /*#__PURE__*/function () {
                 }
 
                 _context5.next = 15;
-                return hoEditorFactory.structureConvert.openXml(xml, callback, isDelBlockLine);
+                return hoEditorFactory.structureConvert.openXml(xml, callback, isDelBlockLine, isClearSign);
 
               case 15:
               case "end":
@@ -219051,7 +219224,7 @@ var VueController = /*#__PURE__*/function () {
         }, _callee5, this);
       }));
 
-      function openXml(_x8, _x9, _x10, _x11) {
+      function openXml(_x8, _x9, _x10, _x11, _x12) {
         return _openXml.apply(this, arguments);
       }
 
@@ -219196,8 +219369,8 @@ var VueController = /*#__PURE__*/function () {
       if (node instanceof SignNode/* SignNode */.N) {
         var nextNode = node.nextLeaf();
 
-        if (node.imgSrc !== "" && node.isTemplate && !(preNode instanceof SignNode/* SignNode */.N) && !(nextNode instanceof SignNode/* SignNode */.N)) {
-          var signNode = new SignNode/* SignNode */.N(this._hoEditorFactoryID, node.rootNodes, node.parentNode, BaseNode/* NodeType.ntSign */.Jq.ntSign, 0, 0, node.name === "" ? "签名" : node.name, node.signType, node.signFormat, "", "", node.signTimeFormat, "", 0, 0, {}, true, node.styleIndex, node.connectMode, node.isFront, node.allowEditSignTime);
+        if ((node.imgSrc !== "" || node.fingerPrintSrc !== "") && node.isTemplate && !(preNode instanceof SignNode/* SignNode */.N) && !(nextNode instanceof SignNode/* SignNode */.N)) {
+          var signNode = new SignNode/* SignNode */.N(this._hoEditorFactoryID, node.rootNodes, node.parentNode, BaseNode/* NodeType.ntSign */.Jq.ntSign, 0, 0, node.name === "" ? "签名" : node.name, node.signType, node.signFormat, "", "", node.signTimeFormat, "", 0, 0, {}, true, node.styleIndex, node.connectMode, node.isFront, node.allowEditSignTime, '', undefined, node.attribute);
           hoEditorFactory.undoService.begin();
           hoEditorFactory.undoService.add(new NodeDeleteUndoUnit/* NodeDeleteUndoUnit */.w(this._hoEditorFactoryID, node, ePath));
           hoEditorFactory.undoService.add(new NodeInsertUndoUnit/* NodeInsertUndoUnit */.R(this._hoEditorFactoryID, sPath, signNode));
@@ -219432,7 +219605,7 @@ var VueController = /*#__PURE__*/function () {
 
   }, {
     key: "insertEmptySignNode",
-    value: function insertEmptySignNode(name, signType, signFormat, signTimeFormat, connectMode, isFront, allowEditSignTime) {
+    value: function insertEmptySignNode(name, signType, signFormat, signTimeFormat, connectMode, isFront, allowEditSignTime, attribute) {
       var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID);
       var curDomRange = hoEditorFactory.docTree.curDomRange.normalize();
       var startPath = curDomRange.normalize().startPath;
@@ -219440,7 +219613,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)) {
-        hoEditorFactory.docController.insertEmptySignNode(curDomRange, name, signType, signFormat, signTimeFormat, connectMode, isFront, allowEditSignTime);
+        hoEditorFactory.docController.insertEmptySignNode(curDomRange, name, signType, signFormat, signTimeFormat, connectMode, isFront, allowEditSignTime, attribute);
       }
     }
     /**
@@ -220038,7 +220211,7 @@ var VueController = /*#__PURE__*/function () {
         }, _callee6, this);
       }));
 
-      function updateElementText(_x12, _x13, _x14) {
+      function updateElementText(_x13, _x14, _x15) {
         return _updateElementText.apply(this, arguments);
       }
 
@@ -220302,7 +220475,7 @@ var VueController = /*#__PURE__*/function () {
                 endPath = curDomRange.normalize().endPath;
                 node = (_hoEditorFactory2$vue = _hoEditorFactory2.vueController.findNodebyPath(endPath)) === null || _hoEditorFactory2$vue === void 0 ? void 0 : _hoEditorFactory2$vue.node;
 
-                if (!(node instanceof SignNode/* SignNode */.N && node.name === "患者签名")) {
+                if (!(node instanceof SignNode/* SignNode */.N && !node.isTemplate && node.attribute == 1)) {
                   _context7.next = 8;
                   break;
                 }
@@ -220324,7 +220497,7 @@ var VueController = /*#__PURE__*/function () {
                 _endPath = _curDomRange2.normalize().endPath;
                 _node = (_hoEditorFactory3$vue = _hoEditorFactory3.vueController.findNodebyPath(_endPath)) === null || _hoEditorFactory3$vue === void 0 ? void 0 : _hoEditorFactory3$vue.node;
 
-                if (!(_node instanceof SignNode/* SignNode */.N && _node.name === "患者签名")) {
+                if (!(_node instanceof SignNode/* SignNode */.N && !_node.isTemplate && _node.attribute == 1)) {
                   _context7.next = 21;
                   break;
                 }
@@ -220348,7 +220521,7 @@ var VueController = /*#__PURE__*/function () {
         }, _callee7, this);
       }));
 
-      function getBase64(_x15) {
+      function getBase64(_x16) {
         return _getBase.apply(this, arguments);
       }
 
@@ -220369,18 +220542,26 @@ var VueController = /*#__PURE__*/function () {
 
       if (node instanceof SignNode/* SignNode */.N) {
         if (node.isTemplate) {
-          if (node.imgSrc || node.fingerPrintSrc) {
+          if (node.imgSrc !== '' || node.fingerPrintSrc !== '') {
             this.deleteNode(node);
             setTimeout(function () {
               var newcurDomRange = hoEditorFactory.docTree.curDomRange.normalize();
               var newNode = newcurDomRange.npEnd.node;
 
               if (newNode instanceof SignNode/* SignNode */.N) {
-                hoEditorFactory.docController.updateSignNode(newNode, 3, "患者签名", "", "", imgSrc, 0, 0, {}, fingerPrintSrc, fingerPosition);
+                Promise.all([hoEditorFactory.docController.updateSignNode(newNode, 3, "患者签名", "", "", imgSrc, 0, 0, {}, fingerPrintSrc, fingerPosition)]).then(function () {
+                  setTimeout(function () {
+                    callback && callback();
+                  }, 0);
+                });
               }
             }, 0);
           } else {
-            hoEditorFactory.docController.updateSignNode(node, 3, "患者签名", "", "", imgSrc, 0, 0, {}, fingerPrintSrc, fingerPosition);
+            Promise.all([hoEditorFactory.docController.updateSignNode(node, 3, "患者签名", "", "", imgSrc, 0, 0, {}, fingerPrintSrc, fingerPosition)]).then(function () {
+              setTimeout(function () {
+                callback && callback();
+              }, 0);
+            });
           }
         } else {
           this.deleteNode(node);
@@ -220804,6 +220985,20 @@ var VueController = /*#__PURE__*/function () {
       if (curDomRange.isEmpty) return;
       var result = DomRange/* DomRange.getSelectDomNodes */.a.getSelectDomNodes(this._hoEditorFactoryID, curDomRange.startPath, curDomRange.endPath, true);
       var nodes = result[0];
+      var isHaveParaNodes = false;
+
+      for (var m = 0; m < nodes.length; m++) {
+        if (nodes[m] instanceof ParagraphNode/* ParagraphNode */.C) {
+          isHaveParaNodes = true;
+          break;
+        }
+      }
+
+      if (!isHaveParaNodes) {
+        message_box_default().alert("选区内没有换行符,无需清除.");
+
+        return;
+      }
 
       for (var i = 0; i < nodes.length; i++) {
         var node = nodes[i];
@@ -220953,37 +221148,6 @@ var VueController = /*#__PURE__*/function () {
       });
       drawTree.commentsMap = commentsMap;
     }
-    /**
-     * 查询是否存在医生签名
-     * @returns boolean
-     */
-
-  }, {
-    key: "getAllSignNode",
-    value: function getAllSignNode() {
-      var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID);
-      var isHasDoctorSign = false;
-
-      var getAllNodes = function getAllNodes(nodes) {
-        for (var i = 0; i < nodes.length; i++) {
-          var node = nodes[i];
-
-          if (node instanceof SignNode/* SignNode */.N && node.type !== 3 && node.imgSrc) {
-            isHasDoctorSign = true;
-            break; // 医生签名已存在的情况中断当前层的遍历
-          }
-
-          if (node instanceof BaseCombineNode/* BaseCombineNode */.V && !isHasDoctorSign) {
-            // 医生签名已存在的情况不在深层调用深层遍历
-            getAllNodes(node.childNodes);
-          }
-        }
-      };
-
-      var mainNodes = hoEditorFactory.docTree.mainNodes;
-      getAllNodes(mainNodes);
-      return isHasDoctorSign;
-    }
   }, {
     key: "SyncElements",
     value: function SyncElements() {
@@ -221152,6 +221316,97 @@ var VueController = /*#__PURE__*/function () {
     value: function setParaCustomProperty(paragraphNode, customProperty) {
       paragraphNode.setCustomProperty(customProperty);
     }
+    /**
+     * 查询是否有空签名元素
+     * @returns boolean
+     */
+
+  }, {
+    key: "getAllEmptySignNode",
+    value: function getAllEmptySignNode(attribute) {
+      var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID);
+      var hasEmptyPatientSign = false;
+      var patientSignCount = 0;
+      var hasEmptyDoctorSign = false;
+
+      var getAllNodes = function getAllNodes(nodes) {
+        for (var i = 0; i < nodes.length; i++) {
+          var node = nodes[i];
+
+          if (node instanceof SignNode/* SignNode */.N) {
+            // 有值的患者签名
+            if (attribute == 1 && node.attribute === 1) {
+              patientSignCount++;
+            }
+
+            if (attribute == 1 && node.attribute === 1 && (node.imgSrc !== '' || node.fingerPrintSrc !== '')) {
+              hasEmptyPatientSign = true;
+              break;
+            } // 空的医生签名
+
+
+            if (attribute == 0 && node.attribute === 0 && node.imgSrc === '') {
+              hasEmptyDoctorSign = true;
+              break;
+            }
+          }
+
+          if (node instanceof BaseCombineNode/* BaseCombineNode */.V && attribute === 1 && hasEmptyPatientSign) {
+            // 患者签名已存在的情况不在深层调用深层遍历
+            getAllNodes(node.childNodes);
+          }
+
+          if (node instanceof BaseCombineNode/* BaseCombineNode */.V && attribute === 0 && !hasEmptyDoctorSign) {
+            // 医生签名不存在的情况不在深层调用深层遍历
+            getAllNodes(node.childNodes);
+          }
+        }
+      };
+
+      var mainNodes = hoEditorFactory.docTree.mainNodes;
+      getAllNodes(mainNodes);
+
+      if (attribute == 1) {
+        if (patientSignCount == 0) {
+          return true;
+        }
+
+        return hasEmptyPatientSign;
+      } else {
+        return hasEmptyDoctorSign;
+      }
+    }
+    /**
+     * 查询是否存在医生签名
+     * @returns boolean
+     */
+
+  }, {
+    key: "getAllSignNode",
+    value: function getAllSignNode() {
+      var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID);
+      var isHasDoctorSign = false;
+
+      var getAllNodes = function getAllNodes(nodes) {
+        for (var i = 0; i < nodes.length; i++) {
+          var node = nodes[i];
+
+          if (node instanceof SignNode/* SignNode */.N && node.type !== 3 && node.imgSrc) {
+            isHasDoctorSign = true;
+            break; // 医生签名已存在的情况中断当前层的遍历
+          }
+
+          if (node instanceof BaseCombineNode/* BaseCombineNode */.V && !isHasDoctorSign) {
+            // 医生签名已存在的情况不在深层调用深层遍历
+            getAllNodes(node.childNodes);
+          }
+        }
+      };
+
+      var mainNodes = hoEditorFactory.docTree.mainNodes;
+      getAllNodes(mainNodes);
+      return isHasDoctorSign;
+    }
   }]);
 
   return VueController;
@@ -223837,6 +224092,7 @@ var PrintController = /*#__PURE__*/function () {
                 hoEditorFactory.drawTree.paintStatus = DrawTree/* PaintState.psPreview */.Dh.psPreview;
                 xmlIndex = -1;
                 mergeList = [];
+                continuousid = '';
                 options = {
                   unit: 'px',
                   hotfixes: ['px_scaling'],
@@ -223888,6 +224144,10 @@ var PrintController = /*#__PURE__*/function () {
                                   position = {};
                                 }
 
+                                if (continuousid && xmlList[xmlIndex][2] !== continuousid) {
+                                  mergeList = [];
+                                }
+
                                 continuousid = xmlList[xmlIndex][2];
                                 mergeList.push([xmlList[xmlIndex][1], xmlList[xmlIndex][0]]);
 
@@ -223899,14 +224159,13 @@ var PrintController = /*#__PURE__*/function () {
                                     } else {
                                       hoEditorFactory.loadImageCallback = toPrint;
                                     }
-
-                                    mergeList = [];
                                   });
                                 } else {
                                   createSvg();
                                 }
                               } else {
                                 mergeList = [];
+                                continuousid = '';
                                 Promise.all([hoEditorFactory.vueController.openXml(xmlList[xmlIndex][0])]).then(function () {
                                   if (hoEditorFactory.loadImageCount === 0) {
                                     toPrint();
@@ -223942,7 +224201,7 @@ var PrintController = /*#__PURE__*/function () {
 
                 createSvg();
 
-              case 13:
+              case 14:
               case "end":
                 return _context8.stop();
             }
@@ -229205,9 +229464,9 @@ var Delimiter_component = normalizeComponent(
 ;// CONCATENATED MODULE: ./src/components/controls/delimiter/index.ts
 
 /* harmony default export */ var delimiter = (delimiter_Delimiter);
-;// 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/sign/Sign.vue?vue&type=template&id=6c042af0&
-var Signvue_type_template_id_6c042af0_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",staticStyle:{"paDDing":"20px"}},[_c('ul',{staticClass:"control-list"},[_c('li',{staticClass:"control-item"},[_c('span',{staticClass:"label"},[_vm._v("签名名称")]),_c('el-input',{staticStyle:{"width":"120px","display":"flex"},attrs:{"size":"mini"},model:{value:(_vm.name),callback:function ($$v) {_vm.name=$$v},expression:"name"}})],1),_c('li',{staticClass:"control-item"},[_c('span',{staticClass:"label"}),_c('el-radio',{attrs:{"label":0},model:{value:(_vm.signType),callback:function ($$v) {_vm.signType=$$v},expression:"signType"}},[_vm._v("常规签名")]),_c('el-radio',{attrs:{"label":1},model:{value:(_vm.signType),callback:function ($$v) {_vm.signType=$$v},expression:"signType"}},[_vm._v("自定义签名")])],1),(_vm.signType === 1)?_c('li',{staticClass:"control-item"},[_c('span',{staticClass:"label"},[_vm._v("签名格式")]),_c('el-select',{attrs:{"size":"mini","placeholder":"请选择"},model:{value:(_vm.signFormat),callback:function ($$v) {_vm.signFormat=$$v},expression:"signFormat"}},[_c('el-option',{attrs:{"label":"<医师姓名>","value":"<医师姓名>"}}),_c('el-option',{attrs:{"label":"<医师姓名>（<医师职称>）","value":"<医师姓名>（<医师职称>）"}}),_c('el-option',{attrs:{"label":"<医师姓名>：<医师职称>","value":"<医师姓名>：<医师职称>"}}),_c('el-option',{attrs:{"label":"<医师姓名>：<医师职称>\\n<签名时间>","value":"<医师姓名>：<医师职称>\\n<签名时间>"}}),_vm._l((_vm.customSignFormatList),function(format){return _c('el-option',{key:format.label,attrs:{"label":format.label,"value":format.value}})})],2)],1):_vm._e(),(_vm.signType === 1)?_c('li',{staticClass:"control-item"},[_c('span',{staticClass:"label"},[_vm._v("签名时间格式")]),_c('el-select',{attrs:{"size":"mini","placeholder":"请选择"},model:{value:(_vm.signTimeFormat),callback:function ($$v) {_vm.signTimeFormat=$$v},expression:"signTimeFormat"}},[_c('el-option',{attrs:{"label":"yyyy-MM-DD HH:mm:ss","value":"yyyy-MM-DD HH:mm:ss"}}),_c('el-option',{attrs:{"label":"yyyy-MM-DD HH:mm","value":"yyyy-MM-DD HH:mm"}}),_c('el-option',{attrs:{"label":"yyyy/MM/DD HH:mm:ss","value":"yyyy/MM/DD HH:mm:ss"}}),_c('el-option',{attrs:{"label":"yyyy/MM/DD HH:mm","value":"yyyy/MM/DD HH:mm"}}),_c('el-option',{attrs:{"label":"yyyy年MM月DD日 HH时mm分ss秒","value":"yyyy年MM月DD日 HH时mm分ss秒"}}),_c('el-option',{attrs:{"label":"yyyy年MM月DD日 HH时mm分","value":"yyyy年MM月DD日 HH时mm分"}})],1)],1):_vm._e(),(_vm.signType === 1)?_c('li',{staticClass:"control-item"},[_c('span',{staticClass:"label"},[_vm._v("签名连接方式")]),_c('el-select',{attrs:{"size":"mini","placeholder":"请选择"},model:{value:(_vm.connectMode),callback:function ($$v) {_vm.connectMode=$$v},expression:"connectMode"}},[_c('el-option',{attrs:{"label":"/","value":"/"}}),_c('el-option',{attrs:{"label":"换行","value":"换行"}}),_c('el-option',{attrs:{"label":"、","value":"、"}}),_c('el-option',{attrs:{"label":"，","value":"，"}})],1)],1):_vm._e(),(_vm.signType === 1)?_c('li',{staticClass:"control-item"},[_c('span',{staticClass:"label"}),_c('el-checkbox',{model:{value:(_vm.isFront),callback:function ($$v) {_vm.isFront=$$v},expression:"isFront"}},[_vm._v("连接符前置")]),_c('el-tooltip',{attrs:{"placement":"right","effect":"dark"}},[_c('div',{attrs:{"slot":"content"},slot:"content"},[_vm._v("不勾选参数:     医师签名 / "),_c('br'),_vm._v("   勾选参数:     / 医师签名 ")]),_c('i',{staticClass:"el-icon-info",staticStyle:{"font-size":"18px","margin-left":"10px"}})])],1):_vm._e(),(_vm.signType === 1)?_c('li',{staticClass:"control-item"},[_c('span',{staticClass:"label"}),_c('el-checkbox',{model:{value:(_vm.allowEditSignTime),callback:function ($$v) {_vm.allowEditSignTime=$$v},expression:"allowEditSignTime"}},[_vm._v("允许修改签名时间")])],1):_vm._e()]),(_vm.signType === 1)?_c('div',{staticClass:"section-right"},[_c('div',{staticClass:"custom-format-tool-box"},[_c('ul',{staticClass:"custom-format-tool"},[_c('li',[_c('el-button',{attrs:{"size":"small","plain":""},on:{"click":function($event){_vm.customFormatContent += '<医师姓名>'}}},[_vm._v("医师姓名")]),_c('i',{staticClass:"el-icon-circle-plus"})],1),_c('li',[_c('el-button',{attrs:{"size":"small","plain":""},on:{"click":function($event){_vm.customFormatContent += '<医师工号>'}}},[_vm._v("医师工号")]),_c('i',{staticClass:"el-icon-circle-plus"})],1),_c('li',[_c('el-button',{attrs:{"size":"small","plain":""},on:{"click":function($event){_vm.customFormatContent += '<医师职称>'}}},[_vm._v("医师职称")]),_c('i',{staticClass:"el-icon-circle-plus"})],1),_c('li',[_c('el-button',{attrs:{"size":"small","plain":""},on:{"click":function($event){_vm.customFormatContent += '<签名时间>'}}},[_vm._v("签名时间")]),_c('i',{staticClass:"el-icon-circle-plus"})],1)]),_c('el-input',{attrs:{"type":"textarea","placeholder":"请输入内容"},model:{value:(_vm.customFormatContent),callback:function ($$v) {_vm.customFormatContent=$$v},expression:"customFormatContent"}})],1),_c('p',[_vm._v("提示：")]),_c('p',[_vm._v("1. 尖括号内的内容用来替换, 不能修改")]),_c('p',[_vm._v("2. 尖括号外的内容处理格式，可以编辑")]),_c('p',[_vm._v("2. 回车键可以自动换行，或者手动插入换行符\\n")]),_c('div',{staticClass:"custom-format-tool-btn"},[_c('el-button',{attrs:{"size":"small","type":"primary"},on:{"click":_vm.createSignFormat}},[_vm._v("添加自定义签名格式")])],1)]):_vm._e()]),_c('footer',{staticClass:"ho-modal-footer"},[_c('el-button',{attrs:{"size":"small","type":"primary"},on:{"click":_vm.insertSign}},[_vm._v("确定")]),_c('el-button',{staticStyle:{"margin-left":"30px"},attrs:{"size":"small"},on:{"click":_vm.handleClose}},[_vm._v("取消")])],1)])}
-var Signvue_type_template_id_6c042af0_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/sign/Sign.vue?vue&type=template&id=38b332be&
+var Signvue_type_template_id_38b332be_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",staticStyle:{"padding":"20px"}},[_c('ul',{staticClass:"control-list"},[_c('li',{staticClass:"control-item"},[_c('span',{staticClass:"label"},[_vm._v("签名名称")]),_c('el-input',{staticStyle:{"width":"120px","display":"flex"},attrs:{"size":"mini"},model:{value:(_vm.name),callback:function ($$v) {_vm.name=$$v},expression:"name"}})],1),_c('li',{staticClass:"control-item",staticStyle:{"align-items":"baseline"}},[_c('span',{staticClass:"label"},[_vm._v("签名类型")]),_c('div',{staticStyle:{"flex":"1"}},[_c('el-radio',{attrs:{"label":1},model:{value:(_vm.signType),callback:function ($$v) {_vm.signType=$$v},expression:"signType"}},[_vm._v("患者签名")]),_c('el-radio',{attrs:{"label":0},model:{value:(_vm.signType),callback:function ($$v) {_vm.signType=$$v},expression:"signType"}},[_vm._v("医生签名")]),_c('el-radio',{attrs:{"label":3},model:{value:(_vm.signType),callback:function ($$v) {_vm.signType=$$v},expression:"signType"}},[_vm._v("自定义医生签名")]),_c('el-radio',{attrs:{"label":2},model:{value:(_vm.signType),callback:function ($$v) {_vm.signType=$$v},expression:"signType"}},[_vm._v("自定义CA签名")])],1)]),(_vm.signType >= 3)?[_c('li',{staticClass:"control-item"},[_c('span',{staticClass:"label"},[_vm._v("签名格式")]),_c('el-select',{attrs:{"size":"mini","placeholder":"请选择"},model:{value:(_vm.signFormat),callback:function ($$v) {_vm.signFormat=$$v},expression:"signFormat"}},[_c('el-option',{attrs:{"label":"<医师姓名>","value":"<医师姓名>"}}),_c('el-option',{attrs:{"label":"<医师姓名>（<医师职称>）","value":"<医师姓名>（<医师职称>）"}}),_c('el-option',{attrs:{"label":"<医师姓名>：<医师职称>","value":"<医师姓名>：<医师职称>"}}),_c('el-option',{attrs:{"label":"<医师姓名>：<医师职称>\\n<签名时间>","value":"<医师姓名>：<医师职称>\\n<签名时间>"}}),_vm._l((_vm.customSignFormatList),function(format){return _c('el-option',{key:format.label,attrs:{"label":format.label,"value":format.value}})})],2)],1),_c('li',{staticClass:"control-item"},[_c('span',{staticClass:"label"},[_vm._v("签名时间格式")]),_c('el-select',{attrs:{"size":"mini","placeholder":"请选择"},model:{value:(_vm.signTimeFormat),callback:function ($$v) {_vm.signTimeFormat=$$v},expression:"signTimeFormat"}},[_c('el-option',{attrs:{"label":"yyyy-MM-DD HH:mm:ss","value":"yyyy-MM-DD HH:mm:ss"}}),_c('el-option',{attrs:{"label":"yyyy-MM-DD HH:mm","value":"yyyy-MM-DD HH:mm"}}),_c('el-option',{attrs:{"label":"yyyy/MM/DD HH:mm:ss","value":"yyyy/MM/DD HH:mm:ss"}}),_c('el-option',{attrs:{"label":"yyyy/MM/DD HH:mm","value":"yyyy/MM/DD HH:mm"}}),_c('el-option',{attrs:{"label":"yyyy年MM月DD日 HH时mm分ss秒","value":"yyyy年MM月DD日 HH时mm分ss秒"}}),_c('el-option',{attrs:{"label":"yyyy年MM月DD日 HH时mm分","value":"yyyy年MM月DD日 HH时mm分"}})],1)],1),_c('li',{staticClass:"control-item"},[_c('span',{staticClass:"label"},[_vm._v("签名连接方式")]),_c('el-select',{attrs:{"size":"mini","placeholder":"请选择"},model:{value:(_vm.connectMode),callback:function ($$v) {_vm.connectMode=$$v},expression:"connectMode"}},[_c('el-option',{attrs:{"label":"/","value":"/"}}),_c('el-option',{attrs:{"label":"换行","value":"换行"}}),_c('el-option',{attrs:{"label":"、","value":"、"}}),_c('el-option',{attrs:{"label":"，","value":"，"}})],1)],1),_c('li',{staticClass:"control-item"},[_c('span',{staticClass:"label"}),_c('el-checkbox',{model:{value:(_vm.isFront),callback:function ($$v) {_vm.isFront=$$v},expression:"isFront"}},[_vm._v("连接符前置")]),_c('el-tooltip',{attrs:{"placement":"right","effect":"dark"}},[_c('div',{attrs:{"slot":"content"},slot:"content"},[_vm._v("不勾选参数:     医师签名 / "),_c('br'),_vm._v("   勾选参数:     / 医师签名")]),_c('i',{staticClass:"el-icon-info",staticStyle:{"font-size":"18px","margin-left":"10px"}})])],1),_c('li',{staticClass:"control-item"},[_c('span',{staticClass:"label"}),_c('el-checkbox',{model:{value:(_vm.allowEditSignTime),callback:function ($$v) {_vm.allowEditSignTime=$$v},expression:"allowEditSignTime"}},[_vm._v("允许修改签名时间")])],1)]:_vm._e()],2),(_vm.signType >= 3)?_c('div',{staticClass:"section-right"},[_c('div',{staticClass:"custom-format-tool-box"},[_c('ul',{staticClass:"custom-format-tool"},[_c('li',[_c('el-button',{attrs:{"size":"small","plain":""},on:{"click":function($event){_vm.customFormatContent += '<医师姓名>'}}},[_vm._v("医师姓名")]),_c('i',{staticClass:"el-icon-circle-plus"})],1),_c('li',[_c('el-button',{attrs:{"size":"small","plain":""},on:{"click":function($event){_vm.customFormatContent += '<医师工号>'}}},[_vm._v("医师工号")]),_c('i',{staticClass:"el-icon-circle-plus"})],1),_c('li',[_c('el-button',{attrs:{"size":"small","plain":""},on:{"click":function($event){_vm.customFormatContent += '<医师职称>'}}},[_vm._v("医师职称")]),_c('i',{staticClass:"el-icon-circle-plus"})],1),_c('li',[_c('el-button',{attrs:{"size":"small","plain":""},on:{"click":function($event){_vm.customFormatContent += '<签名时间>'}}},[_vm._v("签名时间")]),_c('i',{staticClass:"el-icon-circle-plus"})],1)]),_c('el-input',{attrs:{"type":"textarea","placeholder":"请输入内容"},model:{value:(_vm.customFormatContent),callback:function ($$v) {_vm.customFormatContent=$$v},expression:"customFormatContent"}})],1),_c('p',[_vm._v("提示：")]),_c('p',[_vm._v("1. 尖括号内的内容用来替换, 不能修改")]),_c('p',[_vm._v("2. 尖括号外的内容处理格式，可以编辑")]),_c('p',[_vm._v("2. 回车键可以自动换行，或者手动插入换行符\\n")]),_c('div',{staticClass:"custom-format-tool-btn"},[_c('el-button',{attrs:{"size":"small","type":"primary"},on:{"click":_vm.createSignFormat}},[_vm._v("添加自定义签名格式")])],1)]):_vm._e()]),_c('footer',{staticClass:"ho-modal-footer"},[_c('el-button',{attrs:{"size":"small","type":"primary"},on:{"click":_vm.insertSign}},[_vm._v("确定")]),_c('el-button',{staticStyle:{"margin-left":"30px"},attrs:{"size":"small"},on:{"click":_vm.handleClose}},[_vm._v("取消")])],1)])}
+var Signvue_type_template_id_38b332be_staticRenderFns = []
 
 
 ;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js!./node_modules/ts-loader/index.js??clonedRuleSet-84[0].rules[0].use[1]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/sign/Sign.vue?vue&type=script&lang=ts&
@@ -229242,7 +229501,7 @@ var Sign = /*#__PURE__*/function (_Vue) {
 
     _this = _super.apply(this, arguments);
     _this.height = 20;
-    _this.name = "";
+    _this.name = '';
     _this.signType = 0;
     _this.signFormat = '<医师姓名>';
     _this.connectMode = '换行';
@@ -229251,7 +229510,7 @@ var Sign = /*#__PURE__*/function (_Vue) {
     _this.signTimeFormat = 'yyyy-MM-DD HH:mm';
     _this.customFormatContent = '';
     _this.customSignFormatList = [];
-    _this.animationClassNames = "control-modal-contents sign-modal animation-in";
+    _this.animationClassNames = 'control-modal-contents sign-modal animation-in';
     return _this;
   } // 创建自定义签名格式
 
@@ -229259,7 +229518,7 @@ var Sign = /*#__PURE__*/function (_Vue) {
   (0,createClass/* default */.Z)(Sign, [{
     key: "createSignFormat",
     value: function createSignFormat() {
-      var customFormat = JSON.stringify(this.customFormatContent).replace(/^\s+|\s+$/g, "");
+      var customFormat = JSON.stringify(this.customFormatContent).replace(/^\s+|\s+$/g, '');
       var customList = ['<医师姓名>', '<医师职称>', '<医师工号>', '<签名时间>'];
       this.$elMessage.closeAll();
 
@@ -229274,7 +229533,7 @@ var Sign = /*#__PURE__*/function (_Vue) {
         return;
       }
 
-      var format = ["<医师姓名>", "<医师姓名>（<医师职称>）", "<医师姓名>：<医师职称>", "<医师姓名>：<医师职称>\n<签名时间>"].concat();
+      var format = ['<医师姓名>', '<医师姓名>（<医师职称>）', '<医师姓名>：<医师职称>', '<医师姓名>：<医师职称>\n<签名时间>'].concat();
       this.customSignFormatList.forEach(function (v) {
         return format.push(v.value);
       });
@@ -229283,7 +229542,7 @@ var Sign = /*#__PURE__*/function (_Vue) {
         return v === customFormat.slice(1, customFormat.length - 1);
       }).length > 0) {
         this.$elMessage.warning({
-          message: "签名格式已存在无需插入，已自动选中",
+          message: '签名格式已存在无需插入，已自动选中',
           duration: 3000,
           offset: 120
         });
@@ -229299,17 +229558,12 @@ var Sign = /*#__PURE__*/function (_Vue) {
   }, {
     key: "insertSign",
     value: function insertSign() {
-      if (this.signType === 1) {
-        // console.log(this.name ? this.name : "签名",
-        // 	this.signType,
-        // 	this.signFormat,
-        // 	this.connectMode,
-        // 	this.isFront,
-        // 	this.allowEditSignTime)
-        this.vueController.insertEmptySignNode(this.name ? this.name : "签名", this.signType, this.signFormat, this.signTimeFormat, this.connectMode, this.isFront, this.allowEditSignTime);
-      } else {
-        this.vueController.insertEmptySignNode(this.name ? this.name : "签名" //,
-        );
+      if (this.signType === 3) {
+        // 自定义多人签名
+        this.vueController.insertEmptySignNode(this.name ? this.name : '医生签名', 1, this.signFormat, this.signTimeFormat, this.connectMode, this.isFront, this.allowEditSignTime, 0);
+      } else {
+        var name = this.name ? this.name : this.signType == 1 ? '患者签名' : '医生签名';
+        this.vueController.insertEmptySignNode(name, 0, '', '', '', undefined, undefined, this.signType);
       }
 
       this.handleClose();
@@ -229317,8 +229571,8 @@ var Sign = /*#__PURE__*/function (_Vue) {
   }, {
     key: "handleClose",
     value: function handleClose() {
-      this.animationClassNames = "control-modal-contents sign-modal animation-out";
-      this.$emit("closed");
+      this.animationClassNames = 'control-modal-contents sign-modal animation-out';
+      this.$emit('closed');
     }
   }]);
 
@@ -229330,7 +229584,7 @@ __decorate([Prop()], Sign.prototype, "vueController", void 0);
 __decorate([Prop()], Sign.prototype, "controlStatus", void 0);
 
 Sign = __decorate([vue_class_component_esm({
-  name: "Sign",
+  name: 'Sign',
   components: {
     HoColorPicker: HoColorPicker
   }
@@ -229354,8 +229608,8 @@ Sign = __decorate([vue_class_component_esm({
 
 var Sign_component = normalizeComponent(
   sign_Signvue_type_script_lang_ts_,
-  Signvue_type_template_id_6c042af0_render,
-  Signvue_type_template_id_6c042af0_staticRenderFns,
+  Signvue_type_template_id_38b332be_render,
+  Signvue_type_template_id_38b332be_staticRenderFns,
   false,
   null,
   null,