hoeditor-web 2.0.87 → 2.0.88

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.
@@ -47761,7 +47761,7 @@ var SpecialCharsNode = /*#__PURE__*/function (_ControlNode) {
47761
47761
  /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(91347);
47762
47762
  /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_typeof_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(36768);
47763
47763
  /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_classCallCheck_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(42015);
47764
- /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_34__ = __webpack_require__(16296);
47764
+ /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_35__ = __webpack_require__(16296);
47765
47765
  /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_get_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(16862);
47766
47766
  /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_getPrototypeOf_js__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(79123);
47767
47767
  /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_inherits_js__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(83964);
@@ -47780,18 +47780,18 @@ var SpecialCharsNode = /*#__PURE__*/function (_ControlNode) {
47780
47780
  /* harmony import */ var core_js_modules_es_regexp_exec_js__WEBPACK_IMPORTED_MODULE_13___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_regexp_exec_js__WEBPACK_IMPORTED_MODULE_13__);
47781
47781
  /* harmony import */ var core_js_modules_es_string_split_js__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(23123);
47782
47782
  /* harmony import */ var core_js_modules_es_string_split_js__WEBPACK_IMPORTED_MODULE_14___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_string_split_js__WEBPACK_IMPORTED_MODULE_14__);
47783
- /* harmony import */ var core_js_modules_es_string_replace_js__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(15306);
47784
- /* harmony import */ var core_js_modules_es_string_replace_js__WEBPACK_IMPORTED_MODULE_15___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_string_replace_js__WEBPACK_IMPORTED_MODULE_15__);
47785
- /* harmony import */ var core_js_modules_es_string_replace_all_js__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(68757);
47786
- /* harmony import */ var core_js_modules_es_string_replace_all_js__WEBPACK_IMPORTED_MODULE_16___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_string_replace_all_js__WEBPACK_IMPORTED_MODULE_16__);
47787
- /* harmony import */ var core_js_modules_es_regexp_constructor_js__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(24603);
47788
- /* harmony import */ var core_js_modules_es_regexp_constructor_js__WEBPACK_IMPORTED_MODULE_17___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_regexp_constructor_js__WEBPACK_IMPORTED_MODULE_17__);
47789
- /* harmony import */ var core_js_modules_es_regexp_dot_all_js__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(28450);
47790
- /* harmony import */ var core_js_modules_es_regexp_dot_all_js__WEBPACK_IMPORTED_MODULE_18___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_regexp_dot_all_js__WEBPACK_IMPORTED_MODULE_18__);
47791
- /* harmony import */ var core_js_modules_es_regexp_sticky_js__WEBPACK_IMPORTED_MODULE_19__ = __webpack_require__(88386);
47792
- /* harmony import */ var core_js_modules_es_regexp_sticky_js__WEBPACK_IMPORTED_MODULE_19___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_regexp_sticky_js__WEBPACK_IMPORTED_MODULE_19__);
47793
- /* harmony import */ var core_js_modules_es_regexp_to_string_js__WEBPACK_IMPORTED_MODULE_20__ = __webpack_require__(39714);
47794
- /* harmony import */ var core_js_modules_es_regexp_to_string_js__WEBPACK_IMPORTED_MODULE_20___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_regexp_to_string_js__WEBPACK_IMPORTED_MODULE_20__);
47783
+ /* harmony import */ var core_js_modules_es_regexp_to_string_js__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(39714);
47784
+ /* harmony import */ var core_js_modules_es_regexp_to_string_js__WEBPACK_IMPORTED_MODULE_15___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_regexp_to_string_js__WEBPACK_IMPORTED_MODULE_15__);
47785
+ /* harmony import */ var core_js_modules_es_string_replace_js__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(15306);
47786
+ /* harmony import */ var core_js_modules_es_string_replace_js__WEBPACK_IMPORTED_MODULE_16___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_string_replace_js__WEBPACK_IMPORTED_MODULE_16__);
47787
+ /* harmony import */ var core_js_modules_es_string_replace_all_js__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(68757);
47788
+ /* harmony import */ var core_js_modules_es_string_replace_all_js__WEBPACK_IMPORTED_MODULE_17___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_string_replace_all_js__WEBPACK_IMPORTED_MODULE_17__);
47789
+ /* harmony import */ var core_js_modules_es_regexp_constructor_js__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(24603);
47790
+ /* harmony import */ var core_js_modules_es_regexp_constructor_js__WEBPACK_IMPORTED_MODULE_18___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_regexp_constructor_js__WEBPACK_IMPORTED_MODULE_18__);
47791
+ /* harmony import */ var core_js_modules_es_regexp_dot_all_js__WEBPACK_IMPORTED_MODULE_19__ = __webpack_require__(28450);
47792
+ /* harmony import */ var core_js_modules_es_regexp_dot_all_js__WEBPACK_IMPORTED_MODULE_19___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_regexp_dot_all_js__WEBPACK_IMPORTED_MODULE_19__);
47793
+ /* harmony import */ var core_js_modules_es_regexp_sticky_js__WEBPACK_IMPORTED_MODULE_20__ = __webpack_require__(88386);
47794
+ /* harmony import */ var core_js_modules_es_regexp_sticky_js__WEBPACK_IMPORTED_MODULE_20___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_regexp_sticky_js__WEBPACK_IMPORTED_MODULE_20__);
47795
47795
  /* harmony import */ var core_js_modules_es_array_splice_js__WEBPACK_IMPORTED_MODULE_21__ = __webpack_require__(40561);
47796
47796
  /* harmony import */ var core_js_modules_es_array_splice_js__WEBPACK_IMPORTED_MODULE_21___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_splice_js__WEBPACK_IMPORTED_MODULE_21__);
47797
47797
  /* harmony import */ var core_js_modules_es_string_match_all_js__WEBPACK_IMPORTED_MODULE_22__ = __webpack_require__(76373);
@@ -47808,9 +47808,11 @@ var SpecialCharsNode = /*#__PURE__*/function (_ControlNode) {
47808
47808
  /* harmony import */ var _editor_utils_ExpressionCalculator__WEBPACK_IMPORTED_MODULE_28__ = __webpack_require__(77564);
47809
47809
  /* harmony import */ var _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_29__ = __webpack_require__(28831);
47810
47810
  /* harmony import */ var _plugins_util__WEBPACK_IMPORTED_MODULE_30__ = __webpack_require__(17987);
47811
- /* harmony import */ var _BaseNode__WEBPACK_IMPORTED_MODULE_31__ = __webpack_require__(92178);
47812
- /* harmony import */ var _CellNode__WEBPACK_IMPORTED_MODULE_32__ = __webpack_require__(69088);
47813
- /* harmony import */ var _ControlNode__WEBPACK_IMPORTED_MODULE_33__ = __webpack_require__(99964);
47811
+ /* harmony import */ var _BaseCombineNode__WEBPACK_IMPORTED_MODULE_31__ = __webpack_require__(3267);
47812
+ /* harmony import */ var _BaseNode__WEBPACK_IMPORTED_MODULE_32__ = __webpack_require__(92178);
47813
+ /* harmony import */ var _CellNode__WEBPACK_IMPORTED_MODULE_33__ = __webpack_require__(69088);
47814
+ /* harmony import */ var _ControlNode__WEBPACK_IMPORTED_MODULE_34__ = __webpack_require__(99964);
47815
+
47814
47816
 
47815
47817
 
47816
47818
 
@@ -47907,7 +47909,7 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
47907
47909
  return _this;
47908
47910
  }
47909
47911
 
