daiqisheng il y a 3 ans
Parent
commit
efdbda380d
1 fichiers modifiés avec 15 ajouts et 10 suppressions
  1. 15 10
      src/pages/main/performance/common/export.js

+ 15 - 10
src/pages/main/performance/common/export.js

@@ -315,22 +315,27 @@ function addborderToCell(borders) {
             13: "thick",
         },
     };
-    // console.log('borders', borders)
     for (const bor in borders) {
-        // console.log(bor)
-        if (borders[bor].color.indexOf("rgb") === -1) {
-            border[luckyExcel.type[bor]] = {
-                style: luckyExcel.style[borders[bor].style],
-                color: { argb: borders[bor].color.replace("#", "") },
-            };
+        console.log(borders[bor]);
+        if (borders[bor]) {
+            if (borders[bor].color.indexOf("rgb") === -1) {
+                border[luckyExcel.type[bor]] = {
+                    style: luckyExcel.style[borders[bor].style],
+                    color: { argb: borders[bor].color.replace("#", "") },
+                };
+            } else {
+                border[luckyExcel.type[bor]] = {
+                    style: luckyExcel.style[borders[bor].style],
+                    color: { argb: borders[bor].color },
+                };
+            }
         } else {
             border[luckyExcel.type[bor]] = {
-                style: luckyExcel.style[borders[bor].style],
-                color: { argb: borders[bor].color },
+                color: "#000000",
+                style: 1,
             };
         }
     }
-
     return border;
 }