@nocobase/plugin-collection-tree 1.7.0-beta.8 → 1.7.0

package/LICENSE.txt

@@ -1,4 +1,4 @@
-Updated Date: February 20, 2025
+Updated Date: April 1, 2025
 
 NocoBase License Agreement
 
@@ -88,7 +88,7 @@ Except for Third-Party Open Source Software, the Company owns all copyrights, tr
 
 6.6 Can sell plugins developed for Software in the Marketplace.
 
-6.7 The User with an Enterprise Edition License can sell Upper Layer Application to their clients.
+6.7 The User with a Professional or Enterprise Edition License can sell Upper Layer Application to their clients.
 
 6.8 Not restricted by the AGPL-3.0 agreement.
 
@@ -106,9 +106,9 @@ Except for Third-Party Open Source Software, the Company owns all copyrights, tr
 
 7.4 It is not allowed to provide any form of no-code, zero-code, low-code platform SaaS products to the public using the original or modified Software.
 
-7.5 It is not allowed for the User withot an Enterprise Edition license to sell Upper Layer Application to clients without a Commercial license.
+7.5 It is not allowed for the User withot a Professional or Enterprise Edition license to sell Upper Layer Application to clients without a Commercial license.
 
-7.6 It is not allowed for the User with an Enterprise Edition license to sell Upper Layer Application to clients without a Commercial license with access to further development and configuration.
+7.6 It is not allowed for the User with a Professional or Enterprise Edition license to sell Upper Layer Application to clients without a Commercial license with access to further development and configuration.
 
 7.7 It is not allowed to publicly sell plugins developed for Software outside of the Marketplace.
 

package/dist/client/index.js

