Skip to content

fix: async support in form script #2273

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 21, 2025
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions desk/src/composables/formCustomisation.ts
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
import { Field } from "@/types";

export function setupCustomizations(data, obj) {
export async function setupCustomizations(data, obj) {
if (!data._form_script) return [];
let actions = [];
let onChangeFieldMap = {};
if (Array.isArray(data._form_script)) {
data._form_script.forEach((script) => {
const parsed = parseScript(script, obj);
for (const script of data._form_script) {
const parsed = await parseScript(script, obj);
actions = actions.concat(parsed.actions);
if (parsed.onChange) {
parseOnChangeFn(onChangeFieldMap, parsed.onChange);
}
});
}
} else {
const parsed = parseScript(data._form_script, obj);
const parsed = await parseScript(data._form_script, obj);
actions = parsed.actions;
if (parsed.onChange) {
parseOnChangeFn(onChangeFieldMap, parsed.onChange);
Expand All @@ -34,9 +34,9 @@ function parseOnChangeFn(fieldMap: object, currentField: object) {
}
}

function parseScript(script, obj) {
async function parseScript(script, obj) {
const scriptFn = new Function(script + "\nreturn setupForm")();
const formScript = scriptFn(obj);
const formScript = await scriptFn(obj);
return {
actions: formScript?.actions || [],
onChange: formScript?.onChange || null,
Expand Down
Loading