@nocobase/plugin-collection-tree 2.2.0-beta.9 → 3.0.0-alpha.1

package/dist/externalVersion.js

@@ -8,13 +8,13 @@
  */
 
 module.exports = {
-  "@nocobase/client": "2.2.0-beta.9",
-  "@nocobase/client-v2": "2.2.0-beta.9",
-  "@nocobase/plugin-data-source-manager": "2.2.0-beta.9",
-  "@nocobase/database": "2.2.0-beta.9",
-  "@nocobase/utils": "2.2.0-beta.9",
+  "@nocobase/client": "3.0.0-alpha.1",
+  "@nocobase/client-v2": "3.0.0-alpha.1",
+  "@nocobase/plugin-data-source-manager": "3.0.0-alpha.1",
+  "@nocobase/database": "3.0.0-alpha.1",
+  "@nocobase/utils": "3.0.0-alpha.1",
   "lodash": "4.18.1",
-  "@nocobase/data-source-manager": "2.2.0-beta.9",
-  "@nocobase/server": "2.2.0-beta.9",
+  "@nocobase/data-source-manager": "3.0.0-alpha.1",
+  "@nocobase/server": "3.0.0-alpha.1",
   "sequelize": "6.35.2"
 };

package/dist/server/plugin.js

@@ -65,10 +65,17 @@ class PluginCollectionTreeServer extends import_server.Plugin {
           if (collection.options.schema) {
             options["schema"] = collection.options.schema;
           }
+          let nodePkType = "bigInt";
           if (eventOptions.fieldModels) {
-            options["fieldModels"] = eventOptions.fieldModels;
+            const pk = eventOptions.fieldModels.find((x) => x.options.primaryKey === true);
+            if (pk) {
+              nodePkType = pk.type;
+            }
           }
-          this.defineTreePathCollection(name, options);
+          this.defineTreePathCollection(name, {
+            ...options,
+            nodePkType
+          });
           collectionManager.db.on(`${collection.name}.afterSync`, async ({ transaction }) => {
             await this.db.getCollection(name).sync({ transaction });
           });
@@ -183,13 +190,7 @@ 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;
-      }
-    }
+    const { nodePkType, ...collectionOptions } = options;
     this.db.collection({
       name,
       autoGenId: false,
@@ -204,7 +205,7 @@ class PluginCollectionTreeServer extends import_server.Plugin {
           fields: [{ name: "path", length: 191 }]
         }
       ],
-      ...options
+      ...collectionOptions
     });
   }
   async getTreePath(model, path, collection, pathCollectionName, transaction) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-collection-tree",
-  "version": "2.2.0-beta.9",
+  "version": "3.0.0-alpha.1",
   "displayName": "Collection: Tree",
   "displayName.ru-RU": "Древовидная Коллекция",
   "displayName.zh-CN": "数据表：树",
@@ -19,5 +19,5 @@
     "@nocobase/test": "2.x"
   },
   "license": "Apache-2.0",
-  "gitHead": "60e3d7abbaa0c7cead76f71a4f3d5eedb6b8acdb"
+  "gitHead": "22d8be8ece179cfa5c8a4ebb2c896c92bd418e03"
 }