hoeditor-web 2.0.53 → 2.0.54

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. package/lib/hoeditor.common.js +102 -51
  2. package/lib/hoeditor.umd.js +102 -51
  3. package/lib/hoeditor.umd.min.js +2 -2
  4. package/package.json +1 -1
package/lib/hoeditor.common.js CHANGED
@@ -15955,11 +15955,12 @@ var DocController = /*#__PURE__*/function () {
15955
15955
 
15956
15956
  curArea.areaComments.set(commentID, comment);
15957
15957
  hoEditorFactory.drawTree.commentsMap.set(commentID, comment);
15958
- curArea.drawComments();
15959
- var newEndpath = endNode.getNodePath();
15958
+ curArea.drawComments(); //const newEndpath = endNode.getNodePath();
15959
+
15960
15960
  hoEditorFactory.undoService.begin();
15961
- 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)));
15961
+ 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)));
15962
15962
  hoEditorFactory.undoService.commit();
15963
+ var newEndpath = endNode.getNodePath();
15963
15964
  var newRange = new _DomRange__WEBPACK_IMPORTED_MODULE_31__/* .DomRange */ .a(this._hoEditorFactoryID, newEndpath, newEndpath);
15964
15965
  var cgEvent = new _events_SelectionChangeEvent__WEBPACK_IMPORTED_MODULE_35__/* .SelectionChangeEvent */ .r(newRange, newRange); //选中范围变化事件
15965
15966
 
@@ -16829,6 +16830,31 @@ var DocController = /*#__PURE__*/function () {
16829
16830
  node.imgSrc = signText;
16830
16831
  hoEditorFactory.docTree.change(changeEvent);
16831
16832
  }
