@gingkoo/base-server 0.0.4-alpha.19 → 0.0.4-alpha.20

package/backend/utils/excel.js

@@ -337,7 +337,45 @@ function getSheetData(worksheet, mapping, linkColumn, linkWorksheetMap, linkMapp
 }
 
 /**
- * 导入多 sheet
+ * 导入多 sheet 他只负责拿数据 给业务那边处理
+ * @param {string} filePath
+ */
+const _excelImportMultisheet2 = async (filePath = '') => {
+  var workbook = new ExcelJS.Workbook();
+  await workbook.xlsx.readFile(filePath);
+  let result = [];
+
+  workbook.eachSheet((worksheet, sheetId) => {
+    let sheetInfo = {
+      sheetName: worksheet.name,
+      worksheet,
+      header: [], // string[]
+      data: [], // stirng[][]
+    };
+
+    worksheet.eachRow((row, rowNumber) => {
+      let rowData = [];
+      row.eachCell((cell, colNumber) => {
+        let colValue = cell.value;
+
+        if (rowNumber == 1) {
+          sheetInfo.header.push(colValue);
+        } else {
+          rowData[colNumber - 1] = colValue;
+        }
+      });
+
+      rowNumber > 1 && sheetInfo.data.push(rowData);
+    });
+
+    result.push(sheetInfo);
+  });
+
+  return result;
+};
+
+/**
+ * 导入多 sheet 结构
  * @param {string} filePath
  * @param {string} mainSheetName 主sheet
  * @param {string} linkColumn 其他 sheet 和 主sheet 关联的列
@@ -348,8 +386,8 @@ const _excelImportMultisheet = async (
   filePath = '',
   mainSheetName = '',
   linkColumn = '',
-  mainMapping = [],
-  linkMapping = '',
+  mainMapping = {},
+  linkMapping = {},
 ) => {
   var workbook = new ExcelJS.Workbook();
   await workbook.xlsx.readFile(filePath);
@@ -717,6 +755,8 @@ module.exports = {
   _excelImport,
   _excelExport,
   _excelImportMultisheet,
+  _excelImportMultisheet2,
   _excelExportMultisheet,
   ExcelHelper,
+  getSheetData,
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gingkoo/base-server",
-  "version": "0.0.4-alpha.19",
+  "version": "0.0.4-alpha.20",
   "description": "",
   "main": "app.js",
   "scripts": {