@newview/ui 1.1.40 → 1.1.41

package/README.md

@@ -1,3 +1,8 @@
+### 1.1.40
+1、优化LuckySheet 从Excel导入后，预览边框不显示问题。
+2、优化LuckySheet 获取行数、列数API逻辑
+3、优化LuckySheet 获取行高、列框API逻辑
+
 ### 1.1.40
 1、LuckySheet 从Excel导入后，预览边框不显示问题。
 

package/dist/newview-ui.js

@@ -184167,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 {
@@ -184362,21 +184364,14 @@ 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 endRowIndex = border.value.row_index + td.rowspan - 1;
-        var endColIndex = border.value.col_index + td.colspan - 1;
-        var endKey = endRowIndex + "_" + endColIndex;
-        var endRightStyle = this.endTdRightStyle[endKey];
-        if (endRightStyle != void 0) {
-          tdBorders[key2].right = endRightStyle ? endRightStyle.borderNumber : 0;
-          this.setCss(style2, "border-right", endRightStyle ? endRightStyle.css : void 0);
-        } else {
-          this.startTds[endKey] = { startRowIndex: border.value.row_index, startColIndex: border.value.col_index };
-        }
-      } else {
-        var startRowCol = this.startTds[key2];
-        if (startRowCol != void 0) {
-          var startKey = startRowCol.startRowIndex + "_" + startRowCol.startColIndex;
+      } 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,
@@ -184387,8 +184382,6 @@ var HtmlCells$1 = (
           var startStyle = tdBorders[startKey].style;
           tdBorders[startKey].right = rightStyle ? rightStyle.borderNumber : 0;
           this.setCss(startStyle, "border-right", rightStyle ? rightStyle.css : void 0);
-        } else {
-          this.endTdRightStyle[key2] = rightStyle;
         }
       }
     };
@@ -184448,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 {
@@ -184632,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;
@@ -184648,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;
@@ -187925,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);
@@ -188088,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;
   }
   /**
@@ -188115,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;
   }
   /**
@@ -188157,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;
   }
   /**
    * 删除行
@@ -188632,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);
   }
@@ -188644,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);
   }