@gingkoo/base-server 0.0.4-alpha.39 → 0.0.4-alpha.40

package/backend/utils/import-excel.js

@@ -330,16 +330,29 @@ const excelImport = async (filePath = '') => {
  * @param {string[][]} sheetData sheet 数据
  * @param {object} cols 表头信息 e.g { '表名': {name: string | string[], dict: {[key: string]: string}}, dcitMatch: 'include' | 'equal', dictIgnoreCase: boolean }// name 里面是数据库的 字段名，dict 是字典的 key,  dcitMatch是匹配规则 include 包含就行  equal 完全匹配， dictIgnoreCase 是否不区分大小写匹配 默认 false 区分
  * @param {number} options.headerMatchCount 匹配上几个是表头 默认 2 个
- * @param {string} options.uniqueKey 唯一 key  这些值不能重复
+ * @param {string | string[]} options.uniqueKey 唯一 key  这些值不能重复,如果是数组，则表示多个字段组合唯一
  * @param {string[]} options.validKeys 有效值  这些值不能为空
  * @param {（text: string）=> void} options.onLogger 记录日志
  */
 function getSheetData(sheetName, sheetData, cols, options = {}) {
   let headerMatchCount = options?.headerMatchCount || 2;
-  let uniqueKey = options?.uniqueKey || '';
+  let uniqueKey = options?.uniqueKey || [];
   let validKeys = options?.validKeys || [];
-  if (uniqueKey && !validKeys.includes(uniqueKey)) {
-    validKeys.push(uniqueKey);
+  if (typeof uniqueKey === 'string') {
+    uniqueKey = [uniqueKey];
+  }
+  if (!Array.isArray(uniqueKey)) {
+    uniqueKey = [];
+  }
+  if (!Array.isArray(validKeys)) {
+    validKeys = [];
+  }
+  if (uniqueKey.length) {
+    uniqueKey.forEach((it) => {
+      if (!validKeys.includes(it)) {
+        validKeys.push(it);
+      }
+    });
   }
   let onLogger = options?.onLogger || function () {};
   let headerKeys = Object.keys(cols);
@@ -440,15 +453,24 @@ function getSheetData(sheetName, sheetData, cols, options = {}) {
       }
     }
 
-    if (uniqueKey) {
+    if (uniqueKey.length) {
+      let key = uniqueKey
+        .map((it) => {
+          return row[it] ?? '';
+        })
+        .join('-_-');
       // 存在唯一 key 检查
-      if (uniques.includes(row[uniqueKey])) {
+      if (uniques.includes(key)) {
         onLogger(
-          `{danger|${sheetName}} sheet 第 ${i + headerIndex + 2} 行 解析失败，原因：{danger|${sheetColNameMap[uniqueKey]}} 列的值重复`,
+          `{danger|${sheetName}} sheet 第 ${i + headerIndex + 2} 行 解析失败，原因：{danger|${uniqueKey
+            .map((it) => {
+              return sheetColNameMap[it];
+            })
+            .join('+')}} 列的值重复`,
         );
         return false;
       } else {
-        uniques.push(row[uniqueKey]);
+        uniques.push(key);
       }
     }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gingkoo/base-server",
-  "version": "0.0.4-alpha.39",
+  "version": "0.0.4-alpha.40",
   "description": "",
   "main": "app.js",
   "scripts": {
@@ -9,7 +9,7 @@
     "serve": "nodemon serve -p 1000",
     "check": "node scripts/check_publish.js",
     "clean": "rimraf dist",
-    "prepublishOnly": "npm run check && npm run build"
+    "prepublishOnly": "npm run check "
   },
   "files": [
     "dist",