From 39e5f7aad914a9965e4faada992b9d141ccb86a8 Mon Sep 17 00:00:00 2001 From: Wing-Kam Wong Date: Tue, 2 Aug 2022 13:07:08 +0800 Subject: [PATCH 1/4] feat(gui-v2): add isDecimal --- packages/nc-gui-v2/composables/useColumn.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/nc-gui-v2/composables/useColumn.ts b/packages/nc-gui-v2/composables/useColumn.ts index f71afb6015..80560b2961 100644 --- a/packages/nc-gui-v2/composables/useColumn.ts +++ b/packages/nc-gui-v2/composables/useColumn.ts @@ -30,6 +30,7 @@ export function useColumn(column: ColumnType) { const isAttachment = uiDatatype === 'Attachment' const isRating = uiDatatype === UITypes.Rating const isCurrency = uiDatatype === 'Currency' + const isDecimal = uiDatatype === UITypes.Decimal const isDuration = uiDatatype === UITypes.Duration const isPercent = uiDatatype === UITypes.Percent const isAutoSaved = [ @@ -68,6 +69,7 @@ export function useColumn(column: ColumnType) { isAttachment, isRating, isCurrency, + isDecimal, isDuration, isAutoSaved, isManualSaved, From ccccc64ebbc45004f9e65c283df1b04d33731791 Mon Sep 17 00:00:00 2001 From: Wing-Kam Wong Date: Tue, 2 Aug 2022 13:07:16 +0800 Subject: [PATCH 2/4] feat(gui-v2): add CellDecimal --- packages/nc-gui-v2/components/smartsheet/Cell.vue | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/nc-gui-v2/components/smartsheet/Cell.vue b/packages/nc-gui-v2/components/smartsheet/Cell.vue index 119501e22d..a583bb5063 100644 --- a/packages/nc-gui-v2/components/smartsheet/Cell.vue +++ b/packages/nc-gui-v2/components/smartsheet/Cell.vue @@ -43,6 +43,7 @@ const { isString, isInt, isFloat, + isDecimal, isSingleSelect, isMultiSelect, isPercent, @@ -187,6 +188,7 @@ todo : /> --> + From ed1f7a09cec8473c7d3d968cd6b2b555bfd9410a Mon Sep 17 00:00:00 2001 From: Wing-Kam Wong Date: Tue, 2 Aug 2022 13:07:26 +0800 Subject: [PATCH 3/4] feat(gui-v2): add DecimalIcon --- packages/nc-gui-v2/components/smartsheet-header/CellIcon.vue | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/nc-gui-v2/components/smartsheet-header/CellIcon.vue b/packages/nc-gui-v2/components/smartsheet-header/CellIcon.vue index 45551d4d47..fa21fa4904 100644 --- a/packages/nc-gui-v2/components/smartsheet-header/CellIcon.vue +++ b/packages/nc-gui-v2/components/smartsheet-header/CellIcon.vue @@ -20,6 +20,7 @@ import URLIcon from '~icons/mdi/link' import EmailIcon from '~icons/mdi/email' import CurrencyIcon from '~icons/mdi/currency-usd-circle-outline' import PercentIcon from '~icons/mdi/percent-outline' +import DecimalIcon from '~icons/mdi/decimal' const { columnMeta } = defineProps<{ columnMeta?: ColumnType }>() @@ -50,6 +51,8 @@ const icon = computed(() => { return RatingIcon } else if (additionalColMeta.isAttachment) { return AttachmentIcon + } else if (additionalColMeta.isDecimal) { + return DecimalIcon } else if (additionalColMeta.isInt || additionalColMeta.isFloat) { return NumericIcon } From b1ee69918421d5111b2ddec0936f372ba0d059db Mon Sep 17 00:00:00 2001 From: Wing-Kam Wong Date: Tue, 2 Aug 2022 13:07:59 +0800 Subject: [PATCH 4/4] feat(gui-v2): add DecimalCell --- .../nc-gui-v2/components/cell/Decimal.vue | 43 +++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 packages/nc-gui-v2/components/cell/Decimal.vue diff --git a/packages/nc-gui-v2/components/cell/Decimal.vue b/packages/nc-gui-v2/components/cell/Decimal.vue new file mode 100644 index 0000000000..58355b5c20 --- /dev/null +++ b/packages/nc-gui-v2/components/cell/Decimal.vue @@ -0,0 +1,43 @@ + + + + +