Skip to content

2025.6.1 #483

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 12 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions web-app/packages/lib/src/common/components/AppSidebarRight.vue
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,13 @@ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
<div class="flex flex-column h-full">
<!-- Header -->
<div
class="flex align-items-center justify-content-between py-2 px-3"
class="flex align-items-center justify-content-between px-4 py-3"
>
<h4>
<slot v-if="isScrollingContent" name="title"></slot>
</h4>
<slot name="headerTitle">
<h4>
<slot v-if="isScrollingContent" name="title"></slot>
</h4>
</slot>
<div class="flex-shrink-0">
<slot name="headerButtons"></slot>
<PButton
Expand All @@ -47,7 +49,7 @@ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
</div>

<!-- content -->
<div class="overflow-y-auto p-4 pt-6" @scroll="scrollContent">
<div class="overflow-y-auto p-4 pt-5" @scroll="scrollContent">
<slot></slot>
</div>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,18 @@
<div
v-for="col in columns.filter((item) => !item.fixed)"
:class="[
'paragraph-p6 hidden lg:flex',
`col-${col.cols ?? defaultCols}`
'paragraph-p6',
`col-${col.cols ?? defaultCols}`,
responsive ? 'hidden lg:flex' : 'flex'
]"
:key="col.text"
>
{{ col.text }}
</div>
<!-- else -->
<div class="col-12 flex lg:hidden"><slot name="header-title" /></div>
<div v-if="responsive" class="col-12 flex lg:hidden">
<slot name="header-title" />
</div>
</div>
</template>

Expand Down Expand Up @@ -50,12 +53,17 @@
v-for="column in computedColumns.filter((item) => !item.fixed)"
:key="column.value"
:class="[
'flex flex-column justify-content-center col-12 gap-1',
`lg:col-${column.cols ?? defaultCols}`,
'flex flex-column justify-content-center gap-1',
responsive
? `col-12 lg:col-${column.cols ?? defaultCols}`
: `col-${column.cols ?? defaultCols}`,
'py-2 lg:py-0'
]"
>
<p class="paragraph-p6 opacity-80 font-semibold lg:hidden">
<p
v-if="responsive"
class="paragraph-p6 opacity-80 font-semibold lg:hidden"
>
{{ column.text }}
</p>
<slot :name="`col-${column.value}`" :column="column" :item="item">
Expand Down Expand Up @@ -86,8 +94,10 @@
v-for="col in columns.filter((item) => !item.fixed)"
:key="col.value"
:class="[
'flex flex-column justify-content-center col-12',
`lg:col-${col.cols ?? 2}`,
'flex flex-column justify-content-center',
responsive
? `col-12 lg:col-${col.cols ?? defaultCols}`
: `col-${col.cols ?? defaultCols}`,
'py-2 pr-2'
]"
>
Expand Down Expand Up @@ -116,20 +126,6 @@ defineOptions({
inheritAttrs: false
})

/**
* Defines the props for the `DataViewWrapper` component.
*
* @interface Props
* @property {string} dataKey - The key to use for identifying each item in the data.
* @property {boolean} [loading] - Indicates whether the data is currently being loaded.
* @property {number} [loadingRows] - The number of loading rows to display when the data is being loaded.
* @property {string} [emptyMessage] - The message to display when there is no data available.
* @property {DataViewWrapperColumnItem[]} columns - An array of column definitions for the data view.
* @property {(item: any) => StyleValue} [rowStyle] - A function that returns the style for each row in the data view.
* @property {boolean} [rowCursorPointer] - Indicates whether the cursor should be a pointer when hovering over a row.
* @property {DataViewWrapperOptions} [options] - The options for the data view.
* @property {object[]} [value] - The data to be displayed in the data view.
*/
/**
* Defines the props for the `DataViewWrapper` component.
*
Expand All @@ -156,14 +152,16 @@ interface Props {
options?: DataViewWrapperOptions
value?: object[]
defaultCols?: number
responsive?: boolean
}

const props = withDefaults(defineProps<Props>(), {
loading: false,
loadingRows: 3,
emptyMessage: 'No data available',
rowCursorPointer: true,
defaultCols: 2
defaultCols: 2,
responsive: true
})

type EmitItem = Record<string, unknown>
Expand Down
Loading