diff --git a/packages/core/client/src/schema-component/antd/date-picker/DatePicker.tsx b/packages/core/client/src/schema-component/antd/date-picker/DatePicker.tsx
index debbd13e94..4a93093675 100644
--- a/packages/core/client/src/schema-component/antd/date-picker/DatePicker.tsx
+++ b/packages/core/client/src/schema-component/antd/date-picker/DatePicker.tsx
@@ -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({
diff --git a/packages/core/client/src/schema-settings/LinkageRules/ValueDynamicComponent.tsx b/packages/core/client/src/schema-settings/LinkageRules/ValueDynamicComponent.tsx
index 21b74f960b..a8e1bc8627 100644
--- a/packages/core/client/src/schema-settings/LinkageRules/ValueDynamicComponent.tsx
+++ b/packages/core/client/src/schema-settings/LinkageRules/ValueDynamicComponent.tsx
@@ -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, {
diff --git a/packages/core/utils/src/date.ts b/packages/core/utils/src/date.ts
index 2153660a72..d082c06f70 100644
--- a/packages/core/utils/src/date.ts
+++ b/packages/core/utils/src/date.ts
@@ -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;
   }
-  return null;
 };
 
 const toMoment = (val: any, options?: Str2momentOptions) => {