mirrors/nocobase
1
0
Fork 0
mirror of https://github.com/nocobase/nocobase synced 2024-11-15 10:46:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'main' into next
Some checks are pending
Build Docker Image / build-and-push (push) Waiting to run
Details
Build Pro Image / build-and-push (push) Waiting to run
Details
E2E / Build (push) Waiting to run
Details
E2E / Core and plugins (push) Blocked by required conditions
Details
E2E / plugin-workflow (push) Blocked by required conditions
Details
E2E / plugin-workflow-approval (push) Blocked by required conditions
Details
E2E / plugin-data-source-main (push) Blocked by required conditions
Details
E2E / Comment on PR (push) Blocked by required conditions
Details
NocoBase FrontEnd Test / frontend-test (18) (push) Waiting to run
Details

Browse Source
This commit is contained in:
GitHub Actions Bot 2024-08-15 12:18:35 +00:00
commit 2243957d0d
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
packages/core/client/src/block-provider/FilterFormBlockProvider.tsx
View File

@ -10,7 +10,7 @@
import { useFieldSchema } from '@formily/react'; import { useFieldSchema } from '@formily/react';
import React from 'react'; import React from 'react';
import { withDynamicSchemaProps } from '../hoc/withDynamicSchemaProps'; import { withDynamicSchemaProps } from '../hoc/withDynamicSchemaProps';
import { DatePickerProvider } from '../schema-component'; import { DatePickerProvider, ActionBarProvider } from '../schema-component';
import { DefaultValueProvider } from '../schema-settings'; import { DefaultValueProvider } from '../schema-settings';
import { CollectOperators } from './CollectOperators'; import { CollectOperators } from './CollectOperators';
import { FormBlockProvider } from './FormBlockProvider'; import { FormBlockProvider } from './FormBlockProvider';
@ -23,9 +23,18 @@ export const FilterFormBlockProvider = withDynamicSchemaProps((props) => {
return ( return (
<CollectOperators defaultOperators={deprecatedOperators}> <CollectOperators defaultOperators={deprecatedOperators}>
<DatePickerProvider value={{ utc: false }}> <DatePickerProvider value={{ utc: false }}>
<DefaultValueProvider isAllowToSetDefaultValue={() => false}> <ActionBarProvider
<FormBlockProvider name="filter-form" {...props}></FormBlockProvider> forceProps={{
</DefaultValueProvider> style: {
overflowY: 'auto',
width: '100%',
},
}}
>
<DefaultValueProvider isAllowToSetDefaultValue={() => false}>
<FormBlockProvider name="filter-form" {...props}></FormBlockProvider>
</DefaultValueProvider>
</ActionBarProvider>
</DatePickerProvider> </DatePickerProvider>
</CollectOperators> </CollectOperators>
); );