@nocobase/plugin-action-import 2.1.0-beta.23 → 2.1.0-beta.25

package/dist/externalVersion.js

@@ -10,26 +10,26 @@
 module.exports = {
   "@emotion/css": "11.13.0",
   "@formily/react": "2.3.7",
-  "@nocobase/client": "2.1.0-beta.23",
+  "@nocobase/client": "2.1.0-beta.25",
   "react": "18.2.0",
   "react-i18next": "11.18.6",
   "@ant-design/icons": "5.6.1",
   "@formily/shared": "2.3.7",
   "antd": "5.24.2",
-  "@nocobase/utils": "2.1.0-beta.23",
+  "@nocobase/utils": "2.1.0-beta.25",
   "@formily/antd-v5": "1.2.3",
   "file-saver": "2.0.5",
   "react-dom": "18.2.0",
   "lodash": "4.18.1",
   "@formily/core": "2.3.7",
-  "@nocobase/server": "2.1.0-beta.23",
+  "@nocobase/server": "2.1.0-beta.25",
   "@formily/reactive": "2.3.7",
-  "@nocobase/flow-engine": "2.1.0-beta.23",
-  "@nocobase/actions": "2.1.0-beta.23",
-  "@nocobase/database": "2.1.0-beta.23",
+  "@nocobase/flow-engine": "2.1.0-beta.25",
+  "@nocobase/actions": "2.1.0-beta.25",
+  "@nocobase/database": "2.1.0-beta.25",
   "async-mutex": "0.5.0",
-  "@nocobase/data-source-manager": "2.1.0-beta.23",
+  "@nocobase/data-source-manager": "2.1.0-beta.25",
   "sequelize": "6.35.2",
-  "@nocobase/logger": "2.1.0-beta.23",
+  "@nocobase/logger": "2.1.0-beta.25",
   "mathjs": "15.1.0"
 };

package/dist/node_modules/exceljs/package.json