16833
+ /**
16834
+ * 更新签名类型
16835
+ * @param node 签名节点
16836
+ * @param type 签名类型
16837
+ * @param imgSrc 签名内容
16838
+ */
16839
+
16840
+ }, {
16841
+ key: "updateSignType",
16842
+ value: function updateSignType(node, type, imgSrc) {
16843
+ var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_77__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
16844
+ var sPath = hoEditorFactory.docTree.getNodeLastPath(node.previousLeaf());
16845
+ var ePath = hoEditorFactory.docTree.getNodeLastPath(node);
16846
+ var changeEvent = new _events_NodeChangeEvent__WEBPACK_IMPORTED_MODULE_75__/* .NodeChangeEvent */ .G(this._hoEditorFactoryID, _DocTree__WEBPACK_IMPORTED_MODULE_26__/* .DocAction.daModifyStyle */ .gk.daModifyStyle, sPath, ePath);
16847
+ changeEvent.oldEndPath = ePath;
16848
+ changeEvent.afterChangePath = ePath;
16849
+ changeEvent.oldDrawLines = new _draw_SelectRange__WEBPACK_IMPORTED_MODULE_76__/* .SelectRange */ .E(this._hoEditorFactoryID).getRangeDrawLines(sPath, ePath, true);
16850
+
16851
+ if (node.type !== type) {
16852
+ node.type = type;
16853
+ }
16854
+
16855
+ node.imgSrc = imgSrc;
16856
+ hoEditorFactory.docTree.change(changeEvent);
16857
+ }
16832
16858
  /**
16833
16859
  *
16834
16860
  * @returns 返回病历文件变更日志
@@ -49740,6 +49766,17 @@ var DrawPageTable = /*#__PURE__*/function (_DrawRect) {
49740
49766
 
49741
49767
  if (partCell && aHeight) {
49742
49768
  rowHeight = Math.max(aHeight, partCell.docHeight);
49769
+ rowSpan = mainCell.rowSpan;
49770
+ }
49771
+ }
49772
+
49773
+ if (rowSpan > 1) {
49774
+ for (var i = 1; i < rowSpan; i++) {
49775
+ var arowInfos = this._partRowHeights.get(r + i);
49776
+
49777
+ if (arowInfos && arowInfos.rowHeight && aHeight) {
49778
+ aHeight += arowInfos.rowHeight;
49779
+ }
49743
49780
  }
49744
49781
  } //this._partRowHeights.get(r)?.rowHeight
49745
49782
 
@@ -61243,7 +61280,7 @@ var NodeDeleteUndoUnit = /*#__PURE__*/function (_UndoInfo) {
61243
61280
  /* 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);
61244
61281
  /* 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);
61245
61282
  /* 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);
61246
- /* 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);
61283
+ /* 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);
61247
61284
  /* 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);
61248
61285
  /* 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);
61249
61286
  /* harmony import */ var core_js_modules_es_object_to_string_js__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(41539);
@@ -61269,6 +61306,7 @@ var NodeDeleteUndoUnit = /*#__PURE__*/function (_UndoInfo) {
61269
61306
  /* harmony import */ var _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_21__ = __webpack_require__(41005);
61270
61307
  /* harmony import */ var _dom_treeNode_MarkNode__WEBPACK_IMPORTED_MODULE_22__ = __webpack_require__(15868);
61271
61308
  /* harmony import */ var _dom_treeNode_CellNode__WEBPACK_IMPORTED_MODULE_23__ = __webpack_require__(15798);
61309
+ /* harmony import */ var _draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_24__ = __webpack_require__(98199);
61272
61310
 
61273
61311
 
61274
61312
 
@@ -61283,8 +61321,8 @@ var NodeDeleteUndoUnit = /*#__PURE__*/function (_UndoInfo) {
61283
61321
  /*
61284
61322
  * @Author: your name
61285
61323
  * @Date: 2020-09-24 15:56:09
61286
- * @LastEditTime: 2022-03-28 11:38:19
61287
- * @LastEditors: Please set LastEditors
61324
+ * @LastEditTime: 2022-06-07 15:10:10
61325
+ * @LastEditors: liyanan 2441631434@qq.com
61288
61326
  * @Description: In User Settings Edit
61289
61327
  * @FilePath: \hoeditor-web\src\editor\undoRedo\NodeInsertUndoUnit.ts
61290
61328
  */
@@ -61303,6 +61341,7 @@ var NodeDeleteUndoUnit = /*#__PURE__*/function (_UndoInfo) {
61303
61341
 
61304
61342
 
61305
61343
 
61344
+
61306
61345
  var NodeInsertUndoUnit = /*#__PURE__*/function (_UndoInfo) {
61307
61346
  (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_inherits_js__WEBPACK_IMPORTED_MODULE_3__/* ["default"] */ .Z)(NodeInsertUndoUnit, _UndoInfo);
61308
61347
 
@@ -61323,7 +61362,7 @@ var NodeInsertUndoUnit = /*#__PURE__*/function (_UndoInfo) {
61323
61362
  return _this;
61324
61363
  }
61325
61364
 
61326
- (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_24__/* ["default"] */ .Z)(NodeInsertUndoUnit, [{
61365
+ (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_25__/* ["default"] */ .Z)(NodeInsertUndoUnit, [{
61327
61366
  key: "undo",
61328
61367
  value: function undo() {
61329
61368
  this.doUndo();
@@ -61415,6 +61454,11 @@ var NodeInsertUndoUnit = /*#__PURE__*/function (_UndoInfo) {
61415
61454
  } else if (this._pnode && this._pnode instanceof _dom_treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_19__/* .TextInputFieldNode */ .re && this.strBeforePath != hoEditorFactory.docTree.getNodeLastPath(this._pnode)) {
61416
61455
  //删除文本域节点的提示文本，并更新重绘整个文本域
61417
61456
  var pTiNode = this._pnode;
61457
+
61458
+ 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) {
61459
+ return path;
61460
+ }
61461
+
61418
61462
  var res = pTiNode.getReadyToEdit(function (value) {
61419
61463
  //NOTE:在redo当中不能使用同一实例UndoRedoService的commit
61420
61464
  _this2._undo.begin();
@@ -199997,7 +200041,7 @@ var DrawSelectLevel = /*#__PURE__*/function () {
199997
200041
  key: "mouseDblClick",
199998
200042
  value: function () {
199999
200043
  var _mouseDblClick = (0,asyncToGenerator/* default */.Z)( /*#__PURE__*/(0,regeneratorRuntime/* default */.Z)().mark(function _callee(aevent) {
200000
- 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;
200044
+ 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;
200001
200045
 
200002
200046
  return (0,regeneratorRuntime/* default */.Z)().wrap(function _callee$(_context) {
200003
200047
  while (1) {
@@ -200155,48 +200199,42 @@ var DrawSelectLevel = /*#__PURE__*/function () {
200155
200199
  } else if (cellNode.cellProperty.editorProperty === TableProperty/* EditorProperty.DateTime */.YS.DateTime || cellNode.cellProperty.editorProperty === TableProperty/* EditorProperty.DownList */.YS.DownList) {
200156
200200
  _nodeNeedModifyEvent2 = new NodeNeedModifyEvent/* NodeNeedModifyEvent */.x(np.node, "dblclick", this._pageIndex);
200157
200201
  hoEditorFactory.docTree.nodeNeedModify(_nodeNeedModifyEvent2);
200158
- } else if (cellNode.table.tableProperty.isAutoChangeLine) {
200159
- //处理自动换行表格，双击时光标跳到指定双击位置
200160
- dPageTable = cellNode.table.drawTable.getDrawTableByPageIndex(dPage.pageIndex);
200161
-
200162
- if (dPageTable) {
200163
- dPageCell = cellNode.drawCell.getDrawPageCell(dPageTable);
200164
-
200165
- if (dPageCell) {
200166
- pos = dPageCell.globalToLocal(aevent.stageX, aevent.stageY);
200167
- docHeight = 0;
200168
- dHeight = 0;
200169
- index = cellNode.drawCell.drawPageCells.indexOf(dPageCell);
200170
-
200171
- for (i = 0; i < index; i++) {
200172
- docHeight += cellNode.drawCell.drawPageCells[i].docHeight;
200173
- dHeight += cellNode.drawCell.drawPageCells[i].dHeight;
200174
- }
200175
-
200176
- dLastObj = cellNode.drawCell.drawLines[cellNode.drawCell.drawLines.length - 1];
200177
-
200178
- if (dLastObj.dTop + dLastObj.docHeight < dHeight + pos.y) {
200179
- distance = pos.y + dHeight - (dLastObj.dTop + dLastObj.dHeight);
200180
- aHeight = cellNode.table.tableProperty.autoLineHeightPx;
200181
- count = Math.floor(distance / aHeight);
200182
- str = "";
200183
-
200184
- for (j = 0; j < count; j++) {
200185
- str += "\n";
200186
- }
200202
+ } // else if (cellNode.table.tableProperty.isAutoChangeLine) {
200203
+ // //处理自动换行表格，双击时光标跳到指定双击位置
200204
+ // const dPageTable = cellNode.table.drawTable.getDrawTableByPageIndex(dPage.pageIndex);
200205
+ // if (dPageTable) {
200206
+ // const dPageCell = cellNode.drawCell.getDrawPageCell(dPageTable);
200207
+ // if (dPageCell) {
200208
+ // const pos = dPageCell.globalToLocal(aevent.stageX, aevent.stageY);
200209
+ // let docHeight = 0;
200210
+ // let dHeight = 0;
200211
+ // const index = cellNode.drawCell.drawPageCells.indexOf(dPageCell);
200212
+ // for (let i = 0; i < index; i++) {
200213
+ // docHeight += cellNode.drawCell.drawPageCells[i].docHeight;
200214
+ // dHeight += cellNode.drawCell.drawPageCells[i].dHeight
200215
+ // }
200216
+ // const dLastObj = cellNode.drawCell.drawLines[cellNode.drawCell.drawLines.length - 1]
200217
+ // if (dLastObj.dTop + dLastObj.docHeight < dHeight + pos.y) {
200218
+ // const distance = pos.y + dHeight - (dLastObj.dTop + dLastObj.dHeight)
200219
+ // const aHeight = cellNode.table.tableProperty.autoLineHeightPx;
200220
+ // const count = Math.floor(distance / aHeight);
200221
+ // let str = "";
200222
+ // for (let j = 0; j < count; j++) {
200223
+ // str += "\n"
200224
+ // }
200225
+ // if (str != "") {
200226
+ // const oldRange = hoEditorFactory.docTree.curDomRange.clone();
200227
+ // const endPath = hoEditorFactory.docTree.getNodeLastPath(cellNode.childNodes[cellNode.childNodes.length - 1]);
200228
+ // const newRange = new DomRange(hoEditorFactory.hoEditorFactoryId, endPath, endPath);
200229
+ // hoEditorFactory.drawTree.moveCaretToPath(endPath);
200230
+ // hoEditorFactory.docTree.curDomRange = newRange;
200231
+ // hoEditorFactory.docController.insertPlainTextAfterPath(endPath, str);
200232
+ // }
200233
+ // }
200234
+ // }
200235
+ // }
200236
+ // }
200187
200237
 
200188
- if (str != "") {
200189
- _oldRange = hoEditorFactory.docTree.curDomRange.clone();
200190
- _endPath = hoEditorFactory.docTree.getNodeLastPath(cellNode.childNodes[cellNode.childNodes.length - 1]);
200191
- _newRange = new DomRange/* DomRange */.a(hoEditorFactory.hoEditorFactoryId, _endPath, _endPath);
200192
- hoEditorFactory.drawTree.moveCaretToPath(_endPath);
200193
- hoEditorFactory.docTree.curDomRange = _newRange;
200194
- hoEditorFactory.docController.insertPlainTextAfterPath(_endPath, str);
200195
- }
200196
- }
200197
- }
200198
- }
200199
- }
200200
200238
 
200201
200239
  case 45:
200202
200240
  return _context.abrupt("return", true);
@@ -206691,7 +206729,7 @@ var SignNode = __webpack_require__(34450);
206691
206729
  // EXTERNAL MODULE: ./src/editor/dom/treeNode/ParagraphNode.ts
206692
206730
  var ParagraphNode = __webpack_require__(14208);
206693
206731
  ;// CONCATENATED MODULE: ./src/components/version.ts
206694
- /* harmony default export */ var version = ('2.0.53');
206732
+ /* harmony default export */ var version = ('2.0.54');
206695
206733
  ;// 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&
206696
206734
  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)}
206697
206735
  var PoperTipTextvue_type_template_id_3fa4e4d3_scoped_true_staticRenderFns = []
@@ -218847,6 +218885,19 @@ var VueController = /*#__PURE__*/function () {
218847
218885
  var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID);
218848
218886
  hoEditorFactory.docController.updateSignTime(node, signText);
218849
218887
  }
218888
+ /**
218889
+ * 更新签名类型
218890
+ * @param node 签名节点
218891
+ * @param type 签名类型
218892
+ * @param imgSrc 签名内容
218893
+ */
218894
+
218895
+ }, {
218896
+ key: "updateSignType",
218897
+ value: function updateSignType(node, type, imgSrc) {
218898
+ var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID);
218899
+ hoEditorFactory.docController.updateSignType(node, type, imgSrc);
218900
+ }
218850
218901
  /**
218851
218902
  * 强制删除
218852
218903
  */
@@ -219138,7 +219189,7 @@ var VueController = /*#__PURE__*/function () {
219138
219189
  var _loop2 = function _loop2(i) {
219139
219190
  var node = nodes[i];
219140
219191
 
219141
- if (node instanceof DownListNode/* DownListNode */.yF || node instanceof DateTimeNode/* DateTimeNode */.Z || node instanceof TextInputFieldNode/* TextInputFieldNode */.re && node.childNodes.filter(function (child) {
219192
+ 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) {
219142
219193
  return child instanceof TextInputFieldNode/* TextInputFieldNode */.re;
219143
219194
  }).length === 0) {
219144
219195
  if (arr.filter(function (v) {
package/lib/hoeditor.umd.js CHANGED
@@ -15965,11 +15965,12 @@ var DocController = /*#__PURE__*/function () {
15965
15965
 
15966
15966
  curArea.areaComments.set(commentID, comment);
15967
15967
  hoEditorFactory.drawTree.commentsMap.set(commentID, comment);
15968
- curArea.drawComments();
15969
- var newEndpath = endNode.getNodePath();
15968
+ curArea.drawComments(); //const newEndpath = endNode.getNodePath();
15969
+
15970
15970
  hoEditorFactory.undoService.begin();
15971
- 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)));
15971
+ 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)));
15972
15972
  hoEditorFactory.undoService.commit();
15973
+ var newEndpath = endNode.getNodePath();
15973
15974
  var newRange = new _DomRange__WEBPACK_IMPORTED_MODULE_31__/* .DomRange */ .a(this._hoEditorFactoryID, newEndpath, newEndpath);
15974
15975
  var cgEvent = new _events_SelectionChangeEvent__WEBPACK_IMPORTED_MODULE_35__/* .SelectionChangeEvent */ .r(newRange, newRange); //选中范围变化事件
15975
15976
 
@@ -16839,6 +16840,31 @@ var DocController = /*#__PURE__*/function () {
16839
16840
  node.imgSrc = signText;
16840
16841
  hoEditorFactory.docTree.change(changeEvent);
16841
16842
  }
16843
+ /**
16844
+ * 更新签名类型
16845
+ * @param node 签名节点
16846
+ * @param type 签名类型
16847
+ * @param imgSrc 签名内容
16848
+ */
16849
+
16850
+ }, {
16851
+ key: "updateSignType",
16852
+ value: function updateSignType(node, type, imgSrc) {
16853
+ var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_77__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
16854
+ var sPath = hoEditorFactory.docTree.getNodeLastPath(node.previousLeaf());
16855
+ var ePath = hoEditorFactory.docTree.getNodeLastPath(node);
16856
+ var changeEvent = new _events_NodeChangeEvent__WEBPACK_IMPORTED_MODULE_75__/* .NodeChangeEvent */ .G(this._hoEditorFactoryID, _DocTree__WEBPACK_IMPORTED_MODULE_26__/* .DocAction.daModifyStyle */ .gk.daModifyStyle, sPath, ePath);
16857
+ changeEvent.oldEndPath = ePath;
16858
+ changeEvent.afterChangePath = ePath;
16859
+ changeEvent.oldDrawLines = new _draw_SelectRange__WEBPACK_IMPORTED_MODULE_76__/* .SelectRange */ .E(this._hoEditorFactoryID).getRangeDrawLines(sPath, ePath, true);
16860
+
16861
+ if (node.type !== type) {
16862
+ node.type = type;
16863
+ }
16864
+
16865
+ node.imgSrc = imgSrc;
16866
+ hoEditorFactory.docTree.change(changeEvent);
16867
+ }
16842
16868
  /**
16843
16869
  *
16844
16870
  * @returns 返回病历文件变更日志
@@ -49750,6 +49776,17 @@ var DrawPageTable = /*#__PURE__*/function (_DrawRect) {
49750
49776
 
49751
49777
  if (partCell && aHeight) {
49752
49778
  rowHeight = Math.max(aHeight, partCell.docHeight);
49779
+ rowSpan = mainCell.rowSpan;
49780
+ }
49781
+ }
49782
+
49783
+ if (rowSpan > 1) {
49784
+ for (var i = 1; i < rowSpan; i++) {
49785
+ var arowInfos = this._partRowHeights.get(r + i);
49786
+
49787
+ if (arowInfos && arowInfos.rowHeight && aHeight) {
49788
+ aHeight += arowInfos.rowHeight;
49789
+ }
49753
49790
  }
49754
49791
  } //this._partRowHeights.get(r)?.rowHeight
49755
49792
 
@@ -61253,7 +61290,7 @@ var NodeDeleteUndoUnit = /*#__PURE__*/function (_UndoInfo) {
61253
61290
  /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_regeneratorRuntime_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(87461);
61254
61291
  /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_asyncToGenerator_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(60199);
61255
61292
  /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_classCallCheck_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(42015);
61256
- /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_24__ = __webpack_require__(16296);
61293
+ /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_25__ = __webpack_require__(16296);
61257
61294
  /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_inherits_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(83964);
61258
61295
  /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createSuper_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(46455);
61259
61296
  /* harmony import */ var core_js_modules_es_object_to_string_js__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(41539);
@@ -61279,6 +61316,7 @@ var NodeDeleteUndoUnit = /*#__PURE__*/function (_UndoInfo) {
61279
61316
  /* harmony import */ var _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_21__ = __webpack_require__(28831);
61280
61317
  /* harmony import */ var _dom_treeNode_MarkNode__WEBPACK_IMPORTED_MODULE_22__ = __webpack_require__(92730);
61281
61318
  /* harmony import */ var _dom_treeNode_CellNode__WEBPACK_IMPORTED_MODULE_23__ = __webpack_require__(69088);
61319
+ /* harmony import */ var _draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_24__ = __webpack_require__(27356);
61282
61320
 
61283
61321
 
61284
61322
 
@@ -61293,8 +61331,8 @@ var NodeDeleteUndoUnit = /*#__PURE__*/function (_UndoInfo) {
61293
61331
  /*
61294
61332
  * @Author: your name
61295
61333
  * @Date: 2020-09-24 15:56:09
61296
- * @LastEditTime: 2022-03-28 11:38:19
61297
- * @LastEditors: Please set LastEditors
61334
+ * @LastEditTime: 2022-06-07 15:10:10
61335
+ * @LastEditors: liyanan 2441631434@qq.com
61298
61336
  * @Description: In User Settings Edit
61299
61337
  * @FilePath: \hoeditor-web\src\editor\undoRedo\NodeInsertUndoUnit.ts
61300
61338
  */
@@ -61313,6 +61351,7 @@ var NodeDeleteUndoUnit = /*#__PURE__*/function (_UndoInfo) {
61313
61351
 
61314
61352
 
61315
61353
 
61354
+
61316
61355
  var NodeInsertUndoUnit = /*#__PURE__*/function (_UndoInfo) {
61317
61356
  (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_inherits_js__WEBPACK_IMPORTED_MODULE_3__/* ["default"] */ .Z)(NodeInsertUndoUnit, _UndoInfo);
61318
61357
 
@@ -61333,7 +61372,7 @@ var NodeInsertUndoUnit = /*#__PURE__*/function (_UndoInfo) {
61333
61372
  return _this;
61334
61373
  }
61335
61374
 
61336
- (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_24__/* ["default"] */ .Z)(NodeInsertUndoUnit, [{
61375
+ (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_25__/* ["default"] */ .Z)(NodeInsertUndoUnit, [{
61337
61376
  key: "undo",
61338
61377
  value: function undo() {
61339
61378
  this.doUndo();
@@ -61425,6 +61464,11 @@ var NodeInsertUndoUnit = /*#__PURE__*/function (_UndoInfo) {
61425
61464
  } else if (this._pnode && this._pnode instanceof _dom_treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_19__/* .TextInputFieldNode */ .re && this.strBeforePath != hoEditorFactory.docTree.getNodeLastPath(this._pnode)) {
61426
61465
  //删除文本域节点的提示文本，并更新重绘整个文本域
61427
61466
  var pTiNode = this._pnode;
61467
+
61468
+ 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) {
61469
+ return path;
61470
+ }
61471
+
61428
61472
  var res = pTiNode.getReadyToEdit(function (value) {
61429
61473
  //NOTE:在redo当中不能使用同一实例UndoRedoService的commit
61430
61474
  _this2._undo.begin();
@@ -200007,7 +200051,7 @@ var DrawSelectLevel = /*#__PURE__*/function () {
200007
200051
  key: "mouseDblClick",
200008
200052
  value: function () {
200009
200053
  var _mouseDblClick = (0,asyncToGenerator/* default */.Z)( /*#__PURE__*/(0,regeneratorRuntime/* default */.Z)().mark(function _callee(aevent) {
200010
- 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;
200054
+ 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;
200011
200055
 
200012
200056
  return (0,regeneratorRuntime/* default */.Z)().wrap(function _callee$(_context) {
200013
200057
  while (1) {
@@ -200165,48 +200209,42 @@ var DrawSelectLevel = /*#__PURE__*/function () {
200165
200209
  } else if (cellNode.cellProperty.editorProperty === TableProperty/* EditorProperty.DateTime */.YS.DateTime || cellNode.cellProperty.editorProperty === TableProperty/* EditorProperty.DownList */.YS.DownList) {
200166
200210
  _nodeNeedModifyEvent2 = new NodeNeedModifyEvent/* NodeNeedModifyEvent */.x(np.node, "dblclick", this._pageIndex);
200167
200211
  hoEditorFactory.docTree.nodeNeedModify(_nodeNeedModifyEvent2);
200168
- } else if (cellNode.table.tableProperty.isAutoChangeLine) {
200169
- //处理自动换行表格，双击时光标跳到指定双击位置
200170
- dPageTable = cellNode.table.drawTable.getDrawTableByPageIndex(dPage.pageIndex);
200171
-
200172
- if (dPageTable) {
200173
- dPageCell = cellNode.drawCell.getDrawPageCell(dPageTable);
200174
-
200175
- if (dPageCell) {
200176
- pos = dPageCell.globalToLocal(aevent.stageX, aevent.stageY);
200177
- docHeight = 0;
200178
- dHeight = 0;
200179
- index = cellNode.drawCell.drawPageCells.indexOf(dPageCell);
200180
-
200181
- for (i = 0; i < index; i++) {
200182
- docHeight += cellNode.drawCell.drawPageCells[i].docHeight;
200183
- dHeight += cellNode.drawCell.drawPageCells[i].dHeight;
200184
- }
200185
-
200186
- dLastObj = cellNode.drawCell.drawLines[cellNode.drawCell.drawLines.length - 1];
200187
-
200188
- if (dLastObj.dTop + dLastObj.docHeight < dHeight + pos.y) {
200189
- distance = pos.y + dHeight - (dLastObj.dTop + dLastObj.dHeight);
200190
- aHeight = cellNode.table.tableProperty.autoLineHeightPx;
200191
- count = Math.floor(distance / aHeight);
200192
- str = "";
200193
-
200194
- for (j = 0; j < count; j++) {
200195
- str += "\n";
200196
- }
200212
+ } // else if (cellNode.table.tableProperty.isAutoChangeLine) {
200213
+ // //处理自动换行表格，双击时光标跳到指定双击位置
200214
+ // const dPageTable = cellNode.table.drawTable.getDrawTableByPageIndex(dPage.pageIndex);
200215
+ // if (dPageTable) {
200216
+ // const dPageCell = cellNode.drawCell.getDrawPageCell(dPageTable);
200217
+ // if (dPageCell) {
200218
+ // const pos = dPageCell.globalToLocal(aevent.stageX, aevent.stageY);
200219
+ // let docHeight = 0;
200220
+ // let dHeight = 0;
200221
+ // const index = cellNode.drawCell.drawPageCells.indexOf(dPageCell);
200222
+ // for (let i = 0; i < index; i++) {
200223
+ // docHeight += cellNode.drawCell.drawPageCells[i].docHeight;
200224
+ // dHeight += cellNode.drawCell.drawPageCells[i].dHeight
200225
+ // }
200226
+ // const dLastObj = cellNode.drawCell.drawLines[cellNode.drawCell.drawLines.length - 1]
200227
+ // if (dLastObj.dTop + dLastObj.docHeight < dHeight + pos.y) {
200228
+ // const distance = pos.y + dHeight - (dLastObj.dTop + dLastObj.dHeight)
200229
+ // const aHeight = cellNode.table.tableProperty.autoLineHeightPx;
200230
+ // const count = Math.floor(distance / aHeight);
200231
+ // let str = "";
200232
+ // for (let j = 0; j < count; j++) {
200233
+ // str += "\n"
200234
+ // }
200235
+ // if (str != "") {
200236
+ // const oldRange = hoEditorFactory.docTree.curDomRange.clone();
200237
+ // const endPath = hoEditorFactory.docTree.getNodeLastPath(cellNode.childNodes[cellNode.childNodes.length - 1]);
200238
+ // const newRange = new DomRange(hoEditorFactory.hoEditorFactoryId, endPath, endPath);
200239
+ // hoEditorFactory.drawTree.moveCaretToPath(endPath);
200240
+ // hoEditorFactory.docTree.curDomRange = newRange;
200241
+ // hoEditorFactory.docController.insertPlainTextAfterPath(endPath, str);
200242
+ // }
200243
+ // }
200244
+ // }
200245
+ // }
200246
+ // }
200197
200247
 
200198
- if (str != "") {
200199
- _oldRange = hoEditorFactory.docTree.curDomRange.clone();
200200
- _endPath = hoEditorFactory.docTree.getNodeLastPath(cellNode.childNodes[cellNode.childNodes.length - 1]);
200201
- _newRange = new DomRange/* DomRange */.a(hoEditorFactory.hoEditorFactoryId, _endPath, _endPath);
200202
- hoEditorFactory.drawTree.moveCaretToPath(_endPath);
200203
- hoEditorFactory.docTree.curDomRange = _newRange;
200204
- hoEditorFactory.docController.insertPlainTextAfterPath(_endPath, str);
200205
- }
200206
- }
200207
- }
200208
- }
200209
- }
200210
200248
 
200211
200249
  case 45:
200212
200250
  return _context.abrupt("return", true);
@@ -206701,7 +206739,7 @@ var SignNode = __webpack_require__(78975);
206701
206739
  // EXTERNAL MODULE: ./src/editor/dom/treeNode/ParagraphNode.ts
206702
206740
  var ParagraphNode = __webpack_require__(13880);
206703
206741
  ;// CONCATENATED MODULE: ./src/components/version.ts
206704
- /* harmony default export */ var version = ('2.0.53');
206742
+ /* harmony default export */ var version = ('2.0.54');
206705
206743
  ;// 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&
206706
206744
  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)}
206707
206745
  var PoperTipTextvue_type_template_id_3fa4e4d3_scoped_true_staticRenderFns = []
@@ -218857,6 +218895,19 @@ var VueController = /*#__PURE__*/function () {
218857
218895
  var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID);
218858
218896
  hoEditorFactory.docController.updateSignTime(node, signText);
218859
218897
  }
218898
+ /**
218899
+ * 更新签名类型
218900
+ * @param node 签名节点
218901
+ * @param type 签名类型
218902
+ * @param imgSrc 签名内容
218903
+ */
218904
+
218905
+ }, {
218906
+ key: "updateSignType",
218907
+ value: function updateSignType(node, type, imgSrc) {
218908
+ var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID);
218909
+ hoEditorFactory.docController.updateSignType(node, type, imgSrc);
218910
+ }
218860
218911
  /**
218861
218912
  * 强制删除
218862
218913
  */
@@ -219148,7 +219199,7 @@ var VueController = /*#__PURE__*/function () {
219148
219199
  var _loop2 = function _loop2(i) {
219149
219200
  var node = nodes[i];
219150
219201
 
219151
- if (node instanceof DownListNode/* DownListNode */.yF || node instanceof DateTimeNode/* DateTimeNode */.Z || node instanceof TextInputFieldNode/* TextInputFieldNode */.re && node.childNodes.filter(function (child) {
219202
+ 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) {
219152
219203
  return child instanceof TextInputFieldNode/* TextInputFieldNode */.re;
219153
219204
  }).length === 0) {
219154
219205
  if (arr.filter(function (v) {