|
|
|
@ -117,7 +117,7 @@ const {
|
|
|
|
|
formattedData: data, |
|
|
|
|
updateOrSaveRow, |
|
|
|
|
changePage, |
|
|
|
|
addEmptyRow, |
|
|
|
|
addEmptyRow: _addEmptyRow, |
|
|
|
|
deleteRow, |
|
|
|
|
deleteSelectedRows, |
|
|
|
|
selectedAllRecords, |
|
|
|
@ -200,6 +200,7 @@ const {
|
|
|
|
|
isCellActive, |
|
|
|
|
tbodyEl, |
|
|
|
|
resetSelectedRange, |
|
|
|
|
makeActive, |
|
|
|
|
selectedRange, |
|
|
|
|
} = useMultiSelect( |
|
|
|
|
meta, |
|
|
|
@ -774,9 +775,17 @@ eventBus.on(async (event, payload) => {
|
|
|
|
|
} |
|
|
|
|
}) |
|
|
|
|
|
|
|
|
|
const closeAddColumnDropdown = () => { |
|
|
|
|
const closeAddColumnDropdown = (scrollToLastCol = false) => { |
|
|
|
|
columnOrder.value = null |
|
|
|
|
addColumnDropdown.value = false |
|
|
|
|
if (scrollToLastCol) { |
|
|
|
|
setTimeout(() => { |
|
|
|
|
const lastAddNewRowHeader = tableHead.value?.querySelector('th:last-child') |
|
|
|
|
if (lastAddNewRowHeader) { |
|
|
|
|
lastAddNewRowHeader.scrollIntoView({ behavior: 'smooth' }) |
|
|
|
|
} |
|
|
|
|
}, 200) |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
const confirmDeleteRow = (row: number) => { |
|
|
|
@ -803,6 +812,15 @@ const deleteSelectedRangeOfRows = () => {
|
|
|
|
|
activeCell.col = null |
|
|
|
|
}) |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
function addEmptyRow(row?: number) { |
|
|
|
|
const rowObj = _addEmptyRow(row) |
|
|
|
|
nextTick().then(() => { |
|
|
|
|
makeActive(row ?? data.value.length - 1, 0) |
|
|
|
|
scrollToCell?.() |
|
|
|
|
}) |
|
|
|
|
return rowObj |
|
|
|
|
} |
|
|
|
|
</script> |
|
|
|
|
|
|
|
|
|
<template> |
|
|
|
@ -826,7 +844,7 @@ const deleteSelectedRangeOfRows = () => {
|
|
|
|
|
> |
|
|
|
|
<thead ref="tableHead"> |
|
|
|
|
<tr class="nc-grid-header"> |
|
|
|
|
<th class="w-[80px] min-w-[80px]" data-testid="grid-id-column"> |
|
|
|
|
<th class="w-[85px] min-w-[85px]" data-testid="grid-id-column"> |
|
|
|
|
<div class="w-full h-full bg-gray-100 flex pl-5 pr-1 items-center" data-testid="nc-check-all"> |
|
|
|
|
<template v-if="!readOnly"> |
|
|
|
|
<div class="nc-no-label text-gray-500" :class="{ hidden: selectedAllRecords }">#</div> |
|
|
|
@ -879,8 +897,8 @@ const deleteSelectedRangeOfRows = () => {
|
|
|
|
|
<SmartsheetColumnEditOrAddProvider |
|
|
|
|
v-if="addColumnDropdown" |
|
|
|
|
:column-position="columnOrder" |
|
|
|
|
@submit="closeAddColumnDropdown" |
|
|
|
|
@cancel="closeAddColumnDropdown" |
|
|
|
|
@submit="closeAddColumnDropdown(true)" |
|
|
|
|
@cancel="closeAddColumnDropdown()" |
|
|
|
|
@click.stop |
|
|
|
|
@keydown.stop |
|
|
|
|
/> |
|
|
|
@ -955,7 +973,8 @@ const deleteSelectedRangeOfRows = () => {
|
|
|
|
|
:key="columnObj.id" |
|
|
|
|
class="cell relative nc-grid-cell" |
|
|
|
|
:class="{ |
|
|
|
|
'active': isCellSelected(rowIndex, colIndex), |
|
|
|
|
'cursor-pointer': hasEditPermission, |
|
|
|
|
'active': hasEditPermission && isCellSelected(rowIndex, colIndex), |
|
|
|
|
'nc-required-cell': isColumnRequiredAndNull(columnObj, row.row), |
|
|
|
|
'align-middle': !rowHeight || rowHeight === 1, |
|
|
|
|
'align-top': rowHeight && rowHeight !== 1, |
|
|
|
@ -1003,21 +1022,19 @@ const deleteSelectedRangeOfRows = () => {
|
|
|
|
|
</template> |
|
|
|
|
</LazySmartsheetRow> |
|
|
|
|
|
|
|
|
|
<tr v-if="isAddingEmptyRowAllowed"> |
|
|
|
|
<td |
|
|
|
|
<tr |
|
|
|
|
v-if="isAddingEmptyRowAllowed" |
|
|
|
|
v-e="['c:row:add:grid-bottom']" |
|
|
|
|
:colspan="visibleColLength + 1" |
|
|
|
|
class="text-left pointer nc-grid-add-new-cell cursor-pointer" |
|
|
|
|
class="cursor-pointer" |
|
|
|
|
@mouseup.stop |
|
|
|
|
@click="addEmptyRow()" |
|
|
|
|
> |
|
|
|
|
<td class="text-left pointer nc-grid-add-new-cell sticky left-0 !z-5 !border-r-0"> |
|
|
|
|
<div class="px-2 w-full flex items-center text-gray-500"> |
|
|
|
|
<component :is="iconMap.plus" class="text-pint-500 text-xs ml-2 text-primary" /> |
|
|
|
|
|
|
|
|
|
<span class="ml-1"> |
|
|
|
|
{{ $t('activity.addRow') }} |
|
|
|
|
</span> |
|
|
|
|
</div> |
|
|
|
|
</td> |
|
|
|
|
<td :colspan="visibleColLength"></td> |
|
|
|
|
</tr> |
|
|
|
|
</tbody> |
|
|
|
|
</table> |
|
|
|
@ -1079,8 +1096,23 @@ const deleteSelectedRangeOfRows = () => {
|
|
|
|
|
</a-dropdown> |
|
|
|
|
</div> |
|
|
|
|
|
|
|
|
|
<LazySmartsheetPagination /> |
|
|
|
|
<div |
|
|
|
|
v-if="isAddingEmptyRowAllowed" |
|
|
|
|
class="absolute bottom-1px left-2 z-4" |
|
|
|
|
data-testid="nc-grid-add-new-row" |
|
|
|
|
@click="addEmptyRow()" |
|
|
|
|
> |
|
|
|
|
<a-button v-e="['c:row:add:grid-bottom', { footer: true }]" class="!rounded-xl" size="small"> |
|
|
|
|
<div class="flex items-center"> |
|
|
|
|
<component :is="iconMap.plus" class="text-pint-500 text-xs" /> |
|
|
|
|
<span class="ml-1"> |
|
|
|
|
{{ $t('activity.addRow') }} |
|
|
|
|
</span> |
|
|
|
|
</div> |
|
|
|
|
</a-button> |
|
|
|
|
</div> |
|
|
|
|
|
|
|
|
|
<LazySmartsheetPagination align-count-on-right> </LazySmartsheetPagination> |
|
|
|
|
<Suspense> |
|
|
|
|
<LazySmartsheetExpandedForm |
|
|
|
|
v-if="expandedFormRow && expandedFormDlg" |
|
|
|
@ -1179,14 +1211,14 @@ const deleteSelectedRangeOfRows = () => {
|
|
|
|
|
|
|
|
|
|
thead th:nth-child(2) { |
|
|
|
|
position: sticky !important; |
|
|
|
|
left: 80px; |
|
|
|
|
left: 85px; |
|
|
|
|
z-index: 5; |
|
|
|
|
@apply border-r-2 border-r-gray-300; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
tbody td:nth-child(2) { |
|
|
|
|
position: sticky !important; |
|
|
|
|
left: 80px; |
|
|
|
|
left: 85px; |
|
|
|
|
z-index: 4; |
|
|
|
|
background: white; |
|
|
|
|
@apply border-r-2 border-r-gray-300; |
|
|
|
|