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

fix: issue with Gantt block in tree collection (#6617)

Browse Source 
* fix: issue with Gantt block in tree collection

* fix: bug

* fix: test
This commit is contained in:
Katherine 2025-04-03 20:25:44 +08:00 committed by GitHub
parent c0961c053b
commit 235cbebf74
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/core/client/src/schema-component/antd/collection-select/__tests__/collection-select.test.tsx
View File

@ -54,7 +54,7 @@ describe('CollectionSelect', () => {
role="button" role="button"
> >
<div <div
class="css-vij405 ant-formily-item ant-formily-item-layout-horizontal ant-formily-item-feedback-layout-loose ant-formily-item-label-align-right ant-formily-item-control-align-left css-dev-only-do-not-override-11aiz3o" class="css-9mlexe ant-formily-item ant-formily-item-layout-horizontal ant-formily-item-feedback-layout-loose ant-formily-item-label-align-right ant-formily-item-control-align-left css-dev-only-do-not-override-11aiz3o"
> >
<div <div
class="ant-formily-item-label" class="ant-formily-item-label"
@ -191,7 +191,7 @@ describe('CollectionSelect', () => {
role="button" role="button"
> >
<div <div
class="css-vij405 ant-formily-item ant-formily-item-layout-horizontal ant-formily-item-feedback-layout-loose ant-formily-item-label-align-right ant-formily-item-control-align-left css-dev-only-do-not-override-11aiz3o" class="css-9mlexe ant-formily-item ant-formily-item-layout-horizontal ant-formily-item-feedback-layout-loose ant-formily-item-label-align-right ant-formily-item-control-align-left css-dev-only-do-not-override-11aiz3o"
> >
<div <div
class="ant-formily-item-label" class="ant-formily-item-label"

1
packages/core/client/src/schema-component/antd/form-item/FormItem.tsx
View File

@ -92,7 +92,6 @@ export const FormItem: any = withDynamicSchemaProps(
[formItemLabelCss]: showTitle === false, [formItemLabelCss]: showTitle === false,
}); });
}, [showTitle]); }, [showTitle]);
console.log(className);
// 联动规则中的“隐藏保留值”的效果 // 联动规则中的“隐藏保留值”的效果
if (field.data?.hidden) { if (field.data?.hidden) {
return null; return null;

4
packages/plugins/@nocobase/plugin-gantt/src/client/GanttBlockProvider.tsx
View File

@ -104,10 +104,6 @@ export const GanttBlockProvider = (props) => {
const collection = cm.getCollection(props.collection, props.dataSource); const collection = cm.getCollection(props.collection, props.dataSource);
const params = { filter: props.params?.filter, paginate: false, sort: [collection?.primaryKey || 'id'] }; const params = { filter: props.params?.filter, paginate: false, sort: [collection?.primaryKey || 'id'] };
if (collection?.tree) {
params['tree'] = true;
}
return ( return (
<div aria-label="block-item-gantt" role="button"> <div aria-label="block-item-gantt" role="button">
<TableBlockProvider {...props} params={params}> <TableBlockProvider {...props} params={params}>