Browse Source

Merge pull request #2925 from nocodb/refactor/gui-v2-added-phonenumber

vue3: Added phone number cell
pull/2948/head
աɨռɢӄաօռɢ 2 years ago committed by GitHub
parent
commit
831d06b362
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 23
      packages/nc-gui-v2/components/cell/PhoneNumber.vue
  2. 3
      packages/nc-gui-v2/components/smartsheet-header/CellIcon.vue
  3. 2
      packages/nc-gui-v2/components/smartsheet/Cell.vue
  4. 2
      packages/nc-gui-v2/composables/useColumn.ts

23
packages/nc-gui-v2/components/cell/PhoneNumber.vue

@ -0,0 +1,23 @@
<script setup lang="ts">
import Text from './Text.vue'
interface Props {
modelValue: any
}
interface Emits {
(event: 'update:modelValue', model: string): void
}
const props = defineProps<Props>()
const emits = defineEmits<Emits>()
const vModel = useVModel(props, 'modelValue', emits)
</script>
<template>
<Text v-model="vModel" />
</template>
<style scoped></style>

3
packages/nc-gui-v2/components/smartsheet-header/CellIcon.vue

@ -1,6 +1,7 @@
<script setup lang="ts"> <script setup lang="ts">
import type { ColumnType } from 'nocodb-sdk' import type { ColumnType } from 'nocodb-sdk'
import { ColumnInj } from '~/context' import { ColumnInj } from '~/context'
import FilePhoneIcon from '~icons/mdi/file-phone'
import { useColumn } from '#imports' import { useColumn } from '#imports'
import KeyIcon from '~icons/mdi/key-variant' import KeyIcon from '~icons/mdi/key-variant'
import JSONIcon from '~icons/mdi/code-json' import JSONIcon from '~icons/mdi/code-json'
@ -52,6 +53,8 @@ const icon = computed(() => {
return AttachmentIcon return AttachmentIcon
} else if (additionalColMeta.isInt || additionalColMeta.isFloat) { } else if (additionalColMeta.isInt || additionalColMeta.isFloat) {
return NumericIcon return NumericIcon
} else if (additionalColMeta.isPhoneNumber) {
return FilePhoneIcon
} }
// else if(additionalColMeta.isForeignKey) { // else if(additionalColMeta.isForeignKey) {
// return FKIcon // return FKIcon

2
packages/nc-gui-v2/components/smartsheet/Cell.vue

@ -46,6 +46,7 @@ const {
isSingleSelect, isSingleSelect,
isMultiSelect, isMultiSelect,
isPercent, isPercent,
isPhoneNumber,
} = useColumn(column) } = useColumn(column)
</script> </script>
@ -183,6 +184,7 @@ todo :
<CellDuration v-else-if="isDuration" v-model="localState" /> <CellDuration v-else-if="isDuration" v-model="localState" />
<CellEmail v-else-if="isEmail" v-model="localState" /> <CellEmail v-else-if="isEmail" v-model="localState" />
<CellUrl v-else-if="isURL" v-model="localState" /> <CellUrl v-else-if="isURL" v-model="localState" />
<CellPhoneNumber v-else-if="isPhoneNumber" v-model="localState" />
<!-- v-on="parentListeners" <!-- v-on="parentListeners"
/> />
--> -->

2
packages/nc-gui-v2/composables/useColumn.ts

@ -30,6 +30,7 @@ export function useColumn(column: ColumnType) {
const isAttachment = uiDatatype === 'Attachment' const isAttachment = uiDatatype === 'Attachment'
const isRating = uiDatatype === UITypes.Rating const isRating = uiDatatype === UITypes.Rating
const isCurrency = uiDatatype === 'Currency' const isCurrency = uiDatatype === 'Currency'
const isPhoneNumber = uiDatatype === 'PhoneNumber'
const isDuration = uiDatatype === UITypes.Duration const isDuration = uiDatatype === UITypes.Duration
const isPercent = uiDatatype === UITypes.Percent const isPercent = uiDatatype === UITypes.Percent
const isAutoSaved = [ const isAutoSaved = [
@ -74,5 +75,6 @@ export function useColumn(column: ColumnType) {
isSingleSelect, isSingleSelect,
isMultiSelect, isMultiSelect,
isPercent, isPercent,
isPhoneNumber,
} }
} }

Loading…
Cancel
Save