hoeditor-web 2.0.69 → 2.0.71

package/lib/hoeditor.common.js

@@ -33929,7 +33929,7 @@ var SignNode = /*#__PURE__*/function (_BaseNode) {
 
     _this._PNGToJPG = 0; // 当前签名图片是否已转成jpg  0代表未转换 1代表已转换
 
-    _this._attribute = 0; //签名属性 0:医生签名  1:患者签名
+    _this._attribute = 0; //签名属性 0:医生签名  1:患者签名 2:ca签名(职称+签名图片)
 
     _this.number = number;
     _this._type = type;
@@ -34233,7 +34233,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);
     }
@@ -34267,15 +34267,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--) {
@@ -51414,7 +51414,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
@@ -51425,7 +51425,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);
@@ -51437,12 +51437,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;
 
@@ -51482,6 +51487,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) {
@@ -51595,6 +51605,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) {
@@ -51792,7 +51822,19 @@ 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++;
@@ -51810,14 +51852,24 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
               node.imgHeight = nodeImageWidth;
             }
 
-            drawNode.dWidth = hitWidth * hoEditorFactory.signHeight / image.naturalHeight + _this3._drawText.getMeasuredWidth();
-            var width = drawNode.dWidth;
+            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); //这里是图片大小
 
@@ -57633,7 +57685,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);
@@ -58028,7 +58080,7 @@ var DrawTree = /*#__PURE__*/function () {
 
       if (hoEditorFactory.docTree.curOnDragNode) {
         this._caret.visible = false;
-      } // console.timeEnd("文档change事件");
+      } //console.timeEnd("文档change事件");
 
 
       return true;
@@ -59711,8 +59763,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) {
@@ -62740,7 +62792,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_36__ = __webpack_require__(22342);
+/* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_37__ = __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);
@@ -62781,6 +62833,8 @@ var NodeStyleUndoUnit = /*#__PURE__*/function () {
 /* 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);
+/* harmony import */ var _dom_NodePosition__WEBPACK_IMPORTED_MODULE_36__ = __webpack_require__(2242);
+
 
 
 
@@ -62856,7 +62910,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.插入删除的节点
@@ -63135,7 +63189,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;
@@ -63191,9 +63245,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 (result < 0) {
+          pnode = spnode;
+        }
+      }
 
-      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("<元素>")) {
-        this._tmp.end = hoEditorFactory.docTree.getNodeLastPath(s.parentNode.EndMarkNode.previousLeaf());
+      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;
       }
 
@@ -207363,7 +207429,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.69');
+/* 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 = []
@@ -209874,7 +209940,7 @@ var UserInfo = __webpack_require__(75013);
 /*
  * @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
@@ -209897,6 +209963,8 @@ var Option = /*#__PURE__*/function () {
 
     this._downListColor2 = "#D2ACB1"; //下拉列表默认元素颜色
 
+    this._signColor = "transparent"; //签名元素颜色
+
     this._hoEditorFactoryID = hoEditorFactoryID;
   }
 
@@ -209964,9 +210032,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);
@@ -209974,6 +210050,7 @@ var Option = /*#__PURE__*/function () {
       dateTimeColor && (this._dateTimeColor = dateTimeColor);
       downListColor && (this._downListColor = downListColor);
       downListColor2 && (this._downListColor2 = downListColor2);
+      signColor && (this._signColor = signColor);
     }
   }, {
     key: "getColorByLevel",
@@ -209992,6 +210069,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";
       }
@@ -217220,7 +217299,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;
     }
     /**
@@ -220386,7 +220465,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;
                 }
@@ -220408,7 +220487,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;
                 }
@@ -220453,7 +220532,7 @@ 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();
@@ -221236,34 +221315,39 @@ var VueController = /*#__PURE__*/function () {
     key: "getAllEmptySignNode",
     value: function getAllEmptySignNode(attribute) {
       var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID);
-      var hasEmptySign = false;
+      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 && node.imgSrc === '' && node.fingerPrintSrc === '') {
-              hasEmptySign = true;
+            // 有值的患者签名
+            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 === '') {
-              hasEmptySign = true;
-              break;
-            } // 空的签名
-
-
-            if (attribute == undefined && node.imgSrc === '' && node.fingerPrintSrc === '') {
-              hasEmptySign = true;
+              hasEmptyDoctorSign = true;
               break;
             }
           }
 
-          if (node instanceof BaseCombineNode/* BaseCombineNode */.V && !hasEmptySign) {
-            // 医生签名已存在的情况不在深层调用深层遍历
+          if (node instanceof BaseCombineNode/* BaseCombineNode */.V && attribute === 1 && hasEmptyPatientSign) {
+            // 患者签名已存在的情况不在深层调用深层遍历
+            getAllNodes(node.childNodes);
+          }
+
+          if (node instanceof BaseCombineNode/* BaseCombineNode */.V && attribute === 0 && !hasEmptyDoctorSign) {
+            // 医生签名不存在的情况不在深层调用深层遍历
             getAllNodes(node.childNodes);
           }
         }
@@ -221271,7 +221355,16 @@ var VueController = /*#__PURE__*/function () {
 
       var mainNodes = hoEditorFactory.docTree.mainNodes;
       getAllNodes(mainNodes);
-      return hasEmptySign;
+
+      if (attribute == 1) {
+        if (patientSignCount == 0) {
+          return true;
+        }
+
+        return hasEmptyPatientSign;
+      } else {
+        return hasEmptyDoctorSign;
+      }
     }
     /**
      * 查询是否存在医生签名
@@ -229361,9 +229454,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=9b7c7d28&
-var Signvue_type_template_id_9b7c7d28_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":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":2},model:{value:(_vm.signType),callback:function ($$v) {_vm.signType=$$v},expression:"signType"}},[_vm._v("自定义医生签名")])],1),(_vm.signType === 2)?[_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 === 2)?_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_9b7c7d28_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-41[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&
@@ -229455,8 +229548,8 @@ var Sign = /*#__PURE__*/function (_Vue) {
   }, {
     key: "insertSign",
     value: function insertSign() {
-      if (this.signType === 2) {
-        // 多人签名
+      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 ? '患者签名' : '医生签名';
@@ -229505,8 +229598,8 @@ Sign = __decorate([vue_class_component_esm({
 
 var Sign_component = normalizeComponent(
   sign_Signvue_type_script_lang_ts_,
-  Signvue_type_template_id_9b7c7d28_render,
-  Signvue_type_template_id_9b7c7d28_staticRenderFns,
+  Signvue_type_template_id_38b332be_render,
+  Signvue_type_template_id_38b332be_staticRenderFns,
   false,
   null,
   null,