Merge branch 'next' into develop

This commit is contained in:
nocobase[bot] 2025-02-06 00:29:19 +00:00
commit 7838a3d2d9

View File

@ -11,7 +11,6 @@ import { EditOutlined } from '@ant-design/icons';
import { css } from '@emotion/css'; import { css } from '@emotion/css';
import { observer, useFieldSchema } from '@formily/react'; import { observer, useFieldSchema } from '@formily/react';
import React, { useCallback, useContext, useMemo, useRef, useState } from 'react'; import React, { useCallback, useContext, useMemo, useRef, useState } from 'react';
import { useTranslation } from 'react-i18next';
import { ActionContext, ActionContextProvider } from '../action/context'; import { ActionContext, ActionContextProvider } from '../action/context';
import { useGetAriaLabelOfPopover } from '../action/hooks/useGetAriaLabelOfPopover'; import { useGetAriaLabelOfPopover } from '../action/hooks/useGetAriaLabelOfPopover';
import { useSetAriaLabelForPopover } from '../action/hooks/useSetAriaLabelForPopover'; import { useSetAriaLabelForPopover } from '../action/hooks/useSetAriaLabelForPopover';
@ -41,9 +40,8 @@ export const InternalPopoverNester = observer(
}) => React.ReactElement; }) => React.ReactElement;
children?: React.ReactElement; children?: React.ReactElement;
}) => { }) => {
const { options } = useAssociationFieldContext(); const { field } = useAssociationFieldContext();
const [visible, setVisible] = useState(false); const [visible, setVisible] = useState(false);
const { t } = useTranslation();
const schema = useFieldSchema(); const schema = useFieldSchema();
schema['x-component-props'].enableLink = false; schema['x-component-props'].enableLink = false;
const ref = useRef(); const ref = useRef();
@ -81,7 +79,7 @@ export const InternalPopoverNester = observer(
placement="topLeft" placement="topLeft"
open={visible} open={visible}
onOpenChange={handleOpenChange} onOpenChange={handleOpenChange}
title={t(options?.uiSchema?.rawTitle)} title={field?.title || ''}
> >
<span style={{ cursor: 'pointer', display: 'flex' }}> <span style={{ cursor: 'pointer', display: 'flex' }}>
<div <div