@@ -1 +1 @@
-{"name":"exceljs","version":"4.4.0","description":"Excel Workbook Manager - Read and Write xlsx and csv Files.","private":false,"license":"MIT","author":{"name":"Guyon Roche","email":"guyon@live.com"},"repository":{"type":"git","url":"https://github.com/exceljs/exceljs.git"},"engines":{"node":">=8.3.0"},"main":"./excel.js","browser":"./dist/exceljs.min.js","types":"./index.d.ts","files":["dist","lib","excel.js","LICENSE","README.md","README_zh.md","index.ts","index.d.ts"],"scripts":{"test":"npm run test:full","test:es5":"export EXCEL_BUILD=es5 && npm run test:full","test:full":"npm run build && npm run test:unit && npm run test:integration && npm run test:end-to-end && npm run test:jasmine","test:version":"npm run build && npm run test:unit && npm run test:integration && npm run test:end-to-end && npm run test:browser && npm run test:dist","test:all":"npm run test:native && npm run test:es5","test:native":"npm run test:full","test:unit":"mocha --require spec/config/setup --require spec/config/setup-unit spec/unit --recursive","test:integration":"mocha --require spec/config/setup spec/integration --recursive","test:end-to-end":"mocha --require spec/config/setup spec/end-to-end --recursive","test:browser":"if [ ! -f .disable-test-browser ]; then npm run build && npm run test:jasmine; fi","test:jasmine":"grunt jasmine","test:unit:es5":"export EXCEL_BUILD=es5 && npm run test:unit","test:integration:es5":"export EXCEL_BUILD=es5 && npm run test:integration","test:end-to-end:es5":"export EXCEL_BUILD=es5 && npm run test:end-to-end","test:dist":"mocha --require spec/config/setup spec/dist --recursive","test:manual":"node spec/manual/app.js","test:typescript":"mocha -r ts-node/register spec/typescript/**/*.spec.ts","clean-build":"npm run clean && npm run build","lint":"eslint --format node_modules/eslint-friendly-formatter .","lint:fix":"prettier-eslint --write $(pwd)'/**/*.js'","lint:staged":"lint-staged","clean":"rm -rf build/ && rm -rf dist","benchmark":"node --expose-gc benchmark","benchmark:debug":"node --expose-gc --inspect-brk --trace-deopt benchmark","build":"grunt build","install-build":"npm install && grunt build","preversion":"npm run clean && npm run build && npm run test:version","postversion":"git push --no-verify && git push --tags --no-verify"},"husky":{"hooks":{"pre-commit":"lint-staged"}},"lint-staged":{"*.js":["prettier-eslint --write","eslint --format node_modules/eslint-friendly-formatter","git add"]},"keywords":["xlsx","json","csv","excel","font","border","fill","number","format","number format","alignment","office","spreadsheet","workbook","defined names","data validations","rich text","in-cell format","outlineLevel","views","frozen","split","pageSetup"],"dependencies":{"archiver":"^5.0.0","dayjs":"^1.8.34","fast-csv":"^4.3.1","jszip":"^3.10.1","readable-stream":"^3.6.0","saxes":"^5.0.1","tmp":"^0.2.0","unzipper":"^0.10.11","uuid":"^8.3.0"},"devDependencies":{"@babel/cli":"^7.10.5","@babel/core":"^7.11.4","@babel/preset-env":"^7.11.0","@types/chai":"^4.2.12","@types/mocha":"^8.0.3","@types/node":"^14.11.2","babelify":"^10.0.0","browserify":"^16.5.2","chai":"^4.2.0","chai-datetime":"^1.7.0","chai-xml":"^0.3.2","core-js":"^3.6.5","dirty-chai":"^2.0.1","eslint":"^6.5.1","eslint-config-airbnb-base":"^14.2.0","eslint-config-prettier":"^6.12.0","eslint-friendly-formatter":"^4.0.1","eslint-plugin-import":"^2.22.0","eslint-plugin-node":"^11.1.0","express":"^4.16.4","got":"^9.0.0","grunt":"^1.3.0","grunt-babel":"^8.0.0","grunt-browserify":"^5.3.0","grunt-contrib-copy":"^1.0.0","grunt-contrib-jasmine":"^2.2.0","grunt-contrib-watch":"^1.1.0","grunt-exorcise":"^2.1.1","grunt-terser":"^1.0.0","husky":"^4.3.0","lint-staged":"^10.2.13","mocha":"^7.2.0","prettier-eslint":"^11.0.0","prettier-eslint-cli":"^5.0.0","regenerator-runtime":"^0.13.7","sax":"^1.2.4","ts-node":"^8.10.2","typescript":"^3.9.7"},"_lastModified":"2026-04-28T15:58:46.836Z"}
+{"name":"exceljs","version":"4.4.0","description":"Excel Workbook Manager - Read and Write xlsx and csv Files.","private":false,"license":"MIT","author":{"name":"Guyon Roche","email":"guyon@live.com"},"repository":{"type":"git","url":"https://github.com/exceljs/exceljs.git"},"engines":{"node":">=8.3.0"},"main":"./excel.js","browser":"./dist/exceljs.min.js","types":"./index.d.ts","files":["dist","lib","excel.js","LICENSE","README.md","README_zh.md","index.ts","index.d.ts"],"scripts":{"test":"npm run test:full","test:es5":"export EXCEL_BUILD=es5 && npm run test:full","test:full":"npm run build && npm run test:unit && npm run test:integration && npm run test:end-to-end && npm run test:jasmine","test:version":"npm run build && npm run test:unit && npm run test:integration && npm run test:end-to-end && npm run test:browser && npm run test:dist","test:all":"npm run test:native && npm run test:es5","test:native":"npm run test:full","test:unit":"mocha --require spec/config/setup --require spec/config/setup-unit spec/unit --recursive","test:integration":"mocha --require spec/config/setup spec/integration --recursive","test:end-to-end":"mocha --require spec/config/setup spec/end-to-end --recursive","test:browser":"if [ ! -f .disable-test-browser ]; then npm run build && npm run test:jasmine; fi","test:jasmine":"grunt jasmine","test:unit:es5":"export EXCEL_BUILD=es5 && npm run test:unit","test:integration:es5":"export EXCEL_BUILD=es5 && npm run test:integration","test:end-to-end:es5":"export EXCEL_BUILD=es5 && npm run test:end-to-end","test:dist":"mocha --require spec/config/setup spec/dist --recursive","test:manual":"node spec/manual/app.js","test:typescript":"mocha -r ts-node/register spec/typescript/**/*.spec.ts","clean-build":"npm run clean && npm run build","lint":"eslint --format node_modules/eslint-friendly-formatter .","lint:fix":"prettier-eslint --write $(pwd)'/**/*.js'","lint:staged":"lint-staged","clean":"rm -rf build/ && rm -rf dist","benchmark":"node --expose-gc benchmark","benchmark:debug":"node --expose-gc --inspect-brk --trace-deopt benchmark","build":"grunt build","install-build":"npm install && grunt build","preversion":"npm run clean && npm run build && npm run test:version","postversion":"git push --no-verify && git push --tags --no-verify"},"husky":{"hooks":{"pre-commit":"lint-staged"}},"lint-staged":{"*.js":["prettier-eslint --write","eslint --format node_modules/eslint-friendly-formatter","git add"]},"keywords":["xlsx","json","csv","excel","font","border","fill","number","format","number format","alignment","office","spreadsheet","workbook","defined names","data validations","rich text","in-cell format","outlineLevel","views","frozen","split","pageSetup"],"dependencies":{"archiver":"^5.0.0","dayjs":"^1.8.34","fast-csv":"^4.3.1","jszip":"^3.10.1","readable-stream":"^3.6.0","saxes":"^5.0.1","tmp":"^0.2.0","unzipper":"^0.10.11","uuid":"^8.3.0"},"devDependencies":{"@babel/cli":"^7.10.5","@babel/core":"^7.11.4","@babel/preset-env":"^7.11.0","@types/chai":"^4.2.12","@types/mocha":"^8.0.3","@types/node":"^14.11.2","babelify":"^10.0.0","browserify":"^16.5.2","chai":"^4.2.0","chai-datetime":"^1.7.0","chai-xml":"^0.3.2","core-js":"^3.6.5","dirty-chai":"^2.0.1","eslint":"^6.5.1","eslint-config-airbnb-base":"^14.2.0","eslint-config-prettier":"^6.12.0","eslint-friendly-formatter":"^4.0.1","eslint-plugin-import":"^2.22.0","eslint-plugin-node":"^11.1.0","express":"^4.16.4","got":"^9.0.0","grunt":"^1.3.0","grunt-babel":"^8.0.0","grunt-browserify":"^5.3.0","grunt-contrib-copy":"^1.0.0","grunt-contrib-jasmine":"^2.2.0","grunt-contrib-watch":"^1.1.0","grunt-exorcise":"^2.1.1","grunt-terser":"^1.0.0","husky":"^4.3.0","lint-staged":"^10.2.13","mocha":"^7.2.0","prettier-eslint":"^11.0.0","prettier-eslint-cli":"^5.0.0","regenerator-runtime":"^0.13.7","sax":"^1.2.4","ts-node":"^8.10.2","typescript":"^3.9.7"},"_lastModified":"2026-05-06T11:07:34.216Z"}

