diff --git a/packages/core/client/src/block-provider/TableSelectorProvider.tsx b/packages/core/client/src/block-provider/TableSelectorProvider.tsx index 95a4252d4f..e0c37af6b2 100644 --- a/packages/core/client/src/block-provider/TableSelectorProvider.tsx +++ b/packages/core/client/src/block-provider/TableSelectorProvider.tsx @@ -292,7 +292,7 @@ export const useTableSelectorProps = () => { useEffect(() => { if (!ctx?.service?.loading) { const data = ctx?.service?.data?.data.map((v) => { - return _.omit(v, collectionField?.foreignKey); + return v; }); field.value = data; field?.setInitialValue?.(data); diff --git a/packages/plugins/@nocobase/plugin-map/src/client/components/GoogleMaps/Map.tsx b/packages/plugins/@nocobase/plugin-map/src/client/components/GoogleMaps/Map.tsx index f8533792bc..631e154fed 100644 --- a/packages/plugins/@nocobase/plugin-map/src/client/components/GoogleMaps/Map.tsx +++ b/packages/plugins/@nocobase/plugin-map/src/client/components/GoogleMaps/Map.tsx @@ -164,9 +164,9 @@ export const GoogleMapsComponent = React.forwardRef { - if (map.current) { - map.current.setCenter(position); - map.current.setZoom(zoom); + if (map.current && position) { + map.current?.setCenter(position); + map.current?.setZoom(zoom); } }); @@ -192,7 +192,7 @@ export const GoogleMapsComponent = React.forwardRef { @@ -386,7 +386,6 @@ export const GoogleMapsComponent = React.forwardRef Promise<{ lat: number; lng: number }> = ( () => { defaultLatLng(); }, + { + timeout: 2000, // 设置最大等待时间,单位毫秒 + maximumAge: 0, // 不使用缓存的地理位置 + }, ); } else { defaultLatLng(); diff --git a/packages/plugins/@nocobase/plugin-notification-in-app-message/src/client/components/MessageList.tsx b/packages/plugins/@nocobase/plugin-notification-in-app-message/src/client/components/MessageList.tsx index 6908f3d8e2..d2b218761b 100644 --- a/packages/plugins/@nocobase/plugin-notification-in-app-message/src/client/components/MessageList.tsx +++ b/packages/plugins/@nocobase/plugin-notification-in-app-message/src/client/components/MessageList.tsx @@ -104,7 +104,9 @@ const MessageList = observer(() => { style={{ fontWeight: message.status === 'unread' ? 'bold' : 'normal', cursor: 'pointer', - width: '100%', + textOverflow: 'ellipsis', + whiteSpace: 'nowrap', + overflow: 'hidden', }} > {message.title} diff --git a/packages/plugins/@nocobase/plugin-notification-in-app-message/src/server/InAppNotificationChannel.ts b/packages/plugins/@nocobase/plugin-notification-in-app-message/src/server/InAppNotificationChannel.ts index b9917a18b1..49696f49ee 100644 --- a/packages/plugins/@nocobase/plugin-notification-in-app-message/src/server/InAppNotificationChannel.ts +++ b/packages/plugins/@nocobase/plugin-notification-in-app-message/src/server/InAppNotificationChannel.ts @@ -65,8 +65,8 @@ export default class InAppNotificationChannel extends BaseNotificationChannel { type: message.type, data: { ...message.data, - title: message.data.title?.slice(0, 30) || '', - content: message.data.content?.slice(0, 105) || '', + title: message.data.title || '', + content: message.data.content || '', }, })}\n\n`, );