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

Merge branch 'next' into develop

Browse Source
This commit is contained in:
nocobase[bot] 2025-04-18 09:45:36 +00:00
commit cc0ceb72d6
3 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
packages/core/client/src/schema-component/antd/date-picker/DatePicker.tsx
View File

@ -252,8 +252,9 @@ DatePicker.FilterWithPicker = function FilterWithPicker(props: any) {
const value = Array.isArray(props.value) ? props.value[0] : props.value;
const compile = useCompile();
const fieldSchema = useFieldSchema();
const targetPicker = value ? inferPickerType(value, picker) : picker;
const targetDateFormat = getPickerFormat(targetPicker) || format;
const initPicker = value ? inferPickerType(value, picker) : picker;
const [targetPicker, setTargetPicker] = useState(initPicker);
const targetDateFormat = getPickerFormat(initPicker) || format;
const newProps = {
utc,
inputReadOnly: isMobileMedia,
@ -271,13 +272,6 @@ DatePicker.FilterWithPicker = function FilterWithPicker(props: any) {
};
const field: any = useField();
const [stateProps, setStateProps] = useState(newProps);
useEffect(() => {
newProps.picker = targetPicker;
const dateTimeFormat = getDateTimeFormat(targetPicker, targetDateFormat, showTime, timeFormat);
newProps.format = dateTimeFormat;
setStateProps(newProps);
}, [targetPicker]);
return (
<Space.Compact style={{ width: '100%' }}>
<Select
@ -307,6 +301,7 @@ DatePicker.FilterWithPicker = function FilterWithPicker(props: any) {
},
])}
onChange={(value) => {
setTargetPicker(value);
const format = getPickerFormat(value);
const dateTimeFormat = getDateTimeFormat(value, format, showTime, timeFormat);
field.setComponentProps({

3
packages/core/client/src/schema-settings/LinkageRules/ValueDynamicComponent.tsx
View File

@ -97,6 +97,9 @@ export const ValueDynamicComponent = (props: ValueDynamicComponentProps) => {
.ant-input-affix-wrapper {
border-radius: 0px;
}
.ant-checkbox-wrapper {
margin-left: 50%;
}
`}
>
{React.createElement(DynamicComponent, {

5
packages/core/utils/src/date.ts
View File

@ -69,12 +69,13 @@ export const toLocal = (value: dayjs.Dayjs) => {
};
const convertQuarterToFirstDay = (quarterStr) => {
if (dayjs(quarterStr).isValid()) {
try {
const year = parseInt(quarterStr.slice(0, 4)); // 提取年份
const quarter = parseInt(quarterStr.slice(-1)); // 提取季度数字
return dayjs().quarter(quarter).year(year);
}
} catch (error) {
return null;
}
};
const toMoment = (val: any, options?: Str2momentOptions) => {