@nocobase/plugin-collection-tree 1.4.0-alpha → 1.4.0-alpha.0

package/dist/externalVersion.js

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

package/dist/server/migrations/20240802141435-collection-tree.js

@@ -75,8 +75,10 @@ class collection_tree_default extends import_server.Migration {
             }
           ]
         };
-        if (treeCollection.options.schema) {
-          collectionOptions["schema"] = treeCollection.options.schema;
+        const collectionInstance = this.db.getCollection(treeCollection.name);
+        const treeCollectionSchema = collectionInstance.collectionSchema();
+        if (this.app.db.inDialect("postgres") && treeCollectionSchema != this.app.db.options.schema) {
+          collectionOptions["schema"] = treeCollectionSchema;
         }
         this.app.db.collection(collectionOptions);
         const treeExistsInDb = await this.app.db.getCollection(name).existsInDb({ transaction });
@@ -91,8 +93,8 @@ class collection_tree_default extends import_server.Migration {
               { type: "integer", name: "parentId" }
             ]
           };
-          if (treeCollection.options.schema) {
-            opts["schema"] = treeCollection.options.schema;
+          if (treeCollectionSchema != this.app.db.options.schema) {
+            opts["schema"] = treeCollectionSchema;
           }
           this.app.db.collection(opts);
           const chunkSize = 1e3;

package/dist/server/plugin.d.ts

@@ -11,5 +11,6 @@ declare class PluginCollectionTreeServer extends Plugin {
     beforeLoad(): Promise<void>;
     private defineTreePathCollection;
     private getTreePath;
+    private updateTreePath;
 }
 export default PluginCollectionTreeServer;

package/dist/server/plugin.js

@@ -43,9 +43,6 @@ var import_data_source_manager = require("@nocobase/data-source-manager");
 var import_server = require("@nocobase/server");
 var import_lodash = __toESM(require("lodash"));
 var import_tree_collection = require("./tree-collection");
-const getFilterTargetKey = (model) => {
-  return model.constructor.collection.filterTargetKey;
-};
 class PluginCollectionTreeServer extends import_server.Plugin {
   async beforeLoad() {
     const condition = (options) => {
@@ -74,7 +71,7 @@ class PluginCollectionTreeServer extends import_server.Plugin {
           });
           this.db.on(`${collection.name}.afterCreate`, async (model, options2) => {
             const { transaction } = options2;
-            const tk = getFilterTargetKey(model);
+            const tk = collection.filterTargetKey;
             let path = `/${model.get(tk)}`;
             path = await this.getTreePath(model, path, collection, name, transaction);
             const rootPk = path.split("/")[1];
@@ -88,45 +85,30 @@ class PluginCollectionTreeServer extends import_server.Plugin {
             });
           });
           this.db.on(`${collection.name}.afterUpdate`, async (model, options2) => {
-            const tk = getFilterTargetKey(model);
+            const tk = collection.filterTargetKey;
             if (!(model._changed.has(tk) || model._changed.has(parentForeignKey))) {
               return;
             }
             const { transaction } = options2;
-            let path = `/${model.get(tk)}`;
-            path = await this.getTreePath(model, path, collection, name, transaction);
-            const collectionTreePath = this.db.getCollection(name);
-            const nodePkColumnName = collectionTreePath.getField("nodePk").columnName();
-            const pathData = await this.app.db.getRepository(name).findOne({
-              filter: {
-                [nodePkColumnName]: model.get(tk)
-              },
-              transaction
-            });
-            const relatedNodes = await this.app.db.getRepository(name).find({
-              filter: {
-                path: {
-                  $startsWith: `${pathData.get("path")}`
-                }
+            await this.updateTreePath(model, collection, name, transaction);
+          });
+          this.db.on(`${collection.name}.afterBulkUpdate`, async (options2) => {
+            const tk = collection.filterTargetKey;
+            if (!(options2.where && options2.where[tk])) {
+              return;
+            }
+            const instances = await this.db.getRepository(collection.name).find({
+              where: {
+                [tk]: options2.where[tk]
               },
-              transaction
+              transaction: options2.transaction
             });
-            const rootPk = path.split("/")[1];
-            for (const node of relatedNodes) {
-              await this.app.db.getRepository(name).update({
-                values: {
-                  path: node.get("path").replace(`${pathData.get("path")}`, path),
-                  rootPk: rootPk ? Number(rootPk) : null
-                },
-                filter: {
-                  [nodePkColumnName]: node.get("nodePk")
-                },
-                transaction
-              });
+            for (const model of instances) {
+              await this.updateTreePath(model, collection, name, options2.transaction);
             }
           });
           this.db.on(`${collection.name}.afterDestroy`, async (model, options2) => {
-            const tk = getFilterTargetKey(model);
+            const tk = collection.filterTargetKey;
             await this.app.db.getRepository(name).destroy({
               filter: {
                 nodePk: model.get(tk)
@@ -168,7 +150,7 @@ class PluginCollectionTreeServer extends import_server.Plugin {
   }
   async getTreePath(model, path, collection, pathCollectionName, transaction) {
     var _a;
-    const tk = getFilterTargetKey(model);
+    const tk = collection.filterTargetKey;
     const parentForeignKey = ((_a = collection.treeParentField) == null ? void 0 : _a.foreignKey) || "parentId";
     if (model.get(parentForeignKey) && model.get(parentForeignKey) !== null) {
       const parent = await this.app.db.getRepository(collection.name).findOne({
@@ -199,5 +181,40 @@ class PluginCollectionTreeServer extends import_server.Plugin {
     }
     return path;
   }
+  async updateTreePath(model, collection, pathCollectionName, transaction) {
+    const tk = collection.filterTargetKey;
+    let path = `/${model.get(tk)}`;
+    path = await this.getTreePath(model, path, collection, pathCollectionName, transaction);
+    const collectionTreePath = this.db.getCollection(pathCollectionName);
+    const nodePkColumnName = collectionTreePath.getField("nodePk").columnName();
+    const pathData = await this.app.db.getRepository(pathCollectionName).findOne({
+      filter: {
+        [nodePkColumnName]: model.get(tk)
+      },
+      transaction
+    });
+    const relatedNodes = await this.app.db.getRepository(pathCollectionName).find({
+      filter: {
+        path: {
+          $startsWith: `${pathData.get("path")}`
+        }
+      },
+      transaction
+    });
+    const rootPk = path.split("/")[1];
+    for (const node of relatedNodes) {
+      const newPath = node.get("path").replace(pathData.get("path"), path);
+      await this.app.db.getRepository(pathCollectionName).update({
+        values: {
+          path: newPath,
+          rootPk: rootPk ? Number(rootPk) : null
+        },
+        filter: {
+          [nodePkColumnName]: node.get("nodePk")
+        },
+        transaction
+      });
+    }
+  }
 }
 var plugin_default = PluginCollectionTreeServer;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-collection-tree",
-  "version": "1.4.0-alpha",
+  "version": "1.4.0-alpha.0",
   "displayName": "Collection: Tree",
   "displayName.zh-CN": "数据表：树",
   "description": "Provides tree collection template",
@@ -14,5 +14,5 @@
     "@nocobase/server": "1.x",
     "@nocobase/test": "1.x"
   },
-  "gitHead": "f097a2bddec152522b5645bd5d451f4c866d2060"
+  "gitHead": "8ffa7b54bbaf720c0c9857da4b19a99110dffc4b"
 }