diff --git a/charts/nocodb/templates/pvc.yaml b/charts/nocodb/templates/pvc.yaml index 67656c01d1..092a1b0439 100644 --- a/charts/nocodb/templates/pvc.yaml +++ b/charts/nocodb/templates/pvc.yaml @@ -5,10 +5,10 @@ metadata: labels: {{- include "nocodb.selectorLabels" . | nindent 8 }} spec: - accessModes: - - ReadWriteMany resources: requests: storage: {{ .Values.storage.size }} storageClassName: {{ .Values.storage.storageClassName }} + accessModes: + {{- default (toYaml .Values.storage.accessModes) "- ReadWriteMany" | nindent 4 }} volumeMode: Filesystem diff --git a/packages/nc-gui/components.d.ts b/packages/nc-gui/components.d.ts index e3914200e0..b08a5350cc 100644 --- a/packages/nc-gui/components.d.ts +++ b/packages/nc-gui/components.d.ts @@ -89,6 +89,7 @@ declare module '@vue/runtime-core' { IcTwotoneWidthNormal: typeof import('~icons/ic/twotone-width-normal')['default'] LogosGoogleGmail: typeof import('~icons/logos/google-gmail')['default'] LogosMysqlIcon: typeof import('~icons/logos/mysql-icon')['default'] + LogosOracle: typeof import('~icons/logos/oracle')['default'] LogosPostgresql: typeof import('~icons/logos/postgresql')['default'] LogosRedditIcon: typeof import('~icons/logos/reddit-icon')['default'] LogosSnowflakeIcon: typeof import('~icons/logos/snowflake-icon')['default'] diff --git a/packages/nc-gui/components/cell/Checkbox.vue b/packages/nc-gui/components/cell/Checkbox.vue index 1de2de9d79..f482d24511 100644 --- a/packages/nc-gui/components/cell/Checkbox.vue +++ b/packages/nc-gui/components/cell/Checkbox.vue @@ -89,7 +89,7 @@ useSelectedCellKeyupListener(active, (e) => { diff --git a/packages/nc-gui/components/dlg/KeyboardShortcuts.vue b/packages/nc-gui/components/dlg/KeyboardShortcuts.vue index 8079cd6bf8..d3cf53b122 100644 --- a/packages/nc-gui/components/dlg/KeyboardShortcuts.vue +++ b/packages/nc-gui/components/dlg/KeyboardShortcuts.vue @@ -15,6 +15,9 @@ const dialogShow = computed({ const renderCmdOrCtrlKey = () => { return isMac() ? '⌘' : 'CTRL' } +const renderAltOrOptlKey = () => { + return isMac() ? '⌥' : 'ALT' +} const shortcutList = [ { @@ -197,6 +200,22 @@ const shortcutList = [ keys: [renderCmdOrCtrlKey(), 'Enter'], behaviour: 'Save current expanded form item', }, + { + keys: [renderAltOrOptlKey(), '→'], + behaviour: 'Switch to next row', + }, + { + keys: [renderAltOrOptlKey(), '←'], + behaviour: 'Switch to previous row', + }, + { + keys: [renderAltOrOptlKey(), 'S'], + behaviour: 'Save current expanded form item', + }, + { + keys: [renderAltOrOptlKey(), 'N'], + behaviour: 'Create a new row', + }, ], }, ] diff --git a/packages/nc-gui/components/general/ShortcutLabel.vue b/packages/nc-gui/components/general/ShortcutLabel.vue new file mode 100644 index 0000000000..2e861cd948 --- /dev/null +++ b/packages/nc-gui/components/general/ShortcutLabel.vue @@ -0,0 +1,57 @@ + + + + + diff --git a/packages/nc-gui/components/smartsheet/Cell.vue b/packages/nc-gui/components/smartsheet/Cell.vue index be23b134d5..f39454f7f4 100644 --- a/packages/nc-gui/components/smartsheet/Cell.vue +++ b/packages/nc-gui/components/smartsheet/Cell.vue @@ -139,6 +139,15 @@ const isNumericField = computed(() => { isDuration(column.value) ) }) + +// disable contexxtmenu event propagation when cell is in +// editable state and typable (e.g. text area) +// this is to prevent the custom grid view context menu from opening +const onContextmenu = (e: MouseEvent) => { + if (props.editEnabled && isTypableInputColumn(column.value)) { + e.stopPropagation() + } +}