From a5fc22c6b03167b31590b31e13c1dca5a96160d2 Mon Sep 17 00:00:00 2001
From: jack zhang <1098626505@qq.com>
Date: Tue, 11 Jun 2024 22:53:04 +0800
Subject: [PATCH] feat: tree block (#4566)
* feat: tree block
* fix: remove showSettings
* fix: bug
* fix: bug
* fix: bug
* fix: bug
* fix: table tree expand
* fix: bug
* fix: connection bug T-4501
* fix: template settings bug
---
.../association-table-list-and-source-id.tsx | 4 +-
.../src/application/schema-settings/index.ts | 1 +
.../utils/createModalSettingsItem.tsx | 66 +
.../utils/createSelectSettingsItem.tsx | 68 +
.../utils/createSwitchSettingsItem.tsx | 61 +
.../schema-settings/utils/index.ts | 12 +
.../application/schema-settings/utils/util.ts | 39 +
.../src/block-provider/TableBlockProvider.tsx | 21 +-
.../block-provider/TableSelectorProvider.tsx | 4 +-
.../src/data-source/collection/Collection.ts | 4 +
.../demo-utils/dataSourceMainCollections.json | 211 +
.../src/demo-utils/dataSourceMainData.json | 143 +
packages/core/client/src/demo-utils/index.tsx | 8 +-
.../core/client/src/filter-provider/utils.ts | 4 +-
packages/core/client/src/locale/en_US.json | 3 +-
packages/core/client/src/locale/es_ES.json | 3 +-
packages/core/client/src/locale/fr_FR.json | 3 +-
packages/core/client/src/locale/ja_JP.json | 3 +-
packages/core/client/src/locale/ko_KR.json | 3 +-
packages/core/client/src/locale/pt_BR.json | 3 +-
packages/core/client/src/locale/ru_RU.json | 3 +-
packages/core/client/src/locale/tr_TR.json | 3 +-
packages/core/client/src/locale/uk_UA.json | 3 +-
packages/core/client/src/locale/zh-CN.json | 3 +-
packages/core/client/src/locale/zh-TW.json | 3 +-
.../data-blocks/table/tableBlockSettings.tsx | 192 +-
.../antd/card-item/CardItem.tsx | 3 +-
.../schema-component/antd/table-v2/Table.tsx | 2 +-
.../demos/new-demos/tree-expandFlag.tsx | 86 +
.../antd/table-v2/demos/new-demos/tree.tsx | 85 +
.../schema-component/antd/table-v2/index.md | 28 +
.../schema-component/hooks/useBlockSize.ts | 20 +-
.../items/DataBlockInitializer.tsx | 5 +-
.../src/schema-settings/SchemaSettings.tsx | 1 +
.../SchemaSettingsTemplate.tsx | 4 +-
.../core/client/src/schema-settings/index.ts | 2 +
...tDefaultSortingRulesSchemaSettingsItem.tsx | 140 +
.../setTheDataScopeSchemaSettingsItem.tsx | 54 +
.../src/client/index.tsx | 10 +-
yarn.lock | 9219 ++++++++++++++++-
40 files changed, 10089 insertions(+), 441 deletions(-)
create mode 100644 packages/core/client/src/application/schema-settings/utils/createModalSettingsItem.tsx
create mode 100644 packages/core/client/src/application/schema-settings/utils/createSelectSettingsItem.tsx
create mode 100644 packages/core/client/src/application/schema-settings/utils/createSwitchSettingsItem.tsx
create mode 100644 packages/core/client/src/application/schema-settings/utils/index.ts
create mode 100644 packages/core/client/src/application/schema-settings/utils/util.ts
create mode 100644 packages/core/client/src/schema-component/antd/table-v2/demos/new-demos/tree-expandFlag.tsx
create mode 100644 packages/core/client/src/schema-component/antd/table-v2/demos/new-demos/tree.tsx
create mode 100644 packages/core/client/src/schema-settings/setDefaultSortingRulesSchemaSettingsItem.tsx
create mode 100644 packages/core/client/src/schema-settings/setTheDataScopeSchemaSettingsItem.tsx
diff --git a/packages/core/client/docs/en-US/core/data-block/demos/data-block-provider/association-table-list-and-source-id.tsx b/packages/core/client/docs/en-US/core/data-block/demos/data-block-provider/association-table-list-and-source-id.tsx
index a7594c7b5..0552d783a 100644
--- a/packages/core/client/docs/en-US/core/data-block/demos/data-block-provider/association-table-list-and-source-id.tsx
+++ b/packages/core/client/docs/en-US/core/data-block/demos/data-block-provider/association-table-list-and-source-id.tsx
@@ -110,11 +110,11 @@ const mocks = {
},
],
},
- [`${collection}:get/1`]: {
+ [`${collection}:get?filter[id]=1`]: {
id: 1,
username: 'Tom',
},
- [`${collection}:get/2`]: {
+ [`${collection}:get?filter[id]=2`]: {
id: 1,
username: 'Jack',
},
diff --git a/packages/core/client/src/application/schema-settings/index.ts b/packages/core/client/src/application/schema-settings/index.ts
index 2b155a229..f0e510f4e 100644
--- a/packages/core/client/src/application/schema-settings/index.ts
+++ b/packages/core/client/src/application/schema-settings/index.ts
@@ -12,3 +12,4 @@ export * from './SchemaSettingsManager';
export * from './components';
export * from './context/SchemaSettingItemContext';
export * from './types';
+export * from './utils';
diff --git a/packages/core/client/src/application/schema-settings/utils/createModalSettingsItem.tsx b/packages/core/client/src/application/schema-settings/utils/createModalSettingsItem.tsx
new file mode 100644
index 000000000..17c6f2966
--- /dev/null
+++ b/packages/core/client/src/application/schema-settings/utils/createModalSettingsItem.tsx
@@ -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 { SchemaSettingsItemType, useCompile, useDesignable } from '@nocobase/client';
+import { ISchema, useFieldSchema } from '@formily/react';
+import _ from 'lodash';
+import { TFunction, useTranslation } from 'react-i18next';
+
+import { getNewSchema, useHookDefault } from './util';
+
+export interface CreateModalSchemaSettingsItemProps {
+ name: string;
+ title: string | ((t: TFunction<'translation', undefined>) => string);
+ parentSchemaKey: string;
+ defaultValue?: any;
+ useDefaultValue?: () => any;
+ schema: (defaultValue: any) => ISchema;
+ valueKeys?: string[];
+ useVisible?: () => boolean;
+}
+
+/**
+ * create `switch` type schema settings item
+ *
+ * @internal
+ * @unstable
+ */
+export function createModalSettingsItem(options: CreateModalSchemaSettingsItemProps): SchemaSettingsItemType {
+ const {
+ name,
+ parentSchemaKey,
+ valueKeys,
+ schema,
+ title,
+ useVisible,
+ defaultValue: propsDefaultValue,
+ useDefaultValue = useHookDefault,
+ } = options;
+ return {
+ name,
+ type: 'actionModal',
+ useComponentProps() {
+ const fieldSchema = useFieldSchema();
+ const { deepMerge } = useDesignable();
+ const defaultValue = useDefaultValue(propsDefaultValue);
+ const values = _.get(fieldSchema, parentSchemaKey);
+ const compile = useCompile();
+ const { t } = useTranslation();
+
+ return {
+ title: typeof title === 'function' ? title(t) : compile(title),
+ useVisible,
+ schema: schema({ ...defaultValue, ...values }),
+ onSubmit(values) {
+ deepMerge(getNewSchema({ fieldSchema, schemaKey: parentSchemaKey, value: values, valueKeys }));
+ },
+ };
+ },
+ };
+}
diff --git a/packages/core/client/src/application/schema-settings/utils/createSelectSettingsItem.tsx b/packages/core/client/src/application/schema-settings/utils/createSelectSettingsItem.tsx
new file mode 100644
index 000000000..3112ea442
--- /dev/null
+++ b/packages/core/client/src/application/schema-settings/utils/createSelectSettingsItem.tsx
@@ -0,0 +1,68 @@
+/**
+ * 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 _ from 'lodash';
+import { useFieldSchema } from '@formily/react';
+import { SchemaSettingsItemType, SelectProps, useCompile, useDesignable } from '@nocobase/client';
+import { getNewSchema, useHookDefault } from './util';
+import { TFunction, useTranslation } from 'react-i18next';
+
+interface CreateSelectSchemaSettingsItemProps {
+ name: string;
+ title: string | ((t: TFunction<'translation', undefined>) => string);
+ options?: SelectProps['options'];
+ useOptions?: () => SelectProps['options'];
+ schemaKey: string;
+ defaultValue?: string | number;
+ useDefaultValue?: () => string | number;
+ useVisible?: () => boolean;
+}
+
+/**
+ * create `select` type schema settings item
+ *
+ * @internal
+ * @unstable
+ */
+export const createSelectSchemaSettingsItem = (
+ options: CreateSelectSchemaSettingsItemProps,
+): SchemaSettingsItemType => {
+ const {
+ name,
+ title,
+ options: propsOptions,
+ useOptions = useHookDefault,
+ schemaKey,
+ useVisible,
+ defaultValue: propsDefaultValue,
+ useDefaultValue = useHookDefault,
+ } = options;
+ return {
+ name,
+ type: 'select',
+ useComponentProps() {
+ const filedSchema = useFieldSchema();
+ const { deepMerge } = useDesignable();
+ const options = useOptions(propsOptions);
+ const defaultValue = useDefaultValue(propsDefaultValue);
+ const compile = useCompile();
+ const { t } = useTranslation();
+
+ return {
+ title: typeof title === 'function' ? title(t) : compile(title),
+ options,
+ useVisible,
+ value: _.get(filedSchema, schemaKey, defaultValue),
+ onChange(v) {
+ deepMerge(getNewSchema({ fieldSchema: filedSchema, schemaKey, value: v }));
+ },
+ };
+ },
+ };
+};
diff --git a/packages/core/client/src/application/schema-settings/utils/createSwitchSettingsItem.tsx b/packages/core/client/src/application/schema-settings/utils/createSwitchSettingsItem.tsx
new file mode 100644
index 000000000..32177aec3
--- /dev/null
+++ b/packages/core/client/src/application/schema-settings/utils/createSwitchSettingsItem.tsx
@@ -0,0 +1,61 @@
+/**
+ * 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 { SchemaSettingsItemType, useCompile, useDesignable } from '@nocobase/client';
+import { useFieldSchema } from '@formily/react';
+import _ from 'lodash';
+
+import { getNewSchema, useHookDefault } from './util';
+import { TFunction, useTranslation } from 'react-i18next';
+
+export interface CreateSwitchSchemaSettingsItemProps {
+ name: string;
+ title: string | ((t: TFunction<'translation', undefined>) => string);
+ schemaKey: string;
+ defaultValue?: boolean;
+ useDefaultValue?: () => boolean;
+ useVisible?: () => boolean;
+}
+
+/**
+ * create `switch` type schema settings item
+ *
+ * @internal
+ * @unstable
+ */
+export function createSwitchSettingsItem(options: CreateSwitchSchemaSettingsItemProps): SchemaSettingsItemType {
+ const {
+ name,
+ useVisible,
+ schemaKey,
+ title,
+ defaultValue: propsDefaultValue,
+ useDefaultValue = useHookDefault,
+ } = options;
+ return {
+ name,
+ useVisible,
+ type: 'switch',
+ useComponentProps() {
+ const filedSchema = useFieldSchema();
+ const { deepMerge } = useDesignable();
+ const defaultValue = useDefaultValue(propsDefaultValue);
+ const compile = useCompile();
+ const { t } = useTranslation();
+
+ return {
+ title: typeof title === 'function' ? title(t) : compile(title),
+ checked: !!_.get(filedSchema, schemaKey, defaultValue),
+ onChange(v) {
+ deepMerge(getNewSchema({ fieldSchema: filedSchema, schemaKey, value: v }));
+ },
+ };
+ },
+ };
+}
diff --git a/packages/core/client/src/application/schema-settings/utils/index.ts b/packages/core/client/src/application/schema-settings/utils/index.ts
new file mode 100644
index 000000000..4e6b4f85a
--- /dev/null
+++ b/packages/core/client/src/application/schema-settings/utils/index.ts
@@ -0,0 +1,12 @@
+/**
+ * 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.
+ */
+
+export * from './createSelectSettingsItem';
+export * from './createSwitchSettingsItem';
+export * from './createModalSettingsItem';
diff --git a/packages/core/client/src/application/schema-settings/utils/util.ts b/packages/core/client/src/application/schema-settings/utils/util.ts
new file mode 100644
index 000000000..e41403e1b
--- /dev/null
+++ b/packages/core/client/src/application/schema-settings/utils/util.ts
@@ -0,0 +1,39 @@
+/**
+ * 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 { ISchema } from '@formily/json-schema';
+import _ from 'lodash';
+
+type IGetNewSchema = {
+ fieldSchema: ISchema;
+ schemaKey: string;
+ value: any;
+ valueKeys?: string[];
+};
+
+export function getNewSchema(options: IGetNewSchema) {
+ const { fieldSchema, schemaKey, value, valueKeys } = options as any;
+ const schemaKeyArr = schemaKey.split('.');
+ const clonedSchema = _.cloneDeep(fieldSchema[schemaKeyArr[0]]);
+
+ if (value != undefined && typeof value === 'object') {
+ Object.keys(value).forEach((key) => {
+ if (valueKeys && !valueKeys.includes(key)) return;
+ _.set(clonedSchema, `${schemaKeyArr.slice(1)}.${key}`, value[key]);
+ });
+ } else {
+ _.set(clonedSchema, schemaKeyArr.slice(1), value);
+ }
+ return {
+ 'x-uid': fieldSchema['x-uid'],
+ [schemaKeyArr[0]]: clonedSchema,
+ };
+}
+
+export const useHookDefault = (defaultValues?: any) => defaultValues;
diff --git a/packages/core/client/src/block-provider/TableBlockProvider.tsx b/packages/core/client/src/block-provider/TableBlockProvider.tsx
index d295fb8a2..8f34a5e44 100644
--- a/packages/core/client/src/block-provider/TableBlockProvider.tsx
+++ b/packages/core/client/src/block-provider/TableBlockProvider.tsx
@@ -9,7 +9,7 @@
import { createForm } from '@formily/core';
import { FormContext, useField, useFieldSchema } from '@formily/react';
-import React, { createContext, useCallback, useContext, useMemo, useState } from 'react';
+import React, { createContext, useCallback, useContext, useEffect, useMemo, useState } from 'react';
import { useCollectionManager_deprecated } from '../collection-manager';
import { withDynamicSchemaProps } from '../hoc/withDynamicSchemaProps';
import { useTableBlockParams } from '../modules/blocks/data-blocks/table';
@@ -49,14 +49,29 @@ interface Props {
*/
collection?: string;
children?: any;
+ expandFlag?: boolean;
}
const InternalTableBlockProvider = (props: Props) => {
- const { params, showIndex, dragSort, rowKey, childrenColumnName, fieldNames, ...others } = props;
+ const {
+ params,
+ showIndex,
+ dragSort,
+ rowKey,
+ childrenColumnName,
+ expandFlag: propsExpandFlag = false,
+ fieldNames,
+ ...others
+ } = props;
const field: any = useField();
const { resource, service } = useBlockRequestContext();
const fieldSchema = useFieldSchema();
- const [expandFlag, setExpandFlag] = useState(fieldNames ? true : false);
+ const [expandFlag, setExpandFlag] = useState(fieldNames || propsExpandFlag ? true : false);
+
+ useEffect(() => {
+ setExpandFlag(fieldNames || propsExpandFlag);
+ }, [fieldNames || propsExpandFlag]);
+
const allIncludesChildren = useMemo(() => {
const { treeTable } = fieldSchema?.['x-decorator-props'] || {};
const data = service?.data?.data;
diff --git a/packages/core/client/src/block-provider/TableSelectorProvider.tsx b/packages/core/client/src/block-provider/TableSelectorProvider.tsx
index 8fd90a834..3ddcc01d4 100644
--- a/packages/core/client/src/block-provider/TableSelectorProvider.tsx
+++ b/packages/core/client/src/block-provider/TableSelectorProvider.tsx
@@ -61,10 +61,10 @@ export const TableSelectorParamsProvider = ({ params, children }: { params: Para
};
const InternalTableSelectorProvider = (props) => {
- const { params, rowKey, extraFilter } = props;
+ const { params, rowKey, extraFilter, expandFlag: propsExpandFlag = false } = props;
const field = useField();
const { resource, service } = useBlockRequestContext();
- const [expandFlag, setExpandFlag] = useState(false);
+ const [expandFlag, setExpandFlag] = useState(propsExpandFlag);
const parentRecordData = useCollectionParentRecordData();
// if (service.loading) {
// return ;
diff --git a/packages/core/client/src/data-source/collection/Collection.ts b/packages/core/client/src/data-source/collection/Collection.ts
index fd1908b4e..a7dd53806 100644
--- a/packages/core/client/src/data-source/collection/Collection.ts
+++ b/packages/core/client/src/data-source/collection/Collection.ts
@@ -287,4 +287,8 @@ export class Collection {
hasField(name: SchemaKey) {
return !!this.getField(name);
}
+
+ isTitleField(field: CollectionFieldOptions) {
+ return this.app.dataSourceManager.collectionFieldInterfaceManager.getFieldInterface(field.interface)?.titleUsable;
+ }
}
diff --git a/packages/core/client/src/demo-utils/dataSourceMainCollections.json b/packages/core/client/src/demo-utils/dataSourceMainCollections.json
index bfe1adb14..848a38cdb 100644
--- a/packages/core/client/src/demo-utils/dataSourceMainCollections.json
+++ b/packages/core/client/src/demo-utils/dataSourceMainCollections.json
@@ -815,5 +815,216 @@
"template": "general",
"view": false,
"filterTargetKey": "id"
+ },
+ {
+ "key": "knautlbeoqj",
+ "name": "tree-collection",
+ "title": "tree-collection",
+ "inherit": false,
+ "hidden": false,
+ "description": null,
+ "fields": [
+ {
+ "key": "h4ixmucmj41",
+ "name": "parentId",
+ "type": "bigInt",
+ "interface": "integer",
+ "description": null,
+ "collectionName": "tree-collection",
+ "parentKey": null,
+ "reverseKey": null,
+ "isForeignKey": true,
+ "uiSchema": {
+ "type": "number",
+ "title": "{{t(\"Parent ID\")}}",
+ "x-component": "InputNumber",
+ "x-read-pretty": true
+ }
+ },
+ {
+ "key": "noozlvzzcxs",
+ "name": "parent",
+ "type": "belongsTo",
+ "interface": "m2o",
+ "description": null,
+ "collectionName": "tree-collection",
+ "parentKey": null,
+ "reverseKey": null,
+ "foreignKey": "parentId",
+ "treeParent": true,
+ "onDelete": "CASCADE",
+ "uiSchema": {
+ "title": "{{t(\"Parent\")}}",
+ "x-component": "AssociationField",
+ "x-component-props": {
+ "multiple": false,
+ "fieldNames": {
+ "label": "id",
+ "value": "id"
+ }
+ }
+ },
+ "target": "tree-collection",
+ "targetKey": "id"
+ },
+ {
+ "key": "0ozo4vvd28w",
+ "name": "children",
+ "type": "hasMany",
+ "interface": "o2m",
+ "description": null,
+ "collectionName": "tree-collection",
+ "parentKey": null,
+ "reverseKey": null,
+ "foreignKey": "parentId",
+ "treeChildren": true,
+ "onDelete": "CASCADE",
+ "uiSchema": {
+ "title": "{{t(\"Children\")}}",
+ "x-component": "AssociationField",
+ "x-component-props": {
+ "multiple": true,
+ "fieldNames": {
+ "label": "id",
+ "value": "id"
+ }
+ }
+ },
+ "target": "tree-collection",
+ "targetKey": "id",
+ "sourceKey": "id"
+ },
+ {
+ "key": "dsqipnyzywx",
+ "name": "id",
+ "type": "bigInt",
+ "interface": "integer",
+ "description": null,
+ "collectionName": "tree-collection",
+ "parentKey": null,
+ "reverseKey": null,
+ "autoIncrement": true,
+ "primaryKey": true,
+ "allowNull": false,
+ "uiSchema": {
+ "type": "number",
+ "title": "{{t(\"ID\")}}",
+ "x-component": "InputNumber",
+ "x-read-pretty": true
+ }
+ },
+ {
+ "key": "51j7ynbyajo",
+ "name": "createdAt",
+ "type": "date",
+ "interface": "createdAt",
+ "description": null,
+ "collectionName": "tree-collection",
+ "parentKey": null,
+ "reverseKey": null,
+ "field": "createdAt",
+ "uiSchema": {
+ "type": "datetime",
+ "title": "{{t(\"Created at\")}}",
+ "x-component": "DatePicker",
+ "x-component-props": {},
+ "x-read-pretty": true
+ }
+ },
+ {
+ "key": "fn6dpvd9ms1",
+ "name": "createdBy",
+ "type": "belongsTo",
+ "interface": "createdBy",
+ "description": null,
+ "collectionName": "tree-collection",
+ "parentKey": null,
+ "reverseKey": null,
+ "target": "users",
+ "foreignKey": "createdById",
+ "uiSchema": {
+ "type": "object",
+ "title": "{{t(\"Created by\")}}",
+ "x-component": "AssociationField",
+ "x-component-props": {
+ "fieldNames": {
+ "value": "id",
+ "label": "nickname"
+ }
+ },
+ "x-read-pretty": true
+ },
+ "targetKey": "id"
+ },
+ {
+ "key": "n7zolkpe5rh",
+ "name": "updatedAt",
+ "type": "date",
+ "interface": "updatedAt",
+ "description": null,
+ "collectionName": "tree-collection",
+ "parentKey": null,
+ "reverseKey": null,
+ "field": "updatedAt",
+ "uiSchema": {
+ "type": "string",
+ "title": "{{t(\"Last updated at\")}}",
+ "x-component": "DatePicker",
+ "x-component-props": {},
+ "x-read-pretty": true
+ }
+ },
+ {
+ "key": "ogtun00ozu2",
+ "name": "updatedBy",
+ "type": "belongsTo",
+ "interface": "updatedBy",
+ "description": null,
+ "collectionName": "tree-collection",
+ "parentKey": null,
+ "reverseKey": null,
+ "target": "users",
+ "foreignKey": "updatedById",
+ "uiSchema": {
+ "type": "object",
+ "title": "{{t(\"Last updated by\")}}",
+ "x-component": "AssociationField",
+ "x-component-props": {
+ "fieldNames": {
+ "value": "id",
+ "label": "nickname"
+ }
+ },
+ "x-read-pretty": true
+ },
+ "targetKey": "id"
+ },
+ {
+ "key": "4tiwdomlf6g",
+ "name": "title",
+ "type": "string",
+ "interface": "input",
+ "description": null,
+ "collectionName": "tree-collection",
+ "parentKey": null,
+ "reverseKey": null,
+ "uiSchema": {
+ "type": "string",
+ "x-component": "Input",
+ "title": "title"
+ }
+ }
+ ],
+ "logging": true,
+ "autoGenId": true,
+ "createdAt": true,
+ "createdBy": true,
+ "updatedAt": true,
+ "updatedBy": true,
+ "template": "tree",
+ "view": false,
+ "tree": "adjacencyList",
+ "schema": "public",
+ "filterTargetKey": "id"
}
]
diff --git a/packages/core/client/src/demo-utils/dataSourceMainData.json b/packages/core/client/src/demo-utils/dataSourceMainData.json
index 9eb7b5780..87cc52ae0 100644
--- a/packages/core/client/src/demo-utils/dataSourceMainData.json
+++ b/packages/core/client/src/demo-utils/dataSourceMainData.json
@@ -283,5 +283,148 @@
"destroy": [1, 2]
}
}
+ },
+ "tree-collection:list": {
+ "data": [
+ {
+ "id": 1,
+ "createdAt": "2024-06-05T02:58:23.961Z",
+ "updatedAt": "2024-06-05T02:58:23.961Z",
+ "parentId": null,
+ "createdById": 1,
+ "updatedById": 1,
+ "title": "title-0",
+ "children": [
+ {
+ "id": 4,
+ "createdAt": "2024-06-05T02:59:21.455Z",
+ "updatedAt": "2024-06-05T02:59:21.462Z",
+ "parentId": 1,
+ "createdById": 1,
+ "updatedById": 1,
+ "title": "title-0-0",
+ "children": [
+ {
+ "id": 10,
+ "createdAt": "2024-06-05T03:00:14.122Z",
+ "updatedAt": "2024-06-05T03:00:14.129Z",
+ "parentId": 4,
+ "createdById": 1,
+ "updatedById": 1,
+ "title": "title-0-0-0",
+ "__index": "0.children.0.children.0"
+ },
+ {
+ "id": 11,
+ "createdAt": "2024-06-05T03:00:21.816Z",
+ "updatedAt": "2024-06-05T03:00:21.822Z",
+ "parentId": 4,
+ "createdById": 1,
+ "updatedById": 1,
+ "title": "title-0-0-1",
+ "__index": "0.children.0.children.1"
+ },
+ {
+ "id": 12,
+ "createdAt": "2024-06-05T03:00:34.253Z",
+ "updatedAt": "2024-06-05T03:00:34.261Z",
+ "parentId": 4,
+ "createdById": 1,
+ "updatedById": 1,
+ "title": "title-0-0-2",
+ "__index": "0.children.0.children.2"
+ }
+ ],
+ "__index": "0.children.0"
+ },
+ {
+ "id": 5,
+ "createdAt": "2024-06-05T02:59:27.667Z",
+ "updatedAt": "2024-06-05T02:59:27.676Z",
+ "parentId": 1,
+ "createdById": 1,
+ "updatedById": 1,
+ "title": "title-0-1",
+ "__index": "0.children.1"
+ },
+ {
+ "id": 6,
+ "createdAt": "2024-06-05T02:59:33.167Z",
+ "updatedAt": "2024-06-05T02:59:33.174Z",
+ "parentId": 1,
+ "createdById": 1,
+ "updatedById": 1,
+ "title": "title-0-2",
+ "__index": "0.children.2"
+ }
+ ],
+ "__index": "0"
+ },
+ {
+ "id": 2,
+ "createdAt": "2024-06-05T02:58:32.009Z",
+ "updatedAt": "2024-06-05T02:58:32.009Z",
+ "parentId": null,
+ "createdById": 1,
+ "updatedById": 1,
+ "title": "title-1",
+ "children": [
+ {
+ "id": 7,
+ "createdAt": "2024-06-05T02:59:39.049Z",
+ "updatedAt": "2024-06-05T02:59:39.055Z",
+ "parentId": 2,
+ "createdById": 1,
+ "updatedById": 1,
+ "title": "title-1-0",
+ "__index": "1.children.0"
+ },
+ {
+ "id": 8,
+ "createdAt": "2024-06-05T02:59:47.298Z",
+ "updatedAt": "2024-06-05T02:59:47.305Z",
+ "parentId": 2,
+ "createdById": 1,
+ "updatedById": 1,
+ "title": "title-1-1",
+ "__index": "1.children.1"
+ }
+ ],
+ "__index": "1"
+ },
+ {
+ "id": 3,
+ "createdAt": "2024-06-05T02:58:34.289Z",
+ "updatedAt": "2024-06-05T02:58:34.289Z",
+ "parentId": null,
+ "createdById": 1,
+ "updatedById": 1,
+ "title": "title-2",
+ "children": [
+ {
+ "id": 9,
+ "createdAt": "2024-06-05T02:59:54.611Z",
+ "updatedAt": "2024-06-05T02:59:54.617Z",
+ "parentId": 3,
+ "createdById": 1,
+ "updatedById": 1,
+ "title": "title-2-0",
+ "__index": "2.children.0"
+ }
+ ],
+ "__index": "2"
+ }
+ ],
+ "meta": {
+ "count": 3,
+ "page": 1,
+ "pageSize": 20,
+ "totalPage": 1,
+ "allowedActions": {
+ "view": [1, 4, 10, 11, 12, 5, 6, 2, 7, 8, 3, 9],
+ "update": [1, 4, 10, 11, 12, 5, 6, 2, 7, 8, 3, 9],
+ "destroy": [1, 4, 10, 11, 12, 5, 6, 2, 7, 8, 3, 9]
+ }
+ }
}
}
diff --git a/packages/core/client/src/demo-utils/index.tsx b/packages/core/client/src/demo-utils/index.tsx
index a40aa2bd1..d0f83b38a 100644
--- a/packages/core/client/src/demo-utils/index.tsx
+++ b/packages/core/client/src/demo-utils/index.tsx
@@ -15,7 +15,9 @@ import {
AntdSchemaComponentPlugin,
Application,
ApplicationOptions,
+ BlockSchemaToolbar,
CollectionPlugin,
+ DataBlockInitializer,
LocalDataSource,
SchemaSettingsPlugin,
} from '../index';
@@ -108,7 +110,11 @@ export const mockApp = (options: MockAppOptions) => {
app.pluginManager.add(AntdSchemaComponentPlugin);
app.pluginManager.add(SchemaSettingsPlugin);
app.pluginManager.add(CollectionPlugin, { config: { enableRemoteDataSource: false } });
- app.addComponents({ ActionInitializer });
+ app.addComponents({
+ ActionInitializer,
+ DataBlockInitializer,
+ BlockSchemaToolbar,
+ });
const apis = Object.assign({}, defaultApis, optionsApis);
diff --git a/packages/core/client/src/filter-provider/utils.ts b/packages/core/client/src/filter-provider/utils.ts
index 74f068a8e..60e9f6662 100644
--- a/packages/core/client/src/filter-provider/utils.ts
+++ b/packages/core/client/src/filter-provider/utils.ts
@@ -190,7 +190,7 @@ export const useFilterAPI = () => {
useEffect(() => {
setIsConnected(targets && targets.some((target) => dataBlocks.some((dataBlock) => dataBlock.uid === target.uid)));
- }, [targetsKeys.length, dataBlocks]);
+ }, [targetsKeys.length, targets, dataBlocks]);
const doFilter = useCallback(
(
@@ -242,7 +242,7 @@ export const useFilterAPI = () => {
);
});
},
- [dataBlocks],
+ [dataBlocks, targets, uid],
);
return {
diff --git a/packages/core/client/src/locale/en_US.json b/packages/core/client/src/locale/en_US.json
index fdd7a7e38..752b327ba 100644
--- a/packages/core/client/src/locale/en_US.json
+++ b/packages/core/client/src/locale/en_US.json
@@ -828,5 +828,6 @@
"Drag and drop sorting field": "Drag and drop sorting field",
"This variable has been deprecated and can be replaced with \"Current form\"": "This variable has been deprecated and can be replaced with \"Current form\"",
"The value of this variable is derived from the query string of the page URL. This variable can only be used normally when the page has a query string.": "The value of this variable is derived from the query string of the page URL. This variable can only be used normally when the page has a query string.",
- "URL search params": "URL search params"
+ "URL search params": "URL search params",
+ "Expand All": "Expand All"
}
diff --git a/packages/core/client/src/locale/es_ES.json b/packages/core/client/src/locale/es_ES.json
index ee156238d..46f4cf267 100644
--- a/packages/core/client/src/locale/es_ES.json
+++ b/packages/core/client/src/locale/es_ES.json
@@ -760,5 +760,6 @@
"License": "Licencia",
"This variable has been deprecated and can be replaced with \"Current form\"": "La variable ha sido obsoleta; \"Formulario actual\" puede ser utilizada como sustituto",
"The value of this variable is derived from the query string of the page URL. This variable can only be used normally when the page has a query string.": "El valor de esta variable se deriva de la cadena de consulta de la URL de la página. Esta variable sólo puede utilizarse normalmente cuando la página tiene una cadena de consulta.",
- "URL search params": "Parámetros de búsqueda de URL"
+ "URL search params": "Parámetros de búsqueda de URL",
+ "Expand All": "Expandir todo"
}
diff --git a/packages/core/client/src/locale/fr_FR.json b/packages/core/client/src/locale/fr_FR.json
index bd5602bec..530d4f466 100644
--- a/packages/core/client/src/locale/fr_FR.json
+++ b/packages/core/client/src/locale/fr_FR.json
@@ -780,5 +780,6 @@
"License": "Licence",
"This variable has been deprecated and can be replaced with \"Current form\"": "La variable a été obsolète ; \"Formulaire actuel\" peut être utilisé comme substitut",
"The value of this variable is derived from the query string of the page URL. This variable can only be used normally when the page has a query string.": "La valeur de cette variable est dérivée de la chaîne de requête de l'URL de la page. Cette variable ne peut être utilisée normalement que lorsque la page a une chaîne de requête.",
- "URL search params": "Paramètres de recherche d'URL"
+ "URL search params": "Paramètres de recherche d'URL",
+ "Expand All": "Tout déplier"
}
diff --git a/packages/core/client/src/locale/ja_JP.json b/packages/core/client/src/locale/ja_JP.json
index 3df36d743..083cc30a7 100644
--- a/packages/core/client/src/locale/ja_JP.json
+++ b/packages/core/client/src/locale/ja_JP.json
@@ -699,5 +699,6 @@
"License": "ライセンス",
"This variable has been deprecated and can be replaced with \"Current form\"": "この変数は非推奨です。代わりに「現在のフォーム」を使用してください",
"The value of this variable is derived from the query string of the page URL. This variable can only be used normally when the page has a query string.": "この変数の値はページURLのクエリ文字列から取得されます。この変数は、ページにクエリ文字列がある場合にのみ正常に使用できます。",
- "URL search params": "URL検索パラメータ"
+ "URL search params": "URL検索パラメータ",
+ "Expand All": "すべて展開"
}
diff --git a/packages/core/client/src/locale/ko_KR.json b/packages/core/client/src/locale/ko_KR.json
index 2afee2d02..fd756406c 100644
--- a/packages/core/client/src/locale/ko_KR.json
+++ b/packages/core/client/src/locale/ko_KR.json
@@ -871,5 +871,6 @@
"License": "라이선스",
"This variable has been deprecated and can be replaced with \"Current form\"": "변수가 폐기되었습니다. \"현재 폼\"을 대체로 사용할 수 있습니다",
"The value of this variable is derived from the query string of the page URL. This variable can only be used normally when the page has a query string.": "이 변수의 값은 페이지 URL의 쿼리 문자열에서 파생됩니다. 이 변수는 페이지에 쿼리 문자열이 있는 경우에만 정상적으로 사용할 수 있습니다.",
- "URL search params": "URL 검색 매개변수"
+"URL search params": "URL 검색 매개변수",
+"Expand All": "모두 펼치기"
}
diff --git a/packages/core/client/src/locale/pt_BR.json b/packages/core/client/src/locale/pt_BR.json
index 3de3a441e..052159210 100644
--- a/packages/core/client/src/locale/pt_BR.json
+++ b/packages/core/client/src/locale/pt_BR.json
@@ -736,5 +736,6 @@
"License": "Licença",
"This variable has been deprecated and can be replaced with \"Current form\"": "A variável foi descontinuada; \"Formulário atual\" pode ser usada como substituto",
"The value of this variable is derived from the query string of the page URL. This variable can only be used normally when the page has a query string.": "O valor desta variável é derivado da string de consulta da URL da página. Esta variável só pode ser usada normalmente quando a página tem uma string de consulta.",
- "URL search params": "Parâmetros de pesquisa de URL"
+ "URL search params": "Parâmetros de pesquisa de URL",
+ "Expand All": "Expandir tudo"
}
diff --git a/packages/core/client/src/locale/ru_RU.json b/packages/core/client/src/locale/ru_RU.json
index 3ddd1a605..e7e464bb5 100644
--- a/packages/core/client/src/locale/ru_RU.json
+++ b/packages/core/client/src/locale/ru_RU.json
@@ -574,5 +574,6 @@
"License": "Лицензия",
"This variable has been deprecated and can be replaced with \"Current form\"": "Переменная устарела; \"Текущая форма\" может быть использована в качестве замены",
"The value of this variable is derived from the query string of the page URL. This variable can only be used normally when the page has a query string.": "Значение этой переменной происходит из строки запроса URL страницы. Эта переменная может использоваться только в том случае, если у страницы есть строка запроса.",
- "URL search params": "Параметры поиска URL"
+ "URL search params": "Параметры поиска URL",
+ "Expand All": "Развернуть все"
}
diff --git a/packages/core/client/src/locale/tr_TR.json b/packages/core/client/src/locale/tr_TR.json
index 9c5624b2c..864e26efb 100644
--- a/packages/core/client/src/locale/tr_TR.json
+++ b/packages/core/client/src/locale/tr_TR.json
@@ -572,5 +572,6 @@
"License": "Lisans",
"This variable has been deprecated and can be replaced with \"Current form\"": "Değişken kullanımdan kaldırıldı; \"Geçerli form\" yerine kullanılabilir",
"The value of this variable is derived from the query string of the page URL. This variable can only be used normally when the page has a query string.": "Bu değişkenin değeri sayfa URL'sinin sorgu dizgisinden türetilir. Bu değişken, sayfanın bir sorgu dizgisi olduğunda yalnızca normal olarak kullanılabilir.",
- "URL search params": "URL arama parametreleri"
+ "URL search params": "URL arama parametreleri",
+ "Expand All": "Tümünü genişlet"
}
diff --git a/packages/core/client/src/locale/uk_UA.json b/packages/core/client/src/locale/uk_UA.json
index 5182038d1..02b676b05 100644
--- a/packages/core/client/src/locale/uk_UA.json
+++ b/packages/core/client/src/locale/uk_UA.json
@@ -780,5 +780,6 @@
"License": "Ліцензія",
"This variable has been deprecated and can be replaced with \"Current form\"": "Змінна була застарілою; \"Поточна форма\" може бути використана як заміна",
"The value of this variable is derived from the query string of the page URL. This variable can only be used normally when the page has a query string.": "Значення цієї змінної походить з рядка запиту URL-адреси сторінки. Цю змінну можна використовувати нормально лише тоді, коли у сторінки є рядок запиту.",
- "URL search params": "Параметри пошуку URL"
+ "URL search params": "Параметри пошуку URL",
+ "Expand All": "Розгорнути все"
}
diff --git a/packages/core/client/src/locale/zh-CN.json b/packages/core/client/src/locale/zh-CN.json
index 95b780efb..46e941252 100644
--- a/packages/core/client/src/locale/zh-CN.json
+++ b/packages/core/client/src/locale/zh-CN.json
@@ -957,5 +957,6 @@
"The value of this variable is derived from the query string of the page URL. This variable can only be used normally when the page has a query string.": "该变量的值是根据页面 URL 的 query string 得来的，只有当页面存在 query string 的时候，该变量才能正常使用。",
"Edit link":"编辑链接",
"Add parameter":"添加参数",
- "URL search params": "URL 查询参数"
+ "URL search params": "URL 查询参数",
+ "Expand All": "展开全部"
}
diff --git a/packages/core/client/src/locale/zh-TW.json b/packages/core/client/src/locale/zh-TW.json
index f0a52e481..efa5b5f9e 100644
--- a/packages/core/client/src/locale/zh-TW.json
+++ b/packages/core/client/src/locale/zh-TW.json
@@ -869,5 +869,6 @@
"License": "許可證",
"This variable has been deprecated and can be replaced with \"Current form\"": "該變數已被棄用，可以使用“當前表單”作為替代",
"The value of this variable is derived from the query string of the page URL. This variable can only be used normally when the page has a query string.": "該變數的值來自頁面 URL 的查詢字符串，只有當頁面有查詢字符串時，該變數才能正常使用。",
- "URL search params": "URL 查詢參數"
+ "URL search params": "URL 查詢參數",
+ "Expand All": "展開全部"
}
diff --git a/packages/core/client/src/modules/blocks/data-blocks/table/tableBlockSettings.tsx b/packages/core/client/src/modules/blocks/data-blocks/table/tableBlockSettings.tsx
index 8fa49cd89..f5c7e3b8e 100644
--- a/packages/core/client/src/modules/blocks/data-blocks/table/tableBlockSettings.tsx
+++ b/packages/core/client/src/modules/blocks/data-blocks/table/tableBlockSettings.tsx
@@ -7,29 +7,23 @@
* For more information, please refer to: https://www.nocobase.com/agreement.
*/
-import { ArrayItems } from '@formily/antd-v5';
-import { ISchema } from '@formily/json-schema';
import { useField, useFieldSchema } from '@formily/react';
-import { useCallback } from 'react';
import { useTranslation } from 'react-i18next';
import { useAPIClient } from '../../../../api-client';
import { SchemaSettings } from '../../../../application/schema-settings/SchemaSettings';
import { useTableBlockContext } from '../../../../block-provider';
-import { useFormBlockContext } from '../../../../block-provider/FormBlockProvider';
-import {
- useCollectionManager_deprecated,
- useCollection_deprecated,
- useSortFields,
-} from '../../../../collection-manager';
+import { useCollectionManager_deprecated, useCollection_deprecated } from '../../../../collection-manager';
import { FilterBlockType } from '../../../../filter-provider/utils';
-import { removeNullCondition, useDesignable } from '../../../../schema-component';
+import { useDesignable } from '../../../../schema-component';
import { SchemaSettingsBlockHeightItem } from '../../../../schema-settings/SchemaSettingsBlockHeightItem';
import { SchemaSettingsBlockTitleItem } from '../../../../schema-settings/SchemaSettingsBlockTitleItem';
import { SchemaSettingsConnectDataBlocks } from '../../../../schema-settings/SchemaSettingsConnectDataBlocks';
-import { SchemaSettingsDataScope } from '../../../../schema-settings/SchemaSettingsDataScope';
import { SchemaSettingsSortField } from '../../../../schema-settings/SchemaSettingsSortField';
import { SchemaSettingsTemplate } from '../../../../schema-settings/SchemaSettingsTemplate';
import { setDataLoadingModeSettingsItem } from '../details-multi/setDataLoadingModeSettingsItem';
+import { setDefaultSortingRulesSchemaSettingsItem } from '../../../../schema-settings/setDefaultSortingRulesSchemaSettingsItem';
+import { setTheDataScopeSchemaSettingsItem } from '../../../../schema-settings/setTheDataScopeSchemaSettingsItem';
+import { createSwitchSettingsItem } from '../../../../application/schema-settings/utils';
export const tableBlockSettings = new SchemaSettings({
name: 'blockSettings:table',
@@ -66,6 +60,11 @@ export const tableBlockSettings = new SchemaSettings({
onChange: (flag) => {
field.decoratorProps.treeTable = flag;
fieldSchema['x-decorator-props'].treeTable = flag;
+
+ if (flag === false) {
+ fieldSchema['x-decorator-props'].expandFlag = false;
+ }
+
const params = {
...service.params?.[0],
tree: flag ? true : null,
@@ -88,6 +87,16 @@ export const tableBlockSettings = new SchemaSettings({
return collection?.tree && collectionField?.collectionName === collectionField?.target;
},
},
+ createSwitchSettingsItem({
+ name: 'expandFlag',
+ title: (t) => t('Expand All'),
+ defaultValue: false,
+ schemaKey: 'x-decorator-props.expandFlag',
+ useVisible() {
+ const field = useField();
+ return field.decoratorProps.treeTable;
+ },
+ }),
{
name: 'enableDragAndDropSorting',
type: 'switch',
@@ -137,165 +146,8 @@ export const tableBlockSettings = new SchemaSettings({
return field.decoratorProps.dragSort;
},
},
- {
- name: 'SetTheDataScope',
- Component: SchemaSettingsDataScope,
- useComponentProps: () => {
- const { name } = useCollection_deprecated();
- const field = useField();
- const fieldSchema = useFieldSchema();
- const { form } = useFormBlockContext();
- const { service } = useTableBlockContext();
- const { dn } = useDesignable();
- const onDataScopeSubmit = useCallback(
- ({ filter }) => {
- filter = removeNullCondition(filter);
- const params = field.decoratorProps.params || {};
- params.filter = filter;
- field.decoratorProps.params = params;
- fieldSchema['x-decorator-props']['params'] = params;
-
- dn.emit('patch', {
- schema: {
- ['x-uid']: fieldSchema['x-uid'],
- 'x-decorator-props': fieldSchema['x-decorator-props'],
- },
- });
- service.params[0].page = 1;
- },
- [dn, field.decoratorProps, fieldSchema, service],
- );
-
- return {
- collectionName: name,
- defaultFilter: fieldSchema?.['x-decorator-props']?.params?.filter || {},
- form: form,
- onSubmit: onDataScopeSubmit,
- };
- },
- },
- {
- name: 'SetDefaultSortingRules',
- type: 'modal',
- useComponentProps() {
- const { name } = useCollection_deprecated();
- const field = useField();
- const fieldSchema = useFieldSchema();
- const sortFields = useSortFields(name);
- const { service } = useTableBlockContext();
- const { t } = useTranslation();
- const { dn } = useDesignable();
- const defaultSort = fieldSchema?.['x-decorator-props']?.params?.sort || [];
- const sort = defaultSort?.map((item: string) => {
- return item?.startsWith('-')
- ? {
- field: item.substring(1),
- direction: 'desc',
- }
- : {
- field: item,
- direction: 'asc',
- };
- });
-
- return {
- title: t('Set default sorting rules'),
- components: { ArrayItems },
- schema: {
- type: 'object',
- title: t('Set default sorting rules'),
- properties: {
- sort: {
- type: 'array',
- default: sort,
- 'x-component': 'ArrayItems',
- 'x-decorator': 'FormItem',
- items: {
- type: 'object',
- properties: {
- space: {
- type: 'void',
- 'x-component': 'Space',
- properties: {
- sort: {
- type: 'void',
- 'x-decorator': 'FormItem',
- 'x-component': 'ArrayItems.SortHandle',
- },
- field: {
- type: 'string',
- enum: sortFields,
- required: true,
- 'x-decorator': 'FormItem',
- 'x-component': 'Select',
- 'x-component-props': {
- style: {
- width: 260,
- },
- },
- },
- direction: {
- type: 'string',
- 'x-decorator': 'FormItem',
- 'x-component': 'Radio.Group',
- 'x-component-props': {
- optionType: 'button',
- },
- enum: [
- {
- label: t('ASC'),
- value: 'asc',
- },
- {
- label: t('DESC'),
- value: 'desc',
- },
- ],
- },
- remove: {
- type: 'void',
- 'x-decorator': 'FormItem',
- 'x-component': 'ArrayItems.Remove',
- },
- },
- },
- },
- },
- properties: {
- add: {
- type: 'void',
- title: t('Add sort field'),
- 'x-component': 'ArrayItems.Addition',
- },
- },
- },
- },
- } as ISchema,
- onSubmit: ({ sort }) => {
- const sortArr = sort.map((item) => {
- return item.direction === 'desc' ? `-${item.field}` : item.field;
- });
- const params = field.decoratorProps.params || {};
- params.sort = sortArr;
- field.decoratorProps.params = params;
- fieldSchema['x-decorator-props']['params'] = params;
- dn.emit('patch', {
- schema: {
- ['x-uid']: fieldSchema['x-uid'],
- 'x-decorator-props': fieldSchema['x-decorator-props'],
- },
- });
- service.run({ ...service.params?.[0], sort: sortArr });
- },
- };
- },
- useVisible() {
- const field = useField();
- const { dragSort } = field.decoratorProps;
-
- return !dragSort;
- },
- },
+ setTheDataScopeSchemaSettingsItem,
+ setDefaultSortingRulesSchemaSettingsItem,
setDataLoadingModeSettingsItem,
{
name: 'RecordsPerPage',
diff --git a/packages/core/client/src/schema-component/antd/card-item/CardItem.tsx b/packages/core/client/src/schema-component/antd/card-item/CardItem.tsx
index d225ec3b5..0c9097fe1 100644
--- a/packages/core/client/src/schema-component/antd/card-item/CardItem.tsx
+++ b/packages/core/client/src/schema-component/antd/card-item/CardItem.tsx
@@ -17,7 +17,7 @@ import { BlockItemCard } from '../block-item/BlockItemCard';
import { BlockItemError } from '../block-item/BlockItemError';
import useStyles from './style';
-interface CardItemProps extends CardProps {
+export interface CardItemProps extends CardProps {
name?: string;
children?: React.ReactNode;
/**
@@ -27,6 +27,7 @@ interface CardItemProps extends CardProps {
*/
lazyRender?: IntersectionOptions & { element?: React.JSX.Element };
heightMode?: string;
+ height?: number;
}
export const CardItem: FC = (props) => {
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 68528aa9d..f5d103f0f 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
@@ -455,7 +455,7 @@ export const Table: any = withDynamicSchemaProps(
if (!_.isEqual(newExpandesKeys, expandedKeys)) {
setExpandesKeys(newExpandesKeys);
}
- }, [expandFlag]);
+ }, [expandFlag, allIncludesChildren]);
/**
* 为没有设置 key 属性的表格行生成一个唯一的 key
diff --git a/packages/core/client/src/schema-component/antd/table-v2/demos/new-demos/tree-expandFlag.tsx b/packages/core/client/src/schema-component/antd/table-v2/demos/new-demos/tree-expandFlag.tsx
new file mode 100644
index 000000000..981f15a5c
--- /dev/null
+++ b/packages/core/client/src/schema-component/antd/table-v2/demos/new-demos/tree-expandFlag.tsx
@@ -0,0 +1,86 @@
+import React from 'react';
+import { TableBlockProvider, useTableBlockProps, SchemaComponent, Plugin, ISchema } from '@nocobase/client';
+import { mockApp } from '@nocobase/client/demo-utils';
+
+const schema: ISchema = {
+ type: 'void',
+ name: 'root',
+ properties: {
+ test: {
+ type: 'void',
+ 'x-decorator': 'TableBlockProvider',
+ 'x-decorator-props': {
+ collection: 'tree-collection',
+ action: 'list',
+ params: {
+ tree: true,
+ pageSize: 2,
+ },
+ treeTable: true,
+ showIndex: true,
+ expandFlag: true,
+ dragSort: false,
+ },
+ properties: {
+ table: {
+ type: 'array',
+ 'x-component': 'TableV2',
+ 'x-use-component-props': 'useTableBlockProps', // 自动注入 Table 所需的 props
+ 'x-component-props': {
+ rowKey: 'id',
+ rowSelection: {
+ type: 'checkbox',
+ },
+ },
+ properties: {
+ column1: {
+ type: 'void',
+ title: 'Role UID',
+ 'x-component': 'TableV2.Column',
+ properties: {
+ name: {
+ type: 'string',
+ 'x-component': 'CollectionField',
+ 'x-pattern': 'readPretty', // 这里要设置为 true
+ },
+ },
+ },
+ column2: {
+ type: 'void',
+ title: 'Role name',
+ 'x-component': 'TableV2.Column',
+ properties: {
+ title: {
+ type: 'string',
+ 'x-component': 'CollectionField',
+ 'x-pattern': 'readPretty',
+ },
+ },
+ },
+ },
+ },
+ },
+ },
+ },
+};
+const Demo = () => {
+ return ;
+};
+
+class DemoPlugin extends Plugin {
+ async load() {
+ this.app.router.add('root', { path: '/', Component: Demo });
+ }
+}
+
+const app = mockApp({
+ plugins: [DemoPlugin],
+ components: {
+ TableBlockProvider,
+ },
+ scopes: {
+ useTableBlockProps,
+ },
+});
+
+export default app.getRootComponent();
diff --git a/packages/core/client/src/schema-component/antd/table-v2/demos/new-demos/tree.tsx b/packages/core/client/src/schema-component/antd/table-v2/demos/new-demos/tree.tsx
new file mode 100644
index 000000000..29e9e9b06
--- /dev/null
+++ b/packages/core/client/src/schema-component/antd/table-v2/demos/new-demos/tree.tsx
@@ -0,0 +1,85 @@
+import React from 'react';
+import { TableBlockProvider, useTableBlockProps, SchemaComponent, Plugin, ISchema } from '@nocobase/client';
+import { mockApp } from '@nocobase/client/demo-utils';
+
+const schema: ISchema = {
+ type: 'void',
+ name: 'root',
+ properties: {
+ test: {
+ type: 'void',
+ 'x-decorator': 'TableBlockProvider',
+ 'x-decorator-props': {
+ collection: 'tree-collection',
+ action: 'list',
+ params: {
+ tree: true,
+ pageSize: 2,
+ },
+ treeTable: true,
+ showIndex: true,
+ dragSort: false,
+ },
+ properties: {
+ table: {
+ type: 'array',
+ 'x-component': 'TableV2',
+ 'x-use-component-props': 'useTableBlockProps', // 自动注入 Table 所需的 props
+ 'x-component-props': {
+ rowKey: 'id',
+ rowSelection: {
+ type: 'checkbox',
+ },
+ },
+ properties: {
+ column1: {
+ type: 'void',
+ title: 'Role UID',
+ 'x-component': 'TableV2.Column',
+ properties: {
+ name: {
+ type: 'string',
+ 'x-component': 'CollectionField',
+ 'x-pattern': 'readPretty', // 这里要设置为 true
+ },
+ },
+ },
+ column2: {
+ type: 'void',
+ title: 'Role name',
+ 'x-component': 'TableV2.Column',
+ properties: {
+ title: {
+ type: 'string',
+ 'x-component': 'CollectionField',
+ 'x-pattern': 'readPretty',
+ },
+ },
+ },
+ },
+ },
+ },
+ },
+ },
+};
+const Demo = () => {
+ return ;
+};
+
+class DemoPlugin extends Plugin {
+ async load() {
+ this.app.router.add('root', { path: '/', Component: Demo });
+ }
+}
+
+const app = mockApp({
+ plugins: [DemoPlugin],
+ components: {
+ TableBlockProvider,
+ },
+ scopes: {
+ useTableBlockProps,
+ },
+});
+
+export default app.getRootComponent();
diff --git a/packages/core/client/src/schema-component/antd/table-v2/index.md b/packages/core/client/src/schema-component/antd/table-v2/index.md
index 9ff586d33..2c6602897 100644
--- a/packages/core/client/src/schema-component/antd/table-v2/index.md
+++ b/packages/core/client/src/schema-component/antd/table-v2/index.md
@@ -40,3 +40,31 @@ Table 会将当前行的数据通过 [CollectionRecordProvider](/core/data-block
在编辑场景下，在通过 [useDataBlockResource()](/core/data-block/data-block-resource-provider) 和 [useDataBlockRequest()](/core/data-block/data-block-request-provider#usedatablockrequest) 对数据进行更新，以及对列表进行刷新。