From 01dad4e2ffe4182cb97a94a5f7c6588749ac602e Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Mon, 18 Jul 2022 17:52:58 +0800
Subject: [PATCH] fix: validate date using dayjs

---
 .../spreadsheet/components/editColumn/FormulaOptions.vue     | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/nc-gui/components/project/spreadsheet/components/editColumn/FormulaOptions.vue b/packages/nc-gui/components/project/spreadsheet/components/editColumn/FormulaOptions.vue
index 718e02b384..19cd252e8e 100644
--- a/packages/nc-gui/components/project/spreadsheet/components/editColumn/FormulaOptions.vue
+++ b/packages/nc-gui/components/project/spreadsheet/components/editColumn/FormulaOptions.vue
@@ -100,6 +100,7 @@ import jsep from 'jsep';
 import { UITypes, jsepCurlyHook } from 'nocodb-sdk';
 import { getUIDTIcon } from '~/components/project/spreadsheet/helpers/uiTypes';
 import formulaList, { formulas, formulaTypes } from '@/helpers/formulaList';
+import { validateDateWithUnknownFormat } from '@/helpers/dateFormatHelper';
 import { getWordUntilCaret, insertAtCursor } from '@/helpers';
 import NcAutocompleteTree from '@/helpers/NcAutocompleteTree';
 
@@ -265,7 +266,7 @@ export default {
                 parsedTree.arguments[0],
                 formulaTypes.DATE,
                 v => {
-                  if (!(v instanceof Date)) {
+                  if (!validateDateWithUnknownFormat(v)) {
                     typeErrors.add('The first parameter of WEEKDAY() should have date value');
                   }
                 },
@@ -299,7 +300,7 @@ export default {
                 parsedTree.arguments[0],
                 formulaTypes.DATE,
                 v => {
-                  if (!(v instanceof Date)) {
+                  if (!validateDateWithUnknownFormat(v)) {
                     typeErrors.add('The first parameter of DATEADD() should have date value');
                   }
                 },