Browse Source

Merge branch 'develop' into fix/runtime-directive-warnings

pull/6954/head
աɨռɢӄաօռɢ 1 year ago
parent
commit
acdafbc849
  1. 4
      packages/nc-gui/components/smartsheet/grid/Table.vue
  2. 2
      packages/nc-gui/components/smartsheet/header/Menu.vue
  3. 6
      packages/nc-gui/components/virtual-cell/components/ListChildItems.vue

4
packages/nc-gui/components/smartsheet/grid/Table.vue

@ -1270,7 +1270,7 @@ onKeyStroke('ArrowDown', onDown)
:trigger="isSqlView ? [] : ['contextmenu']" :trigger="isSqlView ? [] : ['contextmenu']"
overlay-class-name="nc-dropdown-grid-context-menu" overlay-class-name="nc-dropdown-grid-context-menu"
> >
<div class="table-overlay" :class="{ 'nc-grid-skelton-loader': showSkeleton }"> <div class="table-overlay" :class="{ 'nc-grid-skeleton-loader': showSkeleton }">
<table <table
ref="smartTable" ref="smartTable"
class="xc-row-table nc-grid backgroundColorDefault !h-auto bg-white relative" class="xc-row-table nc-grid backgroundColorDefault !h-auto bg-white relative"
@ -2005,7 +2005,7 @@ onKeyStroke('ArrowDown', onDown)
} }
} }
.nc-grid-skelton-loader { .nc-grid-skeleton-loader {
thead th:nth-child(2) { thead th:nth-child(2) {
@apply border-r-1 !border-r-gray-50; @apply border-r-1 !border-r-gray-50;
} }

2
packages/nc-gui/components/smartsheet/header/Menu.vue

@ -1,6 +1,6 @@
<script lang="ts" setup> <script lang="ts" setup>
import type { ColumnReqType, ColumnType } from 'nocodb-sdk' import type { ColumnReqType, ColumnType } from 'nocodb-sdk'
import { RelationTypes, UITypes, isLinksOrLTAR, isVirtualCol } from 'nocodb-sdk' import { RelationTypes, UITypes, isLinksOrLTAR } from 'nocodb-sdk'
import { import {
ActiveViewInj, ActiveViewInj,
ColumnInj, ColumnInj,

6
packages/nc-gui/components/virtual-cell/components/ListChildItems.vue

@ -134,10 +134,10 @@ onKeyStroke('Escape', () => {
}) })
/* /*
to render same number of skelton as the number of cards to render same number of skeleton as the number of cards
displayed displayed
*/ */
const skeltonCount = computed(() => { const skeletonCount = computed(() => {
if (props.items < 10 && childrenListPagination.page === 1) { if (props.items < 10 && childrenListPagination.page === 1) {
return props.items return props.items
} }
@ -222,7 +222,7 @@ const linkOrUnLink = (rowRef: Record<string, string>, id: string) => {
<div class="cursor-pointer pr-1"> <div class="cursor-pointer pr-1">
<template v-if="isChildrenLoading"> <template v-if="isChildrenLoading">
<div <div
v-for="(x, i) in Array.from({ length: skeltonCount })" v-for="(x, i) in Array.from({ length: skeletonCount })"
:key="i" :key="i"
class="!border-2 flex flex-row gap-2 mb-2 transition-all !rounded-xl relative !border-gray-200 hover:bg-gray-50" class="!border-2 flex flex-row gap-2 mb-2 transition-all !rounded-xl relative !border-gray-200 hover:bg-gray-50"
> >

Loading…
Cancel
Save