Merge branch 'develop' into refactor/gui-v2-common-issues

packages/nc-gui-v2/components/cell/attachment/index.vue

@@ -6,21 +6,17 @@ import { useSortable } from './sort'
 import Carousel from './Carousel.vue'
 import { onMounted, ref, useDropZone, watch } from '#imports'
 import { isImage, openLink } from '~/utils'
-import MaterialSymbolsAttachFile from '~icons/material-symbols/attach-file'
-import MaterialArrowExpandIcon from '~icons/mdi/arrow-expand'
-import MaterialSymbolsFileCopyOutline from '~icons/material-symbols/file-copy-outline'
-import MdiReload from '~icons/mdi/reload'
-import IcOutlineInsertDriveFile from '~icons/ic/outline-insert-drive-file'
 
 interface Props {
   modelValue: string | Record<string, any>[] | null
+  rowIndex: number
 }
 
 interface Emits {
   (event: 'update:modelValue', value: string | Record<string, any>): void
 }
 
-const { modelValue } = defineProps<Props>()
+const { modelValue, rowIndex } = defineProps<Props>()
 
 const emits = defineEmits<Emits>()
 
@@ -60,7 +56,7 @@ onKeyDown('Escape', () => {
 /** if possible, on mounted we try to fetch the relevant `td` cell to use as a dropzone */
 onMounted(() => {
   if (typeof document !== 'undefined') {
-    dropZoneRef.value = document.querySelector(`td[data-col="${column.value.id}"]`) as HTMLTableDataCellElement
+    dropZoneRef.value = document.querySelector(`td[data-key="${rowIndex}${column.value.id}"]`) as HTMLTableDataCellElement
   }
 })
 </script>
@@ -73,7 +69,7 @@ onMounted(() => {
       <general-overlay
         v-model="isOverDropZone"
         inline
-        :target="`td[data-col='${column.id}']`"
+        :target="`td[data-key='${rowIndex}${column.id}']`"
         class="text-white text-lg ring ring-pink-500 bg-gray-700/75 flex items-center justify-center gap-2 backdrop-blur-xl"
       >
         <MaterialSymbolsFileCopyOutline class="text-pink-500" /> Drop here
@@ -100,12 +96,15 @@ onMounted(() => {
     </div>
 
     <template v-if="visibleItems.length">
-      <div ref="sortableRef" :class="{ dragging }" class="flex flex-wrap gap-2 p-1 scrollbar-thin-dull">
+      <div
+        ref="sortableRef"
+        :class="{ dragging }"
+        class="flex justify-center items-center flex-wrap gap-2 p-1 scrollbar-thin-dull max-h-[150px] overflow-scroll"
+      >
         <div
           v-for="(item, i) of visibleItems"
           :id="item.url"
           :key="item.url || item.title"
-          style="flex: 1 1 50px"
           :class="isImage(item.title, item.mimetype) ? '' : 'border-1 rounded'"
           class="nc-attachment flex items-center justify-center min-h-[50px]"
         >
@@ -120,7 +119,7 @@ onMounted(() => {
               placeholder
               :alt="item.title || `#${i}`"
               :src="item.url || item.data"
-              class="ring-1 ring-gray-300 rounded"
+              class="ring-1 ring-gray-300 rounded max-h-[50px] max-w-[50px]"
               @click="selectedImage = item"
             />
 
@@ -137,10 +136,7 @@ onMounted(() => {
         <a-tooltip v-else placement="bottom">
           <template #title> View attachments </template>
 
-          <MaterialArrowExpandIcon
+          <MdiArrowExpand class="select-none transform group-hover:(text-pink-500 scale-120)" @click.stop="modalVisible = true" />
-            class="select-none transform group-hover:(text-pink-500 scale-120)"
-            @click.stop="modalVisible = true"
-          />
         </a-tooltip>
       </div>
     </template>
@@ -152,6 +148,10 @@ onMounted(() => {
 <style lang="scss">
 .nc-cell {
   .nc-attachment-cell {
+    .nc-attachment {
+      @apply w-[50px] h-[50px] min-h-[50px] min-w-[50px];
+    }
+
     .ghost,
     .ghost > * {
       @apply !pointer-events-none;

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

@@ -10,10 +10,13 @@ interface Props {
   column: ColumnType
   modelValue: any
   editEnabled: boolean
+  rowIndex: number
 }
 
 const props = defineProps<Props>()
+
 const emit = defineEmits(['update:modelValue', 'save', 'navigate', 'update:editEnabled'])
+
 const column = toRef(props, 'column')
 
 provide(ColumnInj, column)
@@ -21,6 +24,7 @@ provide(ColumnInj, column)
 provide(EditModeInj, useVModel(props, 'editEnabled', emit))
 
 let changed = $ref(false)
+
 const syncValue = useDebounceFn(function () {
   changed = false
   emit('save')
@@ -110,7 +114,7 @@ const syncAndNavigate = (dir: NavigateDir) => {
   >
     <CellTextArea v-if="isTextArea" v-model="vModel" />
     <CellCheckbox v-else-if="isBoolean" v-model="vModel" />
-    <CellAttachment v-else-if="isAttachment" v-model="vModel" />
+    <CellAttachment v-else-if="isAttachment" v-model="vModel" :row-index="props.rowIndex" />
     <CellSingleSelect v-else-if="isSingleSelect" v-model="vModel" />
     <CellMultiSelect v-else-if="isMultiSelect" v-model="vModel" />
     <CellDatePicker v-else-if="isDate" v-model="vModel" />

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

@@ -261,7 +261,7 @@ const onNavigate = (dir: NavigateDir) => {
       <a-dropdown v-model:visible="contextMenu" :trigger="['contextmenu']">
         <table ref="smartTable" class="xc-row-table nc-grid backgroundColorDefault" @contextmenu.prevent="contextMenu = true">
           <thead>
-            <tr class="group">
+            <tr>
               <th>
                 <div class="flex align-center w-[80px]">
                   <div class="group-hover:hidden" :class="{ hidden: selectedAllRecords }">#</div>
@@ -270,6 +270,7 @@ const onNavigate = (dir: NavigateDir) => {
                     class="group-hover:flex w-full align-center"
                   >
                     <a-checkbox v-model:checked="selectedAllRecords" />
+
                     <span class="flex-1" />
                   </div>
                 </div>
@@ -285,6 +286,7 @@ const onNavigate = (dir: NavigateDir) => {
                 @xcresized="resizingCol = null"
               >
                 <SmartsheetHeaderVirtualCell v-if="isVirtualCol(col)" :column="col" />
+
                 <SmartsheetHeaderCell v-else :column="col" />
               </th>
               <!-- v-if="!isLocked && !isVirtual && !isPublicView && _isUIAllowed('add-column')" -->
@@ -293,6 +295,7 @@ const onNavigate = (dir: NavigateDir) => {
                   <div class="h-full w-[60px] flex align-center justify-center">
                     <MdiPlus class="text-sm" />
                   </div>
+
                   <template #overlay>
                     <SmartsheetColumnEditOrAdd @click.stop @cancel="addColumnDropdown = false" />
                   </template>
@@ -320,10 +323,11 @@ const onNavigate = (dir: NavigateDir) => {
               <td
                 v-for="(columnObj, colIndex) of fields"
                 :key="rowIndex + columnObj.title"
-                class="cell pointer nc-grid-cell"
+                class="cell relative cursor-pointer nc-grid-cell"
                 :class="{
                   active: !isPublicView && selected.col === colIndex && selected.row === rowIndex,
                 }"
+                :data-key="rowIndex + columnObj.id"
                 :data-col="columnObj.id"
                 :data-title="columnObj.title"
                 @click="selectCell(rowIndex, colIndex)"
@@ -345,6 +349,7 @@ const onNavigate = (dir: NavigateDir) => {
                     v-model="row.row[columnObj.title]"
                     :column="columnObj"
                     :edit-enabled="editEnabled && selected.col === colIndex && selected.row === rowIndex"
+                    :row-index="rowIndex"
                     @update:edit-enabled="editEnabled = false"
                     @save="updateOrSaveRow(row, columnObj.title)"
                     @navigate="onNavigate"

packages/nc-gui-v2/layouts/base.vue

@@ -77,7 +77,7 @@ const logout = () => {
         </template>
       </a-layout-header>
 
-      <div class="w-full" style="height: calc(100% - var(--header-height))">
+      <div class="w-full overflow-hidden" style="height: calc(100% - var(--header-height))">
         <slot />
       </div>
     </a-layout>