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

Fix link app did not start with preferred app, implement placeholder

Browse Source
This commit is contained in:
nathan 2022-07-07 09:54:18 -06:00
parent 7a4193073b
commit e3b095dae7
2 changed files with 40 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
api/js/etemplate/Et2Link/Et2LinkAppSelect.ts
View File

@ -108,10 +108,23 @@ export class Et2LinkAppSelect extends SlotMixin(Et2Select)
// Set icon
this.querySelector("[slot='prefix']").setAttribute("src", this.value + "/navbar");
if(!this.value)
{
// use preference
let appname = "";
if(typeof this.value != 'undefined' && this.parentNode && this.parentNode.to_app)
{
appname = this.parentNode.to_app;
}
this.value = this.egw().preference('link_app', appname || this.egw().app_name());
}
// Register to
this.addEventListener("change", this._handleChange);
if (this.__only_app) this.style.display = 'none';
if(this.__only_app)
{
this.style.display = 'none';
}
}
disconnectedCallback()
@ -151,9 +164,9 @@ export class Et2LinkAppSelect extends SlotMixin(Et2Select)
return this.__application_list;
}
get value()
get value() : string
{
return this.only_app ? this.only_app : super.value;
return this.only_app ? this.only_app : <string>super.value;
}
set value(new_value)

27
api/js/etemplate/Et2Link/Et2LinkEntry.ts
View File

@ -63,7 +63,12 @@ export class Et2LinkEntry extends Et2InputWidget(FormControlMixin(ValidateMixin(
/**
* Callback when user selects an option. Must return true, or false to abort normal action.
*/
select: {type: Function}
select: {type: Function},
/**
* Displayed in the search / select when no value is selected
*/
placeholder: {type: String}
}
}
@ -174,6 +179,10 @@ export class Et2LinkEntry extends Et2InputWidget(FormControlMixin(ValidateMixin(
{
this.app = app;
}
if(this._appNode)
{
this._appNode.only_app = app;
}
}
get only_app()
@ -205,6 +214,15 @@ export class Et2LinkEntry extends Et2InputWidget(FormControlMixin(ValidateMixin(
return this.querySelector("[slot='select']");
}
get placeholder() : string
{
return this._searchNode?.placeholder;
}
set placeholder(new_value)
{
this._searchNode.placeholder = new_value;
}
protected _bindListeners()
{
@ -244,6 +262,7 @@ export class Et2LinkEntry extends Et2InputWidget(FormControlMixin(ValidateMixin(
protected _handleEntrySelect(event)
{
this.classList.add("hideApp");
this.dispatchEvent(new Event("change"));
}
@ -256,6 +275,8 @@ export class Et2LinkEntry extends Et2InputWidget(FormControlMixin(ValidateMixin(
{
this.classList.remove("hideApp")
this._searchNode.focus();
this.dispatchEvent(new Event("change"));
}
@ -290,7 +311,7 @@ export class Et2LinkEntry extends Et2InputWidget(FormControlMixin(ValidateMixin(
{
if(this.only_app)
{
return this._searchNode?.value;
return <string>this._searchNode?.value;
}
return this._searchNode ? <LinkInfo>{
id: this._searchNode.value,
@ -301,7 +322,7 @@ export class Et2LinkEntry extends Et2InputWidget(FormControlMixin(ValidateMixin(
set value(val : LinkInfo | string | number)
{
let value : LinkInfo = {app: this.only_app, id: ""};
let value : LinkInfo = {app: this.only_app || this.app, id: ""};
if(typeof val === 'string' && val.length > 0)
{