@nocobase/plugin-collection-tree 2.2.0-alpha.7 → 2.2.0-beta.10

package/dist/externalVersion.js

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

package/dist/server/plugin.js

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

package/package.json

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