hoeditor-web 2.0.67 → 2.0.68

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. package/lib/hoeditor.common.js +29 -17
  2. package/lib/hoeditor.umd.js +29 -17
  3. package/lib/hoeditor.umd.min.js +2 -2
  4. package/package.json +1 -1
package/lib/hoeditor.common.js CHANGED
@@ -46077,6 +46077,7 @@ var DrawCell = /*#__PURE__*/function (_DrawRect) {
46077
46077
  dParent.addChild(dPartCell);
46078
46078
  this.drawPageCells.push(dPartCell);
46079
46079
  dPartCell.paintArea(this._drawLines, startDline, valignTop);
46080
+ dPartCell.valignTop = valignTop;
46080
46081
  ret = this._drawLines[this._drawLines.length - 1].dHeight + this._drawLines[this._drawLines.length - 1].dTop;
46081
46082
  }
46082
46083
  }, {
@@ -48269,7 +48270,7 @@ var DrawPageCell = /*#__PURE__*/function (_DrawArea) {
48269
48270
 
48270
48271
 
48271
48272
  return _this;
48272
- } // public get pageIndex(): number {
48273
+ } // public ge t pageIndex(): number {
48273
48274
  // return this._pageIndex;
48274
48275
  // }
48275
48276
  // public set pageIndex(value: number) {
