@fto-consult/expo-ui 2.30.0 → 2.31.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fto-consult/expo-ui",
-  "version": "2.30.0",
+  "version": "2.31.1",
   "description": "Bibliothèque de composants UI Expo,react-native",
   "main": "index.js",
   "scripts": {
@@ -61,7 +61,7 @@
     "@emotion/native": "^11.10.0",
     "@expo/html-elements": "^0.2.0",
     "@expo/vector-icons": "^13.0.0",
-    "@fto-consult/common": "^1.25.10",
+    "@fto-consult/common": "^1.25.17",
     "@gorhom/portal": "^1.0.14",
     "@react-native-async-storage/async-storage": "~1.17.3",
     "@react-native-community/datetimepicker": "6.5.2",

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

@@ -40,6 +40,7 @@ import {styles as tableStyles} from "$ecomponents/Table";
 import {DialogProvider} from "$ecomponents/Form/FormData";
 import Chart,{getMaxSupportedSeriesSize} from "$ecomponents/Chart";
 import notify from "$cnotify";
+import Divider from "$ecomponents/Divider";
 
 export const donutChart = {
     isChart : true,
@@ -273,10 +274,10 @@ export default class CommonDatagridComponent extends AppComponent {
             if(isPlainObject(f)){
                 this.filters[v] = {...f};
                 this.filters[v].field = defaultStr(f.field,v);
-                this.filters[v].originValue = defaultVal(f.originValue,f.defaultValue,f.value)
+                this.filters[v].defaultValue = defaultVal(f.defaultValue,f.value)
             } else {
                 this.filters[v] = {
-                    originValue : f,
+                    defaultValue : f,
                     field : v
                 }
             }
@@ -355,6 +356,8 @@ export default class CommonDatagridComponent extends AppComponent {
         (Array.isArray(props.sectionListColumns) ? props.sectionListColumns : defaultArray(this.getSessionData("sectionListColumns"))).map((col)=>{
             if(isNonNullString(col)){
                 l[col.trim()] = {};
+            } else if(isObj(col) && isNonNullString(col.field)){
+                l[col.field] = col;
             }
         })
         return l;
@@ -2044,7 +2047,7 @@ export default class CommonDatagridComponent extends AppComponent {
                     andOperator : filterAndOperator,
                     searchIconTooltip : 'Filtre',
                     searchIcon : 'filter_list',  
-                    defaultValue : fCol.originValue,
+                    defaultValue : defaultVal(fCol.defaultValue,restCol.defaultValue),
                     name : header.field,
                     onClearFilter : this.onClearFilter.bind(this),
                     onChange : this.onFilterChange.bind(this),
@@ -2373,9 +2376,9 @@ export default class CommonDatagridComponent extends AppComponent {
                 });
             }
         }
-        return <View testID={testID+"_ContentContainer"}  style={[theme.styles.w100,isA ? theme.styles.ph2 : theme.styles.pt1,theme.styles.justifyContentCenter,theme.styles.alignItemsCenter,theme.styles.pb1,!cells && theme.styles.ml1,theme.styles.mr1,cStyle]}>
+        return <View testID={testID+"_ContentContainer"}  style={[theme.styles.w100,isA && this.state.displayOnlySectionListHeaders && {borderTopColor:theme.colors.divider,borderTopWidth:1},isA ? [theme.styles.ph2,theme.styles.pt1] : theme.styles.pt1,theme.styles.justifyContentCenter,theme.styles.alignItemsCenter,theme.styles.pb1,!cells && theme.styles.ml1,theme.styles.mr1,cStyle]}>
             <Label testID={testID+"_Label"} splitText numberOfLines={3} textBold style={[theme.styles.w100,{color:theme.colors.primaryOnSurface,fontSize:isA?15 :16},lStyle]}>{label}</Label>
-            {cells ? <View testID={testID+"_TableRow"} style = {[theme.styles.w100,theme.styles.row,theme.styles.alignItemsFlexStart,isA && theme.styles.mt05]}
+            {cells ? <View testID={testID+"_TableRow"} style = {[theme.styles.w100,theme.styles.row,isA && theme.styles.pt1,theme.styles.alignItemsFlexStart]}
             >{cells}</View> : null}
         </View>
     }
@@ -2457,7 +2460,7 @@ export default class CommonDatagridComponent extends AppComponent {
             if(!isObj(f)) return;
             defValue = undefined;
             if(f.type =="select") defValue = [];
-            filters[i] = {...f,value:defValue,defaultValue:defValue,originValue:defValue}
+            filters[i] = {...f,value:defValue,defaultValue:defValue}
         })
         this.filters = filters;
         this.refresh(true);
@@ -2483,7 +2486,7 @@ export default class CommonDatagridComponent extends AppComponent {
         field = defaultStr(field,name);
         if(field){
             let v = defaultStr(type).toLowerCase() == "select"? []:undefined
-            this.filters[field] = {value:v,defaultValue:v,originValue:v,originValue:v}
+            this.filters[field] = {value:v,defaultValue:v}
             this.doFilter({value:v,field,force:true})
         }
     }
@@ -2500,7 +2503,7 @@ export default class CommonDatagridComponent extends AppComponent {
             this.filteredValues[field] = {
                 operator,action,value,field
             }
-            filter.originValue = filter.defaultValue = arg.defaultValue;
+            filter.defaultValue = arg.defaultValue;
             filter.operator = operator;
             filter.action = defaultStr(originAction,action);            
         }
@@ -3317,6 +3320,11 @@ CommonDatagridComponent.propTypes = {
         PropTypes.arrayOf(PropTypes.object),
         PropTypes.objectOf(PropTypes.object),
     ]),
