@fto-consult/expo-ui 2.18.4 → 2.18.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (2) hide show
  1. package/package.json +1 -1
  2. package/src/components/Datagrid/Common/Common.js +3 -3
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@fto-consult/expo-ui",
3
- "version": "2.18.4",
3
+ "version": "2.18.6",
4
4
  "description": "Bibliothèque de composants UI Expo,react-native",
5
5
  "main": "index.js",
6
6
  "scripts": {
package/src/components/Datagrid/Common/Common.js CHANGED
@@ -1151,7 +1151,7 @@ export default class CommonDatagridComponent extends AppComponent {
1151
1151
  sortedColumn.header = header;
1152
1152
  sortedColumn.label = restCol.label;
1153
1153
  const isDesc = currentSortedColumn.dir === "desc";
1154
- const prefix = (sortType =='number' || sortType == 'decimal') ? "numeric" : sortType =='boolean'?'bool' : sortType =='date'? 'calendar': sortType =='time'? 'clock' : 'alphabetical';
1154
+ const prefix = (sortType =='number' || sortType == 'decimal') ? "numeric" : sortType =='boolean'?'bool' : sortType.contains('date') ? 'calendar': sortType =='time'? 'clock' : 'alphabetical';
1155
1155
  sortedColumn.icon = 'sort-'+prefix+'-'+(isDesc ? "descending" : "ascending");
1156
1156
  sortedColumn.title = (isDesc ? "Trié par ordre décroissant":"Trié par ordre croissant ")+ " du champ ["+restCol.label+"]";
1157
1157
  }
@@ -2067,10 +2067,10 @@ export default class CommonDatagridComponent extends AppComponent {
2067
2067
  _render = <Hashtag>{_render}</Hashtag>
2068
2068
  } else if(typeof columnDef.render === "function"){
2069
2069
  _render = columnDef.render.call(this,renderArgs);
2070
- } else if(arrayValueExists( _type,["date","datetime","time"]) && isNonNullString(rowData[columnField])){
2070
+ } else if(arrayValueExists( _type,["date","datetime","time"])){
2071
2071
  let _dd =DateLib.parse(rowData[columnField],_type === 'time'?DateLib.isoTimeFormat:DateLib.SQLDateFormat);
2072
2072
  if(DateLib.isDateObj(_dd)){
2073
- _render = DateLib.format(_dd,(_type === 'time'?DateLib.defaultTimeFormat:DateLib.masks.defaultDate));
2073
+ _render = DateLib.format(_dd,defaultStr(columnDef.format,(_type === 'time'?DateLib.defaultTimeFormat:DateLib.masks.defaultDate)));
2074
2074
  }
2075
2075
  if(!_render) _render = rowData[columnField]
2076
2076
  } else if(arrayValueExists(_type,['switch','checkbox'])){