From 4471bab7186a504a1b581c4227677bc383971ed7 Mon Sep 17 00:00:00 2001 From: Pranav C Date: Wed, 16 Oct 2024 06:30:19 +0000 Subject: [PATCH] fix: replace computeAsync with custom watch to avoid unnecessary formula helper functions --- .../smartsheet/column/FormulaOptions.vue | 37 +++++++++++-------- 1 file changed, 22 insertions(+), 15 deletions(-) diff --git a/packages/nc-gui/components/smartsheet/column/FormulaOptions.vue b/packages/nc-gui/components/smartsheet/column/FormulaOptions.vue index fd0916ffad..2d24572b3d 100644 --- a/packages/nc-gui/components/smartsheet/column/FormulaOptions.vue +++ b/packages/nc-gui/components/smartsheet/column/FormulaOptions.vue @@ -85,23 +85,30 @@ if ((column.value?.colOptions as any)?.formula_raw) { const source = computed(() => activeBase.value?.sources?.find((s) => s.id === meta.value?.source_id)) -const parsedTree = computedAsync(async () => { - try { - const parsed = await validateFormulaAndExtractTreeWithType({ - formula: vModel.value.formula || vModel.value.formula_raw, - columns: meta.value?.columns || [], - column: column.value ?? undefined, - clientOrSqlUi: source.value?.type as any, - getMeta: async (modelId) => await getMeta(modelId), - }) - return parsed - } catch (e) { - return { - dataType: FormulaDataTypes.UNKNOWN, - } - } +const parsedTree = ref({ + dataType: FormulaDataTypes.UNKNOWN, }) +watch( + () => vModel.value.formula || vModel.value.formula_raw, + async () => { + try { + const parsed = await validateFormulaAndExtractTreeWithType({ + formula: vModel.value.formula || vModel.value.formula_raw, + columns: (meta.value?.columns || []).slice(), + column: column.value ? { ...column.value } : undefined, + clientOrSqlUi: source.value?.type as any, + getMeta: async (modelId) => await getMeta(modelId), + }) + parsedTree.value = parsed + } catch (e) { + parsedTree.value = { + dataType: FormulaDataTypes.UNKNOWN, + } + } + }, +) + // set additional validations setAdditionalValidations({ ...validators,