hoeditor-web 3.1.102 → 3.1.103

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 (3) hide show
  1. package/lib/hoeditor.umd.js +49 -123
  2. package/lib/hoeditor.umd.min.js +2 -2
  3. package/package.json +1 -1
package/lib/hoeditor.umd.js CHANGED
@@ -49977,7 +49977,7 @@ var CellNode = /*#__PURE__*/function (_RectNode) {
49977
49977
  if (node.text !== "") {
49978
49978
  nodeJson = node.node2Json(undefined, isCopy);
49979
49979
  }
49980
- } else if (node instanceof _DateTimeNode__WEBPACK_IMPORTED_MODULE_31__/* .DateTimeNode */ .Z || node instanceof _QrcodeNode__WEBPACK_IMPORTED_MODULE_39__/* .QrcodeNode */ .d || node instanceof _ControlNode__WEBPACK_IMPORTED_MODULE_30__/* .ControlNode */ .w && node.readType === 1) {
49980
+ } else if (node instanceof _DateTimeNode__WEBPACK_IMPORTED_MODULE_31__/* .DateTimeNode */ .Z || node instanceof _QrcodeNode__WEBPACK_IMPORTED_MODULE_39__/* .QrcodeNode */ .d) {
49981
49981
  nodeJson = node.node2Json(undefined, isCopy, undefined, clearSign);
49982
49982
  } else {
49983
49983
  nodeJson = node.node2Json(undefined, isCopy);
@@ -63777,7 +63777,7 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
63777
63777
  /*
63778
63778
  * @Author: your name
63779
63779
  * @Date: 2020-11-03 15:17:54
63780
- * @LastEditTime: 2024-04-05 21:38:57
63780
+ * @LastEditTime: 2024-04-06 23:29:29
63781
63781
  * @LastEditors: liyanan 2441631434@qq.com
63782
63782
  * @Description: In User Settings Edit
63783
63783
  * @FilePath: \hoeditor-web\src\editor\dom\treeNode\TextInputFieldNode.ts
@@ -65462,33 +65462,6 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
65462
65462
  value: function node2Json(range, isCopy, type, clearSign) {
65463
65463
  var childArray = new Array();
65464
65464
  if (!range) {
65465
- // let mark = true;
65466
- // for (let m = 0; m < this.childNodes.length; m++) {
65467
- // const anode = this.childNodes[m];
65468
- // if (anode instanceof ControlNode || anode instanceof TextInputFieldNode || anode instanceof SignNode || anode instanceof QrcodeNode) {
65469
- // mark = false;
65470
- // break;
65471
- // }
65472
- // }
65473
- // if (clearSign && mark && this.readType === 1) {
65474
- // this.text = "";
65475
- // this._childNodes.splice(1, this._childNodes.length - 2);
65476
- // this._childNodes2.splice(1, this._childNodes2.length - 2);
65477
- // const markNode = new MarkNode(
65478
- // this.hoEditorFactoryID,
65479
- // this.rootNodes,
65480
- // this,
65481
- // NodeType.ntMark,
65482
- // this.labelText,
65483
- // this.StartMarkNode.styleIndex,
65484
- // MarkNodeType.mtContent
65485
- // );
65486
- // this._childNodes.splice(1, 0, markNode);
65487
- // this._childNodes2.splice(1, 0, markNode);
65488
- // for (let n = 0; n < this.childNodes.length; n++) {
65489
- // childArray.push(this.childNodes[n].node2Json(undefined, isCopy));
65490
- // }
65491
- // } else {
65492
65465
  for (var i = 0; i < this.childNodes.length; i++) {
65493
65466
  var node = this.childNodes[i];
65494
65467
  if (!(node instanceof _MarkNode__WEBPACK_IMPORTED_MODULE_47__/* .MarkNode */ .j && node.text.substr(0, 1) !== 'C')) {
@@ -65507,7 +65480,7 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
65507
65480
  if (node.text !== '') {
65508
65481
  childArray.push(node.node2Json(undefined, isCopy));
65509
65482
  }
65510
- } else if (node instanceof _DateTimeNode__WEBPACK_IMPORTED_MODULE_44__/* .DateTimeNode */ .Z || node instanceof _QrcodeNode__WEBPACK_IMPORTED_MODULE_58__/* .QrcodeNode */ .d || node instanceof _ControlNode__WEBPACK_IMPORTED_MODULE_43__/* .ControlNode */ .w && node.readType === 1) {
65483
+ } else if (node instanceof _DateTimeNode__WEBPACK_IMPORTED_MODULE_44__/* .DateTimeNode */ .Z || node instanceof _QrcodeNode__WEBPACK_IMPORTED_MODULE_58__/* .QrcodeNode */ .d) {
65511
65484
  childArray.push(node.node2Json(undefined, isCopy, undefined, clearSign));
65512
65485
  } else {
65513
65486
  childArray.push(node.node2Json(undefined, isCopy));
@@ -65517,63 +65490,6 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
65517
65490
  childArray.push(node.node2Json(undefined, isCopy));
65518
65491
  }
