fm453/nocobase
1
0
Fork 0
mirror of https://gitee.com/nocobase/nocobase.git synced 2025-05-05 21:49:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: use association names

Browse Source
This commit is contained in:
chenos 2023-05-18 17:08:31 +08:00
parent 2f1cc6c938
commit b7954a6f05
2 changed files with 89 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,6 @@
import { createForm } from '@formily/core'; import { createForm } from '@formily/core';
import { RecursionField, Schema, useField, useFieldSchema } from '@formily/react'; import { RecursionField, Schema, useField, useFieldSchema } from '@formily/react';
import { Spin } from 'antd';
import { isEmpty } from 'lodash'; import { isEmpty } from 'lodash';
import React, { createContext, useContext, useEffect, useMemo, useRef } from 'react'; import React, { createContext, useContext, useEffect, useMemo, useRef } from 'react';
import { useCollection } from '../collection-manager'; import { useCollection } from '../collection-manager';
@ -72,7 +73,10 @@ export const FormBlockProvider = (props) => {
const currentCollection = useCollection(); const currentCollection = useCollection();
const { designable } = useDesignable(); const { designable } = useDesignable();
const isEmptyRecord = useIsEmptyRecord(); const isEmptyRecord = useIsEmptyRecord();
const { appends, updateAssociationValues } = useAssociationNames(); const { loading, appends, updateAssociationValues } = useAssociationNames();
if (loading) {
return <Spin />;
}
if (!Object.keys(params).includes('appends')) { if (!Object.keys(params).includes('appends')) {
params['appends'] = appends; params['appends'] = appends;
} }

17
packages/core/client/src/block-provider/hooks/index.ts
View File

@ -16,12 +16,12 @@ import { transformToFilter } from '../../filter-provider/utils';
import { useRecord } from '../../record-provider'; import { useRecord } from '../../record-provider';
import { removeNullCondition, useActionContext, useCompile } from '../../schema-component'; import { removeNullCondition, useActionContext, useCompile } from '../../schema-component';
import { BulkEditFormItemValueType } from '../../schema-initializer/components'; import { BulkEditFormItemValueType } from '../../schema-initializer/components';
import { useSchemaTemplateManager } from '../../schema-templates';
import { useCurrentUserContext } from '../../user'; import { useCurrentUserContext } from '../../user';
import { useBlockRequestContext, useFilterByTk } from '../BlockProvider'; import { useBlockRequestContext, useFilterByTk } from '../BlockProvider';
import { useDetailsBlockContext } from '../DetailsBlockProvider'; import { useDetailsBlockContext } from '../DetailsBlockProvider';
import { mergeFilter } from '../SharedFilterProvider'; import { mergeFilter } from '../SharedFilterProvider';
import { TableFieldResource } from '../TableFieldProvider'; import { TableFieldResource } from '../TableFieldProvider';
import { useSchemaTemplateManager } from '../../schema-templates';
export const usePickActionProps = () => { export const usePickActionProps = () => {
const form = useForm(); const form = useForm();
@ -1073,21 +1073,21 @@ export const useAssociationFilterBlockProps = () => {
}; };
}; };
const getTemplateSchema = ({ uid }) => { const getTemplateSchema = async (api, { uid }) => {
const conf = { const conf = {
url: `/uiSchemas:getJsonSchema/${uid}`, url: `/uiSchemas:getJsonSchema/${uid}`,
}; };
const { data, loading } = useRequest(conf); const { data } = await api.request(conf);
if (loading) { console.log('data?.data', data?.data);
// return;
}
return new Schema(data?.data || {}); return new Schema(data?.data || {});
}; };
export const useAssociationNames = () => { export const useAssociationNames = () => {
const api = useAPIClient();
const { getCollectionJoinField } = useCollectionManager(); const { getCollectionJoinField } = useCollectionManager();
const { getTemplateById } = useSchemaTemplateManager(); const { getTemplateById } = useSchemaTemplateManager();
const fieldSchema = useFieldSchema(); const fieldSchema = useFieldSchema();
const { loading, data } = useRequest(async () => {
const associationValues = []; const associationValues = [];
const formSchema = fieldSchema.reduceProperties((buf, schema) => { const formSchema = fieldSchema.reduceProperties((buf, schema) => {
if (['FormV2', 'Details', 'List', 'GridCard'].includes(schema['x-component'])) { if (['FormV2', 'Details', 'List', 'GridCard'].includes(schema['x-component'])) {
@ -1163,7 +1163,7 @@ export const useAssociationNames = () => {
}; };
if (templateSchema) { if (templateSchema) {
const template = getTemplateById(templateSchema['x-component-props']?.templateId); const template = getTemplateById(templateSchema['x-component-props']?.templateId);
const schema = getTemplateSchema(template); const schema = await getTemplateSchema(api, template);
if (schema) { if (schema) {
const associations = getAssociationAppends(schema); const associations = getAssociationAppends(schema);
const appends = flattenNestedList(associations); const appends = flattenNestedList(associations);
@ -1174,4 +1174,7 @@ export const useAssociationNames = () => {
const appends = flattenNestedList(associations); const appends = flattenNestedList(associations);
return { appends, updateAssociationValues: appends.filter((v) => associationValues.includes(v)) }; return { appends, updateAssociationValues: appends.filter((v) => associationValues.includes(v)) };
} }
});
return { appends: [], updateAssociationValues: [], loading, ...data };
}; };