Fixed no grouping issues (#2434)

This commit is contained in:
mrsadman99 2022-12-14 11:45:47 +07:00 committed by GitHub
parent 8093875c64
commit 3c93efde07
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 1 deletions

View File

@ -27,6 +27,7 @@
getEventPositionElement, getEventPositionElement,
IconAdd, IconAdd,
IconMoreH, IconMoreH,
Label,
showPopup, showPopup,
Spinner Spinner
} from '@hcengineering/ui' } from '@hcengineering/ui'
@ -215,6 +216,10 @@
enlargedText enlargedText
{currentSpace} {currentSpace}
/> />
{:else if !groupByKey}
<span class="text-base fs-bold overflow-label content-accent-color pointer-events-none">
<Label label={tracker.string.NoGrouping} />
</span>
{:else if headerComponent} {:else if headerComponent}
<Component <Component
is={headerComponent} is={headerComponent}

View File

@ -76,7 +76,7 @@
{#each model as attributeModel} {#each model as attributeModel}
{#if attributeModel.props?.type === 'grow'} {#if attributeModel.props?.type === 'grow'}
<svelte:component this={attributeModel.presenter} /> <svelte:component this={attributeModel.presenter} />
{:else if attributeModel.props?.excludeByKey !== groupByKey && !(attributeModel.props?.optional && compactMode)} {:else if (!groupByKey || attributeModel.props?.excludeByKey !== groupByKey) && !(attributeModel.props?.optional && compactMode)}
{#if attributeModel.props?.fixed} {#if attributeModel.props?.fixed}
<FixedColumn <FixedColumn
width={propsWidth[attributeModel.key]} width={propsWidth[attributeModel.key]}