@nocobase/plugin-collection-tree 2.0.0-alpha.9 → 2.0.0-beta.2

package/dist/externalVersion.js

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

package/dist/locale/hu-HU.json

@@ -0,0 +1 @@
+{}

package/dist/server/plugin.js

@@ -54,18 +54,19 @@ 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) => {
-          var _a;
+        collectionManager.db.on("afterDefineCollection", (collection, eventOptions) => {
           if (!condition(collection.options)) {
             return;
           }
           const name = `${dataSource.name}_${collection.name}_path`;
-          const parentForeignKey = ((_a = collection.treeParentField) == null ? void 0 : _a.foreignKey) || "parentId";
           const options = {};
           options["mainCollection"] = collection.name;
           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 });
@@ -85,8 +86,28 @@ class PluginCollectionTreeServer extends import_server.Plugin {
               transaction
             });
           });
+          this.db.on(`${collection.name}.afterBulkCreate`, async (instances, options2) => {
+            const { transaction } = options2;
+            const tk = collection.filterTargetKey;
+            const records = [];
+            for (const model of instances) {
+              let path = `/${model.get(tk)}`;
+              path = await this.getTreePath(model, path, collection, name, transaction);
+              const rootPk = path.split("/")[1] || null;
+              records.push({
+                nodePk: model.get(tk),
+                path,
+                rootPk
+              });
+            }
+            await this.app.db.getModel(name).bulkCreate(records, {
+              transaction
+            });
+          });
           this.db.on(`${collection.name}.afterUpdate`, async (model, options2) => {
+            var _a;
             const tk = collection.filterTargetKey;
+            const parentForeignKey = ((_a = collection.treeParentField) == null ? void 0 : _a.foreignKey) || "parentId";
             if (!(model._changed.has(tk) || model._changed.has(parentForeignKey))) {
               return;
             }
@@ -118,7 +139,9 @@ class PluginCollectionTreeServer extends import_server.Plugin {
             });
           });
           this.db.on(`${collection.name}.beforeSave`, async (model) => {
+            var _a;
             const tk = collection.filterTargetKey;
+            const parentForeignKey = ((_a = collection.treeParentField) == null ? void 0 : _a.foreignKey) || "parentId";
             if (model.get(tk) && model.get(parentForeignKey) === model.get(tk)) {
               throw new Error("Cannot set itself as the parent node");
             }
@@ -144,14 +167,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,9 +1,11 @@
 {
   "name": "@nocobase/plugin-collection-tree",
-  "version": "2.0.0-alpha.9",
+  "version": "2.0.0-beta.2",
   "displayName": "Collection: Tree",
+  "displayName.ru-RU": "Древовидная Коллекция",
   "displayName.zh-CN": "数据表：树",
   "description": "Provides tree collection template",
+  "description.ru-RU": "Предоставляет шаблон коллекции в виде дерева. Широко используется для организации документов, каталожных разделов, управляемых задач, меню, комментариев и других сценариев, где важна вложенность и классификация.",
   "description.zh-CN": "提供树数据表模板",
   "keywords": [
     "Collections"
@@ -14,5 +16,5 @@
     "@nocobase/server": "2.x",
     "@nocobase/test": "2.x"
   },
-  "gitHead": "4a9acf96f21a3aa35bccbd188b942595b09da0a9"
+  "gitHead": "b77a33ee933ae6e09d2d5dce017ca15d8552d57b"
 }