mirror of
https://github.com/hcengineering/platform.git
synced 2025-04-13 11:50:56 +00:00
Allow to define table columns order (#1959)
Signed-off-by: Denis Bykhov <80476319+BykhovDenis@users.noreply.github.com>
This commit is contained in:
Denis Bykhov
GitHub
parent
732fa0100b
commit
47f3880392
@ -6,6 +6,7 @@ Platform:
|
||||
|
||||
- Fix first filter disappear
|
||||
- Adjust label editors design
|
||||
- Allow to define table columns order
|
||||
- Fix skills/labels selection and show real usage counter
|
||||
|
||||
## 0.6.22
|
||||
|
||||
315
packages/ui/src/components/ToggleButton.svelte
Normal file
315
packages/ui/src/components/ToggleButton.svelte
Normal file
@ -0,0 +1,315 @@
|
||||
<!--
|
||||
// Copyright © 2022 Anticrm Platform Contributors.
|
||||
//
|
||||
// Licensed under the Eclipse Public License, Version 2.0 (the "License");
|
||||
// you may not use this file except in compliance with the License. You may
|
||||
// obtain a copy of the License at https://www.eclipse.org/legal/epl-2.0
|
||||
//
|
||||
// Unless required by applicable law or agreed to in writing, software
|
||||
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
//
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
-->
|
||||
<script lang="ts">
|
||||
import type { Asset, IntlString } from '@anticrm/platform'
|
||||
import { createEventDispatcher, onMount } from 'svelte'
|
||||
import { registerFocus } from '../focus'
|
||||
import type { AnySvelteComponent, ButtonKind, ButtonSize } from '../types'
|
||||
import Icon from './Icon.svelte'
|
||||
import Label from './Label.svelte'
|
||||
|
||||
export let value: boolean
|
||||
export let label: IntlString | undefined = undefined
|
||||
export let labelParams: Record<string, any> = {}
|
||||
export let kind: ButtonKind = 'secondary'
|
||||
export let size: ButtonSize = 'medium'
|
||||
export let icon: Asset | AnySvelteComponent | undefined = undefined
|
||||
export let justify: 'left' | 'center' = 'center'
|
||||
export let width: string | undefined = undefined
|
||||
export let resetIconSize: boolean = false
|
||||
export let highlight: boolean = false
|
||||
export let selected: boolean = false
|
||||
export let focus: boolean = false
|
||||
export let borderStyle: 'solid' | 'dashed' = 'solid'
|
||||
export let id: string | undefined = undefined
|
||||
export let input: HTMLButtonElement | undefined = undefined
|
||||
|
||||
$: iconOnly = label === undefined && $$slots.content === undefined
|
||||
|
||||
onMount(() => {
|
||||
if (focus && input) {
|
||||
input.focus()
|
||||
focus = false
|
||||
}
|
||||
})
|
||||
|
||||
export let focusIndex = -1
|
||||
const { idx, focusManager } = registerFocus(focusIndex, {
|
||||
focus: () => {
|
||||
input?.focus()
|
||||
return input != null
|
||||
},
|
||||
isFocus: () => document.activeElement === input
|
||||
})
|
||||
|
||||
$: if (idx !== -1 && focusManager) {
|
||||
focusManager.updateFocus(idx, focusIndex)
|
||||
}
|
||||
|
||||
const updateFocus = () => {
|
||||
focusManager?.setFocus(idx)
|
||||
}
|
||||
$: if (input != null) {
|
||||
input.addEventListener('focus', updateFocus, { once: true })
|
||||
}
|
||||
|
||||
const dispatch = createEventDispatcher()
|
||||
</script>
|
||||
|
||||
<button
|
||||
bind:this={input}
|
||||
class="button {kind} {size} jf-{justify}"
|
||||
class:only-icon={iconOnly}
|
||||
class:border-solid={borderStyle === 'solid'}
|
||||
class:border-dashed={borderStyle === 'dashed'}
|
||||
class:highlight
|
||||
class:selected
|
||||
class:disabled={!value}
|
||||
style={width ? 'width: ' + width : ''}
|
||||
type={kind === 'primary' ? 'submit' : 'button'}
|
||||
on:click={() => {
|
||||
value = !value
|
||||
dispatch('change', value)
|
||||
}}
|
||||
on:focus
|
||||
on:blur
|
||||
on:mousemove
|
||||
on:mouseleave
|
||||
{id}
|
||||
>
|
||||
{#if icon}
|
||||
<div
|
||||
class="btn-icon pointer-events-none"
|
||||
class:mr-1={!iconOnly && kind === 'no-border'}
|
||||
class:mr-2={!iconOnly && kind !== 'no-border'}
|
||||
class:resetIconSize
|
||||
>
|
||||
<Icon bind:icon size={'small'} />
|
||||
</div>
|
||||
{/if}
|
||||
<span class="overflow-label pointer-events-none">
|
||||
{#if label}
|
||||
<Label {label} params={labelParams} />
|
||||
{:else if $$slots.content}
|
||||
<slot name="content" />
|
||||
{/if}
|
||||
</span>
|
||||
</button>
|
||||
|
||||
<style lang="scss">
|
||||
.small {
|
||||
height: 1.5rem;
|
||||
font-size: 0.75rem;
|
||||
line-height: 0.75rem;
|
||||
&.only-icon {
|
||||
width: 1.5rem;
|
||||
}
|
||||
}
|
||||
.medium {
|
||||
height: 1.75rem;
|
||||
&.only-icon {
|
||||
width: 1.75rem;
|
||||
}
|
||||
}
|
||||
.large {
|
||||
height: 2rem;
|
||||
&.only-icon {
|
||||
width: 2rem;
|
||||
}
|
||||
}
|
||||
.x-large {
|
||||
height: 2.75rem;
|
||||
&.only-icon {
|
||||
width: 2.75rem;
|
||||
}
|
||||
}
|
||||
|
||||
.button {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
flex-shrink: 0;
|
||||
padding: 0 0.5rem;
|
||||
font-weight: 500;
|
||||
min-width: 1.5rem;
|
||||
white-space: nowrap;
|
||||
color: var(--accent-color);
|
||||
background-color: transparent;
|
||||
border: 1px solid transparent;
|
||||
transition-property: border, background-color, color, box-shadow;
|
||||
transition-duration: 0.15s;
|
||||
|
||||
&.border-solid {
|
||||
border-style: solid;
|
||||
}
|
||||
|
||||
&.border-dashed {
|
||||
border-style: dashed;
|
||||
}
|
||||
|
||||
.btn-icon {
|
||||
color: var(--content-color);
|
||||
transition: color 0.15s;
|
||||
pointer-events: none;
|
||||
}
|
||||
&.highlight {
|
||||
box-shadow: inset 0 0 1px 1px var(--primary-bg-color);
|
||||
|
||||
&:hover {
|
||||
box-shadow: inset 0 0 1px 1px var(--primary-bg-hover);
|
||||
}
|
||||
}
|
||||
&:hover {
|
||||
color: var(--accent-color);
|
||||
transition-duration: 0;
|
||||
|
||||
.btn-icon {
|
||||
color: var(--caption-color);
|
||||
}
|
||||
}
|
||||
&:focus {
|
||||
border-color: var(--primary-edit-border-color) !important;
|
||||
}
|
||||
&.disabled {
|
||||
color: rgb(var(--caption-color) / 40%);
|
||||
|
||||
.btn-icon {
|
||||
opacity: 0.5;
|
||||
}
|
||||
}
|
||||
|
||||
&.jf-left {
|
||||
justify-content: flex-start;
|
||||
}
|
||||
&.jf-center {
|
||||
justify-content: center;
|
||||
}
|
||||
&.only-icon {
|
||||
padding: 0;
|
||||
}
|
||||
|
||||
&.secondary {
|
||||
background-color: var(--button-bg-color);
|
||||
border-color: var(--button-border-color);
|
||||
box-shadow: var(--button-shadow);
|
||||
|
||||
&:hover {
|
||||
background-color: var(--button-bg-hover);
|
||||
border-color: var(--button-border-hover);
|
||||
}
|
||||
&.disabled {
|
||||
background-color: var(--button-disabled-color);
|
||||
border-color: transparent;
|
||||
}
|
||||
|
||||
&.selected {
|
||||
background-color: var(--button-bg-hover);
|
||||
border-color: var(--button-border-hover);
|
||||
color: var(--caption-color);
|
||||
|
||||
.btn-icon {
|
||||
color: var(--accent-color);
|
||||
}
|
||||
}
|
||||
}
|
||||
&.no-border {
|
||||
font-weight: 400;
|
||||
color: var(--accent-color);
|
||||
background-color: var(--noborder-bg-color);
|
||||
box-shadow: var(--button-shadow);
|
||||
|
||||
&:hover {
|
||||
color: var(--caption-color);
|
||||
background-color: var(--noborder-bg-hover);
|
||||
|
||||
.btn-icon {
|
||||
color: var(--caption-color);
|
||||
}
|
||||
}
|
||||
&.disabled {
|
||||
color: var(--content-color);
|
||||
background-color: var(--button-disabled-color);
|
||||
cursor: default;
|
||||
&:hover {
|
||||
color: var(--content-color);
|
||||
.btn-icon {
|
||||
color: var(--content-color);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
&.transparent:hover,
|
||||
&.transparent.selected {
|
||||
background-color: var(--button-bg-hover);
|
||||
}
|
||||
&.link {
|
||||
padding: 0 0.875rem;
|
||||
&:hover {
|
||||
color: var(--caption-color);
|
||||
background-color: var(--body-color);
|
||||
border-color: var(--divider-color);
|
||||
.btn-icon {
|
||||
color: var(--content-color);
|
||||
}
|
||||
}
|
||||
}
|
||||
&.link-bordered {
|
||||
padding: 0 0.375rem;
|
||||
color: var(--accent-color);
|
||||
border-color: var(--button-border-color);
|
||||
&:hover {
|
||||
color: var(--accent-color);
|
||||
border-color: var(--button-border-hover);
|
||||
.btn-icon {
|
||||
color: var(--accent-color);
|
||||
}
|
||||
}
|
||||
}
|
||||
&.primary {
|
||||
padding: 0 1rem;
|
||||
color: var(--white-color);
|
||||
background-color: var(--primary-bg-color);
|
||||
border-color: var(--primary-bg-color);
|
||||
box-shadow: var(--primary-shadow);
|
||||
|
||||
.btn-icon {
|
||||
color: var(--white-color);
|
||||
}
|
||||
&:hover {
|
||||
background-color: var(--primary-bg-hover);
|
||||
}
|
||||
&.disabled {
|
||||
background-color: #5e6ad255;
|
||||
border-color: #5e6ad255;
|
||||
}
|
||||
}
|
||||
|
||||
&.dangerous {
|
||||
color: var(--white-color);
|
||||
background-color: var(--dangerous-bg-color);
|
||||
border-color: var(--dangerous-bg-color);
|
||||
|
||||
&:hover {
|
||||
background-color: var(--dangerous-bg-hover);
|
||||
}
|
||||
&:focus {
|
||||
box-shadow: var(--dangerous-shadow);
|
||||
}
|
||||
}
|
||||
|
||||
.resetIconSize {
|
||||
font-size: 16px;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
@ -138,6 +138,7 @@ export { default as WeekCalendar } from './components/calendar/WeekCalendar.svel
|
||||
|
||||
export { default as FocusHandler } from './components/FocusHandler.svelte'
|
||||
export { default as ListView } from './components/ListView.svelte'
|
||||
export { default as ToggleButton } from './components/ToggleButton.svelte'
|
||||
|
||||
export * from './types'
|
||||
export * from './location'
|
||||
|
||||
@ -16,7 +16,7 @@
|
||||
import presentation, { Card, createQuery, getAttributePresenterClass, getClient } from '@anticrm/presentation'
|
||||
import { BuildModelKey, Viewlet, ViewletPreference } from '@anticrm/view'
|
||||
import core, { ArrOf, Class, Doc, Lookup, Ref, Type } from '@anticrm/core'
|
||||
import { Button, Grid, MiniToggle } from '@anticrm/ui'
|
||||
import { Button, ToggleButton } from '@anticrm/ui'
|
||||
import { createEventDispatcher } from 'svelte'
|
||||
import { IntlString } from '@anticrm/platform'
|
||||
import { buildConfigLookup, getLookupClass, getLookupLabel, getLookupProperty } from '../utils'
|
||||
@ -142,7 +142,7 @@
|
||||
}
|
||||
}
|
||||
|
||||
async function restoreDefault (): Promise<void> {
|
||||
function restoreDefault (): void {
|
||||
attributes = getConfig(viewlet, undefined)
|
||||
}
|
||||
|
||||
@ -162,8 +162,46 @@
|
||||
for (const key of result) {
|
||||
key.enabled = preference.config.findIndex((p) => deepEqual(p, key.value)) !== -1
|
||||
}
|
||||
result.sort((a, b) => {
|
||||
if (a.enabled !== b.enabled) {
|
||||
return a.enabled ? -1 : 1
|
||||
}
|
||||
return (
|
||||
preference.config.findIndex((p) => deepEqual(p, a.value)) -
|
||||
preference.config.findIndex((p) => deepEqual(p, b.value))
|
||||
)
|
||||
})
|
||||
return result
|
||||
}
|
||||
|
||||
const elements: HTMLElement[] = []
|
||||
let selected: number | undefined
|
||||
|
||||
function dragswap (ev: MouseEvent, i: number): boolean {
|
||||
const s = selected as number
|
||||
if (i < s) {
|
||||
if (elements[i].offsetTop !== elements[s].offsetTop) {
|
||||
return ev.offsetY < elements[i].offsetHeight / 2
|
||||
} else {
|
||||
return ev.offsetX < elements[i].offsetWidth / 2
|
||||
}
|
||||
} else if (i > s) {
|
||||
if (elements[i].offsetTop !== elements[s].offsetTop) {
|
||||
return ev.offsetY > elements[i].offsetHeight / 2
|
||||
} else {
|
||||
return ev.offsetX > elements[i].offsetWidth / 2
|
||||
}
|
||||
}
|
||||
return false
|
||||
}
|
||||
|
||||
function dragover (ev: MouseEvent, i: number) {
|
||||
const s = selected as number
|
||||
if (dragswap(ev, i)) {
|
||||
;[attributes[i], attributes[s]] = [attributes[s], attributes[i]]
|
||||
selected = i
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<Card
|
||||
@ -175,12 +213,28 @@
|
||||
dispatch('close')
|
||||
}}
|
||||
>
|
||||
<Grid column={3}>
|
||||
{#each attributes as attribute}
|
||||
<MiniToggle label={attribute.label} bind:on={attribute.enabled} />
|
||||
<div class="flex flex-wrap flex-row">
|
||||
{#each attributes as attribute, i}
|
||||
<div
|
||||
class="mr-2 mb-2"
|
||||
bind:this={elements[i]}
|
||||
draggable={true}
|
||||
on:dragover|preventDefault={(ev) => {
|
||||
dragover(ev, i)
|
||||
}}
|
||||
on:drop|preventDefault
|
||||
on:dragstart={() => {
|
||||
selected = i
|
||||
}}
|
||||
on:dragend={() => {
|
||||
selected = undefined
|
||||
}}
|
||||
>
|
||||
<ToggleButton label={attribute.label} bind:value={attribute.enabled} />
|
||||
</div>
|
||||
{/each}
|
||||
</Grid>
|
||||
</div>
|
||||
<svelte:fragment slot="footer">
|
||||
<Button label={view.string.RestoreDefaults} on:click={() => restoreDefault()} />
|
||||
<Button label={view.string.RestoreDefaults} on:click={restoreDefault} />
|
||||
</svelte:fragment>
|
||||
</Card>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user