@nocobase/plugin-collection-tree 2.0.0-alpha.53 → 2.0.0-alpha.54

package/dist/externalVersion.js

@@ -8,11 +8,11 @@
  */
 
 module.exports = {
-  "@nocobase/client": "2.0.0-alpha.53",
-  "@nocobase/database": "2.0.0-alpha.53",
-  "@nocobase/utils": "2.0.0-alpha.53",
+  "@nocobase/client": "2.0.0-alpha.54",
+  "@nocobase/database": "2.0.0-alpha.54",
+  "@nocobase/utils": "2.0.0-alpha.54",
   "lodash": "4.17.21",
-  "@nocobase/data-source-manager": "2.0.0-alpha.53",
-  "@nocobase/server": "2.0.0-alpha.53",
+  "@nocobase/data-source-manager": "2.0.0-alpha.54",
+  "@nocobase/server": "2.0.0-alpha.54",
   "sequelize": "6.35.2"
 };

package/dist/server/plugin.js

@@ -54,7 +54,7 @@ class PluginCollectionTreeServer extends import_server.Plugin {
     this.app.dataSourceManager.afterAddDataSource((dataSource) => {
       const collectionManager = dataSource.collectionManager;
       if (collectionManager instanceof import_data_source_manager.SequelizeCollectionManager) {
-        collectionManager.db.on("afterDefineCollection", (collection) => {
+        collectionManager.db.on("afterDefineCollection", (collection, eventOptions) => {
           if (!condition(collection.options)) {
             return;
           }
@@ -64,6 +64,9 @@ class PluginCollectionTreeServer extends import_server.Plugin {
           if (collection.options.schema) {
             options["schema"] = collection.options.schema;
           }
+          if (eventOptions.fieldModels) {
+            options["fieldModels"] = eventOptions.fieldModels;
+          }
           this.defineTreePathCollection(name, options);
           collectionManager.db.on(`${collection.name}.afterSync`, async ({ transaction }) => {
             await this.db.getCollection(name).sync({ transaction });
@@ -146,14 +149,21 @@ class PluginCollectionTreeServer extends import_server.Plugin {
     });
   }
   async defineTreePathCollection(name, options) {
+    let nodePkType = "bigInt";
+    if (options.fieldModels) {
+      const pk = options.fieldModels.find((x) => x.options.primaryKey === true);
+      if (pk) {
+        nodePkType = pk.type;
+      }
+    }
     this.db.collection({
       name,
       autoGenId: false,
       timestamps: false,
       fields: [
-        { type: "bigInt", name: "nodePk" },
+        { type: nodePkType, name: "nodePk" },
         { type: "string", name: "path", length: 1024 },
-        { type: "bigInt", name: "rootPk" }
+        { type: nodePkType, name: "rootPk" }
       ],
       indexes: [
         {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-collection-tree",
-  "version": "2.0.0-alpha.53",
+  "version": "2.0.0-alpha.54",
   "displayName": "Collection: Tree",
   "displayName.ru-RU": "Древовидная Коллекция",
   "displayName.zh-CN": "数据表：树",
@@ -16,5 +16,5 @@
     "@nocobase/server": "2.x",
     "@nocobase/test": "2.x"
   },
-  "gitHead": "ff30cf8261f5a97b3f24c3752af5bbc564167b37"
+  "gitHead": "68c84deaabba0ebec7407bf7245376b8d843449c"
 }