47910
- (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_34__/* ["default"] */ .Z)(TableFormula, [{
47912
+ (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_35__/* ["default"] */ .Z)(TableFormula, [{
47911
47913
  key: "setCustomProperty",
47912
47914
  value: function setCustomProperty(customProperty) {
47913
47915
  var assignvalue = function assignvalue(target, source) {
@@ -48022,9 +48024,9 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
48022
48024
  }, {
48023
48025
  key: "node2DrawNodeRange",
48024
48026
  value: function node2DrawNodeRange(startIndex, endIndex) {
48025
- this.refreshDrawStyle();
48026
- var text = this._hideZero && (this._text == "0" || this._text === "0.00") ? " " : this._text;
48027
- var dNode = new _editor_draw_drawNode_DrawTableFormular__WEBPACK_IMPORTED_MODULE_27__/* .DrawTableFormular */ .A(this._rootPath, this, text);
48027
+ this.refreshDrawStyle(); //const text = this._hideZero && (this._text == "0" || this._text === "0.00") ? " " : this._text;
48028
+
48029
+ var dNode = new _editor_draw_drawNode_DrawTableFormular__WEBPACK_IMPORTED_MODULE_27__/* .DrawTableFormular */ .A(this._rootPath, this, this._text);
48028
48030
 
48029
48031
  this._drawNodes.push(dNode);
48030
48032
  }
@@ -48067,7 +48069,7 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
48067
48069
  key: "node2Json",
48068
48070
  value: function node2Json(range, isCopy) {
48069
48071
  var retObj = {
48070
- nodeType: _BaseNode__WEBPACK_IMPORTED_MODULE_31__/* .NodeType */ .Jq[this.nodeType],
48072
+ nodeType: _BaseNode__WEBPACK_IMPORTED_MODULE_32__/* .NodeType */ .Jq[this.nodeType],
48071
48073
  text: this._formulaStr,
48072
48074
  styleIndex: this.styleIndex,
48073
48075
  hideZero: this._hideZero,
@@ -48089,7 +48091,7 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
48089
48091
  var pNode = this.parentNode;
48090
48092
 
48091
48093
  while (pNode) {
48092
- if (pNode instanceof _CellNode__WEBPACK_IMPORTED_MODULE_32__/* .CellNode */ .D) {
48094
+ if (pNode instanceof _CellNode__WEBPACK_IMPORTED_MODULE_33__/* .CellNode */ .D) {
48093
48095
  return pNode;
48094
48096
  }
48095
48097
 
@@ -48105,7 +48107,7 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
48105
48107
 
48106
48108
  var table = this.getParentCell().table;
48107
48109
  var totalOk = false;
48108
- var total = 0.0;
48110
+ var total = " ";
48109
48111
 
48110
48112
  if (arr.length == 2) {
48111
48113
  var _this$getRowColByCell = this.getRowColByCellAdress(arr[0]),
@@ -48125,6 +48127,7 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
48125
48127
  for (var r = istartRow; r <= iEndRow; r++) {
48126
48128
  for (var c = istartCol; c <= iEndCol; c++) {
48127
48129
  if (bCalc) {
48130
+ if (!table.rows[r]) return "?";
48128
48131
  var cell = table.rows[r][c];
48129
48132
  if (!cell) continue;
48130
48133
 
@@ -48135,7 +48138,10 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
48135
48138
 
48136
48139
  if (cell.cellProperty.downListProperty) {
48137
48140
  if (bret) {
48138
- total += value;
48141
+ //total+=value;
48142
+ if (value !== "") {
48143
+ total = ((total == " " ? 0.00 : Number(total)) + Number(value)).toString();
48144
+ }
48139
48145
  } else {
48140
48146
  var cellText = cell.getCellText();
48141
48147
  var downListProperty = cell.cellProperty.downListProperty;
@@ -48153,7 +48159,8 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
48153
48159
  var val = Number(listItem.value);
48154
48160
 
48155
48161
  if (!isNaN(val)) {
48156
- total += val;
48162
+ //total += val;
48163
+ total = ((total == " " ? 0.00 : Number(total)) + val).toString();
48157
48164
  } else {
48158
48165
  totalOk = false;
48159
48166
  break;
@@ -48173,8 +48180,11 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
48173
48180
  break;
48174
48181
  }
48175
48182
 
48176
- ;
48177
- total += value;
48183
+ ; //total += value;
48184
+
48185
+ if (value !== "") {
48186
+ total = ((total == " " ? 0.00 : Number(total)) + Number(value)).toString();
48187
+ }
48178
48188
  }
48179
48189
  } else {
48180
48190
  this._cellRange.push([r, c]);
@@ -48198,7 +48208,7 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
48198
48208
  }, {
48199
48209
  key: "getCellNumber",
48200
48210
  value: function getCellNumber(tb, irow, icol) {
48201
- var ret = 0;
48211
+ var ret = "";
48202
48212
  var bret = false;
48203
48213
  var cell = tb.rows[irow][icol];
48204
48214
 
@@ -48225,7 +48235,7 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
48225
48235
 
48226
48236
  if (!isNaN(ivalue)) {
48227
48237
  bret = true;
48228
- ret = ivalue;
48238
+ ret = strValue;
48229
48239
  }
48230
48240
  }
48231
48241
 
@@ -48255,7 +48265,7 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
48255
48265
  }, {
48256
48266
  key: "clacFormula",
48257
48267
  value: function clacFormula(bCalc) {
48258
- var strRet = '?';
48268
+ var strRet = ' ';
48259
48269
 
48260
48270
  var strFormula = this._formulaStr.toLowerCase();
48261
48271
 
@@ -48307,7 +48317,8 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
48307
48317
  avalue = _this$getCellNumber4[1];
48308
48318
 
48309
48319
  if (isNumber) {
48310
- value[i] = avalue.toString();
48320
+ //value[i] = avalue.toString();
48321
+ value[i] = avalue;
48311
48322
  } else {
48312
48323
  totalOk = false;
48313
48324
  break;
@@ -48324,7 +48335,7 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
48324
48335
  }
48325
48336
 
48326
48337
  if (!bCalc) {
48327
- return '0';
48338
+ return ' ';
48328
48339
  }
48329
48340
 
48330
48341
  if (totalOk) {
@@ -48332,20 +48343,25 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
48332
48343
  var isRet = true;
48333
48344
 
48334
48345
  for (var m = 0; m < value.length; m++) {
48335
- if (value[m] !== "0") {
48346
+ // if (value[m] !== "0") {
48347
+ // isRet = false;
48348
+ // }
48349
+ if (value[m] !== "") {
48336
48350
  isRet = false;
48351
+ break;
48337
48352
  }
48338
48353
  }
48339
48354
 
48340
48355
  if (isRet) {
48341
- return '0';
48356
+ return " ";
48342
48357
  }
48343
48358
 
48344
48359
  for (var k = arr.length - 1; k >= 0; k--) {
48345
48360
  strFormula = hoEditorFactory.unitConvert.replaceAll(strFormula, arr[k], value[k]); //strFormula.replaceAll(arr[k], value[k]);
48346
48361
  }
48347
48362
 
48348
- strRet = '' + (0,_editor_utils_ExpressionCalculator__WEBPACK_IMPORTED_MODULE_28__/* .expressionCalculator */ .C)(strFormula);
48363
+ var result = (0,_editor_utils_ExpressionCalculator__WEBPACK_IMPORTED_MODULE_28__/* .expressionCalculator */ .C)(strFormula);
48364
+ strRet = result.toString() == "NaN" ? " " : result.toString();
48349
48365
  }
48350
48366
 
48351
48367
  return strRet;
@@ -48353,7 +48369,7 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
48353
48369
  }, {
48354
48370
  key: "clacBMI",
48355
48371
  value: function clacBMI() {
48356
- var strRet = "0";
48372
+ var strRet = " ";
48357
48373
  var table = this.getParentCell().table;
48358
48374
  var arrStr = this.formulaStr.split(",");
48359
48375
 
@@ -48372,6 +48388,8 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
48372
48388
  heightCol = _this$getRowColByCell10[1];
48373
48389
 
48374
48390
  if (weightRow >= 0 && weightCol >= 0 && heightRow >= 0 && heightCol >= 0) {
48391
+ if (!table.rows[weightRow]) return strRet;
48392
+ if (!table.rows[heightRow]) return strRet;
48375
48393
  var wCell = table.rows[weightRow][weightCol];
48376
48394
  var hCell = table.rows[heightRow][heightCol];
48377
48395
 
@@ -48379,14 +48397,17 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
48379
48397
  var _this$getCellNumber5 = this.getCellNumber(table, weightRow, weightCol),
48380
48398
  _this$getCellNumber6 = (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)(_this$getCellNumber5, 2),
48381
48399
  wRet = _this$getCellNumber6[0],
48382
- weightNum = _this$getCellNumber6[1];
48400
+ weight = _this$getCellNumber6[1];
48383
48401
 
48384
48402
  var _this$getCellNumber7 = this.getCellNumber(table, heightRow, heightCol),
48385
48403
  _this$getCellNumber8 = (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)(_this$getCellNumber7, 2),
48386
48404
  hRet = _this$getCellNumber8[0],
48387
- heightNum = _this$getCellNumber8[1];
48405
+ height = _this$getCellNumber8[1];
48388
48406
 
48389
- if (hRet && heightNum === 0) return strRet;
48407
+ if (height == "0" || height == "") return strRet;
48408
+ if (weight == "") return strRet;
48409
+ var weightNum = Number(weight);
48410
+ var heightNum = Number(height);
48390
48411
 
48391
48412
  if (wRet && hRet) {
48392
48413
  if (heightNum > 3) {
@@ -48434,6 +48455,8 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
48434
48455
  }
48435
48456
 
48436
48457
  if (sRow >= 0 && sCol >= 0 && eRow >= 0 && eCol >= 0) {
48458
+ if (!table.rows[sRow]) return "0";
48459
+ if (!table.rows[eRow]) return "0";
48437
48460
  var sCell = table.rows[sRow][sCol];
48438
48461
  var eCell = table.rows[eRow][eCol];
48439
48462
 
@@ -48492,6 +48515,7 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
48492
48515
 
48493
48516
  if (arrStr.length === 3) {
48494
48517
  if (aRow >= 0 && aCol >= 0) {
48518
+ if (!table.rows[aRow]) return "0";
48495
48519
  var aCell = table.rows[aRow][aCol];
48496
48520
 
48497
48521
  if (aCell) {
@@ -48602,6 +48626,7 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
48602
48626
  col = _this$getRowColByCell18[1];
48603
48627
 
48604
48628
  if (row >= 0 && col >= 0) {
48629
+ if (!table.rows[row]) return "0";
48605
48630
  var cell = table.rows[row][col];
48606
48631
 
48607
48632
  if (cell) {
@@ -48646,6 +48671,7 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
48646
48671
  col = _this$getRowColByCell20[1];
48647
48672
 
48648
48673
  if (row >= 0 && col >= 0) {
48674
+ if (!table.rows[row]) return "0";
48649
48675
  var cell = table.rows[row][col];
48650
48676
 
48651
48677
  if (cell) {
@@ -48679,7 +48705,7 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
48679
48705
  }, {
48680
48706
  key: "getScoreMapping",
48681
48707
  value: function getScoreMapping() {
48682
- var strRet = "0";
48708
+ var strRet = " ";
48683
48709
  var formularJson = JSON.parse(this.formulaStr);
48684
48710
  var cellNo = formularJson.cell;
48685
48711
  var items = formularJson.items;
@@ -48691,20 +48717,38 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
48691
48717
  col = _this$getRowColByCell22[1];
48692
48718
 
48693
48719
  if (row >= 0 && col >= 0) {
48720
+ if (!table.rows[row]) return " ";
48694
48721
  var cell = table.rows[row][col];
48695
48722
 
48696
- if (cell && cell.childNodes[1] instanceof TableFormula) {
48697
- var tableFormular = cell.childNodes[1]; //const scoreText = cell.getCellText();
48723
+ if (cell) {
48724
+ var tableFormular = cell.childNodes[0];
48725
+
48726
+ var loopNodes = function loopNodes(nodes) {
48727
+ for (var k = 0; k < nodes.length; k++) {
48728
+ var node = nodes[k];
48729
+
48730
+ if (node instanceof TableFormula) {
48731
+ tableFormular = node;
48732
+ break;
48733
+ }
48734
+
48735
+ if (node instanceof _BaseCombineNode__WEBPACK_IMPORTED_MODULE_31__/* .BaseCombineNode */ .V) {
48736
+ loopNodes(node.childNodes);
48737
+ }
48738
+ }
48739
+ };
48740
+
48741
+ loopNodes(cell.childNodes);
48742
+ if (!(tableFormular instanceof TableFormula)) return " "; //const scoreText = cell.getCellText();
48698
48743
 
48699
48744
  var scoreText = tableFormular.text;
48700
48745
 
48701
48746
  if (scoreText == "" || scoreText == " ") {
48702
48747
  return strRet;
48703
- }
48748
+ } // if (tableFormular.hideZero && (scoreText == "0" || scoreText == "0.00")) {
48749
+ // return strRet;
48750
+ // }
48704
48751
 
48705
- if (tableFormular.hideZero && (scoreText == "0" || scoreText == "0.00")) {
48706
- return strRet;
48707
- }
48708
48752
 
48709
48753
  var score = Number(scoreText);
48710
48754
 
@@ -48827,13 +48871,13 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
48827
48871
  formularType = json.text.indexOf(':') > 0 ? FormularType.ftSum : FormularType.ftFormular;
48828
48872
  }
48829
48873
 
48830
- var ret = new TableFormula(hoEditorFactoryID, rootNodes, pNode ? pNode : null, _BaseNode__WEBPACK_IMPORTED_MODULE_31__/* .NodeType.ntTableFormula */ .Jq.ntTableFormula, json.text, styleIndex, hideZero, formularType, json.customProperty);
48874
+ var ret = new TableFormula(hoEditorFactoryID, rootNodes, pNode ? pNode : null, _BaseNode__WEBPACK_IMPORTED_MODULE_32__/* .NodeType.ntTableFormula */ .Jq.ntTableFormula, json.text, styleIndex, hideZero, formularType, json.customProperty);
48831
48875
  return ret;
48832
48876
  }
48833
48877
  }]);
48834
48878
 
48835
48879
  return TableFormula;
48836
- }(_ControlNode__WEBPACK_IMPORTED_MODULE_33__/* .ControlNode */ .w);
48880
+ }(_ControlNode__WEBPACK_IMPORTED_MODULE_34__/* .ControlNode */ .w);
48837
48881
 
48838
48882
  /***/ }),
48839
48883
 
@@ -49267,6 +49311,8 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
49267
49311
  }
49268
49312
  }
49269
49313
 
49314
+ _this.countChildNodes();
49315
+
49270
49316
  _this.node2DrawNode();
49271
49317
 
49272
49318
  _this.updateWidth();
@@ -49363,11 +49409,11 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
49363
49409
  }, {
49364
49410
  key: "childNodes",
49365
49411
  get: function get() {
49366
- var arr = this._rows.flat();
49412
+ if (!this._childNodes) {
49413
+ this.countChildNodes();
49414
+ }
49367
49415
 
49368
- return arr.filter(function (element) {
49369
- return element !== undefined;
49370
- });
49416
+ return this._childNodes;
49371
49417
  }
49372
49418
  }, {
49373
49419
  key: "borderWidth",
@@ -49377,6 +49423,15 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
49377
49423
  set: function set(borderWidth) {
49378
49424
  this._borderWidth = borderWidth;
49379
49425
  }
49426
+ }, {
49427
+ key: "countChildNodes",
49428
+ value: function countChildNodes() {
49429
+ var arr = this._rows.flat();
49430
+
49431
+ this._childNodes = arr.filter(function (element) {
49432
+ return element !== undefined;
49433
+ });
49434
+ }
49380
49435
  }, {
49381
49436
  key: "calcColWidth",
49382
49437
  value: function calcColWidth() {
@@ -49513,6 +49568,7 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
49513
49568
  }
49514
49569
 
49515
49570
  this._rowCount += 1;
49571
+ this.countChildNodes();
49516
49572
  this._drawTable.needUpdate = true;
49517
49573
  }
49518
49574
 
@@ -49773,6 +49829,7 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
49773
49829
  }
49774
49830
 
49775
49831
  this._colCount += count;
49832
+ this.countChildNodes();
49776
49833
  this.updateWidth(); // }
49777
49834
  }
49778
49835
  /**
@@ -49958,6 +50015,7 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
49958
50015
  // }
49959
50016
  // vampireCell.updateHeight(aHeight);
49960
50017
 
50018
+ this.countChildNodes();
49961
50019
  vampireCell.drawCell.needUpdate = true;
49962
50020
  return vampireCell;
49963
50021
  }
@@ -50214,6 +50272,8 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
50214
50272
  // }
50215
50273
 
50216
50274
  this._rows.splice(index, count);
50275
+
50276
+ this.countChildNodes();
50217
50277
  }
50218
50278
  }, {
50219
50279
  key: "deleteCols",
@@ -50305,6 +50365,8 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
50305
50365
  if (cols.length > 0) {
50306
50366
  this.updateColsWidth(cols, newWidth);
50307
50367
  }
50368
+
50369
+ this.countChildNodes();
50308
50370
  }
50309
50371
  }, {
50310
50372
  key: "unMergeCell",
@@ -50346,6 +50408,8 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
50346
50408
  } else if (bUnMergeCol) {
50347
50409
  this.doUnMergeCol(r, c);
50348
50410
  }
50411
+
50412
+ this.countChildNodes();
50349
50413
  }
50350
50414
  }
50351
50415
  }, {
@@ -51856,6 +51920,7 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
51856
51920
  }
51857
51921
  }
51858
51922
 
51923
+ tableNode.countChildNodes();
51859
51924
  return tableNode;
51860
51925
  }
51861
51926
  }, {
@@ -61663,14 +61728,6 @@ var getPrototypeOf = __webpack_require__(79123);
61663
61728
  var inherits = __webpack_require__(83964);
61664
61729
  // EXTERNAL MODULE: ./node_modules/@babel/runtime/helpers/esm/createSuper.js + 2 modules
61665
61730
  var createSuper = __webpack_require__(46455);
61666
- // EXTERNAL MODULE: ./node_modules/core-js/modules/es.function.name.js
61667
- var es_function_name = __webpack_require__(68309);
61668
- // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.includes.js
61669
- var es_array_includes = __webpack_require__(26699);
61670
- // EXTERNAL MODULE: ./node_modules/core-js/modules/es.string.includes.js
61671
- var es_string_includes = __webpack_require__(32023);
61672
- // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.splice.js
61673
- var es_array_splice = __webpack_require__(40561);
61674
61731
  // EXTERNAL MODULE: ./node_modules/core-js/modules/es.error.cause.js
61675
61732
  var es_error_cause = __webpack_require__(21703);
61676
61733
  // EXTERNAL MODULE: ./src/editor/dom/TableProperty.ts
@@ -62025,10 +62082,6 @@ var DrawPageTable = __webpack_require__(24552);
62025
62082
 
62026
62083
 
62027
62084
 
62028
-
62029
-
62030
-
62031
-
62032
62085
 
62033
62086
 
62034
62087
  var DrawPageCell = /*#__PURE__*/function (_DrawArea) {
@@ -62499,6 +62552,8 @@ var DrawPageCell = /*#__PURE__*/function (_DrawArea) {
62499
62552
  key: "startPaintBackGround",
62500
62553
  value: function startPaintBackGround() {
62501
62554
  this._backImg.uncache();
62555
+
62556
+ this._backImg.graphics.clear();
62502
62557
  }
62503
62558
  }, {
62504
62559
  key: "endPaintBackGround",
@@ -62507,34 +62562,28 @@ var DrawPageCell = /*#__PURE__*/function (_DrawArea) {
62507
62562
  }
62508
62563
  }, {
62509
62564
  key: "paintMarker",
62510
- value: function paintMarker(r, c) {
62511
- var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID);
62512
-
62513
- for (var i = this.children.length - 1; i >= 0; i--) {
62514
- if (this.children[i].name && this.children[i].name.includes("markline")) {
62515
- this.children.splice(i, 1);
62516
- }
62517
- }
62565
+ value: function paintMarker(color) {
62566
+ var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID); // for (let i = this.children.length - 1; i >= 0; i--) {
62567
+ // if (this.children[i].name && this.children[i].name.includes("markline")) {
62568
+ // this.children.splice(i, 1);
62569
+ // }
62570
+ // }
62518
62571
 
62519
62572
  if (hoEditorFactory.drawTree.paintStatus !== DrawTree/* PaintState.psPreview */.Dh.psPreview && hoEditorFactory.drawTree.paintStatus !== DrawTree/* PaintState.psPrint */.Dh.psPrint) {
62520
- var markerLine1 = new createjs.Shape();
62521
- var markerLine2 = new createjs.Shape();
62522
- var markerLine3 = new createjs.Shape();
62523
- var markerLine4 = new createjs.Shape();
62573
+ // const markerLine1 = new createjs.Shape();
62574
+ // const markerLine2 = new createjs.Shape();
62575
+ // const markerLine3 = new createjs.Shape();
62576
+ // const markerLine4 = new createjs.Shape();
62524
62577
  var width = this.dWidth;
62525
- var height = this.dHeight;
62526
- markerLine1.name = "markline1";
62527
- markerLine2.name = "markline2";
62528
- markerLine3.name = "markline3";
62529
- markerLine4.name = "markline4";
62530
- markerLine1.graphics.beginStroke("#FB0101").moveTo(width - 7, height - 0.5).lineTo(width - 0.5, height - 7);
62531
- markerLine2.graphics.beginStroke("#FB0101").moveTo(width - 5, height - 0.5).lineTo(width - 0.5, height - 5);
62532
- markerLine3.graphics.beginStroke("#FB0101").moveTo(width - 3, height - 0.5).lineTo(width - 0.5, height - 3);
62533
- markerLine4.graphics.beginStroke("#FB0101").moveTo(width - 2, height - 0.5).lineTo(width - 0.5, height - 2);
62534
- this.addChild(markerLine1);
62535
- this.addChild(markerLine2);
62536
- this.addChild(markerLine3);
62537
- this.addChild(markerLine4);
62578
+ var height = this.dHeight; // markerLine1.name = "markline1";
62579
+ // markerLine2.name = "markline2";
62580
+ // markerLine3.name = "markline3";
62581
+ // markerLine4.name = "markline4";
62582
+
62583
+ this._backImg.graphics.beginStroke(color).moveTo(width - 7, height - 0.5).lineTo(width - 0.5, height - 7).moveTo(width - 5, height - 0.5).lineTo(width - 0.5, height - 5).moveTo(width - 3, height - 0.5).lineTo(width - 0.5, height - 3).moveTo(width - 2, height - 0.5).lineTo(width - 0.5, height - 2);
62584
+
62585
+ this._backImg.graphics.endStroke(); // this.addChild(markerLine1);
62586
+
62538
62587
  }
62539
62588
  }
62540
62589
  }, {
@@ -62543,9 +62592,7 @@ var DrawPageCell = /*#__PURE__*/function (_DrawArea) {
62543
62592
  var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID);
62544
62593
  this._backImg.x = 0;
62545
62594
  this._backImg.y = 0; // this._backImg.uncache();
62546
-
62547
- this._backImg.graphics.clear(); // 白色背景转透明 处理转换pdf生成的多余线
62548
-
62595
+ // 白色背景转透明 处理转换pdf生成的多余线
62549
62596
 
62550
62597
  this._backImg.graphics.beginFill(this._cell.cellProperty.backColor === '#FFFFFF' ? 'transparent' : this._cell.cellProperty.backColor);
62551
62598
 
@@ -63066,7 +63113,7 @@ var DrawPageMarkNode = /*#__PURE__*/function (_DrawCombineNode) {
63066
63113
  /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(14409);
63067
63114
  /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_inherits_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(83964);
63068
63115
  /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createSuper_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(46455);
63069
- /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(16296);
63116
+ /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(16296);
63070
63117
  /* harmony import */ var D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_classCallCheck_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(42015);
63071
63118
  /* harmony import */ var core_js_modules_es_array_sort_js__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(2707);
63072
63119
  /* harmony import */ var core_js_modules_es_array_sort_js__WEBPACK_IMPORTED_MODULE_5___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_sort_js__WEBPACK_IMPORTED_MODULE_5__);
@@ -63076,12 +63123,16 @@ var DrawPageMarkNode = /*#__PURE__*/function (_DrawCombineNode) {
63076
63123
  /* harmony import */ var core_js_modules_es_error_cause_js__WEBPACK_IMPORTED_MODULE_7___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_error_cause_js__WEBPACK_IMPORTED_MODULE_7__);
63077
63124
  /* harmony import */ var core_js_modules_es_array_concat_js__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(92222);
63078
63125
  /* harmony import */ var core_js_modules_es_array_concat_js__WEBPACK_IMPORTED_MODULE_8___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_concat_js__WEBPACK_IMPORTED_MODULE_8__);
63079
- /* harmony import */ var _editor_dom_treeNode_TableNode__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(59530);
63080
- /* harmony import */ var _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(28831);
63081
- /* harmony import */ var _drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(27546);
63082
- /* harmony import */ var _IDrawInfos__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(32418);
63083
- /* harmony import */ var _DrawPageCell__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(12337);
63084
- /* harmony import */ var _DrawRect__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(6963);
63126
+ /* harmony import */ var _editor_dom_treeNode_BaseCombineNode__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(3267);
63127
+ /* harmony import */ var _editor_dom_treeNode_TableFormula__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(72330);
63128
+ /* harmony import */ var _editor_dom_treeNode_TableNode__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(59530);
63129
+ /* harmony import */ var _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(28831);
63130
+ /* harmony import */ var _drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(27546);
63131
+ /* harmony import */ var _IDrawInfos__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(32418);
63132
+ /* harmony import */ var _DrawPageCell__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(12337);
63133
+ /* harmony import */ var _DrawRect__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(6963);
63134
+
63135
+
63085
63136
 
63086
63137
 
63087
63138
 
@@ -63143,7 +63194,7 @@ var DrawPageMarkNode = /*#__PURE__*/function (_DrawCombineNode) {
63143
63194
  // }
63144
63195
  // }
63145
63196
 
63146
- var PartRowHeight = /*#__PURE__*/(0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_14__/* ["default"] */ .Z)(function PartRowHeight() {
63197
+ var PartRowHeight = /*#__PURE__*/(0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_16__/* ["default"] */ .Z)(function PartRowHeight() {
63147
63198
  (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_classCallCheck_js__WEBPACK_IMPORTED_MODULE_4__/* ["default"] */ .Z)(this, PartRowHeight);
63148
63199
  });
63149
63200
  var PartRowHeights = /*#__PURE__*/function () {
@@ -63154,7 +63205,7 @@ var PartRowHeights = /*#__PURE__*/function () {
63154
63205
  this._drawPageTable = drawPageTable;
63155
63206
  }
63156
63207
 
63157
- (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_14__/* ["default"] */ .Z)(PartRowHeights, [{
63208
+ (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_16__/* ["default"] */ .Z)(PartRowHeights, [{
63158
63209
  key: "getLastRow",
63159
63210
  value: function getLastRow() {
63160
63211
  if (this._rowHeights.length > 0) {
@@ -63248,7 +63299,7 @@ var DrawPageTable = /*#__PURE__*/function (_DrawRect) {
63248
63299
  _this._table = tableNode;
63249
63300
  _this._dParent = dParent;
63250
63301
  _this._charSpace = paragraphNode.combineParagraph.charSpace;
63251
- _this._discriminator = _IDrawInfos__WEBPACK_IMPORTED_MODULE_15__/* .gDrawIntfID */ .t;
63302
+ _this._discriminator = _IDrawInfos__WEBPACK_IMPORTED_MODULE_17__/* .gDrawIntfID */ .t;
63252
63303
  _this._dTop = dTop;
63253
63304
  _this._node = tableNode;
63254
63305
  _this._dWidth = aWidth;
@@ -63263,7 +63314,7 @@ var DrawPageTable = /*#__PURE__*/function (_DrawRect) {
63263
63314
  } // private _endRowinfos: EndRowInfo;
63264
63315
 
63265
63316
 
63266
- (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_14__/* ["default"] */ .Z)(DrawPageTable, [{
63317
+ (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_16__/* ["default"] */ .Z)(DrawPageTable, [{
63267
63318
  key: "startRow",
63268
63319
  get: function get() {
63269
63320
  return this._startRow;
@@ -63543,19 +63594,42 @@ var DrawPageTable = /*#__PURE__*/function (_DrawRect) {
63543
63594
  }, {
63544
63595
  key: "paintCellBorder",
63545
63596
  value: function paintCellBorder(partCell, r, c, newHeight) {
63597
+ partCell.startPaintBackGround();
63546
63598
  var colInfo = this._table.colInfos[c];
63547
63599
 
63548
63600
  if (partCell.cell.cellProperty.editorProperty !== 0 || colInfo.colProperty.editorProperty !== 0) {
63549
- partCell.paintMarker(r, c);
63601
+ partCell.paintMarker("#FB0101");
63602
+ }
63603
+
63604
+ var isHasTableFormula = false;
63605
+
63606
+ var loopNodes = function loopNodes(nodes) {
63607
+ for (var k = 0; k < nodes.length; k++) {
63608
+ var node = nodes[k];
63609
+
63610
+ if (node instanceof _editor_dom_treeNode_TableFormula__WEBPACK_IMPORTED_MODULE_10__/* .TableFormula */ .N) {
63611
+ isHasTableFormula = true;
63612
+ break;
63613
+ }
63614
+
63615
+ if (node instanceof _editor_dom_treeNode_BaseCombineNode__WEBPACK_IMPORTED_MODULE_9__/* .BaseCombineNode */ .V) {
63616
+ loopNodes(node.childNodes);
63617
+ }
63618
+ }
63619
+ };
63620
+
63621
+ loopNodes(partCell.cell.childNodes);
63622
+
63623
+ if (isHasTableFormula) {
63624
+ partCell.paintMarker("#0312FA");
63550
63625
  }
63551
63626
 
63552
- partCell.startPaintBackGround();
63553
63627
  partCell.paintCellBackground(newHeight, r, c);
63554
63628
  partCell.endPaintBackGround(newHeight);
63555
63629
  partCell.updateCrossShap();
63556
- var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_10__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this.table.hoEditorFactoryID);
63630
+ var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_12__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this.table.hoEditorFactoryID);
63557
63631
 
63558
- if (hoEditorFactory.drawTree.paintStatus === _drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_11__/* .PaintState.psPreview */ .Dh.psPreview || hoEditorFactory.drawTree.paintStatus === _drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_11__/* .PaintState.psPrint */ .Dh.psPrint) {
63632
+ if (hoEditorFactory.drawTree.paintStatus === _drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_13__/* .PaintState.psPreview */ .Dh.psPreview || hoEditorFactory.drawTree.paintStatus === _drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_13__/* .PaintState.psPrint */ .Dh.psPrint) {
63559
63633
  return;
63560
63634
  }
63561
63635
 
@@ -63596,7 +63670,7 @@ var DrawPageTable = /*#__PURE__*/function (_DrawRect) {
63596
63670
  }
63597
63671
  }
63598
63672
 
63599
- var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_10__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._table.hoEditorFactoryID);
63673
+ var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_12__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._table.hoEditorFactoryID);
63600
63674
  var tableRestHeight = pageRestHeight;
63601
63675
  this._endRow = this._startRow;
63602
63676
  var emptyRowHeight = 0;
@@ -63605,13 +63679,13 @@ var DrawPageTable = /*#__PURE__*/function (_DrawRect) {
63605
63679
  for (var r = this._startRow; r < this._table.rowCount; r++) {
63606
63680
  var rowRestHeight = 0;
63607
63681
 
63608
- if (pageRestHeight < _editor_dom_treeNode_TableNode__WEBPACK_IMPORTED_MODULE_9__/* .gDefaultRowHeight */ .dT) {
63682
+ if (pageRestHeight < _editor_dom_treeNode_TableNode__WEBPACK_IMPORTED_MODULE_11__/* .gDefaultRowHeight */ .dT) {
63609
63683
  break;
63610
63684
  } //开始行需要判断是否存在上一个未绘制完成的表格
63611
63685
 
63612
63686
 
63613
63687
  if (r === this._startRow && index > 0 && !bStartRowFinished) {
63614
- rowRestHeight = Math.max(this._table.drawTable.getRowRestHeight(index - 1, this._startRow), _editor_dom_treeNode_TableNode__WEBPACK_IMPORTED_MODULE_9__/* .gDefaultRowHeight */ .dT);
63688
+ rowRestHeight = Math.max(this._table.drawTable.getRowRestHeight(index - 1, this._startRow), _editor_dom_treeNode_TableNode__WEBPACK_IMPORTED_MODULE_11__/* .gDefaultRowHeight */ .dT);
63615
63689
  } else {
63616
63690
  rowRestHeight = this._table.rowInfos[r].rowHeight;
63617
63691
  }
@@ -63634,7 +63708,7 @@ var DrawPageTable = /*#__PURE__*/function (_DrawRect) {
63634
63708
 
63635
63709
  if (isEmptyRow) {
63636
63710
  if (r >= this._startRow) {
63637
- var aRowHeight = Math.max(this._table.rowInfos[r].rowHeight, _editor_dom_treeNode_TableNode__WEBPACK_IMPORTED_MODULE_9__/* .gDefaultRowHeight */ .dT);
63711
+ var aRowHeight = Math.max(this._table.rowInfos[r].rowHeight, _editor_dom_treeNode_TableNode__WEBPACK_IMPORTED_MODULE_11__/* .gDefaultRowHeight */ .dT);
63638
63712
 
63639
63713
  this._partRowHeights.set(r, aRowHeight);
63640
63714
 
@@ -63737,7 +63811,7 @@ var DrawPageTable = /*#__PURE__*/function (_DrawRect) {
63737
63811
 
63738
63812
  if (cell.rowSpan + r - 1 === row) {
63739
63813
  var partCell = cell.drawCell.getDrawPageCell(this);
63740
- var hoeditorfactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_10__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._table.hoEditorFactoryID);
63814
+ var hoeditorfactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_12__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._table.hoEditorFactoryID);
63741
63815
 
63742
63816
  if (partCell) {
63743
63817
  // const dobj = partCell.lastDrawLine;
@@ -63748,14 +63822,14 @@ var DrawPageTable = /*#__PURE__*/function (_DrawRect) {
63748
63822
 
63749
63823
  if (index == 0 || index == partCell.cell.drawCell.drawPageCells.length - 1) {
63750
63824
  if (index == 0 && index == partCell.cell.drawCell.drawPageCells.length - 1) {
63751
- dHeight = Math.max(_editor_dom_treeNode_TableNode__WEBPACK_IMPORTED_MODULE_9__/* .gDefaultRowHeight */ .dT, innerTop + partCell.docHeight + innerBottom);
63825
+ dHeight = Math.max(_editor_dom_treeNode_TableNode__WEBPACK_IMPORTED_MODULE_11__/* .gDefaultRowHeight */ .dT, innerTop + partCell.docHeight + innerBottom);
63752
63826
  } else if (index == 0) {
63753
- dHeight = Math.max(_editor_dom_treeNode_TableNode__WEBPACK_IMPORTED_MODULE_9__/* .gDefaultRowHeight */ .dT, innerTop + partCell.docHeight);
63827
+ dHeight = Math.max(_editor_dom_treeNode_TableNode__WEBPACK_IMPORTED_MODULE_11__/* .gDefaultRowHeight */ .dT, innerTop + partCell.docHeight);
63754
63828
  } else if (index == partCell.cell.drawCell.drawPageCells.length - 1) {
63755
- dHeight = Math.max(_editor_dom_treeNode_TableNode__WEBPACK_IMPORTED_MODULE_9__/* .gDefaultRowHeight */ .dT, innerBottom + partCell.docHeight);
63829
+ dHeight = Math.max(_editor_dom_treeNode_TableNode__WEBPACK_IMPORTED_MODULE_11__/* .gDefaultRowHeight */ .dT, innerBottom + partCell.docHeight);
63756
63830
  }
63757
63831
  } else {
63758
- dHeight = Math.max(_editor_dom_treeNode_TableNode__WEBPACK_IMPORTED_MODULE_9__/* .gDefaultRowHeight */ .dT, partCell.docHeight);
63832
+ dHeight = Math.max(_editor_dom_treeNode_TableNode__WEBPACK_IMPORTED_MODULE_11__/* .gDefaultRowHeight */ .dT, partCell.docHeight);
63759
63833
  }
63760
63834
 
63761
63835
  if (index === partCell.cell.drawCell.drawPageCells.length - 1 || this._table.rowInfos[r].rowProperty.repeatAsTitleAtPageTop) {
@@ -63878,7 +63952,7 @@ var DrawPageTable = /*#__PURE__*/function (_DrawRect) {
63878
63952
 
63879
63953
 
63880
63954
  if (partCellindex === cell.drawCell.drawPageCells.length - 1) {
63881
- dPartCell = new _DrawPageCell__WEBPACK_IMPORTED_MODULE_12__/* .DrawPageCell */ .k(this.table.hoEditorFactoryID, this, cell, aleft, cellRowTop, awidth, cellMaxHeight, partCellindex + 1, startChildIndex, cellMaxHeight);
63955
+ dPartCell = new _DrawPageCell__WEBPACK_IMPORTED_MODULE_14__/* .DrawPageCell */ .k(this.table.hoEditorFactoryID, this, cell, aleft, cellRowTop, awidth, cellMaxHeight, partCellindex + 1, startChildIndex, cellMaxHeight);
63882
63956
  cell.drawCell.drawPageCells.push(dPartCell);
63883
63957
  dPartCell.y = cellRowTop;
63884
63958
  dPartCell.x = aleft; //this.drawItems.push(dPartCell);
@@ -63922,7 +63996,7 @@ var DrawPageTable = /*#__PURE__*/function (_DrawRect) {
63922
63996
  }, {
63923
63997
  key: "getMainRestHeight",
63924
63998
  value: function getMainRestHeight() {
63925
- var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_10__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this.table.hoEditorFactoryID);
63999
+ var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_12__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this.table.hoEditorFactoryID);
63926
64000
  var mainArea = hoEditorFactory.drawPageTree.getMainRootArea(this);
63927
64001
  if (!mainArea) return 0;
63928
64002
  var pos = this.localToLocal(0, 0, mainArea);
@@ -63930,7 +64004,7 @@ var DrawPageTable = /*#__PURE__*/function (_DrawRect) {
63930
64004
  var pArea = hoEditorFactory.drawTree.getParentDrawArea(this);
63931
64005
 
63932
64006
  while (pArea && pArea !== mainArea) {
63933
- if (pArea instanceof _DrawPageCell__WEBPACK_IMPORTED_MODULE_12__/* .DrawPageCell */ .k) {
64007
+ if (pArea instanceof _DrawPageCell__WEBPACK_IMPORTED_MODULE_14__/* .DrawPageCell */ .k) {
63934
64008
  var rowIndex = pArea.cell.table.rows.indexOf(pArea.cell.row);
63935
64009
 
63936
64010
  if (rowIndex >= 0) {
@@ -63950,7 +64024,7 @@ var DrawPageTable = /*#__PURE__*/function (_DrawRect) {
63950
64024
  }, {
63951
64025
  key: "getAndUpdatePartRowHeight",
63952
64026
  value: function getAndUpdatePartRowHeight(row) {
63953
- var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_10__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this.table.hoEditorFactoryID);
64027
+ var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_12__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this.table.hoEditorFactoryID);
63954
64028
  var aHeight = 0;
63955
64029
 
63956
64030
  for (var c = 0; c < this._table.colCount; c++) {
@@ -63969,7 +64043,7 @@ var DrawPageTable = /*#__PURE__*/function (_DrawRect) {
63969
64043
  }
63970
64044
  }
63971
64045
 
63972
- aHeight = Math.ceil(Math.max(aHeight, _editor_dom_treeNode_TableNode__WEBPACK_IMPORTED_MODULE_9__/* .gDefaultRowHeight */ .dT));
64046
+ aHeight = Math.ceil(Math.max(aHeight, _editor_dom_treeNode_TableNode__WEBPACK_IMPORTED_MODULE_11__/* .gDefaultRowHeight */ .dT));
63973
64047
 
63974
64048
  if (this._table.rowInfos[row].rowProperty.isSpecifyHeight && this._table.rowInfos[row].rowProperty.isLockRowHeight) {
63975
64049
  aHeight = hoEditorFactory.unitConvert.mmConversionPx(this._table.rowInfos[row].rowProperty.rowHeight * 10, false);
@@ -64179,7 +64253,7 @@ var DrawPageTable = /*#__PURE__*/function (_DrawRect) {
64179
64253
  }, {
64180
64254
  key: "getRowDocHeight",
64181
64255
  value: function getRowDocHeight(r) {
64182
- var ret = _editor_dom_treeNode_TableNode__WEBPACK_IMPORTED_MODULE_9__/* .gDefaultRowHeight */ .dT;
64256
+ var ret = _editor_dom_treeNode_TableNode__WEBPACK_IMPORTED_MODULE_11__/* .gDefaultRowHeight */ .dT;
64183
64257
 
64184
64258
  for (var c = 0; c < this._table.colCount; c++) {
64185
64259
  var cell = this._table.rows[r][c];
@@ -64286,7 +64360,7 @@ var DrawPageTable = /*#__PURE__*/function (_DrawRect) {
64286
64360
  var _this$_partRowHeights2;
64287
64361
 
64288
64362
  var startHeight = (_this$_partRowHeights2 = this._partRowHeights.get(this._startRow)) === null || _this$_partRowHeights2 === void 0 ? void 0 : _this$_partRowHeights2.rowHeight;
64289
- var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_10__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._table.hoEditorFactoryID);
64363
+ var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_12__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._table.hoEditorFactoryID);
64290
64364
  var dPage = null;
64291
64365
  if (this.stage) dPage = hoEditorFactory.drawPageTree.getDrawPageByDNode(this);
64292
64366
 
@@ -64306,7 +64380,7 @@ var DrawPageTable = /*#__PURE__*/function (_DrawRect) {
64306
64380
  }, {
64307
64381
  key: "drawUpdate",
64308
64382
  value: function drawUpdate(prevdPageTable, dRestHeight) {
64309
- var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_10__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this.table.hoEditorFactoryID);
64383
+ var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_12__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this.table.hoEditorFactoryID);
64310
64384
 
64311
64385
  if (this.table.tableProperty.fixedOnePage) {
64312
64386
  dRestHeight = Infinity;
@@ -64358,12 +64432,12 @@ var DrawPageTable = /*#__PURE__*/function (_DrawRect) {
64358
64432
 
64359
64433
  for (var r = startRow; r < this._table.rowCount; r++) {
64360
64434
  if (r === this._startRow && index > 0 && !bStartRowFinished) {
64361
- rowRestHeight = Math.max(this._table.drawTable.getRowRestHeight(index, this._startRow), _editor_dom_treeNode_TableNode__WEBPACK_IMPORTED_MODULE_9__/* .gDefaultRowHeight */ .dT);
64435
+ rowRestHeight = Math.max(this._table.drawTable.getRowRestHeight(index, this._startRow), _editor_dom_treeNode_TableNode__WEBPACK_IMPORTED_MODULE_11__/* .gDefaultRowHeight */ .dT);
64362
64436
  } else {
64363
64437
  rowRestHeight = this._table.rowInfos[r].rowHeight;
64364
64438
  }
64365
64439
 
64366
- if (pageRestHeight < _editor_dom_treeNode_TableNode__WEBPACK_IMPORTED_MODULE_9__/* .gDefaultRowHeight */ .dT) {
64440
+ if (pageRestHeight < _editor_dom_treeNode_TableNode__WEBPACK_IMPORTED_MODULE_11__/* .gDefaultRowHeight */ .dT) {
64367
64441
  this.removeDrawCellAfterRow(r);
64368
64442
  break;
64369
64443
  }
@@ -64387,7 +64461,7 @@ var DrawPageTable = /*#__PURE__*/function (_DrawRect) {
64387
64461
 
64388
64462
  if (isEmptyRow) {
64389
64463
  if (r >= this._startRow) {
64390
- var aRowHeight = Math.max(this._table.rowInfos[r].rowHeight, _editor_dom_treeNode_TableNode__WEBPACK_IMPORTED_MODULE_9__/* .gDefaultRowHeight */ .dT);
64464
+ var aRowHeight = Math.max(this._table.rowInfos[r].rowHeight, _editor_dom_treeNode_TableNode__WEBPACK_IMPORTED_MODULE_11__/* .gDefaultRowHeight */ .dT);
64391
64465
 
64392
64466
  this._partRowHeights.set(r, aRowHeight);
64393
64467
 
@@ -64435,7 +64509,7 @@ var DrawPageTable = /*#__PURE__*/function (_DrawRect) {
64435
64509
 
64436
64510
  if (partCellindex === _cell2.drawCell.drawPageCells.length - 1) {
64437
64511
  bRowHeightChanged = true;
64438
- dPartCell = new _DrawPageCell__WEBPACK_IMPORTED_MODULE_12__/* .DrawPageCell */ .k(this.table.hoEditorFactoryID, this, _cell2, aleft, cellRowTop, awidth, rowRestHeight, partCellindex + 1, startChildIndex, cellMaxHeight);
64512
+ dPartCell = new _DrawPageCell__WEBPACK_IMPORTED_MODULE_14__/* .DrawPageCell */ .k(this.table.hoEditorFactoryID, this, _cell2, aleft, cellRowTop, awidth, rowRestHeight, partCellindex + 1, startChildIndex, cellMaxHeight);
64439
64513
 
64440
64514
  _cell2.drawCell.drawPageCells.push(dPartCell);
64441
64515
 
@@ -64601,7 +64675,7 @@ var DrawPageTable = /*#__PURE__*/function (_DrawRect) {
64601
64675
  }]);
64602
64676
 
64603
64677
  return DrawPageTable;
64604
- }(_DrawRect__WEBPACK_IMPORTED_MODULE_13__/* .DrawRect */ .t);
64678
+ }(_DrawRect__WEBPACK_IMPORTED_MODULE_15__/* .DrawRect */ .t);
64605
64679
 
64606
64680
  /***/ }),
64607
64681
 
@@ -76515,8 +76589,8 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
76515
76589
  var _tmp = _this.getPrevNodeDomRange(Anode); //1.移动光标
76516
76590
 
76517
76591
 
76518
- _this.MoveCaret(_tmp.endPath); //2.删除内容
76519
-
76592
+ hoEditorFactory.docTree.curDomRange = new _dom_DomRange__WEBPACK_IMPORTED_MODULE_18__/* .DomRange */ .a(_this._hoEditorFactoryID, _tmp.endPath, _tmp.endPath); // this.MoveCaret(tmp.endPath);
76593
+ //2.删除内容
76520
76594
 
76521
76595
  info[0] = 1;
76522
76596
  info[1] = _tmp;
@@ -76524,7 +76598,7 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
76524
76598
  //移动光标到文本域外
76525
76599
  var _tmp2 = _this.getPrevNodeDomRange(Anode);
76526
76600
 
76527
- _this.MoveCaret(_tmp2.endPath);
76601
+ hoEditorFactory.docTree.curDomRange = new _dom_DomRange__WEBPACK_IMPORTED_MODULE_18__/* .DomRange */ .a(_this._hoEditorFactoryID, _tmp2.endPath, _tmp2.endPath); // this.MoveCaret(tmp.endPath);
76528
76602
 
76529
76603
  info[0] = 2;
76530
76604
  info[1] = _tmp2;
@@ -213848,9 +213922,9 @@ var es_string_match = __webpack_require__(4723);
213848
213922
  var es_number_constructor = __webpack_require__(9653);
213849
213923
  // EXTERNAL MODULE: ./node_modules/core-js/modules/es.json.stringify.js
213850
213924
  var es_json_stringify = __webpack_require__(38862);
213851
- ;// 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/HoDoc.vue?vue&type=template&id=44f9ba19&
213852
- var HoDocvue_type_template_id_44f9ba19_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{class:_vm.docClassNames},[_c('div',{ref:"editorArea",staticClass:"editors"},[(_vm.drawPageLength > 0)?_c('div',{staticClass:"editor",on:{"click":function($event){return _vm.setActiveDocIndex(_vm.hoEditorId)}}},[_vm._l((_vm.drawPageCount.count),function(pgIndex){return [_c('HoPage',{key:pgIndex - 1,attrs:{"data-id":pgIndex - 1,"index":pgIndex - 1,"docIndex":_vm.docIndex,"canvasWidth":_vm.canvasParams.width,"canvasHeight":_vm.canvasParams.height,"currentActivePages":_vm.activePageIndex.index,"hoEditorId":_vm.hoEditorId,"hoEditorFactoryIdList":_vm.hoEditorFactoryIdList,"mouseMoveNodes":_vm.mouseMoveNodes,"viewableAreaObserver":_vm.viewableAreaObserver,"inViewPages":_vm.inViewPages,"canvasHeadFootPos":_vm.canvasHeadFootPos,"poperTipPos":_vm.poperTipPos,"textStyle":_vm.textStyle,"aiInfo":_vm.aiInfo},on:{"pageReady":_vm.pageReady,"canvasRightClick":_vm.mouseRightClickEvent},scopedSlots:_vm._u([{key:"hoPageHead",fn:function(){return [_vm._t("hoDocHead")]},proxy:true},{key:"hoPageFoot",fn:function(){return [_vm._t("hoDocFoot")]},proxy:true}],null,true)})]})],2):_vm._e()]),(_vm.poperType === 'datePoper' || _vm.poperType === 'selectPoper')?_c('PoperSelectModal',{attrs:{"poperType":_vm.poperType,"poperSelectList":_vm.poperSelectList,"poperPos":_vm.poperPos,"hoEditorId":_vm.hoEditorId},on:{"poperClose":_vm.poperClose}}):_vm._e(),_c('PoperMark',{directives:[{name:"show",rawName:"v-show",value:(_vm.poperType === 'datePoper' || _vm.poperType === 'selectPoper' || _vm.poperType === 'table-cell-poper'),expression:"poperType === 'datePoper' || poperType === 'selectPoper' || poperType === 'table-cell-poper'"}]}),(_vm.poperType === 'table-cell-poper')?_c('TableCellPoper',{attrs:{"poperNode":_vm.nodeValue,"poperPos":_vm.poperPos},on:{"poperClose":_vm.poperClose}}):_vm._e(),_c('HoToPage',{attrs:{"hoEditorId":_vm.hoEditorId,"inViewPages":_vm.inViewPages}}),_c('PoperTipText',{attrs:{"isPoperText":_vm.isPoperText,"poperText":_vm.poperText,"poperPos":_vm.poperTextPos},on:{"poperTextClose":_vm.poperTextClose}}),_c('ul',{directives:[{name:"click-outside",rawName:"v-click-outside",value:(function () { return (_vm.isCreateRightMenuModal = false); }),expression:"() => (isCreateRightMenuModal = false)"},{name:"show",rawName:"v-show",value:(_vm.isCreateRightMenuModal),expression:"isCreateRightMenuModal"}],ref:"rightMenuModal",staticClass:"create-right-menu"},[(_vm.showCommentsBtn)?_c('li',{staticClass:"mouse-menu-item",on:{"click":_vm.hideComments}},[_vm._v(_vm._s(_vm.isHideComments ? '显示' : '隐藏')+"批注")]):_vm._e(),(_vm.eleNode && _vm.eleNode.type == 'sign'&& _vm.currentNode.customProperty)?_c('li',{staticClass:"mouse-menu-item",on:{"click":_vm.deleteSignNode}},[_vm._v("删除签名")]):_vm._e(),_c('li',{staticClass:"mouse-menu-item"},[_vm._v(" 编辑器内核版本:   "),_c('span',{staticStyle:{"font-size":"14px","color":"#0a77e3"}},[_vm._v("v "+_vm._s(_vm.version))])])])],1)}
213853
- var HoDocvue_type_template_id_44f9ba19_staticRenderFns = []
213925
+ ;// 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/HoDoc.vue?vue&type=template&id=90f26168&
213926
+ var HoDocvue_type_template_id_90f26168_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{class:_vm.docClassNames},[_c('div',{ref:"editorArea",staticClass:"editors"},[(_vm.drawPageLength > 0)?_c('div',{staticClass:"editor",on:{"click":function($event){return _vm.setActiveDocIndex(_vm.hoEditorId)}}},[_vm._l((_vm.drawPageCount.count),function(pgIndex){return [_c('HoPage',{key:pgIndex - 1,attrs:{"data-id":pgIndex - 1,"index":pgIndex - 1,"docIndex":_vm.docIndex,"canvasWidth":_vm.canvasParams.width,"canvasHeight":_vm.canvasParams.height,"currentActivePages":_vm.activePageIndex.index,"hoEditorId":_vm.hoEditorId,"hoEditorFactoryIdList":_vm.hoEditorFactoryIdList,"mouseMoveNodes":_vm.mouseMoveNodes,"viewableAreaObserver":_vm.viewableAreaObserver,"inViewPages":_vm.inViewPages,"canvasHeadFootPos":_vm.canvasHeadFootPos,"poperTipPos":_vm.poperTipPos,"textStyle":_vm.textStyle,"aiInfo":_vm.aiInfo},on:{"pageReady":_vm.pageReady,"canvasRightClick":_vm.mouseRightClickEvent},scopedSlots:_vm._u([{key:"hoPageHead",fn:function(){return [_vm._t("hoDocHead")]},proxy:true},{key:"hoPageFoot",fn:function(){return [_vm._t("hoDocFoot")]},proxy:true}],null,true)})]})],2):_vm._e()]),(_vm.poperType === 'datePoper' || _vm.poperType === 'selectPoper')?_c('PoperSelectModal',{attrs:{"poperType":_vm.poperType,"poperSelectList":_vm.poperSelectList,"poperPos":_vm.poperPos,"hoEditorId":_vm.hoEditorId},on:{"poperClose":_vm.poperClose}}):_vm._e(),_c('PoperMark',{directives:[{name:"show",rawName:"v-show",value:(_vm.poperType === 'datePoper' || _vm.poperType === 'selectPoper' || _vm.poperType === 'table-cell-poper'),expression:"poperType === 'datePoper' || poperType === 'selectPoper' || poperType === 'table-cell-poper'"}]}),(_vm.poperType === 'table-cell-poper')?_c('TableCellPoper',{attrs:{"poperNode":_vm.nodeValue,"poperPos":_vm.poperPos},on:{"poperClose":_vm.poperClose}}):_vm._e(),_c('HoToPage',{attrs:{"hoEditorId":_vm.hoEditorId,"inViewPages":_vm.inViewPages}}),_c('PoperTipText',{attrs:{"isPoperText":_vm.isPoperText,"poperText":_vm.poperText,"poperPos":_vm.poperTextPos},on:{"poperTextClose":_vm.poperTextClose}}),_c('ul',{directives:[{name:"click-outside",rawName:"v-click-outside",value:(function () { return (_vm.isCreateRightMenuModal = false); }),expression:"() => (isCreateRightMenuModal = false)"},{name:"show",rawName:"v-show",value:(_vm.isCreateRightMenuModal),expression:"isCreateRightMenuModal"}],ref:"rightMenuModal",staticClass:"create-right-menu"},[(_vm.showCommentsBtn)?_c('li',{staticClass:"mouse-menu-item",on:{"click":_vm.hideComments}},[_vm._v(_vm._s(_vm.isHideComments ? '显示' : '隐藏')+"批注")]):_vm._e(),(_vm.currentNode && _vm.currentNode.customProperty && _vm.currentNode.signFormat )?_c('li',{staticClass:"mouse-menu-item",on:{"click":_vm.deleteSignNode}},[_vm._v("删除签名")]):_vm._e(),_c('li',{staticClass:"mouse-menu-item"},[_vm._v(" 编辑器内核版本:   "),_c('span',{staticStyle:{"font-size":"14px","color":"#0a77e3"}},[_vm._v("v "+_vm._s(_vm.version))])])])],1)}
213927
+ var HoDocvue_type_template_id_90f26168_staticRenderFns = []
213854
213928
 
213855
213929
 
213856
213930
  // EXTERNAL MODULE: ./node_modules/element-ui/lib/message-box.js
@@ -217488,7 +217562,7 @@ var SignNode = __webpack_require__(78975);
217488
217562
  // EXTERNAL MODULE: ./src/editor/dom/treeNode/ParagraphNode.ts
217489
217563
  var ParagraphNode = __webpack_require__(13880);
217490
217564
  ;// CONCATENATED MODULE: ./src/components/version.ts
217491
- /* harmony default export */ var version = ('2.0.86');
217565
+ /* harmony default export */ var version = ('2.0.88');
217492
217566
  // EXTERNAL MODULE: ./src/components/controls/poperTipText/PoperTipText.vue + 5 modules
217493
217567
  var PoperTipText = __webpack_require__(97824);
217494
217568
  ;// CONCATENATED MODULE: ./src/components/controls/poperTipText/index.ts
@@ -217821,9 +217895,10 @@ var ImageNode = __webpack_require__(23778);
217821
217895
  this.currentNode = null;
217822
217896
  this.isCreateRightMenuModal = false;
217823
217897
  return;
217824
- }
217898
+ } // hoEditorFactory.elementController.deleteNode(this.eleNode.node());
217899
+
217825
217900
 
217826
- hoEditorFactory.elementController.deleteNode(this.eleNode.node());
217901
+ hoEditorFactory.vueController.forceDelete();
217827
217902
  this.eleNode = null;
217828
217903
  this.currentNode = null;
217829
217904
  this.isCreateRightMenuModal = false;
@@ -218174,7 +218249,7 @@ var ImageNode = __webpack_require__(23778);
218174
218249
  var node = (_hoEditorFactory$vueC2 = hoEditorFactory.vueController.findNodebyPath(path)) === null || _hoEditorFactory$vueC2 === void 0 ? void 0 : _hoEditorFactory$vueC2.node;
218175
218250
  this.setRightClickNodeValue(node);
218176
218251
  this.eleNode = this.getRightClickNodeValue();
218177
- this.currentNode = this.getCurrentSelectNode();
218252
+ this.currentNode = node;
218178
218253
  var rightPosition = {
218179
218254
  clientX: e.clientX || e.pageX,
218180
218255
  clientY: e.clientY || e.pageY
@@ -218267,8 +218342,8 @@ var ImageNode = __webpack_require__(23778);
218267
218342
 
218268
218343
  var HoDoc_component = (0,componentNormalizer/* default */.Z)(
218269
218344
  components_HoDocvue_type_script_lang_js_,
218270
- HoDocvue_type_template_id_44f9ba19_render,
218271
- HoDocvue_type_template_id_44f9ba19_staticRenderFns,
218345
+ HoDocvue_type_template_id_90f26168_render,
218346
+ HoDocvue_type_template_id_90f26168_staticRenderFns,
218272
218347
  false,
218273
218348
  null,
218274
218349
  null,
@@ -218828,7 +218903,7 @@ var DrawPageTree = /*#__PURE__*/function () {
218828
218903
  drawTop = 0;
218829
218904
  }
218830
218905
 
218831
- this.update(mainArea, dMainRoots, drawTop, mainIndex, mainIndex);
218906
+ this.update(mainArea, dMainRoots, drawTop, mainIndex, mainIndex, true);
218832
218907
  } finally {
218833
218908
  // const iendDraw= hoEditorFactory.drawTree.inViewPages[hoEditorFactory.drawTree.inViewPages.length-1];
218834
218909
  // const istartDraw=hoEditorFactory.drawTree.inViewPages[0];
@@ -219076,7 +219151,7 @@ var DrawPageTree = /*#__PURE__*/function () {
219076
219151
  }, {
219077
219152
  key: "update",
219078
219153
  value: function update(drawArea, dRoots, // startDline: DrawLine | DrawPageTable,
219079
- dTop, startLine, endLine) {
219154
+ dTop, startLine, endLine, callFromPaint) {
219080
219155
  var _this2 = this;
219081
219156
 
219082
219157
  var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID);
@@ -219230,9 +219305,12 @@ var DrawPageTree = /*#__PURE__*/function () {
219230
219305
  // this._endNeedUpdatePage = -1;
219231
219306
 
219232
219307
 
219233
- hoEditorFactory.drawTree.inViewPages.forEach(function (i) {
219234
- _this2.updateDrawPage(i);
219235
- }); // }
219308
+ if (!callFromPaint) {
219309
+ hoEditorFactory.drawTree.inViewPages.forEach(function (i) {
219310
+ _this2.updateDrawPage(i);
219311
+ });
219312
+ } // }
219313
+
219236
219314
  } // if (hoEditorFactory.drawTree.paintStatus === PaintState.psReview) {
219237
219315
  // drawArea.drawComments();
219238
219316
  // }
@@ -232155,7 +232233,7 @@ var EditController = /*#__PURE__*/function () {
232155
232233
  var style = hoeditorfactory.docTree.styles[node.styleIndex];
232156
232234
 
232157
232235
  if (style.combineStyle.script != 0) {
232158
- var newStyle = style.clone();
232236
+ var newStyle = hoeditorfactory.docTree.styles[hoeditorfactory.docTree.curStyleIndex].clone();
232159
232237
  newStyle.script = style.combineStyle.script;
232160
232238
  var newStyleIndex = hoeditorfactory.docTree.styleCompare(newStyle);
232161
232239
  node.styleIndex = newStyleIndex;
@@ -241689,9 +241767,9 @@ var ToolControlvue_type_template_id_a55c0f5a_render = function () {var _vm=this;
241689
241767
  var ToolControlvue_type_template_id_a55c0f5a_staticRenderFns = []
241690
241768
 
241691
241769
 
241692
- ;// 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/toolbar/insert/HoSpecialChars.vue?vue&type=template&id=146e538d&scoped=true&
241693
- var HoSpecialCharsvue_type_template_id_146e538d_scoped_true_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('el-dropdown',{class:_vm.dropdownClassName,attrs:{"trigger":"click","placement":"bottom-start","popper-append-to-body":"","tabindex":-1},on:{"visible-change":_vm.dropdownChange}},[_c('span',{staticClass:"el-dropdown-link"},[_c('svg',{staticStyle:{"transform":"translateY(0px)"},attrs:{"viewBox":"0 0 1024 1024","version":"1.1","xmlns":"http://www.w3.org/2000/svg","width":"16","height":"16"}},[_c('path',{attrs:{"d":"M825.163595 883.651765H416.226184v-10.842353c62.162824-39.996235 99.629176-117.157647 99.629176-211.727059 0-32.768-4.999529-64.813176-12.047059-95.232H727.642654a18.432 18.432 0 0 0 18.130824-18.672941V477.605647a18.432 18.432 0 0 0-18.130824-18.612706h-254.192941c-16.263529-52.525176-30.358588-106.194824-30.358588-163.84 0-101.074824 77.101176-163.117176 198.053647-163.117176 48.790588 0 96.496941 9.517176 137.095529 24.395294 11.806118 4.457412 24.094118-4.638118 24.094118-17.648941V46.983529a18.853647 18.853647 0 0 0-11.866353-17.468235A448.752941 448.752941 0 0 0 630.904772 0c-210.823529 0-343.762824 103.424-343.762824 279.491765 0 61.138824 15.661176 120.892235 33.129412 179.2H198.776772A18.432 18.432 0 0 0 180.706184 477.304471V546.936471c0 10.24 8.192 18.612706 18.130823 18.612705H351.172066c7.710118 34.153412 13.372235 68.306824 13.372235 102.701177 0 105.050353-65.355294 193.536-165.165176 218.895059a18.552471 18.552471 0 0 0-13.854118 18.070588v89.509647c0 10.24 8.192 18.612706 18.130824 18.612706H825.223831a18.432 18.432 0 0 0 18.130823-18.672941V902.324706a18.432 18.432 0 0 0-18.130823-18.672941z"}})]),_c('span',[_vm._v("特殊字符")]),_c('i',{staticClass:"el-icon-arrow-down el-icon--right"})]),_c('el-dropdown-menu',{attrs:{"slot":"dropdown"},slot:"dropdown"},[_c('el-dropdown-item',{staticClass:"special-characters",attrs:{"disabled":""}},[_c('section',[_c('ul',[_c('li',[_c('header',[_vm._v("特殊字符")]),_c('p',{staticClass:"chars-list special-chars-list"},_vm._l((_vm.specialChars),function(chars){return _c('span',{key:chars,on:{"click":function($event){return _vm.specialCharsClick(chars)}}},[_vm._v(_vm._s(chars))])}),0)]),_c('li',[_c('header',[_vm._v("罗马字符")]),_c('p',{staticClass:"chars-list"},_vm._l((_vm.romanChars),function(chars){return _c('span',{key:chars,on:{"click":function($event){return _vm.specialCharsClick(chars)}}},[_vm._v(_vm._s(chars))])}),0)]),_c('li',[_c('header',[_vm._v("数学字符")]),_c('p',{staticClass:"chars-list"},_vm._l((_vm.mathChars),function(chars){return _c('span',{key:chars,on:{"click":function($event){return _vm.specialCharsClick(chars)}}},[_vm._v(_vm._s(chars))])}),0)])])])])],1)],1)}
241694
- var HoSpecialCharsvue_type_template_id_146e538d_scoped_true_staticRenderFns = []
241770
+ ;// 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/toolbar/insert/HoSpecialChars.vue?vue&type=template&id=463b09d0&scoped=true&
241771
+ var HoSpecialCharsvue_type_template_id_463b09d0_scoped_true_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('el-dropdown',{class:_vm.dropdownClassName,attrs:{"trigger":"click","placement":"bottom-start","popper-append-to-body":"","tabindex":-1},on:{"visible-change":_vm.dropdownChange}},[_c('span',{staticClass:"el-dropdown-link"},[_c('svg',{staticStyle:{"transform":"translateY(0px)"},attrs:{"viewBox":"0 0 1024 1024","version":"1.1","xmlns":"http://www.w3.org/2000/svg","width":"16","height":"16"}},[_c('path',{attrs:{"d":"M825.163595 883.651765H416.226184v-10.842353c62.162824-39.996235 99.629176-117.157647 99.629176-211.727059 0-32.768-4.999529-64.813176-12.047059-95.232H727.642654a18.432 18.432 0 0 0 18.130824-18.672941V477.605647a18.432 18.432 0 0 0-18.130824-18.612706h-254.192941c-16.263529-52.525176-30.358588-106.194824-30.358588-163.84 0-101.074824 77.101176-163.117176 198.053647-163.117176 48.790588 0 96.496941 9.517176 137.095529 24.395294 11.806118 4.457412 24.094118-4.638118 24.094118-17.648941V46.983529a18.853647 18.853647 0 0 0-11.866353-17.468235A448.752941 448.752941 0 0 0 630.904772 0c-210.823529 0-343.762824 103.424-343.762824 279.491765 0 61.138824 15.661176 120.892235 33.129412 179.2H198.776772A18.432 18.432 0 0 0 180.706184 477.304471V546.936471c0 10.24 8.192 18.612706 18.130823 18.612705H351.172066c7.710118 34.153412 13.372235 68.306824 13.372235 102.701177 0 105.050353-65.355294 193.536-165.165176 218.895059a18.552471 18.552471 0 0 0-13.854118 18.070588v89.509647c0 10.24 8.192 18.612706 18.130824 18.612706H825.223831a18.432 18.432 0 0 0 18.130823-18.672941V902.324706a18.432 18.432 0 0 0-18.130823-18.672941z"}})]),_c('span',[_vm._v("特殊字符")]),_c('i',{staticClass:"el-icon-arrow-down el-icon--right"})]),_c('el-dropdown-menu',{attrs:{"slot":"dropdown"},slot:"dropdown"},[_c('el-dropdown-item',{staticClass:"special-characters",attrs:{"disabled":""}},[_c('section',[_c('ul',[_c('li',[_c('header',[_vm._v("特殊字符")]),_c('p',{staticClass:"chars-list special-chars-list"},_vm._l((_vm.specialChars),function(chars){return _c('span',{key:chars,on:{"click":function($event){return _vm.specialCharsClick(chars)}}},[_vm._v(_vm._s(chars))])}),0)]),_c('li',[_c('header',[_vm._v("罗马字符")]),_c('p',{staticClass:"chars-list"},_vm._l((_vm.romanChars),function(chars){return _c('span',{key:chars,on:{"click":function($event){return _vm.specialCharsClick(chars)}}},[_vm._v(_vm._s(chars))])}),0)]),_c('li',[_c('header',[_vm._v("数学字符")]),_c('p',{staticClass:"chars-list"},_vm._l((_vm.mathChars),function(chars){return _c('span',{key:chars,on:{"click":function($event){return _vm.specialCharsClick(chars)}}},[_vm._v(_vm._s(chars))])}),0)])])])])],1)],1)}
241772
+ var HoSpecialCharsvue_type_template_id_463b09d0_scoped_true_staticRenderFns = []
241695
241773
 
241696
241774
 
241697
241775
  ;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-83[0].rules[0].use[0]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/toolbar/insert/HoSpecialChars.vue?vue&type=script&lang=js&
@@ -241758,7 +241836,7 @@ var HoSpecialCharsvue_type_template_id_146e538d_scoped_true_staticRenderFns = []
241758
241836
  arrChars: ['㎎', '㎏', '㎜', '㎝', '㎞', '㎡', '㏄', '㏎', '㏑', '㏒', '㏕', '℡'],
241759
241837
  specialChars: ['、', '。', '·', 'ˉ', 'ˇ', '¨', '〃', '々', '—', '~', '‖', '…', '‘', '’', '“', '”', '〔', '〕', '〈', '〉', '《', '》', '「', '」', '『', '』', '±', '×', '÷', '∶', '∧', '∨', '∑', '∏', '∪', '∩', '∈', 'α', 'β', 'γ', '∷', '√', '⊥', '∥', '∠', '⌒', '⊙', '∫', '∮', '≡', '≌', '≈', '∽', '∝', '≠', '≮', '≯', '≤', '≥', '∞', '∵', '∴', '♂', '♀', '°', '′', '″', '℃', '$', '¤', '¢', '£', '‰', '§', '№', '※', '→', '←', '↑', '↓', '㎎', '㎏', '㎜', '㎝', '㎞', '㎡', '㏄', '㏎', '㏑', '㏒', '㏕', '℡', '▽', '△', '▷', '◁', '/', '∕'],
241760
241838
  romanChars: ['ⅰ', 'ⅱ', 'ⅲ', 'ⅳ', 'ⅴ', 'ⅵ', 'ⅶ', 'ⅷ', 'ⅸ', 'ⅹ', 'Ⅰ', 'Ⅱ', 'Ⅲ', 'Ⅳ', 'Ⅴ', 'Ⅵ', 'Ⅶ', 'Ⅷ', 'Ⅸ', 'Ⅹ', 'Ⅺ', 'Ⅻ'],
241761
- //mathChars: [],
241839
+ usedChars: [],
241762
241840
  mathChars: ['⒈', '⒉', '⒊', '⒋', '⒌', '⒍', '⒎', '⒏', '⒐', '⒑', '⒒', '⒓', '⒔', '⒕', '⒖', '⒗', '⒘', '⒙', '⒚', '⒛', '⑴', '⑵', '⑶', '⑷', '⑸', '⑹', '⑺', '⑻', '⑼', '⑽', '⑾', '⑿', '⒀', '⒁', '⒂', '⒃', '⒄', '⒅', '⒆', '⒇', '①', '②', '③', '④', '⑤', '⑥', '⑦', '⑧', '⑨', '⑩', '㈠', '㈡', '㈢', '㈣', '㈤', '㈥', '㈦', '㈧', '㈨', '㈩']
241763
241841
  };
241764
241842
  },
@@ -241790,10 +241868,10 @@ var HoSpecialCharsvue_type_template_id_146e538d_scoped_true_staticRenderFns = []
241790
241868
  });
241791
241869
  ;// CONCATENATED MODULE: ./src/components/toolbar/insert/HoSpecialChars.vue?vue&type=script&lang=js&
241792
241870
  /* harmony default export */ var insert_HoSpecialCharsvue_type_script_lang_js_ = (HoSpecialCharsvue_type_script_lang_js_);
241793
- ;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-65[0].rules[0].use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-65[0].rules[0].use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-65[0].rules[0].use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-65[0].rules[0].use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/toolbar/insert/HoSpecialChars.vue?vue&type=style&index=0&id=146e538d&lang=scss&scoped=true&
241871
+ ;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-65[0].rules[0].use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-65[0].rules[0].use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-65[0].rules[0].use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-65[0].rules[0].use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/toolbar/insert/HoSpecialChars.vue?vue&type=style&index=0&id=463b09d0&lang=scss&scoped=true&
241794
241872
  // extracted by mini-css-extract-plugin
241795
241873
 
241796
- ;// CONCATENATED MODULE: ./src/components/toolbar/insert/HoSpecialChars.vue?vue&type=style&index=0&id=146e538d&lang=scss&scoped=true&
241874
+ ;// CONCATENATED MODULE: ./src/components/toolbar/insert/HoSpecialChars.vue?vue&type=style&index=0&id=463b09d0&lang=scss&scoped=true&
241797
241875
 
241798
241876
  ;// CONCATENATED MODULE: ./src/components/toolbar/insert/HoSpecialChars.vue
241799
241877
 
@@ -241806,11 +241884,11 @@ var HoSpecialCharsvue_type_template_id_146e538d_scoped_true_staticRenderFns = []
241806
241884
 
241807
241885
  var HoSpecialChars_component = (0,componentNormalizer/* default */.Z)(
241808
241886
  insert_HoSpecialCharsvue_type_script_lang_js_,
241809
- HoSpecialCharsvue_type_template_id_146e538d_scoped_true_render,
241810
- HoSpecialCharsvue_type_template_id_146e538d_scoped_true_staticRenderFns,
241887
+ HoSpecialCharsvue_type_template_id_463b09d0_scoped_true_render,
241888
+ HoSpecialCharsvue_type_template_id_463b09d0_scoped_true_staticRenderFns,
241811
241889
  false,
241812
241890
  null,
241813
- "146e538d",
241891
+ "463b09d0",
241814
241892
  null
241815
241893
 
241816
241894
  )