@@ -7,4 +7,4 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-!function(e,t){"object"==typeof exports&&"object"==typeof module?module.exports=t(require("@nocobase/client")):"function"==typeof define&&define.amd?define("@nocobase/plugin-collection-tree",["@nocobase/client"],t):"object"==typeof exports?exports["@nocobase/plugin-collection-tree"]=t(require("@nocobase/client")):e["@nocobase/plugin-collection-tree"]=t(e["@nocobase/client"])}(self,function(e){return function(){"use strict";var t={772:function(t){t.exports=e}},n={};function r(e){var o=n[e];if(void 0!==o)return o.exports;var u=n[e]={exports:{}};return t[e](u,u.exports,r),u.exports}r.n=function(e){var t=e&&e.__esModule?function(){return e.default}:function(){return e};return r.d(t,{a:t}),t},r.d=function(e,t){for(var n in t)r.o(t,n)&&!r.o(e,n)&&Object.defineProperty(e,n,{enumerable:!0,get:t[n]})},r.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},r.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})};var o={};r.r(o),r.d(o,{PluginCollectionTreeClient:function(){return d}});var u=r(772);function i(e,t,n,r,o,u,i){try{var c=e[u](i),f=c.value}catch(e){n(e);return}c.done?t(f):Promise.resolve(f).then(r,o)}function c(e){return function(){var t=this,n=arguments;return new Promise(function(r,o){var u=e.apply(t,n);function c(e){i(u,r,o,c,f,"next",e)}function f(e){i(u,r,o,c,f,"throw",e)}c(void 0)})}}function f(e,t,n){return(f=y()?Reflect.construct:function(e,t,n){var r=[null];r.push.apply(r,t);var o=new(Function.bind.apply(e,r));return n&&p(o,n.prototype),o}).apply(null,arguments)}function l(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}function a(e){return(a=Object.setPrototypeOf?Object.getPrototypeOf:function(e){return e.__proto__||Object.getPrototypeOf(e)})(e)}function p(e,t){return(p=Object.setPrototypeOf||function(e,t){return e.__proto__=t,e})(e,t)}function s(e){var t="function"==typeof Map?new Map:void 0;return(s=function(e){var n;if(null===e||(n=e,-1===Function.toString.call(n).indexOf("[native code]")))return e;if("function"!=typeof e)throw TypeError("Super expression must either be null or a function");if(void 0!==t){if(t.has(e))return t.get(e);t.set(e,r)}function r(){return f(e,arguments,a(this).constructor)}return r.prototype=Object.create(e.prototype,{constructor:{value:r,enumerable:!1,writable:!0,configurable:!0}}),p(r,e)})(e)}function y(){try{var e=!Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],function(){}))}catch(e){}return(y=function(){return!!e})()}function b(e,t){var n,r,o,u,i={label:0,sent:function(){if(1&o[0])throw o[1];return o[1]},trys:[],ops:[]};return u={next:c(0),throw:c(1),return:c(2)},"function"==typeof Symbol&&(u[Symbol.iterator]=function(){return this}),u;function c(u){return function(c){return function(u){if(n)throw TypeError("Generator is already executing.");for(;i;)try{if(n=1,r&&(o=2&u[0]?r.return:u[0]?r.throw||((o=r.return)&&o.call(r),0):r.next)&&!(o=o.call(r,u[1])).done)return o;switch(r=0,o&&(u=[2&u[0],o.value]),u[0]){case 0:case 1:o=u;break;case 4:return i.label++,{value:u[1],done:!1};case 5:i.label++,r=u[1],u=[0];continue;case 7:u=i.ops.pop(),i.trys.pop();continue;default:if(!(o=(o=i.trys).length>0&&o[o.length-1])&&(6===u[0]||2===u[0])){i=0;continue}if(3===u[0]&&(!o||u[1]>o[0]&&u[1]<o[3])){i.label=u[1];break}if(6===u[0]&&i.label<o[1]){i.label=o[1],o=u;break}if(o&&i.label<o[2]){i.label=o[2],i.ops.push(u);break}o[2]&&i.ops.pop(),i.trys.pop();continue}u=t.call(e,i)}catch(e){u=[6,e],r=0}finally{n=o=0}if(5&u[0])throw u[1];return{value:u[0]?u[1]:void 0,done:!0}}([u,c])}}}var d=function(e){var t,n,r;function o(){var e,t,n;return!function(e,t){if(!(e instanceof t))throw TypeError("Cannot call a class as a function")}(this,o),e=this,t=o,n=arguments,t=a(t),function(e,t){return t&&("object"===function(e){return e&&"undefined"!=typeof Symbol&&e.constructor===Symbol?"symbol":typeof e}(t)||"function"==typeof t)?t:function(e){if(void 0===e)throw ReferenceError("this hasn't been initialised - super() hasn't been called");return e}(e)}(e,y()?Reflect.construct(t,n||[],a(e).constructor):t.apply(e,n))}return!function(e,t){if("function"!=typeof t&&null!==t)throw TypeError("Super expression must either be null or a function");e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,writable:!0,configurable:!0}}),t&&p(e,t)}(o,e),t=o,n=[{key:"afterAdd",value:function(){return c(function(){return b(this,function(e){return[2]})})()}},{key:"beforeLoad",value:function(){return c(function(){return b(this,function(e){return[2]})})()}},{key:"load",value:function(){return c(function(){return b(this,function(e){return[2]})})()}}],l(t.prototype,n),o}(s(u.Plugin));return o.default=d,o}()});
+!function(e,t){"object"==typeof exports&&"object"==typeof module?module.exports=t(require("@nocobase/client")):"function"==typeof define&&define.amd?define("@nocobase/plugin-collection-tree",["@nocobase/client"],t):"object"==typeof exports?exports["@nocobase/plugin-collection-tree"]=t(require("@nocobase/client")):e["@nocobase/plugin-collection-tree"]=t(e["@nocobase/client"])}(self,function(e){return function(){"use strict";var t={772:function(t){t.exports=e}},n={};function r(e){var o=n[e];if(void 0!==o)return o.exports;var u=n[e]={exports:{}};return t[e](u,u.exports,r),u.exports}r.n=function(e){var t=e&&e.__esModule?function(){return e.default}:function(){return e};return r.d(t,{a:t}),t},r.d=function(e,t){for(var n in t)r.o(t,n)&&!r.o(e,n)&&Object.defineProperty(e,n,{enumerable:!0,get:t[n]})},r.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},r.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})};var o={};return!function(){r.r(o),r.d(o,{PluginCollectionTreeClient:function(){return p}});var e=r(772);function t(e,t,n,r,o,u,i){try{var c=e[u](i),l=c.value}catch(e){n(e);return}c.done?t(l):Promise.resolve(l).then(r,o)}function n(e){return function(){var n=this,r=arguments;return new Promise(function(o,u){var i=e.apply(n,r);function c(e){t(i,o,u,c,l,"next",e)}function l(e){t(i,o,u,c,l,"throw",e)}c(void 0)})}}function u(e,t,n){return(u=a()?Reflect.construct:function(e,t,n){var r=[null];r.push.apply(r,t);var o=new(Function.bind.apply(e,r));return n&&c(o,n.prototype),o}).apply(null,arguments)}function i(e){return(i=Object.setPrototypeOf?Object.getPrototypeOf:function(e){return e.__proto__||Object.getPrototypeOf(e)})(e)}function c(e,t){return(c=Object.setPrototypeOf||function(e,t){return e.__proto__=t,e})(e,t)}function l(e){var t="function"==typeof Map?new Map:void 0;return(l=function(e){if(null===e||-1===Function.toString.call(e).indexOf("[native code]"))return e;if("function"!=typeof e)throw TypeError("Super expression must either be null or a function");if(void 0!==t){if(t.has(e))return t.get(e);t.set(e,n)}function n(){return u(e,arguments,i(this).constructor)}return n.prototype=Object.create(e.prototype,{constructor:{value:n,enumerable:!1,writable:!0,configurable:!0}}),c(n,e)})(e)}function a(){try{var e=!Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],function(){}))}catch(e){}return(a=function(){return!!e})()}function f(e,t){var n,r,o,u,i={label:0,sent:function(){if(1&o[0])throw o[1];return o[1]},trys:[],ops:[]};return u={next:c(0),throw:c(1),return:c(2)},"function"==typeof Symbol&&(u[Symbol.iterator]=function(){return this}),u;function c(u){return function(c){var l=[u,c];if(n)throw TypeError("Generator is already executing.");for(;i;)try{if(n=1,r&&(o=2&l[0]?r.return:l[0]?r.throw||((o=r.return)&&o.call(r),0):r.next)&&!(o=o.call(r,l[1])).done)return o;switch(r=0,o&&(l=[2&l[0],o.value]),l[0]){case 0:case 1:o=l;break;case 4:return i.label++,{value:l[1],done:!1};case 5:i.label++,r=l[1],l=[0];continue;case 7:l=i.ops.pop(),i.trys.pop();continue;default:if(!(o=(o=i.trys).length>0&&o[o.length-1])&&(6===l[0]||2===l[0])){i=0;continue}if(3===l[0]&&(!o||l[1]>o[0]&&l[1]<o[3])){i.label=l[1];break}if(6===l[0]&&i.label<o[1]){i.label=o[1],o=l;break}if(o&&i.label<o[2]){i.label=o[2],i.ops.push(l);break}o[2]&&i.ops.pop(),i.trys.pop();continue}l=t.call(e,i)}catch(e){l=[6,e],r=0}finally{n=o=0}if(5&l[0])throw l[1];return{value:l[0]?l[1]:void 0,done:!0}}}}var p=function(e){var t;if("function"!=typeof e&&null!==e)throw TypeError("Super expression must either be null or a function");function r(){var e,t;if(!(this instanceof r))throw TypeError("Cannot call a class as a function");return e=r,t=arguments,e=i(e),function(e,t){var n;if(t&&("object"==((n=t)&&"undefined"!=typeof Symbol&&n.constructor===Symbol?"symbol":typeof n)||"function"==typeof t))return t;if(void 0===e)throw ReferenceError("this hasn't been initialised - super() hasn't been called");return e}(this,a()?Reflect.construct(e,t||[],i(this).constructor):e.apply(this,t))}return r.prototype=Object.create(e&&e.prototype,{constructor:{value:r,writable:!0,configurable:!0}}),e&&c(r,e),t=[{key:"afterAdd",value:function(){return n(function(){return f(this,function(e){return[2]})})()}},{key:"beforeLoad",value:function(){return n(function(){return f(this,function(e){return[2]})})()}},{key:"load",value:function(){return n(function(){return f(this,function(e){return[2]})})()}}],function(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}(r.prototype,t),r}(l(e.Plugin));o.default=p}(),o}()});

