osl-base-extended 2.0.30 → 2.0.32

package/fesm2022/osl-base-extended.mjs

@@ -2703,7 +2703,7 @@ class DynamicForm {
         this.loadApiDatasources();
     }
     ngOnChanges(changes) {
-        if (changes['elements']) {
+        if (changes['elements'] || changes['model']) {
             this.loadApiDatasources();
         }
     }
@@ -2720,6 +2720,8 @@ class DynamicForm {
                     const allReady = elem.dependsOn.every(k => this.model?.[k] != null);
                     if (!allReady)
                         continue;
+                    if (elem.datasource?.length)
+                        continue;
                 }
                 elem.loadingIf = () => true;
                 const data = await this.datasourceCache.load(elem.apiService, elem.apiMethod, elem.apiBody ? elem.apiBody(this.model) : null);
@@ -2753,6 +2755,7 @@ class DynamicForm {
         elem.change(this.model, undefined, selectedObj);
     }
     onFieldChange(elem, value) {
+        this.model[elem.key] = value;
         if (elem.change)
             this.onSelectChange(elem, value);
         this._refreshDependents(elem.key);
@@ -2760,8 +2763,21 @@ class DynamicForm {
     async _refreshDependents(changedKey) {
         const dependents = this._flatElements().filter(e => e.dependsOn?.includes(changedKey));
         for (const dep of dependents) {
-            const body = dep.apiBody ? dep.apiBody(this.model) : undefined;
             let valueCleared = false;
+            // If any parent dependency is now null, clear field + datasource without API call
+            const anyDepNull = dep.dependsOn.some(k => this.model[k] == null);
+            if (anyDepNull) {
+                if (this.model[dep.key] != null) {
+                    this.model[dep.key] = null;
+                    valueCleared = true;
+                }
+                dep.datasource = [];
+                this.cdr.markForCheck();
+                if (valueCleared)
+                    await this._refreshDependents(dep.key);
+                continue;
+            }
+            const body = dep.apiBody ? dep.apiBody(this.model) : undefined;
             if (dep.searchType !== 'Api' && dep.apiService && dep.apiMethod) {
                 dep.loadingIf = () => true;
                 this.cdr.markForCheck();