65519
65492
  }
65520
- //}
65521
- // let mark = true;
65522
- // for (let m = 0; m < this.childNodes.length; m++) {
65523
- // const anode = this.childNodes[m];
65524
- // if (anode instanceof ControlNode || anode instanceof TextInputFieldNode || anode instanceof SignNode || anode instanceof QrcodeNode) {
65525
- // mark = false;
65526
- // break;
65527
- // }
65528
- // }
65529
- // if (clearSign && mark && this.readType === 1) {
65530
- // this.text = "";
65531
- // this._childNodes.splice(1, this._childNodes.length - 2);
65532
- // this._childNodes2.splice(1, this._childNodes2.length - 2);
65533
- // const markNode = new MarkNode(
65534
- // this.hoEditorFactoryID,
65535
- // this.rootNodes,
65536
- // this,
65537
- // NodeType.ntMark,
65538
- // this.labelText,
65539
- // this.StartMarkNode.styleIndex,
65540
- // MarkNodeType.mtContent
65541
- // );
65542
- // this._childNodes.splice(1, 0, markNode);
65543
- // this._childNodes2.splice(1, 0, markNode);
65544
- // for (let n = 0; n < this.childNodes.length; n++) {
65545
- // childArray.push(this.childNodes[n].node2Json(undefined, isCopy));
65546
- // }
65547
- // } else {
65548
- for (var _i = 0; _i < this.childNodes.length; _i++) {
65549
- var _node = this.childNodes[_i];
65550
- if (!(_node instanceof _MarkNode__WEBPACK_IMPORTED_MODULE_47__/* .MarkNode */ .j && _node.text.substr(0, 1) !== 'C')) {
65551
- if (_node instanceof TextInputFieldNode) {
65552
- childArray.push(_node.node2Json(undefined, isCopy, type, clearSign));
65553
- } else if (_node instanceof _SignNode__WEBPACK_IMPORTED_MODULE_54__/* .SignNode */ .N) {
65554
- if (clearSign) {
65555
- if (_node.isTemplate) {
65556
- childArray.push(_node.node2Json(undefined, isCopy, undefined, clearSign));
65557
- }
65558
- } else {
65559
- childArray.push(_node.node2Json(undefined, isCopy));
65560
- }
65561
- } else {
65562
- if (_node instanceof _TextNode__WEBPACK_IMPORTED_MODULE_57__/* .TextNode */ .R) {
65563
- if (_node.text !== '') {
65564
- childArray.push(_node.node2Json(undefined, isCopy));
65565
- }
65566
- } else if (_node instanceof _DateTimeNode__WEBPACK_IMPORTED_MODULE_44__/* .DateTimeNode */ .Z || _node instanceof _QrcodeNode__WEBPACK_IMPORTED_MODULE_58__/* .QrcodeNode */ .d || _node instanceof _ControlNode__WEBPACK_IMPORTED_MODULE_43__/* .ControlNode */ .w && _node.readType === 1) {
65567
- childArray.push(_node.node2Json(undefined, isCopy, undefined, clearSign));
65568
- } else {
65569
- childArray.push(_node.node2Json(undefined, isCopy));
65570
- }
65571
- }
65572
- } else {
65573
- childArray.push(_node.node2Json(undefined, isCopy));
65574
- }
65575
- }
65576
- //}
65577
65493
  // if (childArray.length > 0) {
65578
65494
  // if (childArray[0].MarkNode && childArray[0].MarkNode.type === 0) {
65579
65495
  // if (!childArray[childArray.length - 1].MarkNode) {
@@ -65611,17 +65527,17 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
65611
65527
  if (rec.from == this.range().from) {
65612
65528
  canCopy = true;
65613
65529
  }
