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

Merge branch 'next' into develop

Browse Source
This commit is contained in:
nocobase[bot] 2024-12-16 03:17:47 +00:00
commit ef078fb2f9
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/plugins/@nocobase/plugin-action-custom-request/src/client/hooks/useCustomRequestVariableOptions.ts
View File

@ -25,7 +25,7 @@ export const useCustomRequestVariableOptions = () => {
const userFieldOptions = useCollectionFilterOptions('users', DEFAULT_DATA_SOURCE_KEY); const userFieldOptions = useCollectionFilterOptions('users', DEFAULT_DATA_SOURCE_KEY);
const compile = useCompile(); const compile = useCompile();
const recordData = useCollectionRecordData(); const recordData = useCollectionRecordData();
const { name: blockType } = useBlockContext(); const { name: blockType } = useBlockContext() || {};
const [fields, userFields] = useMemo(() => { const [fields, userFields] = useMemo(() => {
return [compile(fieldsOptions), compile(userFieldOptions)]; return [compile(fieldsOptions), compile(userFieldOptions)];

2
packages/plugins/@nocobase/plugin-action-custom-request/src/client/hooks/useCustomizeRequestActionProps.ts
View File

@ -27,7 +27,7 @@ export const useCustomizeRequestActionProps = () => {
const actionSchema = useFieldSchema(); const actionSchema = useFieldSchema();
const compile = useCompile(); const compile = useCompile();
const form = useForm(); const form = useForm();
const { name: blockType } = useBlockContext(); const { name: blockType } = useBlockContext() || {};
// const { getPrimaryKey } = useCollection_deprecated(); // const { getPrimaryKey } = useCollection_deprecated();
const recordData = useCollectionRecordData(); const recordData = useCollectionRecordData();
const fieldSchema = useFieldSchema(); const fieldSchema = useFieldSchema();