mirror of
https://gitee.com/nocobase/nocobase.git
synced 2025-05-07 22:49:26 +08:00
Merge branch 'next' into develop
# Conflicts: # lerna.json # packages/core/acl/package.json # packages/core/actions/package.json # packages/core/app/package.json # packages/core/auth/package.json # packages/core/build/package.json # packages/core/cache/package.json # packages/core/cli/package.json # packages/core/client/package.json # packages/core/create-nocobase-app/package.json # packages/core/data-source-manager/package.json # packages/core/database/package.json # packages/core/devtools/package.json # packages/core/evaluators/package.json # packages/core/logger/package.json # packages/core/resourcer/package.json # packages/core/sdk/package.json # packages/core/server/package.json # packages/core/telemetry/package.json # packages/core/test/package.json # packages/core/utils/package.json # packages/plugins/@nocobase/plugin-acl/package.json # packages/plugins/@nocobase/plugin-action-bulk-edit/package.json # packages/plugins/@nocobase/plugin-action-bulk-update/package.json # packages/plugins/@nocobase/plugin-action-custom-request/package.json # packages/plugins/@nocobase/plugin-action-duplicate/package.json # packages/plugins/@nocobase/plugin-action-export/package.json # packages/plugins/@nocobase/plugin-action-import/package.json # packages/plugins/@nocobase/plugin-action-print/package.json # packages/plugins/@nocobase/plugin-api-doc/package.json # packages/plugins/@nocobase/plugin-api-keys/package.json # packages/plugins/@nocobase/plugin-audit-logs/package.json # packages/plugins/@nocobase/plugin-auth-sms/package.json # packages/plugins/@nocobase/plugin-auth/package.json # packages/plugins/@nocobase/plugin-backup-restore/package.json # packages/plugins/@nocobase/plugin-block-iframe/package.json # packages/plugins/@nocobase/plugin-block-workbench/package.json # packages/plugins/@nocobase/plugin-calendar/package.json # packages/plugins/@nocobase/plugin-charts/package.json # packages/plugins/@nocobase/plugin-client/package.json # packages/plugins/@nocobase/plugin-collection-sql/package.json # packages/plugins/@nocobase/plugin-collection-tree/package.json # packages/plugins/@nocobase/plugin-data-source-main/package.json # packages/plugins/@nocobase/plugin-data-source-manager/package.json # packages/plugins/@nocobase/plugin-data-visualization/package.json # packages/plugins/@nocobase/plugin-disable-pm-add/package.json # packages/plugins/@nocobase/plugin-error-handler/package.json # packages/plugins/@nocobase/plugin-field-china-region/package.json # packages/plugins/@nocobase/plugin-field-formula/package.json # packages/plugins/@nocobase/plugin-field-m2m-array/package.json # packages/plugins/@nocobase/plugin-field-markdown-vditor/package.json # packages/plugins/@nocobase/plugin-field-sequence/package.json # packages/plugins/@nocobase/plugin-file-manager/package.json # packages/plugins/@nocobase/plugin-gantt/package.json # packages/plugins/@nocobase/plugin-graph-collection-manager/package.json # packages/plugins/@nocobase/plugin-kanban/package.json # packages/plugins/@nocobase/plugin-localization/package.json # packages/plugins/@nocobase/plugin-logger/package.json # packages/plugins/@nocobase/plugin-map/package.json # packages/plugins/@nocobase/plugin-mobile-client/package.json # packages/plugins/@nocobase/plugin-mobile/package.json # packages/plugins/@nocobase/plugin-mock-collections/package.json # packages/plugins/@nocobase/plugin-multi-app-manager/package.json # packages/plugins/@nocobase/plugin-multi-app-share-collection/package.json # packages/plugins/@nocobase/plugin-notification-email/package.json # packages/plugins/@nocobase/plugin-notification-in-app-message/package.json # packages/plugins/@nocobase/plugin-notification-manager/package.json # packages/plugins/@nocobase/plugin-notifications/package.json # packages/plugins/@nocobase/plugin-public-forms/package.json # packages/plugins/@nocobase/plugin-sample-hello/package.json # packages/plugins/@nocobase/plugin-snapshot-field/package.json # packages/plugins/@nocobase/plugin-system-settings/package.json # packages/plugins/@nocobase/plugin-theme-editor/package.json # packages/plugins/@nocobase/plugin-ui-schema-storage/package.json # packages/plugins/@nocobase/plugin-user-data-sync/package.json # packages/plugins/@nocobase/plugin-users/package.json # packages/plugins/@nocobase/plugin-verification/package.json # packages/plugins/@nocobase/plugin-workflow-action-trigger/package.json # packages/plugins/@nocobase/plugin-workflow-aggregate/package.json # packages/plugins/@nocobase/plugin-workflow-delay/package.json # packages/plugins/@nocobase/plugin-workflow-dynamic-calculation/package.json # packages/plugins/@nocobase/plugin-workflow-loop/package.json # packages/plugins/@nocobase/plugin-workflow-mailer/package.json # packages/plugins/@nocobase/plugin-workflow-manual/package.json # packages/plugins/@nocobase/plugin-workflow-notification/package.json # packages/plugins/@nocobase/plugin-workflow-parallel/package.json # packages/plugins/@nocobase/plugin-workflow-request/package.json # packages/plugins/@nocobase/plugin-workflow-sql/package.json # packages/plugins/@nocobase/plugin-workflow-test/package.json # packages/plugins/@nocobase/plugin-workflow/package.json # packages/presets/nocobase/package.json
This commit is contained in:
chenos
commit
4ff4d09f20
@ -292,7 +292,7 @@ export const useTableSelectorProps = () => {
|
|||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (!ctx?.service?.loading) {
|
if (!ctx?.service?.loading) {
|
||||||
const data = ctx?.service?.data?.data.map((v) => {
|
const data = ctx?.service?.data?.data.map((v) => {
|
||||||
return _.omit(v, collectionField?.foreignKey);
|
return v;
|
||||||
});
|
});
|
||||||
field.value = data;
|
field.value = data;
|
||||||
field?.setInitialValue?.(data);
|
field?.setInitialValue?.(data);
|
||||||
|
|||||||
@ -164,9 +164,9 @@ export const GoogleMapsComponent = React.forwardRef<GoogleMapForwardedRefProps,
|
|||||||
});
|
});
|
||||||
|
|
||||||
const toCenter = useMemoizedFn((position) => {
|
const toCenter = useMemoizedFn((position) => {
|
||||||
if (map.current) {
|
if (map.current && position) {
|
||||||
map.current.setCenter(position);
|
map.current?.setCenter(position);
|
||||||
map.current.setZoom(zoom);
|
map.current?.setZoom(zoom);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
@ -192,7 +192,7 @@ export const GoogleMapsComponent = React.forwardRef<GoogleMapForwardedRefProps,
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
map.current.setCenter(bounds.getCenter());
|
map.current?.setCenter?.(bounds.getCenter());
|
||||||
});
|
});
|
||||||
|
|
||||||
const onFocusOverlay = () => {
|
const onFocusOverlay = () => {
|
||||||
@ -386,7 +386,6 @@ export const GoogleMapsComponent = React.forwardRef<GoogleMapForwardedRefProps,
|
|||||||
});
|
});
|
||||||
});
|
});
|
||||||
const app = useApp();
|
const app = useApp();
|
||||||
|
|
||||||
if (!accessKey || errMessage) {
|
if (!accessKey || errMessage) {
|
||||||
return (
|
return (
|
||||||
<Alert
|
<Alert
|
||||||
|
|||||||
@ -34,6 +34,10 @@ export const getCurrentPosition: () => Promise<{ lat: number; lng: number }> = (
|
|||||||
() => {
|
() => {
|
||||||
defaultLatLng();
|
defaultLatLng();
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
timeout: 2000, // 设置最大等待时间，单位毫秒
|
||||||
|
maximumAge: 0, // 不使用缓存的地理位置
|
||||||
|
},
|
||||||
);
|
);
|
||||||
} else {
|
} else {
|
||||||
defaultLatLng();
|
defaultLatLng();
|
||||||
|
|||||||
@ -104,7 +104,9 @@ const MessageList = observer(() => {
|
|||||||
style={{
|
style={{
|
||||||
fontWeight: message.status === 'unread' ? 'bold' : 'normal',
|
fontWeight: message.status === 'unread' ? 'bold' : 'normal',
|
||||||
cursor: 'pointer',
|
cursor: 'pointer',
|
||||||
width: '100%',
|
textOverflow: 'ellipsis',
|
||||||
|
whiteSpace: 'nowrap',
|
||||||
|
overflow: 'hidden',
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
{message.title}
|
{message.title}
|
||||||
|
|||||||
@ -65,8 +65,8 @@ export default class InAppNotificationChannel extends BaseNotificationChannel {
|
|||||||
type: message.type,
|
type: message.type,
|
||||||
data: {
|
data: {
|
||||||
...message.data,
|
...message.data,
|
||||||
title: message.data.title?.slice(0, 30) || '',
|
title: message.data.title || '',
|
||||||
content: message.data.content?.slice(0, 105) || '',
|
content: message.data.content || '',
|
||||||
},
|
},
|
||||||
})}\n\n`,
|
})}\n\n`,
|
||||||
);
|
);
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user