extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-28 02:43:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Et2Select: Fix email (& other values with spaces) did not show initial value

Browse Source
This commit is contained in:
nathan 2023-11-22 09:21:03 -07:00
parent c7764ebebe
commit 76250398b0
1 changed files with 15 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
api/js/etemplate/Et2Select/Et2Select.ts
View File

@ -425,7 +425,7 @@ export class Et2Select extends Et2WithSearchMixin(Et2WidgetWithSelect)
} }
if(this.select) if(this.select)
{ {
this.select.value = this.__value; this.select.value = this.shoelaceValue;
} }
this.requestUpdate("value", oldValue); this.requestUpdate("value", oldValue);
} }
@ -515,19 +515,6 @@ export class Et2Select extends Et2WithSearchMixin(Et2WidgetWithSelect)
} }
} }
update(changedProperties : PropertyValues)
{
super.update(changedProperties);
if(changedProperties.has("select_options") && changedProperties.has("value"))
{
// Force select to stay in sync, avoids value not shown when select options arrive late
if(this.select && this.value !== null && typeof this.value !== "undefined")
{
this.select.value = this.value;
}
}
}
/** /**
* Tag used for rendering tags when multiple=true * Tag used for rendering tags when multiple=true
* Used for creating, finding & filtering options. * Used for creating, finding & filtering options.
@ -548,27 +535,6 @@ export class Et2Select extends Et2WithSearchMixin(Et2WidgetWithSelect)
this.hide(); this.hide();
} }
/* Parent should be fine now?
private handleTagRemove(event : CustomEvent, option)
{
event.stopPropagation();
if(!this.disabled)
{
option.selected = false;
let index = this.value.indexOf(option.value);
if(index > -1)
{
this.value.splice(index, 1);
}
this.dispatchEvent(new CustomEvent('sl-input'));
this.dispatchEvent(new CustomEvent('sl-change'));
this.validate();
}
}
*/
/** /**
* Apply the user preference to close the dropdown if an option is clicked, even if multiple=true. * Apply the user preference to close the dropdown if an option is clicked, even if multiple=true.
* The default (from SlSelect) leaves the dropdown open for multiple=true * The default (from SlSelect) leaves the dropdown open for multiple=true
@ -829,11 +795,22 @@ export class Et2Select extends Et2WithSearchMixin(Et2WidgetWithSelect)
return typeof super._extraTemplate == "function" ? super._extraTemplate() : nothing; return typeof super._extraTemplate == "function" ? super._extraTemplate() : nothing;
} }
/**
* Shoelace select uses space as multiple separator, so our values cannot have a space in them.
* We replace spaces with "___" before passing the value to SlSelect
*
* @protected
*/
protected get shoelaceValue() : string | string[]
{
return Array.isArray(this.value) ?
this.value.map(v => { return v.replaceAll(" ", "___"); }) :
(typeof this.value == "string" ? this.value.replaceAll(" ", "___") : "");
}
public render() public render()
{ {
const value = Array.isArray(this.value) ? const value = this.shoelaceValue;
this.value.map(v => { return v.replaceAll(" ", "___"); }) :
(typeof this.value == "string" ? this.value.replaceAll(" ", "___") : "");
let icon : TemplateResult | typeof nothing = nothing; let icon : TemplateResult | typeof nothing = nothing;
if(!this.multiple) if(!this.multiple)