mirrors/nocobase
1
0
Fork 0
mirror of https://github.com/nocobase/nocobase synced 2024-11-15 10:17:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: record provider required for read pretty

Browse Source
This commit is contained in:
chenos 2022-08-11 23:48:13 +08:00
parent 538a28d0bd
commit 38c3e3e4cc
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
packages/core/client/src/block-provider/FormBlockProvider.tsx
View File

@ -2,6 +2,7 @@ import { createForm } from '@formily/core';
import { useField } from '@formily/react';
import { Spin } from 'antd';
import React, { createContext, useContext, useEffect, useMemo, useRef } from 'react';
import { RecordProvider } from '../record-provider';
import { BlockProvider, useBlockRequestContext } from './BlockProvider';
export const FormBlockContext = createContext<any>({});
@ -33,7 +34,13 @@ const InternalFormBlockProvider = (props) => {
formBlockRef,
}}
>
<div ref={formBlockRef}>{props.children}</div>
{readPretty ? (
<RecordProvider record={service?.data?.data}>
<div ref={formBlockRef}>{props.children}</div>
</RecordProvider>
) : (
<div ref={formBlockRef}>{props.children}</div>
)}
</FormBlockContext.Provider>
);
};

4
packages/core/client/src/block-provider/TableSelectorProvider.tsx
View File

@ -1,7 +1,7 @@
import { ArrayField } from '@formily/core';
import { Schema, useField, useFieldSchema } from '@formily/react';
import React, { createContext, useContext, useEffect } from 'react';
import { useCollection, useCollectionManager } from '../collection-manager';
import { useCollectionManager } from '../collection-manager';
import { useRecord } from '../record-provider';
import { BlockProvider, useBlockRequestContext } from './BlockProvider';
import { useFormBlockContext } from './FormBlockProvider';
@ -60,7 +60,7 @@ export const TableSelectorProvider = (props) => {
if (props.dragSort) {
params['sort'] = ['sort'];
}
if (appends?.length) {
if (!Object.keys(params).includes('appends')) {
params['appends'] = appends;
}
if (collectionField) {

1
packages/plugins/export/src/client/ExportActionInitializer.tsx
View File

@ -52,6 +52,7 @@ export const ExportActionInitializer = (props) => {
exportSettings: [],
},
'x-designer': 'ExportDesigner',
'x-decorator': 'ACLActionProvider',
'x-component': 'Action',
'x-component-props': {
icon: 'clouddownloadoutlined',