@gingkoo/base-server 0.0.4-alpha.30 → 0.0.4-alpha.32

package/backend/services/services.js

@@ -4,6 +4,7 @@ const isPlainObject = require('lodash/isPlainObject');
 const { sqlExecutor } = require('@gingkoo/node-tools');
 const entity = require('../common/entity');
 const path = require('../utils/path');
+const config = require('../config');
 const generateAvatar = require('../utils/avatar');
 const userService = require('../common/services/user');
 const dictService = require('../common/services/dict');

package/backend/utils/excel.js

@@ -1,6 +1,7 @@
 'use strict';
 const ExcelJS = require('exceljs');
 const { sse, bgTaskEnum } = require('../common/sse');
+// const { importlog } = require('../common/logger');
 const fillHeader = { type: 'pattern', pattern: 'solid', fgColor: { argb: 'ff4576B5' } };
 const fontHeader = {
   name: 'Arial Black',
@@ -85,9 +86,10 @@ async function _excelImport(filePath, dataModel, mappingData, mappingRules = 'de
   var worksheet = workbook.getWorksheet(1);
   let titleRow = worksheet.getRow(1);
   titleRow.eachCell((cell, colNumber) => {
-    if (cell.value in colsMap) {
+    let colValue = cellToString(cell.value);
+    if (colValue in colsMap) {
       let colId = cell.address.match(/[a-zA-Z]+/g)[0];
-      colIndex[colId] = colsMap[cell.value];
+      colIndex[colId] = colsMap[colValue];
     }
   });
 
@@ -95,21 +97,23 @@ async function _excelImport(filePath, dataModel, mappingData, mappingRules = 'de
     let row = worksheet.getRow(i);
     let rec = {};
     row.eachCell((cell, colNumber) => {
+      let colValue = cellToString(cell.value);
+
       let colId = cell.address.match(/[a-zA-Z]+/g)[0];
       if (colId in colIndex) {
         let fieldId = colIndex[colId];
         if (dataModel[fieldId]['source']) {
           //数据字典字段
           let mappingId = dataModel[fieldId]['source']?.split('.')[1];
-          if (mappingData2?.[mappingId]?.data?.[cell.value]) {
-            rec[colIndex[colId]] = mappingData2?.[mappingId]?.data?.[cell.value];
+          if (mappingData2?.[mappingId]?.data?.[colValue]) {
+            rec[colIndex[colId]] = mappingData2?.[mappingId]?.data?.[colValue];
           } else {
             //数据字典匹配不到
-            mappingRules != 'strict' ? (rec[colIndex[colId]] = cell.value) : null;
+            mappingRules != 'strict' ? (rec[colIndex[colId]] = colValue) : null;
           }
         } else {
           //非数据字典字段
-          rec[colIndex[colId]] = cell.value;
+          rec[colIndex[colId]] = colValue;
         }
       }
     });
@@ -288,9 +292,10 @@ function handleImportData(mapping, titleRow) {
   }
 
   titleRow.eachCell((cell, colNumber) => {
-    if (cell.value in colsMap) {
+    let colValue = cellToString(cell.value);
+    if (colValue in colsMap) {
       let colId = cell.address.match(/[a-zA-Z]+/g)[0];
-      colIndex[colId] = colsMap[cell.value];
+      colIndex[colId] = colsMap[colValue];
     }
   });
 
@@ -307,7 +312,7 @@ function getSheetData(worksheet, mapping, linkColumn, linkWorksheetMap, linkMapp
       let rec = {};
       row.eachCell((cell, colNumber) => {
         let colId = cell.address.match(/[a-zA-Z]+/g)[0];
-        let colValue = cell.value;
+        let colValue = cellToString(cell.value);
         if (colId in colIndex) {
           let fieldId = colIndex[colId];
 
@@ -402,6 +407,35 @@ function manualVLOOKUP(formula, worksheet, workbook) {
   return result;
 }
 
+const cellToString = (value) => {
+  if (typeof value == 'string' || typeof value == 'number') {
+    return value + '';
+  }
+
+  if (!value) {
+    return '';
+  }
+
+  let _value = '';
+  if (value.richText) {
+    if (Array.isArray(value.richText)) {
+      value.richText.forEach((v) => {
+        _value += v?.text || '';
+      });
+      return _value;
+    }
+  }
+
+  if (value.error) {
+    _value = '';
+  }
+
+  if (value.result) {
+    _value = value.result + '';
+  }
+  return _value;
+};
+
 /**
  * 导入多 sheet 他只负责拿数据 给业务那边处理
  * @param {string} filePath
@@ -422,25 +456,17 @@ const _excelImportMultisheet2 = async (filePath = '') => {
     worksheet.eachRow((row, rowNumber) => {
       let rowData = [];
       row.eachCell((cell, colNumber) => {
-        let colValue = cell.value;
-
-        if (!colValue && colValue !== 0 && colValue?.result) {
-          colValue = colValue.result;
-        }
+        let colValue = cellToString(cell.value);
 
         if (rowNumber == 1) {
           sheetInfo.header[colNumber - 1] = colValue;
         } else {
           if (cell.formula && cell.formula.includes('VLOOKUP')) {
             colValue = manualVLOOKUP(cell.formula, worksheet, workbook);
+
             if (colValue === null) {
               colValue = cell.value?.result ?? cell.value; // 降级使用原始值
-              if (typeof colValue === 'number') {
-                colValue = colValue.toString();
-              }
-              if (!colValue) {
-                colValue = '';
-              }
+              colValue = cellToString(colValue);
             }
           }
 

package/package.json

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