@nocobase/plugin-collection-tree 1.9.0-beta.5 → 1.9.0-beta.7

package/dist/externalVersion.js

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

package/dist/server/commands/sync-path.d.ts

@@ -7,4 +7,6 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 import { Application } from '@nocobase/server';
+import { Database, Model, Transaction } from '@nocobase/database';
+export declare function getTreePath(db: Database, model: Model, path: string, collection: string, pathCollectionName: string, transaction?: Transaction): Promise<string>;
 export default function (app: Application): void;

package/dist/server/commands/sync-path.js

@@ -36,7 +36,8 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var sync_path_exports = {};
 __export(sync_path_exports, {
-  default: () => sync_path_default
+  default: () => sync_path_default,
+  getTreePath: () => getTreePath
 });
 module.exports = __toCommonJS(sync_path_exports);
 var import_lodash = __toESM(require("lodash"));
@@ -47,7 +48,6 @@ async function getTreePath(db, model, path, collection, pathCollectionName, tran
       transaction
     });
     if (parent && parent.get("parentId") !== model.get("id")) {
-      path = `/${parent.get("id")}${path}`;
       const collectionTreePath = db.getCollection(pathCollectionName);
       const nodePkColumnName = collectionTreePath.getField("nodePk").columnName();
       const parentPathData = await db.getRepository(pathCollectionName).findOne({
@@ -56,7 +56,15 @@ async function getTreePath(db, model, path, collection, pathCollectionName, tran
       });
       const parentPath = import_lodash.default.get(parentPathData, "path", null);
       if (parentPath == null) {
-        path = await getTreePath(db, parent, path, collection, pathCollectionName, transaction);
+        const parentFullPath = await getTreePath(
+          db,
+          parent,
+          `/${parent.get("id")}`,
+          collection,
+          pathCollectionName,
+          transaction
+        );
+        path = `${parentFullPath}/${model.get("id")}`;
       } else {
         path = `${parentPath}/${model.get("id")}`;
       }
@@ -114,3 +122,7 @@ function sync_path_default(app) {
     });
   });
 }
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  getTreePath
+});

package/dist/server/plugin.js

@@ -123,19 +123,25 @@ class PluginCollectionTreeServer extends import_server.Plugin {
               throw new Error("Cannot set itself as the parent node");
             }
           });
+          this.db.on("collections.afterDestroy", async (collection2, { transaction }) => {
+            const name2 = `main_${collection2.get("name")}_path`;
+            if (!condition(collection2.options)) {
+              return;
+            }
+            const collectionTree = this.db.getCollection(name2);
+            if (collectionTree) {
+              await this.db.getCollection(name2).removeFromDb({ transaction });
+              collectionManager.db.removeAllListeners(`${collection2.name}.afterSync`);
+              this.db.removeAllListeners(`${collection2.name}.afterCreate`);
+              this.db.removeAllListeners(`${collection2.name}.afterUpdate`);
+              this.db.removeAllListeners(`${collection2.name}.afterBulkUpdate`);
+              this.db.removeAllListeners(`${collection2.name}.afterDestroy`);
+              this.db.removeAllListeners(`${collection2.name}.beforeSave`);
+            }
+          });
         });
       }
     });
-    this.db.on("collections.afterDestroy", async (collection, { transaction }) => {
-      const name = `main_${collection.get("name")}_path`;
-      if (!condition(collection.options)) {
-        return;
-      }
-      const collectionTree = this.db.getCollection(name);
-      if (collectionTree) {
-        await this.db.getCollection(name).removeFromDb({ transaction });
-      }
-    });
   }
   async defineTreePathCollection(name, options) {
     this.db.collection({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-collection-tree",
-  "version": "1.9.0-beta.5",
+  "version": "1.9.0-beta.7",
   "displayName": "Collection: Tree",
   "displayName.zh-CN": "数据表：树",
   "description": "Provides tree collection template",
@@ -14,5 +14,5 @@
     "@nocobase/server": "1.x",
     "@nocobase/test": "1.x"
   },
-  "gitHead": "9a61c60dd3db5af64244e82447309b0cb17aabb6"
+  "gitHead": "4a5055c973b51611d5db1604aaaf6c1b73b4733c"
 }