hoeditor-web 3.3.3-beta.16 → 3.3.3-beta.18

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.
package/lib/hoeditor.mjs CHANGED
@@ -1,5 +1,5 @@
1
1
  import "vue";
2
- import { H as i, d as r, b as e, a as l, e as t, T as H, f as d, i as f } from "./index-Cy8mLq0t.mjs";
2
+ import { H as i, d as r, b as e, a as l, e as t, T as H, f as d, i as f } from "./index-CPX-XsP5.mjs";
3
3
  export {
4
4
  i as HoDocs,
5
5
  r as HoEditorProvide,
@@ -4590,9 +4590,13 @@ class Caret {
4590
4590
  * @param y y坐标
4591
4591
  */
4592
4592
  moveTo(t, r, o) {
4593
- this.div_cursor.className = "", this.x = r * DrawConfig.instance().scaleXY, this.y = o * DrawConfig.instance().scaleXY, this._aiInfo && (this._aiInfo.x = r * DrawConfig.instance().scaleXY, this._aiInfo.y = o * DrawConfig.instance().scaleXY, this._aiInfo.pageIndex = t, this._aiInfo.height = this._height), this.div_cursor.style.left = r * DrawConfig.instance().scaleXY + "px", this.div_cursor.style.top = o * DrawConfig.instance().scaleXY + "px", this.div_cursor.style.opacity = "1", setTimeout(() => {
4594
- this.updateCaret(), this.setPage(t);
4595
- }, 300);
4593
+ this.div_cursor.className = "", this.x = r * DrawConfig.instance().scaleXY, this.y = o * DrawConfig.instance().scaleXY, this._aiInfo && (this._aiInfo.x = r * DrawConfig.instance().scaleXY, this._aiInfo.y = o * DrawConfig.instance().scaleXY, this._aiInfo.pageIndex = t, this._aiInfo.height = this._height), this.div_cursor.style.left = r * DrawConfig.instance().scaleXY + "px", this.div_cursor.style.top = o * DrawConfig.instance().scaleXY + "px", this.div_cursor.style.opacity = "1";
4594
+ try {
4595
+ setTimeout(() => {
4596
+ this.updateCaret(), this.setPage(t);
4597
+ }, 300);
4598
+ } catch {
4599
+ }
4596
4600
  }
4597
4601
  }
4598
4602
  var OperType = /* @__PURE__ */ ((a) => (a[a.keyBoardInput = 0] = "keyBoardInput", a[a.keyBoardDelete = 1] = "keyBoardDelete", a[a.fontFormat = 2] = "fontFormat", a[a.fontSize = 3] = "fontSize", a[a.fontSizeEnlarge = 4] = "fontSizeEnlarge", a[a.fontSizeDecrease = 5] = "fontSizeDecrease", a[a.fontSuperScript = 6] = "fontSuperScript", a[a.fontSubScript = 7] = "fontSubScript", a[a.fontBold = 8] = "fontBold", a[a.fontItalic = 9] = "fontItalic", a[a.fontUnderline = 10] = "fontUnderline", a[a.fontStrikeout = 11] = "fontStrikeout", a[a.fontColor = 12] = "fontColor", a[a.fontBackColor = 13] = "fontBackColor", a[a.alignedLeft = 14] = "alignedLeft", a[a.alignedCenter = 15] = "alignedCenter", a[a.alignedRight = 16] = "alignedRight", a[a.alignedBothEnds = 17] = "alignedBothEnds", a[a.addIndent = 18] = "addIndent", a[a.decreaseIndent = 19] = "decreaseIndent", a[a.setLineHeight = 20] = "setLineHeight", a[a.insertTable = 21] = "insertTable", a[a.insertRowAbove = 22] = "insertRowAbove", a[a.insertRowBelow = 23] = "insertRowBelow", a[a.insertColLeft = 24] = "insertColLeft", a[a.insertColRight = 25] = "insertColRight", a[a.tableDeleteRows = 26] = "tableDeleteRows", a[a.tableDeleteCols = 27] = "tableDeleteCols", a[a.tableMergerCells = 28] = "tableMergerCells", a[a.tableUnMergerCells = 29] = "tableUnMergerCells", a[a.insertMedicalExpression = 30] = "insertMedicalExpression", a[a.updateMedicalExpression = 31] = "updateMedicalExpression", a[a.insertTextInputField = 32] = "insertTextInputField", a[a.updateTextInputField = 33] = "updateTextInputField", a[a.insertImage = 34] = "insertImage", a[a.insertBarcode = 35] = "insertBarcode", a[a.updateBarcode = 36] = "updateBarcode", a[a.insertQrcode = 37] = "insertQrcode", a[a.updateQrcode = 38] = "updateQrcode", a[a.insertRadioAndCheckBox = 39] = "insertRadioAndCheckBox", a[a.updateRadioAndCheckBox = 40] = "updateRadioAndCheckBox", a[a.insertDateTime = 41] = "insertDateTime", a[a.updateDateTime = 42] = "updateDateTime", a[a.insertDownList = 43] = "insertDownList", a[a.updateDownList = 44] = "updateDownList", a[a.insertSpecialChars = 45] = "insertSpecialChars", a[a.insertPageNum = 46] = "insertPageNum", a[a.insertSeparateChar = 47] = "insertSeparateChar", a[a.newFile = 48] = "newFile", a[a.openLocalFiles = 49] = "openLocalFiles", a[a.saveAsFile = 50] = "saveAsFile", a[a.openXml = 51] = "openXml", a[a.insertComment = 52] = "insertComment", a[a.deleteComment = 53] = "deleteComment", a[a.editComment = 54] = "editComment", a[a.clearTraces = 55] = "clearTraces", a[a.insertTableFormula = 56] = "insertTableFormula", a[a.insertSign = 57] = "insertSign", a[a.insertGestation = 58] = "insertGestation", a[a.insertRareChar = 59] = "insertRareChar", a[a.insertJumpButton = 60] = "insertJumpButton", a[a.insertPopQScore = 61] = "insertPopQScore", a[a.updatePopQScore = 62] = "updatePopQScore", a[a.insertSlider = 63] = "insertSlider", a[a.insertFigure = 64] = "insertFigure", a[a.updateFigure = 65] = "updateFigure", a[a.addFirstIndent = 66] = "addFirstIndent", a[a.decreaseFirstIndent = 67] = "decreaseFirstIndent", a))(OperType || {});
@@ -11087,13 +11091,7 @@ class DrawPageTable extends DrawRect {
11087
11091
  const m = c.partRowHeights.get(p);
11088
11092
  m && (f += m.rowHeight);
11089
11093
  }
11090
- r.dHeight = f, r.maxHeight = f, r.update(
11091
- o,
11092
- r.cell.drawCell.drawLines,
11093
- l,
11094
- r.valignTop,
11095
- f
11096
- ), c.paintCellBorder(r, n, s, f);
11094
+ r.dHeight = f, r.maxHeight = f, r.update(o, r.cell.drawCell.drawLines, l, r.valignTop, f), c.paintCellBorder(r, n, s, f);
11097
11095
  }
