hoeditor-web 3.1.94 → 3.1.96

package/lib/hoeditor.umd.js

@@ -50408,12 +50408,6 @@ var CellNode = /*#__PURE__*/function (_RectNode) {
             if (convertNode instanceof _MarkNode__WEBPACK_IMPORTED_MODULE_32__/* .MarkNode */ .j) {
               hoEditorFactory.structureConvert._markNodes.push(convertNode);
             }
-            // if (convertNode instanceof SignNode && ((convertNode.imgSrc != ""
-            //   && ((hoEditorFactory.superiorSigns.length > 0
-            //     && hoEditorFactory.superiorSigns.includes((convertNode.customProperty as any).bce01)) || hoEditorFactory.forbidEditBeforeSign))
-            //   || hoEditorFactory.lockContent)) {
-            //   hoEditorFactory.structureConvert._superiorSign[0] = convertNode;
-            // }
           }
         } else {
           cellNode.childNodes[0].paraNo = Number(item.styleIndex);
@@ -59299,8 +59293,10 @@ var SignNode = /*#__PURE__*/function (_BaseNode) {
         json.fingerPrintSrc = '';
       }
       var signNode = new SignNode(hoEditorFactoryID, rootNodes, pNode ? pNode : null, _BaseNode__WEBPACK_IMPORTED_MODULE_20__/* .NodeType */ .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, isFront, allowEditSignTime, isClearSign ? "" : json.fingerPrintSrc, isClearSign ? 0 : json.fingerPosition, attribute, json.connectChar, json.otherProperties, json.dataId, json.associatedElement);
-      if (signNode.imgSrc != "" && (hoEditorFactory.superiorSigns.length > 0 && hoEditorFactory.superiorSigns.includes(signNode.customProperty.bce01) || hoEditorFactory.forbidEditBeforeSign) || hoEditorFactory.lockContent) {
-        hoEditorFactory.structureConvert._superiorSign[0] = signNode;
+      if (signNode.attribute != 1) {
+        if (signNode.imgSrc != "" && (hoEditorFactory.superiorSigns.length > 0 && hoEditorFactory.superiorSigns.includes(signNode.customProperty.bce01) || hoEditorFactory.forbidEditBeforeSign) || hoEditorFactory.lockContent) {
+          hoEditorFactory.structureConvert._superiorSign[0] = signNode;
+        }
       }
       // if (json.id != "") {
       //     signNode.id = json.id;
@@ -207358,7 +207354,7 @@ var TextNode = __webpack_require__(27198);
 // EXTERNAL MODULE: ./src/editor/dom/treeNode/ParagraphNode.ts
 var ParagraphNode = __webpack_require__(67945);
 ;// CONCATENATED MODULE: ./src/components/version.ts
-/* harmony default export */ var version = ('3.1.94');
+/* harmony default export */ var version = ('3.1.96');
 // EXTERNAL MODULE: ./src/components/controls/poperTipText/PoperTipText.vue + 5 modules
 var PoperTipText = __webpack_require__(50987);
 ;// CONCATENATED MODULE: ./src/components/controls/poperTipText/index.ts
@@ -217092,6 +217088,13 @@ var VueController = /*#__PURE__*/function () {
       } else {
         var superiorSign = hoEditorFactory.structureConvert._superiorSign;
         var signNode = superiorSign[0];
+        if (hoEditorFactory.forbidEditBeforeSign && hoEditorFactory.drawTree.paintStatus == DrawTree/* PaintState */.Dh.psReview) {
+          var _signNode$customPrope;
+          if (((_signNode$customPrope = signNode.customProperty) === null || _signNode$customPrope === void 0 ? void 0 : _signNode$customPrope.bce01) != hoEditorFactory.userInfo.id) {
+            this.hiddenMask(true);
+            return;
+          }
+        }
         var curArea = hoEditorFactory.drawPageTree.getMainRootArea(signNode.drawNodes[0]);
         var actualHeight = hoEditorFactory.drawPageTree.drawHeaders[0].displayHeight;
         if (curArea && curArea instanceof DrawPageMainDoc/* DrawPageMainDoc */.$) {
@@ -217257,7 +217260,7 @@ var VueController = /*#__PURE__*/function () {
       var iteratesNodes = function iteratesNodes(nodes) {
         for (var i = 0; i < nodes.length; i++) {
           var anode = nodes[i];
-          if (anode instanceof SignNode/* SignNode */.N && anode.imgSrc === "" && anode.attribute === 1) {
+          if (anode instanceof SignNode/* SignNode */.N && anode.imgSrc === "" && (hoEditorFactory.lockContent && anode.attribute == 1 || !hoEditorFactory.lockContent)) {
             var path2 = anode.getNodePath();
             var result = NodePosition/* NodePosition */.F.treePathCompare(path1, path2);
             if (result > 0) {