fix: current object in drawersubtable (#924)
Reviewed-on: daoyoucloud/tachybase#924
This commit is contained in:
parent
ffc9236728
commit
2a03c6bf5c
@ -1,21 +1,21 @@
|
|||||||
import { EditOutlined } from '@ant-design/icons';
|
import { EditOutlined } from '@ant-design/icons';
|
||||||
import { css } from '@emotion/css';
|
import { css } from '@emotion/css';
|
||||||
import { observer } from '@tachybase/schema';
|
import { observer, useField, useFieldSchema } from '@tachybase/schema';
|
||||||
import React, { useContext, useRef, useState } from 'react';
|
import React, { useContext, useState } from 'react';
|
||||||
import { useTranslation } from 'react-i18next';
|
import { useTranslation } from 'react-i18next';
|
||||||
import { InternalSubTable } from './InternalSubTable';
|
import { InternalSubTable } from './InternalSubTable';
|
||||||
import { Button, Drawer } from 'antd';
|
import { Button, Drawer } from 'antd';
|
||||||
import { useAssociationFieldContext } from './hooks';
|
import { SubFormProvider, useAssociationFieldContext } from './hooks';
|
||||||
import { ActionContext, ActionContextProvider } from '../action/context';
|
import { ActionContext, ActionContextProvider } from '../action/context';
|
||||||
import { useGetAriaLabelOfPopover } from '../action';
|
|
||||||
import { ReadPrettyInternalViewer } from './InternalViewer';
|
import { ReadPrettyInternalViewer } from './InternalViewer';
|
||||||
|
import { useCollectionManager } from '../../../data-source';
|
||||||
|
import { FlagProvider } from '../../../flag-provider';
|
||||||
|
|
||||||
export const InternaDrawerSubTable = observer(
|
export const InternaDrawerSubTable = observer(
|
||||||
(props) => {
|
(props) => {
|
||||||
const { options } = useAssociationFieldContext();
|
const { options } = useAssociationFieldContext();
|
||||||
const [visible, setVisible] = useState(false);
|
const [visible, setVisible] = useState(false);
|
||||||
const { t } = useTranslation();
|
const { t } = useTranslation();
|
||||||
const ref = useRef();
|
|
||||||
const nesterProps = {
|
const nesterProps = {
|
||||||
...props,
|
...props,
|
||||||
shouldMountElement: true,
|
shouldMountElement: true,
|
||||||
@ -26,8 +26,11 @@ export const InternaDrawerSubTable = observer(
|
|||||||
enableLink: true,
|
enableLink: true,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const field = useField();
|
||||||
|
const fieldSchema = useFieldSchema();
|
||||||
|
const cm = useCollectionManager();
|
||||||
|
|
||||||
const ctx = useContext(ActionContext);
|
const ctx = useContext(ActionContext);
|
||||||
const { getAriaLabel } = useGetAriaLabelOfPopover();
|
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
<span
|
<span
|
||||||
@ -60,8 +63,14 @@ export const InternaDrawerSubTable = observer(
|
|||||||
确认
|
确认
|
||||||
</Button>
|
</Button>
|
||||||
}
|
}
|
||||||
|
>
|
||||||
|
<FlagProvider isInSubForm>
|
||||||
|
<SubFormProvider
|
||||||
|
value={{ value: field.value, collection: cm.getCollection(fieldSchema['x-collection-field']) }}
|
||||||
>
|
>
|
||||||
<InternalSubTable {...nesterProps} />
|
<InternalSubTable {...nesterProps} />
|
||||||
|
</SubFormProvider>
|
||||||
|
</FlagProvider>
|
||||||
</Drawer>
|
</Drawer>
|
||||||
</ActionContextProvider>
|
</ActionContextProvider>
|
||||||
</>
|
</>
|
||||||
|
Loading…
Reference in New Issue
Block a user