diff --git a/packages/ui/src/components/EditBox.svelte b/packages/ui/src/components/EditBox.svelte index f80ac3f02fa..f47993383ef 100644 --- a/packages/ui/src/components/EditBox.svelte +++ b/packages/ui/src/components/EditBox.svelte @@ -66,11 +66,9 @@ if (minValue !== undefined && maxValue !== undefined && maxValue < minValue) return if (minValue !== undefined && val < minValue) value = minValue if (maxValue !== undefined && val > maxValue) value = maxValue - dispatch('change') + dispatch('value', value) } - $: setValue(value, maxValue, minValue) - $: translateCB(placeholder, placeholderParam ?? {}, $themeStore.language, (res) => { phTranslate = res }) @@ -196,11 +194,17 @@ type="number" bind:value placeholder={phTranslate} + min={minValue} + max={maxValue} on:input={handleInput} - on:change + on:change={() => { + setValue(value, maxValue, minValue) + dispatch('change', value) + }} on:keydown on:keypress on:blur={() => { + setValue(value, maxValue, minValue) dispatch('blur', value) }} /> diff --git a/plugins/process-resources/src/components/ProcessAttribute.svelte b/plugins/process-resources/src/components/ProcessAttribute.svelte index 057f282e186..b4641f42826 100644 --- a/plugins/process-resources/src/components/ProcessAttribute.svelte +++ b/plugins/process-resources/src/components/ProcessAttribute.svelte @@ -86,7 +86,6 @@ {#if contextValue} + + +{#if presenter !== undefined} + +{/if} diff --git a/plugins/process-resources/src/components/attributeEditors/ConstValuePopup.svelte b/plugins/process-resources/src/components/attributeEditors/ConstValuePopup.svelte new file mode 100644 index 00000000000..3a10748d345 --- /dev/null +++ b/plugins/process-resources/src/components/attributeEditors/ConstValuePopup.svelte @@ -0,0 +1,58 @@ + + + + + {value} + {#if editor != null} + + {/if} + diff --git a/plugins/process-resources/src/components/attributeEditors/ContextSelectorPopup.svelte b/plugins/process-resources/src/components/attributeEditors/ContextSelectorPopup.svelte index 2ca296f3388..7eeef92ef77 100644 --- a/plugins/process-resources/src/components/attributeEditors/ContextSelectorPopup.svelte +++ b/plugins/process-resources/src/components/attributeEditors/ContextSelectorPopup.svelte @@ -24,11 +24,12 @@ RelatedContext, SelectedContext } from '@hcengineering/process' - import { Label, resizeObserver, Scroller, Submenu } from '@hcengineering/ui' + import { eventToHTMLElement, Label, resizeObserver, Scroller, showPopup, Submenu } from '@hcengineering/ui' import { createEventDispatcher } from 'svelte' import plugin from '../../plugin' import { generateContextId, getRelationObjectReduceFunc, getValueReduceFunc } from '../../utils' import ExecutionContextPresenter from './ExecutionContextPresenter.svelte' + import ConstValuePopup from './ConstValuePopup.svelte' export let process: Process export let masterTag: Ref @@ -44,11 +45,6 @@ dispatch('close') } - function onCustom (): void { - onSelect(null) - dispatch('close') - } - function onAttribute (val: AnyAttribute): void { const valueFunc = getValueReduceFunc(val, attribute) onClick({ @@ -108,6 +104,19 @@ }) dispatch('close') } + + function onConst (e: MouseEvent): void { + showPopup(ConstValuePopup, { attribute }, eventToHTMLElement(e), (res) => { + if (res != null) { + onSelect({ + type: 'const', + key: attribute.name, + value: res + }) + } + dispatch('close') + }) + }
dispatch('changeContent')}> @@ -241,13 +250,7 @@