Merge branch 'main' into next

This commit is contained in:
katherinehhh 2025-01-06 15:13:38 +08:00
commit c2c5e4c560
2 changed files with 1 additions and 1 deletions

View File

@ -208,7 +208,6 @@ DatePicker.RangePicker = function RangePicker(props: any) {
showTime: showTime ? { defaultValue: [dayjs('00:00:00', 'HH:mm:ss'), dayjs('00:00:00', 'HH:mm:ss')] } : false,
};
const [stateProps, setStateProps] = useState(newProps);
if (isFilterAction) {
return (
<Space.Compact>

View File

@ -521,6 +521,7 @@ export const EditOperator = () => {
componentProps = {
...fieldSchema['x-component-props'],
component: operator.schema['x-component'],
...field.componentProps,
...operator.schema?.['x-component-props'],
};
} else if (fieldSchema['x-component-props']?.component) {