ruiling/tachybase_todo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: current object in drawersubtable (#924)

Browse Source 
Reviewed-on: daoyoucloud/tachybase#924
This commit is contained in:
sealday 2024-05-08 17:51:23 +08:00
parent ffc9236728
commit 2a03c6bf5c
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
packages/core/client/src/schema-component/antd/association-field/InternalDrawerSubTable.tsx
View File

@ -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
@ -61,7 +64,13 @@ export const InternaDrawerSubTable = observer(
</Button> </Button>
} }
> >
<InternalSubTable {...nesterProps} /> <FlagProvider isInSubForm>
<SubFormProvider
value={{ value: field.value, collection: cm.getCollection(fieldSchema['x-collection-field']) }}
>
<InternalSubTable {...nesterProps} />
</SubFormProvider>
</FlagProvider>
</Drawer> </Drawer>
</ActionContextProvider> </ActionContextProvider>
</> </>