extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-02-16 18:31:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

cleanup tree and make Leaf Selection possible

Browse Source
This commit is contained in:
milan 2024-08-21 20:45:38 +02:00
parent c9a5edb0bd
commit 888f859097
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
api/js/etemplate/Et2Tree/Et2Tree.ts
View File

@ -20,12 +20,13 @@ export type TreeItemData = SelectOption & {
// Has children, but they may not be provided in item
child: Boolean | 1,
data?: Object,//{sieve:true,...} or {acl:true} or other
id: string,
//this is coming from SelectOption
value: string,
im0: String,
im1: String,
im2: String,
// Child items
item: TreeItemData[],
children: TreeItemData[],
checked?: Boolean,
nocheckbox: number | Boolean,
open: 0 | 1,
@ -96,6 +97,8 @@ export class Et2Tree extends Et2WidgetWithSelectMixin(LitElement) implements Fin
openIcon: String;
@property({type: Function})
onclick;// description: "JS code which gets executed when clicks on text of a node"
@property({type:String})
selection = "single"
//onselect and oncheck only appear in multiselectTree
@ -413,7 +416,7 @@ export class Et2Tree extends Et2WidgetWithSelectMixin(LitElement) implements Fin
/** Sets focus on the control. */
focus(options? : FocusOptions)
{
this._tree.focus();
this._tree?.focus();
}
/** Removes focus from the control. */
@ -892,7 +895,7 @@ export class Et2Tree extends Et2WidgetWithSelectMixin(LitElement) implements Fin
<sl-tree-item
part="item"
exportparts="checkbox, label, item:item-item"
id=${selectOption.id}
id=${value}
title=${selectOption.tooltip || nothing}
class=${selectOption.class || nothing}
?selected=${typeof this.value == "string" && this.value == value || Array.isArray(this.value) && this.value.includes(value)}
@ -952,7 +955,7 @@ export class Et2Tree extends Et2WidgetWithSelectMixin(LitElement) implements Fin
${this.styleTemplate()}
<sl-tree
part="tree"
.selection=${/* implement unlinked multiple: this.multiple ? "multiple" :*/ "single"}
.selection=${this.leafOnly?"leaf":"single"}
@sl-selection-change=${
(event: any) => {
this._previousOption = this._currentOption ?? (this.value.length ? this.getNode(this.value[0]) : null);

8
api/js/etemplate/Et2Tree/Et2TreeDropdown.ts
View File

@ -80,7 +80,7 @@ export class Et2TreeDropdown extends SearchMixin<Constructor<any> & Et2InputWidg
*/
@property({type: Object}) actions = {};
@state() currentTag : Et2Tag;
@state() currentTag: Et2Tag;
// We show search results in the same dropdown
@state() treeOrSearch : "tree" | "search" = "tree";
@ -168,6 +168,8 @@ export class Et2TreeDropdown extends SearchMixin<Constructor<any> & Et2InputWidg
);
}
/** Sets focus on the control. */
focus(options? : FocusOptions)
{
@ -446,11 +448,11 @@ export class Et2TreeDropdown extends SearchMixin<Constructor<any> & Et2InputWidg
// For single value, we can just grab selected from the tree. For multiple, we need to manage it.
if(!this.multiple)
{
this.value = event?.detail?.selection?.map(i => i.id) ?? []
this.value = event?.detail?.selection?.map(i => i.id || i.value) ?? []
}
else
{
const id = event?.detail?.selection?.map(i => i.id).pop();
const id = event?.detail?.selection?.map(i => i.id || i.value).pop();
if(id && !this.value.includes(id))
{
// Copy so LitElement knows it changed