@fto-consult/expo-ui 7.1.6 → 7.2.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fto-consult/expo-ui",
-  "version": "7.1.6",
+  "version": "7.2.0",
   "description": "Bibliothèque de composants UI Expo,react-native",
   "main": "main",
   "scripts": {
@@ -71,7 +71,7 @@
     "@expo/html-elements": "^0.5.1",
     "@expo/vector-icons": "^13.0.0",
     "@faker-js/faker": "^8.0.2",
-    "@fto-consult/common": "^3.71.15",
+    "@fto-consult/common": "^3.72.12",
     "@pchmn/expo-material3-theme": "^1.3.1",
     "@react-native-async-storage/async-storage": "1.18.2",
     "@react-native-community/datetimepicker": "7.2.0",

package/src/components/Datagrid/Common/Common.js

@@ -1790,6 +1790,10 @@ export default class CommonDatagridComponent extends AppComponent {
                         defaultValue : 0,
                         type : "switch",
                     }  : null,
+                    pdfDocumentTitle : {
+                        text : "Titre du document",
+                        multiple : true,
+                    },
                     ...sFields,
                 },
                 actions : [{text:'Exporter',icon : "check"}],
@@ -1844,7 +1848,7 @@ export default class CommonDatagridComponent extends AppComponent {
         if(pdfDocumentTitle){
             content.unshift(pdfDocumentTitle);
         }
-        const pdf = createPDF({content},config);
+        const pdf = createPDF({...config,content});
         if(isWeb()){
             return pdf.open();
         }

package/src/components/Form/Fields/Field.js

@@ -96,7 +96,6 @@ export default class Field extends AppComponent {
             },
             isDisabled : {
                 value : ()=>{
-                    console.log("checking disable ",this.name,!!this.state.isReadOnlyOrDisabled,!this.isEditableBySymbol())
                     return !!this.state.isReadOnlyOrDisabled || !this.isEditableBySymbol();
                 }, override : false,writable : false
             }

package/src/pdf/index.js

@@ -9,6 +9,7 @@ import session from "$session";
 
 const {createPdf} = pdfMake;
 pdfMake.createPdf = (docDefinition,...rest)=>{
+    console.log("creating pdf ",docDefinition);
     try {
         //@see : https://pdfmake.github.io/docs/0.1/getting-started/client-side/methods/
         const pdf = createPdf(docDefinition,...rest);
@@ -43,14 +44,7 @@ export const print = (data,options,...rest)=>{
 
 export const getFields = (config)=>{
     config = Object.assign({},config);
-    const sFields = extendObj({},{
-        pdfDocumentTitle : {
-            text : "Titre du document",
-            multiple : true,
-        }
-    },pdfFields);
-    delete sFields.code;
-    delete sFields.label;
+    const sFields = Object.clone(pdfFields);
     if(!isDataURL(config.logo)){
         delete sFields.displayLogo;
         delete sFields.logoWidth;
@@ -80,6 +74,7 @@ export const getPrintSettings = ({multiple,sessionName,formDataProps,...rest})=>
             onValidate : ({value,context}) =>{
                 if(context){
                     const pageBreakBeforeEachDoc = context.getField("pageBreakBeforeEachDoc");
+                    const pageMarginAfterEachDoc = context.getField("pageMarginAfterEachDoc");
                     if(pageBreakBeforeEachDoc){
                         if(value || multiple){
                             pageBreakBeforeEachDoc.enable();
@@ -87,6 +82,13 @@ export const getPrintSettings = ({multiple,sessionName,formDataProps,...rest})=>
                             pageBreakBeforeEachDoc.disable();
                         }
                     }
+                    if(pageMarginAfterEachDoc){
+                        if(value || multiple){
+                            pageMarginAfterEachDoc.enable();
+                        } else {
+                            pageMarginAfterEachDoc.disable();
+                        }
+                    }
                 }
             }
         },
@@ -104,7 +106,23 @@ export const getPrintSettings = ({multiple,sessionName,formDataProps,...rest})=>
                 }
                 return v;
             }
-        }
+        },
+        pageMarginAfterEachDoc : {
+            text : "Marge après chaque document",
+            tooltip : 'Spécifiez le nombre de ligne à ajouter comme marge après chaque document',
+            defaultValue : 2,
+            type : "number",
+            getValidValue : ({context,data}) => {
+                if(!context || !context?.isDisabled) {
+                    return 0;
+                }
+                const v = context?.isDisabled()?0 : context.getValue();
+                if(isObj(data)){
+                    data.pageMarginAfterEachDoc = v;
+                }
+                return v;
+            }
+        },
     },getFields(formDataProps.data))
     return new Promise((resolve,reject)=>{
         return DialogProvider.open({
@@ -122,7 +140,7 @@ export const getPrintSettings = ({multiple,sessionName,formDataProps,...rest})=>
                     session.set(sessionName,sessionD);
                 }
                 DialogProvider.close();
-                resolve({...opts,fields});
+                resolve({...opts,data,fields});
             },
             onCancel : reject,
         })