fm453/nocobase
1
0
Fork 0
mirror of https://gitee.com/nocobase/nocobase.git synced 2025-05-08 23:19:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: support expend and collapse

Browse Source
This commit is contained in:
katherinehhh 2023-03-14 13:59:40 +08:00
parent eddaac0c94
commit dbf53a762e
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
packages/core/client/src/block-provider/TableBlockProvider.tsx
View File

@ -2,7 +2,7 @@ import { ArrayField, createForm } from '@formily/core';
import { FormContext, Schema, useField, useFieldSchema } from '@formily/react'; import { FormContext, Schema, useField, useFieldSchema } from '@formily/react';
import uniq from 'lodash/uniq'; import uniq from 'lodash/uniq';
import React, { createContext, useContext, useEffect, useMemo, useState } from 'react'; import React, { createContext, useContext, useEffect, useMemo, useState } from 'react';
import { useCollectionManager } from '../collection-manager'; import { useCollectionManager, useCollection } from '../collection-manager';
import { BlockProvider, RenderChildrenWithAssociationFilter, useBlockRequestContext } from './BlockProvider'; import { BlockProvider, RenderChildrenWithAssociationFilter, useBlockRequestContext } from './BlockProvider';
import { useFixedSchema } from '../schema-component'; import { useFixedSchema } from '../schema-component';
@ -88,11 +88,12 @@ export const TableBlockProvider = (props) => {
const appends = useAssociationNames(props.collection); const appends = useAssociationNames(props.collection);
const form = useMemo(() => createForm(), []); const form = useMemo(() => createForm(), []);
const fieldSchema = useFieldSchema(); const fieldSchema = useFieldSchema();
const collection = useCollection();
const { treeTable } = fieldSchema['x-decorator-props']; const { treeTable } = fieldSchema['x-decorator-props'];
if (props.dragSort) { if (props.dragSort) {
params['sort'] = ['sort']; params['sort'] = ['sort'];
} }
if (treeTable !== false) { if ((collection as any).template === 'tree' && treeTable !== false) {
params['tree'] = true; params['tree'] = true;
} }
if (!Object.keys(params).includes('appends')) { if (!Object.keys(params).includes('appends')) {

12
packages/core/client/src/schema-component/antd/table-v2/utils.ts
View File

@ -20,11 +20,13 @@ export function extractIndex(str) {
export function getIdsWithChildren(nodes) { export function getIdsWithChildren(nodes) {
const ids = []; const ids = [];
for (let node of nodes) { if (nodes) {
if (node.children && node.children.length > 0) { for (let node of nodes) {
ids.push(node.id); if (node.children && node.children.length > 0) {
ids.push(...getIdsWithChildren(node.children)); ids.push(node.id);
ids.push(...getIdsWithChildren(node.children));
}
} }
} }
return ids; return ids;
} }