@mediusinc/mng-commons 6.1.0-rc.1 → 6.2.0-rc.0

package/fesm2022/mediusinc-mng-commons-tableview.mjs

@@ -1841,14 +1841,19 @@ function createFormlyTabType(tabGroups, editorDescriptor, formlyConfig, formEdit
         }
     };
     for (const tab of tabGroups) {
+        const { props, expressions, ...restConfig } = tab.formlyConfig;
         const tabField = {
+            ...restConfig,
             id: tab.name,
             props: {
+                ...props,
                 formEditorComponent,
                 descriptor: tab,
                 editorDescriptor: editorDescriptor
             },
-            expressions: {},
+            expressions: {
+                ...expressions
+            },
             fieldGroup: []
         };
         if (tab.title) {
@@ -1905,22 +1910,34 @@ function createFormlyFields(descriptor, editorDescriptor, formlyConfig, formEdit
     for (const descriptorField of descriptor.fields) {
         fields.push(createFormlyField(descriptorField, editorDescriptor, formlyConfig, formEditorComponent));
     }
+    const { props, validation, ...restConfig } = descriptor.formlyConfig;
     // wrap in group to be able to use flex grid
     const wrapperGroup = {
+        ...restConfig,
         fieldGroupClassName: descriptor?.className?.grid ?? 'grid grid-cols-12 gap-4',
         fieldGroup: fields,
-        props: {}
+        props: {
+            ...props
+        },
+        validation: {
+            ...validation,
+            show: descriptor.validationOpts.forceShowMessage
+        }
     };
     addValidationsToFormlyField(wrapperGroup, descriptor.validations, formlyConfig);
     return [wrapperGroup];
 }
 function createFormlyField(descriptor, editorDescriptor, formlyConfig, formEditorComponent) {
+    const { modelOptions, hooks, props, validation, expressions, ...restConfig } = descriptor.formlyConfig;
     const field = {
+        ...restConfig,
         key: descriptor.property,
         modelOptions: {
-            updateOn: descriptor.updateOn
+            updateOn: descriptor.updateOn,
+            ...modelOptions
         },
         hooks: {
+            ...hooks,
             onInit: () => (descriptor.onInit ? descriptor.onInit(field) : undefined),
             onChanges: () => (descriptor.onChanges ? descriptor.onChanges(field) : undefined),
             afterContentInit: () => (descriptor.afterContentInit ? descriptor.afterContentInit(field) : undefined),
@@ -1928,12 +1945,19 @@ function createFormlyField(descriptor, editorDescriptor, formlyConfig, formEdito
             onDestroy: () => (descriptor.onDestroy ? descriptor.onDestroy(field) : undefined)
         },
         props: {
+            ...props,
             descriptor,
             formEditorComponent,
             editorDescriptor: editorDescriptor,
             onValueChange: descriptor.onValueChange
         },
-        expressions: {}
+        validation: {
+            ...validation,
+            show: descriptor.validationOpts.forceShowMessage
+        },
+        expressions: {
+            ...expressions
+        }
     };
     if (descriptor instanceof FieldInputDescriptor) {
         switch (descriptor.fieldType) {