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

fix(variable): compat old variable names (#2889)

Browse Source 
* fix(variable): compat old variable names

* refactor: remove LocalVariablesProvider
This commit is contained in:
被雨水过滤的空气-Rain 2023-10-21 14:23:06 +08:00 committed by GitHub
parent 2ec3130f46
commit cde25ed871
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 91 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
packages/core/client/src/block-provider/hooks/useParsedFilter.ts
View File

@ -1,17 +1,16 @@
import { reaction } from '@formily/reactive';
import { flatten } from '@nocobase/utils/client';
import { flatten, getValuesByPath } from '@nocobase/utils/client';
import _ from 'lodash';
import { useEffect, useState } from 'react';
import { useParseDataScopeFilter } from '../../schema-settings';
import { DEBOUNCE_WAIT } from '../../variables';
import { getPath } from '../../variables/utils/getPath';
import { getVariableName } from '../../variables/utils/getVariableName';
import { isVariable } from '../../variables/utils/isVariable';
import { useFormBlockContext } from '../FormBlockProvider';
export function useParsedFilter({ filterOption, currentRecord }: { filterOption: any; currentRecord?: any }) {
const { parseFilter } = useParseDataScopeFilter({ currentRecord });
const { parseFilter, findVariable } = useParseDataScopeFilter({ currentRecord });
const [filter, setFilter] = useState({});
const { form } = useFormBlockContext();
useEffect(() => {
if (!filterOption) return;
@ -33,7 +32,19 @@ export function useParsedFilter({ filterOption, currentRecord }: { filterOption:
if (!isVariable(value)) {
return value;
}
const result = _.get({ $nForm: form?.values }, getPath(value));
const variableName = getVariableName(value);
const variable = findVariable(variableName);
if (process.env.NODE_ENV !== 'production' && !variable) {
throw new Error(`useParsedFilter: can not find variable ${variableName}`);
}
const result = getValuesByPath(
{
[variableName]: variable?.ctx || {},
},
getPath(value),
);
return result;
},
});

5
packages/core/client/src/schema-component/antd/association-field/Nester.tsx
View File

@ -17,7 +17,6 @@ import {
IsAllowToSetDefaultValueParams,
interfacesOfUnsupportedDefaultValue,
} from '../../../schema-settings/hooks/useIsAllowToSetDefaultValue';
import { LocalVariablesProvider } from '../../../variables/hooks/useLocalVariables';
import { AssociationFieldContext } from './context';
import { SubFormProvider, useAssociationFieldContext } from './hooks';
@ -80,11 +79,9 @@ const ToOneNester = (props) => {
<FormActiveFieldsProvider name="nester">
<SubFormProvider value={field.value}>
<RecordProvider record={field.value}>
<LocalVariablesProvider iterationCtx={field.value}>
<DefaultValueProvider isAllowToSetDefaultValue={isAllowToSetDefaultValue}>
<Card bordered={true}>{props.children}</Card>
</DefaultValueProvider>
</LocalVariablesProvider>
</RecordProvider>
</SubFormProvider>
</FormActiveFieldsProvider>
@ -190,7 +187,6 @@ const ToManyNester = observer(
<FormActiveFieldsProvider name="nester">
<SubFormProvider value={value}>
<RecordProvider record={value}>
<LocalVariablesProvider iterationCtx={value}>
<RecordIndexProvider index={index}>
<DefaultValueProvider isAllowToSetDefaultValue={isAllowToSetDefaultValue}>
<RecursionField
@ -200,7 +196,6 @@ const ToManyNester = observer(
/>
</DefaultValueProvider>
</RecordIndexProvider>
</LocalVariablesProvider>
</RecordProvider>
</SubFormProvider>
</FormActiveFieldsProvider>

48
packages/core/client/src/schema-component/antd/association-field/hooks.ts
View File

@ -5,7 +5,6 @@ import { flatten, getValuesByPath } from '@nocobase/utils/client';
import _, { isString } from 'lodash';
import cloneDeep from 'lodash/cloneDeep';
import { createContext, useCallback, useContext, useEffect, useMemo, useState } from 'react';
import { useFormBlockContext } from '../../../block-provider';
import { mergeFilter } from '../../../block-provider/SharedFilterProvider';
import { useCollection, useCollectionManager } from '../../../collection-manager';
import { isInFilterFormBlock } from '../../../filter-provider';
@ -13,6 +12,7 @@ import { useRecord } from '../../../record-provider';
import { useParseDataScopeFilter } from '../../../schema-settings';
import { DEBOUNCE_WAIT } from '../../../variables';
import { getPath } from '../../../variables/utils/getPath';
import { getVariableName } from '../../../variables/utils/getVariableName';
import { isVariable } from '../../../variables/utils/isVariable';
import { useDesignable } from '../../hooks';
import { AssociationFieldContext } from './context';
@ -48,17 +48,14 @@ export function useAssociationFieldContext<F extends GeneralField>() {
}
export default function useServiceOptions(props) {
const { action = 'list', service, fieldNames } = props;
const params = service?.params || {};
const { action = 'list', service } = props;
const fieldSchema = useFieldSchema();
const field = useField();
const { getField } = useCollection();
const { getCollectionJoinField } = useCollectionManager();
const record = useRecord();
const { parseFilter } = useParseDataScopeFilter();
const { parseFilter, findVariable } = useParseDataScopeFilter();
const [fieldServiceFilter, setFieldServiceFilter] = useState(null);
const { form } = useFormBlockContext();
const { formValue: subFormValue } = useSubFormValue();
useEffect(() => {
const filterFromSchema = isString(fieldSchema?.['x-component-props']?.service?.params?.filter)
@ -83,10 +80,16 @@ export default function useServiceOptions(props) {
if (!isVariable(value)) {
return value;
}
const variableName = getVariableName(value);
const variable = findVariable(variableName);
if (process.env.NODE_ENV !== 'production' && !variable) {
throw new Error(`useServiceOptions: can not find variable ${variableName}`);
}
const result = getValuesByPath(
{
$nForm: form?.values,
$iteration: subFormValue,
[variableName]: variable?.ctx || {},
},
getPath(value),
);
@ -100,39 +103,12 @@ export default function useServiceOptions(props) {
}, [
field.componentProps?.service?.params?.filter,
fieldSchema,
form?.values,
findVariable,
parseFilter,
record,
service?.params?.filter,
subFormValue,
]);
const normalizeValues = useCallback(
(obj) => {
if (obj && typeof obj === 'object') {
return obj[fieldNames?.value];
}
return obj;
},
[fieldNames?.value],
);
const value = useMemo(() => {
if (props.value === undefined || props.value === null) {
return;
}
let result: any[] = null;
if (Array.isArray(props.value)) {
result = props.value.map(normalizeValues);
} else {
result = [normalizeValues(props.value)];
}
return result.filter(Boolean);
}, [props.value, normalizeValues]);
const collectionField = useMemo(() => {
return getField(fieldSchema.name) || getCollectionJoinField(fieldSchema?.['x-collection-field']);
}, [fieldSchema]);

26
packages/core/client/src/schema-component/antd/form-item/hooks/useParseDefaultValue.ts
View File

@ -3,7 +3,7 @@ import { useField, useFieldSchema } from '@formily/react';
import { reaction } from '@formily/reactive';
import { getValuesByPath } from '@nocobase/utils/client';
import _ from 'lodash';
import { useEffect } from 'react';
import { useCallback, useEffect } from 'react';
import { useRecord, useRecordIndex } from '../../../../../src/record-provider';
import { useFormBlockType } from '../../../../block-provider/FormBlockProvider';
import { useCollection } from '../../../../collection-manager';
@ -31,6 +31,20 @@ const useParseDefaultValue = () => {
const index = useRecordIndex();
const { type: formBlockType } = useFormBlockType();
/**
* name: 如 $user
*/
const findVariable = useCallback(
(name: string) => {
let result = variables?.getVariable(name);
if (!result) {
result = localVariables.find((item) => item.name === name);
}
return result;
},
[localVariables, variables],
);
useEffect(() => {
if (
fieldSchema.default == null ||
@ -94,12 +108,16 @@ const useParseDefaultValue = () => {
if (isVariable(fieldSchema.default)) {
const variableName = getVariableName(fieldSchema.default);
const variableValue = localVariables.find((item) => item.name === variableName);
const variable = findVariable(variableName);
if (variableValue) {
if (process.env.NODE_ENV !== 'production' && !variable) {
throw new Error(`useParseDefaultValue: can not find variable ${variableName}`);
}
if (variable) {
// 实现联动的效果，当依赖的变量变化时（如 `$nForm` 变量），重新解析默认值
const dispose = reaction(() => {
const obj = { [variableName]: variableValue?.ctx };
const obj = { [variableName]: variable?.ctx || {} };
const path = getPath(fieldSchema.default);
// fix https://nocobase.height.app/T-2212

3
packages/core/client/src/schema-component/antd/table-v2/Table.tsx
View File

@ -22,7 +22,6 @@ import {
useTableSelectorContext,
} from '../../../';
import { useACLFieldWhitelist } from '../../../acl/ACLProvider';
import { LocalVariablesProvider } from '../../../variables/hooks/useLocalVariables';
import { useToken } from '../__builtins__';
import { SubFormProvider } from '../association-field/hooks';
import { ColumnFieldProvider } from './components/ColumnFieldProvider';
@ -65,7 +64,6 @@ const useTableColumns = (props: { showDel?: boolean; isSubTable?: boolean }) =>
return (
<SubFormProvider value={record}>
<RecordIndexProvider index={record.__index || index}>
<LocalVariablesProvider iterationCtx={record}>
<RecordProvider record={record}>
<ColumnFieldProvider schema={s} basePath={field.address.concat(record.__index || index)}>
<RecursionField
@ -75,7 +73,6 @@ const useTableColumns = (props: { showDel?: boolean; isSubTable?: boolean }) =>
/>
</ColumnFieldProvider>
</RecordProvider>
</LocalVariablesProvider>
</RecordIndexProvider>
</SubFormProvider>
);

16
packages/core/client/src/schema-settings/hooks/useParseDataScopeFilter.ts
View File

@ -20,6 +20,20 @@ const useParseDataScopeFilter = ({ exclude = defaultExclude, currentRecord }: Pr
const localVariables = useLocalVariables({ currentRecord });
const variables = useVariables();
/**
* name: 如 $user
*/
const findVariable = useCallback(
(name: string) => {
let result = variables?.getVariable(name);
if (!result) {
result = localVariables.find((item) => item.name === name);
}
return result;
},
[localVariables, variables],
);
const parseFilter = useCallback(
async (filterValue: any) => {
const flat = flatten(filterValue, {
@ -52,7 +66,7 @@ const useParseDataScopeFilter = ({ exclude = defaultExclude, currentRecord }: Pr
[exclude, localVariables, variables?.parseVariable],
);
return { parseFilter };
return { parseFilter, findVariable };
};
export default useParseDataScopeFilter;

21
packages/core/client/src/variables/hooks/useLocalVariables.tsx
View File

@ -1,8 +1,9 @@
import { Form } from '@formily/core';
import React, { useContext, useMemo } from 'react';
import { useMemo } from 'react';
import { useFormBlockContext } from '../../block-provider';
import { useCollection } from '../../collection-manager';
import { useRecord } from '../../record-provider';
import { useSubFormValue } from '../../schema-component/antd/association-field/hooks';
import { useBlockCollection } from '../../schema-settings/VariableInput/hooks/useBlockCollection';
import { VariableOption } from '../types';
@ -12,21 +13,9 @@ interface Props {
currentForm?: Form;
}
const LocalVariablesContext = React.createContext<{ iterationCtx: Record<string, any> }>(null);
export const LocalVariablesProvider = ({
children,
iterationCtx,
}: {
iterationCtx: Record<string, any>;
children: React.ReactNode;
}) => {
return <LocalVariablesContext.Provider value={{ iterationCtx }}>{children}</LocalVariablesContext.Provider>;
};
const useLocalVariables = (props?: Props) => {
const { name: currentCollectionName } = useCollection();
const { iterationCtx } = useContext(LocalVariablesContext) || {};
const { formValue: subFormValue } = useSubFormValue();
let { name } = useBlockCollection();
let currentRecord = useRecord();
let { form } = useFormBlockContext();
@ -86,10 +75,10 @@ const useLocalVariables = (props?: Props) => {
ctx: form?.values,
collectionName: name,
},
iterationCtx && { name: '$iteration', ctx: iterationCtx, collectionName: currentCollectionName },
subFormValue && { name: '$iteration', ctx: subFormValue, collectionName: currentCollectionName },
] as VariableOption[]
).filter(Boolean);
}, [currentRecord, name, form?.values, iterationCtx, currentCollectionName]); // 尽量保持返回的值不变，这样可以减少接口的请求次数，因为关系字段会缓存到变量的 ctx 中
}, [currentRecord, name, form?.values, subFormValue, currentCollectionName]); // 尽量保持返回的值不变，这样可以减少接口的请求次数，因为关系字段会缓存到变量的 ctx 中
};
export default useLocalVariables;