mirror of
https://github.com/hcengineering/platform.git
synced 2024-12-23 03:22:19 +03:00
UBER-500: Confusing Show More button in table (#3590)
Signed-off-by: Maxim Karmatskikh <mkarmatskih@gmail.com>
This commit is contained in:
parent
18f328e433
commit
85d1a9521c
@ -80,6 +80,7 @@
|
|||||||
config={preference?.config ?? viewlet.config}
|
config={preference?.config ?? viewlet.config}
|
||||||
options={viewlet.options}
|
options={viewlet.options}
|
||||||
query={resultQuery}
|
query={resultQuery}
|
||||||
|
totalQuery={query}
|
||||||
showNotification
|
showNotification
|
||||||
/>
|
/>
|
||||||
{/if}
|
{/if}
|
||||||
|
@ -131,6 +131,7 @@
|
|||||||
config={preference?.config ?? viewlet.config}
|
config={preference?.config ?? viewlet.config}
|
||||||
options={viewlet.options}
|
options={viewlet.options}
|
||||||
query={resultQuery}
|
query={resultQuery}
|
||||||
|
totalQuery={baseQuery}
|
||||||
showNotification
|
showNotification
|
||||||
/>
|
/>
|
||||||
{/if}
|
{/if}
|
||||||
|
@ -244,6 +244,7 @@
|
|||||||
query={{
|
query={{
|
||||||
...resultQuery
|
...resultQuery
|
||||||
}}
|
}}
|
||||||
|
totalQuery={{}}
|
||||||
showNotification
|
showNotification
|
||||||
/>
|
/>
|
||||||
{/if}
|
{/if}
|
||||||
|
@ -189,6 +189,7 @@
|
|||||||
...resultQuery,
|
...resultQuery,
|
||||||
archived
|
archived
|
||||||
}}
|
}}
|
||||||
|
totalQuery={{}}
|
||||||
showNotification
|
showNotification
|
||||||
/>
|
/>
|
||||||
{/if}
|
{/if}
|
||||||
|
@ -384,15 +384,21 @@
|
|||||||
<span class="select-text">
|
<span class="select-text">
|
||||||
<Label label={view.string.Total} params={{ total: gtotal }} />
|
<Label label={view.string.Total} params={{ total: gtotal }} />
|
||||||
</span>
|
</span>
|
||||||
{#if objects.length > 0 && objects.length < gtotal}
|
|
||||||
<!-- svelte-ignore a11y-click-events-have-key-events -->
|
{#if objects.length > 0 && (total !== gtotal || objects.length < total)}
|
||||||
<span class="select-text ml-2">
|
<span class="select-text ml-2">
|
||||||
<Label
|
<Label
|
||||||
label={view.string.Shown}
|
label={view.string.Shown}
|
||||||
params={{ total: objects.length === total ? -1 : total, len: objects.length }}
|
params={{
|
||||||
|
total: objects.length === total || total === gtotal ? -1 : total,
|
||||||
|
len: objects.length
|
||||||
|
}}
|
||||||
/>
|
/>
|
||||||
</span>
|
</span>
|
||||||
|
{/if}
|
||||||
|
|
||||||
|
{#if objects.length > 0 && objects.length < total}
|
||||||
|
<!-- svelte-ignore a11y-click-events-have-key-events -->
|
||||||
<Button
|
<Button
|
||||||
label={ui.string.ShowMore}
|
label={ui.string.ShowMore}
|
||||||
kind={'ghost'}
|
kind={'ghost'}
|
||||||
|
Loading…
Reference in New Issue
Block a user