Merge branch 'main' into next

This commit is contained in:
nocobase[bot] 2025-02-11 08:05:29 +00:00
commit 629d16ab92

View File

@ -44,6 +44,11 @@ export const useCustomizeRequestActionProps = () => {
await form.submit(); await form.submit();
} }
let currentRecordData = { ...recordData };
if (xAction === 'customize:form:request') {
currentRecordData = form.values;
}
actionField.data ??= {}; actionField.data ??= {};
actionField.data.loading = true; actionField.data.loading = true;
try { try {
@ -55,7 +60,7 @@ export const useCustomizeRequestActionProps = () => {
// id: record[getPrimaryKey()], // id: record[getPrimaryKey()],
// appends: result.params[0]?.appends, // appends: result.params[0]?.appends,
dataSourceKey, dataSourceKey,
data: recordData || form.values, data: currentRecordData,
}, },
$nForm: blockType === 'form' ? form.values : undefined, $nForm: blockType === 'form' ? form.values : undefined,
}, },