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

Merge branch 'main' into next

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
packages/core/client/src/schema-component/antd/date-picker/DatePicker.tsx
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, showTime: showTime ? { defaultValue: [dayjs('00:00:00', 'HH:mm:ss'), dayjs('00:00:00', 'HH:mm:ss')] } : false,
}; };
const [stateProps, setStateProps] = useState(newProps); const [stateProps, setStateProps] = useState(newProps);
if (isFilterAction) { if (isFilterAction) {
return ( return (
<Space.Compact> <Space.Compact>

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

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