diff --git a/packages/core/utils/src/date.ts b/packages/core/utils/src/date.ts
index d35fe611e3..a4aa48ff82 100644
--- a/packages/core/utils/src/date.ts
+++ b/packages/core/utils/src/date.ts
@@ -69,9 +69,12 @@ export const toLocal = (value: dayjs.Dayjs) => {
};
const convertQuarterToFirstDay = (quarterStr) => {
- const year = parseInt(quarterStr.slice(0, 4)); // 提取年份
- const quarter = parseInt(quarterStr.slice(-1)); // 提取季度数字
- return dayjs().quarter(quarter).year(year);
+ if (dayjs(quarterStr).isValid()) {
+ const year = parseInt(quarterStr.slice(0, 4)); // 提取年份
+ const quarter = parseInt(quarterStr.slice(-1)); // 提取季度数字
+ return dayjs().quarter(quarter).year(year);
+ }
+ return null;
};
const toMoment = (val: any, options?: Str2momentOptions) => {
diff --git a/packages/plugins/@nocobase/plugin-mobile/src/client/pages/dynamic-page/MobilePage.tsx b/packages/plugins/@nocobase/plugin-mobile/src/client/pages/dynamic-page/MobilePage.tsx
index 9665d10679..0a26980056 100644
--- a/packages/plugins/@nocobase/plugin-mobile/src/client/pages/dynamic-page/MobilePage.tsx
+++ b/packages/plugins/@nocobase/plugin-mobile/src/client/pages/dynamic-page/MobilePage.tsx
@@ -7,7 +7,7 @@
* For more information, please refer to: https://www.nocobase.com/agreement.
*/
-import { RemoteSchemaComponent, AssociationField } from '@nocobase/client';
+import { RemoteSchemaComponent, AssociationField, useDesignable, Select, DatePicker } from '@nocobase/client';
import React, { useCallback } from 'react';
import { Outlet, useParams } from 'react-router-dom';
import { Button as MobileButton, Dialog as MobileDialog } from 'antd-mobile';
@@ -16,8 +16,22 @@ import { MobileDateTimePicker } from './components/MobileDatePicker';
const mobileComponents = {
Button: MobileButton,
- Select: MobilePicker,
- DatePicker: MobileDateTimePicker,
+ Select: (props) => {
+ const { designable } = useDesignable();
+ if (designable !== false) {
+ return ;
+ } else {
+ return ;
+ }
+ },
+ DatePicker: (props) => {
+ const { designable } = useDesignable();
+ if (designable !== false) {
+ return ;
+ } else {
+ return ;
+ }
+ },
UnixTimestamp: MobileDateTimePicker,
Modal: MobileDialog,
AssociationField: (props) => {