@@ -48320,6 +48321,9 @@ var DrawPageCell = /*#__PURE__*/function (_DrawArea) {
48320
48321
  key: "valignTop",
48321
48322
  get: function get() {
48322
48323
  return this._valignTop;
48324
+ },
48325
+ set: function set(val) {
48326
+ this._valignTop = val;
48323
48327
  } // public get dPage(): DrawPage {
48324
48328
  // return this._dPage;
48325
48329
  // }
@@ -48789,7 +48793,7 @@ var DrawPageCell = /*#__PURE__*/function (_DrawArea) {
48789
48793
  var adjustValignTop = newValignTop - this._valignTop;
48790
48794
  this._valignTop = newValignTop;
48791
48795
 
48792
- for (var i = 0; i < this.numChildren - 1; i++) {
48796
+ for (var i = 0; i < this.numChildren; i++) {
48793
48797
  if (this.children[i] instanceof DrawLine/* DrawLine */.a || this.children[i] instanceof DrawPageTable/* DrawPageTable */.ox) {
48794
48798
  this.children[i].y += adjustValignTop;
48795
48799
  }
@@ -48832,12 +48836,10 @@ var DrawPageCell = /*#__PURE__*/function (_DrawArea) {
48832
48836
  }, {
48833
48837
  key: "update",
48834
48838
  value: function update(prevDrawArea, dlines, startIndex, dTop, restHeight) {
48835
- var valignTop = dTop;
48836
-
48837
- if (startIndex === 0) {
48838
- valignTop = this.calcValignTop();
48839
- this._valignTop = valignTop;
48840
- }
48839
+ var valignTop = dTop; // if (startIndex === 0) {
48840
+ // valignTop=this.calcValignTop();
48841
+ // this._valignTop=valignTop;
48842
+ // }
48841
48843
 
48842
48844
  this._startDline = startIndex;
48843
48845
 
@@ -49433,7 +49435,7 @@ var DrawPageTable = /*#__PURE__*/function (_DrawRect) {
49433
49435
 
49434
49436
  partCell.dHeight = newHeight;
49435
49437
  partCell.maxHeight = newHeight;
49436
- partCell.update(dPrevPartCell, partCell.cell.drawCell.drawLines, startChildIndex, 0, newHeight);
49438
+ partCell.update(dPrevPartCell, partCell.cell.drawCell.drawLines, startChildIndex, partCell.valignTop, newHeight);
49437
49439
  dPageTable.paintCellBorder(partCell, r, c, newHeight);
49438
49440
  }
49439
49441
  }, {
@@ -49924,7 +49926,7 @@ var DrawPageTable = /*#__PURE__*/function (_DrawRect) {
49924
49926
  dPartCell.x = aleft; //this.drawItems.push(dPartCell);
49925
49927
 
49926
49928
  this.addChild(dPartCell);
49927
- var ret = dPartCell.update(dPrevPartCell, cell.drawCell.drawLines, startChildIndex, 0, cellMaxHeight);
49929
+ var ret = dPartCell.update(dPrevPartCell, cell.drawCell.drawLines, startChildIndex, dPartCell.valignTop, cellMaxHeight);
49928
49930
  dPartCell.y = cellRowTop;
49929
49931
  } else {
49930
49932
  dPartCell = cell.drawCell.drawPageCells[partCellindex + 1];
@@ -49948,7 +49950,7 @@ var DrawPageTable = /*#__PURE__*/function (_DrawRect) {
49948
49950
  dPartCell.maxHeight = tableRestHeight - cellRowTop;
49949
49951
  }
49950
49952
 
49951
- var _ret = dPartCell.update(dPrevPartCell, cell.drawCell.drawLines, startChildIndex, 0, cellMaxHeight);
49953
+ var _ret = dPartCell.update(dPrevPartCell, cell.drawCell.drawLines, startChildIndex, dPartCell.valignTop, cellMaxHeight);
49952
49954
  }
49953
49955
 
49954
49956
  dPartCell.y = cellRowTop;
@@ -50154,7 +50156,13 @@ var DrawPageTable = /*#__PURE__*/function (_DrawRect) {
50154
50156
  var partCell = mainCell.drawCell.getDrawPageCell(this);
50155
50157
 
50156
50158
  if (partCell && aHeight) {
50157
- rowHeight = Math.max(aHeight, partCell.docHeight);
50159
+ var cellHeight = aHeight;
50160
+
50161
+ if (mainCell.rowSpan > 1) {
50162
+ cellHeight = partCell.dHeight;
50163
+ }
50164
+
50165
+ rowHeight = Math.max(cellHeight, partCell.docHeight);
50158
50166
  rowSpan = mainCell.rowSpan;
50159
50167
  }
50160
50168
  }
@@ -50477,7 +50485,7 @@ var DrawPageTable = /*#__PURE__*/function (_DrawRect) {
50477
50485
  dPartCell.x = aleft; //this.drawItems.push(dPartCell);
50478
50486
 
50479
50487
  this.addChild(dPartCell);
50480
- var ret = dPartCell.update(dPrevPartCell, _cell2.drawCell.drawLines, startChildIndex, 0, cellMaxHeight);
50488
+ var ret = dPartCell.update(dPrevPartCell, _cell2.drawCell.drawLines, startChildIndex, dPartCell.valignTop, cellMaxHeight);
50481
50489
  dPartCell.y = cellRowTop;
50482
50490
  rowFinished = rowFinished && ret;
50483
50491
  } else {
@@ -50507,7 +50515,7 @@ var DrawPageTable = /*#__PURE__*/function (_DrawRect) {
50507
50515
 
50508
50516
  bRowHeightChanged = true;
50509
50517
 
50510
- var _ret2 = dPartCell.update(dPrevPartCell, _cell2.drawCell.drawLines, startChildIndex, 0, cellMaxHeight);
50518
+ var _ret2 = dPartCell.update(dPrevPartCell, _cell2.drawCell.drawLines, startChildIndex, dPartCell.valignTop, cellMaxHeight);
50511
50519
 
50512
50520
  rowFinished = rowFinished && _ret2;
50513
50521
  } else if (_cell2.drawCell.drawPageCells.length > 1 && partCellindex + 1 < _cell2.drawCell.drawPageCells.length - 1 && !this._table.rowInfos[r].rowProperty.repeatAsTitleAtPageTop) {
@@ -223827,6 +223835,7 @@ var PrintController = /*#__PURE__*/function () {
223827
223835
  hoEditorFactory.drawTree.paintStatus = DrawTree/* PaintState.psPreview */.Dh.psPreview;
223828
223836
  xmlIndex = -1;
223829
223837
  mergeList = [];
223838
+ continuousid = '';
223830
223839
  options = {
223831
223840
  unit: 'px',
223832
223841
  hotfixes: ['px_scaling'],
@@ -223878,6 +223887,10 @@ var PrintController = /*#__PURE__*/function () {
223878
223887
  position = {};
223879
223888
  }
223880
223889
 
223890
+ if (continuousid && xmlList[xmlIndex][2] !== continuousid) {
223891
+ mergeList = [];
223892
+ }
223893
+
223881
223894
  continuousid = xmlList[xmlIndex][2];
223882
223895
  mergeList.push([xmlList[xmlIndex][1], xmlList[xmlIndex][0]]);
223883
223896
 
@@ -223889,14 +223902,13 @@ var PrintController = /*#__PURE__*/function () {
223889
223902
  } else {
223890
223903
  hoEditorFactory.loadImageCallback = toPrint;
223891
223904
  }
223892
-
223893
- mergeList = [];
223894
223905
  });
223895
223906
  } else {
223896
223907
  createSvg();
223897
223908
  }
223898
223909
  } else {
223899
223910
  mergeList = [];
223911
+ continuousid = '';
223900
223912
  Promise.all([hoEditorFactory.vueController.openXml(xmlList[xmlIndex][0])]).then(function () {
223901
223913
  if (hoEditorFactory.loadImageCount === 0) {
223902
223914
  toPrint();
@@ -223932,7 +223944,7 @@ var PrintController = /*#__PURE__*/function () {
223932
223944
 
223933
223945
  createSvg();
223934
223946
 
223935
- case 13:
223947
+ case 14:
223936
223948
  case "end":
223937
223949
  return _context8.stop();
223938
223950
  }
package/lib/hoeditor.umd.js CHANGED
@@ -46087,6 +46087,7 @@ var DrawCell = /*#__PURE__*/function (_DrawRect) {
46087
46087
  dParent.addChild(dPartCell);
46088
46088
  this.drawPageCells.push(dPartCell);
46089
46089
  dPartCell.paintArea(this._drawLines, startDline, valignTop);
46090
+ dPartCell.valignTop = valignTop;
46090
46091
  ret = this._drawLines[this._drawLines.length - 1].dHeight + this._drawLines[this._drawLines.length - 1].dTop;
46091
46092
  }
46092
46093
  }, {
@@ -48279,7 +48280,7 @@ var DrawPageCell = /*#__PURE__*/function (_DrawArea) {
48279
48280
 
48280
48281
 
48281
48282
  return _this;
48282
- } // public get pageIndex(): number {
48283
+ } // public ge t pageIndex(): number {
48283
48284
  // return this._pageIndex;
48284
48285
  // }
48285
48286
  // public set pageIndex(value: number) {
@@ -48330,6 +48331,9 @@ var DrawPageCell = /*#__PURE__*/function (_DrawArea) {
48330
48331
  key: "valignTop",
48331
48332
  get: function get() {
48332
48333
  return this._valignTop;
48334
+ },
48335
+ set: function set(val) {
48336
+ this._valignTop = val;
48333
48337
  } // public get dPage(): DrawPage {
48334
48338
  // return this._dPage;
48335
48339
  // }
@@ -48799,7 +48803,7 @@ var DrawPageCell = /*#__PURE__*/function (_DrawArea) {
48799
48803
  var adjustValignTop = newValignTop - this._valignTop;
48800
48804
  this._valignTop = newValignTop;
48801
48805
 
48802
- for (var i = 0; i < this.numChildren - 1; i++) {
48806
+ for (var i = 0; i < this.numChildren; i++) {
48803
48807
  if (this.children[i] instanceof DrawLine/* DrawLine */.a || this.children[i] instanceof DrawPageTable/* DrawPageTable */.ox) {
48804
48808
  this.children[i].y += adjustValignTop;
48805
48809
  }
@@ -48842,12 +48846,10 @@ var DrawPageCell = /*#__PURE__*/function (_DrawArea) {
48842
48846
  }, {
48843
48847
  key: "update",
48844
48848
  value: function update(prevDrawArea, dlines, startIndex, dTop, restHeight) {
48845
- var valignTop = dTop;
48846
-
48847
- if (startIndex === 0) {
48848
- valignTop = this.calcValignTop();
48849
- this._valignTop = valignTop;
48850
- }
48849
+ var valignTop = dTop; // if (startIndex === 0) {
48850
+ // valignTop=this.calcValignTop();
48851
+ // this._valignTop=valignTop;
48852
+ // }
48851
48853
 
48852
48854
  this._startDline = startIndex;
48853
48855
 
@@ -49443,7 +49445,7 @@ var DrawPageTable = /*#__PURE__*/function (_DrawRect) {
49443
49445
 
49444
49446
  partCell.dHeight = newHeight;
49445
49447
  partCell.maxHeight = newHeight;
49446
- partCell.update(dPrevPartCell, partCell.cell.drawCell.drawLines, startChildIndex, 0, newHeight);
49448
+ partCell.update(dPrevPartCell, partCell.cell.drawCell.drawLines, startChildIndex, partCell.valignTop, newHeight);
49447
49449
  dPageTable.paintCellBorder(partCell, r, c, newHeight);
49448
49450
  }
49449
49451
  }, {
@@ -49934,7 +49936,7 @@ var DrawPageTable = /*#__PURE__*/function (_DrawRect) {
49934
49936
  dPartCell.x = aleft; //this.drawItems.push(dPartCell);
49935
49937
 
49936
49938
  this.addChild(dPartCell);
49937
- var ret = dPartCell.update(dPrevPartCell, cell.drawCell.drawLines, startChildIndex, 0, cellMaxHeight);
49939
+ var ret = dPartCell.update(dPrevPartCell, cell.drawCell.drawLines, startChildIndex, dPartCell.valignTop, cellMaxHeight);
49938
49940
  dPartCell.y = cellRowTop;
49939
49941
  } else {
49940
49942
  dPartCell = cell.drawCell.drawPageCells[partCellindex + 1];
@@ -49958,7 +49960,7 @@ var DrawPageTable = /*#__PURE__*/function (_DrawRect) {
49958
49960
  dPartCell.maxHeight = tableRestHeight - cellRowTop;
49959
49961
  }
49960
49962
 
49961
- var _ret = dPartCell.update(dPrevPartCell, cell.drawCell.drawLines, startChildIndex, 0, cellMaxHeight);
49963
+ var _ret = dPartCell.update(dPrevPartCell, cell.drawCell.drawLines, startChildIndex, dPartCell.valignTop, cellMaxHeight);
49962
49964
  }
49963
49965
 
49964
49966
  dPartCell.y = cellRowTop;
@@ -50164,7 +50166,13 @@ var DrawPageTable = /*#__PURE__*/function (_DrawRect) {
50164
50166
  var partCell = mainCell.drawCell.getDrawPageCell(this);
50165
50167
 
50166
50168
  if (partCell && aHeight) {
50167
- rowHeight = Math.max(aHeight, partCell.docHeight);
50169
+ var cellHeight = aHeight;
50170
+
50171
+ if (mainCell.rowSpan > 1) {
50172
+ cellHeight = partCell.dHeight;
50173
+ }
50174
+
50175
+ rowHeight = Math.max(cellHeight, partCell.docHeight);
50168
50176
  rowSpan = mainCell.rowSpan;
50169
50177
  }
50170
50178
  }
@@ -50487,7 +50495,7 @@ var DrawPageTable = /*#__PURE__*/function (_DrawRect) {
50487
50495
  dPartCell.x = aleft; //this.drawItems.push(dPartCell);
50488
50496
 
50489
50497
  this.addChild(dPartCell);
50490
- var ret = dPartCell.update(dPrevPartCell, _cell2.drawCell.drawLines, startChildIndex, 0, cellMaxHeight);
50498
+ var ret = dPartCell.update(dPrevPartCell, _cell2.drawCell.drawLines, startChildIndex, dPartCell.valignTop, cellMaxHeight);
50491
50499
  dPartCell.y = cellRowTop;
50492
50500
  rowFinished = rowFinished && ret;
50493
50501
  } else {
@@ -50517,7 +50525,7 @@ var DrawPageTable = /*#__PURE__*/function (_DrawRect) {
50517
50525
 
50518
50526
  bRowHeightChanged = true;
50519
50527
 
50520
- var _ret2 = dPartCell.update(dPrevPartCell, _cell2.drawCell.drawLines, startChildIndex, 0, cellMaxHeight);
50528
+ var _ret2 = dPartCell.update(dPrevPartCell, _cell2.drawCell.drawLines, startChildIndex, dPartCell.valignTop, cellMaxHeight);
50521
50529
 
50522
50530
  rowFinished = rowFinished && _ret2;
50523
50531
  } else if (_cell2.drawCell.drawPageCells.length > 1 && partCellindex + 1 < _cell2.drawCell.drawPageCells.length - 1 && !this._table.rowInfos[r].rowProperty.repeatAsTitleAtPageTop) {
@@ -223837,6 +223845,7 @@ var PrintController = /*#__PURE__*/function () {
223837
223845
  hoEditorFactory.drawTree.paintStatus = DrawTree/* PaintState.psPreview */.Dh.psPreview;
223838
223846
  xmlIndex = -1;
223839
223847
  mergeList = [];
223848
+ continuousid = '';
223840
223849
  options = {
223841
223850
  unit: 'px',
223842
223851
  hotfixes: ['px_scaling'],
@@ -223888,6 +223897,10 @@ var PrintController = /*#__PURE__*/function () {
223888
223897
  position = {};
223889
223898
  }
223890
223899
 
223900
+ if (continuousid && xmlList[xmlIndex][2] !== continuousid) {
223901
+ mergeList = [];
223902
+ }
223903
+
223891
223904
  continuousid = xmlList[xmlIndex][2];
223892
223905
  mergeList.push([xmlList[xmlIndex][1], xmlList[xmlIndex][0]]);
223893
223906
 
@@ -223899,14 +223912,13 @@ var PrintController = /*#__PURE__*/function () {
223899
223912
  } else {
223900
223913
  hoEditorFactory.loadImageCallback = toPrint;
223901
223914
  }
223902
-
223903
- mergeList = [];
223904
223915
  });
223905
223916
  } else {
223906
223917
  createSvg();
223907
223918
  }
223908
223919
  } else {
223909
223920
  mergeList = [];
223921
+ continuousid = '';
223910
223922
  Promise.all([hoEditorFactory.vueController.openXml(xmlList[xmlIndex][0])]).then(function () {
223911
223923
  if (hoEditorFactory.loadImageCount === 0) {
223912
223924
  toPrint();
@@ -223942,7 +223954,7 @@ var PrintController = /*#__PURE__*/function () {
223942
223954
 
223943
223955
  createSvg();
223944
223956
 
223945
- case 13:
223957
+ case 14:
223946
223958
  case "end":
223947
223959
  return _context8.stop();
223948
223960
  }