@nocobase/plugin-action-import 2.0.0-alpha.5 → 2.0.0-alpha.51

package/dist/server/services/xlsx-importer.js

@@ -187,12 +187,13 @@ class XlsxImporter extends import_events.default {
   getModel() {
     return this.repository instanceof import_database.RelationRepository ? this.repository.targetModel : this.repository.model;
   }
-  async handleRowValuesWithColumns(row, rowValues, options) {
-    for (let index = 0; index < this.options.columns.length; index++) {
-      const column = this.options.columns[index];
+  async handleRowValuesWithColumns(row, rowValues, options, columns) {
+    var _a;
+    for (let index = 0; index < columns.length; index++) {
+      const column = columns[index];
       const field = this.options.collection.getField(column.dataIndex[0]);
       if (!field) {
-        throw new import_errors.ImportValidationError("Import validation.Field not found", {
+        throw new import_errors.ImportValidationError("Import validation. Field not found", {
           field: column.dataIndex[0]
         });
       }
@@ -215,7 +216,15 @@ class XlsxImporter extends import_events.default {
         ctx.targetCollection = field.targetCollection();
         ctx.filterKey = column.dataIndex[1];
       }
-      rowValues[dataKey] = await interfaceInstance.toValue(this.trimString(str), ctx);
+      try {
+        rowValues[dataKey] = str == null ? null : await interfaceInstance.toValue(this.trimString(str), ctx);
+      } catch (error) {
+        throw new import_errors.ImportValidationError("Failed to parse field {{field}} in row {{rowIndex}}: {{message}}", {
+          rowIndex: ((_a = options == null ? void 0 : options.context) == null ? void 0 : _a.handingRowIndex) || 1,
+          field: dataKey,
+          message: error.message
+        });
+      }
     }
     const model = this.getModel();
     const guard = import_database.UpdateGuard.fromOptions(model, {
@@ -229,10 +238,11 @@ class XlsxImporter extends import_events.default {
     var _a, _b;
     let { handingRowIndex = 1 } = options;
     const { transaction } = runOptions;
+    const columns = this.getColumnsByPermission(options == null ? void 0 : options.context);
     const rows = [];
     for (const row of chunkRows) {
       const rowValues = {};
-      await this.handleRowValuesWithColumns(row, rowValues, runOptions);
+      await this.handleRowValuesWithColumns(row, rowValues, runOptions, columns);
       rows.push({
         ...this.options.rowDefaultValues || {},
         ...rowValues
@@ -264,7 +274,7 @@ class XlsxImporter extends import_events.default {
       });
       throw new import_errors.ImportError(`Import failed at row ${handingRowIndex}`, {
         rowIndex: handingRowIndex,
-        rowData: rows[handingRowIndex],
+        rowData: rows[handingRowIndex - (this.options.explain ? 2 : 1)],
         cause: error
       });
     }
@@ -288,11 +298,6 @@ class XlsxImporter extends import_events.default {
     for (let i = 0; i < instances.length; i++) {
       const instance = instances[i];
       const value = values[i];
-      await this.loggerService.measureExecutedTime(
-        async () => (0, import_database.updateAssociations)(instance, value, { transaction }),
-        `Row ${i + 1}: updateAssociations completed in {time}ms`,
-        "debug"
-      );
       if (insertOptions.hooks !== false) {
         await this.loggerService.measureExecutedTime(
           async () => {
@@ -308,6 +313,11 @@ class XlsxImporter extends import_events.default {
           "debug"
         );
       }
+      await this.loggerService.measureExecutedTime(
+        async () => (0, import_database.updateAssociations)(instance, value, { transaction }),
+        `Row ${i + 1}: updateAssociations completed in {time}ms`,
+        "debug"
+      );
       if ((context == null ? void 0 : context.skipWorkflow) !== true) {
         await this.loggerService.measureExecutedTime(
           async () => {
@@ -378,7 +388,7 @@ class XlsxImporter extends import_events.default {
         headers: expectedHeaders.join(", ")
       });
     }
-    data = this.alignWithHeaders({ data, expectedHeaders, headers });
+    data = this.alignWithHeaders({ data, expectedHeaders, headerRowIndex });
     const rows = data.slice(headerRowIndex + 1);
     if (rows.length === 0) {
       throw new import_errors.ImportValidationError("No data to import");
@@ -386,8 +396,14 @@ class XlsxImporter extends import_events.default {
     return [headers, ...rows];
   }
   alignWithHeaders(params) {
-    const { expectedHeaders, headers, data } = params;
-    const keepCols = headers.map((x, i) => expectedHeaders.includes(x) ? i : -1).filter((i) => i > -1);
+    const { data, expectedHeaders, headerRowIndex } = params;
+    const headerRow = data[headerRowIndex];
+    const keepCols = expectedHeaders.map((header) => headerRow.indexOf(header));
+    if (keepCols.some((index) => index < 0)) {
+      throw new import_errors.ImportValidationError("Headers not found. Expected headers: {{headers}}", {
+        headers: expectedHeaders.join(", ")
+      });
+    }
     return data.map((row) => keepCols.map((i) => row[i]));
   }
   findAndValidateHeaders(options) {
@@ -401,6 +417,7 @@ class XlsxImporter extends import_events.default {
         return { headerRowIndex: rowIndex, headers: orderedHeaders };
       }
     }
+    return { headerRowIndex: -1, headers: [] };
   }
 }
 // Annotate the CommonJS export names for ESM import in node:

package/package.json

@@ -2,12 +2,15 @@
   "name": "@nocobase/plugin-action-import",
   "displayName": "Action: Import records",
   "displayName.zh-CN": "操作：导入记录",
+  "displayName.ru-RU": "Действие: Импорт записей",
   "description": "Import records using excel templates. You can configure which fields to import and templates will be generated automatically.",
+  "description.ru-RU": "Импорт записей с помощью шаблонов Excel: можно настроить, какие поля импортировать, шаблоны будут генерироваться автоматически.",
   "description.zh-CN": "使用 Excel 模板导入数据，可以配置导入哪些字段，自动生成模板。",
-  "version": "2.0.0-alpha.5",
+  "version": "2.0.0-alpha.51",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/action-import",
+  "homepage.ru-RU": "https://docs.nocobase.ru/handbook/action-import",
   "homepage.zh-CN": "https://docs-cn.nocobase.com/handbook/action-import",
   "devDependencies": {
     "@ant-design/icons": "5.x",
@@ -36,7 +39,7 @@
     "@nocobase/test": "2.x",
     "@nocobase/utils": "2.x"
   },
-  "gitHead": "943e035bbec27f9ecfe8ce8857955945f20976f3",
+  "gitHead": "a1e34dd97f370d54f3d80a6b83ab7ddb9c72dc18",
   "keywords": [
     "Actions"
   ]