hoeditor-web 3.1.7 → 3.1.8

package/lib/hoeditor.umd.js

@@ -40210,7 +40210,7 @@ var DocController = /*#__PURE__*/function () {
     key: "deleteTextBeforePath",
     value: function () {
       var _deleteTextBeforePath = (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_asyncToGenerator_js__WEBPACK_IMPORTED_MODULE_3__/* ["default"] */ .Z)( /*#__PURE__*/(0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_regeneratorRuntime_js__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z)().mark(function _callee(startPath) {
-        var hoEditorFactory, domRange, nodePosition, childIndex, node, ret, topath, arr, tmp, aRange, endPath, _topath, _aRange, isError, prevNode, cellNode, tableNode, tIndex, cIndex, preParaNode, newpath, signUserId, preNode, nextNode, path, signNode, table, c, colProperty, spath, epath, newSignNode, nodesDeleteUndoUnit, pNode;
+        var hoEditorFactory, domRange, nodePosition, childIndex, node, ret, topath, arr, tmp, aRange, endPath, _topath, _aRange, isError, prevNode, cellNode, tableNode, tIndex, cIndex, preParaNode, newpath, signUserId, preNode, sPath, ePath, path, signNode, table, c, colProperty, pNode;
         return (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_regeneratorRuntime_js__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z)().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
@@ -40231,18 +40231,18 @@ var DocController = /*#__PURE__*/function () {
               //   )
               // );
               // hoEditorFactory.undoService.commit();
-              _context.next = 126;
+              _context.next = 123;
               break;
             case 6:
               nodePosition = hoEditorFactory.docTree.findNodePositionByPath(startPath);
               childIndex = nodePosition.childIndex;
               node = nodePosition.node;
               if (!node) {
-                _context.next = 126;
+                _context.next = 123;
                 break;
               }
               if (!domRange.isEmpty) {
-                _context.next = 126;
+                _context.next = 123;
                 break;
               }
               if (!(node instanceof _treeNode_TextNode__WEBPACK_IMPORTED_MODULE_28__/* .TextNode */ .R)) {
@@ -40298,7 +40298,7 @@ var DocController = /*#__PURE__*/function () {
               aRange = new _DomRange__WEBPACK_IMPORTED_MODULE_32__/* .DomRange */ .a(this._hoEditorFactoryID, startPath, topath).normalize();
               this.deleteRange(aRange, true);
               hoEditorFactory.docTree.curDomRange = new _DomRange__WEBPACK_IMPORTED_MODULE_32__/* .DomRange */ .a(this._hoEditorFactoryID, topath, topath);
-              _context.next = 126;
+              _context.next = 123;
               break;
             case 36:
               if (!(node instanceof _treeNode_MarkNode__WEBPACK_IMPORTED_MODULE_48__/* .MarkNode */ .j)) {
@@ -40350,7 +40350,7 @@ var DocController = /*#__PURE__*/function () {
               //   )
               // );
               // hoEditorFactory.undoService.commit();
-              _context.next = 126;
+              _context.next = 123;
               break;
             case 56:
               if (!(node instanceof _treeNode_ParagraphNode__WEBPACK_IMPORTED_MODULE_31__/* .ParagraphNode */ .C)) {
@@ -40437,13 +40437,15 @@ var DocController = /*#__PURE__*/function () {
               return _context.abrupt("return");
             case 98:
               if (!(node instanceof _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_85__/* .SignNode */ .N)) {
-                _context.next = 121;
+                _context.next = 118;
                 break;
               }
               preNode = node.previousLeaf();
-              nextNode = node.nextLeaf();
-              if (!((node.imgSrc !== "" || node.fingerPrintSrc !== "") && node.isTemplate && !(preNode instanceof _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_85__/* .SignNode */ .N) && !(nextNode instanceof _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_85__/* .SignNode */ .N))) {
-                _context.next = 110;
+              sPath = hoEditorFactory.docTree.getNodeLastPath(preNode);
+              ePath = hoEditorFactory.docTree.getNodeLastPath(node); //const nextNode = node.nextLeaf();
+              //if ((node.imgSrc !== "" || node.fingerPrintSrc !== "") && node.isTemplate && !(preNode instanceof SignNode) && !(nextNode instanceof SignNode)) {
+              if (!((node.imgSrc !== "" || node.fingerPrintSrc !== "") && node.isTemplate)) {
+                _context.next = 113;
                 break;
               }
               path = hoEditorFactory.docTree.getNodeLastPath(preNode);
@@ -40465,31 +40467,15 @@ var DocController = /*#__PURE__*/function () {
                 }
               }
               return _context.abrupt("return");
-            case 110:
-              if (!(preNode instanceof _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_85__/* .SignNode */ .N)) {
-                _context.next = 121;
-                break;
-              }
-              spath = "";
-              if (node.number === 2 || node.number === 1 && node.isTemplate) {
-                spath = hoEditorFactory.docTree.getNodeLastPath(preNode.previousLeaf());
-              } else {
-                spath = hoEditorFactory.docTree.getNodeLastPath(preNode);
+            case 113:
+              if (node.connectMode == "换行" && preNode instanceof _treeNode_ParagraphNode__WEBPACK_IMPORTED_MODULE_31__/* .ParagraphNode */ .C) {
+                sPath = hoEditorFactory.docTree.getNodeLastPath(preNode.previousLeaf());
               }
-              //const spath = hoEditorFactory.docTree.getNodeLastPath(preNode);
-              epath = hoEditorFactory.docTree.getNodeLastPath(node);
-              newSignNode = new _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_85__/* .SignNode */ .N(this._hoEditorFactoryID, preNode.rootNodes, preNode.parentNode, _treeNode_BaseNode__WEBPACK_IMPORTED_MODULE_25__/* .NodeType */ .Jq.ntSign, 1, preNode.type, preNode.name === "" ? "签名" : preNode.name, preNode.signType, preNode.signFormat, preNode.signor, preNode.signTime, preNode.signTimeFormat, preNode.imgSrc, preNode.imgWidth, preNode.imgHeight, preNode.customProperty, preNode.isTemplate ? preNode.isTemplate : node.isTemplate,
-              //node.isTemplate,
-              node.styleIndex, preNode.connectMode, preNode.isFront, preNode.allowEditSignTime, preNode.fingerPrintSrc, preNode.fingerPosition, preNode.attribute, preNode.connectChar, preNode.otherProperties);
               hoEditorFactory.undoService.begin();
-              nodesDeleteUndoUnit = new _undoRedo_NodesDeleteUndoUnit__WEBPACK_IMPORTED_MODULE_37__/* .NodesDeleteUndoUnit */ .F(this._hoEditorFactoryID, spath, epath, true);
-              hoEditorFactory.undoService.add(nodesDeleteUndoUnit);
-              if (!nodesDeleteUndoUnit.isError && (node.number === 2 || node.number === 1 && node.isTemplate)) {
-                hoEditorFactory.undoService.add(new _undoRedo_NodeInsertUndoUnit__WEBPACK_IMPORTED_MODULE_26__/* .NodeInsertUndoUnit */ .R(this._hoEditorFactoryID, spath, newSignNode));
-              }
+              hoEditorFactory.undoService.add(new _undoRedo_NodesDeleteUndoUnit__WEBPACK_IMPORTED_MODULE_37__/* .NodesDeleteUndoUnit */ .F(this._hoEditorFactoryID, sPath, ePath, true));
               hoEditorFactory.undoService.commit();
               return _context.abrupt("return");
-            case 121:
+            case 118:
               pNode = node.parentNode;
               hoEditorFactory.undoService.begin();
               hoEditorFactory.undoService.add(new _undoRedo_NodeDeleteUndoUnit__WEBPACK_IMPORTED_MODULE_38__/* .NodeDeleteUndoUnit */ .w(this._hoEditorFactoryID, node, startPath));
@@ -40497,7 +40483,7 @@ var DocController = /*#__PURE__*/function () {
               if (pNode && pNode instanceof _treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_47__/* .TextInputFieldNode */ .re && pNode.childNodes.length === 2) {
                 this.resetEmptyInputFieldNode(hoEditorFactory, pNode);
               }
-            case 126:
+            case 123:
             case "end":
               return _context.stop();
           }
@@ -45771,11 +45757,25 @@ var DocTree = /*#__PURE__*/function () {
   }, {
     key: "getParentNode",
     value: function getParentNode(startPath) {
-      var pNode = null;
+      var parentNode = null;
       var np = this.findNodePositionByPath(startPath);
       if (!(np && np.node)) {
         throw _events_Exception__WEBPACK_IMPORTED_MODULE_42__/* .Exception */ .P.NodeNotFound();
       }
+      parentNode = np.node.parentNode;
+      if (parentNode && parentNode.last() == np.node && parentNode instanceof _treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_36__/* .TextInputFieldNode */ .re) {
+        parentNode = parentNode.parentNode;
+      }
+      return parentNode;
+    }
+  }, {
+    key: "getFinalParentNode",
+    value: function getFinalParentNode(path) {
+      var pNode = null;
+      var np = this.findNodePositionByPath(path);
+      if (!(np && np.node)) {
+        throw _events_Exception__WEBPACK_IMPORTED_MODULE_42__/* .Exception */ .P.NodeNotFound();
+      }
       pNode = np.node.parentNode;
       if (pNode instanceof _treeNode_CellNode__WEBPACK_IMPORTED_MODULE_43__/* .CellNode */ .D) {
         return pNode;
@@ -45788,14 +45788,6 @@ var DocTree = /*#__PURE__*/function () {
           }
         }
       } while (pNode && pNode.parentNode);
-      // parentNode = np.node.parentNode;
-      // if (
-      //   parentNode &&
-      //   parentNode.last() == np.node &&
-      //   parentNode instanceof TextInputFieldNode
-      // ) {
-      //   parentNode = parentNode.parentNode;
-      // }
       return pNode;
     }
   }, {
@@ -61026,10 +61018,16 @@ var SignNode = /*#__PURE__*/function (_BaseNode) {
       _this._styleIndex = hoEditorFactory.docTree.curStyleIndex;
     }
     _this._connectMode = connectMode;
-    if (signType === 1 && type !== 1) {
+    if (isFront !== undefined) {
       _this._isFront = isFront;
+    }
+    if (allowEditSignTime !== undefined) {
       _this._allowEditSignTime = allowEditSignTime;
     }
+    // if (signType === 1 && type !== 1) {
+    //     this._isFront = isFront as boolean;
+    //     this._allowEditSignTime = allowEditSignTime as boolean;
+    // }
     _this._otherProperties = new Object();
     _this._customProperty = new Object();
     var assignvalue = function assignvalue(target, source) {
@@ -78430,7 +78428,7 @@ var DrawRect = /*#__PURE__*/function (_DrawContainer) {
 /*
  * @Author: your name
  * @Date: 2021-09-01 16:51:49
- * @LastEditTime: 2023-07-07 17:44:37
+ * @LastEditTime: 2023-09-05 16:39:23
  * @LastEditors: liyanan 2441631434@qq.com
  * @Description: In User Settings Edit
  * @FilePath: \hoeditor-web\src\editor\draw\drawNode\DrawSignNode.ts
@@ -78932,11 +78930,14 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
           bitmap.setBounds(0, 0, drawNode.dWidth, drawNode.dHeight);
           if (_this3.number === 1) {
             bitmap.x = 0;
+            _this3.addChildAt(bitmap, 0);
           } else {
             if (isFront) {
               bitmap.x = 0;
+              _this3.addChildAt(bitmap, 0);
             } else {
               bitmap.x = _this3._drawText.getMeasuredWidth();
+              _this3.addChild(bitmap);
             }
           }
           if (_this3.attribute === 2 && _this3.abi02 !== "") {
@@ -78996,8 +78997,6 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
                 }
                 _this3.addChild(_this3._drawDate);
               }
-            } else {
-              _this3.addChildAt(bitmap, 0);
             }
           }
           var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_12__/* .HOEditorFactorys */ .b.instance().getFactory(drawNode.node.hoEditorFactoryID);
@@ -79074,7 +79073,7 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
                 }
                 bitmap.setTransform(x, y, width / hitWidth, scaleY);
               } else {
-                bitmap.setTransform(0, -drawNode.dHeight, width / hitWidth, drawNode.dHeight / hitHeight);
+                bitmap.setTransform(bitmap.x, -drawNode.dHeight, width / hitWidth, drawNode.dHeight / hitHeight);
               }
               var hitArea = new createjs.Shape();
               hitArea.graphics.beginFill('#000').drawRect(0, 0, drawNode.dWidth, drawNode.dHeight); //这里是图片大小
@@ -85398,7 +85397,7 @@ var DrawTree = /*#__PURE__*/function () {
           }
           var aNode = e.node;
           var nodePathCur = aNode.getNodePath();
-          var pNode = hoEditorFactory.docTree.getParentNode(nodePathCur);
+          var pNode = hoEditorFactory.docTree.getFinalParentNode(nodePathCur);
           if (pNode instanceof CellNode/* CellNode */.D) {
             if (pNode.table.tableProperty.isSignLock && pNode.table.tableProperty.isLock) {
               message/* default */.Z.destroy();
@@ -217573,7 +217572,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.7');
+/* harmony default export */ var version = ('3.1.8');
 // EXTERNAL MODULE: ./src/components/controls/poperTipText/PoperTipText.vue + 5 modules
 var PoperTipText = __webpack_require__(50987);
 ;// CONCATENATED MODULE: ./src/components/controls/poperTipText/index.ts
@@ -228794,8 +228793,9 @@ var VueController = /*#__PURE__*/function () {
         return;
       }
       if (node instanceof SignNode/* SignNode */.N) {
-        var nextNode = node.nextLeaf();
-        if ((node.imgSrc !== '' || node.fingerPrintSrc !== '') && node.isTemplate && !(preNode instanceof SignNode/* SignNode */.N) && !(nextNode instanceof SignNode/* SignNode */.N)) {
+        //const nextNode = node.nextLeaf();
+        //if ((node.imgSrc !== '' || node.fingerPrintSrc !== '') && node.isTemplate && !(preNode instanceof SignNode) && !(nextNode instanceof SignNode)) {
+        if ((node.imgSrc !== '' || node.fingerPrintSrc !== '') && node.isTemplate) {
           var signNode = new SignNode/* SignNode */.N(this._hoEditorFactoryID, node.rootNodes, node.parentNode, BaseNode/* NodeType */.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, node.connectChar, node.otherProperties);
           hoEditorFactory.undoService.begin();
           hoEditorFactory.undoService.add(new NodeDeleteUndoUnit/* NodeDeleteUndoUnit */.w(this._hoEditorFactoryID, node, ePath));
@@ -228814,35 +228814,72 @@ var VueController = /*#__PURE__*/function () {
             }
           }
           return;
-        }
-        if (preNode instanceof SignNode/* SignNode */.N) {
-          if (hoEditorFactory.drawTree.paintStatus !== DrawTree/* PaintState */.Dh.psDesign) {
-            if (node.isTemplate && node.number === 0) {
-              message/* default */.Z.warn('该签名元素不允许删除！');
-              return;
-            }
-          }
-          var spath = '';
-          if (node.number === 2 || node.number === 1 && node.isTemplate) {
-            spath = hoEditorFactory.docTree.getNodeLastPath(preNode.previousLeaf());
-          } else {
-            spath = hoEditorFactory.docTree.getNodeLastPath(preNode);
+        } else {
+          if (node.connectMode == "换行" && preNode instanceof ParagraphNode/* ParagraphNode */.C) {
+            sPath = hoEditorFactory.docTree.getNodeLastPath(preNode.previousLeaf());
           }
-          //const spath = hoEditorFactory.docTree.getNodeLastPath(preNode as BaseNode);
-          //const epath = hoEditorFactory.docTree.getNodeLastPath(node);
-          var newSignNode = new SignNode/* SignNode */.N(this._hoEditorFactoryID, preNode.rootNodes, preNode.parentNode, BaseNode/* NodeType */.Jq.ntSign, 1, preNode.type, preNode.name === '' ? '签名' : preNode.name, preNode.signType, preNode.signFormat, preNode.signor, preNode.signTime, preNode.signTimeFormat, preNode.imgSrc, preNode.imgWidth, preNode.imgHeight, preNode.customProperty, preNode.isTemplate ? preNode.isTemplate : node.isTemplate,
-          //node.isTemplate,
-          node.styleIndex, preNode.connectMode, preNode.isFront, preNode.allowEditSignTime, preNode.fingerPrintSrc, preNode.fingerPosition, preNode.attribute, preNode.connectChar, preNode.otherProperties);
           hoEditorFactory.undoService.begin();
-          var nodesDeleteUndoUnit = new NodesDeleteUndoUnit/* NodesDeleteUndoUnit */.F(this._hoEditorFactoryID, spath, ePath, true);
-          hoEditorFactory.undoService.add(nodesDeleteUndoUnit);
-          if (!nodesDeleteUndoUnit.isError && (node.number === 2 || node.number === 1 && node.isTemplate)) {
-            hoEditorFactory.undoService.add(new NodeInsertUndoUnit/* NodeInsertUndoUnit */.R(this._hoEditorFactoryID, spath, newSignNode));
-          }
+          hoEditorFactory.undoService.add(new NodesDeleteUndoUnit/* NodesDeleteUndoUnit */.F(this._hoEditorFactoryID, sPath, ePath, true));
           hoEditorFactory.undoService.commit();
           return;
         }
+        /*
+        if (preNode instanceof SignNode) {
+            if (hoEditorFactory.drawTree.paintStatus !== PaintState.psDesign) {
+                if (node.isTemplate && node.number === 0) {
+                    message.warn('该签名元素不允许删除！');
+                    return;
+                }
+            }
+            let spath = '';
+            if (node.number === 2 || (node.number === 1 && node.isTemplate)) {
+                spath = hoEditorFactory.docTree.getNodeLastPath(preNode.previousLeaf() as BaseNode);
+            } else {
+                spath = hoEditorFactory.docTree.getNodeLastPath(preNode);
+            }
+            //const spath = hoEditorFactory.docTree.getNodeLastPath(preNode as BaseNode);
+            //const epath = hoEditorFactory.docTree.getNodeLastPath(node);
+            const newSignNode = new SignNode(
+                this._hoEditorFactoryID,
+                preNode.rootNodes,
+                preNode.parentNode,
+                NodeType.ntSign,
+                preNode.number,
+                preNode.type,
+                preNode.name === '' ? '签名' : preNode.name,
+                preNode.signType,
+                preNode.signFormat,
+                preNode.signor,
+                preNode.signTime,
+                preNode.signTimeFormat,
+                preNode.imgSrc,
+                preNode.imgWidth,
+                preNode.imgHeight,
+                preNode.customProperty,
+                preNode.isTemplate ? preNode.isTemplate : node.isTemplate,
+                //node.isTemplate,
+                node.styleIndex,
+                preNode.connectMode,
+                preNode.isFront,
+                preNode.allowEditSignTime,
+                preNode.fingerPrintSrc,
+                preNode.fingerPosition,
+                preNode.attribute,
+                preNode.connectChar,
+                preNode.otherProperties
+            );
+            hoEditorFactory.undoService.begin();
+            const nodesDeleteUndoUnit = new NodesDeleteUndoUnit(this._hoEditorFactoryID, spath, ePath, true);
+            hoEditorFactory.undoService.add(nodesDeleteUndoUnit);
+            if (!nodesDeleteUndoUnit.isError && (node.number === 2 || (node.number === 1 && node.isTemplate))) {
+                hoEditorFactory.undoService.add(new NodeInsertUndoUnit(this._hoEditorFactoryID, spath, newSignNode));
+            }
+            hoEditorFactory.undoService.commit();
+            return;
+        }
+        */
       }
+
       hoEditorFactory.undoService.begin();
       hoEditorFactory.undoService.add(new NodeDeleteUndoUnit/* NodeDeleteUndoUnit */.w(this._hoEditorFactoryID, node));
       hoEditorFactory.undoService.commit();
@@ -229562,7 +229599,7 @@ var VueController = /*#__PURE__*/function () {
         throw new Error('根据元素id:' + id + '未找到对应的元素');
       }
     }
-    //更新回填元素的文本内容
+    //更新回填元素的文本内容  更正元素
   }, {
     key: "updateElementText",
     value: function () {
@@ -229646,7 +229683,7 @@ var VueController = /*#__PURE__*/function () {
         return _updateElementText.apply(this, arguments);
       }
       return updateElementText;
-    }()
+    }() //元素替换
   }, {
     key: "updateElementTextById",
     value: function () {
@@ -233397,7 +233434,7 @@ var EditController = /*#__PURE__*/function () {
         }
       }
       if (result && hoEditorFactory.drawTree.paintStatus !== DrawTree/* PaintState */.Dh.psDesign) {
-        var pNode = hoEditorFactory.docTree.getParentNode(curDomRange.startPath);
+        var pNode = hoEditorFactory.docTree.getFinalParentNode(curDomRange.startPath);
         if (pNode && pNode instanceof CellNode/* CellNode */.D) {
           if (pNode.table.tableProperty.isSignLock && pNode.table.tableProperty.isLock) {
             message/* default */.Z.destroy();