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

Et2DateDuration: Fix disabled was not disabling inputs, reflect change event

Browse Source
This commit is contained in:
nathan 2024-09-12 14:13:47 -06:00
parent b7160e6eaf
commit 2cfab31d19
2 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
api/js/etemplate/Et2Date/Et2Date.ts
View File

@ -1036,7 +1036,10 @@ export class Et2Date extends Et2InputWidget(LitFlatpickr)
// This element gets hidden and used for value, but copied by flatpickr and used for input
return html`
<slot name="prefix"></slot>
<et2-textbox type="text" placeholder=${this.placeholder} ?required=${this.required}>
<et2-textbox type="text" placeholder=${this.placeholder}
?required=${this.required}
?disabled=${this.disabled}
>
${this._incrementButtonTemplate()}
</et2-textbox>
<slot name="sufix"></slot>

25
api/js/etemplate/Et2Date/Et2DateRange.ts
View File

@ -54,6 +54,14 @@ export class Et2DateRange extends Et2InputWidget(LitElement)
super();
}
_handleChange(event)
{
this.updateComplete.then(() =>
{
this.dispatchEvent(new Event("change", {bubbles: true}));
});
}
render()
{
const hasLabel = this.label ? true : false
@ -74,7 +82,10 @@ export class Et2DateRange extends Et2InputWidget(LitElement)
<slot name="label">${this.label}</slot>
</label>
</div>
<div class="form-control-input" part="form-control-input">${this._inputGroupTemplate()}</div>
<div class="form-control-input" part="form-control-input"
>
${this._inputGroupTemplate()}
</div>
<slot
name="help-text"
part="form-control-help-text"
@ -112,7 +123,9 @@ export class Et2DateRange extends Et2InputWidget(LitElement)
?required=${this.required}
placeholder=${ifDefined(this.placeholder)}
.emptyLabel=${ifDefined(this.emptyLabel)}
.select_options=${Et2DateRange.relative_dates}></et2-select>`;
.select_options=${Et2DateRange.relative_dates}
@change=${this._handleChange}
></et2-select>`;
}
/**
@ -131,6 +144,7 @@ export class Et2DateRange extends Et2InputWidget(LitElement)
?required=${this.required}
placeholder=${ifDefined(this.placeholder || this.egw().lang("From"))}
defaultDate=${ifDefined(this.value?.from)}
@change=${this._handleChange}
></et2-date>
<et2-date
name="to"
@ -139,6 +153,7 @@ export class Et2DateRange extends Et2InputWidget(LitElement)
?required=${this.required}
placeholder=${ifDefined(this.placeholder || this.egw().lang("To"))}
value=${ifDefined(this.value?.to)}
@change=${this._handleChange}
></et2-date>
`;
}
@ -193,14 +208,14 @@ export class Et2DateRange extends Et2InputWidget(LitElement)
new_value = Et2DateRange.relativeToAbsolute(new_value);
}
if(this.fromElement._instance)
if(this.fromElement._instance?.config?.mode == "range")
{
this.fromElement._instance.setDate([new_value?.from, new_value?.to], true);
}
else
{
this.fromElement.value = new_value?.from.toJSON() || "";
this.toElement.value = new_value?.to.toJSON() || "";
this.fromElement.value = new_value?.from?.toJSON() || "";
this.toElement.value = new_value?.to?.toJSON() || "";
}
}
}