@yourself.create/ngx-form-designer 0.0.6 → 0.0.7

package/fesm2022/uch-web-ngx-form-designer.mjs

@@ -31946,20 +31946,20 @@ class DefaultDataProvider extends DataProvider {
     }
     async getValue(field, engine) {
         const cfg = getEffectiveDataConfig(field);
+        const currentValue = this.getCurrentFieldValue(field, engine);
         if (cfg.type === 'static') {
             if (cfg.staticValue !== undefined)
                 return cfg.staticValue;
-            return field.defaultValue;
+            return currentValue !== undefined ? currentValue : field.defaultValue;
         }
         let rows = await this.getRawRows(cfg, field, engine);
         rows = this.resolveCollectionRows(rows, cfg, engine);
         rows = this.applyRowFilters(rows, cfg.filters, engine);
         if (!rows || rows.length === 0) {
-            return field.defaultValue;
+            return currentValue !== undefined ? currentValue : field.defaultValue;
         }
         const selectedRow = this.selectScalarRow(rows, cfg, engine);
         if (cfg.rowSelectionMode === 'selected' && !selectedRow) {
-            const currentValue = field.name && engine ? engine.getValue(field.name) : undefined;
             return currentValue !== undefined ? currentValue : field.defaultValue;
         }
         const row = selectedRow ?? rows[0];
@@ -32007,6 +32007,9 @@ class DefaultDataProvider extends DataProvider {
                 return [];
         }
     }
+    getCurrentFieldValue(field, engine) {
+        return field.name && engine ? engine.getValue(field.name) : undefined;
+    }
     async getGlobalRows(cfg) {
         if (!cfg.datasourceId)
             return [];