@nocobase/plugin-collection-tree 1.3.35-beta → 1.3.36-beta

package/dist/externalVersion.js

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

package/dist/server/migrations/20240802141435-collection-tree.d.ts

@@ -12,6 +12,9 @@ import { Transaction } from 'sequelize';
 export default class extends Migration {
     on: string;
     appVersion: string;
+    getTreeCollections({ transaction }: {
+        transaction: any;
+    }): Promise<any>;
     up(): Promise<void>;
     getTreePath(model: Model, path: string, collection: Model, pathCollectionName: string, transaction: Transaction): Promise<string>;
 }

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

@@ -45,15 +45,19 @@ class collection_tree_default extends import_server.Migration {
   on = "afterLoad";
   // 'beforeLoad' or 'afterLoad'
   appVersion = "<=1.3.0-beta";
+  async getTreeCollections({ transaction }) {
+    const treeCollections = await this.app.db.getRepository("collections").find({
+      appends: ["fields"],
+      filter: {
+        "options.tree": "adjacencyList"
+      },
+      transaction
+    });
+    return treeCollections;
+  }
   async up() {
     await this.db.sequelize.transaction(async (transaction) => {
-      const treeCollections = await this.app.db.getRepository("collections").find({
-        appends: ["fields"],
-        filter: {
-          "options.tree": "adjacencyList"
-        },
-        transaction
-      });
+      const treeCollections = await this.getTreeCollections({ transaction });
       for (const treeCollection of treeCollections) {
         const name = `main_${treeCollection.name}_path`;
         const collectionOptions = {

package/dist/server/migrations/20241022161700-inherit-collection-tree.d.ts

@@ -0,0 +1,16 @@
+/**
+ * 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 Migration from './20240802141435-collection-tree';
+export default class extends Migration {
+    on: string;
+    appVersion: string;
+    getTreeCollections({ transaction }: {
+        transaction: any;
+    }): Promise<any>;
+}

package/dist/server/migrations/20241022161700-inherit-collection-tree.js

@@ -0,0 +1,60 @@
+/**
+ * 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 inherit_collection_tree_exports = {};
+__export(inherit_collection_tree_exports, {
+  default: () => inherit_collection_tree_default
+});
+module.exports = __toCommonJS(inherit_collection_tree_exports);
+var import_collection_tree = __toESM(require("./20240802141435-collection-tree"));
+class inherit_collection_tree_default extends import_collection_tree.default {
+  on = "afterLoad";
+  // 'beforeLoad' or 'afterLoad'
+  appVersion = "<=1.3.36-beta";
+  async getTreeCollections({ transaction }) {
+    const treeCollections = await this.app.db.getRepository("collections").find({
+      appends: ["fields"],
+      filter: {
+        "options.tree": "adjacencyList"
+      },
+      transaction
+    });
+    return treeCollections.filter((collection) => {
+      var _a;
+      return ((_a = collection.options.inherits) == null ? void 0 : _a.length) > 0;
+    });
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-collection-tree",
-  "version": "1.3.35-beta",
+  "version": "1.3.36-beta",
   "displayName": "Collection: Tree",
   "displayName.zh-CN": "数据表：树",
   "description": "Provides tree collection template",
@@ -14,5 +14,5 @@
     "@nocobase/server": "1.x",
     "@nocobase/test": "1.x"
   },
-  "gitHead": "e76f371c232ed038d8a82a39f84c74aeb788e21c"
+  "gitHead": "c220ce1036f651eb23deb91246d7f84b046074b6"
 }