@nocobase/plugin-collection-tree 1.3.0-beta → 1.3.2-beta

package/dist/externalVersion.js

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

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

@@ -6,8 +6,8 @@
  * 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 '@nocobase/server';
 import { Model } from '@nocobase/database';
+import { Migration } from '@nocobase/server';
 import { Transaction } from 'sequelize';
 export default class extends Migration {
     on: string;

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

@@ -56,7 +56,7 @@ class collection_tree_default extends import_server.Migration {
       });
       for (const treeCollection of treeCollections) {
         const name = `main_${treeCollection.name}_path`;
-        this.app.db.collection({
+        const collectionOptions = {
           name,
           autoGenId: false,
           timestamps: false,
@@ -70,11 +70,15 @@ class collection_tree_default extends import_server.Migration {
               fields: [{ name: "path", length: 191 }]
             }
           ]
-        });
+        };
+        if (treeCollection.options.schema) {
+          collectionOptions["schema"] = treeCollection.options.schema;
+        }
+        this.app.db.collection(collectionOptions);
         const treeExistsInDb = await this.app.db.getCollection(name).existsInDb({ transaction });
         if (!treeExistsInDb) {
           await this.app.db.getCollection(name).sync({ transaction });
-          this.app.db.collection({
+          const opts = {
             name: treeCollection.name,
             autoGenId: false,
             timestamps: false,
@@ -82,7 +86,11 @@ class collection_tree_default extends import_server.Migration {
               { type: "integer", name: "id" },
               { type: "integer", name: "parentId" }
             ]
-          });
+          };
+          if (treeCollection.options.schema) {
+            opts["schema"] = treeCollection.options.schema;
+          }
+          this.app.db.collection(opts);
           const chunkSize = 1e3;
           await this.app.db.getRepository(treeCollection.name).chunk({
             chunkSize,

package/dist/server/plugin.js

@@ -39,8 +39,8 @@ __export(plugin_exports, {
   default: () => plugin_default
 });
 module.exports = __toCommonJS(plugin_exports);
-var import_server = require("@nocobase/server");
 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) => {
@@ -64,12 +64,16 @@ class PluginCollectionTreeServer extends import_server.Plugin {
           }
           const name = `${dataSource.name}_${collection.name}_path`;
           const parentForeignKey = ((_a = collection.treeParentField) == null ? void 0 : _a.foreignKey) || "parentId";
-          this.defineTreePathCollection(name);
+          const options = {};
+          if (collection.options.schema) {
+            options["schema"] = collection.options.schema;
+          }
+          this.defineTreePathCollection(name, options);
           collectionManager.db.on(`${collection.name}.afterSync`, async ({ transaction }) => {
             await this.db.getCollection(name).sync({ transaction });
           });
-          this.db.on(`${collection.name}.afterCreate`, async (model, options) => {
-            const { transaction } = options;
+          this.db.on(`${collection.name}.afterCreate`, async (model, options2) => {
+            const { transaction } = options2;
             const tk = getFilterTargetKey(model);
             let path = `/${model.get(tk)}`;
             path = await this.getTreePath(model, path, collection, name, transaction);
@@ -83,12 +87,12 @@ class PluginCollectionTreeServer extends import_server.Plugin {
               transaction
             });
           });
-          this.db.on(`${collection.name}.afterUpdate`, async (model, options) => {
+          this.db.on(`${collection.name}.afterUpdate`, async (model, options2) => {
             const tk = getFilterTargetKey(model);
             if (!(model._changed.has(tk) || model._changed.has(parentForeignKey))) {
               return;
             }
-            const { transaction } = options;
+            const { transaction } = options2;
             let path = `/${model.get(tk)}`;
             path = await this.getTreePath(model, path, collection, name, transaction);
             const collectionTreePath = this.db.getCollection(name);
@@ -121,13 +125,13 @@ class PluginCollectionTreeServer extends import_server.Plugin {
               });
             }
           });
-          this.db.on(`${collection.name}.afterDestroy`, async (model, options) => {
+          this.db.on(`${collection.name}.afterDestroy`, async (model, options2) => {
             const tk = getFilterTargetKey(model);
             await this.app.db.getRepository(name).destroy({
               filter: {
                 nodePk: model.get(tk)
               },
-              transaction: options.transaction
+              transaction: options2.transaction
             });
           });
         });
@@ -144,7 +148,7 @@ class PluginCollectionTreeServer extends import_server.Plugin {
       }
     });
   }
-  async defineTreePathCollection(name) {
+  async defineTreePathCollection(name, options) {
     this.db.collection({
       name,
       autoGenId: false,
@@ -158,7 +162,8 @@ class PluginCollectionTreeServer extends import_server.Plugin {
         {
           fields: [{ name: "path", length: 191 }]
         }
-      ]
+      ],
+      ...options
     });
   }
   async getTreePath(model, path, collection, pathCollectionName, transaction) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-collection-tree",
-  "version": "1.3.0-beta",
+  "version": "1.3.2-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": "175a86dcc41577bff4f94ae614ebe778fd532f3f"
+  "gitHead": "7a411e2dec764d9d7800dc4eaae26b5ce0b1c751"
 }