@newview/ui 1.1.39 → 1.1.41

package/README.md

@@ -1,3 +1,11 @@
+### 1.1.40
+1、优化LuckySheet 从Excel导入后，预览边框不显示问题。
+2、优化LuckySheet 获取行数、列数API逻辑
+3、优化LuckySheet 获取行高、列框API逻辑
+
+### 1.1.40
+1、LuckySheet 从Excel导入后，预览边框不显示问题。
+
 ### 1.1.39
 1、UploadFileList 新增分页控制
 

package/dist/newview-ui.js

@@ -184006,6 +184006,11 @@ var HtmlBase$1 = (
         1: "left",
         2: "right"
       };
+      this.textVHAlign = {
+        0: "center",
+        1: "start",
+        2: "end"
+      };
       this.defaultColWidth = 72;
       this.defaultRowHeight = 17;
     }
@@ -184036,12 +184041,13 @@ var HtmlBase$1 = (
       this.setCss(style2, "font-weight", objValue.bl == 1 ? "bold" : "normal");
       this.setCss(style2, "font-style", objValue.it == 1 ? "italic" : "normal");
       this.setCss(style2, "display", "flex");
-      this.setCss(style2, "align-items", "center");
+      this.setCss(style2, "align-items", objValue.vt == void 0 ? "center" : this.textVHAlign[objValue.vt]);
+      this.setCss(style2, "justify-content", objValue.ht == void 0 ? "center" : this.textVHAlign[objValue.ht]);
+      this.setCss(style2, "text-align", objValue.ht == void 0 ? void 0 : this.textAlign[objValue.ht]);
       this.setCss(style2, "font-size", objValue.fs == void 0 ? void 0 : objValue.fs + "pt");
       this.setCss(style2, "line-height", objValue.fs == void 0 ? void 0 : objValue.fs + "pt");
       this.pushTextDecoration(style2, objValue.cl && objValue.cl == 1 ? "line-through" : void 0);
       this.pushTextDecoration(style2, objValue.un && objValue.un == 1 ? "underline" : void 0);
-      this.setCss(style2, "text-align", objValue.ht == void 0 ? void 0 : this.textAlign[objValue.ht]);
       this.setCss(style2, "margin", objValue.ht == 0 ? "0px auto" : void 0);
       if (style2["text-decoration"]) {
         style2["text-decoration"] = style2["text-decoration"].join(" ");
@@ -184097,6 +184103,8 @@ var HtmlCells$1 = (
       _this.columnWidths = {};
       _this.tdBorders = {};
       _this.imageDict = {};
+      _this.startTds = {};
+      _this.endTdRightStyle = {};
       _this.verticalAlign = {
         0: "middle",
         1: "top",
@@ -184159,6 +184167,8 @@ var HtmlCells$1 = (
     HtmlCells2.prototype.setMerge = function(td, objValue) {
       if (objValue.mc) {
         td.isMerge = true;
+        td.startRow = objValue.mc.r;
+        td.startCol = objValue.mc.c;
         if (objValue.mc.cs == void 0) {
           td.isRender = false;
         } else {
@@ -184354,6 +184364,25 @@ var HtmlCells$1 = (
       if (!isMerge) {
         tdBorders[key2].right = rightStyle ? rightStyle.borderNumber : 0;
         this.setCss(style2, "border-right", rightStyle ? rightStyle.css : void 0);
+      } else if (!td.isRender) {
+        var startRow = td.startRow;
+        var startCol = td.startCol;
+        var startKey = startRow + "_" + startCol;
+        var startTd = this.tds[startKey];
+        var endRow = startRow + startTd.rowspan - 1;
+        var endCol = startCol + startTd.colspan - 1;
+        if (endRow == border.value.row_index && endCol == border.value.col_index) {
+          tdBorders[startKey] = tdBorders[startKey] || {
+            style: {},
+            left: 0,
+            right: 0,
+            top: 0,
+            bottom: 0
+          };
+          var startStyle = tdBorders[startKey].style;
+          tdBorders[startKey].right = rightStyle ? rightStyle.borderNumber : 0;
+          this.setCss(startStyle, "border-right", rightStyle ? rightStyle.css : void 0);
+        }
       }
     };
     HtmlCells2.prototype.parseTdBorders = function(borderInfo) {
@@ -184371,6 +184400,12 @@ var HtmlCells$1 = (
       }
       return tdBorders;
     };
+    HtmlCells2.prototype.getValue = function(value, styles) {
+      if (styles === void 0) {
+        styles = "";
+      }
+      return value.replace("/  /g", "&nbsp;").replace(/\r\n/g, "<br/>").replace(/\n/g, "<br/>").replace(/{sup}/g, "<sup " + styles + ">").replace(/{\/sup}/g, "</sup>").replace(/{sub}/g, "<sub>").replace(/{\/sub}/g, "</sub>");
+    };
     HtmlCells2.prototype.isImage = function(value) {
       return this.imageDict[value] != void 0;
     };
@@ -184398,12 +184433,6 @@ var HtmlCells$1 = (
       var base64Url = this.imageDict[tdValue.value];
       return "<div " + style2 + '><img src="' + base64Url + '" style="width: 100%; height: 100%; object-fit: contain;" /></div>';
     };
-    HtmlCells2.prototype.getValue = function(value, styles) {
-      if (styles === void 0) {
-        styles = "";
-      }
-      return value.replace(/\r\n/g, "<br/>").replace(/\n/g, "<br/>").replace(/{sup}/g, "<sup " + styles + ">").replace(/{\/sup}/g, "</sup>").replace(/{sub}/g, "<sub>").replace(/{\/sub}/g, "</sub>");
-    };
     HtmlCells2.prototype.countTdStaticSize = function(tdcell, Rindex, Cindex, border) {
       var cellwidth = 0;
       var cellheight = 0;
@@ -184412,12 +184441,12 @@ var HtmlCells$1 = (
       if (tdcell.isMerge) {
         if (xcolwidth && tdcell.colspan) {
           for (var i2 = Cindex; i2 < Cindex + tdcell.colspan; i2++) {
-            cellwidth += Number(xcolwidth[i2]);
+            cellwidth += xcolwidth[i2] == void 0 ? this.defaultColWidth : Number(xcolwidth[i2]);
           }
         }
         if (yrowheight && tdcell.rowspan) {
           for (var j2 = Rindex; j2 < Rindex + tdcell.rowspan; j2++) {
-            cellheight += Number(yrowheight[j2]);
+            cellheight += yrowheight[j2] == void 0 ? this.defaultRowHeight : Number(yrowheight[j2]);
           }
         }
       } else {
@@ -184556,7 +184585,7 @@ var HtmlCells$1 = (
         style2 = style2.replace("flex", "block");
         return "<div " + style2 + " " + cellid + '><div style="' + transstr + '">' + this.getValue(tdValue.value, 'style="top:0"') + "</div></div>";
       }
-      return "<div " + style2 + " " + cellid + '><div style="margin:auto;' + transstr + '">' + this.getValue(tdValue.value, 'style="top:0"') + "</div></div>";
+      return "<div " + style2 + " " + cellid + '><div style="maring:1px auto;' + transstr + '">' + this.getValue(tdValue.value, 'style="top:0"') + "</div></div>";
     };
     HtmlCells2.prototype.getTdContent = function(cellid, td, border, ishidenrow) {
       if (ishidenrow === void 0) {
@@ -184596,7 +184625,7 @@ var HtmlCells$1 = (
           var td = cells.tds[key2];
           var border = cells.borders[key2];
           if (row == 0) {
-            var width = this.sheet.config.columnlen ? this.sheet.config.columnlen[col_1] : this.defaultColWidth;
+            var width = this.sheet.config.columnlen && this.sheet.config.columnlen[col_1] != void 0 ? this.sheet.config.columnlen[col_1] : this.defaultColWidth;
             if (!border)
               width++;
             width = ishiddencol ? 0 : width;
@@ -184612,7 +184641,7 @@ var HtmlCells$1 = (
                 if (ishidenrow) {
                   rowHeight = 0;
                 } else {
-                  rowHeight = this.sheet.config.rowlen ? this.sheet.config.rowlen[row] : this.defaultRowHeight;
+                  rowHeight = this.sheet.config.rowlen && this.sheet.config.rowlen[row] != void 0 ? this.sheet.config.rowlen[row] : this.defaultRowHeight;
                   rowHeight = rowHeight || this.defaultRowHeight;
                   if (rowHeight < 5) {
                     rowHeight = 0;
@@ -187889,6 +187918,8 @@ class PrintApi extends BaseInstance {
     const sheetHeight = this.reportApi.sheetApi.getSheetHeight(sheetHandle);
     const countRow = this.reportApi.rowColApi.getRows(sheetHandle);
     const countCol = this.reportApi.rowColApi.getCols(sheetHandle);
+    console.log(countRow, countCol);
+    console.log(sheetWidth, sheetHeight);
     const dh = (a4Height - sheetHeight) / countRow;
     for (let i2 = 0; i2 < countRow - 1; i2++) {
       let height = this.reportApi.rowColApi.getRowHeight(i2, sheetHandle);
@@ -188052,7 +188083,8 @@ class RowColApi extends BaseInstance {
   getColWidth(colIndex, sheetHandle) {
     let cindex = this.utilities.isNull(sheetHandle) ? this.luckysheet.getSheet().order : Number(sheetHandle);
     const sheet = this.luckysheet.getSheet({ order: cindex });
-    let swidth = Number(sheet.config.columnlen[colIndex]);
+    let defaultWidth = this.luckysheet.getDefaultColWidth({ order: cindex });
+    let swidth = !this.utilities.isNull(sheet.config.columnlen[colIndex]) ? Number(sheet.config.columnlen[colIndex]) : defaultWidth;
     return swidth;
   }
   /**
@@ -188079,7 +188111,8 @@ class RowColApi extends BaseInstance {
   getRowHeight(rowIndex, sheetHandle) {
     let cindex = this.utilities.isNull(sheetHandle) ? this.luckysheet.getSheet().order : Number(sheetHandle);
     const sheet = this.luckysheet.getSheet({ order: cindex });
-    let sheight = Number(sheet.config.rowlen[rowIndex]);
+    let defaultHeight = this.luckysheet.getDefaultRowHeight({ order: cindex });
+    let sheight = !this.utilities.isNull(sheet.config.rowlen[rowIndex]) ? Number(sheet.config.rowlen[rowIndex]) : defaultHeight;
     return sheight;
   }
   /**
@@ -188121,26 +188154,39 @@ class RowColApi extends BaseInstance {
    * @param sheetHandle
    */
   getRows(sheetHandle) {
-    let config = this.reportApi.sheetApi.getSheetConfig(sheetHandle);
-    if (!this.utilities.isNull(config) && !this.utilities.isNull(config.rowlen)) {
-      const keys6 = Object.keys(config.rowlen);
-      return keys6.length;
-    } else {
-      return 0;
+    let cindex = this.utilities.isNull(sheetHandle) ? this.luckysheet.getSheet().order : Number(sheetHandle);
+    const datas = this.luckysheet.getSheetData({ order: cindex });
+    let length = 0;
+    if (datas.length == 0) {
+      return length;
+    }
+    console.log(datas.length);
+    for (const row of datas) {
+      const cell = row[0];
+      if (!this.utilities.isNull(cell)) {
+        length++;
+      }
     }
+    return length;
   }
   /**
    * 获取总列数
    * @param sheetHandle
    */
   getCols(sheetHandle) {
-    let config = this.reportApi.sheetApi.getSheetConfig(sheetHandle);
-    if (!this.utilities.isNull(config) && !this.utilities.isNull(config.columnlen)) {
-      const keys6 = Object.keys(config.columnlen);
-      return keys6.length;
-    } else {
-      return 0;
+    let cindex = this.utilities.isNull(sheetHandle) ? this.luckysheet.getSheet().order : Number(sheetHandle);
+    const datas = this.luckysheet.getSheetData({ order: cindex });
+    let length = 0;
+    if (datas.length == 0) {
+      return length;
+    }
+    const row = datas[0];
+    for (const cell of row) {
+      if (!this.utilities.isNull(cell)) {
+        length++;
+      }
     }
+    return length;
   }
   /**
    * 删除行
@@ -188596,8 +188642,10 @@ class SheetApi extends BaseInstance {
     let cindex = this.utilities.isNull(sheetHandle) ? this.luckysheet.getSheet().order : Number(sheetHandle);
     let xsheet = this.luckysheet.getSheet({ order: cindex });
     let swidth = 0;
-    for (let p in xsheet.config.columnlen) {
-      swidth += Number(xsheet.config.columnlen[p]);
+    let defaultWidth = this.luckysheet.getDefaultColWidth({ order: cindex });
+    const colCount = this.reportApi.rowColApi.getCols(cindex);
+    for (let col = 0; col < colCount; col++) {
+      swidth += xsheet.config.columnlen && xsheet.config.columnlen[col] != void 0 ? Number(xsheet.config.columnlen[col]) : defaultWidth;
     }
     return swidth + this.reportApi.rowColApi.getCols(cindex);
   }
@@ -188608,8 +188656,10 @@ class SheetApi extends BaseInstance {
     let cindex = this.utilities.isNull(sheetHandle) ? this.luckysheet.getSheet().order : Number(sheetHandle);
     let xsheet = this.luckysheet.getSheet({ order: cindex });
     let sheight = 0;
-    for (let p in xsheet.config.rowlen) {
-      sheight += Number(xsheet.config.rowlen[p]);
+    let defaultHeight = this.luckysheet.getDefaultRowHeight({ order: cindex });
+    const rowCount = this.reportApi.rowColApi.getRows(cindex);
+    for (let row = 0; row < rowCount; row++) {
+      sheight += xsheet.config.rowlen && xsheet.config.rowlen[row] != void 0 ? Number(xsheet.config.rowlen[row]) : defaultHeight;
     }
     return sheight + this.reportApi.rowColApi.getRows(cindex);
   }