@fto-consult/expo-ui 2.21.2 → 2.22.0

package/src/components/Datagrid/Footer/Footer.js

@@ -1,4 +1,3 @@
-import Button from "$ecomponents/Button";
 import Menu from "$ecomponents/BottomSheet/Menu";
 import View from "$ecomponents/View";
 import {Pressable,StyleSheet} from "react-native";

package/src/components/Datagrid/Footer/index.js

@@ -3,21 +3,27 @@ import View from "$ecomponents/View";
 import React from "$react";
 import memoize from "$react/memoize";
 export {default as FooterItem} from "./Footer";
-import {parseDecimal} from "$utils";
+import {parseDecimal,defaultObj,defaultStr,isNonNullString} from "$utils";
 
-export const evalSingleValue = ({data,columnDef,field,result,withLabel,displayLabel,onlyVisible})=>{
-    data = data || {}
+export * from "./Footer";
+
+/***évalue la valeur décimale selon les paramètres */
+export const getFooterColumnValue = ({data,columnDef,field,result,columnField}) =>{
+    data = defaultObj(data)
+    columnDef = defaultObj(columnDef);
+    columnField = defaultStr(columnField,columnDef.field,field);
+    let val = data[columnField];
+    if(typeof columnDef.multiplicater ==='function'){
+        val = defaultDecimal(columnDef.multiplicater({value:val,columnField,field,columnDef,rowData:data,item:data}),val)
+    }
+    return typeof val =='number'? parseDecimal(val.toFixed(12)) : 0;
+}
+
+export const evalSingleValue = ({data,columnDef,field,columnField,withLabel,result,displayLabel,onlyVisible})=>{
     if(!isNonNullString(field) || !isObj(columnDef)) return result;
     onlyVisible = defaultBool(onlyVisible,true);
     if(onlyVisible === true && !(columnDef.visible !== false)) result;
-    let val = data[field];
-    if(isFunction(columnDef.multiplicater)){
-        val = defaultDecimal(columnDef.multiplicater({value:val,columnField:field,field,columnDef,rowData:data,item:data}),val)
-    }
-    if(!isDecimal(val)){
-        return result;
-    }
-    val = parseDecimal(val.toFixed(10));
+    let val = getFooterColumnValue({data,columnDef,columnField,result,field});
     (Array.isArray(result) ? result : [result]).map((currentResult)=>{
         currentResult = defaultObj(currentResult);
         if(!isObj(currentResult[field])){

package/src/components/Datagrid/Table/index.js

@@ -53,7 +53,7 @@ const DatagridFactory = (Factory)=>{
         renderFooterCell(props){
             const {columnField,style} = props;
             let footersValues = this.getFooterValues();
-            const footerFields = this.getFooterFields();
+            const footerFields = this.getFootersFields();
             if(isObj(footerFields[columnField])){
                 return <Footer
                     //{...footerFields[columnField]}
@@ -160,8 +160,9 @@ const DatagridFactory = (Factory)=>{
                 total:pagination.rows,pages:countPages
             })*/
             const {visibleColumns} = this.preparedColumns;
-            const hasFooterFields = this.hasFooterFields();
-            const {columnsWidths:widths,showFilters,showFooters} = this.state;
+            const hasFootersFields = this.hasFootersFields();
+            const {columnsWidths:widths} = this.state;
+            const showFooters = this.canShowFooters(), showFilters = this.canShowFilters();
             const isLoading = this.isLoading();
             let _progressBar = this.getProgressBar();
             const pointerEvents = this.getPointerEvents(); 
@@ -219,13 +220,13 @@ const DatagridFactory = (Factory)=>{
                                         {showFilters?'Masquer/Filtres':'Afficher/Filtres'}
                                 </Button>
                             )}
-                            {hasFooterFields && !canRenderChart ? <Button
+                            {hasFootersFields && !canRenderChart ? <Button
                                 normal
                                 style={styles.paginationItem}
                                 onPress =  {()=>{this.toggleFooters(!showFooters)} }   
                                 icon = {showFooters?'view-column':'view-module'}
                             >   
-                                    {showFooters?'Masquer/Ligne des totaux':'Afficher/Ligne des totaux'}
+                                    {showFooters?'Masquer les totaux':'Afficher les totaux'}
                             </Button>:null}
                             {restItems.map((item,index)=>{
                                 return <Button 
@@ -277,7 +278,7 @@ const DatagridFactory = (Factory)=>{
                                     ,icon :  showFilters?'eye-off':'eye'
                                     ,text : (showFilters?'Masquer/Filtres':'Afficher/Filtres')
                                 } : null,
-                                isMobile && hasFooterFields?{
+                                isMobile && hasFootersFields?{
                                     onPress :  ()=>{this.toggleFooters(!showFooters)}    
                                     ,icon :  showFooters?'view-column':'view-module'
                                     ,text : (showFooters?'Masquer/Ligne des totaux':'Afficher/Ligne des totaux')
@@ -344,7 +345,7 @@ const DatagridFactory = (Factory)=>{
                     </View> : null}
                     getItemType = {this.getFlashListItemType.bind(this)}
                     renderItem = {this.renderFlashListItem.bind(this)}
-                    hasFooters = {hasFooterFields && !canRenderChart ? true : false}
+                    hasFooters = {hasFootersFields && !canRenderChart ? true : false}
                     showFilters = {showFilters}
                     showFooters = {showFooters && !canRenderChart ? true : false}
                     showHeaders = { canRenderChart ? !!showFilters : true}

package/src/components/Date/FormatSelector.js

@@ -79,7 +79,8 @@ export const selectDateFormatFieldProps = ({onAdd:customOnAdd,onAddCustomFormat,
         getItemValue : ({item})=>item.code,
         renderItem : dateFormatSelectorRenderItem,
         showAdd : true,
-        ...defaultObj(props),
+        ...props,
+        defaultValue : defaultStr(props.defaultValue,props.format),
         onAdd,
         onAdd : undefined,
         showAdd : false,

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

@@ -889,7 +889,7 @@ export default class Field extends AppComponent {
 
         this.___formattedField = undefined;
         let _type = this.type;
-        format = defaultStr(format).toLowerCase().trim();
+        format = defaultStr(format);
         tooltip = defaultVal(tooltip,title);
 
         const isEditable = rest.disabled !== true && rest.readOnly !== true && rest.editable !== false ? true : false;