package/dist/externalVersion.js

@@ -8,11 +8,11 @@
  */
 
 module.exports = {
-  "@nocobase/client": "1.7.0-beta.8",
-  "@nocobase/database": "1.7.0-beta.8",
-  "@nocobase/utils": "1.7.0-beta.8",
+  "@nocobase/client": "1.7.0",
+  "@nocobase/database": "1.7.0",
+  "@nocobase/utils": "1.7.0",
   "lodash": "4.17.21",
-  "@nocobase/data-source-manager": "1.7.0-beta.8",
-  "@nocobase/server": "1.7.0-beta.8",
+  "@nocobase/data-source-manager": "1.7.0",
+  "@nocobase/server": "1.7.0",
   "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/migrations/20240802141435-collection-tree.js

@@ -59,6 +59,7 @@ class collection_tree_default extends import_server.Migration {
     await this.db.sequelize.transaction(async (transaction) => {
       const treeCollections = await this.getTreeCollections({ transaction });
       for (const treeCollection of treeCollections) {
+        await treeCollection.load({ transaction });
         const name = `main_${treeCollection.name}_path`;
         const collectionOptions = {
           name,
@@ -84,19 +85,6 @@ class collection_tree_default extends import_server.Migration {
         const treeExistsInDb = await this.app.db.getCollection(name).existsInDb({ transaction });
         if (!treeExistsInDb) {
           await this.app.db.getCollection(name).sync({ transaction });
-          const opts = {
-            name: treeCollection.name,
-            autoGenId: false,
-            timestamps: false,
-            fields: [
-              { type: "integer", name: "id" },
-              { type: "integer", name: "parentId" }
-            ]
-          };
-          if (treeCollectionSchema != this.app.db.options.schema) {
-            opts["schema"] = treeCollectionSchema;
-          }
-          this.app.db.collection(opts);
           const chunkSize = 1e3;
           await this.app.db.getRepository(treeCollection.name).chunk({
             chunkSize,

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.7.0-beta.8",
+  "version": "1.7.0",
   "displayName": "Collection: Tree",
   "displayName.zh-CN": "数据表：树",
   "description": "Provides tree collection template",
@@ -14,5 +14,5 @@
     "@nocobase/server": "1.x",
     "@nocobase/test": "1.x"
   },
-  "gitHead": "9ad35ee90db98d95dfa660645d155f4f4e81b47c"
+  "gitHead": "767ae089e404a104d718962272289c0bec01803a"
 }