hoeditor-web 3.1.31 → 3.1.33

package/lib/hoeditor.umd.js

@@ -55137,7 +55137,7 @@ var SelectRange = __webpack_require__(53901);
 /*
  * @Author: your name
  * @Date: 2020-11-11 11:04:19
- * @LastEditTime: 2023-06-08 17:27:09
+ * @LastEditTime: 2023-11-15 16:25:41
  * @LastEditors: liyanan 2441631434@qq.com
  * @Description: In User Settings Edit
  * @FilePath: \hoeditor-web\src\editor\draw\drawNode\DrawImageNode.ts
@@ -55244,13 +55244,15 @@ var DrawImageNode = /*#__PURE__*/function (_DrawCombineNode) {
       }
       image.onerror = function () {
         hoEditorFactory.loadImageCount--;
-        var path = _this2.node.previousLeaf().getNodePath();
-        hoEditorFactory.docTree.deleteNode(_this2.node);
-        var changeEvent = new NodeChangeEvent/* NodeChangeEvent */.G(_this2._hoEditorFactoryID, DocTree/* DocAction */.gk.daModifyStyle, path, path);
-        changeEvent.oldEndPath = path;
-        changeEvent.afterChangePath = path;
-        changeEvent.oldDrawLines = new SelectRange/* SelectRange */.E(_this2._hoEditorFactoryID).getRangeDrawLines(path, path, true);
-        hoEditorFactory.docTree.change(changeEvent);
+        if (!drawNode.node.isBackFill) {
+          var path = _this2.node.previousLeaf().getNodePath();
+          hoEditorFactory.docTree.deleteNode(_this2.node);
+          var changeEvent = new NodeChangeEvent/* NodeChangeEvent */.G(_this2._hoEditorFactoryID, DocTree/* DocAction */.gk.daModifyStyle, path, path);
+          changeEvent.oldEndPath = path;
+          changeEvent.afterChangePath = path;
+          changeEvent.oldDrawLines = new SelectRange/* SelectRange */.E(_this2._hoEditorFactoryID).getRangeDrawLines(path, path, true);
+          hoEditorFactory.docTree.change(changeEvent);
+        }
       };
     }
   }, {
@@ -55341,7 +55343,7 @@ var BaseNode = __webpack_require__(62358);
 var ImageNode = /*#__PURE__*/function (_BaseNode) {
   (0,inherits/* default */.Z)(ImageNode, _BaseNode);
   var _super = (0,createSuper/* default */.Z)(ImageNode);
-  // 修改层json信息
+  //是否是回填的
   function ImageNode(hoEditorFactoryID, rootNodes, pNode, nodeType, id, imageDataBase64String, width, height,
   //scaleX?: number,
   //scaleY?: number,
@@ -55368,6 +55370,8 @@ var ImageNode = /*#__PURE__*/function (_BaseNode) {
     (0,defineProperty/* default */.Z)((0,assertThisInitialized/* default */.Z)(_this), "_markImage", void 0);
     // 修改层
     (0,defineProperty/* default */.Z)((0,assertThisInitialized/* default */.Z)(_this), "_imageJson", void 0);
+    // 修改层json信息
+    (0,defineProperty/* default */.Z)((0,assertThisInitialized/* default */.Z)(_this), "_isBackFill", void 0);
     _this._id = id;
     _this._width = width;
     _this._height = height;
@@ -55376,6 +55380,7 @@ var ImageNode = /*#__PURE__*/function (_BaseNode) {
     _this._isFormula = options !== null && options !== void 0 && options.isFormula ? options.isFormula : false;
     _this._markImage = markImage ? markImage : '';
     _this._imageJson = imageJson ? imageJson : '';
+    _this.isBackFill = options !== null && options !== void 0 && options.isBackFill ? options.isBackFill : false;
     //this._scaleX = scaleX ? scaleX : 1;
     //this._scaleY = scaleY ? scaleY : 1;
     _this.node2DrawNodeRange(0, 0);
@@ -55483,6 +55488,16 @@ var ImageNode = /*#__PURE__*/function (_BaseNode) {
         this._imageJson = value;
       }
     }
+  }, {
+    key: "isBackFill",
+    get: function get() {
+      return this._isBackFill;
+    },
+    set: function set(value) {
+      if (this._isBackFill !== value) {
+        this._isBackFill = value;
+      }
+    }
     /**
      * imageNode 节点删除时 如果 imageDataBase64String是url地址形式 需要保存url列表
      */
@@ -55576,6 +55591,9 @@ var ImageNode = /*#__PURE__*/function (_BaseNode) {
       if (this.imageJson) {
         retObj.imageJson = this.imageJson;
       }
+      if (this.isBackFill) {
+        retObj.isBackFill = this.isBackFill;
+      }
       if (isCopy) {
         return retObj;
       }
@@ -55596,11 +55614,13 @@ var ImageNode = /*#__PURE__*/function (_BaseNode) {
       //const scaleX = Number(json.scaleX);
       //const scaleY = Number(json.scaleY);
       var isFormula = json.isFormula ? json.isFormula === "true" ? true : false : false;
+      var isBackFill = json.isBackFill ? json.isBackFill === "true" ? true : false : false;
       return new ImageNode(hoEditorFactoryID, rootNodes, pNode ? pNode : null, BaseNode/* NodeType */.Jq.ntImage, json.id, json.imageDataBase64String, width, height,
       //scaleX,
       //scaleY,
       {
-        isFormula: isFormula
+        isFormula: isFormula,
+        isBackFill: isBackFill
       }, json.markImage, json.imageJson);
     }
   }]);
@@ -61669,11 +61689,13 @@ var SignNode = /*#__PURE__*/function (_BaseNode) {
       var imgHeight = isClearSign ? 0 : Number(json.imgHeight);
       var isTemplate = json.isTemplate === true || json.isTemplate === "true" ? true : false;
       var attribute = json.attribute ? Number(json.attribute) : 0;
+      var isFront = json.isFront === true || json.isFront === "true" ? true : false;
+      var allowEditSignTime = json.allowEditSignTime === true || json.allowEditSignTime === "true" ? true : false;
       // 处理otherProperties参数传错导致fingerPrintSrc属性错误问题
       if ((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_typeof_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z)(json.fingerPrintSrc) == 'object') {
         json.fingerPrintSrc = '';
       }
-      var signNode = new SignNode(hoEditorFactoryID, rootNodes, pNode ? pNode : null, _BaseNode__WEBPACK_IMPORTED_MODULE_18__/* .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, json.isFront, json.allowEditSignTime, isClearSign ? "" : json.fingerPrintSrc, isClearSign ? 0 : json.fingerPosition, attribute, json.connectChar, json.otherProperties, json.dataId);
+      var signNode = new SignNode(hoEditorFactoryID, rootNodes, pNode ? pNode : null, _BaseNode__WEBPACK_IMPORTED_MODULE_18__/* .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);
       // if (json.id != "") {
       //     signNode.id = json.id;
       // }
@@ -218061,7 +218083,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.31');
+/* harmony default export */ var version = ('3.1.33');
 // EXTERNAL MODULE: ./src/components/controls/poperTipText/PoperTipText.vue + 5 modules
 var PoperTipText = __webpack_require__(50987);
 ;// CONCATENATED MODULE: ./src/components/controls/poperTipText/index.ts
@@ -231677,16 +231699,16 @@ var VueController = /*#__PURE__*/function () {
       getAllNodes(mainNodes);
       var hSignList = signList.map(function (sign, index) {
         if (sign.number > 1) {
-          if (sign.isFront) {
-            for (var i = index; i >= 0; i++) {
-              if (signList[i].number == 1) {
+          if (!sign.isFront) {
+            for (var i = index; i <= signList.length - 1; i++) {
+              if (signList[i] && signList[i].number == 1) {
                 sign.isTemplate = signList[i].isTemplate;
                 break;
               }
             }
           } else {
             for (var _i4 = index; _i4 >= 0; _i4--) {
-              if (signList[_i4].number == 1) {
+              if (signList[_i4] && signList[_i4].number == 1) {
                 sign.isTemplate = signList[_i4].isTemplate;
                 break;
               }