+    /****les colonnes via lesquelles le tableau est groupé par defaut */
+    sectionListColumns : PropTypes.oneOfType([
+        PropTypes.arrayOf(PropTypes.object),
+        PropTypes.arrayOf(PropTypes.string),
+    ]),
     sectionListHeaderEmptyValue : PropTypes.string, //la valeur vide par défaut à afficher dans les entêtes du table
     ignoreCaseOnSectionListHeader : PropTypes.bool,//si l'on ignorera la casse dans le sectionlISThEADER
     sectoonListHeaderUpperCase : PropTypes.bool, //si le sectionListHeader sera en majuscule

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

@@ -96,7 +96,6 @@ export default class CommonTableDatagrid extends CommonDatagrid{
                 fetchOptions.selector = defaultObj(fetchOptions.selector);
                 fetchOptions.dataSources = this.currentDataSources;
                 fetchOptions = extendObj(true,true,{},fetchOptions,{selector : fetchFilters});
-                console.log(fetchOptions," is fetchOptions ",this.getFiltersProps(),fetchFilters)
                 fetchOptions.dataSources = this.currentDataSources;
                 fetchOptions.sort = this.getSort();
                 let limit = this.getQueryLimit();

package/src/components/Date/DateTime.js

@@ -10,7 +10,6 @@ import {defaultObj,isNumber,defaultNumber,defaultStr,defaultBool,isNonNullString
 import theme,{flattenStyle} from "$theme";
 import DateLib from "$date";
 import { toDateObj } from "./utils";
-import TextField from "$components/TextField";
 import PeriodActionComponent from "./PeriodAction";
 
 export default function DateTimePickerComponent({left,isPeriodAction,contentProps,withSeconds,right,format,dateFormat,timeFormat,defaultValue,onChange,testID,dateProps,disabled,readOnly,timeProps,...rest}){

package/src/components/Date/PeriodAction.js

@@ -8,7 +8,7 @@ import DateLib from "$date";
 
 const PeriodActionComponent = React.forwardRef(({defaultValue,label,isDateTime,...props},ref)=>{
     if(isNonNullString(label)){
-        label+=" [Période1]";
+        label+=" [Période]";
     }
     const datePeriod= DateLib.formatPeriod(defaultValue,isDateTime);
     if(datePeriod){

package/src/components/Filter/index.js

@@ -178,7 +178,6 @@ export default class Filter extends AppComponent {
       if(!isObjOrArray(value) && (isNullOrEmpty(value,true) || value ==='undefined') ){
           value = undefined;
       }
-      let originValue = value;
       if(action =="$today" || action =='$yesterday'){
          force = true;
       }
@@ -230,7 +229,7 @@ export default class Filter extends AppComponent {
                 }
              }
           }
-          this.props.onChange({...this.getStateValues(),value,originValue:originValue,originValue,field:this.props.field,action,operator,selector,originAction,context:this});
+          this.props.onChange({...this.getStateValues(),value,field:this.props.field,action,operator,selector,originAction,context:this});
       }
   }
   componentDidUpdate (){