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

Framework WIP:

Browse Source 
- better non-application tab initial loading
This commit is contained in:
nathan 2024-06-10 17:33:05 -06:00
parent 2da2ad2faa
commit dddf1db7bc
1 changed files with 37 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
kdots/js/EgwFramework.ts
View File

@ -268,10 +268,21 @@ export class EgwFramework extends LitElement
// Wait until new tab is there to activate it // Wait until new tab is there to activate it
if(active || app.active) if(active || app.active)
{ {
this.updateComplete.then(() => // Wait for egw
this.getEgwComplete().then(() =>
{ {
this.tabs.show(appname); // Wait for redraw after getEgwComplete promise
}) this.updateComplete.then(() =>
{
// Tabs present
this.updateComplete.then(() =>
{
this.querySelectorAll("egw-app[active]").forEach(n => n.removeAttribute("active"));
this.tabs.show(appname);
});
});
});
} }
return appComponent; return appComponent;
@ -513,7 +524,11 @@ export class EgwFramework extends LitElement
appComponent.setAttribute("active", ""); appComponent.setAttribute("active", "");
// Update the list on the server // Update the list on the server
this.updateTabs(event.target.activeTab); const tabGroup : SlTabGroup = this.shadowRoot.querySelector("sl-tab-group.egw_fw__open_applications");
tabGroup.updateComplete.then(() =>
{
this.updateTabs(appComponent);
});
} }
/** /**
@ -533,7 +548,10 @@ export class EgwFramework extends LitElement
else else
{ {
// Show will update, but closing in the background we call directly // Show will update, but closing in the background we call directly
this.updateTabs(tabGroup.querySelector("sl-tab[active]")); tabGroup.updateComplete.then(() =>
{
this.updateTabs(tabGroup.querySelector("sl-tab[active]"));
});
} }
// Remove the tab + panel // Remove the tab + panel
@ -554,6 +572,19 @@ export class EgwFramework extends LitElement
//Send the current tab list to the server //Send the current tab list to the server
let data = this.assembleTabList(activeTab); let data = this.assembleTabList(activeTab);
// Update session tabs
let tabs = {};
Object.keys(this.tabApps).forEach((t) =>
{
if(data.some(d => d.appName == t))
{
tabs[t] = this.tabApps[t];
tabs[t].active = t == activeTab.id;
}
});
this.tabApps = tabs;
//Serialize the tab list and check whether it really has changed since the last //Serialize the tab list and check whether it really has changed since the last
//submit //submit
var serialized = egw.jsonEncode(data); var serialized = egw.jsonEncode(data);
@ -573,7 +604,7 @@ export class EgwFramework extends LitElement
let appList = [] let appList = []
Array.from(this.shadowRoot.querySelectorAll("sl-tab-group.egw_fw__open_applications sl-tab")).forEach((tab : SlTab) => Array.from(this.shadowRoot.querySelectorAll("sl-tab-group.egw_fw__open_applications sl-tab")).forEach((tab : SlTab) =>
{ {
appList.push({appName: tab.panel, active: activeTab.panel == tab.panel}) appList.push({appName: tab.panel, active: activeTab.id == tab.panel})
}); });
return appList; return appList;
} }