mirror of
https://gitee.com/nocobase/nocobase.git
synced 2025-07-01 18:52:20 +08:00
Merge branch 'main' into next
This commit is contained in:
commit
c2c5e4c560
@ -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>
|
||||
|
@ -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) {
|
||||
|
Loading…
x
Reference in New Issue
Block a user