Merge remote-tracking branch 'origin/master'

This commit is contained in:
M_Kececi
2026-06-19 23:04:16 +03:00
parent 1fedae041b
commit 5de8f9e918

View File

@@ -149,7 +149,13 @@
</div> </div>
</div> </div>
<div class="table-wrap" :style="{ '--sticky-scroll-comp': `${stickyScrollComp}px` }"> <div
class="table-wrap"
:style="{
'--sticky-scroll-comp': `${stickyScrollComp}px`,
'--sticky-left-width': `${stickyLeftWidth}px`
}"
>
<div v-if="showGuidanceOverlay" class="empty-overlay"> <div v-if="showGuidanceOverlay" class="empty-overlay">
<div class="empty-overlay-inner"> <div class="empty-overlay-inner">
<div class="text-subtitle1 text-weight-bold">Liste Icin Filtre Secin</div> <div class="text-subtitle1 text-weight-bold">Liste Icin Filtre Secin</div>
@@ -1497,8 +1503,9 @@ const stickyLeftMap = computed(() => {
const stickyScrollComp = computed(() => { const stickyScrollComp = computed(() => {
const boundaryName = stickyBoundaryColumnName.value const boundaryName = stickyBoundaryColumnName.value
const boundaryCol = allColumns.find((x) => x.name === boundaryName) const boundaryCol = allColumns.find((x) => x.name === boundaryName)
return ((stickyLeftMap.value[boundaryName] || 0) + extractWidth(boundaryCol?.style)) * 1.2 return (stickyLeftMap.value[boundaryName] || 0) + extractWidth(boundaryCol?.style)
}) })
const stickyLeftWidth = computed(() => stickyScrollComp.value)
function isStickyCol (name) { function isStickyCol (name) {
return stickyColumnNameSet.value.has(name) return stickyColumnNameSet.value.has(name)
@@ -1798,6 +1805,8 @@ onMounted(() => {
.top-x-scroll { .top-x-scroll {
flex: 0 0 var(--top-scroll-height); flex: 0 0 var(--top-scroll-height);
height: var(--top-scroll-height); height: var(--top-scroll-height);
width: max(160px, calc(100% - var(--sticky-left-width, 0px)));
margin-left: var(--sticky-left-width, 0px);
overflow-x: auto; overflow-x: auto;
overflow-y: hidden; overflow-y: hidden;
background: #f8fafc; background: #f8fafc;