package/dist/node_modules/xlsx/package.json

@@ -1 +1 @@
-{"name":"xlsx","version":"0.18.5","author":"sheetjs","description":"SheetJS Spreadsheet data parser and writer","keywords":["excel","xls","xlsx","xlsb","xlsm","ods","csv","dbf","dif","sylk","office","spreadsheet"],"bin":{"xlsx":"./bin/xlsx.njs"},"main":"xlsx.js","module":"xlsx.mjs","unpkg":"dist/xlsx.full.min.js","jsdelivr":"dist/xlsx.full.min.js","types":"types/index.d.ts","browser":{"buffer":false,"crypto":false,"stream":false,"process":false,"fs":false},"sideEffects":false,"dependencies":{"adler-32":"~1.3.0","cfb":"~1.2.1","codepage":"~1.15.0","crc-32":"~1.2.1","ssf":"~0.11.2","wmf":"~1.0.1","word":"~0.3.0"},"devDependencies":{"@sheetjs/uglify-js":"~2.7.3","@types/node":"^8.5.9","acorn":"7.4.1","alex":"8.1.1","blanket":"~1.2.3","commander":"~2.17.1","dtslint":"^0.1.2","eslint":"7.23.0","eslint-plugin-html":"^6.1.2","eslint-plugin-json":"^2.1.2","exit-on-epipe":"~1.0.1","fflate":"^0.7.1","jsdom":"~11.1.0","markdown-spellcheck":"^1.3.1","mocha":"~2.5.3","sinon":"^1.17.7","typescript":"2.2.0"},"repository":{"type":"git","url":"git://github.com/SheetJS/sheetjs.git"},"scripts":{"pretest":"npm run lint","test":"npm run tests-only","pretest-only":"git submodule init && git submodule update","tests-only":"make travis","build":"make","lint":"make fullint","dtslint":"dtslint types"},"config":{"blanket":{"pattern":"xlsx.js"}},"alex":{"allow":["chinese","special","simple","just","crash","wtf","holes"]},"homepage":"https://sheetjs.com/","bugs":{"url":"https://github.com/SheetJS/sheetjs/issues"},"license":"Apache-2.0","engines":{"node":">=0.8"},"_lastModified":"2026-04-28T15:58:49.218Z"}
+{"name":"xlsx","version":"0.18.5","author":"sheetjs","description":"SheetJS Spreadsheet data parser and writer","keywords":["excel","xls","xlsx","xlsb","xlsm","ods","csv","dbf","dif","sylk","office","spreadsheet"],"bin":{"xlsx":"./bin/xlsx.njs"},"main":"xlsx.js","module":"xlsx.mjs","unpkg":"dist/xlsx.full.min.js","jsdelivr":"dist/xlsx.full.min.js","types":"types/index.d.ts","browser":{"buffer":false,"crypto":false,"stream":false,"process":false,"fs":false},"sideEffects":false,"dependencies":{"adler-32":"~1.3.0","cfb":"~1.2.1","codepage":"~1.15.0","crc-32":"~1.2.1","ssf":"~0.11.2","wmf":"~1.0.1","word":"~0.3.0"},"devDependencies":{"@sheetjs/uglify-js":"~2.7.3","@types/node":"^8.5.9","acorn":"7.4.1","alex":"8.1.1","blanket":"~1.2.3","commander":"~2.17.1","dtslint":"^0.1.2","eslint":"7.23.0","eslint-plugin-html":"^6.1.2","eslint-plugin-json":"^2.1.2","exit-on-epipe":"~1.0.1","fflate":"^0.7.1","jsdom":"~11.1.0","markdown-spellcheck":"^1.3.1","mocha":"~2.5.3","sinon":"^1.17.7","typescript":"2.2.0"},"repository":{"type":"git","url":"git://github.com/SheetJS/sheetjs.git"},"scripts":{"pretest":"npm run lint","test":"npm run tests-only","pretest-only":"git submodule init && git submodule update","tests-only":"make travis","build":"make","lint":"make fullint","dtslint":"dtslint types"},"config":{"blanket":{"pattern":"xlsx.js"}},"alex":{"allow":["chinese","special","simple","just","crash","wtf","holes"]},"homepage":"https://sheetjs.com/","bugs":{"url":"https://github.com/SheetJS/sheetjs/issues"},"license":"Apache-2.0","engines":{"node":">=0.8"},"_lastModified":"2026-05-06T11:07:36.653Z"}

