From 21095d0127f35c8ff28035f3b943eeb9d360e851 Mon Sep 17 00:00:00 2001
From: Zeke Zhang <958414905@qq.com>
Date: Wed, 22 Jan 2025 17:40:13 +0800
Subject: [PATCH 1/2] fix(Table): fix incorrect rowKey (#6109)

* fix(Table): fix incorrect rowKey

* fix: add key for table row
---
 .../core/client/src/schema-component/antd/table-v2/Table.tsx    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/core/client/src/schema-component/antd/table-v2/Table.tsx b/packages/core/client/src/schema-component/antd/table-v2/Table.tsx
index 2248165d97..9a1f052f09 100644
--- a/packages/core/client/src/schema-component/antd/table-v2/Table.tsx
+++ b/packages/core/client/src/schema-component/antd/table-v2/Table.tsx
@@ -142,7 +142,7 @@ const useTableColumns = (props: { showDel?: any; isSubTable?: boolean }, paginat
                 <RecordIndexProvider index={record.__index || index}>
                   <RecordProvider isNew={isNewRecord(record)} record={record} parent={parentRecordData}>
                     <ColumnFieldProvider schema={s} basePath={basePath}>
-                      <span role="button" className={schemaToolbarBigger}>
+                      <span role="button" className={schemaToolbarBigger} key={index}>
                         <RecursionField basePath={basePath} schema={s} onlyRenderProperties />
                       </span>
                     </ColumnFieldProvider>

From aa62053c14d8ecb3e43b6b0b41d34b4141cd5312 Mon Sep 17 00:00:00 2001
From: YANG QIA <2013xile@gmail.com>
Date: Wed, 22 Jan 2025 17:57:50 +0800
Subject: [PATCH 2/2] fix(tree): should not set a tree collection node as its
 own parent (#6122)

---
 .../src/server/__tests__/issues.test.ts       | 66 +++++++++++++++++++
 .../src/server/plugin.ts                      |  7 ++
 2 files changed, 73 insertions(+)
 create mode 100644 packages/plugins/@nocobase/plugin-collection-tree/src/server/__tests__/issues.test.ts

diff --git a/packages/plugins/@nocobase/plugin-collection-tree/src/server/__tests__/issues.test.ts b/packages/plugins/@nocobase/plugin-collection-tree/src/server/__tests__/issues.test.ts
new file mode 100644
index 0000000000..3f216b93a0
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-collection-tree/src/server/__tests__/issues.test.ts
@@ -0,0 +1,66 @@
+/**
+ * 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 { Database } from '@nocobase/database';
+import { MockServer, createMockServer } from '@nocobase/test';
+
+describe('issues', async () => {
+  let app: MockServer;
+  let db: Database;
+  beforeEach(async () => {
+    app = await createMockServer({
+      plugins: ['collection-tree'],
+    });
+    db = app.db;
+    db.collection({
+      name: 'tree',
+      tree: 'adjacency-list',
+      fields: [
+        {
+          type: 'string',
+          name: 'name',
+        },
+        {
+          type: 'belongsTo',
+          name: 'parent',
+          foreignKey: 'parentId',
+          treeParent: true,
+        },
+        {
+          type: 'hasMany',
+          name: 'children',
+          foreignKey: 'parentId',
+          treeChildren: true,
+        },
+      ],
+    });
+    await db.sync();
+  });
+
+  afterEach(async () => {
+    await db.clean({ drop: true });
+    await app.destroy();
+  });
+
+  it('should not set itself as parent', async () => {
+    expect.assertions(1);
+    const root = await db.getRepository('tree').create({
+      values: {
+        name: 'root',
+      },
+    });
+    try {
+      await root.update({
+        parentId: root.get('id'),
+      });
+    } catch (error) {
+      expect(error.message).toBe('Cannot set itself as the parent node');
+    }
+  });
+});
diff --git a/packages/plugins/@nocobase/plugin-collection-tree/src/server/plugin.ts b/packages/plugins/@nocobase/plugin-collection-tree/src/server/plugin.ts
index 945b558a40..cb43d9629d 100644
--- a/packages/plugins/@nocobase/plugin-collection-tree/src/server/plugin.ts
+++ b/packages/plugins/@nocobase/plugin-collection-tree/src/server/plugin.ts
@@ -102,6 +102,13 @@ class PluginCollectionTreeServer extends Plugin {
               transaction: options.transaction,
             });
           });
+
+          this.db.on(`${collection.name}.beforeSave`, async (model: Model) => {
+            const tk = collection.filterTargetKey as string;
+            if (model.get(parentForeignKey) === model.get(tk)) {
+              throw new Error('Cannot set itself as the parent node');
+            }
+          });
         });
       }
     });