Browse Source

Merge pull request #2931 from nocodb/enhancement/formula-currency-support

enhancement: support currency in formula
pull/2933/head
navi 2 years ago committed by GitHub
parent
commit
f64430d655
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      packages/nc-gui/components/project/spreadsheet/components/editColumn/FormulaOptions.vue

2
packages/nc-gui/components/project/spreadsheet/components/editColumn/FormulaOptions.vue

@ -486,6 +486,7 @@ export default {
case UITypes.Rating: case UITypes.Rating:
case UITypes.Count: case UITypes.Count:
case UITypes.AutoNumber: case UITypes.AutoNumber:
case UITypes.Currency:
if (expectedType !== formulaTypes.NUMERIC) { if (expectedType !== formulaTypes.NUMERIC) {
typeErrors.add( typeErrors.add(
`Column '${parsedTree.name}' with ${formulaTypes.NUMERIC} type is found but ${expectedType} type is expected` `Column '${parsedTree.name}' with ${formulaTypes.NUMERIC} type is found but ${expectedType} type is expected`
@ -510,7 +511,6 @@ export default {
case UITypes.Attachment: case UITypes.Attachment:
case UITypes.ID: case UITypes.ID:
case UITypes.Time: case UITypes.Time:
case UITypes.Currency:
case UITypes.Percent: case UITypes.Percent:
case UITypes.Duration: case UITypes.Duration:
case UITypes.Rollup: case UITypes.Rollup:

Loading…
Cancel
Save