Merge develop into branch

packages/nc-gui/components/cell/Currency/Editor.vue

@@ -23,7 +23,7 @@ const _vModel = useVModel(props, 'modelValue', emit)
 const lastSaved = ref()
 const cellFocused = ref(false)
 
-const inputType = computed(() => (!isForm.value && !cellFocused.value ? 'text' : 'number'))
+const inputType = computed(() => (isExpandedFormOpen.value && !cellFocused.value ? 'text' : 'number'))
 
 const currencyMeta = computed(() => {
   return {

packages/nc-gui/components/cell/Currency/index.vue

@@ -29,7 +29,7 @@ const _vModel = useVModel(props, 'modelValue', emit)
 
 const cellFocused = ref(false)
 
-const inputType = computed(() => (!isForm.value && !cellFocused.value ? 'text' : 'number'))
+const inputType = computed(() => (isExpandedFormOpen.value && !cellFocused.value ? 'text' : 'number'))
 
 const vModel = computed({
   get: () => _vModel.value,

packages/nc-gui/components/cell/Decimal/Editor.vue

@@ -21,6 +21,7 @@ const readOnly = inject(ReadonlyInj, ref(false))
 const isExpandedFormOpen = inject(IsExpandedFormOpenInj, ref(false))!
 const isForm = inject(IsFormInj)!
 const isCanvasInjected = inject(IsCanvasInjectionInj, false)
+const canvasCellEventData = inject(CanvasCellEventDataInj, reactive<CanvasCellEventDataInjType>({}))
 
 const inputRef = ref<HTMLInputElement>()
 const vModel = useVModel(props, 'modelValue', emits)
@@ -30,6 +31,9 @@ const precision = computed(() => {
 })
 
 onMounted(() => {
+  if (canvasCellEventData?.keyboardKey && isSinglePrintableKey(canvasCellEventData?.keyboardKey)) {
+    vModel.value = Number(canvasCellEventData.keyboardKey)
+  }
   if (isCanvasInjected && !isExpandedFormOpen.value && !isEditColumn.value && !isForm.value) {
     inputRef.value?.focus()
   }

packages/nc-gui/components/cell/Time/index.vue

@@ -55,7 +55,7 @@ const localState = computed({
       return undefined
     }
     let convertingValue = modelValue
-    const valueNumber: number = Number(modelValue)
+    const valueNumber = Number(modelValue)
     if (!isNaN(valueNumber)) {
       // FIXME: currently returned value is in minutes
       // so need to * 60 and need to be removed if changed to seconds

packages/nc-gui/components/dlg/AirtableImport.vue

@@ -6,6 +6,7 @@ const { modelValue, baseId, sourceId, transition } = defineProps<{
   baseId: string
   sourceId: string
   transition?: string
+  showBackBtn?: boolean
 }>()
 
 const emit = defineEmits(['update:modelValue', 'back'])
@@ -450,7 +451,9 @@ const collapseKey = ref('')
             }
           "
         >
-          {{ $t('general.back') }}
+          <GeneralIcon v-if="showBackBtn" icon="chevronLeft" class="mr-1" />
+
+          {{ showBackBtn ? $t('general.back') : $t('general.cancel') }}
         </nc-button>
 
         <nc-button

packages/nc-gui/components/dlg/Base/Duplicate.vue

@@ -77,11 +77,7 @@ const _duplicate = async () => {
     const jobData = await api.base.duplicate(props.base.id as string, {
       options: optionsToExclude.value,
       base: {
-        fk_workspace_id: isEeUI
-          ? targetWorkspace.value?.id
-            ? targetWorkspace.value.id
-            : props.base.fk_workspace_id
-          : null,
+        fk_workspace_id: isEeUI ? (targetWorkspace.value?.id ? targetWorkspace.value.id : props.base.fk_workspace_id) : null,
         type: props.base.type,
         color,
         meta: JSON.stringify({

packages/nc-gui/components/dlg/NocoDbImport.vue

@@ -5,6 +5,7 @@ const { modelValue, baseId, transition } = defineProps<{
   modelValue: boolean
   baseId: string
   transition?: string
+  showBackBtn?: boolean
 }>()
 
 const emit = defineEmits(['update:modelValue', 'back'])
@@ -347,7 +348,9 @@ onUnmounted(() => {
             }
           "
         >
-          {{ $t('general.back') }}
+          <GeneralIcon v-if="showBackBtn" icon="chevronLeft" class="mr-1" />
+
+          {{ showBackBtn ? $t('general.back') : $t('general.cancel') }}
         </NcButton>
         <NcButton v-else key="abort" type="danger" size="small" @click="abortListening">
           {{ $t('general.abort') }}