@newview/ui 1.1.39 → 1.1.40

package/README.md

@@ -1,3 +1,6 @@
+### 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",
@@ -184354,6 +184362,34 @@ 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;
+          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);
+        } else {
+          this.endTdRightStyle[key2] = rightStyle;
+        }
       }
     };
     HtmlCells2.prototype.parseTdBorders = function(borderInfo) {
@@ -184371,6 +184407,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 +184440,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;
@@ -184556,7 +184592,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) {