@nocobase/plugin-error-handler 0.19.0-alpha.9 → 0.20.0-alpha.2

package/dist/externalVersion.js

@@ -1,7 +1,7 @@
 module.exports = {
-  "@nocobase/client": "0.19.0-alpha.9",
+  "@nocobase/client": "0.20.0-alpha.2",
   "@formily/json-schema": "2.3.0",
-  "@nocobase/database": "0.19.0-alpha.9",
-  "@nocobase/server": "0.19.0-alpha.9",
+  "@nocobase/database": "0.20.0-alpha.2",
+  "@nocobase/server": "0.20.0-alpha.2",
   "lodash": "4.17.21"
 };

package/dist/server/server.js

@@ -44,12 +44,15 @@ class PluginErrorHandler extends import_server.Plugin {
     this.registerSequelizeValidationErrorHandler();
   }
   registerSequelizeValidationErrorHandler() {
-    const findFieldTitle = (instance, path, tFunc) => {
+    const findFieldTitle = (instance, path, tFunc, ctx) => {
       if (!instance) {
         return path;
       }
       const model = instance.constructor;
-      const collection = this.db.modelCollection.get(model);
+      const dataSourceKey = ctx.get("x-data-source");
+      const dataSource = ctx.app.dataSourceManager.dataSources.get(dataSourceKey);
+      const database = dataSource ? dataSource.collectionManager.db : ctx.db;
+      const collection = database.modelCollection.get(model);
       const field = collection.getField(path);
       const fieldOptions = import_json_schema.Schema.compile(field == null ? void 0 : field.options, { t: tFunc });
       const title = import_lodash.default.get(fieldOptions, "uiSchema.title", path);
@@ -66,7 +69,7 @@ class PluginErrorHandler extends import_server.Plugin {
             return {
               message: ctx.i18n.t(err2.type, {
                 ns: this.i18nNs,
-                field: findFieldTitle(err2.instance, err2.path, ctx.i18n.t)
+                field: findFieldTitle(err2.instance, err2.path, ctx.i18n.t, ctx)
               })
             };
           })

package/package.json

@@ -4,7 +4,7 @@
   "displayName.zh-CN": "错误处理器",
   "description": "Handling application errors and exceptions.",
   "description.zh-CN": "处理应用程序中的错误和异常。",
-  "version": "0.19.0-alpha.9",
+  "version": "0.20.0-alpha.2",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "devDependencies": {
@@ -23,5 +23,5 @@
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/plugin-error-handler"
   },
-  "gitHead": "975f9c58a1995df6a8d7a4d191a0dc4a9769ebc5"
+  "gitHead": "6fb885dfc3554e4b0f29e9a7a1eecbbe85d0eebb"
 }