mirror of
https://gitee.com/nocobase/nocobase.git
synced 2025-05-08 06:59:26 +08:00
fix: after setting title field the collection data should refresh (#4358)
This commit is contained in:
parent
0a42d490e4
commit
cb8aa0d931
@ -11,7 +11,7 @@ import { css } from '@emotion/css';
|
|||||||
import { createForm, Field } from '@formily/core';
|
import { createForm, Field } from '@formily/core';
|
||||||
import { FieldContext, FormContext, useField } from '@formily/react';
|
import { FieldContext, FormContext, useField } from '@formily/react';
|
||||||
import { Space, Switch, Table, TableColumnProps, Tag, Tooltip, message } from 'antd';
|
import { Space, Switch, Table, TableColumnProps, Tag, Tooltip, message } from 'antd';
|
||||||
import React, { useContext, useMemo, useState } from 'react';
|
import React, { createContext, useContext, useMemo, useState } from 'react';
|
||||||
import { useTranslation } from 'react-i18next';
|
import { useTranslation } from 'react-i18next';
|
||||||
import {
|
import {
|
||||||
Action,
|
Action,
|
||||||
@ -59,8 +59,14 @@ const resourceActionProps = {
|
|||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const CollectionListContext = createContext(null);
|
||||||
|
|
||||||
const CollectionFieldsProvider = (props) => {
|
const CollectionFieldsProvider = (props) => {
|
||||||
return <ResourceActionProvider {...resourceActionProps}>{props.children}</ResourceActionProvider>;
|
return (
|
||||||
|
<CollectionListContext.Provider value={useResourceActionContext()}>
|
||||||
|
<ResourceActionProvider {...resourceActionProps}>{props.children}</ResourceActionProvider>
|
||||||
|
</CollectionListContext.Provider>
|
||||||
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
const indentStyle = css`
|
const indentStyle = css`
|
||||||
@ -101,12 +107,10 @@ const CurrentFields = (props) => {
|
|||||||
const parentRecordData = useRecord();
|
const parentRecordData = useRecord();
|
||||||
const [loadingRecord, setLoadingRecord] = React.useState<any>(null);
|
const [loadingRecord, setLoadingRecord] = React.useState<any>(null);
|
||||||
const { refreshCM, isTitleField, getTemplate } = useCollectionManager_deprecated();
|
const { refreshCM, isTitleField, getTemplate } = useCollectionManager_deprecated();
|
||||||
const { [targetKey]: filterByTk, titleField: targetTitleField, template } = parentRecordData;
|
const { [targetKey]: filterByTk, titleField, template } = parentRecordData;
|
||||||
const [titleField, setTitleField] = useState(targetTitleField);
|
|
||||||
|
|
||||||
const targetTemplate = getTemplate(template);
|
const targetTemplate = getTemplate(template);
|
||||||
const api = useAPIClient();
|
const api = useAPIClient();
|
||||||
|
const ctx = useContext(CollectionListContext);
|
||||||
const columns: TableColumnProps<any>[] = [
|
const columns: TableColumnProps<any>[] = [
|
||||||
{
|
{
|
||||||
dataIndex: ['uiSchema', 'title'],
|
dataIndex: ['uiSchema', 'title'],
|
||||||
@ -134,10 +138,10 @@ const CurrentFields = (props) => {
|
|||||||
data: { titleField: checked ? record.name : 'id' },
|
data: { titleField: checked ? record.name : 'id' },
|
||||||
});
|
});
|
||||||
message.success(t('Saved successfully'));
|
message.success(t('Saved successfully'));
|
||||||
setTitleField(checked ? record.name : 'id');
|
|
||||||
await props.refreshAsync();
|
await props.refreshAsync();
|
||||||
setLoadingRecord(null);
|
setLoadingRecord(null);
|
||||||
refreshCM();
|
refreshCM();
|
||||||
|
ctx?.refresh?.();
|
||||||
};
|
};
|
||||||
|
|
||||||
return isTitleField(record) ? (
|
return isTitleField(record) ? (
|
||||||
@ -221,6 +225,7 @@ const InheritFields = (props) => {
|
|||||||
const { t } = useTranslation();
|
const { t } = useTranslation();
|
||||||
const { refreshCM, isTitleField } = useCollectionManager_deprecated();
|
const { refreshCM, isTitleField } = useCollectionManager_deprecated();
|
||||||
const { [targetKey]: filterByTk, titleField, name } = parentRecord;
|
const { [targetKey]: filterByTk, titleField, name } = parentRecord;
|
||||||
|
const ctx = useContext(CollectionListContext);
|
||||||
|
|
||||||
const columns: TableColumnProps<any>[] = [
|
const columns: TableColumnProps<any>[] = [
|
||||||
{
|
{
|
||||||
@ -249,6 +254,7 @@ const InheritFields = (props) => {
|
|||||||
await props.refreshAsync();
|
await props.refreshAsync();
|
||||||
setLoadingRecord(null);
|
setLoadingRecord(null);
|
||||||
refreshCM();
|
refreshCM();
|
||||||
|
ctx?.refresh?.();
|
||||||
})
|
})
|
||||||
.catch((err) => {
|
.catch((err) => {
|
||||||
setLoadingRecord(null);
|
setLoadingRecord(null);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user