@ajf/material 18.0.5 → 18.0.6

package/fesm2022/ajf-material-form-builder.mjs

@@ -53,7 +53,7 @@ import { DataSource } from '@angular/cdk/collections';
 import { BehaviorSubject, of, Subject, Subscription, combineLatest } from 'rxjs';
 import * as i6$1 from '@ngneat/transloco';
 import { take, filter, map, scan, shareReplay, withLatestFrom, finalize, switchMap, startWith, pairwise, distinctUntilChanged, sample } from 'rxjs/operators';
-import { createCondition, alwaysCondition, createFormula, neverCondition } from '@ajf/core/models';
+import { createFormula, createCondition, alwaysCondition, neverCondition } from '@ajf/core/models';
 import { deepCopy } from '@ajf/core/utils';
 import { ENTER, COMMA } from '@angular/cdk/keycodes';
 import * as i5$1 from '@angular/material/core';
@@ -278,21 +278,70 @@ function getNodeContainer(c, node) {
     }
     return null;
 }
+function toArray(input) {
+    if (!input)
+        return [];
+    input = input.replace(/\[|\]/g, '').trim();
+    return input
+        .split(',')
+        .map(s => s.trim())
+        .map(s => s.replace(/^['"]|['"]$/g, ''))
+        .filter(s => s);
+}
+/**
+ * Take the defaultValue from the properties box and return the new value to save in the ajf form defaultValue field properties
+ * @param value
+ * @param node
+ * @returns
+ * {"formula": "'colazione note'"}
+ * {"formula": "'[\"colazione\", \"docce\"]'"}
+ * {"formula": "3"}
+ * {"formula": "(1 === 1)"}
+ */
 function getDefaultValue(value, node) {
     let defaultValue = value && value.trim() != '' ? value : null;
     if (defaultValue) {
         switch (node.fieldType) {
             case AjfFieldType.Boolean:
-                return defaultValue === 'true' || defaultValue === '1';
+                if (defaultValue === 'true' || defaultValue === '1') {
+                    return true;
+                }
+                if (defaultValue === 'false' || defaultValue === '0') {
+                    return false;
+                }
+                return createFormula({ formula: defaultValue });
             case AjfFieldType.MultipleChoice:
-                return [defaultValue];
-            case AjfFieldType.Number:
-                const v = +defaultValue;
-                return isNaN(v) ? 0 : v;
+                // return a string[]
+                return toArray(defaultValue);
         }
+        return createFormula({ formula: defaultValue });
     }
     return defaultValue;
 }
+/**
+ * Take the defaultValue from the ajf form defaultValue prop (non formula)
+ * and return the value to be shown in the properties box
+ * @param value
+ * @param node
+ * @returns
+ */
+function cleanDefaultValue(value, node) {
+    if (!value || String(value).trim() === '') {
+        return null;
+    }
+    switch (node.fieldType) {
+        case AjfFieldType.String:
+        case AjfFieldType.Text:
+        case AjfFieldType.SingleChoice:
+            if (/^"[^"]*"$/.test(String(value)) || /^'[^']*'$/.test(String(value))) {
+                return String(value);
+            }
+            return `'${String(value)}'`;
+        case AjfFieldType.MultipleChoice:
+            return JSON.stringify(value);
+    }
+    return String(value);
+}
 function buildFormBuilderNodesSubtree(nodes, parent, ignoreConditionalBranches = false) {
     const entries = nodes
         .filter(n => n.parent === parent.id)
@@ -2378,8 +2427,11 @@ class AjfFbNodeProperties {
                     });
                 }
                 const formula = node.formula != null ? node.formula.formula : null;
+                const defaultValue = node.defaultValue && node.defaultValue.formula != null
+                    ? node.defaultValue.formula
+                    : cleanDefaultValue(node.defaultValue, node);
                 controls.description = node.description;
-                controls.defaultValue = node.defaultValue;
+                controls.defaultValue = defaultValue;
                 controls.hint = node.hint;
                 controls.size = node.size;
                 controls.formula = formula;
@@ -3376,5 +3428,5 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.13", ngImpo
  * Generated bundle index. Do not edit.
  */
 
-export { AjfFormBuilder, AjfFormBuilderModule, AjfFormBuilderService, disableFieldDropPredicate, disableSlideDropPredicate, flattenNodes, onDropProcess };
+export { AjfFormBuilder, AjfFormBuilderModule, AjfFormBuilderService, cleanDefaultValue, disableFieldDropPredicate, disableSlideDropPredicate, flattenNodes, onDropProcess };
 //# sourceMappingURL=ajf-material-form-builder.mjs.map