refactor: tree table is not enabled by default (#4001)

* refactor: table block do not enable trees by default

* fix: bug

* fix: bug

* fix: bug

packages/core/client/src/block-provider/TableBlockProvider.tsx

@@ -50,7 +50,7 @@ const InternalTableBlockProvider = (props: Props) => {
   const allIncludesChildren = useMemo(() => {
     const { treeTable } = fieldSchema?.['x-decorator-props'] || {};
     const data = service?.data?.data;
-    if (treeTable !== false) {
+    if (treeTable) {
       const keys = getIdsWithChildren(data);
       return keys;
     }
@@ -120,13 +120,14 @@ export const TableBlockProvider = withDynamicSchemaProps((props) => {
   const params = useTableBlockParamsCompat(props);
 
   let childrenColumnName = 'children';
-  if (collection?.tree && treeTable !== false) {
+
+  if (treeTable) {
     if (resourceName?.includes('.')) {
       const f = getCollectionField(resourceName);
       if (f?.treeChildren) {
         childrenColumnName = f.name;
-        params['tree'] = true;
       }
+      params['tree'] = true;
     } else {
       const f = collection.fields.find((f) => f.treeChildren);
       if (f) {

packages/core/client/src/block-provider/TableSelectorProvider.tsx

@@ -161,7 +161,7 @@ export const TableSelectorProvider = withDynamicSchemaProps((props: TableSelecto
   if (props.dragSort) {
     params['sort'] = ['sort'];
   }
-  if (collectionField?.target === collectionField?.collectionName && collection?.tree && treeTable !== false) {
+  if (collectionField?.target === collectionField?.collectionName && collection?.tree && treeTable) {
     params['tree'] = true;
     if (collectionFieldSchema.name === 'parent') {
       params.filter = {

packages/core/client/src/modules/blocks/data-blocks/table-selector/tableSelectorBlockSettings.ts

@@ -77,7 +77,7 @@ export const tableSelectorBlockSettings = new SchemaSettings({
         return {
           title: t('Tree table'),
           defaultChecked: true,
-          checked: field.decoratorProps.treeTable !== false,
+          checked: field.decoratorProps.treeTable,
           onChange: (flag) => {
             field.form.clearFormGraph(`${field.address}.*`);
             field.decoratorProps.treeTable = flag;

packages/core/client/src/modules/blocks/data-blocks/table/TableActionColumnInitializers.tsx

@@ -188,7 +188,7 @@ const commonOptions = {
             const fieldSchema = useFieldSchema();
             const collection = useCollection_deprecated();
             const { treeTable } = fieldSchema?.parent?.parent['x-decorator-props'] || {};
-            return collection.tree && treeTable !== false;
+            return collection.tree && treeTable;
           },
         },
       ],

packages/core/client/src/modules/blocks/data-blocks/table/TableActionInitializers.tsx

@@ -80,7 +80,7 @@ export const tableActionInitializers_deprecated = new CompatibleSchemaInitialize
             const schema = useFieldSchema();
             const collection = useCollection_deprecated();
             const { treeTable } = schema?.parent?.['x-decorator-props'] || {};
-            return collection.tree && treeTable !== false;
+            return collection.tree && treeTable;
           },
         },
       ],
@@ -195,7 +195,7 @@ export const tableActionInitializers = new CompatibleSchemaInitializer(
               const schema = useFieldSchema();
               const collection = useCollection_deprecated();
               const { treeTable } = schema?.parent?.['x-decorator-props'] || {};
-              return collection.tree && treeTable !== false;
+              return collection.tree && treeTable;
             },
           },
         ],

packages/core/client/src/modules/blocks/data-blocks/table/__e2e__/schemaSettings.test.ts

@@ -760,6 +760,7 @@ test.describe('actions schema settings', () => {
     test('supported options', async ({ page, mockPage, mockRecord }) => {
       const nocoPage = await mockPage(oneEmptyTableWithTreeCollection).waitForInit();
       await nocoPage.goto();
+      await page.getByLabel('block-item-CardItem-treeCollection-table').hover();
 
       // 添加一行数据
       // TODO: 使用 mockRecord 为 tree 表添加一行数据无效
@@ -774,6 +775,9 @@ test.describe('actions schema settings', () => {
       await page.mouse.move(300, 0);
       await page.getByRole('button', { name: 'Submit' }).click();
 
+      await page.getByLabel('designer-schema-settings-CardItem-TableBlockDesigner-treeCollection').hover();
+      await page.getByRole('menuitem', { name: 'Tree table' }).click();
+
       // 添加 add child 按钮
       await page.getByRole('button', { name: 'Actions', exact: true }).hover();
       await page.getByLabel('designer-schema-settings-TableV2.Column-TableV2.ActionColumnDesigner-tree').hover();

packages/core/client/src/modules/blocks/data-blocks/table/__e2e__/tree/schemaSettings.test.ts

@@ -32,9 +32,10 @@ test.describe('tree table block schema settings', () => {
     // await expect(page.getByLabel('Expand row').first()).toBeVisible({ timeout: 1000 * 60 });
 
     await showSettingsMenu(page);
-    await expect(page.getByRole('menuitem', { name: 'Tree table' }).getByRole('switch')).toBeChecked();
+    //默认不启用
-    await page.getByRole('menuitem', { name: 'Tree table' }).click();
     await expect(page.getByRole('menuitem', { name: 'Tree table' }).getByRole('switch')).not.toBeChecked();
+    await page.getByRole('menuitem', { name: 'Tree table' }).click();
+    await expect(page.getByRole('menuitem', { name: 'Tree table' }).getByRole('switch')).toBeChecked();
     // await expect(page.getByLabel('Expand row')).toBeHidden();
   });
 });

packages/core/client/src/modules/blocks/data-blocks/table/tableBlockSettings.tsx

@@ -50,7 +50,7 @@ export const tableBlockSettings = new SchemaSettings({
         return {
           title: t('Tree table'),
           defaultChecked: true,
-          checked: treeCollection ? field.decoratorProps.treeTable !== false : false,
+          checked: treeCollection ? field.decoratorProps.treeTable : false,
           onChange: (flag) => {
             field.decoratorProps.treeTable = flag;
             fieldSchema['x-decorator-props'].treeTable = flag;

packages/core/client/src/schema-component/antd/table-v2/TableBlockDesigner.tsx

@@ -126,7 +126,7 @@ export const TableBlockDesigner = () => {
         <SchemaSettingsSwitchItem
           title={t('Tree table')}
           defaultChecked={true}
-          checked={treeCollection ? field.decoratorProps.treeTable !== false : false}
+          checked={treeCollection ? field.decoratorProps.treeTable : false}
           onChange={(flag) => {
             field.decoratorProps.treeTable = flag;
             fieldSchema['x-decorator-props'].treeTable = flag;

packages/core/client/src/schema-component/antd/table-v2/TableSelectorDesigner.tsx

@@ -110,7 +110,7 @@ export const TableSelectorDesigner = () => {
         <SchemaSettingsSwitchItem
           title={t('Tree table')}
           defaultChecked={true}
-          checked={field.decoratorProps.treeTable !== false}
+          checked={field.decoratorProps.treeTable}
           onChange={(flag) => {
             field.form.clearFormGraph(`${field.address}.*`);
             field.decoratorProps.treeTable = flag;

packages/plugins/@nocobase/plugin-gantt/src/client/GanttActionInitializers.tsx

@@ -78,7 +78,7 @@ export const GanttActionInitializers_deprecated = new CompatibleSchemaInitialize
             const schema = useFieldSchema();
             const collection = useCollection_deprecated();
             const { treeTable } = schema?.parent?.['x-decorator-props'] || {};
-            return collection.tree && treeTable !== false;
+            return collection.tree && treeTable;
           },
         },
       ],
@@ -193,7 +193,7 @@ export const ganttActionInitializers = new CompatibleSchemaInitializer(
               const schema = useFieldSchema();
               const collection = useCollection_deprecated();
               const { treeTable } = schema?.parent?.['x-decorator-props'] || {};
-              return collection.tree && treeTable !== false;
+              return collection.tree && treeTable;
             },
           },
         ],