65614
- for (var _i2 = 0; _i2 < this.childNodes.length; _i2++) {
65615
- var _node2 = this.childNodes[_i2];
65530
+ for (var _i = 0; _i < this.childNodes.length; _i++) {
65531
+ var _node = this.childNodes[_i];
65616
65532
  if (!canCopy) {
65617
- canCopy = _node2.checkPath(rec.from);
65533
+ canCopy = _node.checkPath(rec.from);
65618
65534
  }
65619
65535
  if (canCopy) {
65620
- if (!(_node2 instanceof _MarkNode__WEBPACK_IMPORTED_MODULE_47__/* .MarkNode */ .j && _node2.text.substr(0, 1) === 'C')) {
65621
- childArray.push(_node2.node2Json(rec, isCopy));
65536
+ if (!(_node instanceof _MarkNode__WEBPACK_IMPORTED_MODULE_47__/* .MarkNode */ .j && _node.text.substr(0, 1) === 'C')) {
65537
+ childArray.push(_node.node2Json(rec, isCopy));
65622
65538
  }
65623
65539
  }
65624
- if (_node2.checkPath(rec.to)) {
65540
+ if (_node.checkPath(rec.to)) {
65625
65541
  break;
65626
65542
  }
65627
65543
  }
@@ -65943,45 +65859,45 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
65943
65859
  }
65944
65860
  } else {
65945
65861
  //单个对象
65946
- var _node3 = hoEditorFactory.structureConvert.convertNode(item, rootNodes, temp, undefined, undefined, isClearSign);
65947
- if (_node3) {
65948
- if (_node3 instanceof _TextNode__WEBPACK_IMPORTED_MODULE_57__/* .TextNode */ .R) {
65949
- if (_node3.text.length > (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_toConsumableArray_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)(_node3.text).length) {
65862
+ var _node2 = hoEditorFactory.structureConvert.convertNode(item, rootNodes, temp, undefined, undefined, isClearSign);
65863
+ if (_node2) {
65864
+ if (_node2 instanceof _TextNode__WEBPACK_IMPORTED_MODULE_57__/* .TextNode */ .R) {
65865
+ if (_node2.text.length > (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_toConsumableArray_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)(_node2.text).length) {
65950
65866
  //特殊处理生僻字
65951
- var _rareCharNode = new _RareCharNode__WEBPACK_IMPORTED_MODULE_59__/* .RareCharNode */ .Q(temp.hoEditorFactoryID, _node3.rootNodes, _node3.parentNode, _BaseNode__WEBPACK_IMPORTED_MODULE_42__/* .NodeType */ .Jq.ntRareChar, _node3.text, _node3.styleIndex);
65867
+ var _rareCharNode = new _RareCharNode__WEBPACK_IMPORTED_MODULE_59__/* .RareCharNode */ .Q(temp.hoEditorFactoryID, _node2.rootNodes, _node2.parentNode, _BaseNode__WEBPACK_IMPORTED_MODULE_42__/* .NodeType */ .Jq.ntRareChar, _node2.text, _node2.styleIndex);
65952
65868
  nodes.push(_rareCharNode);
65953
65869
  } else {
65954
- if (_node3.text !== '' && _node3.text !== '‌‌' && _node3.text !== '‌‌‌‌' && _node3.text !== '‌‌‌‌‌' && _node3.text !== '‌‌‌' && _node3.text !== '‌') {
65955
- nodes.push(_node3);
65870
+ if (_node2.text !== '' && _node2.text !== '‌‌' && _node2.text !== '‌‌‌‌' && _node2.text !== '‌‌‌‌‌' && _node2.text !== '‌‌‌' && _node2.text !== '‌') {
65871
+ nodes.push(_node2);
65956
65872
  }
65957
- if (_node3.errorIndex != undefined) {
65958
- hoEditorFactory.structureConvert._errTextNodes.push(_node3);
65873
+ if (_node2.errorIndex != undefined) {
65874
+ hoEditorFactory.structureConvert._errTextNodes.push(_node2);
65959
65875
  isErrorValid = true;
65960
65876
  }
65961
65877
  }
65962
65878
  } else {
65963
65879
  //nodes.push(node);
65964
65880
  if (isClearSign) {
65965
- if (_node3 instanceof _SignNode__WEBPACK_IMPORTED_MODULE_54__/* .SignNode */ .N) {
65966
- if (_node3.isTemplate && !(_node3.number == 0 && _node3.type == 0 && _node3.name == '')) {
65967
- nodes.push(_node3);
65881
+ if (_node2 instanceof _SignNode__WEBPACK_IMPORTED_MODULE_54__/* .SignNode */ .N) {
65882
+ if (_node2.isTemplate && !(_node2.number == 0 && _node2.type == 0 && _node2.name == '')) {
65883
+ nodes.push(_node2);
65968
65884
  }
65969
65885
  } else {
65970
- nodes.push(_node3);
65886
+ nodes.push(_node2);
65971
65887
  }
65972
65888
  } else {
65973
- if (_node3 instanceof _SignNode__WEBPACK_IMPORTED_MODULE_54__/* .SignNode */ .N) {
65974
- if (!(_node3.number == 0 && _node3.type == 0 && _node3.name == '')) {
65975
- nodes.push(_node3);
65889
+ if (_node2 instanceof _SignNode__WEBPACK_IMPORTED_MODULE_54__/* .SignNode */ .N) {
65890
+ if (!(_node2.number == 0 && _node2.type == 0 && _node2.name == '')) {
65891
+ nodes.push(_node2);
65976
65892
  }
65977
65893
  } else {
65978
- nodes.push(_node3);
65894
+ nodes.push(_node2);
65979
65895
  }
65980
65896
  }
65981
65897
  }
65982
65898
  }
65983
- if (_node3 instanceof _MarkNode__WEBPACK_IMPORTED_MODULE_47__/* .MarkNode */ .j && _node3.MarkNodeType === _MarkNode__WEBPACK_IMPORTED_MODULE_47__/* .MarkNodeType */ .q.mtEnd && _node3.text.substring(0, 1) === 'C') {
65984
- hoEditorFactory.structureConvert._markNodes.push(_node3);
65899
+ if (_node2 instanceof _MarkNode__WEBPACK_IMPORTED_MODULE_47__/* .MarkNode */ .j && _node2.MarkNodeType === _MarkNode__WEBPACK_IMPORTED_MODULE_47__/* .MarkNodeType */ .q.mtEnd && _node2.text.substring(0, 1) === 'C') {
65900
+ hoEditorFactory.structureConvert._markNodes.push(_node2);
65985
65901
  }
65986
65902
  // if (node instanceof SignNode &&
65987
65903
  // ((node.imgSrc != "" && ((hoEditorFactory.superiorSigns.length > 0 && hoEditorFactory.superiorSigns.includes((node.customProperty as any).bce01)) || hoEditorFactory.forbidEditBeforeSign))
@@ -66178,14 +66094,14 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
66178
66094
  }
66179
66095
  }
66180
66096
  if (textArr.length > 1) {
66181
- for (var _i3 = 1; _i3 < textArr.length; _i3++) {
66097
+ for (var _i2 = 1; _i2 < textArr.length; _i2++) {
66182
66098
  var paragraNode = new _ParagraphNode__WEBPACK_IMPORTED_MODULE_50__/* .ParagraphNode */ .C(hoEditorFactoryID, rootNodes, temp, 0);
66183
66099
  paragraNode.styleIndex = styleIndex;
66184
66100
  temp.childNodes.splice(temp.childNodes.length - 1, 0, paragraNode);
66185
- if (textArr[_i3] !== '') {
66186
- if (textArr[_i3].indexOf('<上标>') >= 0 || textArr[_i3].indexOf('<下标>') >= 0) {
66101
+ if (textArr[_i2] !== '') {
66102
+ if (textArr[_i2].indexOf('<上标>') >= 0 || textArr[_i2].indexOf('<下标>') >= 0) {
66187
66103
  result = [];
66188
- var resultArr1 = getText(textArr[_i3]);
66104
+ var resultArr1 = getText(textArr[_i2]);
66189
66105
  for (var _k = 0; _k < resultArr1.length; _k++) {
66190
66106
  if (resultArr1[_k].text != '') {
66191
66107
  var _newStyleIndex = styleIndex;
@@ -66200,7 +66116,7 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
66200
66116
  }
66201
66117
  }
66202
66118
  } else {
66203
- var _textNode2 = new _TextNode__WEBPACK_IMPORTED_MODULE_57__/* .TextNode */ .R(hoEditorFactoryID, rootNodes, temp, _BaseNode__WEBPACK_IMPORTED_MODULE_42__/* .NodeType */ .Jq.ntText, textArr[_i3], styleIndex);
66119
+ var _textNode2 = new _TextNode__WEBPACK_IMPORTED_MODULE_57__/* .TextNode */ .R(hoEditorFactoryID, rootNodes, temp, _BaseNode__WEBPACK_IMPORTED_MODULE_42__/* .NodeType */ .Jq.ntText, textArr[_i2], styleIndex);
66204
66120
  temp.childNodes.splice(temp.childNodes.length - 1, 0, _textNode2);
66205
66121
  }
66206
66122
  }
@@ -66212,9 +66128,9 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
66212
66128
  }
66213
66129
  if (expressArr.length > 0) {
66214
66130
  //每遍历一个表达式 先插入表达式 再将表达式后的文本插进去
66215
- for (var _i4 = 0; _i4 < expressArr.length; _i4++) {
66216
- var sIndex = expressArr[_i4].sIndex;
66217
- var eIndex = expressArr[_i4].eIndex;
66131
+ for (var _i3 = 0; _i3 < expressArr.length; _i3++) {
66132
+ var sIndex = expressArr[_i3].sIndex;
66133
+ var eIndex = expressArr[_i3].eIndex;
66218
66134
  var expressJson = temp.text.substring(sIndex + 16, eIndex);
66219
66135
  var expressObj = JSON.parse(expressJson);
66220
66136
  var expressStyle = _MenstrualHistoryNode__WEBPACK_IMPORTED_MODULE_49__/* .ExpressStyle */ .e[expressObj.expressStyle];
@@ -66240,8 +66156,8 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
66240
66156
  }
66241
66157
  temp.childNodes.splice(temp.childNodes.length - 1, 0, medicalExpressNode);
66242
66158
  var behindText = ''; //表达式后的文本串
66243
- if (_i4 < expressArr.length - 1) {
66244
- behindText = temp.text.substring(eIndex + 17, expressArr[_i4 + 1].sIndex);
66159
+ if (_i3 < expressArr.length - 1) {
66160
+ behindText = temp.text.substring(eIndex + 17, expressArr[_i3 + 1].sIndex);
66245
66161
  } else {
66246
66162
  behindText = temp.text.substring(eIndex + 17, temp.text.length);
66247
66163
  }
@@ -207437,7 +207353,7 @@ var TextNode = __webpack_require__(27198);
207437
207353
  // EXTERNAL MODULE: ./src/editor/dom/treeNode/ParagraphNode.ts
207438
207354
  var ParagraphNode = __webpack_require__(67945);
207439
207355
  ;// CONCATENATED MODULE: ./src/components/version.ts
207440
- /* harmony default export */ var version = ('3.1.102');
207356
+ /* harmony default export */ var version = ('3.1.103');
207441
207357
  // EXTERNAL MODULE: ./src/components/controls/poperTipText/PoperTipText.vue + 5 modules
207442
207358
  var PoperTipText = __webpack_require__(50987);
207443
207359
  ;// CONCATENATED MODULE: ./src/components/controls/poperTipText/index.ts
@@ -224855,6 +224771,16 @@ var EditController = /*#__PURE__*/function () {
224855
224771
  //hoEditorFactory.isUseForm = true;
224856
224772
  //hoEditorFactory.allowEditCellInForm = false;
224857
224773
  var curDomRange = hoEditorFactory.docTree.curDomRange.normalize(); //获取当前选中区域
224774
+ var drawPage = hoEditorFactory.drawTree.activePage;
224775
+ if (drawPage) {
224776
+ var dNode = hoEditorFactory.drawTree.getDNodeByPath(curDomRange.endPath);
224777
+ var dline = hoEditorFactory.drawTree.getDrawLineByDNode(dNode);
224778
+ var stagePt = dline.localToGlobal(dNode.x, dNode.y);
224779
+ var _result = hoEditorFactory.vueController.isCanEdit(drawPage.pageIndex, stagePt.x, stagePt.y);
224780
+ if (!_result) {
224781
+ return false;
224782
+ }
224783
+ }
224858
224784
  if (hoEditorFactory.isUseForm) {
224859
224785
  var _enode$parentNode, _enode$parentNode2;
224860
224786
  var snode = curDomRange.npStart.node;