@univerjs/engine-render 0.6.10 → 0.7.0-beta.0

package/lib/es/index.js

@@ -35514,7 +35514,7 @@ class y0 {
     k(this, "_context");
     k(this, "_width", 0);
     k(this, "_height", 0);
-    t = t || {}, this._canvasEle = v7(), this._canvasEle.style.padding = "0", this._canvasEle.style.margin = "0", this._canvasEle.style.border = "0", this._canvasEle.style.background = "transparent", this._canvasEle.style.position = "absolute", this._canvasEle.style.top = "0", this._canvasEle.style.left = "0", this._canvasEle.style.zIndex = "8", this._canvasEle.className = "univer-render-canvas", this._canvasEle.tabIndex = 1, this._canvasEle.style.touchAction = "none", this._canvasEle.style.outline = "0";
+    t = t || {}, this._canvasEle = v7(), this._canvasEle.style.padding = "0", this._canvasEle.style.margin = "0", this._canvasEle.style.border = "0", this._canvasEle.style.background = "transparent", this._canvasEle.style.position = "absolute", this._canvasEle.style.top = "0", this._canvasEle.style.left = "0", this._canvasEle.style.zIndex = "8", this._canvasEle.dataset.uComp = "render-canvas", this._canvasEle.tabIndex = 1, this._canvasEle.style.touchAction = "none", this._canvasEle.style.outline = "0";
     const e = this._canvasEle.getContext("2d");
     if (e == null)
       throw new Error("context is not support");
@@ -56155,36 +56155,36 @@ let X5 = class extends X8 {
    * In Excel, for the border rendering of merged cells to take effect, the outermost cells need to have the same border style.
    */
   _setMergeBorderProps(t, e, a) {
-    var u;
+    var u, d, g;
     if (!this.worksheet || !e.border) return;
     const s = [];
     let n = a.startRow, i = a.endRow, o = a.startRow, l = a.startColumn;
     t === K.TOP ? (o = a.startRow, n = a.startColumn, i = a.endColumn) : t === K.BOTTOM ? (o = a.endRow, n = a.startColumn, i = a.endColumn) : t === K.LEFT ? (l = a.startColumn, n = a.startRow, i = a.endRow) : t === K.RIGHT && (l = a.endColumn, n = a.startRow, i = a.endRow);
-    for (let d = n; d <= i; d++) {
-      t === K.TOP || t === K.BOTTOM ? l = d : (t === K.LEFT || t === K.RIGHT) && (o = d);
-      const g = this.worksheet.getCell(o, l);
-      if (!g)
+    for (let c = n; c <= i; c++) {
+      t === K.TOP || t === K.BOTTOM ? l = c : (t === K.LEFT || t === K.RIGHT) && (o = c);
+      const h = this.worksheet.getCell(o, l);
+      if (!h)
         break;
-      const c = this._styles.getStyleByCell(g);
-      if (!c)
+      const p = (u = h.themeStyle) == null ? void 0 : u.bd, f = this._styles.getStyleByCell(h);
+      if (!f && !p)
         break;
-      const h = (u = c.bd) == null ? void 0 : u[t];
-      if (h) {
-        const p = b3(h.cl) || L3;
+      const m = (g = (d = f == null ? void 0 : f.bd) == null ? void 0 : d[t]) != null ? g : p == null ? void 0 : p[t];
+      if (m) {
+        const v = b3(m.cl) || L3;
         s.push({
           r: o,
           c: l,
-          style: h.s,
-          color: p
+          style: m.s,
+          color: v
         });
       }
     }
-    s.forEach((d) => {
-      const { r: g, c, style: h, color: p } = d;
-      e.border.getValue(g, c) || e.border.setValue(g, c, {}), e.border.getValue(g, c)[t] = {
+    s.forEach((c) => {
+      const { r: h, c: p, style: f, color: m } = c;
+      e.border.getValue(h, p) || e.border.setValue(h, p, {}), e.border.getValue(h, p)[t] = {
         type: t,
-        style: h,
-        color: p
+        style: f,
+        color: m
       };
     });
   }

package/lib/index.js

@@ -35514,7 +35514,7 @@ class y0 {
     k(this, "_context");
     k(this, "_width", 0);
     k(this, "_height", 0);
-    t = t || {}, this._canvasEle = v7(), this._canvasEle.style.padding = "0", this._canvasEle.style.margin = "0", this._canvasEle.style.border = "0", this._canvasEle.style.background = "transparent", this._canvasEle.style.position = "absolute", this._canvasEle.style.top = "0", this._canvasEle.style.left = "0", this._canvasEle.style.zIndex = "8", this._canvasEle.className = "univer-render-canvas", this._canvasEle.tabIndex = 1, this._canvasEle.style.touchAction = "none", this._canvasEle.style.outline = "0";
+    t = t || {}, this._canvasEle = v7(), this._canvasEle.style.padding = "0", this._canvasEle.style.margin = "0", this._canvasEle.style.border = "0", this._canvasEle.style.background = "transparent", this._canvasEle.style.position = "absolute", this._canvasEle.style.top = "0", this._canvasEle.style.left = "0", this._canvasEle.style.zIndex = "8", this._canvasEle.dataset.uComp = "render-canvas", this._canvasEle.tabIndex = 1, this._canvasEle.style.touchAction = "none", this._canvasEle.style.outline = "0";
     const e = this._canvasEle.getContext("2d");
     if (e == null)
       throw new Error("context is not support");
@@ -56155,36 +56155,36 @@ let X5 = class extends X8 {
    * In Excel, for the border rendering of merged cells to take effect, the outermost cells need to have the same border style.
    */
   _setMergeBorderProps(t, e, a) {
-    var u;
+    var u, d, g;
     if (!this.worksheet || !e.border) return;
     const s = [];
     let n = a.startRow, i = a.endRow, o = a.startRow, l = a.startColumn;
     t === K.TOP ? (o = a.startRow, n = a.startColumn, i = a.endColumn) : t === K.BOTTOM ? (o = a.endRow, n = a.startColumn, i = a.endColumn) : t === K.LEFT ? (l = a.startColumn, n = a.startRow, i = a.endRow) : t === K.RIGHT && (l = a.endColumn, n = a.startRow, i = a.endRow);
-    for (let d = n; d <= i; d++) {
-      t === K.TOP || t === K.BOTTOM ? l = d : (t === K.LEFT || t === K.RIGHT) && (o = d);
-      const g = this.worksheet.getCell(o, l);
-      if (!g)
+    for (let c = n; c <= i; c++) {
+      t === K.TOP || t === K.BOTTOM ? l = c : (t === K.LEFT || t === K.RIGHT) && (o = c);
+      const h = this.worksheet.getCell(o, l);
+      if (!h)
         break;
-      const c = this._styles.getStyleByCell(g);
-      if (!c)
+      const p = (u = h.themeStyle) == null ? void 0 : u.bd, f = this._styles.getStyleByCell(h);
+      if (!f && !p)
         break;
-      const h = (u = c.bd) == null ? void 0 : u[t];
-      if (h) {
-        const p = b3(h.cl) || L3;
+      const m = (g = (d = f == null ? void 0 : f.bd) == null ? void 0 : d[t]) != null ? g : p == null ? void 0 : p[t];
+      if (m) {
+        const v = b3(m.cl) || L3;
         s.push({
           r: o,
           c: l,
-          style: h.s,
-          color: p
+          style: m.s,
+          color: v
         });
       }
     }
-    s.forEach((d) => {
-      const { r: g, c, style: h, color: p } = d;
-      e.border.getValue(g, c) || e.border.setValue(g, c, {}), e.border.getValue(g, c)[t] = {
+    s.forEach((c) => {
+      const { r: h, c: p, style: f, color: m } = c;
+      e.border.getValue(h, p) || e.border.setValue(h, p, {}), e.border.getValue(h, p)[t] = {
         type: t,
-        style: h,
-        color: p
+        style: f,
+        color: m
       };
     });
   }