@nocobase/plugin-collection-tree 1.6.32 → 1.6.34

package/dist/externalVersion.js

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

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

@@ -0,0 +1,10 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+import { Application } from '@nocobase/server';
+export default function (app: Application): void;

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

@@ -0,0 +1,116 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var sync_path_exports = {};
+__export(sync_path_exports, {
+  default: () => sync_path_default
+});
+module.exports = __toCommonJS(sync_path_exports);
+var import_lodash = __toESM(require("lodash"));
+async function getTreePath(db, model, path, collection, pathCollectionName, transaction) {
+  if (model.get("parentId") !== null) {
+    const parent = await db.getRepository(collection).findOne({
+      filter: { id: model.get("parentId") },
+      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({
+        filter: { [nodePkColumnName]: parent.get("id") },
+        transaction
+      });
+      const parentPath = import_lodash.default.get(parentPathData, "path", null);
+      if (parentPath == null) {
+        path = await getTreePath(db, parent, path, collection, pathCollectionName, transaction);
+      } else {
+        path = `${parentPath}/${model.get("id")}`;
+      }
+    }
+  }
+  return path;
+}
+function sync_path_default(app) {
+  app.command("tree-collection:sync-path").preload().option("-c, --collection [collection]").action(async (options) => {
+    const { collection: name } = options || {};
+    const mainData = app.pm.get("data-source-main");
+    mainData.setLoadFilter({
+      name
+    });
+    await app.emitAsync("beforeStart");
+    if (!name) {
+      throw new Error("Collection name is required");
+    }
+    const collection = app.db.getCollection(name);
+    if (!collection) {
+      throw new Error(`Collection ${name} not found`);
+    }
+    const isTree = collection.options.tree;
+    if (!isTree) {
+      throw new Error(`Collection ${name} is not a tree collection`);
+    }
+    const pathTableName = `main_${name}_path`;
+    const pathRepo = app.db.getRepository(pathTableName);
+    const nodeRepo = app.db.getRepository(name);
+    const chunkSize = 1e3;
+    await app.db.sequelize.transaction(async (transaction) => {
+      await pathRepo.destroy({ truncate: true, transaction });
+      console.log(`Truncated table ${pathTableName}`);
+      await nodeRepo.chunk({
+        chunkSize,
+        callback: async (records, options2) => {
+          const toInsert = [];
+          for (const record of records) {
+            const id = record.get("id");
+            let path = `/${id}`;
+            path = await getTreePath(app.db, record, path, name, pathTableName, transaction);
+            toInsert.push({
+              nodePk: id,
+              path,
+              rootPk: path.split("/")[1]
+            });
+          }
+          if (toInsert.length > 0) {
+            await app.db.getModel(pathTableName).bulkCreate(toInsert, { transaction });
+            console.log(`Inserted ${toInsert.length} records into ${pathTableName}`);
+          }
+        },
+        transaction
+      });
+    });
+  });
+}

package/dist/server/plugin.js

@@ -119,7 +119,7 @@ class PluginCollectionTreeServer extends import_server.Plugin {
           });
           this.db.on(`${collection.name}.beforeSave`, async (model) => {
             const tk = collection.filterTargetKey;
-            if (model.get(parentForeignKey) === model.get(tk)) {
+            if (model.get(tk) && model.get(parentForeignKey) === model.get(tk)) {
               throw new Error("Cannot set itself as the parent node");
             }
           });
@@ -200,11 +200,15 @@ class PluginCollectionTreeServer extends import_server.Plugin {
       },
       transaction
     });
+    const basePath = pathData.get("path");
     const relatedNodes = await this.app.db.getRepository(pathCollectionName).find({
       filter: {
-        path: {
-          $startsWith: `${pathData.get("path")}`
-        }
+        $or: [
+          { path: basePath },
+          // 自身节点
+          { path: { $startsWith: `${basePath}/` } }
+          // 确保是子节点（路径段）
+        ]
       },
       transaction
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-collection-tree",
-  "version": "1.6.32",
+  "version": "1.6.34",
   "displayName": "Collection: Tree",
   "displayName.zh-CN": "数据表：树",
   "description": "Provides tree collection template",
@@ -14,5 +14,5 @@
     "@nocobase/server": "1.x",
     "@nocobase/test": "1.x"
   },
-  "gitHead": "b546588373c844aa108d2adb42e76cc84c4b8de8"
+  "gitHead": "6066f121bc4fa37b3b1ad6032426295ff381ffa3"
 }