Browse Source

refactor(gui-v2): `add new row` size correction

Signed-off-by: Pranav C <pranavxc@gmail.com>
pull/3057/head
Pranav C 2 years ago
parent
commit
cf42def81d
  1. 53
      packages/nc-gui-v2/components/smartsheet/Grid.vue

53
packages/nc-gui-v2/components/smartsheet/Grid.vue

@ -126,7 +126,7 @@ const makeEditable = (row: Row, col: ColumnType) => {
return return
} }
if (!isPkAvail.value && !row.rowMeta.new) { if (!isPkAvail.value && !row.rowMeta.new) {
message.info("Update not allowed for table which doesn't have primary Key") message.info('Update not allowed for table which doesn\'t have primary Key')
return return
} }
if (col.ai) { if (col.ai) {
@ -190,35 +190,34 @@ const onKeyDown = async (e: KeyboardEvent) => {
e.preventDefault() e.preventDefault()
if (selected.row < data.value.length - 1) selected.row++ if (selected.row < data.value.length - 1) selected.row++
break break
default: default: {
{ const rowObj = data.value[selected.row]
const rowObj = data.value[selected.row] const columnObj = fields.value[selected.col]
const columnObj = fields.value[selected.col]
if (e.metaKey || e.ctrlKey) {
if (e.metaKey || e.ctrlKey) { switch (e.keyCode) {
switch (e.keyCode) { // copy - ctrl/cmd +c
// copy - ctrl/cmd +c case 67:
case 67: await copy(rowObj.row[columnObj.title] || '')
await copy(rowObj.row[columnObj.title] || '') break
break
}
} }
}
if (editEnabled || e.ctrlKey || e.altKey || e.metaKey) { if (editEnabled || e.ctrlKey || e.altKey || e.metaKey) {
return return
} }
/** on letter key press make cell editable and empty */ /** on letter key press make cell editable and empty */
if (e?.key?.length === 1) { if (e?.key?.length === 1) {
if (!isPkAvail && !rowObj.rowMeta.new) { if (!isPkAvail && !rowObj.rowMeta.new) {
return message.info("Update not allowed for table which doesn't have primary Key") return message.info('Update not allowed for table which doesn\'t have primary Key')
}
if (makeEditable(rowObj, columnObj)) {
rowObj.row[columnObj.title] = ''
}
// editEnabled = true
} }
if (makeEditable(rowObj, columnObj)) {
rowObj.row[columnObj.title] = ''
}
// editEnabled = true
} }
}
break break
} }
} }
@ -253,7 +252,8 @@ const onNavigate = (dir: NavigateDir) => {
<div class="flex flex-col h-100 min-h-0 w-100"> <div class="flex flex-col h-100 min-h-0 w-100">
<div class="nc-grid-wrapper min-h-0 flex-1 scrollbar-thin-dull"> <div class="nc-grid-wrapper min-h-0 flex-1 scrollbar-thin-dull">
<a-dropdown v-model:visible="contextMenu" :trigger="['contextmenu']"> <a-dropdown v-model:visible="contextMenu" :trigger="['contextmenu']">
<table ref="smartTable" class="xc-row-table nc-grid backgroundColorDefault" @contextmenu.prevent="contextMenu = true"> <table ref="smartTable" class="xc-row-table nc-grid backgroundColorDefault"
@contextmenu.prevent="contextMenu = true">
<thead> <thead>
<tr class="group"> <tr class="group">
<th> <th>
@ -304,6 +304,7 @@ const onNavigate = (dir: NavigateDir) => {
class="group-hover:flex w-full items-center justify-between p-1" class="group-hover:flex w-full items-center justify-between p-1"
> >
<a-checkbox v-model:checked="row.rowMeta.selected" /> <a-checkbox v-model:checked="row.rowMeta.selected" />
<span class="flex-1" />
<div class="cursor-pointer flex items-center border-1 active:ring rounded p-1 hover:bg-primary/10"> <div class="cursor-pointer flex items-center border-1 active:ring rounded p-1 hover:bg-primary/10">
<MdiArrowExpand class="select-none transform hover:(text-pink-500 scale-120)" /> <MdiArrowExpand class="select-none transform hover:(text-pink-500 scale-120)" />
</div> </div>

Loading…
Cancel
Save