@nocobase/database 2.1.0-beta.7 → 2.1.0-beta.9

package/lib/collection.js

@@ -188,7 +188,7 @@ const _Collection = class _Collection extends import_events.EventEmitter {
         label: `${this.name}.${field.name}`,
         value: val
       });
-      const { error } = joiSchema.validate(val);
+      const { error } = joiSchema.validate(val, { convert: false });
       if (error) {
         throw error;
       }

package/lib/eager-loading/eager-loading-tree.js

@@ -149,6 +149,11 @@ const _EagerLoadingTree = class _EagerLoadingTree {
           const { sourceKey } = association;
           pushAttribute(eagerLoadingTreeParent, sourceKey);
         }
+        if (associationType == "BelongsToArray") {
+          const { foreignKey, targetKey } = association;
+          pushAttribute(eagerLoadingTreeParent, foreignKey);
+          pushAttribute(child, targetKey);
+        }
         eagerLoadingTreeParent.children.push(child);
         if (include.include) {
           traverseIncludeOption(include.include, child);

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@nocobase/database",
-  "version": "2.1.0-beta.7",
+  "version": "2.1.0-beta.9",
   "description": "",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "Apache-2.0",
   "dependencies": {
-    "@nocobase/logger": "2.1.0-beta.7",
-    "@nocobase/utils": "2.1.0-beta.7",
+    "@nocobase/logger": "2.1.0-beta.9",
+    "@nocobase/utils": "2.1.0-beta.9",
     "async-mutex": "^0.3.2",
     "chalk": "^4.1.1",
     "cron-parser": "4.4.0",
@@ -38,5 +38,5 @@
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/database"
   },
-  "gitHead": "da7dfef2b6d6854988a56119463c8c38e3221e79"
+  "gitHead": "c3a2875e4cbbb43b1f2361e6f9f5f84a7d3f3c3c"
 }