package/dist/server/services/xlsx-importer.d.ts

@@ -58,7 +58,7 @@ export declare class XlsxImporter extends EventEmitter {
     protected validateColumns(ctx?: Context): void;
     performImport(data: string[][], options?: RunOptions): Promise<any>;
     protected getModel(): typeof Model;
-    handleRowValuesWithColumns(row: any, rowValues: any, options: RunOptions, columns: ImportColumn[]): Promise<void>;
+    handleRowValuesWithColumns(row: any, rowValues: any, options: RunOptions, columns: ImportColumn[], rowIndex?: number): Promise<void>;
     handleChuckRows(chunkRows: string[][], runOptions?: RunOptions, options?: {
         handingRowIndex: number;
         context: any;

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

@@ -257,6 +257,7 @@ class XlsxImporter extends import_events.default {
     let chunkRows;
     while ((chunkRows = chunks.shift()) !== void 0) {
       await this.handleChuckRows(chunkRows, options, { handingRowIndex, context: options == null ? void 0 : options.context });
+      handingRowIndex += chunkRows.length;
       imported += chunkRows.length;
       this.emit("progress", {
         total,
@@ -268,8 +269,7 @@ 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, columns) {
-    var _a;
+  async handleRowValuesWithColumns(row, rowValues, options, columns, rowIndex = 1) {
     for (let index = 0; index < columns.length; index++) {
       const column = columns[index];
       const field = this.options.collection.getField(column.dataIndex[0]);
@@ -301,7 +301,7 @@ class XlsxImporter extends import_events.default {
         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,
+          rowIndex,
           field: dataKey,
           message: error.message
         });
@@ -317,7 +317,7 @@ class XlsxImporter extends import_events.default {
   }
   async handleChuckRows(chunkRows, runOptions, options) {
     var _a, _b;
-    let { handingRowIndex = 1 } = options;
+    const { handingRowIndex: chunkStartRowIndex = 1 } = options;
     const db = this.options.collectionManager.db;
     const externalTransaction = runOptions == null ? void 0 : runOptions.transaction;
     const transaction = externalTransaction || (db ? await db.sequelize.transaction() : null);
@@ -332,10 +332,13 @@ class XlsxImporter extends import_events.default {
       }
     };
     const rows = [];
+    let inChunkRowIndex = 0;
     try {
-      for (const row of chunkRows) {
+      for (let i = 0; i < chunkRows.length; i++) {
+        inChunkRowIndex = i;
+        const row = chunkRows[i];
         const rowValues = {};
-        await this.handleRowValuesWithColumns(row, rowValues, chunkRunOptions, columns);
+        await this.handleRowValuesWithColumns(row, rowValues, chunkRunOptions, columns, chunkStartRowIndex + i);
         rows.push({
           ...this.options.rowDefaultValues || {},
           ...rowValues
@@ -350,7 +353,6 @@ class XlsxImporter extends import_events.default {
         "Record insertion completed in {time}ms"
       );
       await new Promise((resolve) => setTimeout(resolve, 5));
-      handingRowIndex += chunkRows.length;
       if (!externalTransaction) {
         await (transaction == null ? void 0 : transaction.commit());
       }
@@ -364,18 +366,18 @@ class XlsxImporter extends import_events.default {
       if (error.name === "SequelizeUniqueConstraintError") {
         throw new Error(`${translate("Unique constraint error, fields:")} ${JSON.stringify(error.fields)}`);
       }
+      const failedRowIndex = chunkStartRowIndex + inChunkRowIndex;
       if ((_a = error.params) == null ? void 0 : _a.rowIndex) {
-        handingRowIndex += error.params.rowIndex;
-        error.params.rowIndex = handingRowIndex;
+        error.params.rowIndex = failedRowIndex;
       }
-      (_b = this.logger) == null ? void 0 : _b.error(`Import error at row ${handingRowIndex}: ${error.message}`, {
-        rowIndex: handingRowIndex,
-        rowData: rows[handingRowIndex],
+      (_b = this.logger) == null ? void 0 : _b.error(`Import error at row ${failedRowIndex}: ${error.message}`, {
+        rowIndex: failedRowIndex,
+        rowData: chunkRows[inChunkRowIndex],
         originalError: error.stack || error.toString()
       });
-      throw new import_errors.ImportError(`Import failed at row ${handingRowIndex}`, {
-        rowIndex: handingRowIndex,
-        rowData: rows[handingRowIndex - (this.options.explain ? 2 : 1)],
+      throw new import_errors.ImportError(`Import failed at row ${failedRowIndex}`, {
+        rowIndex: failedRowIndex,
+        rowData: chunkRows[inChunkRowIndex],
         cause: error
       });
     }

package/package.json

@@ -6,7 +6,7 @@
   "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.1.0-beta.23",
+  "version": "2.1.0-beta.25",
   "license": "Apache-2.0",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/action-import",
@@ -46,7 +46,7 @@
     "@nocobase/test": "2.x",
     "@nocobase/utils": "2.x"
   },
-  "gitHead": "bb4c0d3551bf9eff505b63756dd24a0813231f16",
+  "gitHead": "824f8b8200e9fe086135768934d3ef427b212446",
   "keywords": [
     "Actions"
   ]