11098
11096
  updatePartCellHeight(r, o, n, s, l, c) {
11099
11097
  let d = l;
@@ -11193,13 +11191,7 @@ class DrawPageTable extends DrawRect {
11193
11191
  const z = D.drawCell.getDrawPageCell(this._table.drawTable.drawPageTables[u - 1]);
11194
11192
  z && (k = D.drawCell.getCellRestHeight(D.drawCell.drawPageCells.indexOf(z) - 1), z.isEndLineFinished() ? z.endDline == -2 ? M = 0 : M = z.endDline + 1 : M = z.endDline);
11195
11193
  } else D.drawCell.drawPageCells.length > 0 && (D.drawCell.drawPageCells.length = 0);
11196
- I = Math.min(k, c), D.drawCell.paintCell(
11197
- this,
11198
- L,
11199
- I,
11200
- H,
11201
- M
11202
- );
11194
+ I = Math.min(k, c), D.drawCell.paintCell(this, L, I, H, M);
11203
11195
  }
11204
11196
  }
11205
11197
  if (g = Math.min(this.getAndUpdatePartRowHeight(y), c), this._endRow = y, this.updateRowPartCellHeight(y, g), s += g + m, l += g + m, c -= g + m, m = 0, this.isEndRowFinished())
@@ -11224,13 +11216,7 @@ class DrawPageTable extends DrawRect {
11224
11216
  if (r.rowSpan + o - 1 === s) {
11225
11217
  const d = r.drawCell.getDrawPageCell(this), u = HOEditorFactorys.instance().getFactory(this._table.hoEditorFactoryID);
11226
11218
  if (d) {
11227
- const f = u.unitConvert.mmConversionPx(
11228
- d.cell.cellProperty.cellInnerMargin[0] * 10,
11229
- !0
11230
- ), p = u.unitConvert.mmConversionPx(
11231
- d.cell.cellProperty.cellInnerMargin[1] * 10,
11232
- !0
11233
- );
11219
+ const f = u.unitConvert.mmConversionPx(d.cell.cellProperty.cellInnerMargin[0] * 10, !0), p = u.unitConvert.mmConversionPx(d.cell.cellProperty.cellInnerMargin[1] * 10, !0);
11234
11220
  let m = 0;
11235
11221
  const g = d.cell.drawCell.drawPageCells.indexOf(d), y = ((c = d.cell.table.rowInfos[o]) == null ? void 0 : c.rowProperty) || {};
11236
11222
  if (y.isLockRowHeight && y.rowHeight && y.rowHeight > 0 ? m = HOEditorFactorys.instance().getFactory(this.table.hoEditorFactoryID).unitConvert.mmConversionPx(this._table.rowInfos[s].rowProperty.rowHeight * 10, !1) : g == 0 || g == d.cell.drawCell.drawPageCells.length - 1 ? g == 0 && g == d.cell.drawCell.drawPageCells.length - 1 ? m = Math.max(gDefaultRowHeight, f + d.docHeight + p) : g == 0 ? m = Math.max(gDefaultRowHeight, f + d.docHeight) : g == d.cell.drawCell.drawPageCells.length - 1 && (m = Math.max(gDefaultRowHeight, p + d.docHeight)) : m = Math.max(gDefaultRowHeight, d.docHeight), (g === d.cell.drawCell.drawPageCells.length - 1 || this._table.rowInfos[o].rowProperty.repeatAsTitleAtPageTop) && r.table.rowInfos[s].rowProperty.isSpecifyHeight) {
@@ -11259,12 +11245,8 @@ class DrawPageTable extends DrawRect {
11259
11245
  const u = this.getPageCellTop(l), f = n - u, p = this._table.drawTable.drawPageTables.indexOf(this);
11260
11246
  let m = 0;
11261
11247
  if (p > 0 && c <= this._startRow) {
11262
- const y = l.drawCell.getDrawPageCell(
11263
- this._table.drawTable.drawPageTables[p - 1]
11264
- );
11265
- y && (l.drawCell.getCellRestHeight(
11266
- l.drawCell.drawPageCells.indexOf(y) - 1
11267
- ), y.isEndLineFinished() ? m = y.endDline + 1 : m = y.endDline);
11248
+ const y = l.drawCell.getDrawPageCell(this._table.drawTable.drawPageTables[p - 1]);
11249
+ y && (l.drawCell.getCellRestHeight(l.drawCell.drawPageCells.indexOf(y) - 1), y.isEndLineFinished() ? m = y.endDline + 1 : m = y.endDline);
11268
11250
  } else if (l.drawCell.drawPageCells.length > 0) {
11269
11251
  for (let y = l.drawCell.drawPageCells.length - 1; y >= 0; y--)
11270
11252
  l.drawCell.drawPageCells[y].parent.removeChild(l.drawCell.drawPageCells[y]);
@@ -11288,42 +11270,15 @@ class DrawPageTable extends DrawRect {
11288
11270
  if (c && c.rowSpan + d - 1 > o && u == l) {
11289
11271
  const f = this.getPageCellTop(c), p = s - f;
11290
11272
  let m = 0, g = -1, y = null;
11291
- r && d <= this._startRow && (y = c.drawCell.getDrawPageCell(r), y && (g = c.drawCell.drawPageCells.indexOf(
11292
- y
11293
- ), y.isEndLineFinished() ? m = y.endDline + 1 : m = y.endDline));
11273
+ r && d <= this._startRow && (y = c.drawCell.getDrawPageCell(r), y && (g = c.drawCell.drawPageCells.indexOf(y), y.isEndLineFinished() ? m = y.endDline + 1 : m = y.endDline));
11294
11274
  let w;
11295
11275
  const [v, C] = c.getLeftWidth();
11296
- g === c.drawCell.drawPageCells.length - 1 ? (w = new DrawPageCell(
11297
- this.table.hoEditorFactoryID,
11298
- this,
11299
- c,
11300
- v,
11301
- f,
11302
- C,
11303
- p,
11304
- g + 1,
11305
- m,
11306
- p
11307
- ), c.drawCell.drawPageCells.push(w), w.y = f, w.x = v, this.addChild(w), w.update(
11308
- y,
11309
- c.drawCell.drawLines,
11310
- m,
11311
- w.valignTop,
11312
- p
11313
- ), w.y = f) : (w = c.drawCell.drawPageCells[g + 1], w.parent !== this && (c.drawCell.needUpdate = !0, w.parent && w.parent.removeChild(w), w.drawPageTable = this, this.addChild(w)), (c.drawCell.needUpdate || m !== w.startDline || w.dHeight > p || w.y != f) && (c.drawCell.needUpdate || (c.drawCell.needUpdate = !0), o === d ? (w.maxHeight = p, w.dHeight = p) : w.maxHeight = s - f, w.update(
11314
- y,
11315
- c.drawCell.drawLines,
11316
- m,
11317
- w.valignTop,
11318
- p
11319
- )), w.y = f, w.x = v), this.updatePartCellHeight(c, d, u, o, n, !0);
11276
+ g === c.drawCell.drawPageCells.length - 1 ? (w = new DrawPageCell(this.table.hoEditorFactoryID, this, c, v, f, C, p, g + 1, m, p), c.drawCell.drawPageCells.push(w), w.y = f, w.x = v, this.addChild(w), w.update(y, c.drawCell.drawLines, m, w.valignTop, p), w.y = f) : (w = c.drawCell.drawPageCells[g + 1], w.parent !== this && (c.drawCell.needUpdate = !0, w.parent && w.parent.removeChild(w), w.drawPageTable = this, this.addChild(w)), (c.drawCell.needUpdate || m !== w.startDline || w.dHeight > p || w.y != f) && (c.drawCell.needUpdate || (c.drawCell.needUpdate = !0), o === d ? (w.maxHeight = p, w.dHeight = p) : w.maxHeight = s - f, w.update(y, c.drawCell.drawLines, m, w.valignTop, p)), w.y = f, w.x = v), this.updatePartCellHeight(c, d, u, o, n, !0);
11320
11277
  }
11321
11278
  }
11322
11279
  }
11323
11280
  getMainRestHeight() {
11324
- const r = HOEditorFactorys.instance().getFactory(this.table.hoEditorFactoryID), o = r.drawPageTree.getMainRootArea(
11325
- this
11326
- );
11281
+ const r = HOEditorFactorys.instance().getFactory(this.table.hoEditorFactoryID), o = r.drawPageTree.getMainRootArea(this);
11327
11282
  if (!o) return 0;
11328
11283
  const n = this.localToLocal(0, 0, o);
11329
11284
  let s = o.maxHeight - n.y, l = r.drawTree.getParentDrawArea(this);
@@ -11490,9 +11445,7 @@ class DrawPageTable extends DrawRect {
11490
11445
  var s;
11491
11446
  const r = (s = this._partRowHeights.get(this._startRow)) == null ? void 0 : s.rowHeight, o = HOEditorFactorys.instance().getFactory(this._table.hoEditorFactoryID);
11492
11447
  let n = null;
11493
- if (this.stage && (n = o.drawPageTree.getDrawPageByDNode(
11494
- this
11495
- )), r && n) {
11448
+ if (this.stage && (n = o.drawPageTree.getDrawPageByDNode(this)), r && n) {
11496
11449
  const l = this.localToGlobal(0, 0);
11497
11450
  return [n, l.x, l.y, r];
11498
11451
  } else
@@ -11523,7 +11476,7 @@ class DrawPageTable extends DrawRect {
11523
11476
  this.removeDrawCellAfterRow(C);
11524
11477
  break;
11525
11478
  }
11526
- if (s <= this._table.drawTable.getRowStartLineMaxHeight(C)) {
11479
+ if (s < this._table.drawTable.getRowStartLineMaxHeight(C)) {
11527
11480
  this.removeDrawCellAfterRow(C);
11528
11481
  break;
11529
11482
  }
@@ -11546,42 +11499,17 @@ class DrawPageTable extends DrawRect {
11546
11499
  const [T, I, M] = this._table.getMainCell(C, E);
11547
11500
  if (T && M === E && (I + T.rowSpan - 1 == C || m > s - 10 || s - m < n.defaultLineHeight)) {
11548
11501
  let k = 0, L = -1, H = null;
11549
- r && I <= this._startRow && (H = T.drawCell.getDrawPageCell(r), H && (L = T.drawCell.drawPageCells.indexOf(
11550
- H
11551
- ), H.isEndLineFinished() ? H.endDline == -2 ? k = 0 : k = H.endDline + 1 : k = H.endDline));
11502
+ r && I <= this._startRow && (H = T.drawCell.getDrawPageCell(r), H && (L = T.drawCell.drawPageCells.indexOf(H), H.isEndLineFinished() ? H.endDline == -2 ? k = 0 : k = H.endDline + 1 : k = H.endDline));
11552
11503
  let z;
11553
11504
  const [Z, j] = T.getLeftWidth();
11554
11505
  let Y = l, X = s;
11555
11506
  if (T.rowSpan > 1 && (Y = this.getPageCellTop(T), X = u - Y), L === T.drawCell.drawPageCells.length - 1) {
11556
- g = !0, z = new DrawPageCell(
11557
- this.table.hoEditorFactoryID,
11558
- this,
11559
- T,
11560
- Z,
11561
- Y,
11562
- j,
11563
- m,
11564
- L + 1,
11565
- k,
11566
- X
11567
- ), T.drawCell.drawPageCells.push(z), z.y = Y, M > 0 && (z.x = Z), this.addChild(z);
11568
- const O = z.update(
11569
- H,
11570
- T.drawCell.drawLines,
11571
- k,
11572
- z.valignTop,
11573
- X
11574
- );
11507
+ g = !0, z = new DrawPageCell(this.table.hoEditorFactoryID, this, T, Z, Y, j, m, L + 1, k, X), T.drawCell.drawPageCells.push(z), z.y = Y, M > 0 && (z.x = Z), this.addChild(z);
11508
+ const O = z.update(H, T.drawCell.drawLines, k, z.valignTop, X);
11575
11509
  z.y = Y, _ = _ && O;
11576
11510
  } else if (z = T.drawCell.drawPageCells[L + 1], z.parent !== this && (T.drawCell.needUpdate = !0, z.parent && z.parent.removeChild(z), z.drawPageTable = this, this.addChild(z)), z.y = Y, z.x = Z, T.drawCell.needUpdate || k !== z.startDline || z.dHeight > s || z.dHeight + n.defaultLineHeight < s && L + 1 < T.drawCell.drawPageCells.length - 1 && !this._table.rowInfos[C].rowProperty.repeatAsTitleAtPageTop) {
11577
11511
  T.drawCell.needUpdate || (T.drawCell.needUpdate = !0), C === I ? (z.maxHeight = s, z.dHeight = Math.min(m, s)) : z.maxHeight = u - Y, g = !0;
11578
- const O = z.update(
11579
- H,
11580
- T.drawCell.drawLines,
11581
- k,
11582
- z.valignTop,
11583
- X
11584
- );
11512
+ const O = z.update(H, T.drawCell.drawLines, k, z.valignTop, X);
11585
11513
  _ = _ && O;
11586
11514
  } else T.drawCell.drawPageCells.length > 1 && L + 1 < T.drawCell.drawPageCells.length - 1 && !this._table.rowInfos[C].rowProperty.repeatAsTitleAtPageTop && (_ = !1);
11587
11515
  }
@@ -11981,12 +11909,12 @@ class DrawArea extends DrawRect {
11981
11909
  let y = null;
11982
11910
  const w = g.getHeadHeight();
11983
11911
  let v = g.getDrawTableByParentArea(this);
11984
- if (w + gDefaultRowHeight > f || !g.isFirstRowCanFit(f)) {
11912
+ if (w + g.getRowStartLineMaxHeight((v == null ? void 0 : v.startRow) || 0) > f || !g.isFirstRowCanFit(f)) {
11985
11913
  v && v.parent.removeChild(v);
11986
11914
  break;
11987
11915
  }
11988
11916
  if (u === n && r && (y = g.getDrawTableByParentArea(r), y && (y.isEndRowFinished() ? y.endRow + 1 : y.endRow)), !v && g.drawPageTables.length > 0 && !y && (v = g.drawPageTables[0], g.needUpdate = !0), v)
11989
- g.needUpdate || v.dHeight - f > gDefaultRowHeight || g.drawPageTables.indexOf(v) < g.drawPageTables.length - 1 && l > v.dHeight + d.defaultLineHeight ? s = g.drawUpdate(this, y, s, f) : s = s + v.dHeight, this._lastDrawLine = v;
11917
+ g.needUpdate || v.dHeight - f > g.getRowStartLineMaxHeight((v == null ? void 0 : v.startRow) || 0) || g.drawPageTables.indexOf(v) < g.drawPageTables.length - 1 && l > v.dHeight + d.defaultLineHeight ? s = g.drawUpdate(this, y, s, f) : s = s + v.dHeight, this._lastDrawLine = v;
11990
11918
  else {
11991
11919
  let C = null, _ = 0;
11992
11920
  if (u === n && r && (C = g.getDrawTableByParentArea(r), C)) {
@@ -12502,17 +12430,7 @@ b(Wt, "_dashLine", new createjs$1.Shape());
12502
12430
  let ResizeDrawTableObj = Wt;
12503
12431
  class DrawPageCell extends DrawArea {
12504
12432
  constructor(r, o, n, s, l, c, d, u, f, p, m) {
12505
- super(
12506
- r,
12507
- n.rootPath,
12508
- u,
12509
- s,
12510
- l,
12511
- c,
12512
- d,
12513
- c,
12514
- d
12515
- );
12433
+ super(r, n.rootPath, u, s, l, c, d, c, d);
12516
12434
  b(this, "_backImg");
12517
12435
  b(this, "_touchArea");
12518
12436
  // private _crossShape: createjs.Shape | null;
@@ -12778,20 +12696,10 @@ class DrawPageCell extends DrawArea {
12778
12696
  var M;
12779
12697
  if (p === "row") {
12780
12698
  const k = d.table.rowInfos[u].rowHeight, L = k + C;
12781
- o.undoService.begin(), o.undoService.add(
12782
- new TableResizeRowUndoUnit(
12783
- o.hoEditorFactoryId,
12784
- d.table,
12785
- u,
12786
- k,
12787
- L
12788
- )
12789
- ), o.undoService.commit();
12699
+ o.undoService.begin(), o.undoService.add(new TableResizeRowUndoUnit(o.hoEditorFactoryId, d.table, u, k, L)), o.undoService.commit();
12790
12700
  } else {
12791
12701
  const L = d.table.colInfos[f].colWidth + v;
12792
- o.undoService.begin(), o.undoService.add(
12793
- new TableResizeColUndoUnit(o.hoEditorFactoryId, d.table, f, L)
12794
- ), o.undoService.commit();
12702
+ o.undoService.begin(), o.undoService.add(new TableResizeColUndoUnit(o.hoEditorFactoryId, d.table, f, L)), o.undoService.commit();
12795
12703
  }
12796
12704
  (M = this._anchorLine) == null || M.remove(), document.removeEventListener("mousemove", E), setTimeout(() => {
12797
12705
  var L, H;
@@ -12918,10 +12826,10 @@ class DrawPageCell extends DrawArea {
12918
12826
  for (let l = this.startDline; l < this._endDline; l++) {
12919
12827
  const c = r[l];
12920
12828
  let d = 1;
12921
- c instanceof DrawLine && (c.dHeight > o && (d = Math.ceil(c.dHeight / o)), s += d * o, this.dHeight - s > n && this._backImg.graphics.beginStroke("#000").setStrokeStyle(1).moveTo(0, Math.ceil(s) - 0.5).lineTo(this._dWidth, Math.ceil(s) - 0.5));
12829
+ c instanceof DrawLine && (c.dHeight > o && (d = Math.ceil(c.dHeight / o)), s += d * o, this.dHeight - s > n && (this._backImg.graphics.beginStroke("#000"), this._cell.cellProperty.gridLinesStyle != GridLinesStyle.solid ? this._backImg.graphics.setStrokeDash([2, 2]) : this.setStrokeStyle2(this._backImg.graphics, 1), this._backImg.graphics.moveTo(0, Math.ceil(s) - 0.5).lineTo(this._dWidth, Math.ceil(s) - 0.5)));
12922
12830
  }
12923
12831
  for (; s < this.dHeight + o; )
12924
- s += o, this.dHeight - s > n && this._backImg.graphics.beginStroke("#000").setStrokeStyle(1).moveTo(0, Math.ceil(s) - 0.5).lineTo(this._dWidth, Math.ceil(s) - 0.5);
12832
+ s += o, this.dHeight - s > n && (this._backImg.graphics.beginStroke("#000"), this._cell.cellProperty.gridLinesStyle != GridLinesStyle.solid ? this._backImg.graphics.setStrokeDash([2, 2]) : this.setStrokeStyle2(this._backImg.graphics, 1), this._backImg.graphics.moveTo(0, Math.ceil(s) - 0.5).lineTo(this._dWidth, Math.ceil(s) - 0.5));
12925
12833
  }
12926
12834
  paintCellAdress(r) {
12927
12835
  if (r) {
@@ -12963,12 +12871,7 @@ class DrawPageCell extends DrawArea {
12963
12871
  if (!r)
12964
12872
  throw new Error("表格绘制还未准备好");
12965
12873
  const o = this._cell.childNodes[0].combineParagraph, n = o.leftMarginPixes, s = o.topMarginPixes;
12966
- return new PagePaintPosition(
12967
- this._hoEditorFactoryID,
12968
- r.pageIndex,
12969
- n,
12970
- s
12971
- );
12874
+ return new PagePaintPosition(this._hoEditorFactoryID, r.pageIndex, n, s);
12972
12875
  }
12973
12876
  calcValignTop(r) {
12974
12877
  const o = this.cell.drawCell.drawPageCells.indexOf(this), n = this._cell.drawCell;
@@ -12995,13 +12898,7 @@ class DrawPageCell extends DrawArea {
12995
12898
  update(r, o, n, s, l) {
12996
12899
  let c = s;
12997
12900
  this._cell.cellProperty.align == VAlign.vabottom && (c = this.calcValignTop(l)[0], this._valignTop = c), this._startDline = n < -1 ? 0 : n;
12998
- const d = super.update(
12999
- r,
13000
- o,
13001
- this._startDline,
13002
- c,
13003
- l
13004
- );
12901
+ const d = super.update(r, o, this._startDline, c, l);
13005
12902
  return this.docHeight = Math.max(0, this.docHeight - c), this.updateDHeight(), d;
13006
12903
  }
13007
12904
  /**
@@ -15301,7 +15198,7 @@ class DrawSignNode extends DrawCombineNode {
15301
15198
  }
15302
15199
  }
15303
15200
  }
15304
- const version = "3.3.3-beta.16";
15201
+ const version = "3.3.3-beta.18";
15305
15202
  var FingerPosition = /* @__PURE__ */ ((a) => (a[a.left = 0] = "left", a[a.center = 1] = "center", a[a.right = 2] = "right", a))(FingerPosition || {});
15306
15203
  class SignNode extends BaseNode {
15307
15204
  constructor(hoEditorFactoryID, rootNodes, pNode, nodeType, number, type, name, signType, signFormat, signor, signTime, signTimeFormat, imgSrc, imgWidth, imgHeight, customProperty, isTemplate, styleIndex, connectMode, isFront, allowEditSignTime, fingerPrintSrc, fingerPosition, attribute, connectChar, otherProperties, dataId, associatedElement, isTemp, innerIdentifier) {
@@ -21267,7 +21164,7 @@ class DrawMedicalExpression extends DrawCombineNode {
21267
21164
  drawPermanentTeeth() {
21268
21165
  let r = this._arrValues[0].split(",").join(""), o = this._arrValues[1].split(",").join(""), n = this._arrValues[2].split(",").join(""), s = this._arrValues[3].split(",").join(""), l = this._textStyle.color, c = this._textStyle.color, d = this._textStyle.color, u = this._textStyle.color;
21269
21166
  const f = this.node.remark;
21270
- f == "teeth" && (r == "" && (r = "右上牙位", l = "#9B9E9E"), o == "" && (o = "左上牙位", c = "#9B9E9E"), n == "" && (n = "右下牙位", d = "#9B9E9E"), s == "" && (s = "左下牙位", u = "#9B9E9E"));
21167
+ f == "teeth" && (r == "" && (l = "#9B9E9E"), o == "" && (c = "#9B9E9E"), n == "" && (d = "#9B9E9E"), s == "" && (u = "#9B9E9E"));
21271
21168
  const p = new createjs$1.Text(r, this._textStyle.getStyleKey(), l), m = new createjs$1.Text(o, this._textStyle.getStyleKey(), c), g = new createjs$1.Text(n, this._textStyle.getStyleKey(), d), y = new createjs$1.Text(s, this._textStyle.getStyleKey(), u), w = new createjs$1.Shape(), v = new createjs$1.Shape(), C = Math.max(p.getMeasuredWidth(), m.getMeasuredWidth()) + Math.max(g.getMeasuredWidth(), y.getMeasuredWidth()) + 15, _ = Math.max(p.getMeasuredWidth() + m.getMeasuredWidth(), g.getMeasuredWidth() + y.getMeasuredWidth()) + 15, D = Math.max(C, _), E = Math.max(p.getMeasuredHeight(), g.getMeasuredHeight()) + Math.max(m.getMeasuredHeight(), y.getMeasuredHeight()) + 15, T = Math.max(p.getMeasuredWidth(), g.getMeasuredWidth());
21272
21169
  this.dWidth = D, this.dHeight < E && (this.dHeight = E);
21273
21170
  const I = T + 6 - 0.5;
@@ -40260,9 +40157,7 @@ class HTMLconverter2 {
40260
40157
  }
40261
40158
  if (p)
40262
40159
  for (let g = 0; g < c.length; g++) {
40263
- const y = o.getParentWidth(), w = Math.floor(
40264
- (y - o.borderWidth * 2) / c.length
40265
- );
40160
+ const y = o.getParentWidth(), w = Math.floor((y - o.borderWidth * 2) / c.length);
40266
40161
  c[g].colWidth = w;
40267
40162
  }
40268
40163
  o.rowInfos = l, o.colInfos = c;
@@ -40320,14 +40215,7 @@ class HTMLconverter2 {
40320
40215
  w.push(...v), l.push(w);
40321
40216
  }
40322
40217
  }
40323
- const p = new TableNode(
40324
- this._hoEditorFactoryID,
40325
- o.docTree.activeNodes,
40326
- n,
40327
- c,
40328
- d,
40329
- this.generateTableProperty(t)
40330
- );
40218
+ const p = new TableNode(this._hoEditorFactoryID, o.docTree.activeNodes, n, c, d, this.generateTableProperty(t));
40331
40219
  if (l.length == 0)
40332
40220
  return [];
40333
40221
  {
@@ -40519,7 +40407,7 @@ class HTMLconverter2 {
40519
40407
  if (s) {
40520
40408
  s.rowSpan = parseInt(t.getAttribute("rowspan") || "1") || 1, s.colSpan = parseInt(t.getAttribute("colspan") || "1") || 1;
40521
40409
  const l = this.mergestyle(t.getAttribute("style") || "", "");
40522
- l.mso_diagonal_down && l.mso_diagonal_down != "none" && (s.crossLineType = CrossLineType.ct02), l.mso_diagonal_up && l.mso_diagonal_up != "none" && (s.crossLineType = CrossLineType.ct13), t.getAttribute("valign") == "top" ? s.cellProperty.align = VAlign.vatop : t.getAttribute("valign") == "bottom" ? s.cellProperty.align = VAlign.vabottom : s.cellProperty.align = VAlign.vacenter;
40410
+ l.mso_diagonal_down && l.mso_diagonal_down != "none" && (s.crossLineType = CrossLineType.ct02), l.mso_diagonal_up && l.mso_diagonal_up != "none" && (s.crossLineType = CrossLineType.ct13), (l.width === "0px" || l.width === "0pt") && (s.cellProperty.gridLineDisplay = [!1, !1, !1, !1]), t.getAttribute("valign") == "top" ? s.cellProperty.align = VAlign.vatop : t.getAttribute("valign") == "bottom" ? s.cellProperty.align = VAlign.vabottom : s.cellProperty.align = VAlign.vacenter;
40523
40411
  const c = Array();
40524
40412
  for (let d = 0; d < t.childNodes.length; d++) {
40525
40413
  const u = this.convert.get(t.childNodes[d].nodeName.toLowerCase());
@@ -65274,7 +65162,7 @@ WebPDecoder.prototype.getData = function() {
65274
65162
  (function(a) {
65275
65163
  function t() {
65276
65164
  return function() {
65277
- return globalObject.canvg ? Promise.resolve(globalObject.canvg) : import("./index.es-qXnwv3w3.mjs");
65165
+ return globalObject.canvg ? Promise.resolve(globalObject.canvg) : import("./index.es-BPswcJjD.mjs");
65278
65166
  }().catch(function(r) {
65279
65167
  return Promise.reject(new Error("Could not load canvg: " + r));
65280
65168
  }).then(function(r) {
@@ -1,4 +1,4 @@
1
- import { c as Da, _ as Va, g as il } from "./index-Cy8mLq0t.mjs";
1
+ import { c as Da, _ as Va, g as il } from "./index-CPX-XsP5.mjs";
2
2
  var fn = {}, cn = {}, cr, vn;
3
3
  function Q() {
4
4
  if (vn) return cr;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "hoeditor-web",
3
- "version": "3.3.3-beta.16",
3
+ "version": "3.3.3-beta.18",
4
4
  "private": false,
5
5
  "main": "lib/hoeditor.mjs",
6
6
  "typings": "types/index.d.ts",