hoeditor-web 2.0.53 → 2.0.54-rc.1

package/lib/hoeditor.common.js

@@ -15955,11 +15955,12 @@ var DocController = /*#__PURE__*/function () {
 
       curArea.areaComments.set(commentID, comment);
       hoEditorFactory.drawTree.commentsMap.set(commentID, comment);
-      curArea.drawComments();
-      var newEndpath = endNode.getNodePath();
+      curArea.drawComments(); //const newEndpath = endNode.getNodePath();
+
       hoEditorFactory.undoService.begin();
-      hoEditorFactory.undoService.add(new _undoRedo_NodeStyleUndoUnit__WEBPACK_IMPORTED_MODULE_34__/* .NodeStyleUndoUnit */ .o(this._hoEditorFactoryID, startPath, newEndpath, new _undoRedo_NodeStyleUndoUnit__WEBPACK_IMPORTED_MODULE_34__/* .Operate */ .p("insertComment", commentID)));
+      hoEditorFactory.undoService.add(new _undoRedo_NodeStyleUndoUnit__WEBPACK_IMPORTED_MODULE_34__/* .NodeStyleUndoUnit */ .o(this._hoEditorFactoryID, startPath, endPath, new _undoRedo_NodeStyleUndoUnit__WEBPACK_IMPORTED_MODULE_34__/* .Operate */ .p("insertComment", commentID)));
       hoEditorFactory.undoService.commit();
+      var newEndpath = endNode.getNodePath();
       var newRange = new _DomRange__WEBPACK_IMPORTED_MODULE_31__/* .DomRange */ .a(this._hoEditorFactoryID, newEndpath, newEndpath);
       var cgEvent = new _events_SelectionChangeEvent__WEBPACK_IMPORTED_MODULE_35__/* .SelectionChangeEvent */ .r(newRange, newRange); //选中范围变化事件
 
@@ -16777,9 +16778,9 @@ var DocController = /*#__PURE__*/function () {
         node.customProperty = customProperty;
         node.imgWidth = imgWidth;
         node.imgHeight = imgHeight;
-        node.imgSrc = imgSrc;
         node.fingerPrintSrc = fingerPrintSrc ? fingerPrintSrc : "";
         node.fingerPosition = fingerPosition ? fingerPosition : 0;
+        node.imgSrc = imgSrc;
 
         if (type == 1 && node.signType == 1) {
           node.isFront = true;
@@ -16829,6 +16830,29 @@ var DocController = /*#__PURE__*/function () {
       node.imgSrc = signText;
       hoEditorFactory.docTree.change(changeEvent);
     }
+    /**
+     * 更新签名类型
+     * @param node 签名节点
+     * @param type 签名类型
+     * @param imgSrc 签名内容
+     */
+
+  }, {
+    key: "updateSignType",
+    value: function updateSignType(node, type, imgSrc, imgWidth, imgHeight) {
+      var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_77__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
+      var sPath = hoEditorFactory.docTree.getNodeLastPath(node.previousLeaf());
+      var ePath = hoEditorFactory.docTree.getNodeLastPath(node);
+      var changeEvent = new _events_NodeChangeEvent__WEBPACK_IMPORTED_MODULE_75__/* .NodeChangeEvent */ .G(this._hoEditorFactoryID, _DocTree__WEBPACK_IMPORTED_MODULE_26__/* .DocAction.daModifyStyle */ .gk.daModifyStyle, sPath, ePath);
+      changeEvent.oldEndPath = ePath;
+      changeEvent.afterChangePath = ePath;
+      changeEvent.oldDrawLines = new _draw_SelectRange__WEBPACK_IMPORTED_MODULE_76__/* .SelectRange */ .E(this._hoEditorFactoryID).getRangeDrawLines(sPath, ePath, true);
+      node.type = type;
+      node.imgWidth = imgWidth;
+      node.imgHeight = imgHeight;
+      node.imgSrc = imgSrc;
+      hoEditorFactory.docTree.change(changeEvent);
+    }
     /**
      *
      * @returns 返回病历文件变更日志
@@ -49740,6 +49764,17 @@ var DrawPageTable = /*#__PURE__*/function (_DrawRect) {
 
           if (partCell && aHeight) {
             rowHeight = Math.max(aHeight, partCell.docHeight);
+            rowSpan = mainCell.rowSpan;
+          }
+        }
+
+        if (rowSpan > 1) {
+          for (var i = 1; i < rowSpan; i++) {
+            var arowInfos = this._partRowHeights.get(r + i);
+
+            if (arowInfos && arowInfos.rowHeight && aHeight) {
+              aHeight += arowInfos.rowHeight;
+            }
           }
         } //this._partRowHeights.get(r)?.rowHeight
 
@@ -61243,7 +61278,7 @@ var NodeDeleteUndoUnit = /*#__PURE__*/function (_UndoInfo) {
 /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_regeneratorRuntime_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(86160);
 /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_asyncToGenerator_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(39873);
 /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_classCallCheck_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(35671);
-/* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_24__ = __webpack_require__(22342);
+/* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_25__ = __webpack_require__(22342);
 /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_inherits_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(99640);
 /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createSuper_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(28214);
 /* harmony import */ var core_js_modules_es_object_to_string_js__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(41539);
@@ -61269,6 +61304,7 @@ var NodeDeleteUndoUnit = /*#__PURE__*/function (_UndoInfo) {
 /* harmony import */ var _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_21__ = __webpack_require__(41005);
 /* harmony import */ var _dom_treeNode_MarkNode__WEBPACK_IMPORTED_MODULE_22__ = __webpack_require__(15868);
 /* harmony import */ var _dom_treeNode_CellNode__WEBPACK_IMPORTED_MODULE_23__ = __webpack_require__(15798);
+/* harmony import */ var _draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_24__ = __webpack_require__(98199);
 
 
 
@@ -61283,8 +61319,8 @@ var NodeDeleteUndoUnit = /*#__PURE__*/function (_UndoInfo) {
 /*
  * @Author: your name
  * @Date: 2020-09-24 15:56:09
- * @LastEditTime: 2022-03-28 11:38:19
- * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2022-06-07 15:10:10
+ * @LastEditors: liyanan 2441631434@qq.com
  * @Description: In User Settings Edit
  * @FilePath: \hoeditor-web\src\editor\undoRedo\NodeInsertUndoUnit.ts
  */
@@ -61303,6 +61339,7 @@ var NodeDeleteUndoUnit = /*#__PURE__*/function (_UndoInfo) {
 
 
 
+
 var NodeInsertUndoUnit = /*#__PURE__*/function (_UndoInfo) {
   (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_inherits_js__WEBPACK_IMPORTED_MODULE_3__/* ["default"] */ .Z)(NodeInsertUndoUnit, _UndoInfo);
 
@@ -61323,7 +61360,7 @@ var NodeInsertUndoUnit = /*#__PURE__*/function (_UndoInfo) {
     return _this;
   }
 
-  (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_24__/* ["default"] */ .Z)(NodeInsertUndoUnit, [{
+  (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_25__/* ["default"] */ .Z)(NodeInsertUndoUnit, [{
     key: "undo",
     value: function undo() {
       this.doUndo();
@@ -61415,6 +61452,11 @@ var NodeInsertUndoUnit = /*#__PURE__*/function (_UndoInfo) {
       } else if (this._pnode && this._pnode instanceof _dom_treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_19__/* .TextInputFieldNode */ .re && this.strBeforePath != hoEditorFactory.docTree.getNodeLastPath(this._pnode)) {
         //删除文本域节点的提示文本，并更新重绘整个文本域
         var pTiNode = this._pnode;
+
+        if (hoEditorFactory.drawTree.paintStatus == _draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_24__/* .PaintState.psReview */ .Dh.psReview && this.node instanceof _dom_treeNode_MarkNode__WEBPACK_IMPORTED_MODULE_22__/* .MarkNode */ .j && this.node.MarkNodeType === 2 && this.node.text.startsWith("C") && this._pnode.childNodes.length === 3 && this._pnode.childNodes[1] instanceof _dom_treeNode_MarkNode__WEBPACK_IMPORTED_MODULE_22__/* .MarkNode */ .j) {
+          return path;
+        }
+
         var res = pTiNode.getReadyToEdit(function (value) {
           //NOTE:在redo当中不能使用同一实例UndoRedoService的commit
           _this2._undo.begin();
@@ -199997,7 +200039,7 @@ var DrawSelectLevel = /*#__PURE__*/function () {
     key: "mouseDblClick",
     value: function () {
       var _mouseDblClick = (0,asyncToGenerator/* default */.Z)( /*#__PURE__*/(0,regeneratorRuntime/* default */.Z)().mark(function _callee(aevent) {
-        var hoEditorFactory, dPage, oldDPage, oldPageIndex, oldArea, targetArea, isSameArea, cgEvent, startPos, np, _np$node$parentNode, prevNode, oldRange, startPath, endPath, newRange, selectChangeEvent, nodeNeedModifyEvent, cellNode, colInfos, rowInfos, colProperty, _nodeNeedModifyEvent, _nodeNeedModifyEvent2, dPageTable, dPageCell, pos, docHeight, dHeight, index, i, dLastObj, distance, aHeight, count, str, j, _oldRange, _endPath, _newRange;
+        var hoEditorFactory, dPage, oldDPage, oldPageIndex, oldArea, targetArea, isSameArea, cgEvent, startPos, np, _np$node$parentNode, prevNode, oldRange, startPath, endPath, newRange, selectChangeEvent, nodeNeedModifyEvent, cellNode, colInfos, rowInfos, colProperty, _nodeNeedModifyEvent, _nodeNeedModifyEvent2;
 
         return (0,regeneratorRuntime/* default */.Z)().wrap(function _callee$(_context) {
           while (1) {
@@ -200155,48 +200197,42 @@ var DrawSelectLevel = /*#__PURE__*/function () {
                 } else if (cellNode.cellProperty.editorProperty === TableProperty/* EditorProperty.DateTime */.YS.DateTime || cellNode.cellProperty.editorProperty === TableProperty/* EditorProperty.DownList */.YS.DownList) {
                   _nodeNeedModifyEvent2 = new NodeNeedModifyEvent/* NodeNeedModifyEvent */.x(np.node, "dblclick", this._pageIndex);
                   hoEditorFactory.docTree.nodeNeedModify(_nodeNeedModifyEvent2);
-                } else if (cellNode.table.tableProperty.isAutoChangeLine) {
-                  //处理自动换行表格，双击时光标跳到指定双击位置
-                  dPageTable = cellNode.table.drawTable.getDrawTableByPageIndex(dPage.pageIndex);
-
-                  if (dPageTable) {
-                    dPageCell = cellNode.drawCell.getDrawPageCell(dPageTable);
-
-                    if (dPageCell) {
-                      pos = dPageCell.globalToLocal(aevent.stageX, aevent.stageY);
-                      docHeight = 0;
-                      dHeight = 0;
-                      index = cellNode.drawCell.drawPageCells.indexOf(dPageCell);
-
-                      for (i = 0; i < index; i++) {
-                        docHeight += cellNode.drawCell.drawPageCells[i].docHeight;
-                        dHeight += cellNode.drawCell.drawPageCells[i].dHeight;
-                      }
-
-                      dLastObj = cellNode.drawCell.drawLines[cellNode.drawCell.drawLines.length - 1];
-
-                      if (dLastObj.dTop + dLastObj.docHeight < dHeight + pos.y) {
-                        distance = pos.y + dHeight - (dLastObj.dTop + dLastObj.dHeight);
-                        aHeight = cellNode.table.tableProperty.autoLineHeightPx;
-                        count = Math.floor(distance / aHeight);
-                        str = "";
+                } //   else if (cellNode.table.tableProperty.isAutoChangeLine) {
+                //     //处理自动换行表格，双击时光标跳到指定双击位置
+                //     const dPageTable = cellNode.table.drawTable.getDrawTableByPageIndex(dPage.pageIndex);
+                //     if (dPageTable) {
+                //       const dPageCell = cellNode.drawCell.getDrawPageCell(dPageTable);
+                //       if (dPageCell) {
+                //         const pos = dPageCell.globalToLocal(aevent.stageX, aevent.stageY);
+                //         let docHeight = 0;
+                //         let dHeight = 0;
+                //         const index = cellNode.drawCell.drawPageCells.indexOf(dPageCell);
+                //         for (let i = 0; i < index; i++) {
+                //           docHeight += cellNode.drawCell.drawPageCells[i].docHeight;
+                //           dHeight += cellNode.drawCell.drawPageCells[i].dHeight
+                //         }
+                //         const dLastObj = cellNode.drawCell.drawLines[cellNode.drawCell.drawLines.length - 1]
+                //         if (dLastObj.dTop + dLastObj.docHeight < dHeight + pos.y) {
+                //           const distance = pos.y + dHeight - (dLastObj.dTop + dLastObj.dHeight)
+                //           const aHeight = cellNode.table.tableProperty.autoLineHeightPx;
+                //           const count = Math.floor(distance / aHeight);
+                //           let str = "";
+                //           for (let j = 0; j < count; j++) {
+                //             str += "\n"
+                //           }
+                //           if (str != "") {
+                //             const oldRange = hoEditorFactory.docTree.curDomRange.clone();
+                //             const endPath = hoEditorFactory.docTree.getNodeLastPath(cellNode.childNodes[cellNode.childNodes.length - 1]);
+                //             const newRange = new DomRange(hoEditorFactory.hoEditorFactoryId, endPath, endPath);
+                //             hoEditorFactory.drawTree.moveCaretToPath(endPath);
+                //             hoEditorFactory.docTree.curDomRange = newRange;
+                //             hoEditorFactory.docController.insertPlainTextAfterPath(endPath, str);
+                //           }
+                //         }
+                //       }
+                //     }
+                //   }
 
-                        for (j = 0; j < count; j++) {
-                          str += "\n";
-                        }
-
-                        if (str != "") {
-                          _oldRange = hoEditorFactory.docTree.curDomRange.clone();
-                          _endPath = hoEditorFactory.docTree.getNodeLastPath(cellNode.childNodes[cellNode.childNodes.length - 1]);
-                          _newRange = new DomRange/* DomRange */.a(hoEditorFactory.hoEditorFactoryId, _endPath, _endPath);
-                          hoEditorFactory.drawTree.moveCaretToPath(_endPath);
-                          hoEditorFactory.docTree.curDomRange = _newRange;
-                          hoEditorFactory.docController.insertPlainTextAfterPath(_endPath, str);
-                        }
-                      }
-                    }
-                  }
-                }
 
               case 45:
                 return _context.abrupt("return", true);
@@ -206691,7 +206727,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.53');
+/* harmony default export */ var version = ('2.0.54-rc.1');
 ;// 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 = []
@@ -218847,6 +218883,19 @@ var VueController = /*#__PURE__*/function () {
       var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID);
       hoEditorFactory.docController.updateSignTime(node, signText);
     }
+    /**
+     * 更新签名类型
+     * @param node 签名节点
+     * @param type 签名类型
+     * @param imgSrc 签名内容
+     */
+
+  }, {
+    key: "updateSignType",
+    value: function updateSignType(node, type, imgSrc, imgWidth, imgHeight) {
+      var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID);
+      hoEditorFactory.docController.updateSignType(node, type, imgSrc, imgWidth, imgHeight);
+    }
     /**
      * 强制删除
      */
@@ -219138,7 +219187,7 @@ var VueController = /*#__PURE__*/function () {
         var _loop2 = function _loop2(i) {
           var node = nodes[i];
 
-          if (node instanceof DownListNode/* DownListNode */.yF || node instanceof DateTimeNode/* DateTimeNode */.Z || node instanceof TextInputFieldNode/* TextInputFieldNode */.re && node.childNodes.filter(function (child) {
+          if (node instanceof DownListNode/* DownListNode */.yF && node.isReadOnly || node instanceof DateTimeNode/* DateTimeNode */.Z && node.isReadOnly || node instanceof TextInputFieldNode/* TextInputFieldNode */.re && !node.canModifyContent && node.inputFieldType == 0 && node.childNodes.filter(function (child) {
             return child instanceof TextInputFieldNode/* TextInputFieldNode */.re;
           }).length === 0) {
             if (arr.filter(function (v) {