export-to-exceljs-util 1.0.7 → 1.0.9

package/README.md

@@ -65,7 +65,7 @@ const data = [
 const fileName = "测试数据.xlsx";
 
 // 其他信息（可选）
-const otherInfo = null;
+const otherInfo = '注释：这里是一些其他信息';
 
 // 创建 Excel 导出实例
 const excelExporter = new ExcelExporter(columns, data, fileName, otherInfo);

package/defaultExport.js

@@ -20,7 +20,7 @@ const borderStyle = {
   right: { style: "thin" },
 };
 export default class DefaultExport {
-  constructor(columns, data, filename = "export.xlsx", describe = []) {
+  constructor(columns, data, filename = "export.xlsx", describe = "") {
     this.columns = columns;
     this.data = data;
     this.filename = filename;
@@ -180,19 +180,33 @@ export default class DefaultExport {
 
   generateDescribe(worksheet) {
     if (this.describe) {
-      // 定义开始的位置
-      const startCell = this.data.length + 7;
-      const endCell = startCell  + 9;
-      worksheet.mergeCells(`A${startCell}:E${endCell}`);
+      // 定义开始和结束单元格的位置
+      let startCell = this.data.length + 7;
+      let endCell = 0;
 
       // 在表格底部加上文字解释
       let combinedText = this.describe;
+
+      // 合并单元格处理,根据描述信息的类型
+      if (typeof this.describe === "string") {
+        endCell = startCell + 10;
+      } else if (Array.isArray(this.describe)) {
+        endCell = startCell + this.describe.length;
+        combinedText = this.describe.join("\n");
+      } else {
+        endCell = startCell;
+      }
+      worksheet.mergeCells(`A${startCell}:H${endCell}`);
+
       const mergedCells = [
         `A${startCell}`,
         `B${startCell}`,
         `C${startCell}`,
         `D${startCell}`,
         `E${startCell}`,
+        `F${startCell}`,
+        `G${startCell}`,
+        `H${startCell}`,
       ];
 
       // 设置每个合并单元格的自动换行属性

package/index.js

@@ -1,8 +1,7 @@
 import { saveAs } from "file-saver";
 import DefaultExport from "./defaultExport.js";
-import { workerUrl, retainTitleAndKey } from "./utils/index";
-
-class ExcelExporter1 {
+import { workerScript, retainTitleAndKey } from "./utils/index";
+class ExcelExporter {
   constructor(columns, data, filename = "导出数据.xlsx", describe = []) {
     this.columns = columns;
     this.data = data;
@@ -10,27 +9,28 @@ class ExcelExporter1 {
     this.describe = describe;
   }
 
-  async exportToExcel() {
-    try {
-      if (this.data.length > 10000) {
-        await this.exportLargeDataSet();
-      } else {
-        await this.exportSmallDataSet();
-      }
-    } catch (error) {
-      console.error("Export failed:", error);
+  exportToExcel() {
+    if (this.data.length > 10000) {
+      this.exportLargeDataSet();
+    } else {
+      this.exportSmallDataSet();
     }
   }
 
-  async exportLargeDataSet() {
+  exportLargeDataSet() {
+    // 创建 Blob 对象
+    const blob = new Blob([workerScript()], { type: "text/javascript" });
+
+    // 创建指向 Blob 的 URL
+    const workerUrl = URL.createObjectURL(blob);
 
     // 创建 Web Worker 实例
     const writeBufferWorker = new Worker(workerUrl);
 
-    // 格式化数组数据
+    // 处理数据格式，保留标题和键
     const formatColumns = retainTitleAndKey(this.columns);
 
-    // 发送数据到 Web Worker
+    // 向 Web Worker 实例发送数据
     writeBufferWorker.postMessage({
       columns: formatColumns,
       data: this.data,
@@ -38,24 +38,28 @@ class ExcelExporter1 {
       filename: this.filename,
     });
 
-    // 监听 Web Worker 的消息
+    // 监听 Web Worker 实例的消息
     writeBufferWorker.onmessage = (e) => {
+      // 下载文件
       const { buffer, filename } = e.data;
       const blob = new Blob([buffer], { type: "application/octet-stream" });
-      // 下载文件
       saveAs(blob, filename);
+
       // 释放对象 URL
       URL.revokeObjectURL(workerUrl);
+
       // 终止 Web Worker
       writeBufferWorker.terminate();
     };
 
     writeBufferWorker.onerror = (error) => {
       console.error("Worker error:", error);
+      URL.revokeObjectURL(workerUrl);
+      writeBufferWorker.terminate();
     };
   }
 
-  async exportSmallDataSet() {
+  exportSmallDataSet() {
     const defaultExport = new DefaultExport(
       this.columns,
       this.data,
@@ -66,4 +70,4 @@ class ExcelExporter1 {
   }
 }
 
-export default ExcelExporter1;
+export default ExcelExporter;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "export-to-exceljs-util",
-  "version": "1.0.7",
+  "version": "1.0.9",
   "description": "使用exceljs导出excel文件",
   "main": "index.js",
   "scripts": {

package/utils/index.js

@@ -1,221 +1,221 @@
 export function retainTitleAndKey(items) {
-  return items.map((item) => {
-    // 如果项目是一个数组，递归调用这个函数
-    if (Array.isArray(item)) {
-      return retainTitleAndKey(item);
-    }
-    // 如果项目是一个对象，处理 title, key 和 children 属性
-    if (typeof item === "object" && item !== null) {
-      // 创建一个新对象，只包含 title 和 key 属性
-      let newItem = {
-        title: item.title,
-        key: item.key,
-      };
-      // 如果存在 children 属性，递归处理它
-      if (item.children && Array.isArray(item.children)) {
-        newItem.children = retainTitleAndKey(item.children);
+    return items.map((item) => {
+      // 如果项目是一个数组，递归调用这个函数
+      if (Array.isArray(item)) {
+        return retainTitleAndKey(item);
       }
-      return newItem;
-    }
-    // 如果项目既不是数组也不是对象，直接返回它
-    return item;
-  });
-}
-
-function getworkerUrl() {
-  const workerScript = `
-      importScripts("https://cdn.bootcdn.net/ajax/libs/exceljs/4.4.0/exceljs.min.js");
-      const fontStyle = {
-              name: "Arial",
-              size: 10,
-              bold: true, // 设置文字加粗
-              color: { argb: "FF000000" },
-              };
-              const alignmentStyle = (vertical = "middle", horizontal = "center") => {
-              return {
-                  vertical,
-                  horizontal,
-              };
-      };
-          
-      const borderStyle = {
-          top: { style: "thin" },
-          left: { style: "thin" },
-          bottom: { style: "thin" },
-          right: { style: "thin" },
-      };
-          
-      function generateHeaders(worksheet, columns, rowIndex = 1, colIndexStart = 1, maxDepth = null) {
-              let maxRowIndex = rowIndex;
-              let colIndex = colIndexStart;
-              
-              // 计算整个表头的最大深度（用于单级表头行合并）
-              if (maxDepth === null) {
-                  maxDepth = getMaxDepth(columns);
-              }
-              
-              columns.forEach((column) => {
-                  const currentRowIndex = rowIndex;
-                  const currentColIndex = colIndex;
-              
-                  // 计算列的跨度和行的跨度
-                  const colSpan = getColSpan(column);
-                  const rowSpan = getRowSpan(column, maxDepth - rowIndex + 1);
-              
-                  // 设置表头单元格值并应用样式
-                  const cell = worksheet.getCell(currentRowIndex, currentColIndex);
-                  cell.value = column.title;
-                  cell.alignment = alignmentStyle();
-                  cell.border = borderStyle;
-                  cell.font = fontStyle;
-                  cell.fill = {
-                  type: "pattern",
-                  pattern: "solid",
-                  fgColor: { argb: "87CEEB" },
-                  };
-              
-                  // 合并单元格处理
-                  if (colSpan > 1) {
-                  worksheet.mergeCells(
-                      currentRowIndex,
-                      currentColIndex,
-                      currentRowIndex,
-                      currentColIndex + colSpan - 1
-                  );
-                  }
-              
-                  // 处理跨行合并的情况
-                  if (rowSpan > 1) {
-                  worksheet.mergeCells(
-                      currentRowIndex,
-                      currentColIndex,
-                      currentRowIndex + rowSpan - 1,
-                      currentColIndex
-                  );
-                  }
-              
-                  // 处理子列
-                  if (column.children && column.children.length > 0) {
-                  const childMaxRowIndex = generateHeaders(
-                      worksheet,
-                      column.children,
-                      currentRowIndex + 1,
-                      currentColIndex,
-                      maxDepth
-                  );
-                  maxRowIndex = Math.max(maxRowIndex, childMaxRowIndex);
-                  } else {
-                  maxRowIndex = Math.max(maxRowIndex, currentRowIndex + rowSpan - 1);
-                  }
-              
-                  colIndex += colSpan;
-              });
-              
-              return maxRowIndex;
-      }
-          
-      function getColSpan(column) {
-          if (!column.children || column.children.length === 0) {
-              return 1;
-          }
-          return column.children.reduce((sum, child) => sum + getColSpan(child), 0);
+      // 如果项目是一个对象，处理 title, key 和 children 属性
+      if (typeof item === "object" && item !== null) {
+        // 创建一个新对象，只包含 title 和 key 属性
+        let newItem = {
+          title: item.title,
+          key: item.key,
+        };
+        // 如果存在 children 属性，递归处理它
+        if (item.children && Array.isArray(item.children)) {
+          newItem.children = retainTitleAndKey(item.children);
+        }
+        return newItem;
       }
-      
-      function getRowSpan(column, remainingDepth) {
-          if (!column.children || column.children.length === 0) {
-              return remainingDepth;
-          }
-          return 1;
-      }
-          
-      function getMaxDepth(columns) {
-          return columns.reduce((max, column) => {
-              const depth = column.children ? 1 + getMaxDepth(column.children) : 1;
-              return Math.max(max, depth);
-          }, 1);
-      }
-      
-      function fillData(worksheet, data, columns) {
-          const rows = data.map((rowData) =>
-              columns.flatMap((col) => extractValues(rowData, col))
-          );
-          worksheet.addRows(rows);
-      }
-          
-      function autoFitColumns(worksheet) {
-          worksheet.columns.forEach((column) => {
-              let maxLength = 0;
-              column.eachCell({ includeEmpty: true }, (cell) => {
-              const columnLength = cell.value ? cell.value.toString().length : 10;
-              if (columnLength > maxLength) {
-                  maxLength = columnLength;
-              }
-              });
-              column.width = maxLength < 10 ? maxLength + 5 : maxLength;
-          });
-      }
-          
-      function generateDescribe(worksheet, describe, data) {
+      // 如果项目既不是数组也不是对象，直接返回它
+      return item;
+    });
+  }
+  
+  export function workerScript() {
+    const workerScript = `
+        importScripts("https://cdn.bootcdn.net/ajax/libs/exceljs/4.4.0/exceljs.min.js");
+        const fontStyle = {
+                name: "Arial",
+                size: 10,
+                bold: true, // 设置文字加粗
+                color: { argb: "FF000000" },
+                };
+                const alignmentStyle = (vertical = "middle", horizontal = "center") => {
+                return {
+                    vertical,
+                    horizontal,
+                };
+        };
+            
+        const borderStyle = {
+            top: { style: "thin" },
+            left: { style: "thin" },
+            bottom: { style: "thin" },
+            right: { style: "thin" },
+        };
+            
+        function generateHeaders(worksheet, columns, rowIndex = 1, colIndexStart = 1, maxDepth = null) {
+                let maxRowIndex = rowIndex;
+                let colIndex = colIndexStart;
+                
+                // 计算整个表头的最大深度（用于单级表头行合并）
+                if (maxDepth === null) {
+                    maxDepth = getMaxDepth(columns);
+                }
+                
+                columns.forEach((column) => {
+                    const currentRowIndex = rowIndex;
+                    const currentColIndex = colIndex;
+                
+                    // 计算列的跨度和行的跨度
+                    const colSpan = getColSpan(column);
+                    const rowSpan = getRowSpan(column, maxDepth - rowIndex + 1);
+                
+                    // 设置表头单元格值并应用样式
+                    const cell = worksheet.getCell(currentRowIndex, currentColIndex);
+                    cell.value = column.title;
+                    cell.alignment = alignmentStyle();
+                    cell.border = borderStyle;
+                    cell.font = fontStyle;
+                    cell.fill = {
+                    type: "pattern",
+                    pattern: "solid",
+                    fgColor: { argb: "87CEEB" },
+                    };
+                
+                    // 合并单元格处理
+                    if (colSpan > 1) {
+                    worksheet.mergeCells(
+                        currentRowIndex,
+                        currentColIndex,
+                        currentRowIndex,
+                        currentColIndex + colSpan - 1
+                    );
+                    }
+                
+                    // 处理跨行合并的情况
+                    if (rowSpan > 1) {
+                    worksheet.mergeCells(
+                        currentRowIndex,
+                        currentColIndex,
+                        currentRowIndex + rowSpan - 1,
+                        currentColIndex
+                    );
+                    }
+                
+                    // 处理子列
+                    if (column.children && column.children.length > 0) {
+                    const childMaxRowIndex = generateHeaders(
+                        worksheet,
+                        column.children,
+                        currentRowIndex + 1,
+                        currentColIndex,
+                        maxDepth
+                    );
+                    maxRowIndex = Math.max(maxRowIndex, childMaxRowIndex);
+                    } else {
+                    maxRowIndex = Math.max(maxRowIndex, currentRowIndex + rowSpan - 1);
+                    }
+                
+                    colIndex += colSpan;
+                });
+                
+                return maxRowIndex;
+        }
+            
+        function getColSpan(column) {
+            if (!column.children || column.children.length === 0) {
+                return 1;
+            }
+            return column.children.reduce((sum, child) => sum + getColSpan(child), 0);
+        }
+        
+        function getRowSpan(column, remainingDepth) {
+            if (!column.children || column.children.length === 0) {
+                return remainingDepth;
+            }
+            return 1;
+        }
+            
+        function getMaxDepth(columns) {
+            return columns.reduce((max, column) => {
+                const depth = column.children ? 1 + getMaxDepth(column.children) : 1;
+                return Math.max(max, depth);
+            }, 1);
+        }
+        
+        function fillData(worksheet, data, columns) {
+            const rows = data.map((rowData) =>
+                columns.flatMap((col) => extractValues(rowData, col))
+            );
+            worksheet.addRows(rows);
+        }
+            
+        function autoFitColumns(worksheet) {
+            worksheet.columns.forEach((column) => {
+                let maxLength = 0;
+                column.eachCell({ includeEmpty: true }, (cell) => {
+                const columnLength = cell.value ? cell.value.toString().length : 10;
+                if (columnLength > maxLength) {
+                    maxLength = columnLength;
+                }
+                });
+                column.width = maxLength < 10 ? maxLength + 5 : maxLength;
+            });
+        }
+            
+        function generateDescribe(worksheet, describe, data) {
           if (describe) {
-              console.log('describe',describe);
-              // 定义开始的位置
-              const startCell = data.length + 7;
-              const endCell = startCell + 9;
-          
+              // 定义开始和结束单元格的位置
+              let startCell = data.length + 7;
+              let endCell = 0;
+              // 在表格底部加上文字解释
+              let combinedText = describe;
+              if (typeof describe === "string") {
+                  endCell = startCell + 10;
+              } else if (Array.isArray(describe)) {
+                  endCell = startCell + describe.length;
+                  combinedText = describe.join("\\n");
+              } else {
+                  endCell = startCell;
+              }
               // 合并单元格的范围
               const mergeStart = 'A' + startCell;
-              const mergeEnd = 'E' + endCell;
-              worksheet.mergeCells(mergeStart + ':' + mergeEnd);
-          
-              // 在表格底部加上文字解释
-              let combinedText = describe.join('\\n');
+              const mergeEnd = 'H' + endCell;
               const mergedCells = [
-              'A' + startCell,
-              'B' + startCell,
-              'C' + startCell,
-              'D' + startCell,
-              'E' + startCell,
+                  'A' + startCell,
+                  'B' + startCell,
+                  'C' + startCell,
+                  'D' + startCell,
+                  'E' + startCell,
+                  'F' + startCell,
+                  'G' + startCell,
+                  'H' + startCell
               ];
-          
               // 设置每个合并单元格的自动换行属性
               mergedCells.forEach(function(cell) {
-              const currentCell = worksheet.getCell(cell);
-              currentCell.value = combinedText;
-              currentCell.font = fontStyle;
-              currentCell.alignment = {
-                  vertical: "top",
-                  horizontal: "left",
-                  wrapText: true // 设置自动换行
-              };
+                  const currentCell = worksheet.getCell(cell);
+                  currentCell.value = combinedText;
+                  currentCell.font = fontStyle;
+                  currentCell.alignment = {
+                      vertical: "top",
+                      horizontal: "left",
+                      wrapText: true // 设置自动换行
+                  };
               });
               worksheet.getCell(mergeStart).border = borderStyle;
           }
-      }
-          
-      function extractValues(rowData, column) {
-          if (column.children && column.children.length > 0) {
-              return column.children.flatMap((child) => extractValues(rowData, child));
-          } else {
-              return [rowData[column.key]];
-          }
-      }
-      self.onmessage = async function (e) {
-      const { data, columns, describe, filename } = e.data;
-      const workbook = new ExcelJS.Workbook();
-      const worksheet = workbook.addWorksheet("Sheet1");
-      generateHeaders(worksheet, columns);
-      fillData(worksheet, data, columns);
-      generateDescribe(worksheet, describe, data);
-      const buffer = await workbook.xlsx.writeBuffer();
-      self.postMessage({ buffer, filename });
-      const endTime = performance.now();
-  };`;
-
-  // 创建 Blob 对象
-  const blob = new Blob([workerScript], { type: "text/javascript" });
-
-  // 创建指向 Blob 的 URL
-  return URL.createObjectURL(blob);
-}
-
-export const workerUrl = getworkerUrl();
+        }
+            
+        function extractValues(rowData, column) {
+            if (column.children && column.children.length > 0) {
+                return column.children.flatMap((child) => extractValues(rowData, child));
+            } else {
+                return [rowData[column.key]];
+            }
+        }
+        self.onmessage = async function (e) {
+        const { data, columns, describe, filename } = e.data;
+        const workbook = new ExcelJS.Workbook();
+        const worksheet = workbook.addWorksheet("Sheet1");
+        generateHeaders(worksheet, columns);
+        fillData(worksheet, data, columns);
+        generateDescribe(worksheet, describe, data);
+        const buffer = await workbook.xlsx.writeBuffer();
+        self.postMessage({ buffer, filename });
+        const endTime = performance.now();
+    };`;
+    return workerScript
+  }
+