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

feat: update VariableFilters to use CardItem and enhance form handling

Browse Source
This commit is contained in:
Sheldon Guo 2025-03-11 09:38:42 +08:00
parent 3f6cae33ec
commit b271f0cbc3
1 changed files with 74 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

140
packages/core/client/src/schema-component/antd/variable/VariableFilters.tsx
View File

@ -122,84 +122,92 @@ export function Filter({ config, filter, filterId, previousFilters }) {
},
};
};
const argsMap = config.uiSchema
? Object.fromEntries(config.uiSchema.map((param, index) => [param.name, filter.args[index]]))
: {};
const useFormBlockProps = () => {
return { form, layout: 'vertical' };
return { form: createForm({ initialValues: argsMap }), layout: 'vertical' };
};
const WithPropOver = ({ children }) => {
const { value } = useVariable();
const schema = {
'x-uid': uid(),
type: 'void',
'x-component': 'FormV2',
'x-use-component-props': 'useFormBlockProps',
properties: {
'$input-value': {
type: 'void',
'x-component': 'Input',
'x-component-props': {
defaultValue: '{{ inputValue }}',
disabled: true,
},
'x-decorator': 'FormItem',
title: tval('Input Value'),
'x-read-pretty': true,
},
...Object.fromEntries(
config.uiSchema.map((param) => [
param.name,
{
...param,
'x-decorator': 'FormItem',
const schema = {
'x-uid': uid(),
type: 'void',
'x-component': 'CardItem',
properties: {
form: {
'x-uid': uid(),
type: 'void',
'x-component': 'FormV2',
'x-use-component-props': 'useFormBlockProps',
properties: {
'$input-value': {
type: 'void',
'x-component': 'Input',
'x-component-props': {
defaultValue: '{{ inputValue }}',
disabled: true,
},
]),
),
'$return-value': {
type: 'void',
'x-component': 'Input',
'x-component-props': {
defaultValue: '{{ outputValue }}',
disabled: true,
'x-decorator': 'FormItem',
title: tval('Input Value'),
'x-read-pretty': true,
},
'x-decorator': 'FormItem',
title: tval('Return Value'),
'x-read-pretty': true,
},
actions: {
type: 'void',
title: tval('Save'),
'x-component': 'ActionBar',
properties: {
delete: {
type: 'void',
title: tval('Delete'),
'x-component': 'Action',
'x-use-component-props': 'useDeleteActionProps',
...Object.fromEntries(
config.uiSchema.map((param) => [
param.name,
{
...param,
'x-decorator': 'FormItem',
},
]),
),
'$return-value': {
type: 'void',
'x-component': 'Input',
'x-component-props': {
defaultValue: '{{ outputValue }}',
disabled: true,
},
save: {
type: 'void',
title: tval('Save'),
'x-component': 'Action',
'x-use-component-props': 'useSaveActionProps',
'x-decorator': 'FormItem',
title: tval('Return Value'),
'x-read-pretty': true,
},
actions: {
type: 'void',
title: tval('Save'),
'x-component': 'ActionBar',
properties: {
delete: {
type: 'void',
title: tval('Delete'),
'x-component': 'Action',
'x-use-component-props': 'useDeleteActionProps',
},
save: {
type: 'void',
title: tval('Save'),
'x-component': 'Action',
'x-use-component-props': 'useSaveActionProps',
},
},
},
},
},
};
},
};
const Content = (
<SchemaComponent
schema={schema}
scope={{ useSaveActionProps, useFormBlockProps, useDeleteActionProps, outputValue, inputValue }}
basePath={['']}
/>
);
const WithPropOver = ({ children }) => {
const { value } = useVariable();
return (
<Popover
open={open}
onOpenChange={handleOpenChange}
content={
<SchemaComponent
schema={schema}
scope={{ useSaveActionProps, useFormBlockProps, useDeleteActionProps, outputValue, inputValue }}
basePath={['']}
/>
}
trigger={'hover'}
>
<Popover open={open} onOpenChange={handleOpenChange} content={Content} trigger={'click'}>
{children}
</Popover>
);