blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-06-01 20:29:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(Moodle Events DependencyInjection): resolves lazy loading bug

Browse Source
This commit is contained in:
SimonGschnell
2025-06-06 09:57:59 +02:00
parent e89233d6ac
commit 6d7f8522f3
2 changed files with 33 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/js/apps/Dashboard/Fhc.js
+4 -4
View File
@@ -293,16 +293,16 @@ const app = Vue.createApp({
.then(data => {
for (let rendertype of Object.keys(data)) {
let modalTitel = Vue.defineAsyncComponent(() => import(data[rendertype].modalTitel));
let modalContent = Vue.defineAsyncComponent(() => import(data[rendertype].modalContent));
let calendarEvent = Vue.defineAsyncComponent(() => import(data[rendertype].calendarEvent));
let modalTitle = Vue.markRaw(Vue.defineAsyncComponent(() => import(data[rendertype].modalTitle)));
let modalContent = Vue.markRaw(Vue.defineAsyncComponent(() => import(data[rendertype].modalContent)));
let calendarEvent = Vue.markRaw(Vue.defineAsyncComponent(() => import(data[rendertype].calendarEvent)));
if(this.renderers === null) {
this.renderers = {};
}
if (!this.renderers[rendertype]) {
this.renderers[rendertype] = {}
}
this.renderers[rendertype].modalTitel = modalTitel;
this.renderers[rendertype].modalTitle = modalTitle;
this.renderers[rendertype].modalContent = modalContent;
this.renderers[rendertype].calendarEvent = calendarEvent;
}
public/js/components/Cis/Stundenplan/Stundenplan.js
+29 -12
View File
@@ -26,7 +26,9 @@ const Stundenplan = {
studiensemester_start: null,
studiensemester_ende: null,
uid: null,
renderComponents: {}
renderComponents: {},
isModalContentResolved: false,
isModalTitleResolved: false,
}
},
props: {
@@ -109,9 +111,25 @@ const Stundenplan = {
},
},
methods:{
modalTitleResolved: function () {
this.isModalTitleResolved = true;
if(this.isModalContentResolved && this.isModalTitleResolved)
Vue.nextTick(() => {
if(this.$refs.lvmodal)
this.$refs.lvmodal.show();
});
},
modalContentResolved: function () {
this.isModalContentResolved = true;
if (this.isModalContentResolved && this.isModalTitleResolved)
Vue.nextTick(() => {
if (this.$refs.lvmodal)
this.$refs.lvmodal.show();
});
},
// component renderers fetches from different addons
modalTitleComponent(type){
return this.renderers[type].modalTitel;
return this.renderers[type].modalTitle;
},
modalContentComponent(type) {
return this.renderers[type].modalContent;
@@ -186,9 +204,8 @@ const Stundenplan = {
},
showModal: function(event){
this.currentlySelectedEvent = event;
Vue.nextTick(() => {
this.$refs.lvmodal.show();
});
this.isModalTitleResolved = false;
this.isModalContentResolved = false;
},
updateRange: function ({start,end, mounted}) {
let checkDate = (date) => {
@@ -275,14 +292,14 @@ const Stundenplan = {
<hr>
<lv-modal v-if="currentlySelectedEvent" :event="currentlySelectedEvent" ref="lvmodal" >
<template #modalTitle>
<Suspense>
<component :is="modalTitleComponent(currentlySelectedEvent.type)" v-if="currentlySelectedEvent" :event="currentlySelectedEvent" ></component>
</Suspense>
</template>
<Suspense @resolve="modalTitleResolved">
<component :is="modalTitleComponent(currentlySelectedEvent.type)" v-if="currentlySelectedEvent" :event="currentlySelectedEvent" ></component>
</Suspense>
</template>
<template #modalContent>
<Suspense>
<component :is="modalContentComponent(currentlySelectedEvent.type)" v-if="currentlySelectedEvent" :event="currentlySelectedEvent" ></component>
</Suspense>
<Suspense @resolve="modalContentResolved">
<component :is="modalContentComponent(currentlySelectedEvent.type)" v-if="currentlySelectedEvent" :event="currentlySelectedEvent" ></component>
</Suspense>
</template>
</lv-modal>