@nocobase/plugin-collection-tree 1.6.0-beta.2 → 1.6.0-beta.4

package/dist/externalVersion.js

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

package/dist/server/adjacency-list-repository.d.ts

@@ -6,7 +6,7 @@
  * 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 { CountOptions, FindOptions, Repository, FindAndCountOptions, Model } from '@nocobase/database';
+import { CountOptions, FindAndCountOptions, FindOptions, Model, Repository } from '@nocobase/database';
 import { TreeCollection } from './tree-collection';
 export declare class AdjacencyListRepository extends Repository {
     collection: TreeCollection;

package/dist/server/adjacency-list-repository.js

@@ -39,9 +39,9 @@ __export(adjacency_list_repository_exports, {
   AdjacencyListRepository: () => AdjacencyListRepository
 });
 module.exports = __toCommonJS(adjacency_list_repository_exports);
-var import_lodash = __toESM(require("lodash"));
 var import_database = require("@nocobase/database");
 var import_utils = require("@nocobase/utils");
+var import_lodash = __toESM(require("lodash"));
 class AdjacencyListRepository extends import_database.Repository {
   async update(options) {
     return super.update({
@@ -209,7 +209,8 @@ class AdjacencyListRepository extends import_database.Repository {
     return rootIds.size;
   }
   async count(countOptions) {
-    if (countOptions.raw || !countOptions.tree) {
+    countOptions = countOptions || {};
+    if ((countOptions == null ? void 0 : countOptions.raw) || !(countOptions == null ? void 0 : countOptions.tree)) {
       return await super.count(countOptions);
     }
     if (!(0, import_utils.isValidFilter)(countOptions.filter) && !countOptions.filterByTk) {

package/dist/server/plugin.js

@@ -62,6 +62,7 @@ class PluginCollectionTreeServer extends import_server.Plugin {
           const name = `${dataSource.name}_${collection.name}_path`;
           const parentForeignKey = ((_a = collection.treeParentField) == null ? void 0 : _a.foreignKey) || "parentId";
           const options = {};
+          options["mainCollection"] = collection.name;
           if (collection.options.schema) {
             options["schema"] = collection.options.schema;
           }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-collection-tree",
-  "version": "1.6.0-beta.2",
+  "version": "1.6.0-beta.4",
   "displayName": "Collection: Tree",
   "displayName.zh-CN": "数据表：树",
   "description": "Provides tree collection template",
@@ -14,5 +14,5 @@
     "@nocobase/server": "1.x",
     "@nocobase/test": "1.x"
   },
-  "gitHead": "476ab2f424d86f585c8fba1459568c8aec49a5c6"
+  "gitHead": "4419f433716dadf34886b261d9abe20e74551044"
 }